Rework of styles

Still a lot left to do

Change-Id: I02f63eebd2bdd393b0a36acebb9134e6d24085fd