update with defs from cm.mk