updating styles with colors, fonts
Merge branch 'master' into first-draft