Fix the various themes