Fix color picker not showing / Fix 466