Reformat themes for consistency