Separated colours and matrix into separate namespaces.