#571 - Misc theming, organizing css.