fix color-scheme
Merge remote-tracking branch 'origin/VS-41' into VS-41

Conflicts:
	colors.json
editable color-schemes