Resolve theme issues