Renamed and tweaked styles