Fixes to the theme for color