Fixed theming bugs