Style overhaul part 2