Apply fixes to new theme