Initial independant styling
Stylying
Update tests to match style classes
Merge branch 'style' into develop
Up version