Update/156 consistency update

[TristanMNorton]

1. Removed the mixin pattern where it still existed.
2. Various formatting consistency.
3. But a default block variable at the top of all components.
4. Updated various uses of nested block styles to use blog variable.
5. Fixed categories.