Fix some theme issues