Reorganised styles in order to incorporate styles from Velcro.
Now uses new uses cases added in o-colors 2.1.0