Initial attempt to reconcile styling changes

...which were made on wrong codebase