Making syntax highlighting less of an eye-sore
Added prefix for box sizing
Merge branch 'design'