basic styles and video all working

what
Merge branch 'basic-styles-2'