Initial conversion to "blue" colour scheme.
pre merge
pre merge to test
Merge branch 'dev' into test