colors and settings and doge
Merge remote-tracking branch 'origin/master'