Continue migration of styles per issue #5