Re-theming
Style fixes.