improve comment for themes
fix highlight current line for osx