Fixed support for solid-colored themes