Settings: Make two options. Stock color clock or Colorful clock.
Merge branch 'new_branch_name' into jellybean