made colon optional for build, removed at sign for di/devinf