Minor theming fixes...