Fix up theming issues
Merge pull request #1 from VanillaUnicorn/kitkat

Revert "Add GlowPad Torch (1/2)"
Merge pull request #1 from Chintan1998/kitkat

Theming Issues Fixup