More fixes for Theming
Oops, derp
Another derp lol