diff --git a/public/assets/js/bridge/blocks-api.js b/public/assets/js/bridge/blocks-api.js
index 4ba3c2d..1395fa8 100644
--- a/public/assets/js/bridge/blocks-api.js
+++ b/public/assets/js/bridge/blocks-api.js
@@ -15,8 +15,10 @@
 	const log = (message, color = '#1E90FF', type = 'info', force = false) => B.log(PluginName, message, color, type, force);
 	
 	const qs = new URLSearchParams(location.search);
-	B.EDITOR_MODE = (qs.get('mode') || 'templates').toUpperCase();
-	log(`START: SKRIPT-AUSFÜHRUNG GESTARTET. Editor Modus: ${B.EDITOR_MODE}.`, '#DC143C');
+	const requestedMode = (qs.get('mode') || 'templates').toLowerCase();
+	B.EDITOR_MODE = (B.EDITOR_MODE || requestedMode.toUpperCase());
+	const EDITOR_MODE = (B.EDITOR_MODE || 'TEMPLATES').toLowerCase();
+	log(`START: SKRIPT-AUSFÜHRUNG GESTARTET. Editor Modus: ${EDITOR_MODE}.`, '#DC143C');
 
 	const TARGET_CAT_ID = 'custom';
 	const PLACEHOLDER_ID = 'api-placeholder-loading';
@@ -24,9 +26,9 @@
 	
 	// --- NEUE KONSTANTEN FÜR SPEICHERN-LOGIK ---
 	// Annahme: ID der aktuellen Seite/Template ist global in B verfügbar
-	const CURRENT_ENTITY_ID = B.CURRENT_ENTITY_ID || qs.get('id') || 0; 
+	const CURRENT_ENTITY_ID = Number(B.CURRENT_ENTITY_ID || qs.get('id') || 0); 
 	// Annahme: Basis-URL der API ist in B verfügbar
-	const API_KERNEL_URL = B.API_KERNEL_URL || '/api/ApiKernel.php'; 
+	const API_KERNEL_URL = B.API_KERNEL_URL || B.API_BASE || '/api.php'; 
 	// -------------------------------------------
 
 // --------------------------------------------------------
@@ -173,20 +175,26 @@
 				// 1. Daten extrahieren
 				const htmlContent = editor.getHtml() + '<style>' + editor.getCss() + '</style>';
 				// 2. KRITISCH: Holt die JSON-Repräsentation des Editors
-				const jsonProjectData = editor.getProjectData(); 
+				const jsonProjectData = editor.getProjectData(); 
+
+				const resource = EDITOR_MODE;
+				const action = `${resource}.update`;
 
 				log('SAVE START', 'Starte Speichern des Inhalts an die API...', '#FF4500');
 
 				// 3. Daten für den POST-Request vorbereiten
 				const dataToSend = {
-					action: 'blocks.update', // Oder 'templates.update', je nach Entity
-					id: CURRENT_ENTITY_ID, 
+					action,
+					id: CURRENT_ENTITY_ID, 
 					html: htmlContent,
-					// 🚨 KRITISCH: Korrigiert auf 'json_content' für das PHP-Backend
-					json_content: jsonProjectData, 
-					name: B.CURRENT_ENTITY_NAME || 'Unbenannt', // Optional
+					// 🚨 KRITISCH: Server erwartet das Feld 'json'
+					json: jsonProjectData, 
 				};
 
