AnalogClock unified

Copied over from Bob Kruger’s fork.