More theme issues fixed.