Moving theme related styles to theme.scss

Still more to find...