Major style overhaul