Fix theme issues