Added theme-ablity & dynamic highlight definitions