added color-theme support