Revert 2d3d2bb..bad9cfd

This rolls back to commit 2d3d2bb72e7e52163e5552dd27e9676f48334a6a.
Update With New Styling WIP