#397 partially fixed (color picker has still some issues)