Modified the theme a bit more