Fixed some UI glitches with theme