use more comprehensive names for theme
highlight keywords