Adding first cut of the merge between Material branch and the style-rework branch
Fixing up the styleguide to be in a theme file. Time for Material and see what we can do