Fixup the new theme