update colors; change layout components a bit
Merge branch 'master' of github.com:donahut/mm-twist