Fixed up the theming