Fix color-theme setup