fixing color scheme and theme assignments