Merge "Refactor Clock theme handling" into main