Audit/styles

This is still a WIP, need to review some things with Chris