Togari: Omni-fy

Conflicts:
	cm.mk