+				if (B.CURRENT_ENTITY_NAME) {
+					dataToSend.name = B.CURRENT_ENTITY_NAME;
+				}
+
 				// 4. API-Aufruf (fetch)
 				fetch(API_KERNEL_URL, {
 					method: 'POST',
@@ -208,7 +216,7 @@
 						log('SAVE FAILED (API)', `Speichern fehlgeschlagen: API-Fehler: ${data.error || 'Unbekannt'}`, 'red', 'error', true);
 						alert(`Speichern fehlgeschlagen: ${data.error || 'API-Fehler'}`);
 					} else {
-						log('SAVE SUCCESS', 'Speichern erfolgreich. JSON-Daten wurden gesendet.', '#008000', 'info', true);
+						log('SAVE SUCCESS', `Speichern erfolgreich für Aktion ${action}.`, '#008000', 'info', true);
 						// 💡 HINZUGEFÜGT: Bestätigung an das Elternfenster senden
 						window.parent.postMessage({ source: 'editor', type: 'save:success' }, '*');
 						editor.refresh(); // Optional: Editor-Ansicht aktualisieren
diff --git a/public/editor/bridge-core.js b/public/editor/bridge-core.js
index bc98490..c93b20d 100644
--- a/public/editor/bridge-core.js
+++ b/public/editor/bridge-core.js
@@ -43,12 +43,12 @@
     window.__bridgeCoreInitialized = true;
     
     // --- Initialisierung BridgeParts (B) und Plugin-Registry ---
-    B.BASE_PATH_BRIDGE = '../assets/js/bridge/';
-    B.BASE_PATH_CONFIG = B.BASE_PATH_BRIDGE; 
-    // NEU: Standard-API-Endpunkt für Fallbacks, falls category-config.js ihn nicht setzt.
-    // **KORREKTUR**: Auf '/api/editor' FIX eingestellt.
-    B.API_BASE = '/api/editor'; // <<< FIX AUF /api/editor
-    B.STORAGE_URL_BASE = '/api/editor'; // <<< FIX: Erzwingt, dass auch der Storage Manager diesen Pfad verwendet
+    B.BASE_PATH_BRIDGE = '../assets/js/bridge/';
+    B.BASE_PATH_CONFIG = B.BASE_PATH_BRIDGE; 
+    const apiFallback = '/api.php';
+    B.API_BASE = B.API_BASE || apiFallback;
+    B.STORAGE_URL_BASE = B.STORAGE_URL_BASE || B.API_BASE;
+    B.API_KERNEL_URL = B.API_KERNEL_URL || B.API_BASE;
     
     B.GrapesJSPlugins = []; 
     
@@ -377,9 +377,10 @@
             },
         };
 
-        var ed = grapesjs.init({
-            container: '#gjs',
-            height: '100vh',
+        var ed = grapesjs.init({
+            container: '#gjs',
+            height: '100vh',
+            noticeOnUnload: 0,
             
             // 🛑 KRITISCHE KORREKTUR: storageManager aktivieren und konfigurieren
             storageManager: storageConf,
diff --git a/public/editor/editor-core.php b/public/editor/editor-core.php
index 18b011d..daaa0b5 100644
--- a/public/editor/editor-core.php
+++ b/public/editor/editor-core.php
@@ -1,5 +1,6 @@
 <?php
 $mode = strtolower($_GET['mode'] ?? 'templates');
+$id   = (int)($_GET['id'] ?? 0);
 $ts   = time();
 ?><!doctype html>
 <html lang="de">
@@ -23,6 +24,14 @@ $ts   = time();
   <div id="blocks"></div>
 
   <script>
+  window.__editorMode = "<?=htmlspecialchars($mode, ENT_QUOTES)?>";
+  window.__editorId = <?= $id ?>;
+  window.BridgeParts = window.BridgeParts || {};
+  window.BridgeParts.CURRENT_ENTITY_ID = window.BridgeParts.CURRENT_ENTITY_ID || <?= $id ?>;
+  window.BridgeParts.API_KERNEL_URL = window.BridgeParts.API_KERNEL_URL || '/api.php';
+  window.BridgeParts.API_BASE = window.BridgeParts.API_BASE || window.BridgeParts.API_KERNEL_URL;
+  window.BridgeParts.STORAGE_URL_BASE = window.BridgeParts.STORAGE_URL_BASE || window.BridgeParts.API_BASE;
+
   function logToParent(type, detail){ try{ parent.postMessage({source:'editor-core',type:type,detail:String(detail||'')},'*'); }catch(e){} }
   window.addEventListener('error', function(e){
     var b=document.getElementById('badge');
@@ -68,8 +77,6 @@ $ts   = time();
                 // Heartbeat vom Core (sichtbar im Hauptfenster)
                 var hb=0, timer=setInterval(function(){ hb++; if(hb>60){clearInterval(timer);return;} logToParent('hb','tick '+hb); }, 200);
 
-                // Mode für die Bridge bereitstellen
-                window.__editorMode = "<?=htmlspecialchars($mode,ENT_QUOTES)?>";
             });
         });
     });