fix color picker
Merge remote-tracking branch 'origin/aiko'