diff --git a/src/app/generation/model/class-generation.service.ts b/src/app/generation/model/class-generation.service.ts
index 0bea83d..1a24ce4 100644
--- a/src/app/generation/model/class-generation.service.ts
+++ b/src/app/generation/model/class-generation.service.ts
@@ -98,7 +98,7 @@ export class ClassGenerationService {
     model: EPackageJson): string {
     const imports = new Set<string>();
     //basic import: eClass and attribuets and reference decorators if needed from emfular:
-    imports.add(`import { eClass${cls.references.length>0? ', reference': ''}${cls.attributes.length>0? ', attribute': ''} } from 'emfular'`)
+    imports.add(`import { eClass${cls.references.length>0? ', reference': ''}${cls.attributes.length>0? ', attribute': ''} } from 'emfular-core'`)
 
     // interface supertypes (type-only)
     interfaces.forEach(i =>
@@ -112,7 +112,7 @@ export class ClassGenerationService {
     });
     //modelList if needed (type-only)
     if (cls.references.some(r => r.upperBound !== 1)) {
-      imports.add(`import type { ModelList } from 'emfular';`);
+      imports.add(`import type { ModelList } from 'emfular-core';`);
     }
     // meta:
     imports.add(`import { ${model.name}Meta${cls.references.length> 0?`, ${cls.name}Refs`:'' }${usedEnums.size>0?", "+Array.from(usedEnums).join(", "):''} } from './_meta_';`)
@@ -120,7 +120,7 @@ export class ClassGenerationService {
     if (realParent) {
       imports.add(`import { ${realParent} } from './${realParent}';`);
     } else {
-      imports.add(`import { Referencable } from 'emfular';`);
+      imports.add(`import { Referencable } from 'emfular-core';`);
     }
 
     return Array.from(imports).join('\n');
diff --git a/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts b/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts
index c6f6a51..c2e4466 100644
--- a/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts
+++ b/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts
@@ -1,17 +1,17 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PackageSelectionDialog } from './package-selection-dialog';
+import {PackageSelectionDialogComponent} from './package-selection-dialog';
 
 describe('PackageSelectionDialog', () => {
-  let component: PackageSelectionDialog;
-  let fixture: ComponentFixture<PackageSelectionDialog>;
+  let component: PackageSelectionDialogComponent;
+  let fixture: ComponentFixture<PackageSelectionDialogComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [PackageSelectionDialog],
+      imports: [PackageSelectionDialogComponent],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(PackageSelectionDialog);
+    fixture = TestBed.createComponent(PackageSelectionDialogComponent);
     component = fixture.componentInstance;
     await fixture.whenStable();
   });
diff --git a/src/assets/templates/angular/package.json.template.json b/src/assets/templates/angular/package.json.template.json
index 992dd39..131b5c8 100644
--- a/src/assets/templates/angular/package.json.template.json
+++ b/src/assets/templates/angular/package.json.template.json
@@ -18,10 +18,10 @@
     "@angular/platform-browser-dynamic": "^19.2.0",
     "@angular/router": "^19.2.0",
 
-    "emfular": "%%emfularVersion%%",
-    "ngx-emfular-helper": "^1.0.0",
-    "ngx-emfular-integration": "^0.4.1",
-    "ngx-svg-graphics": "^3.0.0",
+    "emfular-core": "^1.3.0",
+    "ngx-emfular-diagram": "^2.0.2",
+    "ngx-emfular-tool": "^1.1.1",
+    "ngx-emfular-integration": "^2.0.0",
 
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
diff --git a/src/assets/templates/model/editor/editor.component.html b/src/assets/templates/model/editor/editor.component.html
index b475eec..eb00e3d 100644
--- a/src/assets/templates/model/editor/editor.component.html
+++ b/src/assets/templates/model/editor/editor.component.html
@@ -4,14 +4,14 @@
   [modelService]="modelService"
 >
   <!-- Default sidebar -->
-  <emfular-model-editing-bar
+  <emfular-model-specific-palette
     sidebar
     [buttons]="sidebarButtons">
-  </emfular-model-editing-bar>
+  </emfular-model-specific-palette>
 
   <!-- Default canvas content, needs svg namespace just like components -->
   <svg:g canvas>
-    <g referencable-box
+    <g emfular-tree-model-element
        [referencable]="modelService.model"
        [position]="initialBBox"
        (chooseElement)="choose($event)">
diff --git a/src/assets/templates/model/editor/editor.component.ts.template.ts b/src/assets/templates/model/editor/editor.component.ts.template.ts
index 7c875da..de8ea58 100644
--- a/src/assets/templates/model/editor/editor.component.ts.template.ts
+++ b/src/assets/templates/model/editor/editor.component.ts.template.ts
@@ -1,13 +1,13 @@
 import {Component} from '@angular/core';
 import {
-  TreeModelDetailsService,
-  EditButtonDef,
-  ModelEditingBarComponent,
+  ActionButtonDef,
   BasicEditorComponent,
-  ReferencableBoxComponent
+  GraphicalTreeDetailsService,
+  ModelSpecificPaletteComponent,
+  TreeModelElementComponent
 } from "ngx-emfular-integration";
-import { BoundingBox } from 'ngx-svg-graphics';
-import { Referencable} from "emfular";
+import { BoundingBox } from "ngx-emfular-diagram";
+import { Referencable} from "emfular-core";
 
 import { %%modelName%%Service } from "../edit/%%modelName%%.service";
 import { %%root%% } from "../core/%%root%%";
@@ -15,22 +15,22 @@ import { %%root%% } from "../core/%%root%%";
 @Component({
   selector: '%%modelName%%-editor',
   imports: [
-    ModelEditingBarComponent,
+    ModelSpecificPaletteComponent,
     BasicEditorComponent,
-    ReferencableBoxComponent
+    TreeModelElementComponent
   ],
   templateUrl: './%%modelName%%-editor.component.html',
   styleUrl: './%%modelName%%-editor.component.css'
 })
 export class %%modelName%%EditorComponent{
 
-  svgwidth = 1500;
-  svgheigth = 1000;
-  initialBBox : BoundingBox = {x: this.svgwidth/2, y: 20, w: 200, h: 25}
-  sidebarButtons: Array<EditButtonDef> | null = null;
+  svgwidth = 750;
+  svgheigth = 500;
+  initialBBox : BoundingBox = {x: this.svgwidth/2-100, y: 20, w: 200, h: 50}
+  sidebarButtons: ActionButtonDef[] = [];
 
   constructor(
-    public treeDetailsService: TreeModelDetailsService<%%root%%>,
+    public treeDetailsService: GraphicalTreeDetailsService<%%root%%>,
     public modelService: %%modelName%%Service,
   ) {
     this.sidebarButtons = [
diff --git a/src/assets/templates/model/services/model-history.service.ts.template.ts b/src/assets/templates/model/services/model-history.service.ts.template.ts
index 177e27b..203d371 100644
--- a/src/assets/templates/model/services/model-history.service.ts.template.ts
+++ b/src/assets/templates/model/services/model-history.service.ts.template.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
-import { HistoryService } from 'ngx-emfular-helper';
-import { JsonOf } from 'emfular';
+import { HistoryService } from 'ngx-emfular-tool';
+import { JsonOf } from 'emfular-core';
 import { %%root%% } from '../core/%%root%%';
 
 @Injectable({
diff --git a/src/assets/templates/model/services/model.service.ts.template.ts b/src/assets/templates/model/services/model.service.ts.template.ts
index ec77861..d7167e9 100644
--- a/src/assets/templates/model/services/model.service.ts.template.ts
+++ b/src/assets/templates/model/services/model.service.ts.template.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ModelService } from 'ngx-emfular-integration';
-import { IoService } from 'ngx-emfular-helper';
+import { IoService } from 'ngx-emfular-tool';
 
 import { %%modelName%%HistoryService } from './%%modelName%%-history.service';
 %%ALL_REAL_CLASSES_IMPORTS%%
diff --git a/src/assets/templates/model/v10/meta/model-meta.ts.template.ts b/src/assets/templates/model/v10/meta/model-meta.ts.template.ts
index a6c1d21..9bd6a62 100644
--- a/src/assets/templates/model/v10/meta/model-meta.ts.template.ts
+++ b/src/assets/templates/model/v10/meta/model-meta.ts.template.ts
@@ -1,4 +1,4 @@
-import { ModelDefinition, ReferenceMeta } from "emfular";
+import { ModelDefinition, ReferenceMeta } from "emfular-core";
 
 %%TYPES%%
 %%ENUMS%%