CM Deskclock and Calculator

Fix compile for now until we can get Inverted toggle merged in