retrying basic styles

:(
Merge branch 'basic-styles-2'