Fixed theming issue