colors etc
Merge branches 'local' and 'master'