fixing theme issues1