More less refactoring

In digging into splitting out the branding components of the LESS/CSS I ran into loads more refactoring. Hoping to ship that first. :smile_cat: 

@deathbearbrown @garrensmith hope these are helpful.