Layout updates, fixing colornames
Merge branch 'master' of https://github.com/Redraven/sggn-simplex