Squashed fixes for clock styles and Clock color picker