zwischenstand
update colors
Merged 'dev'.