Fix some theme issues
