Remove color options for clock and overscoll

Also some code updates from Omni