NXP-15375: Increase contrast of colors, misc fix