This fixes an issue where a non-default theme set to use the base color scheme (i.e. the theme had an empty `color_scheme_id`) was loading the default theme's color scheme instead.