early stab at unifying styles
Merge remote-tracking branch 'origin/master'
consolidating map styles