fixed light theme issues