Fix some theme stuff