Continue migration of styles per issue #5

Completed Shared Styles section