ColorTheme Fix