0.2.5 style revamp

Figured it's be nicer to make a PR for this so later I can go back and look at the entire changeset  online