Minor theming fixes