[110216] Colors and behaviour fixes