added missing extId and missing colour assignments
fixed merge clash