Styling Updates 1/21

Last major set of changes prior to pushing live.
Merge branch 'Style-Updates-1/15'
Merge branch 'Style-Updates-1/15'
Merge branch 'master' of https://github.com/Grizzard/Happy-70th-Anniversary