Changed theming a bit