Fixing theme issues