fixed theme issues