Theme Fixes!

Getting ready for the user settings page, and custom themes (Dark
Default, with Light Theme as well).