Continue migration of styles to CL-CSS per issue #5