Colour fixes
Filename typo
Merge branch 'master' into ui-mockups
Merge branch 'ui-mockups' of https://github.com/krutkay/igem-bricklayer into ui-mockups