fixing theme issues