Final fix for for clock styles and Clock color picker