Merged CSS style guide updates