Update: "Fix color picker dialog, (ported from BeerGang)"