Main style overhaul