Dev branch

1.0 styles