General theming and fixes.