Revert "Revert "dailer to cm""

This reverts commit 18fa40812807b7acfc2f1588140bd069d9ce12a0.

Conflicts:
	default.xml