Done some more theming