Implemented a whole host of style upgrades