Refactored theming a bit.