diff --git a/package-lock.json b/package-lock.json
index 32e53f9..e74c2bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,15 +143,14 @@
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "21.0.0",
-      "license": "MPL-2.0",
+      "version": "20.0.1",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "21.1.0",
-        "@angular/core": "21.1.0",
-        "ol": "^8.2.0"
+        "@angular/common": ">=19.0.0 <=20.x.x",
+        "@angular/core": ">=19.0.0 <=20.x.x",
+        "ol": "~10.7.0"
       }
     },
     "node_modules/@algolia/abtesting": {
diff --git a/projects/common-map/package-lock.json b/projects/common-map/package-lock.json
index e949609..9016a11 100644
--- a/projects/common-map/package-lock.json
+++ b/projects/common-map/package-lock.json
@@ -8,11 +8,12 @@
       "name": "@farmmaps/common-map",
       "version": "2.0.0",
       "dependencies": {
-        "@farmmaps/ng-openlayers": "file:../ng-openlayers",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "@angular/core": "21.1.0",
+        "@farmmaps/common": "file:../../dist/common",
+        "@farmmaps/ng-openlayers": "file:../../dist/ng-openlayers",
         "@ngrx/effects": "21.0.1",
         "@ngrx/router-store": "21.0.1",
         "@ngrx/store": "21.0.1",
@@ -21,9 +22,41 @@
         "tassign": "^1.0.0"
       }
     },
+    "../../../../dist/common": {
+      "extraneous": true
+    },
+    "../../../../dist/ng-openlayers": {
+      "extraneous": true
+    },
     "../../../dist/ng-openlayers": {
       "extraneous": true
     },
+    "../../dist/common": {
+      "name": "@farmmaps/common",
+      "version": "21.1.0",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "21.1.0",
+        "@angular/core": "21.1.0",
+        "@angular/forms": "21.1.0",
+        "@microsoft/signalr": "10.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^20.0.0",
+        "@ngrx/effects": "21.0.1",
+        "@ngrx/router-store": "21.0.1",
+        "@ngrx/store": "21.0.1",
+        "angular-oauth2-oidc": "20.0.2",
+        "bootstrap": "^5.3.3",
+        "moment": "^2.29.4",
+        "ngx-avatars": "1.10.1",
+        "ngx-clipboard": "^16.0.0",
+        "ngx-image-cropper": "9.1.6",
+        "ngx-uploadx": "7.0.1",
+        "tassign": "^1.0.0"
+      }
+    },
     "../../dist/libs/ng-openlayers": {
       "version": "18.0.0",
       "extraneous": true,
@@ -40,7 +73,7 @@
     "../../dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
       "version": "20.0.1",
-      "extraneous": true,
+      "peer": true,
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -53,12 +86,16 @@
     "../ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
       "version": "20.0.1",
+      "extraneous": true,
       "peerDependencies": {
         "@angular/common": ">=19.0.0 <=20.x.x",
         "@angular/core": ">=19.0.0 <=20.x.x",
         "ol": "~10.7.0"
       }
     },
+    "dist/common": {
+      "extraneous": true
+    },
     "dist/ng-openlayers": {
       "extraneous": true
     },
@@ -147,8 +184,12 @@
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
+    "node_modules/@farmmaps/common": {
+      "resolved": "../../dist/common",
+      "link": true
+    },
     "node_modules/@farmmaps/ng-openlayers": {
-      "resolved": "../ng-openlayers",
+      "resolved": "../../dist/ng-openlayers",
       "link": true
     },
     "node_modules/@ngrx/effects": {
diff --git a/projects/common-map/package.json b/projects/common-map/package.json
index d99f969..774cf12 100644
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -5,11 +5,12 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "dependencies": {
-    "tslib": "^2.0.0",
-    "@farmmaps/ng-openlayers": "file:../ng-openlayers"
+    "tslib": "^2.0.0"
   },
   "peerDependencies": {
     "@angular/core": "21.1.0",
+    "@farmmaps/common": "file:../../dist/common",
+    "@farmmaps/ng-openlayers": "file:../../dist/ng-openlayers",
     "ngrx-store-localstorage": "20.1.0",
     "@ngrx/effects": "21.0.1",
     "@ngrx/router-store": "21.0.1",
diff --git a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
index 3d40993..5455763 100644
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -21,13 +21,13 @@ import { Geometry } from 'ol/geom';
 import BaseLayer from 'ol/layer/Base';
 import Feature from 'ol/Feature';
 
-@Component({
-    selector: 'fm-map-item-layers',
-    template: `<ng-content></ng-content>`,
-    providers: [
-        { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
-    ],
-    standalone: false
+@Component({
+    selector: 'fm-map-item-layers',
+    template: `<ng-content></ng-content>`,
+    providers: [
+        { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
+    ],
+    standalone: false
 })
 
 export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {