Added optional ui theming