CM Deskclock and Calculator

For now, to fix compile