Adding fixes for theming