Fixed some theme glitches