Simplify Android build: use default command for APK and AAB

tauri android build creates both APK and AAB by default.
Fix Android build commands: use --apk and --aab flags
2025-12-18 15:00:52 +01:00 · 2025-11-01 16:44:32 +01:00 · 2025-11-01 16:34:15 +01:00 · 2025-11-01 16:06:35 +01:00 · 2025-11-01 16:03:46 +01:00 · 2025-11-01 15:39:44 +01:00
114 changed files with 4664 additions and 14476 deletions
--- a/.claude-session.json
+++ b/.claude-session.json
@ -1,227 +0,0 @@
-{
-  "session_date": "2025-10-20",
-  "project": "haex-hub System Windows Architecture + Drizzle CRDT RETURNING Fix + PK-Remapping Refactor",
-  "status": "system_windows_ui_integration_completed",
-
-  "context": {
-    "main_work_today": [
-      "Fixed Drizzle CRDT integration with RETURNING support",
-      "Implemented System Windows architecture (Settings, Marketplace as Desktop Windows)",
-      "Refactored executor functions: Split execute/query paths for cleaner code",
-      "Integrated System Windows UI: Launcher, Window Component, Placeholder Components"
-    ],
-    "completed_today": [
-      "Added AST-based statement_has_returning() for safe RETURNING detection",
-      "Created SqlExecutor::query_internal() for INSERT/UPDATE/DELETE with RETURNING",
-      "Simplified execute_internal to use execute_internal_typed (now with PK-Remapping!)",
-      "Added sql_query_with_crdt Tauri command",
-      "Updated drizzleCallback in index.ts to route correctly",
-      "Extended IWindow interface: type ('system' | 'extension'), sourceId",
-      "Added SystemWindowDefinition interface",
-      "Created system windows registry in windowManager store",
-      "Extended openWindow() to support both system and extension windows",
-      "Added singleton support for system windows",
-      "Split execute_internal_typed_with_context into two functions (execute vs query)",
-      "Created query_internal_typed_with_context with full PK-Remapping support",
-      "Updated query_internal to use new typed function with PK-Remapping",
-      "Fixed manager.rs to use query_internal_typed_with_context for INSERT RETURNING",
-      "Extended Launcher to show System Windows + Extensions alphabetically",
-      "Adapted Window Component to render System Windows as Vue Components, Extensions as iFrames",
-      "Created placeholder components: Settings.vue and Marketplace.vue"
-    ],
-    "tech_stack": "Vue 3, TypeScript, Pinia, Nuxt UI, Tauri, Rust, Drizzle ORM, SQLite"
-  },
-
-  "drizzle_crdt_implementation": {
-    "problem": "Drizzle .insert().returning() executed SQL twice and lost RETURNING data",
-    "solution": "Separate execute and query paths based on RETURNING clause",
-
-    "typescript_side": {
-      "file": "src/stores/vault/index.ts",
-      "drizzleCallback_logic": {
-        "select": "sql_select (unchanged)",
-        "with_returning": "sql_query_with_crdt (NEW)",
-        "without_returning": "sql_execute_with_crdt (unchanged)"
-      },
-      "hasReturning_check": "String-based RETURNING regex (safe enough for generated SQL)"
-    },
-
-    "rust_side": {
-      "files": [
-        "src-tauri/src/database/core.rs",
-        "src-tauri/src/extension/database/executor.rs",
-        "src-tauri/src/database/mod.rs"
-      ],
-      "core_rs_changes": {
-        "statement_has_returning": {
-          "line": 84,
-          "purpose": "AST-based RETURNING check (INSERT, UPDATE, DELETE)",
-          "safety": "Checks actual AST, not string matching"
-        },
-        "convert_value_ref_to_json": {
-          "line": 333,
-          "visibility": "Made public for reuse"
-        },
-        "removed": "query_with_crdt function (replaced by SqlExecutor::query_internal)"
-      },
-      "executor_rs_changes": {
-        "execute_internal_typed_with_context": {
-          "line": 100,
-          "purpose": "Execute SQL WITHOUT RETURNING (with CRDT and FK-Remapping)",
-          "returns": "Result<HashSet<String>, DatabaseError>",
-          "behavior": "Handles INSERTs with FK-Remapping, uses execute()"
-        },
-        "query_internal_typed_with_context": {
-          "line": 186,
-          "purpose": "Execute SQL WITH RETURNING (with CRDT, PK-Remapping, FK-Remapping)",
-          "returns": "Result<(HashSet<String>, Vec<Vec<JsonValue>>), DatabaseError>",
-          "behavior": "Handles INSERTs with full PK-Remapping + FK-Remapping, returns all RETURNING columns"
-        },
-        "query_internal": {
-          "line": 454,
-          "purpose": "Execute with CRDT + return full RETURNING results (JsonValue params)",
-          "behavior": "Wrapper around query_internal_typed_with_context"
-        },
-        "execute_internal_refactor": {
-          "line": 345,
-          "change": "Now wrapper around execute_internal_typed",
-          "benefit": "Drizzle now gets PK-Remapping for ON CONFLICT!"
-        }
-      },
-      "mod_rs_changes": {
-        "sql_query_with_crdt": {
-          "line": 59,
-          "calls": "SqlExecutor::query_internal",
-          "returns": "Vec<Vec<JsonValue>>"
-        }
-      },
-      "lib_rs_changes": {
-        "registered_command": "sql_query_with_crdt added to invoke_handler"
-      }
-    },
-
-    "benefits": [
-      "SQL executed only once (not twice)",
-      "Full RETURNING results available to Drizzle",
-      "PK-Remapping now works for Drizzle (both execute and query paths)",
-      "AST-based RETURNING detection (safe)",
-      "Less code duplication",
-      "Cleaner code separation: execute vs query functions",
-      "FK-Remapping works across transactions with PkRemappingContext"
-    ]
-  },
-
-  "system_windows_architecture": {
-    "concept": "ALL UI (Settings, Marketplace, etc.) as DesktopWindows, same as Extensions",
-    "status": "Store completed, UI integration pending",
-
-    "window_manager_store": {
-      "file": "src/stores/desktop/windowManager.ts",
-      "changes": {
-        "IWindow_interface": {
-          "added_fields": [
-            "type: 'system' | 'extension'",
-            "sourceId: string (replaces extensionId)"
-          ],
-          "removed_fields": ["extensionId"]
-        },
-        "SystemWindowDefinition": {
-          "fields": "id, name, icon, component, defaultWidth, defaultHeight, resizable, singleton"
-        },
-        "system_windows_registry": {
-          "line": 46,
-          "entries": ["settings", "marketplace"],
-          "structure": "Record<string, SystemWindowDefinition>"
-        },
-        "openWindow_function": {
-          "line": 101,
-          "signature": "(type, sourceId, title?, icon?, width?, height?, sourcePosition?)",
-          "features": [
-            "Type-based handling (system vs extension)",
-            "Singleton check for system windows",
-            "Auto-loads defaults from registry",
-            "Activates existing singleton if already open"
-          ]
-        },
-        "new_exports": ["getAllSystemWindows", "getSystemWindow"]
-      }
-    },
-
-    "ui_integration": {
-      "launcher": {
-        "file": "src/components/haex/extension/launcher.vue",
-        "changes": [
-          "Combined system windows and extensions in unified launcherItems computed",
-          "Alphabetically sorted by name",
-          "openItem() function handles both types with correct openWindow() signature",
-          "Uses windowManagerStore.getAllSystemWindows()"
-        ]
-      },
-      "desktop_window_component": {
-        "file": "src/components/haex/desktop/index.vue",
-        "changes": [
-          "Dynamic component rendering: <component :is='getSystemWindowComponent()'> for system windows",
-          "HaexDesktopExtensionFrame for extensions (iFrame)",
-          "getSystemWindowComponent() function to retrieve Vue component from registry",
-          "Applied to both normal mode and overview mode"
-        ]
-      },
-      "placeholder_components": {
-        "created": [
-          "src/components/haex/system/settings.vue",
-          "src/components/haex/system/marketplace.vue"
-        ],
-        "description": "Simple placeholder UI with sections and styling"
-      }
-    },
-
-    "next_steps": {
-      "priority": [
-        "Desktop Icons: Support system window icons (alongside extension icons)",
-        "Drag & Drop: Launcher → Desktop for all types (system + extension)"
-      ]
-    }
-  },
-
-  "workspace_overview_context": {
-    "still_active": "GNOME-style workspace overview with UDrawer, implemented yesterday",
-    "file": "src/components/haex/desktop/index.vue",
-    "status": "Working, workspace switching functional"
-  },
-
-  "file_changes_today": {
-    "modified": [
-      "src/stores/vault/index.ts (drizzleCallback with hasReturning)",
-      "src-tauri/src/database/core.rs (statement_has_returning, removed query_with_crdt)",
-      "src-tauri/src/extension/database/executor.rs (split execute/query functions, PK-Remapping)",
-      "src-tauri/src/database/mod.rs (sql_query_with_crdt command)",
-      "src-tauri/src/lib.rs (registered sql_query_with_crdt)",
-      "src/stores/desktop/windowManager.ts (system windows support)",
-      "src-tauri/src/extension/core/manager.rs (updated to use query_internal_typed_with_context)",
-      "src/components/haex/extension/launcher.vue (unified launcher for system + extensions)",
-      "src/components/haex/desktop/index.vue (dynamic component rendering)"
-    ],
-    "created": [
-      "src/components/haex/system/settings.vue",
-      "src/components/haex/system/marketplace.vue"
-    ],
-    "deleted": []
-  },
-
-  "important_notes": [
-    "Drizzle RETURNING now fully functional with CRDT",
-    "System windows use Vue components, Extensions use iFrame",
-    "sourceId is generic: extensionId for extensions, systemWindowId for system windows",
-    "Singleton system windows auto-activate if already open",
-    "PK-Remapping now works for both execute and query paths",
-    "executor.rs: Two separate functions for execute (no RETURNING) vs query (with RETURNING)",
-    "query_internal_typed_with_context returns full RETURNING results as Vec<Vec<JsonValue>>",
-    "FK-Remapping works across transaction using PkRemappingContext",
-    "Next session: Implement Launcher UI integration for system windows"
-  ],
-
-  "todos_remaining": [
-    "Desktop Icons für System Windows unterstützen (neben Extension Icons)",
-    "Drag & Drop vom Launcher zum Desktop implementieren (für beide Typen)"
-  ]
-}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,228 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+    tags-ignore:
+      - '**'
+  pull_request:
+    branches:
+      - main
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-desktop:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest'
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest'
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Install dependencies (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Tauri app
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: ${{ matrix.args }}
+
+      - name: Upload artifacts (macOS)
+        if: matrix.platform == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ contains(matrix.args, 'aarch64') && 'aarch64' || 'x86_64' }}
+          path: |
+            src-tauri/target/*/release/bundle/dmg/*.dmg
+            src-tauri/target/*/release/bundle/macos/*.app
+
+      - name: Upload artifacts (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux
+          path: |
+            src-tauri/target/release/bundle/deb/*.deb
+            src-tauri/target/release/bundle/appimage/*.AppImage
+            src-tauri/target/release/bundle/rpm/*.rpm
+
+      - name: Upload artifacts (Windows)
+        if: matrix.platform == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows
+          path: |
+            src-tauri/target/release/bundle/msi/*.msi
+            src-tauri/target/release/bundle/nsis/*.exe
+
+  build-android:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Rust Android targets
+        run: |
+          rustup target add aarch64-linux-android
+          rustup target add armv7-linux-androideabi
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - name: Setup NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r26d
+        id: setup-ndk
+
+      - name: Setup Android NDK environment for OpenSSL
+        run: |
+          echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+          echo "NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+
+          # Add all Android toolchains to PATH for OpenSSL cross-compilation
+          echo "${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
+
+          # Set CC, AR, RANLIB for each target
+          echo "CC_aarch64_linux_android=aarch64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_aarch64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_aarch64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_armv7_linux_androideabi=armv7a-linux-androideabi24-clang" >> $GITHUB_ENV
+          echo "AR_armv7_linux_androideabi=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_armv7_linux_androideabi=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_i686_linux_android=i686-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_i686_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_i686_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_x86_64_linux_android=x86_64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_x86_64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_x86_64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+      - name: Install build dependencies for OpenSSL
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y perl make
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Setup Keystore (if secrets available)
+        env:
+          ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+          ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
+        run: |
+          if [ -n "$ANDROID_KEYSTORE" ]; then
+            echo "$ANDROID_KEYSTORE" | base64 -d > $HOME/keystore.jks
+            echo "ANDROID_KEYSTORE_PATH=$HOME/keystore.jks" >> $GITHUB_ENV
+            echo "ANDROID_KEYSTORE_PASSWORD=$ANDROID_KEYSTORE_PASSWORD" >> $GITHUB_ENV
+            echo "ANDROID_KEY_ALIAS=$ANDROID_KEY_ALIAS" >> $GITHUB_ENV
+            echo "ANDROID_KEY_PASSWORD=$ANDROID_KEY_PASSWORD" >> $GITHUB_ENV
+            echo "Keystore configured for signing"
+          else
+            echo "No keystore configured, building unsigned APK"
+          fi
+
+      - name: Build Android APK and AAB (unsigned if no keystore)
+        run: pnpm tauri android build
+
+      - name: Upload Android artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: android
+          path: |
+            src-tauri/gen/android/app/build/outputs/apk/**/*.apk
+            src-tauri/gen/android/app/build/outputs/bundle/**/*.aab
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,247 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  create-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    outputs:
+      release_id: ${{ steps.create-release.outputs.result }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Get version
+        run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+
+      - name: Create release
+        id: create-release
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data } = await github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag_name: `v${process.env.PACKAGE_VERSION}`,
+              name: `haex-hub v${process.env.PACKAGE_VERSION}`,
+              body: 'Take a look at the assets to download and install this app.',
+              draft: true,
+              prerelease: false
+            })
+            return data.id
+
+  build-desktop:
+    needs: create-release
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest'
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest'
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Install dependencies (Ubuntu)
+        if: matrix.platform == 'ubuntu-22.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build and release Tauri app
+        uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          releaseId: ${{ needs.create-release.outputs.release_id }}
+          args: ${{ matrix.args }}
+
+  build-android:
+    needs: create-release
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Rust Android targets
+        run: |
+          rustup target add aarch64-linux-android
+          rustup target add armv7-linux-androideabi
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - name: Setup NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r26d
+        id: setup-ndk
+
+      - name: Setup Android NDK environment for OpenSSL
+        run: |
+          echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+          echo "NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
+
+          # Add all Android toolchains to PATH for OpenSSL cross-compilation
+          echo "${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin" >> $GITHUB_PATH
+
+          # Set CC, AR, RANLIB for each target
+          echo "CC_aarch64_linux_android=aarch64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_aarch64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_aarch64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_armv7_linux_androideabi=armv7a-linux-androideabi24-clang" >> $GITHUB_ENV
+          echo "AR_armv7_linux_androideabi=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_armv7_linux_androideabi=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_i686_linux_android=i686-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_i686_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_i686_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+          echo "CC_x86_64_linux_android=x86_64-linux-android24-clang" >> $GITHUB_ENV
+          echo "AR_x86_64_linux_android=llvm-ar" >> $GITHUB_ENV
+          echo "RANLIB_x86_64_linux_android=llvm-ranlib" >> $GITHUB_ENV
+
+      - name: Install build dependencies for OpenSSL
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y perl make
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Setup Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: src-tauri
+
+      - name: Install frontend dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Setup Keystore (required for release)
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 -d > $HOME/keystore.jks
+          echo "ANDROID_KEYSTORE_PATH=$HOME/keystore.jks" >> $GITHUB_ENV
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> $GITHUB_ENV
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> $GITHUB_ENV
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> $GITHUB_ENV
+
+      - name: Build Android APK and AAB (signed)
+        run: pnpm tauri android build
+
+      - name: Upload to Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            src-tauri/gen/android/app/build/outputs/apk/**/*.apk
+            src-tauri/gen/android/app/build/outputs/bundle/**/*.aab
+          draft: true
+
+  publish-release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
+    needs: [create-release, build-desktop, build-android]
+
+    steps:
+      - name: Publish release
+        id: publish-release
+        uses: actions/github-script@v7
+        env:
+          release_id: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            github.rest.repos.updateRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              release_id: process.env.release_id,
+              draft: false,
+              prerelease: false
+            })
--- a/.gitignore
+++ b/.gitignore
@ -26,4 +26,6 @@ dist-ssr
 src-tauri/target
 nogit*
 .claude
-.output
+.output
+target
+CLAUDE.md
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@ -16,6 +16,9 @@ export default defineNuxtConfig({
  },

  app: {
+    head: {
+      viewport: 'width=device-width, initial-scale=1.0, viewport-fit=cover',
+    },
    pageTransition: {
      name: 'fade',
    },
@ -108,8 +111,7 @@ export default defineNuxtConfig({
  runtimeConfig: {
    public: {
      haexVault: {
-        lastVaultFileName: 'lastVaults.json',
-        instanceFileName: 'instance.json',
+        deviceFileName: 'device.json',
        defaultVaultName: 'HaexHub',
      },
    },
--- a/package.json
+++ b/package.json
@ -21,45 +21,46 @@
    "@nuxt/eslint": "1.9.0",
    "@nuxt/fonts": "0.11.4",
    "@nuxt/icon": "2.0.0",
-    "@nuxt/ui": "4.0.0",
+    "@nuxt/ui": "4.1.0",
    "@nuxtjs/i18n": "10.0.6",
    "@pinia/nuxt": "^0.11.2",
-    "@tailwindcss/vite": "^4.1.15",
+    "@tailwindcss/vite": "^4.1.16",
    "@tauri-apps/api": "^2.9.0",
-    "@tauri-apps/plugin-dialog": "^2.4.0",
-    "@tauri-apps/plugin-fs": "^2.4.2",
+    "@tauri-apps/plugin-dialog": "^2.4.2",
+    "@tauri-apps/plugin-fs": "^2.4.4",
    "@tauri-apps/plugin-http": "2.5.2",
    "@tauri-apps/plugin-notification": "2.3.1",
-    "@tauri-apps/plugin-opener": "^2.5.0",
-    "@tauri-apps/plugin-os": "^2.3.1",
+    "@tauri-apps/plugin-opener": "^2.5.2",
+    "@tauri-apps/plugin-os": "^2.3.2",
    "@tauri-apps/plugin-sql": "2.3.0",
-    "@tauri-apps/plugin-store": "^2.4.0",
+    "@tauri-apps/plugin-store": "^2.4.1",
    "@vueuse/components": "^13.9.0",
    "@vueuse/core": "^13.9.0",
    "@vueuse/gesture": "^2.0.0",
    "@vueuse/nuxt": "^13.9.0",
-    "drizzle-orm": "^0.44.6",
+    "drizzle-orm": "^0.44.7",
    "eslint": "^9.38.0",
    "fuse.js": "^7.1.0",
-    "nuxt": "^4.1.3",
    "nuxt-zod-i18n": "^1.12.1",
    "swiper": "^12.0.3",
-    "tailwindcss": "^4.1.15",
+    "tailwindcss": "^4.1.16",
    "vue": "^3.5.22",
    "vue-router": "^4.6.3",
    "zod": "^3.25.76"
  },
  "devDependencies": {
    "@iconify-json/hugeicons": "^1.2.17",
-    "@iconify/json": "^2.2.398",
+    "@iconify-json/lucide": "^1.2.71",
+    "@iconify/json": "^2.2.401",
    "@iconify/tailwind4": "^1.0.6",
    "@libsql/client": "^0.15.15",
-    "@tauri-apps/cli": "^2.9.0",
+    "@tauri-apps/cli": "^2.9.1",
    "@types/node": "^24.9.1",
    "@vitejs/plugin-vue": "6.0.1",
    "@vue/compiler-sfc": "^3.5.22",
    "drizzle-kit": "^0.31.5",
    "globals": "^16.4.0",
+    "nuxt": "^4.2.0",
    "prettier": "3.6.2",
    "tsx": "^4.20.6",
    "tw-animate-css": "^1.4.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -1715,6 +1715,7 @@ dependencies = [
 "tauri-plugin-persisted-scope",
 "tauri-plugin-store",
 "thiserror 2.0.17",
+ "trash",
 "ts-rs",
 "uhlc",
 "url",
@ -4399,9 +4400,9 @@ dependencies = [

 [[package]]
 name = "tao"
-version = "0.34.3"
+version = "0.34.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
+checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7"
 dependencies = [
 "bitflags 2.9.0",
 "block2 0.6.0",
@ -4431,7 +4432,7 @@ dependencies = [
 "tao-macros",
 "unicode-segmentation",
 "url",
- "windows",
+ "windows 0.61.1",
 "windows-core 0.61.0",
 "windows-version",
 "x11-dl",
@ -4456,9 +4457,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "tauri"
-version = "2.8.5"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d1d3b3dc4c101ac989fd7db77e045cc6d91a25349cd410455cb5c57d510c1c"
+checksum = "c9871670c6711f50fddd4e20350be6b9dd6e6c2b5d77d8ee8900eb0d58cd837a"
 dependencies = [
 "anyhow",
 "bytes",
@ -4500,18 +4501,17 @@ dependencies = [
 "tokio",
 "tray-icon",
 "url",
- "urlpattern",
 "webkit2gtk",
 "webview2-com",
 "window-vibrancy",
- "windows",
+ "windows 0.61.1",
 ]

 [[package]]
 name = "tauri-build"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c432ccc9ff661803dab74c6cd78de11026a578a9307610bbc39d3c55be7943f"
+checksum = "a924b6c50fe83193f0f8b14072afa7c25b7a72752a2a73d9549b463f5fe91a38"
 dependencies = [
 "anyhow",
 "cargo_toml",
@ -4531,9 +4531,9 @@ dependencies = [

 [[package]]
 name = "tauri-codegen"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a"
+checksum = "6c1fe64c74cc40f90848281a90058a6db931eb400b60205840e09801ee30f190"
 dependencies = [
 "base64 0.22.1",
 "brotli",
@ -4558,9 +4558,9 @@ dependencies = [

 [[package]]
 name = "tauri-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4368ea8094e7045217edb690f493b55b30caf9f3e61f79b4c24b6db91f07995e"
+checksum = "260c5d2eb036b76206b9fca20b7be3614cfd21046c5396f7959e0e64a4b07f2f"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@ -4589,9 +4589,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.4.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beee42a4002bc695550599b011728d9dfabf82f767f134754ed6655e434824e"
+checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19"
 dependencies = [
 "log",
 "raw-window-handle",
@ -4607,9 +4607,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-fs"
-version = "2.4.2"
+version = "2.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315784ec4be45e90a987687bae7235e6be3d6e9e350d2b75c16b8a4bf22c1db7"
+checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9"
 dependencies = [
 "anyhow",
 "dunce",
@ -4629,9 +4629,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-http"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a3d7051c9a82b431e3a0f3468f85715b3442b3c3a3913095e9fa509e2652c"
+checksum = "c00685aceab12643cf024f712ab0448ba8fcadf86f2391d49d2e5aa732aacc70"
 dependencies = [
 "bytes",
 "cookie_store",
@ -4653,9 +4653,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-notification"
-version = "2.3.1"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fbc86b929b5376ab84b25c060f966d146b2fbd59b6af8264027b343c82c219"
+checksum = "01fc2c5ff41105bd1f7242d8201fdf3efd70749b82fa013a17f2126357d194cc"
 dependencies = [
 "log",
 "notify-rust",
@ -4672,9 +4672,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786156aa8e89e03d271fbd3fe642207da8e65f3c961baa9e2930f332bf80a1f5"
+checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b"
 dependencies = [
 "dunce",
 "glob",
@ -4688,15 +4688,15 @@ dependencies = [
 "tauri-plugin",
 "thiserror 2.0.17",
 "url",
- "windows",
+ "windows 0.61.1",
 "zbus",
 ]

 [[package]]
 name = "tauri-plugin-os"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1c77ebf6f20417ab2a74e8c310820ba52151406d0c80fbcea7df232e3f6ba"
+checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997"
 dependencies = [
 "gethostname",
 "log",
@ -4712,9 +4712,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-persisted-scope"
-version = "2.3.2"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f1fed7dc3c24a4bdb183ce7c18490466985e5b3aaef05825bd62588c507ae2"
+checksum = "65e4639faf38e4527a4549cbc68b788c0d29b03b65e65f1590f5ec582df5d028"
 dependencies = [
 "aho-corasick",
 "bincode",
@ -4728,9 +4728,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-store"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85dd80d60a76ee2c2fdce09e9ef30877b239c2a6bb76e6d7d03708aa5f13a19"
+checksum = "59a77036340a97eb5bbe1b3209c31e5f27f75e6f92a52fd9dd4b211ef08bf310"
 dependencies = [
 "dunce",
 "serde",
@ -4744,9 +4744,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "2.8.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846"
+checksum = "9368f09358496f2229313fccb37682ad116b7f46fa76981efe116994a0628926"
 dependencies = [
 "cookie",
 "dpi",
@ -4764,14 +4764,14 @@ dependencies = [
 "url",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.61.1",
 ]

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.8.1"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fe9d48bd122ff002064e88cfcd7027090d789c4302714e68fcccba0f4b7807"
+checksum = "929f5df216f5c02a9e894554401bcdab6eec3e39ec6a4a7731c7067fc8688a93"
 dependencies = [
 "gtk",
 "http",
@ -4790,15 +4790,15 @@ dependencies = [
 "url",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.61.1",
 "wry",
 ]

 [[package]]
 name = "tauri-utils"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212"
+checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673"
 dependencies = [
 "anyhow",
 "brotli",
@ -4850,7 +4850,7 @@ checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"
 dependencies = [
 "quick-xml 0.37.5",
 "thiserror 2.0.17",
- "windows",
+ "windows 0.61.1",
 "windows-version",
 ]

@ -5190,6 +5190,24 @@ dependencies = [
 "once_cell",
 ]

+[[package]]
+name = "trash"
+version = "5.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22746c6b0c6d85d60a8f0d858f7057dfdf11297c132679f452ec908fba42b871"
+dependencies = [
+ "chrono",
+ "libc",
+ "log",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "once_cell",
+ "percent-encoding",
+ "scopeguard",
+ "urlencoding",
+ "windows 0.56.0",
+]
+
 [[package]]
 name = "tray-icon"
 version = "0.21.0"
@ -5354,6 +5372,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "urlpattern"
 version = "0.3.0"
@ -5639,10 +5663,10 @@ checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4"
 dependencies = [
 "webview2-com-macros",
 "webview2-com-sys",
- "windows",
+ "windows 0.61.1",
 "windows-core 0.61.0",
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
 ]

 [[package]]
@ -5663,7 +5687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
 dependencies = [
 "thiserror 2.0.17",
- "windows",
+ "windows 0.61.1",
 "windows-core 0.61.0",
 ]

@ -5713,6 +5737,16 @@ dependencies = [
 "windows-version",
 ]

+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core 0.56.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows"
 version = "0.61.1"
@ -5744,16 +5778,28 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
 "windows-link",
- "windows-result",
+ "windows-result 0.3.2",
 "windows-strings 0.4.0",
 ]

@ -5767,6 +5813,17 @@ dependencies = [
 "windows-link",
 ]

+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.60.0"
@ -5778,6 +5835,17 @@ dependencies = [
 "syn 2.0.100",
 ]

+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.59.1"
@ -5811,11 +5879,20 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
 dependencies = [
- "windows-result",
+ "windows-result 0.3.2",
 "windows-strings 0.3.1",
 "windows-targets 0.53.2",
 ]

+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.2"
@ -6190,9 +6267,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"

 [[package]]
 name = "wry"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f0e9642a0d061f6236c54ccae64c2722a7879ad4ec7dff59bd376d446d8e90"
+checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2"
 dependencies = [
 "base64 0.22.1",
 "block2 0.6.0",
@ -6227,7 +6304,7 @@ dependencies = [
 "webkit2gtk",
 "webkit2gtk-sys",
 "webview2-com",
- "windows",
+ "windows 0.61.1",
 "windows-core 0.61.0",
 "windows-version",
 "x11-dl",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -20,13 +20,8 @@ tauri-build = { version = "2.2", features = [] }
 serde = { version = "1.0.228", features = ["derive"] }

 [dependencies]
-rusqlite = { version = "0.37.0", features = [
-    "load_extension",
-    "bundled-sqlcipher-vendored-openssl",
-    "functions",
-] }
-
-#tauri-plugin-sql = { version = "2", features = ["sqlite"] }tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }#libsqlite3-sys = { version = "0.31", features = ["bundled-sqlcipher"] }
+tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
+#libsqlite3-sys = { version = "0.31", features = ["bundled-sqlcipher"] }
 #sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite"] }
 base64 = "0.22"
 ed25519-dalek = "2.1"
@ -39,18 +34,25 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.143"
 sha2 = "0.10.9"
 sqlparser = { version = "0.59.0", features = ["visitor"] }
-tauri = { version = "2.8.5", features = ["protocol-asset", "devtools"] }
-tauri-plugin-dialog = "2.4.0"
+tauri = { version = "2.9.1", features = ["protocol-asset", "devtools"] }
+tauri-plugin-dialog = "2.4.2"
 tauri-plugin-fs = "2.4.0"
-tauri-plugin-http = "2.5.2"
-tauri-plugin-notification = "2.3.1"
-tauri-plugin-opener = "2.5.0"
-tauri-plugin-os = "2.3"
-tauri-plugin-persisted-scope = "2.3.2"
-tauri-plugin-store = "2.4.0"
+tauri-plugin-http = "2.5.4"
+tauri-plugin-notification = "2.3.3"
+tauri-plugin-opener = "2.5.2"
+tauri-plugin-os = "2.3.2"
+tauri-plugin-persisted-scope = "2.3.4"
+tauri-plugin-store = "2.4.1"
 thiserror = "2.0.17"
 ts-rs = { version = "11.1.0", features = ["serde-compat"] }
 uhlc = "0.8.2"
+url = "2.5.7"
 uuid = { version = "1.18.1", features = ["v4"] }
 zip = "6.0.0"
-url = "2.5.7"
+
+[target.'cfg(not(target_os = "android"))'.dependencies]
+trash = "5.2.0"
+rusqlite = { version = "0.37.0", features = ["load_extension", "bundled-sqlcipher-vendored-openssl", "functions"] }
+
+[target.'cfg(target_os = "android")'.dependencies]
+rusqlite = { version = "0.37.0", features = ["load_extension", "bundled-sqlcipher-vendored-openssl", "functions"] }
--- a/src-tauri/bindings/ExtensionInfoResponse.ts
+++ b/src-tauri/bindings/ExtensionInfoResponse.ts
@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.

-export type ExtensionInfoResponse = { id: string, publicKey: string, name: string, version: string, author: string | null, enabled: boolean, description: string | null, homepage: string | null, icon: string | null, devServerUrl: string | null, };
+export type ExtensionInfoResponse = { id: string, publicKey: string, name: string, version: string, author: string | null, enabled: boolean, description: string | null, homepage: string | null, icon: string | null, entry: string | null, singleInstance: boolean | null, devServerUrl: string | null, };
--- a/src-tauri/bindings/ExtensionManifest.ts
+++ b/src-tauri/bindings/ExtensionManifest.ts
@ -1,4 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ExtensionPermissions } from "./ExtensionPermissions";

-export type ExtensionManifest = { name: string, version: string, author: string | null, entry: string, icon: string | null, public_key: string, signature: string, permissions: ExtensionPermissions, homepage: string | null, description: string | null, };
+export type ExtensionManifest = { name: string, version: string, author: string | null, entry: string | null, icon: string | null, public_key: string, signature: string, permissions: ExtensionPermissions, homepage: string | null, description: string | null, single_instance: boolean | null, };
--- a/src-tauri/database/generate-rust-types.ts
+++ b/src-tauri/database/generate-rust-types.ts
@ -170,6 +170,14 @@ use serde::{Deserialize, Serialize};
      table: schema.haexCrdtSnapshots,
    },
    { name: tablesNames.haex.crdt.configs.name, table: schema.haexCrdtConfigs },
+    {
+      name: tablesNames.haex.desktop_items.name,
+      table: schema.haexDesktopItems,
+    },
+    {
+      name: tablesNames.haex.workspaces.name,
+      table: schema.haexWorkspaces,
+    },
  ]

  for (const { name, table } of schemas) {
--- a/src-tauri/database/index.ts
+++ b/src-tauri/database/index.ts
@ -19,5 +19,3 @@ const dummyExecutor = async (
 // Erstelle die Drizzle-Instanz für den SQLite-Dialekt
 // Übergib den dummyExecutor und das importierte Schema
 export const db = drizzle(dummyExecutor, { schema })
-
-// Exportiere auch alle Schema-Definitionen weiter, damit man alles aus einer Datei importieren kann
--- a/src-tauri/database/migrations/0000_dashing_night_nurse.sql
+++ b/src-tauri/database/migrations/0000_dashing_night_nurse.sql
@ -24,9 +24,23 @@ CREATE TABLE `haex_crdt_snapshots` (
 	`file_size_bytes` integer
 );
 --> statement-breakpoint
+CREATE TABLE `haex_desktop_items` (
+	`id` text PRIMARY KEY NOT NULL,
+	`workspace_id` text NOT NULL,
+	`item_type` text NOT NULL,
+	`extension_id` text,
+	`system_window_id` text,
+	`position_x` integer DEFAULT 0 NOT NULL,
+	`position_y` integer DEFAULT 0 NOT NULL,
+	`haex_timestamp` text,
+	FOREIGN KEY (`workspace_id`) REFERENCES `haex_workspaces`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE cascade,
+	CONSTRAINT "item_reference" CHECK(("haex_desktop_items"."item_type" = 'extension' AND "haex_desktop_items"."extension_id" IS NOT NULL AND "haex_desktop_items"."system_window_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'system' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'file' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL) OR ("haex_desktop_items"."item_type" = 'folder' AND "haex_desktop_items"."system_window_id" IS NOT NULL AND "haex_desktop_items"."extension_id" IS NULL))
+);
+--> statement-breakpoint
 CREATE TABLE `haex_extension_permissions` (
 	`id` text PRIMARY KEY NOT NULL,
-	`extension_id` text,
+	`extension_id` text NOT NULL,
 	`resource_type` text,
 	`action` text,
 	`target` text,
@ -34,38 +48,28 @@ CREATE TABLE `haex_extension_permissions` (
 	`status` text DEFAULT 'denied' NOT NULL,
 	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
 	`updated_at` integer,
-	`haex_tombstone` integer,
 	`haex_timestamp` text,
-	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE UNIQUE INDEX `haex_extension_permissions_extension_id_resource_type_action_target_unique` ON `haex_extension_permissions` (`extension_id`,`resource_type`,`action`,`target`);--> statement-breakpoint
 CREATE TABLE `haex_extensions` (
 	`id` text PRIMARY KEY NOT NULL,
+	`public_key` text NOT NULL,
+	`name` text NOT NULL,
+	`version` text NOT NULL,
 	`author` text,
 	`description` text,
-	`entry` text,
+	`entry` text DEFAULT 'index.html',
 	`homepage` text,
-	`enabled` integer,
+	`enabled` integer DEFAULT true,
 	`icon` text,
-	`name` text,
-	`public_key` text,
-	`signature` text,
-	`url` text,
-	`version` text,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
--> statement-breakpoint
-CREATE TABLE `haex_settings` (
-	`id` text PRIMARY KEY NOT NULL,
-	`key` text,
-	`type` text,
-	`value` text,
-	`haex_tombstone` integer,
+	`signature` text NOT NULL,
+	`single_instance` integer DEFAULT false,
 	`haex_timestamp` text
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `haex_extensions_public_key_name_unique` ON `haex_extensions` (`public_key`,`name`);--> statement-breakpoint
 CREATE TABLE `haex_notifications` (
 	`id` text PRIMARY KEY NOT NULL,
 	`alt` text,
@ -77,63 +81,24 @@ CREATE TABLE `haex_notifications` (
 	`text` text,
 	`title` text,
 	`type` text NOT NULL,
-	`haex_tombstone` integer
+	`haex_timestamp` text
 );
 --> statement-breakpoint
-CREATE TABLE `haex_passwords_group_items` (
-	`group_id` text,
-	`item_id` text,
-	`haex_tombstone` integer,
-	PRIMARY KEY(`item_id`, `group_id`),
-	FOREIGN KEY (`group_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE no action,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
-);
--> statement-breakpoint
-CREATE TABLE `haex_passwords_groups` (
+CREATE TABLE `haex_settings` (
 	`id` text PRIMARY KEY NOT NULL,
-	`name` text,
-	`description` text,
-	`icon` text,
-	`order` integer,
-	`color` text,
-	`parent_id` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	FOREIGN KEY (`parent_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE no action
-);
--> statement-breakpoint
-CREATE TABLE `haex_passwords_item_details` (
-	`id` text PRIMARY KEY NOT NULL,
-	`title` text,
-	`username` text,
-	`password` text,
-	`note` text,
-	`icon` text,
-	`tags` text,
-	`url` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer
-);
--> statement-breakpoint
-CREATE TABLE `haex_passwords_item_history` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text,
-	`changed_property` text,
-	`old_value` text,
-	`new_value` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
-);
--> statement-breakpoint
-CREATE TABLE `haex_passwords_item_key_values` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text,
 	`key` text,
+	`type` text,
 	`value` text,
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE no action
+	`haex_timestamp` text
 );
+--> statement-breakpoint
+CREATE UNIQUE INDEX `haex_settings_key_type_value_unique` ON `haex_settings` (`key`,`type`,`value`);--> statement-breakpoint
+CREATE TABLE `haex_workspaces` (
+	`id` text PRIMARY KEY NOT NULL,
+	`device_id` text NOT NULL,
+	`name` text NOT NULL,
+	`position` integer DEFAULT 0 NOT NULL,
+	`haex_timestamp` text
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `haex_workspaces_position_unique` ON `haex_workspaces` (`position`);
--- a/src-tauri/database/migrations/0001_green_stark_industries.sql
+++ b/src-tauri/database/migrations/0001_green_stark_industries.sql
@ -1 +0,0 @@
-ALTER TABLE `haex_notifications` ADD `haex_timestamp` text;
--- a/src-tauri/database/migrations/0002_amazing_iron_fist.sql
+++ b/src-tauri/database/migrations/0002_amazing_iron_fist.sql
@ -1,22 +0,0 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_haex_extensions` (
-	`id` text PRIMARY KEY NOT NULL,
-	`public_key` text NOT NULL,
-	`name` text NOT NULL,
-	`version` text NOT NULL,
-	`author` text,
-	`description` text,
-	`entry` text DEFAULT 'index.html' NOT NULL,
-	`homepage` text,
-	`enabled` integer DEFAULT true,
-	`icon` text,
-	`signature` text NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_extensions`("id", "public_key", "name", "version", "author", "description", "entry", "homepage", "enabled", "icon", "signature", "haex_tombstone", "haex_timestamp") SELECT "id", "public_key", "name", "version", "author", "description", "entry", "homepage", "enabled", "icon", "signature", "haex_tombstone", "haex_timestamp" FROM `haex_extensions`;--> statement-breakpoint
-DROP TABLE `haex_extensions`;--> statement-breakpoint
-ALTER TABLE `__new_haex_extensions` RENAME TO `haex_extensions`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE UNIQUE INDEX `haex_extensions_public_key_name_unique` ON `haex_extensions` (`public_key`,`name`);
--- a/src-tauri/database/migrations/0003_daily_polaris.sql
+++ b/src-tauri/database/migrations/0003_daily_polaris.sql
@ -1,9 +0,0 @@
-CREATE TABLE `haex_desktop_items` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_type` text NOT NULL,
-	`reference_id` text NOT NULL,
-	`position_x` integer DEFAULT 0 NOT NULL,
-	`position_y` integer DEFAULT 0 NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
--- a/src-tauri/database/migrations/0004_mature_viper.sql
+++ b/src-tauri/database/migrations/0004_mature_viper.sql
@ -1,10 +0,0 @@
-CREATE TABLE `haex_workspaces` (
-	`id` text PRIMARY KEY NOT NULL,
-	`name` text NOT NULL,
-	`position` integer DEFAULT 0 NOT NULL,
-	`created_at` integer NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text
-);
--> statement-breakpoint
-ALTER TABLE `haex_desktop_items` ADD `workspace_id` text NOT NULL REFERENCES haex_workspaces(id);
--- a/src-tauri/database/migrations/0005_tidy_yellowjacket.sql
+++ b/src-tauri/database/migrations/0005_tidy_yellowjacket.sql
@ -1 +0,0 @@
-CREATE UNIQUE INDEX `haex_workspaces_name_unique` ON `haex_workspaces` (`name`);
--- a/src-tauri/database/migrations/0006_gigantic_bloodaxe.sql
+++ b/src-tauri/database/migrations/0006_gigantic_bloodaxe.sql
@ -1,3 +0,0 @@
-DROP INDEX `haex_workspaces_name_unique`;--> statement-breakpoint
-CREATE UNIQUE INDEX `haex_workspaces_position_unique` ON `haex_workspaces` (`position`);--> statement-breakpoint
-CREATE UNIQUE INDEX `haex_settings_key_type_value_unique` ON `haex_settings` (`key`,`type`,`value`);
--- a/src-tauri/database/migrations/0007_stale_longshot.sql
+++ b/src-tauri/database/migrations/0007_stale_longshot.sql
@ -1,2 +0,0 @@
-DROP INDEX `haex_workspaces_position_unique`;--> statement-breakpoint
-ALTER TABLE `haex_workspaces` DROP COLUMN `created_at`;
--- a/src-tauri/database/migrations/0008_dizzy_blue_shield.sql
+++ b/src-tauri/database/migrations/0008_dizzy_blue_shield.sql
@ -1 +0,0 @@
-CREATE UNIQUE INDEX `haex_workspaces_position_unique` ON `haex_workspaces` (`position`);
--- a/src-tauri/database/migrations/0009_boring_arclight.sql
+++ b/src-tauri/database/migrations/0009_boring_arclight.sql
@ -1,92 +0,0 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_haex_desktop_items` (
-	`id` text PRIMARY KEY NOT NULL,
-	`workspace_id` text NOT NULL,
-	`item_type` text NOT NULL,
-	`reference_id` text NOT NULL,
-	`position_x` integer DEFAULT 0 NOT NULL,
-	`position_y` integer DEFAULT 0 NOT NULL,
-	`haex_tombstone` integer,
-	`haex_timestamp` text,
-	FOREIGN KEY (`workspace_id`) REFERENCES `haex_workspaces`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_desktop_items`("id", "workspace_id", "item_type", "reference_id", "position_x", "position_y", "haex_tombstone", "haex_timestamp") SELECT "id", "workspace_id", "item_type", "reference_id", "position_x", "position_y", "haex_tombstone", "haex_timestamp" FROM `haex_desktop_items`;--> statement-breakpoint
-DROP TABLE `haex_desktop_items`;--> statement-breakpoint
-ALTER TABLE `__new_haex_desktop_items` RENAME TO `haex_desktop_items`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE TABLE `__new_haex_extension_permissions` (
-	`id` text PRIMARY KEY NOT NULL,
-	`extension_id` text NOT NULL,
-	`resource_type` text,
-	`action` text,
-	`target` text,
-	`constraints` text,
-	`status` text DEFAULT 'denied' NOT NULL,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	`haex_timestamp` text,
-	FOREIGN KEY (`extension_id`) REFERENCES `haex_extensions`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_extension_permissions`("id", "extension_id", "resource_type", "action", "target", "constraints", "status", "created_at", "updated_at", "haex_tombstone", "haex_timestamp") SELECT "id", "extension_id", "resource_type", "action", "target", "constraints", "status", "created_at", "updated_at", "haex_tombstone", "haex_timestamp" FROM `haex_extension_permissions`;--> statement-breakpoint
-DROP TABLE `haex_extension_permissions`;--> statement-breakpoint
-ALTER TABLE `__new_haex_extension_permissions` RENAME TO `haex_extension_permissions`;--> statement-breakpoint
-CREATE UNIQUE INDEX `haex_extension_permissions_extension_id_resource_type_action_target_unique` ON `haex_extension_permissions` (`extension_id`,`resource_type`,`action`,`target`);--> statement-breakpoint
-CREATE TABLE `__new_haex_passwords_group_items` (
-	`group_id` text NOT NULL,
-	`item_id` text NOT NULL,
-	`haex_tombstone` integer,
-	PRIMARY KEY(`item_id`, `group_id`),
-	FOREIGN KEY (`group_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_passwords_group_items`("group_id", "item_id", "haex_tombstone") SELECT "group_id", "item_id", "haex_tombstone" FROM `haex_passwords_group_items`;--> statement-breakpoint
-DROP TABLE `haex_passwords_group_items`;--> statement-breakpoint
-ALTER TABLE `__new_haex_passwords_group_items` RENAME TO `haex_passwords_group_items`;--> statement-breakpoint
-CREATE TABLE `__new_haex_passwords_groups` (
-	`id` text PRIMARY KEY NOT NULL,
-	`name` text,
-	`description` text,
-	`icon` text,
-	`order` integer,
-	`color` text,
-	`parent_id` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	FOREIGN KEY (`parent_id`) REFERENCES `haex_passwords_groups`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_passwords_groups`("id", "name", "description", "icon", "order", "color", "parent_id", "created_at", "updated_at", "haex_tombstone") SELECT "id", "name", "description", "icon", "order", "color", "parent_id", "created_at", "updated_at", "haex_tombstone" FROM `haex_passwords_groups`;--> statement-breakpoint
-DROP TABLE `haex_passwords_groups`;--> statement-breakpoint
-ALTER TABLE `__new_haex_passwords_groups` RENAME TO `haex_passwords_groups`;--> statement-breakpoint
-CREATE TABLE `__new_haex_passwords_item_history` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text NOT NULL,
-	`changed_property` text,
-	`old_value` text,
-	`new_value` text,
-	`created_at` text DEFAULT (CURRENT_TIMESTAMP),
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_passwords_item_history`("id", "item_id", "changed_property", "old_value", "new_value", "created_at", "haex_tombstone") SELECT "id", "item_id", "changed_property", "old_value", "new_value", "created_at", "haex_tombstone" FROM `haex_passwords_item_history`;--> statement-breakpoint
-DROP TABLE `haex_passwords_item_history`;--> statement-breakpoint
-ALTER TABLE `__new_haex_passwords_item_history` RENAME TO `haex_passwords_item_history`;--> statement-breakpoint
-CREATE TABLE `__new_haex_passwords_item_key_values` (
-	`id` text PRIMARY KEY NOT NULL,
-	`item_id` text NOT NULL,
-	`key` text,
-	`value` text,
-	`updated_at` integer,
-	`haex_tombstone` integer,
-	FOREIGN KEY (`item_id`) REFERENCES `haex_passwords_item_details`(`id`) ON UPDATE no action ON DELETE cascade
-);
--> statement-breakpoint
-INSERT INTO `__new_haex_passwords_item_key_values`("id", "item_id", "key", "value", "updated_at", "haex_tombstone") SELECT "id", "item_id", "key", "value", "updated_at", "haex_tombstone" FROM `haex_passwords_item_key_values`;--> statement-breakpoint
-DROP TABLE `haex_passwords_item_key_values`;--> statement-breakpoint
-ALTER TABLE `__new_haex_passwords_item_key_values` RENAME TO `haex_passwords_item_key_values`;
--- a/src-tauri/database/migrations/meta/0000_snapshot.json
+++ b/src-tauri/database/migrations/meta/0000_snapshot.json
@ -1,7 +1,7 @@
 {
  "version": "6",
  "dialect": "sqlite",
-  "id": "3bbe52b8-5933-4b21-8b24-de3927a2f9b0",
+  "id": "8dc25226-70f9-4d2e-89d4-f3a6b2bdf58d",
  "prevId": "00000000-0000-0000-0000-000000000000",
  "tables": {
    "haex_crdt_configs": {
@ -155,6 +155,106 @@
      "uniqueConstraints": {},
      "checkConstraints": {}
    },
+    "haex_desktop_items": {
+      "name": "haex_desktop_items",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "item_type": {
+          "name": "item_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "extension_id": {
+          "name": "extension_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "system_window_id": {
+          "name": "system_window_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "haex_desktop_items_workspace_id_haex_workspaces_id_fk": {
+          "name": "haex_desktop_items_workspace_id_haex_workspaces_id_fk",
+          "tableFrom": "haex_desktop_items",
+          "tableTo": "haex_workspaces",
+          "columnsFrom": [
+            "workspace_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "haex_desktop_items_extension_id_haex_extensions_id_fk": {
+          "name": "haex_desktop_items_extension_id_haex_extensions_id_fk",
+          "tableFrom": "haex_desktop_items",
+          "tableTo": "haex_extensions",
+          "columnsFrom": [
+            "extension_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {
+        "item_reference": {
+          "name": "item_reference",
+          "value": "(\"haex_desktop_items\".\"item_type\" = 'extension' AND \"haex_desktop_items\".\"extension_id\" IS NOT NULL AND \"haex_desktop_items\".\"system_window_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'system' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'file' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL) OR (\"haex_desktop_items\".\"item_type\" = 'folder' AND \"haex_desktop_items\".\"system_window_id\" IS NOT NULL AND \"haex_desktop_items\".\"extension_id\" IS NULL)"
+        }
+      }
+    },
    "haex_extension_permissions": {
      "name": "haex_extension_permissions",
      "columns": {
@ -169,7 +269,7 @@
          "name": "extension_id",
          "type": "text",
          "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
          "autoincrement": false
        },
        "resource_type": {
@ -223,13 +323,6 @@
          "notNull": false,
          "autoincrement": false
        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
        "haex_timestamp": {
          "name": "haex_timestamp",
          "type": "text",
@ -261,7 +354,7 @@
          "columnsTo": [
            "id"
          ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
          "onUpdate": "no action"
        }
      },
@ -279,6 +372,27 @@
          "notNull": true,
          "autoincrement": false
        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
        "author": {
          "name": "author",
          "type": "text",
@ -298,7 +412,8 @@
          "type": "text",
          "primaryKey": false,
          "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": "'index.html'"
        },
        "homepage": {
          "name": "homepage",
@ -312,7 +427,8 @@
          "type": "integer",
          "primaryKey": false,
          "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": true
        },
        "icon": {
          "name": "icon",
@ -321,99 +437,20 @@
          "notNull": false,
          "autoincrement": false
        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
        "signature": {
          "name": "signature",
          "type": "text",
          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
          "notNull": true,
          "autoincrement": false
        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
+        "single_instance": {
+          "name": "single_instance",
          "type": "integer",
          "primaryKey": false,
          "notNull": false,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": false
        },
        "haex_timestamp": {
          "name": "haex_timestamp",
@ -423,7 +460,16 @@
          "autoincrement": false
        }
      },
-      "indexes": {},
+      "indexes": {
+        "haex_extensions_public_key_name_unique": {
+          "name": "haex_extensions_public_key_name_unique",
+          "columns": [
+            "public_key",
+            "name"
+          ],
+          "isUnique": true
+        }
+      },
      "foreignKeys": {},
      "compositePrimaryKeys": {},
      "uniqueConstraints": {},
@ -502,9 +548,9 @@
          "notNull": true,
          "autoincrement": false
        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
          "primaryKey": false,
          "notNull": false,
          "autoincrement": false
@ -516,74 +562,8 @@
      "uniqueConstraints": {},
      "checkConstraints": {}
    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
+    "haex_settings": {
+      "name": "haex_settings",
      "columns": {
        "id": {
          "name": "id",
@ -592,270 +572,6 @@
          "notNull": true,
          "autoincrement": false
        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
        "key": {
          "name": "key",
          "type": "text",
@ -863,6 +579,13 @@
          "notNull": false,
          "autoincrement": false
        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
        "value": {
          "name": "value",
          "type": "text",
@ -870,37 +593,80 @@
          "notNull": false,
          "autoincrement": false
        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
          "primaryKey": false,
          "notNull": false,
          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "haex_settings_key_type_value_unique": {
+          "name": "haex_settings_key_type_value_unique",
+          "columns": [
+            "key",
+            "type",
+            "value"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "haex_workspaces": {
+      "name": "haex_workspaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
+        "device_id": {
+          "name": "device_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "position": {
+          "name": "position",
          "type": "integer",
          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "haex_timestamp": {
+          "name": "haex_timestamp",
+          "type": "text",
+          "primaryKey": false,
          "notNull": false,
          "autoincrement": false
        }
      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
+      "indexes": {
+        "haex_workspaces_position_unique": {
+          "name": "haex_workspaces_position_unique",
+          "columns": [
+            "position"
          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
+          "isUnique": true
        }
      },
+      "foreignKeys": {},
      "compositePrimaryKeys": {},
      "uniqueConstraints": {},
      "checkConstraints": {}
--- a/src-tauri/database/migrations/meta/0001_snapshot.json
+++ b/src-tauri/database/migrations/meta/0001_snapshot.json
@ -1,926 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "862ac1d5-3065-4244-8652-2b6782254862",
-  "prevId": "3bbe52b8-5933-4b21-8b24-de3927a2f9b0",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
--- a/src-tauri/database/migrations/meta/0002_snapshot.json
+++ b/src-tauri/database/migrations/meta/0002_snapshot.json
@ -1,930 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "5387568f-75b3-4a85-86c5-67f539c3fedf",
-  "prevId": "862ac1d5-3065-4244-8652-2b6782254862",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'index.html'"
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": true
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extensions_public_key_name_unique": {
-          "name": "haex_extensions_public_key_name_unique",
-          "columns": [
-            "public_key",
-            "name"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
--- a/src-tauri/database/migrations/meta/0003_snapshot.json
+++ b/src-tauri/database/migrations/meta/0003_snapshot.json
@ -1,991 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "2f40a42e-9b3f-42be-8951-8e94baadcd65",
-  "prevId": "5387568f-75b3-4a85-86c5-67f539c3fedf",
-  "tables": {
-    "haex_crdt_configs": {
-      "name": "haex_crdt_configs",
-      "columns": {
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_logs": {
-      "name": "haex_crdt_logs",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "table_name": {
-          "name": "table_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "row_pks": {
-          "name": "row_pks",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "op_type": {
-          "name": "op_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "column_name": {
-          "name": "column_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_haex_timestamp": {
-          "name": "idx_haex_timestamp",
-          "columns": [
-            "haex_timestamp"
-          ],
-          "isUnique": false
-        },
-        "idx_table_row": {
-          "name": "idx_table_row",
-          "columns": [
-            "table_name",
-            "row_pks"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_crdt_snapshots": {
-      "name": "haex_crdt_snapshots",
-      "columns": {
-        "snapshot_id": {
-          "name": "snapshot_id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created": {
-          "name": "created",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "epoch_hlc": {
-          "name": "epoch_hlc",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "location_url": {
-          "name": "location_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "file_size_bytes": {
-          "name": "file_size_bytes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_desktop_items": {
-      "name": "haex_desktop_items",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_type": {
-          "name": "item_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reference_id": {
-          "name": "reference_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "position_x": {
-          "name": "position_x",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "position_y": {
-          "name": "position_y",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extension_permissions": {
-      "name": "haex_extension_permissions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "extension_id": {
-          "name": "extension_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "resource_type": {
-          "name": "resource_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "action": {
-          "name": "action",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "target": {
-          "name": "target",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "constraints": {
-          "name": "constraints",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'denied'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extension_permissions_extension_id_resource_type_action_target_unique": {
-          "name": "haex_extension_permissions_extension_id_resource_type_action_target_unique",
-          "columns": [
-            "extension_id",
-            "resource_type",
-            "action",
-            "target"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "haex_extension_permissions_extension_id_haex_extensions_id_fk": {
-          "name": "haex_extension_permissions_extension_id_haex_extensions_id_fk",
-          "tableFrom": "haex_extension_permissions",
-          "tableTo": "haex_extensions",
-          "columnsFrom": [
-            "extension_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_extensions": {
-      "name": "haex_extensions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author": {
-          "name": "author",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entry": {
-          "name": "entry",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'index.html'"
-        },
-        "homepage": {
-          "name": "homepage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": true
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "signature": {
-          "name": "signature",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "haex_extensions_public_key_name_unique": {
-          "name": "haex_extensions_public_key_name_unique",
-          "columns": [
-            "public_key",
-            "name"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_notifications": {
-      "name": "haex_notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "alt": {
-          "name": "alt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "date": {
-          "name": "date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "read": {
-          "name": "read",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "text": {
-          "name": "text",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_settings": {
-      "name": "haex_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_timestamp": {
-          "name": "haex_timestamp",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_group_items": {
-      "name": "haex_passwords_group_items",
-      "columns": {
-        "group_id": {
-          "name": "group_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_group_items_group_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "group_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_group_items_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_group_items",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "haex_passwords_group_items_item_id_group_id_pk": {
-          "columns": [
-            "item_id",
-            "group_id"
-          ],
-          "name": "haex_passwords_group_items_item_id_group_id_pk"
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_groups": {
-      "name": "haex_passwords_groups",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk": {
-          "name": "haex_passwords_groups_parent_id_haex_passwords_groups_id_fk",
-          "tableFrom": "haex_passwords_groups",
-          "tableTo": "haex_passwords_groups",
-          "columnsFrom": [
-            "parent_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_details": {
-      "name": "haex_passwords_item_details",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "note": {
-          "name": "note",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "icon": {
-          "name": "icon",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tags": {
-          "name": "tags",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_history": {
-      "name": "haex_passwords_item_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "changed_property": {
-          "name": "changed_property",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "old_value": {
-          "name": "old_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "new_value": {
-          "name": "new_value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "(CURRENT_TIMESTAMP)"
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_history_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_history",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "haex_passwords_item_key_values": {
-      "name": "haex_passwords_item_key_values",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "item_id": {
-          "name": "item_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "haex_tombstone": {
-          "name": "haex_tombstone",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk": {
-          "name": "haex_passwords_item_key_values_item_id_haex_passwords_item_details_id_fk",
-          "tableFrom": "haex_passwords_item_key_values",
-          "tableTo": "haex_passwords_item_details",
-          "columnsFrom": [
-            "item_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
--- a/src-tauri/database/migrations/meta/0004_snapshot.json
+++ b/src-tauri/database/migrations/meta/0004_snapshot.json
--- a/src-tauri/database/migrations/meta/0005_snapshot.json
+++ b/src-tauri/database/migrations/meta/0005_snapshot.json
--- a/src-tauri/database/migrations/meta/0006_snapshot.json
+++ b/src-tauri/database/migrations/meta/0006_snapshot.json
--- a/src-tauri/database/migrations/meta/0007_snapshot.json
+++ b/src-tauri/database/migrations/meta/0007_snapshot.json
--- a/src-tauri/database/migrations/meta/0008_snapshot.json
+++ b/src-tauri/database/migrations/meta/0008_snapshot.json
--- a/src-tauri/database/migrations/meta/0009_snapshot.json
+++ b/src-tauri/database/migrations/meta/0009_snapshot.json
--- a/src-tauri/database/migrations/meta/_journal.json
+++ b/src-tauri/database/migrations/meta/_journal.json
@ -5,71 +5,8 @@
    {
      "idx": 0,
      "version": "6",
-      "when": 1759402321133,
-      "tag": "0000_glamorous_hulk",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1759418087677,
-      "tag": "0001_green_stark_industries",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1760272083150,
-      "tag": "0002_amazing_iron_fist",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1760611690801,
-      "tag": "0003_daily_polaris",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "6",
-      "when": 1760817142340,
-      "tag": "0004_mature_viper",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "6",
-      "when": 1760964548034,
-      "tag": "0005_tidy_yellowjacket",
-      "breakpoints": true
-    },
-    {
-      "idx": 6,
-      "version": "6",
-      "when": 1761137108127,
-      "tag": "0006_gigantic_bloodaxe",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "6",
-      "when": 1761141111765,
-      "tag": "0007_stale_longshot",
-      "breakpoints": true
-    },
-    {
-      "idx": 8,
-      "version": "6",
-      "when": 1761145177028,
-      "tag": "0008_dizzy_blue_shield",
-      "breakpoints": true
-    },
-    {
-      "idx": 9,
-      "version": "6",
-      "when": 1761203548348,
-      "tag": "0009_boring_arclight",
+      "when": 1761821821609,
+      "tag": "0000_dashing_night_nurse",
      "breakpoints": true
    }
  ]
--- a/src-tauri/database/schemas/haex.ts
+++ b/src-tauri/database/schemas/haex.ts
@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+  check,
  integer,
  sqliteTable,
  text,
@ -8,33 +9,28 @@ import {
  type SQLiteColumnBuilderBase,
 } from 'drizzle-orm/sqlite-core'
 import tableNames from '../tableNames.json'
+import { crdtColumnNames } from '.'

-// Helper function to add common CRDT columns (haexTombstone and haexTimestamp)
+// Helper function to add common CRDT columns ( haexTimestamp)
 export const withCrdtColumns = <
  T extends Record<string, SQLiteColumnBuilderBase>,
 >(
  columns: T,
-  columnNames: { haexTombstone: string; haexTimestamp: string },
 ) => ({
  ...columns,
-  haexTombstone: integer(columnNames.haexTombstone, { mode: 'boolean' }),
-  haexTimestamp: text(columnNames.haexTimestamp),
+  haexTimestamp: text(crdtColumnNames.haexTimestamp),
 })

 export const haexSettings = sqliteTable(
  tableNames.haex.settings.name,
-  {
+  withCrdtColumns({
    id: text()
      .primaryKey()
      .$defaultFn(() => crypto.randomUUID()),
    key: text(),
    type: text(),
    value: text(),
-    haexTombstone: integer(tableNames.haex.settings.columns.haexTombstone, {
-      mode: 'boolean',
-    }),
-    haexTimestamp: text(tableNames.haex.settings.columns.haexTimestamp),
-  },
+  }),
  (table) => [unique().on(table.key, table.type, table.value)],
 )
 export type InsertHaexSettings = typeof haexSettings.$inferInsert
@ -42,7 +38,7 @@ export type SelectHaexSettings = typeof haexSettings.$inferSelect

 export const haexExtensions = sqliteTable(
  tableNames.haex.extensions.name,
-  {
+  withCrdtColumns({
    id: text()
      .primaryKey()
      .$defaultFn(() => crypto.randomUUID()),
@ -51,16 +47,13 @@ export const haexExtensions = sqliteTable(
    version: text().notNull(),
    author: text(),
    description: text(),
-    entry: text().notNull().default('index.html'),
+    entry: text().default('index.html'),
    homepage: text(),
    enabled: integer({ mode: 'boolean' }).default(true),
    icon: text(),
    signature: text().notNull(),
-    haexTombstone: integer(tableNames.haex.extensions.columns.haexTombstone, {
-      mode: 'boolean',
-    }),
-    haexTimestamp: text(tableNames.haex.extensions.columns.haexTimestamp),
-  },
+    single_instance: integer({ mode: 'boolean' }).default(false),
+  }),
  (table) => [
    // UNIQUE constraint: Pro Developer (public_key) kann nur eine Extension mit diesem Namen existieren
    unique().on(table.public_key, table.name),
@ -71,13 +64,11 @@ export type SelectHaexExtensions = typeof haexExtensions.$inferSelect

 export const haexExtensionPermissions = sqliteTable(
  tableNames.haex.extension_permissions.name,
-  {
+  withCrdtColumns({
    id: text()
      .primaryKey()
      .$defaultFn(() => crypto.randomUUID()),
-    extensionId: text(
-      tableNames.haex.extension_permissions.columns.extensionId,
-    )
+    extensionId: text(tableNames.haex.extension_permissions.columns.extensionId)
      .notNull()
      .references((): AnySQLiteColumn => haexExtensions.id, {
        onDelete: 'cascade',
@ -95,14 +86,7 @@ export const haexExtensionPermissions = sqliteTable(
    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
      () => new Date(),
    ),
-    haexTombstone: integer(
-      tableNames.haex.extension_permissions.columns.haexTombstone,
-      { mode: 'boolean' },
-    ),
-    haexTimestamp: text(
-      tableNames.haex.extension_permissions.columns.haexTimestamp,
-    ),
-  },
+  }),
  (table) => [
    unique().on(
      table.extensionId,
@ -119,7 +103,7 @@ export type SelecthaexExtensionPermissions =

 export const haexNotifications = sqliteTable(
  tableNames.haex.notifications.name,
-  {
+  withCrdtColumns({
    id: text().primaryKey(),
    alt: text(),
    date: text(),
@ -132,30 +116,23 @@ export const haexNotifications = sqliteTable(
    type: text({
      enum: ['error', 'success', 'warning', 'info', 'log'],
    }).notNull(),
-    haexTombstone: integer(
-      tableNames.haex.notifications.columns.haexTombstone,
-      { mode: 'boolean' },
-    ),
-    haexTimestamp: text(tableNames.haex.notifications.columns.haexTimestamp),
-  },
+  }),
 )
 export type InsertHaexNotifications = typeof haexNotifications.$inferInsert
 export type SelectHaexNotifications = typeof haexNotifications.$inferSelect

 export const haexWorkspaces = sqliteTable(
  tableNames.haex.workspaces.name,
-  withCrdtColumns(
-    {
-      id: text(tableNames.haex.workspaces.columns.id)
-        .primaryKey()
-        .$defaultFn(() => crypto.randomUUID()),
-      name: text(tableNames.haex.workspaces.columns.name).notNull(),
-      position: integer(tableNames.haex.workspaces.columns.position)
-        .notNull()
-        .default(0),
-    },
-    tableNames.haex.workspaces.columns,
-  ),
+  withCrdtColumns({
+    id: text(tableNames.haex.workspaces.columns.id)
+      .primaryKey()
+      .$defaultFn(() => crypto.randomUUID()),
+    deviceId: text(tableNames.haex.workspaces.columns.deviceId).notNull(),
+    name: text(tableNames.haex.workspaces.columns.name).notNull(),
+    position: integer(tableNames.haex.workspaces.columns.position)
+      .notNull()
+      .default(0),
+  }),
  (table) => [unique().on(table.position)],
 )
 export type InsertHaexWorkspaces = typeof haexWorkspaces.$inferInsert
@ -163,29 +140,37 @@ export type SelectHaexWorkspaces = typeof haexWorkspaces.$inferSelect

 export const haexDesktopItems = sqliteTable(
  tableNames.haex.desktop_items.name,
-  withCrdtColumns(
-    {
-      id: text(tableNames.haex.desktop_items.columns.id)
-        .primaryKey()
-        .$defaultFn(() => crypto.randomUUID()),
-      workspaceId: text(tableNames.haex.desktop_items.columns.workspaceId)
-        .notNull()
-        .references(() => haexWorkspaces.id, { onDelete: 'cascade' }),
-      itemType: text(tableNames.haex.desktop_items.columns.itemType, {
-        enum: ['extension', 'file', 'folder'],
-      }).notNull(),
-      referenceId: text(
-        tableNames.haex.desktop_items.columns.referenceId,
-      ).notNull(), // extensionId für extensions, filePath für files/folders
-      positionX: integer(tableNames.haex.desktop_items.columns.positionX)
-        .notNull()
-        .default(0),
-      positionY: integer(tableNames.haex.desktop_items.columns.positionY)
-        .notNull()
-        .default(0),
-    },
-    tableNames.haex.desktop_items.columns,
-  ),
+  withCrdtColumns({
+    id: text(tableNames.haex.desktop_items.columns.id)
+      .primaryKey()
+      .$defaultFn(() => crypto.randomUUID()),
+    workspaceId: text(tableNames.haex.desktop_items.columns.workspaceId)
+      .notNull()
+      .references(() => haexWorkspaces.id, { onDelete: 'cascade' }),
+    itemType: text(tableNames.haex.desktop_items.columns.itemType, {
+      enum: ['system', 'extension', 'file', 'folder'],
+    }).notNull(),
+    // Für Extensions (wenn itemType = 'extension')
+    extensionId: text(
+      tableNames.haex.desktop_items.columns.extensionId,
+    ).references((): AnySQLiteColumn => haexExtensions.id, {
+      onDelete: 'cascade',
+    }),
+    // Für System Windows (wenn itemType = 'system')
+    systemWindowId: text(tableNames.haex.desktop_items.columns.systemWindowId),
+    positionX: integer(tableNames.haex.desktop_items.columns.positionX)
+      .notNull()
+      .default(0),
+    positionY: integer(tableNames.haex.desktop_items.columns.positionY)
+      .notNull()
+      .default(0),
+  }),
+  (table) => [
+    check(
+      'item_reference',
+      sql`(${table.itemType} = 'extension' AND ${table.extensionId} IS NOT NULL AND ${table.systemWindowId} IS NULL) OR (${table.itemType} = 'system' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL) OR (${table.itemType} = 'file' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL) OR (${table.itemType} = 'folder' AND ${table.systemWindowId} IS NOT NULL AND ${table.extensionId} IS NULL)`,
+    ),
+  ],
 )
 export type InsertHaexDesktopItems = typeof haexDesktopItems.$inferInsert
 export type SelectHaexDesktopItems = typeof haexDesktopItems.$inferSelect
--- a/src-tauri/database/schemas/index.ts
+++ b/src-tauri/database/schemas/index.ts
@ -1,2 +1,5 @@
+export const crdtColumnNames = {
+  haexTimestamp: 'haex_timestamp',
+}
 export * from './crdt'
 export * from './haex'
--- a/src-tauri/database/schemas/vault.ts
+++ b/src-tauri/database/schemas/vault.ts
@ -1,121 +0,0 @@
-import { sql } from 'drizzle-orm'
-import {
-  integer,
-  primaryKey,
-  sqliteTable,
-  text,
-  type AnySQLiteColumn,
-} from 'drizzle-orm/sqlite-core'
-import tableNames from '../tableNames.json'
-
-export const haexPasswordsItemDetails = sqliteTable(
-  tableNames.haex.passwords.item_details,
-  {
-    id: text().primaryKey(),
-    title: text(),
-    username: text(),
-    password: text(),
-    note: text(),
-    icon: text(),
-    tags: text(),
-    url: text(),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InsertHaexPasswordsItemDetails =
-  typeof haexPasswordsItemDetails.$inferInsert
-export type SelectHaexPasswordsItemDetails =
-  typeof haexPasswordsItemDetails.$inferSelect
-
-export const haexPasswordsItemKeyValues = sqliteTable(
-  tableNames.haex.passwords.item_key_values,
-  {
-    id: text().primaryKey(),
-    itemId: text('item_id')
-      .notNull()
-      .references((): AnySQLiteColumn => haexPasswordsItemDetails.id, {
-        onDelete: 'cascade',
-      }),
-    key: text(),
-    value: text(),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InserthaexPasswordsItemKeyValues =
-  typeof haexPasswordsItemKeyValues.$inferInsert
-export type SelectHaexPasswordsItemKeyValues =
-  typeof haexPasswordsItemKeyValues.$inferSelect
-
-export const haexPasswordsItemHistory = sqliteTable(
-  tableNames.haex.passwords.item_histories,
-  {
-    id: text().primaryKey(),
-    itemId: text('item_id')
-      .notNull()
-      .references((): AnySQLiteColumn => haexPasswordsItemDetails.id, {
-        onDelete: 'cascade',
-      }),
-    changedProperty:
-      text('changed_property').$type<keyof typeof haexPasswordsItemDetails>(),
-    oldValue: text('old_value'),
-    newValue: text('new_value'),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InserthaexPasswordsItemHistory =
-  typeof haexPasswordsItemHistory.$inferInsert
-export type SelectHaexPasswordsItemHistory =
-  typeof haexPasswordsItemHistory.$inferSelect
-
-export const haexPasswordsGroups = sqliteTable(
-  tableNames.haex.passwords.groups,
-  {
-    id: text().primaryKey(),
-    name: text(),
-    description: text(),
-    icon: text(),
-    order: integer(),
-    color: text(),
-    parentId: text('parent_id').references(
-      (): AnySQLiteColumn => haexPasswordsGroups.id,
-      { onDelete: 'cascade' },
-    ),
-    createdAt: text('created_at').default(sql`(CURRENT_TIMESTAMP)`),
-    updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
-      () => new Date(),
-    ),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-)
-export type InsertHaexPasswordsGroups = typeof haexPasswordsGroups.$inferInsert
-export type SelectHaexPasswordsGroups = typeof haexPasswordsGroups.$inferSelect
-
-export const haexPasswordsGroupItems = sqliteTable(
-  tableNames.haex.passwords.group_items,
-  {
-    groupId: text('group_id')
-      .notNull()
-      .references((): AnySQLiteColumn => haexPasswordsGroups.id, {
-        onDelete: 'cascade',
-      }),
-    itemId: text('item_id')
-      .notNull()
-      .references((): AnySQLiteColumn => haexPasswordsItemDetails.id, {
-        onDelete: 'cascade',
-      }),
-    haex_tombstone: integer({ mode: 'boolean' }),
-  },
-  (table) => [primaryKey({ columns: [table.itemId, table.groupId] })],
-)
-export type InsertHaexPasswordsGroupItems =
-  typeof haexPasswordsGroupItems.$inferInsert
-export type SelectHaexPasswordsGroupItems =
-  typeof haexPasswordsGroupItems.$inferSelect
--- a/src-tauri/database/tableNames.json
+++ b/src-tauri/database/tableNames.json
@ -7,7 +7,7 @@
        "key": "key",
        "type": "type",
        "value": "value",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
@ -26,7 +26,7 @@
        "signature": "signature",
        "url": "url",
        "version": "version",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
@ -42,7 +42,7 @@
        "status": "status",
        "createdAt": "created_at",
        "updateAt": "updated_at",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
@ -59,7 +59,7 @@
        "text": "text",
        "title": "title",
        "type": "type",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
@ -67,10 +67,11 @@
      "name": "haex_workspaces",
      "columns": {
        "id": "id",
+        "deviceId": "device_id",
        "name": "name",
        "position": "position",
        "createdAt": "created_at",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
@ -80,20 +81,15 @@
        "id": "id",
        "workspaceId": "workspace_id",
        "itemType": "item_type",
-        "referenceId": "reference_id",
+        "extensionId": "extension_id",
+        "systemWindowId": "system_window_id",
        "positionX": "position_x",
        "positionY": "position_y",
-        "haexTombstone": "haex_tombstone",
+
        "haexTimestamp": "haex_timestamp"
      }
    },
-    "passwords": {
-      "groups": "haex_passwords_groups",
-      "group_items": "haex_passwords_group_items",
-      "item_details": "haex_passwords_item_details",
-      "item_key_values": "haex_passwords_item_key_values",
-      "item_histories": "haex_passwords_item_history"
-    },
+
    "crdt": {
      "logs": {
        "name": "haex_crdt_logs",
--- a/src-tauri/database/vault.db
+++ b/src-tauri/database/vault.db
--- a/src-tauri/gen/android/app/build.gradle.kts
+++ b/src-tauri/gen/android/app/build.gradle.kts
@ -24,6 +24,23 @@ android {
        versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
    }
+
+    signingConfigs {
+        create("release") {
+            val keystorePath = System.getenv("ANDROID_KEYSTORE_PATH")
+            val keystorePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+            val keyAlias = System.getenv("ANDROID_KEY_ALIAS")
+            val keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+
+            if (keystorePath != null && keystorePassword != null && keyAlias != null && keyPassword != null) {
+                storeFile = file(keystorePath)
+                storePassword = keystorePassword
+                this.keyAlias = keyAlias
+                this.keyPassword = keyPassword
+            }
+        }
+    }
+
    buildTypes {
        getByName("debug") {
            manifestPlaceholders["usesCleartextTraffic"] = "true"
@ -43,6 +60,12 @@ android {
                    .plus(getDefaultProguardFile("proguard-android-optimize.txt"))
                    .toList().toTypedArray()
            )
+
+            // Sign with release config if available
+            val releaseSigningConfig = signingConfigs.getByName("release")
+            if (releaseSigningConfig.storeFile != null) {
+                signingConfig = releaseSigningConfig
+            }
        }
    }
    kotlinOptions {
--- a/src-tauri/gen/android/app/src/main/assets/database/vault.db
+++ b/src-tauri/gen/android/app/src/main/assets/database/vault.db
--- a/src-tauri/gen/schemas/acl-manifests.json
+++ b/src-tauri/gen/schemas/acl-manifests.json
--- a/src-tauri/gen/schemas/android-schema.json
+++ b/src-tauri/gen/schemas/android-schema.json
@ -1400,10 +1400,10 @@
                        "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                      },
                      {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                        "type": "string",
                        "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                      },
                      {
                        "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@ -2277,10 +2277,10 @@
          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
        },
        {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
          "type": "string",
          "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
        },
        {
          "description": "Enables the app_hide command without any pre-configured scope.",
@ -2324,12 +2324,24 @@
          "const": "core:app:allow-name",
          "markdownDescription": "Enables the name command without any pre-configured scope."
        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:allow-remove-data-store",
          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -2396,12 +2408,24 @@
          "const": "core:app:deny-name",
          "markdownDescription": "Denies the name command without any pre-configured scope."
        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:deny-remove-data-store",
          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -5541,10 +5565,10 @@
          "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
        },
        {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
          "type": "string",
          "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
        },
        {
          "description": "This scope permits access to all files and list content of top level directories in the application folders.",
--- a/src-tauri/gen/schemas/desktop-schema.json
+++ b/src-tauri/gen/schemas/desktop-schema.json
@ -1400,10 +1400,10 @@
                        "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                      },
                      {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                        "type": "string",
                        "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                      },
                      {
                        "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@ -2277,10 +2277,10 @@
          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
        },
        {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
          "type": "string",
          "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
        },
        {
          "description": "Enables the app_hide command without any pre-configured scope.",
@ -2324,12 +2324,24 @@
          "const": "core:app:allow-name",
          "markdownDescription": "Enables the name command without any pre-configured scope."
        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:allow-remove-data-store",
          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -2396,12 +2408,24 @@
          "const": "core:app:deny-name",
          "markdownDescription": "Denies the name command without any pre-configured scope."
        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:deny-remove-data-store",
          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -5541,10 +5565,10 @@
          "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
        },
        {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
          "type": "string",
          "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
        },
        {
          "description": "This scope permits access to all files and list content of top level directories in the application folders.",
--- a/src-tauri/gen/schemas/linux-schema.json
+++ b/src-tauri/gen/schemas/linux-schema.json
@ -1400,10 +1400,10 @@
                        "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                      },
                      {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                        "type": "string",
                        "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                      },
                      {
                        "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@ -2277,10 +2277,10 @@
          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
        },
        {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
          "type": "string",
          "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
        },
        {
          "description": "Enables the app_hide command without any pre-configured scope.",
@ -2324,12 +2324,24 @@
          "const": "core:app:allow-name",
          "markdownDescription": "Enables the name command without any pre-configured scope."
        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:allow-remove-data-store",
          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -2396,12 +2408,24 @@
          "const": "core:app:deny-name",
          "markdownDescription": "Denies the name command without any pre-configured scope."
        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:deny-remove-data-store",
          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -5541,10 +5565,10 @@
          "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
        },
        {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
          "type": "string",
          "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
        },
        {
          "description": "This scope permits access to all files and list content of top level directories in the application folders.",
--- a/src-tauri/gen/schemas/mobile-schema.json
+++ b/src-tauri/gen/schemas/mobile-schema.json
@ -1400,10 +1400,10 @@
                        "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
                      },
                      {
-                        "description": "An empty permission you can use to modify the global scope.",
+                        "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
                        "type": "string",
                        "const": "fs:scope",
-                        "markdownDescription": "An empty permission you can use to modify the global scope."
+                        "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
                      },
                      {
                        "description": "This scope permits access to all files and list content of top level directories in the application folders.",
@ -2277,10 +2277,10 @@
          "markdownDescription": "Default core plugins set.\n#### This default permission set includes:\n\n- `core:path:default`\n- `core:event:default`\n- `core:window:default`\n- `core:webview:default`\n- `core:app:default`\n- `core:image:default`\n- `core:resources:default`\n- `core:menu:default`\n- `core:tray:default`"
        },
        {
-          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`",
+          "description": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`",
          "type": "string",
          "const": "core:app:default",
-          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`"
+          "markdownDescription": "Default permissions for the plugin.\n#### This default permission set includes:\n\n- `allow-version`\n- `allow-name`\n- `allow-tauri-version`\n- `allow-identifier`\n- `allow-bundle-type`\n- `allow-register-listener`\n- `allow-remove-listener`"
        },
        {
          "description": "Enables the app_hide command without any pre-configured scope.",
@ -2324,12 +2324,24 @@
          "const": "core:app:allow-name",
          "markdownDescription": "Enables the name command without any pre-configured scope."
        },
+        {
+          "description": "Enables the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-register-listener",
+          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:allow-remove-data-store",
          "markdownDescription": "Enables the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Enables the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:allow-remove-listener",
+          "markdownDescription": "Enables the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Enables the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -2396,12 +2408,24 @@
          "const": "core:app:deny-name",
          "markdownDescription": "Denies the name command without any pre-configured scope."
        },
+        {
+          "description": "Denies the register_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-register-listener",
+          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the remove_data_store command without any pre-configured scope.",
          "type": "string",
          "const": "core:app:deny-remove-data-store",
          "markdownDescription": "Denies the remove_data_store command without any pre-configured scope."
        },
+        {
+          "description": "Denies the remove_listener command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:app:deny-remove-listener",
+          "markdownDescription": "Denies the remove_listener command without any pre-configured scope."
+        },
        {
          "description": "Denies the set_app_theme command without any pre-configured scope.",
          "type": "string",
@ -5541,10 +5565,10 @@
          "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
        },
        {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
          "type": "string",
          "const": "fs:scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
        },
        {
          "description": "This scope permits access to all files and list content of top level directories in the application folders.",
--- a/src-tauri/generator/table_names.rs
+++ b/src-tauri/generator/table_names.rs
@ -1,5 +1,6 @@
 // src-tarui/src/build/table_names.rs
 use serde::Deserialize;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::env;
 use std::fs::File;
@ -8,25 +9,7 @@ use std::path::Path;

 #[derive(Debug, Deserialize)]
 struct Schema {
-    haex: Haex,
-}
-
-#[derive(Debug, Deserialize)]
-#[allow(non_snake_case)]
-struct Haex {
-    settings: TableDefinition,
-    extensions: TableDefinition,
-    extension_permissions: TableDefinition,
-    notifications: TableDefinition,
-    desktop_items: TableDefinition,
-    crdt: Crdt,
-}
-
-#[derive(Debug, Deserialize)]
-struct Crdt {
-    logs: TableDefinition,
-    snapshots: TableDefinition,
-    configs: TableDefinition,
+    haex: HashMap<String, Value>,
 }

 #[derive(Debug, Deserialize)]
@ -45,185 +28,39 @@ pub fn generate_table_names() {
    let reader = BufReader::new(file);
    let schema: Schema =
        serde_json::from_reader(reader).expect("Konnte tableNames.json nicht parsen");
-    let haex = schema.haex;

-    let code = format!(
+    let mut code = String::from(
        r#"
 // ==================================================================
 // HINWEIS: Diese Datei wurde automatisch von build.rs generiert.
 // Manuelle Änderungen werden bei der nächsten Kompilierung überschrieben!
 // ==================================================================

-// --- Table: haex_settings ---
-pub const TABLE_SETTINGS: &str = "{t_settings}";
-pub const COL_SETTINGS_ID: &str = "{c_settings_id}";
-pub const COL_SETTINGS_KEY: &str = "{c_settings_key}";
-pub const COL_SETTINGS_TYPE: &str = "{c_settings_type}";
-pub const COL_SETTINGS_VALUE: &str = "{c_settings_value}";
-pub const COL_SETTINGS_HAEX_TOMBSTONE: &str = "{c_settings_tombstone}";
-pub const COL_SETTINGS_HAEX_TIMESTAMP: &str = "{c_settings_timestamp}";
-
-// --- Table: haex_extensions ---
-pub const TABLE_EXTENSIONS: &str = "{t_extensions}";
-pub const COL_EXTENSIONS_ID: &str = "{c_ext_id}";
-pub const COL_EXTENSIONS_AUTHOR: &str = "{c_ext_author}";
-pub const COL_EXTENSIONS_DESCRIPTION: &str = "{c_ext_description}";
-pub const COL_EXTENSIONS_ENTRY: &str = "{c_ext_entry}";
-pub const COL_EXTENSIONS_HOMEPAGE: &str = "{c_ext_homepage}";
-pub const COL_EXTENSIONS_ENABLED: &str = "{c_ext_enabled}";
-pub const COL_EXTENSIONS_ICON: &str = "{c_ext_icon}";
-pub const COL_EXTENSIONS_NAME: &str = "{c_ext_name}";
-pub const COL_EXTENSIONS_PUBLIC_KEY: &str = "{c_ext_public_key}";
-pub const COL_EXTENSIONS_SIGNATURE: &str = "{c_ext_signature}";
-pub const COL_EXTENSIONS_URL: &str = "{c_ext_url}";
-pub const COL_EXTENSIONS_VERSION: &str = "{c_ext_version}";
-pub const COL_EXTENSIONS_HAEX_TOMBSTONE: &str = "{c_ext_tombstone}";
-pub const COL_EXTENSIONS_HAEX_TIMESTAMP: &str = "{c_ext_timestamp}";
-
-// --- Table: haex_extension_permissions ---
-pub const TABLE_EXTENSION_PERMISSIONS: &str = "{t_ext_perms}";
-pub const COL_EXT_PERMS_ID: &str = "{c_extp_id}";
-pub const COL_EXT_PERMS_EXTENSION_ID: &str = "{c_extp_extensionId}";
-pub const COL_EXT_PERMS_RESOURCE_TYPE: &str = "{c_extp_resourceType}";
-pub const COL_EXT_PERMS_ACTION: &str = "{c_extp_action}";
-pub const COL_EXT_PERMS_TARGET: &str = "{c_extp_target}";
-pub const COL_EXT_PERMS_CONSTRAINTS: &str = "{c_extp_constraints}";
-pub const COL_EXT_PERMS_STATUS: &str = "{c_extp_status}";
-pub const COL_EXT_PERMS_CREATED_AT: &str = "{c_extp_createdAt}";
-pub const COL_EXT_PERMS_UPDATE_AT: &str = "{c_extp_updateAt}";
-pub const COL_EXT_PERMS_HAEX_TOMBSTONE: &str = "{c_extp_tombstone}";
-pub const COL_EXT_PERMS_HAEX_TIMESTAMP: &str = "{c_extp_timestamp}";
-
-// --- Table: haex_notifications ---
-pub const TABLE_NOTIFICATIONS: &str = "{t_notifications}";
-pub const COL_NOTIFICATIONS_ID: &str = "{c_notif_id}";
-pub const COL_NOTIFICATIONS_ALT: &str = "{c_notif_alt}";
-pub const COL_NOTIFICATIONS_DATE: &str = "{c_notif_date}";
-pub const COL_NOTIFICATIONS_ICON: &str = "{c_notif_icon}";
-pub const COL_NOTIFICATIONS_IMAGE: &str = "{c_notif_image}";
-pub const COL_NOTIFICATIONS_READ: &str = "{c_notif_read}";
-pub const COL_NOTIFICATIONS_SOURCE: &str = "{c_notif_source}";
-pub const COL_NOTIFICATIONS_TEXT: &str = "{c_notif_text}";
-pub const COL_NOTIFICATIONS_TITLE: &str = "{c_notif_title}";
-pub const COL_NOTIFICATIONS_TYPE: &str = "{c_notif_type}";
-pub const COL_NOTIFICATIONS_HAEX_TOMBSTONE: &str = "{c_notif_tombstone}";
-
-// --- Table: haex_desktop_items ---
-pub const TABLE_DESKTOP_ITEMS: &str = "{t_desktop_items}";
-pub const COL_DESKTOP_ITEMS_ID: &str = "{c_desktop_id}";
-pub const COL_DESKTOP_ITEMS_ITEM_TYPE: &str = "{c_desktop_itemType}";
-pub const COL_DESKTOP_ITEMS_REFERENCE_ID: &str = "{c_desktop_referenceId}";
-pub const COL_DESKTOP_ITEMS_POSITION_X: &str = "{c_desktop_positionX}";
-pub const COL_DESKTOP_ITEMS_POSITION_Y: &str = "{c_desktop_positionY}";
-pub const COL_DESKTOP_ITEMS_HAEX_TOMBSTONE: &str = "{c_desktop_tombstone}";
-pub const COL_DESKTOP_ITEMS_HAEX_TIMESTAMP: &str = "{c_desktop_timestamp}";
-
-// --- Table: haex_crdt_logs ---
-pub const TABLE_CRDT_LOGS: &str = "{t_crdt_logs}";
-pub const COL_CRDT_LOGS_ID: &str = "{c_crdt_logs_id}";
-pub const COL_CRDT_LOGS_HAEX_TIMESTAMP: &str = "{c_crdt_logs_timestamp}";
-pub const COL_CRDT_LOGS_TABLE_NAME: &str = "{c_crdt_logs_tableName}";
-pub const COL_CRDT_LOGS_ROW_PKS: &str = "{c_crdt_logs_rowPks}";
-pub const COL_CRDT_LOGS_OP_TYPE: &str = "{c_crdt_logs_opType}";
-pub const COL_CRDT_LOGS_COLUMN_NAME: &str = "{c_crdt_logs_columnName}";
-pub const COL_CRDT_LOGS_NEW_VALUE: &str = "{c_crdt_logs_newValue}";
-pub const COL_CRDT_LOGS_OLD_VALUE: &str = "{c_crdt_logs_oldValue}";
-
-// --- Table: haex_crdt_snapshots ---
-pub const TABLE_CRDT_SNAPSHOTS: &str = "{t_crdt_snapshots}";
-pub const COL_CRDT_SNAPSHOTS_ID: &str = "{c_crdt_snap_id}";
-pub const COL_CRDT_SNAPSHOTS_CREATED: &str = "{c_crdt_snap_created}";
-pub const COL_CRDT_SNAPSHOTS_EPOCH_HLC: &str = "{c_crdt_snap_epoch}";
-pub const COL_CRDT_SNAPSHOTS_LOCATION_URL: &str = "{c_crdt_snap_location}";
-pub const COL_CRDT_SNAPSHOTS_FILE_SIZE: &str = "{c_crdt_snap_size}";
-
-// --- Table: haex_crdt_configs ---
-pub const TABLE_CRDT_CONFIGS: &str = "{t_crdt_configs}";
-pub const COL_CRDT_CONFIGS_KEY: &str = "{c_crdt_configs_key}";
-pub const COL_CRDT_CONFIGS_VALUE: &str = "{c_crdt_configs_value}";
 "#,
-        // Settings
-        t_settings = haex.settings.name,
-        c_settings_id = haex.settings.columns["id"],
-        c_settings_key = haex.settings.columns["key"],
-        c_settings_type = haex.settings.columns["type"],
-        c_settings_value = haex.settings.columns["value"],
-        c_settings_tombstone = haex.settings.columns["haexTombstone"],
-        c_settings_timestamp = haex.settings.columns["haexTimestamp"],
-        // Extensions
-        t_extensions = haex.extensions.name,
-        c_ext_id = haex.extensions.columns["id"],
-        c_ext_author = haex.extensions.columns["author"],
-        c_ext_description = haex.extensions.columns["description"],
-        c_ext_entry = haex.extensions.columns["entry"],
-        c_ext_homepage = haex.extensions.columns["homepage"],
-        c_ext_enabled = haex.extensions.columns["enabled"],
-        c_ext_icon = haex.extensions.columns["icon"],
-        c_ext_name = haex.extensions.columns["name"],
-        c_ext_public_key = haex.extensions.columns["public_key"],
-        c_ext_signature = haex.extensions.columns["signature"],
-        c_ext_url = haex.extensions.columns["url"],
-        c_ext_version = haex.extensions.columns["version"],
-        c_ext_tombstone = haex.extensions.columns["haexTombstone"],
-        c_ext_timestamp = haex.extensions.columns["haexTimestamp"],
-        // Extension Permissions
-        t_ext_perms = haex.extension_permissions.name,
-        c_extp_id = haex.extension_permissions.columns["id"],
-        c_extp_extensionId = haex.extension_permissions.columns["extensionId"],
-        c_extp_resourceType = haex.extension_permissions.columns["resourceType"],
-        c_extp_action = haex.extension_permissions.columns["action"],
-        c_extp_target = haex.extension_permissions.columns["target"],
-        c_extp_constraints = haex.extension_permissions.columns["constraints"],
-        c_extp_status = haex.extension_permissions.columns["status"],
-        c_extp_createdAt = haex.extension_permissions.columns["createdAt"],
-        c_extp_updateAt = haex.extension_permissions.columns["updateAt"],
-        c_extp_tombstone = haex.extension_permissions.columns["haexTombstone"],
-        c_extp_timestamp = haex.extension_permissions.columns["haexTimestamp"],
-        // Notifications
-        t_notifications = haex.notifications.name,
-        c_notif_id = haex.notifications.columns["id"],
-        c_notif_alt = haex.notifications.columns["alt"],
-        c_notif_date = haex.notifications.columns["date"],
-        c_notif_icon = haex.notifications.columns["icon"],
-        c_notif_image = haex.notifications.columns["image"],
-        c_notif_read = haex.notifications.columns["read"],
-        c_notif_source = haex.notifications.columns["source"],
-        c_notif_text = haex.notifications.columns["text"],
-        c_notif_title = haex.notifications.columns["title"],
-        c_notif_type = haex.notifications.columns["type"],
-        c_notif_tombstone = haex.notifications.columns["haexTombstone"],
-        // Desktop Items
-        t_desktop_items = haex.desktop_items.name,
-        c_desktop_id = haex.desktop_items.columns["id"],
-        c_desktop_itemType = haex.desktop_items.columns["itemType"],
-        c_desktop_referenceId = haex.desktop_items.columns["referenceId"],
-        c_desktop_positionX = haex.desktop_items.columns["positionX"],
-        c_desktop_positionY = haex.desktop_items.columns["positionY"],
-        c_desktop_tombstone = haex.desktop_items.columns["haexTombstone"],
-        c_desktop_timestamp = haex.desktop_items.columns["haexTimestamp"],
-        // CRDT Logs
-        t_crdt_logs = haex.crdt.logs.name,
-        c_crdt_logs_id = haex.crdt.logs.columns["id"],
-        c_crdt_logs_timestamp = haex.crdt.logs.columns["haexTimestamp"],
-        c_crdt_logs_tableName = haex.crdt.logs.columns["tableName"],
-        c_crdt_logs_rowPks = haex.crdt.logs.columns["rowPks"],
-        c_crdt_logs_opType = haex.crdt.logs.columns["opType"],
-        c_crdt_logs_columnName = haex.crdt.logs.columns["columnName"],
-        c_crdt_logs_newValue = haex.crdt.logs.columns["newValue"],
-        c_crdt_logs_oldValue = haex.crdt.logs.columns["oldValue"],
-        // CRDT Snapshots
-        t_crdt_snapshots = haex.crdt.snapshots.name,
-        c_crdt_snap_id = haex.crdt.snapshots.columns["snapshotId"],
-        c_crdt_snap_created = haex.crdt.snapshots.columns["created"],
-        c_crdt_snap_epoch = haex.crdt.snapshots.columns["epochHlc"],
-        c_crdt_snap_location = haex.crdt.snapshots.columns["locationUrl"],
-        c_crdt_snap_size = haex.crdt.snapshots.columns["fileSizeBytes"],
-        // CRDT Configs
-        t_crdt_configs = haex.crdt.configs.name,
-        c_crdt_configs_key = haex.crdt.configs.columns["key"],
-        c_crdt_configs_value = haex.crdt.configs.columns["value"]
    );

+    // Dynamisch über alle Einträge in haex iterieren
+    for (key, value) in &schema.haex {
+        // Spezialbehandlung für nested structures wie "crdt"
+        if key == "crdt" {
+            if let Some(crdt_obj) = value.as_object() {
+                for (crdt_key, crdt_value) in crdt_obj {
+                    if let Ok(table) = serde_json::from_value::<TableDefinition>(crdt_value.clone())
+                    {
+                        let const_prefix = format!("CRDT_{}", to_screaming_snake_case(crdt_key));
+                        code.push_str(&generate_table_constants(&table, &const_prefix));
+                    }
+                }
+            }
+        } else {
+            // Normale Tabelle (settings, extensions, notifications, workspaces, desktop_items, etc.)
+            if let Ok(table) = serde_json::from_value::<TableDefinition>(value.clone()) {
+                let const_prefix = to_screaming_snake_case(key);
+                code.push_str(&generate_table_constants(&table, &const_prefix));
+            }
+        }
+    }
+
    // --- Datei schreiben ---
    let mut f = File::create(&dest_path).expect("Konnte Zieldatei nicht erstellen");
    f.write_all(code.as_bytes())
@ -231,3 +68,51 @@ pub const COL_CRDT_CONFIGS_VALUE: &str = "{c_crdt_configs_value}";

    println!("cargo:rerun-if-changed=database/tableNames.json");
 }
+
+/// Konvertiert einen String zu SCREAMING_SNAKE_CASE
+fn to_screaming_snake_case(s: &str) -> String {
+    let mut result = String::new();
+    let mut prev_is_lower = false;
+
+    for (i, ch) in s.chars().enumerate() {
+        if ch == '_' {
+            result.push('_');
+            prev_is_lower = false;
+        } else if ch.is_uppercase() {
+            if i > 0 && prev_is_lower {
+                result.push('_');
+            }
+            result.push(ch);
+            prev_is_lower = false;
+        } else {
+            result.push(ch.to_ascii_uppercase());
+            prev_is_lower = true;
+        }
+    }
+
+    result
+}
+
+/// Generiert die Konstanten für eine Tabelle
+fn generate_table_constants(table: &TableDefinition, const_prefix: &str) -> String {
+    let mut code = String::new();
+
+    // Tabellenname
+    code.push_str(&format!("// --- Table: {} ---\n", table.name));
+    code.push_str(&format!(
+        "pub const TABLE_{}: &str = \"{}\";\n",
+        const_prefix, table.name
+    ));
+
+    // Spalten
+    for (col_key, col_value) in &table.columns {
+        let col_const_name = format!("COL_{}_{}", const_prefix, to_screaming_snake_case(col_key));
+        code.push_str(&format!(
+            "pub const {}: &str = \"{}\";\n",
+            col_const_name, col_value
+        ));
+    }
+
+    code.push('\n');
+    code
+}
--- a/src-tauri/src/crdt/insert_transformer.rs
+++ b/src-tauri/src/crdt/insert_transformer.rs
@ -1,21 +1,19 @@
 // src-tauri/src/crdt/insert_transformer.rs
 // INSERT-spezifische CRDT-Transformationen (ON CONFLICT, RETURNING)

-use crate::crdt::trigger::{HLC_TIMESTAMP_COLUMN, TOMBSTONE_COLUMN};
+use crate::crdt::trigger::HLC_TIMESTAMP_COLUMN;
 use crate::database::error::DatabaseError;
 use sqlparser::ast::{Expr, Ident, Insert, SelectItem, SetExpr, Value};
 use uhlc::Timestamp;

 /// Helper-Struct für INSERT-Transformationen
 pub struct InsertTransformer {
-    tombstone_column: &'static str,
    hlc_timestamp_column: &'static str,
 }

 impl InsertTransformer {
    pub fn new() -> Self {
        Self {
-            tombstone_column: TOMBSTONE_COLUMN,
            hlc_timestamp_column: HLC_TIMESTAMP_COLUMN,
        }
    }
@ -58,11 +56,9 @@ impl InsertTransformer {
        insert_stmt: &mut Insert,
        timestamp: &Timestamp,
    ) -> Result<(), DatabaseError> {
-        // Add both haex_timestamp and haex_tombstone columns if not exists
+        // Add haex_timestamp  column if not exists
        let hlc_col_index =
            Self::find_or_add_column(&mut insert_stmt.columns, self.hlc_timestamp_column);
-        let tombstone_col_index =
-            Self::find_or_add_column(&mut insert_stmt.columns, self.tombstone_column);

        // ON CONFLICT Logik komplett entfernt!
        // Bei Hard Deletes gibt es keine Tombstone-Einträge mehr zu reaktivieren
@ -74,24 +70,15 @@ impl InsertTransformer {
                    for row in &mut values.rows {
                        let hlc_value =
                            Expr::Value(Value::SingleQuotedString(timestamp.to_string()).into());
-                        let tombstone_value =
-                            Expr::Value(Value::Number("0".to_string(), false).into());

                        Self::set_or_push_value(row, hlc_col_index, hlc_value);
-                        Self::set_or_push_value(row, tombstone_col_index, tombstone_value);
                    }
                }
                SetExpr::Select(select) => {
                    let hlc_value =
                        Expr::Value(Value::SingleQuotedString(timestamp.to_string()).into());
-                    let tombstone_value = Expr::Value(Value::Number("0".to_string(), false).into());

                    Self::set_or_push_projection(&mut select.projection, hlc_col_index, hlc_value);
-                    Self::set_or_push_projection(
-                        &mut select.projection,
-                        tombstone_col_index,
-                        tombstone_value,
-                    );
                }
                _ => {
                    return Err(DatabaseError::UnsupportedStatement {
--- a/src-tauri/src/crdt/transformer.rs
+++ b/src-tauri/src/crdt/transformer.rs
@ -1,12 +1,12 @@
 // src-tauri/src/crdt/transformer.rs

 use crate::crdt::insert_transformer::InsertTransformer;
-use crate::crdt::trigger::{HLC_TIMESTAMP_COLUMN, TOMBSTONE_COLUMN};
+use crate::crdt::trigger::HLC_TIMESTAMP_COLUMN;
 use crate::database::error::DatabaseError;
 use crate::table_names::{TABLE_CRDT_CONFIGS, TABLE_CRDT_LOGS};
 use sqlparser::ast::{
-    Assignment, AssignmentTarget, ColumnDef, DataType, Expr, Ident, ObjectName,
-    ObjectNamePart, Statement, TableFactor, TableObject, Value,
+    Assignment, AssignmentTarget, ColumnDef, DataType, Expr, Ident, ObjectName, ObjectNamePart,
+    Statement, TableFactor, TableObject, Value,
 };
 use std::borrow::Cow;
 use std::collections::HashSet;
@ -15,13 +15,11 @@ use uhlc::Timestamp;
 /// Konfiguration für CRDT-Spalten
 #[derive(Clone)]
 struct CrdtColumns {
-    tombstone: &'static str,
    hlc_timestamp: &'static str,
 }

 impl CrdtColumns {
    const DEFAULT: Self = Self {
-        tombstone: TOMBSTONE_COLUMN,
        hlc_timestamp: HLC_TIMESTAMP_COLUMN,
    };

@ -37,13 +35,6 @@ impl CrdtColumns {

    /// Fügt CRDT-Spalten zu einer Tabellendefinition hinzu
    fn add_to_table_definition(&self, columns: &mut Vec<ColumnDef>) {
-        if !columns.iter().any(|c| c.name.value == self.tombstone) {
-            columns.push(ColumnDef {
-                name: Ident::new(self.tombstone),
-                data_type: DataType::Integer(None),
-                options: vec![],
-            });
-        }
        if !columns.iter().any(|c| c.name.value == self.hlc_timestamp) {
            columns.push(ColumnDef {
                name: Ident::new(self.hlc_timestamp),
@ -86,7 +77,7 @@ impl CrdtTransformer {
    // =================================================================
    // ÖFFENTLICHE API-METHODEN
    // =================================================================
-    
+
    pub fn transform_execute_statement_with_table_info(
        &self,
        stmt: &mut Statement,
@ -171,7 +162,7 @@ impl CrdtTransformer {
            Statement::Update {
                table, assignments, ..
            } => {
-                if let TableFactor::Table { name, ..} = &table.relation {
+                if let TableFactor::Table { name, .. } = &table.relation {
                    if self.is_crdt_sync_table(name) {
                        assignments.push(self.columns.create_hlc_assignment(hlc_timestamp));
                    }
--- a/src-tauri/src/crdt/trigger.rs
+++ b/src-tauri/src/crdt/trigger.rs
@ -12,18 +12,16 @@ const UPDATE_TRIGGER_TPL: &str = "z_crdt_{TABLE_NAME}_update";
 const DELETE_TRIGGER_TPL: &str = "z_crdt_{TABLE_NAME}_delete";

 //const SYNC_ACTIVE_KEY: &str = "sync_active";
-pub const TOMBSTONE_COLUMN: &str = "haex_tombstone";
+
 pub const HLC_TIMESTAMP_COLUMN: &str = "haex_timestamp";

+/// Name der custom UUID-Generierungs-Funktion (registriert in database::core::open_and_init_db)
+pub const UUID_FUNCTION_NAME: &str = "gen_uuid";
+
 #[derive(Debug)]
 pub enum CrdtSetupError {
    /// Kapselt einen Fehler, der von der rusqlite-Bibliothek kommt.
    DatabaseError(rusqlite::Error),
-    /// Die Tabelle hat keine Tombstone-Spalte, was eine CRDT-Voraussetzung ist.
-    TombstoneColumnMissing {
-        table_name: String,
-        column_name: String,
-    },
    HlcColumnMissing {
        table_name: String,
        column_name: String,
@ -37,14 +35,6 @@ impl Display for CrdtSetupError {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
        match self {
            CrdtSetupError::DatabaseError(e) => write!(f, "Database error: {}", e),
-            CrdtSetupError::TombstoneColumnMissing {
-                table_name,
-                column_name,
-            } => write!(
-                f,
-                "Table '{}' is missing the required tombstone column '{}'",
-                table_name, column_name
-            ),
            CrdtSetupError::HlcColumnMissing {
                table_name,
                column_name,
@ -95,7 +85,8 @@ impl ColumnInfo {
 }

 fn is_safe_identifier(name: &str) -> bool {
-    !name.is_empty() && name.chars().all(|c| c.is_alphanumeric() || c == '_')
+    // Allow alphanumeric characters, underscores, and hyphens (for extension names like "nuxt-app")
+    !name.is_empty() && name.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-')
 }

 /// Richtet CRDT-Trigger für eine einzelne Tabelle ein.
@ -110,13 +101,6 @@ pub fn setup_triggers_for_table(
        return Ok(TriggerSetupResult::TableNotFound);
    }

-    if !columns.iter().any(|c| c.name == TOMBSTONE_COLUMN) {
-        return Err(CrdtSetupError::TombstoneColumnMissing {
-            table_name: table_name.to_string(),
-            column_name: TOMBSTONE_COLUMN.to_string(),
-        });
-    }
-
    if !columns.iter().any(|c| c.name == HLC_TIMESTAMP_COLUMN) {
        return Err(CrdtSetupError::HlcColumnMissing {
            table_name: table_name.to_string(),
@ -138,7 +122,7 @@ pub fn setup_triggers_for_table(

    let cols_to_track: Vec<String> = columns
        .iter()
-        .filter(|c| !c.is_pk) //&& c.name != TOMBSTONE_COLUMN && c.name != HLC_TIMESTAMP_COLUMN
+        .filter(|c| !c.is_pk)
        .map(|c| c.name.clone())
        .collect();

@ -269,9 +253,10 @@ fn generate_insert_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
    let column_inserts = if cols.is_empty() {
        // Nur PKs -> einfacher Insert ins Log
        format!(
-            "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks)
-            VALUES (NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}));",
+            "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks)
+            VALUES ({uuid_fn}(), NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}));",
            log_table = TABLE_CRDT_LOGS,
+            uuid_fn = UUID_FUNCTION_NAME,
            hlc_col = HLC_TIMESTAMP_COLUMN,
            table = table_name,
            pk_payload = pk_json_payload
@ -280,9 +265,10 @@ fn generate_insert_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
        cols.iter().fold(String::new(), |mut acc, col| {
            writeln!(
                &mut acc,
-                "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks, column_name, new_value)
-                VALUES (NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}), '{column}', json_object('value', NEW.\"{column}\"));",
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, new_value)
+                VALUES ({uuid_fn}(), NEW.\"{hlc_col}\", 'INSERT', '{table}', json_object({pk_payload}), '{column}', json_object('value', NEW.\"{column}\"));",
                log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
                hlc_col = HLC_TIMESTAMP_COLUMN,
                table = table_name,
                pk_payload = pk_json_payload,
@ -324,11 +310,12 @@ fn generate_update_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
        for col in cols {
            writeln!(
                &mut body,
-                "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks, column_name, new_value, old_value)
-                    SELECT NEW.\"{hlc_col}\", 'UPDATE', '{table}', json_object({pk_payload}), '{column}',
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, new_value, old_value)
+                    SELECT {uuid_fn}(), NEW.\"{hlc_col}\", 'UPDATE', '{table}', json_object({pk_payload}), '{column}',
                    json_object('value', NEW.\"{column}\"), json_object('value', OLD.\"{column}\")
                    WHERE NEW.\"{column}\" IS NOT OLD.\"{column}\";",
                log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
                hlc_col = HLC_TIMESTAMP_COLUMN,
                table = table_name,
                pk_payload = pk_json_payload,
@ -367,10 +354,11 @@ fn generate_delete_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
        for col in cols {
            writeln!(
                &mut body,
-                "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks, column_name, old_value)
-                    VALUES (OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}), '{column}',
+                "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks, column_name, old_value)
+                    VALUES ({uuid_fn}(), OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}), '{column}',
                    json_object('value', OLD.\"{column}\"));",
                log_table = TABLE_CRDT_LOGS,
+                uuid_fn = UUID_FUNCTION_NAME,
                hlc_col = HLC_TIMESTAMP_COLUMN,
                table = table_name,
                pk_payload = pk_json_payload,
@ -381,13 +369,15 @@ fn generate_delete_trigger_sql(table_name: &str, pks: &[String], cols: &[String]
        // Nur PKs -> minimales Delete Log
        writeln!(
            &mut body,
-            "INSERT INTO {log_table} (haex_timestamp, op_type, table_name, row_pks)
-                VALUES (OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}));",
+            "INSERT INTO {log_table} (id, haex_timestamp, op_type, table_name, row_pks)
+                VALUES ({uuid_fn}(), OLD.\"{hlc_col}\", 'DELETE', '{table}', json_object({pk_payload}));",
            log_table = TABLE_CRDT_LOGS,
+            uuid_fn = UUID_FUNCTION_NAME,
            hlc_col = HLC_TIMESTAMP_COLUMN,
            table = table_name,
            pk_payload = pk_json_payload
-        ).unwrap();
+        )
+        .unwrap();
    }

    let trigger_name = DELETE_TRIGGER_TPL.replace("{TABLE_NAME}", table_name);
--- a/src-tauri/src/database/core.rs
+++ b/src-tauri/src/database/core.rs
@ -1,9 +1,11 @@
 // src-tauri/src/database/core.rs

+use crate::crdt::trigger::UUID_FUNCTION_NAME;
 use crate::database::error::DatabaseError;
 use crate::database::DbConnection;
 use crate::extension::database::executor::SqlExecutor;
 use base64::{engine::general_purpose::STANDARD, Engine as _};
+use rusqlite::functions::FunctionFlags;
 use rusqlite::types::Value as SqlValue;
 use rusqlite::{
    types::{Value as RusqliteValue, ValueRef},
@ -13,6 +15,7 @@ use serde_json::Value as JsonValue;
 use sqlparser::ast::{Expr, Query, Select, SetExpr, Statement, TableFactor, TableObject};
 use sqlparser::dialect::SQLiteDialect;
 use sqlparser::parser::Parser;
+use uuid::Uuid;

 /// Öffnet und initialisiert eine Datenbank mit Verschlüsselung
 pub fn open_and_init_db(path: &str, key: &str, create: bool) -> Result<Connection, DatabaseError> {
@ -34,6 +37,19 @@ pub fn open_and_init_db(path: &str, key: &str, create: bool) -> Result<Connectio
            reason: e.to_string(),
        })?;

+    // Register custom UUID function for SQLite triggers
+    conn.create_scalar_function(
+        UUID_FUNCTION_NAME,
+        0,
+        FunctionFlags::SQLITE_UTF8 | FunctionFlags::SQLITE_DETERMINISTIC,
+        |_ctx| {
+            Ok(Uuid::new_v4().to_string())
+        },
+    )
+    .map_err(|e| DatabaseError::DatabaseError {
+        reason: format!("Failed to register {} function: {}", UUID_FUNCTION_NAME, e),
+    })?;
+
    let journal_mode: String = conn
        .query_row("PRAGMA journal_mode=WAL;", [], |row| row.get(0))
        .map_err(|e| DatabaseError::PragmaError {
@ -73,8 +89,15 @@ pub fn parse_single_statement(sql: &str) -> Result<Statement, DatabaseError> {
 /// Utility für SQL-Parsing - parst mehrere SQL-Statements
 pub fn parse_sql_statements(sql: &str) -> Result<Vec<Statement>, DatabaseError> {
    let dialect = SQLiteDialect {};
-    Parser::parse_sql(&dialect, sql).map_err(|e| DatabaseError::ParseError {
-        reason: e.to_string(),
+
+    // Normalize whitespace: replace multiple whitespaces (including newlines, tabs) with single space
+    let normalized_sql = sql
+        .split_whitespace()
+        .collect::<Vec<&str>>()
+        .join(" ");
+
+    Parser::parse_sql(&dialect, &normalized_sql).map_err(|e| DatabaseError::ParseError {
+        reason: format!("Failed to parse SQL: {}", e),
        sql: sql.to_string(),
    })
 }
@ -236,7 +259,7 @@ pub fn select_with_crdt(
    connection: &DbConnection,
 ) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
    with_connection(&connection, |conn| {
-        SqlExecutor::select_internal(conn, &sql, &params)
+        SqlExecutor::query_select(conn, &sql, &params)
    })
 }

--- a/src-tauri/src/database/generated.rs
+++ b/src-tauri/src/database/generated.rs
@ -16,8 +16,6 @@ pub struct HaexSettings {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub value: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub haex_timestamp: Option<String>,
 }

@ -28,8 +26,7 @@ impl HaexSettings {
            key: row.get(1)?,
            r#type: row.get(2)?,
            value: row.get(3)?,
-            haex_tombstone: row.get(4)?,
-            haex_timestamp: row.get(5)?,
+            haex_timestamp: row.get(4)?,
        })
    }
 }
@ -54,8 +51,6 @@ pub struct HaexExtensions {
    pub icon: Option<String>,
    pub signature: String,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub haex_timestamp: Option<String>,
 }

@ -73,8 +68,7 @@ impl HaexExtensions {
            enabled: row.get(8)?,
            icon: row.get(9)?,
            signature: row.get(10)?,
-            haex_tombstone: row.get(11)?,
-            haex_timestamp: row.get(12)?,
+            haex_timestamp: row.get(11)?,
        })
    }
 }
@ -83,8 +77,7 @@ impl HaexExtensions {
 #[serde(rename_all = "camelCase")]
 pub struct HaexExtensionPermissions {
    pub id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub extension_id: Option<String>,
+    pub extension_id: String,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub resource_type: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
@ -99,8 +92,6 @@ pub struct HaexExtensionPermissions {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub updated_at: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub haex_timestamp: Option<String>,
 }

@ -116,8 +107,7 @@ impl HaexExtensionPermissions {
            status: row.get(6)?,
            created_at: row.get(7)?,
            updated_at: row.get(8)?,
-            haex_tombstone: row.get(9)?,
-            haex_timestamp: row.get(10)?,
+            haex_timestamp: row.get(9)?,
        })
    }
 }
@ -200,3 +190,51 @@ impl HaexCrdtConfigs {
    }
 }

+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HaexDesktopItems {
+    pub id: String,
+    pub workspace_id: String,
+    pub item_type: String,
+    pub reference_id: String,
+    pub position_x: i64,
+    pub position_y: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub haex_timestamp: Option<String>,
+}
+
+impl HaexDesktopItems {
+    pub fn from_row(row: &rusqlite::Row) -> rusqlite::Result<Self> {
+        Ok(Self {
+            id: row.get(0)?,
+            workspace_id: row.get(1)?,
+            item_type: row.get(2)?,
+            reference_id: row.get(3)?,
+            position_x: row.get(4)?,
+            position_y: row.get(5)?,
+            haex_timestamp: row.get(6)?,
+        })
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HaexWorkspaces {
+    pub id: String,
+    pub name: String,
+    pub position: i64,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub haex_timestamp: Option<String>,
+}
+
+impl HaexWorkspaces {
+    pub fn from_row(row: &rusqlite::Row) -> rusqlite::Result<Self> {
+        Ok(Self {
+            id: row.get(0)?,
+            name: row.get(1)?,
+            position: row.get(2)?,
+            haex_timestamp: row.get(3)?,
+        })
+    }
+}
+
--- a/src-tauri/src/database/init.rs
+++ b/src-tauri/src/database/init.rs
@ -0,0 +1,67 @@
+// src-tauri/src/database/init.rs
+// Database initialization utilities (trigger setup, etc.)
+
+use crate::crdt::trigger;
+use crate::database::error::DatabaseError;
+use crate::table_names::{
+    TABLE_DESKTOP_ITEMS,
+    TABLE_EXTENSIONS,
+    TABLE_EXTENSION_PERMISSIONS,
+    TABLE_NOTIFICATIONS,
+    TABLE_SETTINGS,
+    TABLE_WORKSPACES,
+};
+use rusqlite::{params, Connection};
+
+/// Liste aller CRDT-Tabellen die Trigger benötigen (ohne Password-Tabellen - die kommen in Extension)
+const CRDT_TABLES: &[&str] = &[
+    TABLE_SETTINGS,
+    TABLE_EXTENSIONS,
+    TABLE_EXTENSION_PERMISSIONS,
+    TABLE_NOTIFICATIONS,
+    TABLE_WORKSPACES,
+    TABLE_DESKTOP_ITEMS,
+];
+
+/// Prüft ob Trigger bereits initialisiert wurden und erstellt sie falls nötig
+///
+/// Diese Funktion wird beim ersten Öffnen einer Template-DB aufgerufen.
+/// Sie erstellt alle CRDT-Trigger für die definierten Tabellen und markiert
+/// die Initialisierung in haex_settings.
+///
+/// Bei Migrations (ALTER TABLE) werden Trigger automatisch neu erstellt,
+/// daher ist kein Versioning nötig.
+pub fn ensure_triggers_initialized(conn: &mut Connection) -> Result<bool, DatabaseError> {
+    let tx = conn.transaction()?;
+
+    // Check if triggers already initialized
+    let check_sql = format!(
+        "SELECT value FROM {} WHERE key = ? AND type = ?",
+        TABLE_SETTINGS
+    );
+    let initialized: Option<String> = tx
+        .query_row(
+            &check_sql,
+            params!["triggers_initialized", "system"],
+            |row| row.get(0),
+        )
+        .ok();
+
+    if initialized.is_some() {
+        eprintln!("DEBUG: Triggers already initialized, skipping");
+        tx.commit()?; // Wichtig: Transaktion trotzdem abschließen
+        return Ok(true); // true = war schon initialisiert
+    }
+
+    eprintln!("INFO: Initializing CRDT triggers for database...");
+
+    // Create triggers for all CRDT tables
+    for table_name in CRDT_TABLES {
+        eprintln!("  - Setting up triggers for: {}", table_name);
+        trigger::setup_triggers_for_table(&tx, table_name, false)?;
+    }
+
+    tx.commit()?;
+    eprintln!("INFO: ✓ CRDT triggers created successfully (flag pending)");
+    Ok(false) // false = wurde gerade initialisiert
+}
--- a/src-tauri/src/database/mod.rs
+++ b/src-tauri/src/database/mod.rs
@ -3,11 +3,13 @@
 pub mod core;
 pub mod error;
 pub mod generated;
+pub mod init;

 use crate::crdt::hlc::HlcService;
+use crate::database::core::execute_with_crdt;
 use crate::database::error::DatabaseError;
 use crate::extension::database::executor::SqlExecutor;
-use crate::table_names::TABLE_CRDT_CONFIGS;
+use crate::table_names::{TABLE_CRDT_CONFIGS, TABLE_SETTINGS};
 use crate::AppState;
 use rusqlite::Connection;
 use serde::{Deserialize, Serialize};
@ -18,6 +20,8 @@ use std::time::UNIX_EPOCH;
 use std::{fs, sync::Arc};
 use tauri::{path::BaseDirectory, AppHandle, Manager, State};
 use tauri_plugin_fs::FsExt;
+#[cfg(not(target_os = "android"))]
+use trash;
 use ts_rs::TS;

 pub struct DbConnection(pub Arc<Mutex<Option<Connection>>>);
@ -76,7 +80,8 @@ pub fn sql_query_with_crdt(

    core::with_connection(&state.db, |conn| {
        let tx = conn.transaction().map_err(DatabaseError::from)?;
-        let result = SqlExecutor::query_internal(&tx, &hlc_service, &sql, &params)?;
+        let (_modified_tables, result) =
+            SqlExecutor::query_internal(&tx, &hlc_service, &sql, &params)?;
        tx.commit().map_err(DatabaseError::from)?;
        Ok(result)
    })
@ -209,7 +214,60 @@ pub fn vault_exists(app_handle: AppHandle, vault_name: String) -> Result<bool, D
    Ok(Path::new(&vault_path).exists())
 }

-/// Deletes a vault database file
+/// Moves a vault database file to trash (or deletes permanently if trash is unavailable)
+#[tauri::command]
+pub fn move_vault_to_trash(
+    app_handle: AppHandle,
+    vault_name: String,
+) -> Result<String, DatabaseError> {
+    // On Android, trash is not available, so delete permanently
+    #[cfg(target_os = "android")]
+    {
+        println!(
+            "Android platform detected, permanently deleting vault '{}'",
+            vault_name
+        );
+        return delete_vault(app_handle, vault_name);
+    }
+
+    // On non-Android platforms, try to use trash
+    #[cfg(not(target_os = "android"))]
+    {
+        let vault_path = get_vault_path(&app_handle, &vault_name)?;
+        let vault_shm_path = format!("{}-shm", vault_path);
+        let vault_wal_path = format!("{}-wal", vault_path);
+
+        if !Path::new(&vault_path).exists() {
+            return Err(DatabaseError::IoError {
+                path: vault_path,
+                reason: "Vault does not exist".to_string(),
+            });
+        }
+
+        // Try to move to trash first (works on desktop systems)
+        let moved_to_trash = trash::delete(&vault_path).is_ok();
+
+        if moved_to_trash {
+            // Also try to move auxiliary files to trash (ignore errors as they might not exist)
+            let _ = trash::delete(&vault_shm_path);
+            let _ = trash::delete(&vault_wal_path);
+
+            Ok(format!(
+                "Vault '{}' successfully moved to trash",
+                vault_name
+            ))
+        } else {
+            // Fallback: Permanent deletion if trash fails
+            println!(
+                "Trash not available, falling back to permanent deletion for vault '{}'",
+                vault_name
+            );
+            delete_vault(app_handle, vault_name)
+        }
+    }
+}
+
+/// Deletes a vault database file permanently (bypasses trash)
 #[tauri::command]
 pub fn delete_vault(app_handle: AppHandle, vault_name: String) -> Result<String, DatabaseError> {
    let vault_path = get_vault_path(&app_handle, &vault_name)?;
@ -417,9 +475,12 @@ fn initialize_session(
    state: &State<'_, AppState>,
 ) -> Result<(), DatabaseError> {
    // 1. Establish the raw database connection
-    let conn = core::open_and_init_db(path, key, false)?;
+    let mut conn = core::open_and_init_db(path, key, false)?;

-    // 2. Initialize the HLC service
+    // 2. Ensure CRDT triggers are initialized (for template DB)
+    let triggers_were_already_initialized = init::ensure_triggers_initialized(&mut conn)?;
+
+    // 3. Initialize the HLC service
    let hlc_service = HlcService::try_initialize(&conn, app_handle).map_err(|e| {
        // We convert the HlcError into a DatabaseError
        DatabaseError::ExecutionError {
@ -429,16 +490,53 @@ fn initialize_session(
        }
    })?;

-    // 3. Store everything in the global AppState
+    // 4. Store everything in the global AppState
    let mut db_guard = state.db.0.lock().map_err(|e| DatabaseError::LockError {
        reason: e.to_string(),
    })?;
+    // Wichtig: Wir brauchen den db_guard gleich nicht mehr,
+    // da 'execute_with_crdt' 'with_connection' aufruft, was
+    // 'state.db' selbst locken muss.
+    // Wir müssen den Guard freigeben, *bevor* wir 'execute_with_crdt' rufen,
+    // um einen Deadlock zu verhindern.
+    // Aber wir müssen die 'conn' erst hineinbewegen.
    *db_guard = Some(conn);
+    drop(db_guard);

    let mut hlc_guard = state.hlc.lock().map_err(|e| DatabaseError::LockError {
        reason: e.to_string(),
    })?;
    *hlc_guard = hlc_service;

+    // WICHTIG: hlc_guard *nicht* freigeben, da 'execute_with_crdt'
+    // eine Referenz auf die Guard erwartet.
+
+    // 5. NEUER SCHRITT: Setze das Flag via CRDT, falls nötig
+    if !triggers_were_already_initialized {
+        eprintln!("INFO: Setting 'triggers_initialized' flag via CRDT...");
+
+        let insert_sql = format!(
+            "INSERT INTO {} (id, key, type, value) VALUES (?, ?, ?, ?)",
+            TABLE_SETTINGS
+        );
+
+        // execute_with_crdt erwartet Vec<JsonValue>, kein params!-Makro
+        let params_vec: Vec<JsonValue> = vec![
+            JsonValue::String(uuid::Uuid::new_v4().to_string()),
+            JsonValue::String("triggers_initialized".to_string()),
+            JsonValue::String("system".to_string()),
+            JsonValue::String("1".to_string()),
+        ];
+
+        // Jetzt können wir 'execute_with_crdt' sicher aufrufen,
+        // da der AppState initialisiert ist.
+        execute_with_crdt(
+            insert_sql, params_vec, &state.db,  // Das &DbConnection (der Mutex)
+            &hlc_guard, // Die gehaltene MutexGuard
+        )?;
+
+        eprintln!("INFO: ✓ 'triggers_initialized' flag set.");
+    }
+
    Ok(())
 }
--- a/src-tauri/src/extension/core/manager.rs
+++ b/src-tauri/src/extension/core/manager.rs
@ -4,7 +4,7 @@ use crate::extension::core::manifest::{EditablePermissions, ExtensionManifest, E
 use crate::extension::core::types::{copy_directory, Extension, ExtensionSource};
 use crate::extension::core::ExtensionPermissions;
 use crate::extension::crypto::ExtensionCrypto;
-use crate::extension::database::executor::{PkRemappingContext, SqlExecutor};
+use crate::extension::database::executor::SqlExecutor;
 use crate::extension::error::ExtensionError;
 use crate::extension::permissions::manager::PermissionManager;
 use crate::extension::permissions::types::ExtensionPermission;
@ -66,17 +66,124 @@ impl ExtensionManager {
        Self::default()
    }

+    /// Helper function to validate path and check for path traversal
+    /// Returns the cleaned path if valid, or None if invalid/not found
+    /// If require_exists is true, returns None if path doesn't exist
+    pub fn validate_path_in_directory(
+        base_dir: &PathBuf,
+        relative_path: &str,
+        require_exists: bool,
+    ) -> Result<Option<PathBuf>, ExtensionError> {
+        // Check for path traversal patterns
+        if relative_path.contains("..") {
+            return Err(ExtensionError::SecurityViolation {
+                reason: format!("Path traversal attempt: {}", relative_path),
+            });
+        }
+
+        // Clean the path (same logic as in protocol.rs)
+        let clean_path = relative_path
+            .replace('\\', "/")
+            .trim_start_matches('/')
+            .split('/')
+            .filter(|&part| !part.is_empty() && part != "." && part != "..")
+            .collect::<PathBuf>();
+
+        let full_path = base_dir.join(&clean_path);
+
+        // Check if file/directory exists (if required)
+        if require_exists && !full_path.exists() {
+            return Ok(None);
+        }
+
+        // Verify path is within base directory
+        let canonical_base = base_dir
+            .canonicalize()
+            .map_err(|e| ExtensionError::Filesystem { source: e })?;
+
+        if let Ok(canonical_path) = full_path.canonicalize() {
+            if !canonical_path.starts_with(&canonical_base) {
+                return Err(ExtensionError::SecurityViolation {
+                    reason: format!("Path outside base directory: {}", relative_path),
+                });
+            }
+            Ok(Some(canonical_path))
+        } else {
+            // Path doesn't exist yet - still validate it would be within base
+            if full_path.starts_with(&canonical_base) {
+                Ok(Some(full_path))
+            } else {
+                Err(ExtensionError::SecurityViolation {
+                    reason: format!("Path outside base directory: {}", relative_path),
+                })
+            }
+        }
+    }
+
+    /// Validates icon path and falls back to favicon.ico if not specified
+    fn validate_and_resolve_icon_path(
+        extension_dir: &PathBuf,
+        haextension_dir: &str,
+        icon_path: Option<&str>,
+    ) -> Result<Option<String>, ExtensionError> {
+        // If icon is specified in manifest, validate it
+        if let Some(icon) = icon_path {
+            if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, icon, true)? {
+                return Ok(Some(clean_path.to_string_lossy().to_string()));
+            } else {
+                eprintln!("WARNING: Icon path specified in manifest not found: {}", icon);
+                // Continue to fallback logic
+            }
+        }
+
+        // Fallback 1: Check haextension/favicon.ico
+        let haextension_favicon = format!("{}/favicon.ico", haextension_dir);
+        if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, &haextension_favicon, true)? {
+            return Ok(Some(clean_path.to_string_lossy().to_string()));
+        }
+
+        // Fallback 2: Check public/favicon.ico
+        if let Some(clean_path) = Self::validate_path_in_directory(extension_dir, "public/favicon.ico", true)? {
+            return Ok(Some(clean_path.to_string_lossy().to_string()));
+        }
+
+        // No icon found
+        Ok(None)
+    }
+
    /// Extrahiert eine Extension-ZIP-Datei und validiert das Manifest
    fn extract_and_validate_extension(
        bytes: Vec<u8>,
        temp_prefix: &str,
+        app_handle: &AppHandle,
    ) -> Result<ExtractedExtension, ExtensionError> {
-        let temp = std::env::temp_dir().join(format!("{}_{}", temp_prefix, uuid::Uuid::new_v4()));
+        // Use app_cache_dir for better Android compatibility
+        let cache_dir = app_handle
+            .path()
+            .app_cache_dir()
+            .map_err(|e| ExtensionError::InstallationFailed {
+                reason: format!("Cannot get app cache dir: {}", e),
+            })?;

+        let temp_id = uuid::Uuid::new_v4();
+        let temp = cache_dir.join(format!("{}_{}", temp_prefix, temp_id));
+        let zip_file_path = cache_dir.join(format!("{}_{}_{}.haextension", temp_prefix, temp_id, "temp"));
+
+        // Write bytes to a temporary ZIP file first (important for Android file system)
+        fs::write(&zip_file_path, &bytes).map_err(|e| {
+            ExtensionError::filesystem_with_path(zip_file_path.display().to_string(), e)
+        })?;
+
+        // Create extraction directory
        fs::create_dir_all(&temp)
            .map_err(|e| ExtensionError::filesystem_with_path(temp.display().to_string(), e))?;

-        let mut archive = ZipArchive::new(Cursor::new(bytes)).map_err(|e| {
+        // Open ZIP file from disk (more reliable on Android than from memory)
+        let zip_file = fs::File::open(&zip_file_path).map_err(|e| {
+            ExtensionError::filesystem_with_path(zip_file_path.display().to_string(), e)
+        })?;
+
+        let mut archive = ZipArchive::new(zip_file).map_err(|e| {
            ExtensionError::InstallationFailed {
                reason: format!("Invalid ZIP: {}", e),
            }
@ -88,38 +195,54 @@ impl ExtensionManager {
                reason: format!("Cannot extract ZIP: {}", e),
            })?;

-        // Check if manifest.json is directly in temp or in a subdirectory
-        let manifest_path = temp.join("manifest.json");
-        let actual_dir = if manifest_path.exists() {
-            temp.clone()
-        } else {
-            // manifest.json is in a subdirectory - find it
-            let mut found_dir = None;
-            for entry in fs::read_dir(&temp)
-                .map_err(|e| ExtensionError::filesystem_with_path(temp.display().to_string(), e))?
-            {
-                let entry = entry.map_err(|e| ExtensionError::Filesystem { source: e })?;
-                let path = entry.path();
-                if path.is_dir() && path.join("manifest.json").exists() {
-                    found_dir = Some(path);
-                    break;
-                }
-            }
+        // Clean up temporary ZIP file
+        let _ = fs::remove_file(&zip_file_path);

-            found_dir.ok_or_else(|| ExtensionError::ManifestError {
-                reason: "manifest.json not found in extension archive".to_string(),
-            })?
+        // Read haextension_dir from config if it exists, otherwise use default
+        let config_path = temp.join("haextension.config.json");
+        let haextension_dir = if config_path.exists() {
+            let config_content = std::fs::read_to_string(&config_path)
+                .map_err(|e| ExtensionError::ManifestError {
+                    reason: format!("Cannot read haextension.config.json: {}", e),
+                })?;
+
+            let config: serde_json::Value = serde_json::from_str(&config_content)
+                .map_err(|e| ExtensionError::ManifestError {
+                    reason: format!("Invalid haextension.config.json: {}", e),
+                })?;
+
+            let dir = config
+                .get("dev")
+                .and_then(|dev| dev.get("haextension_dir"))
+                .and_then(|dir| dir.as_str())
+                .unwrap_or("haextension")
+                .to_string();
+
+            dir
+        } else {
+            "haextension".to_string()
        };

-        let manifest_path = actual_dir.join("manifest.json");
+        // Validate manifest path using helper function
+        let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
+        let manifest_path = Self::validate_path_in_directory(&temp, &manifest_relative_path, true)?
+            .ok_or_else(|| ExtensionError::ManifestError {
+                reason: format!("manifest.json not found at {}/manifest.json", haextension_dir),
+            })?;
+
+        let actual_dir = temp.clone();
        let manifest_content =
            std::fs::read_to_string(&manifest_path).map_err(|e| ExtensionError::ManifestError {
                reason: format!("Cannot read manifest: {}", e),
            })?;

-        let manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;
+        let mut manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;

-        let content_hash = ExtensionCrypto::hash_directory(&actual_dir).map_err(|e| {
+        // Validate and resolve icon path with fallback logic
+        let validated_icon = Self::validate_and_resolve_icon_path(&actual_dir, &haextension_dir, manifest.icon.as_deref())?;
+        manifest.icon = validated_icon;
+
+        let content_hash = ExtensionCrypto::hash_directory(&actual_dir, &manifest_path).map_err(|e| {
            ExtensionError::SignatureVerificationFailed {
                reason: e.to_string(),
            }
@ -393,9 +516,10 @@ impl ExtensionManager {

    pub async fn preview_extension_internal(
        &self,
+        app_handle: &AppHandle,
        file_bytes: Vec<u8>,
    ) -> Result<ExtensionPreview, ExtensionError> {
-        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_preview")?;
+        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_preview", app_handle)?;

        let is_valid_signature = ExtensionCrypto::verify_signature(
            &extracted.manifest.public_key,
@ -420,7 +544,7 @@ impl ExtensionManager {
        custom_permissions: EditablePermissions,
        state: &State<'_, AppState>,
    ) -> Result<String, ExtensionError> {
-        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_ext")?;
+        let extracted = Self::extract_and_validate_extension(file_bytes, "haexhub_ext", &app_handle)?;

        // Signatur verifizieren (bei Installation wird ein Fehler geworfen, nicht nur geprüft)
        ExtensionCrypto::verify_signature(
@ -437,6 +561,17 @@ impl ExtensionManager {
            &extracted.manifest.version,
        )?;

+        // If extension version already exists, remove it completely before installing
+        if extensions_dir.exists() {
+            eprintln!(
+                "Extension version already exists at {}, removing old version",
+                extensions_dir.display()
+            );
+            std::fs::remove_dir_all(&extensions_dir).map_err(|e| {
+                ExtensionError::filesystem_with_path(extensions_dir.display().to_string(), e)
+            })?;
+        }
+
        std::fs::create_dir_all(&extensions_dir).map_err(|e| {
            ExtensionError::filesystem_with_path(extensions_dir.display().to_string(), e)
        })?;
@ -478,19 +613,13 @@ impl ExtensionManager {
            let hlc_service = hlc_service_guard.clone();
            drop(hlc_service_guard);

-            // Erstelle PK-Remapping Context für die gesamte Transaktion
-            // Dies ermöglicht automatisches FK-Remapping wenn ON CONFLICT bei Extension auftritt
-            let mut pk_context = PkRemappingContext::new();
-
            // 1. Extension-Eintrag erstellen mit generierter UUID
-            // WICHTIG: RETURNING wird vom CRDT-Transformer automatisch hinzugefügt
            let insert_ext_sql = format!(
-                "INSERT INTO {} (id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id",
+                "INSERT INTO {} (id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled, single_instance) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                TABLE_EXTENSIONS
            );

-            let (_tables, returning_results): (HashSet<String>, Vec<Vec<JsonValue>>) =
-                SqlExecutor::query_internal_typed_with_context(
+            SqlExecutor::execute_internal_typed(
                    &tx,
                    &hlc_service,
                    &insert_ext_sql,
@ -506,27 +635,11 @@ impl ExtensionManager {
                        extracted.manifest.homepage,
                        extracted.manifest.description,
                        true, // enabled
+                        extracted.manifest.single_instance.unwrap_or(false),
                    ],
-                    &mut pk_context,
                )?;

-            // Nutze die tatsächliche ID aus der Datenbank (wichtig bei ON CONFLICT)
-            // Die haex_extensions Tabelle hat einen single-column PK namens "id"
-            let actual_extension_id = returning_results
-                .first() // Holt die erste Zeile (das innere Vec<JsonValue>, z.B. Some(&["uuid-string"]))
-                .and_then(|row_array| row_array.first()) // Holt das erste Element daraus (z.B. Some(&JsonValue::String("uuid-string")))
-                .and_then(|val| val.as_str()) // Konvertiert zu &str (z.B. Some("uuid-string"))
-                .map(|s| s.to_string()) // Konvertiert zu String
-                .unwrap_or_else(|| extension_id.clone()); // Fallback
-
-            eprintln!(
-                "DEBUG: Extension UUID - Generated: {}, Actual from DB: {}",
-                extension_id, actual_extension_id
-            );
-
-            // 2. Permissions speichern (oder aktualisieren falls schon vorhanden)
-            // Nutze einfaches INSERT - die CRDT-Transformation fügt automatisch ON CONFLICT hinzu
-            // FK-Werte (extension_id) werden automatisch remapped wenn Extension ON CONFLICT hatte
+            // 2. Permissions speichern
            let insert_perm_sql = format!(
                "INSERT INTO {} (id, extension_id, resource_type, action, target, constraints, status) VALUES (?, ?, ?, ?, ?, ?, ?)",
                TABLE_EXTENSION_PERMISSIONS
@ -536,7 +649,7 @@ impl ExtensionManager {
                use crate::database::generated::HaexExtensionPermissions;
                let db_perm: HaexExtensionPermissions = perm.into();

-                SqlExecutor::execute_internal_typed_with_context(
+                SqlExecutor::execute_internal_typed(
                    &tx,
                    &hlc_service,
                    &insert_perm_sql,
@ -549,16 +662,15 @@ impl ExtensionManager {
                        db_perm.constraints,
                        db_perm.status,
                    ],
-                    &mut pk_context,
                )?;
            }

            tx.commit().map_err(DatabaseError::from)?;
-            Ok(actual_extension_id.clone())
+            Ok(extension_id.clone())
        })?;

        let extension = Extension {
-            id: actual_extension_id.clone(), // Nutze die actual_extension_id aus der Transaktion
+            id: extension_id.clone(),
            source: ExtensionSource::Production {
                path: extensions_dir.clone(),
                version: extracted.manifest.version.clone(),
@ -602,13 +714,12 @@ impl ExtensionManager {
        // Lade alle Daten aus der Datenbank
        let extensions = with_connection(&state.db, |conn| {
            let sql = format!(
-            "SELECT id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled FROM {}",
+            "SELECT id, name, version, author, entry, icon, public_key, signature, homepage, description, enabled, single_instance FROM {}",
            TABLE_EXTENSIONS
        );
            eprintln!("DEBUG: SQL Query before transformation: {}", sql);

-            // select_internal gibt jetzt Vec<Vec<JsonValue>> zurück
-            let results = SqlExecutor::select_internal(conn, &sql, &[])?;
+            let results = SqlExecutor::query_select(conn, &sql, &[])?;
            eprintln!("DEBUG: Query returned {} results", results.len());

            let mut data = Vec::new();
@ -635,13 +746,16 @@ impl ExtensionManager {
                        })?
                        .to_string(),
                    author: row[3].as_str().map(String::from),
-                    entry: row[4].as_str().unwrap_or("index.html").to_string(),
+                    entry: row[4].as_str().map(String::from),
                    icon: row[5].as_str().map(String::from),
                    public_key: row[6].as_str().unwrap_or("").to_string(),
                    signature: row[7].as_str().unwrap_or("").to_string(),
                    permissions: ExtensionPermissions::default(),
                    homepage: row[8].as_str().map(String::from),
                    description: row[9].as_str().map(String::from),
+                    single_instance: row[11]
+                        .as_bool()
+                        .or_else(|| row[11].as_i64().map(|v| v != 0)),
                };

                let enabled = row[10]
@ -675,9 +789,10 @@ impl ExtensionManager {
                &extension_data.manifest.version,
            )?;

-            if !extension_path.exists() || !extension_path.join("manifest.json").exists() {
+            // Check if extension directory exists
+            if !extension_path.exists() {
                eprintln!(
-                    "DEBUG: Extension files missing for: {} at {:?}",
+                    "DEBUG: Extension directory missing for: {} at {:?}",
                    extension_id, extension_path
                );
                self.missing_extensions
@ -694,6 +809,52 @@ impl ExtensionManager {
                continue;
            }

+            // Read haextension_dir from config if it exists, otherwise use default
+            let config_path = extension_path.join("haextension.config.json");
+            let haextension_dir = if config_path.exists() {
+                match std::fs::read_to_string(&config_path) {
+                    Ok(config_content) => {
+                        match serde_json::from_str::<serde_json::Value>(&config_content) {
+                            Ok(config) => {
+                                config
+                                    .get("dev")
+                                    .and_then(|dev| dev.get("haextension_dir"))
+                                    .and_then(|dir| dir.as_str())
+                                    .unwrap_or("haextension")
+                                    .to_string()
+                            }
+                            Err(_) => "haextension".to_string(),
+                        }
+                    }
+                    Err(_) => "haextension".to_string(),
+                }
+            } else {
+                "haextension".to_string()
+            };
+
+            // Validate manifest.json path using helper function
+            let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
+            if Self::validate_path_in_directory(&extension_path, &manifest_relative_path, true)?
+                .is_none()
+            {
+                eprintln!(
+                    "DEBUG: manifest.json missing or invalid for: {} at {}/manifest.json",
+                    extension_id, haextension_dir
+                );
+                self.missing_extensions
+                    .lock()
+                    .map_err(|e| ExtensionError::MutexPoisoned {
+                        reason: e.to_string(),
+                    })?
+                    .push(MissingExtension {
+                        id: extension_id.clone(),
+                        public_key: extension_data.manifest.public_key.clone(),
+                        name: extension_data.manifest.name.clone(),
+                        version: extension_data.manifest.version.clone(),
+                    });
+                continue;
+            }
+
            eprintln!("DEBUG: Extension loaded successfully: {}", extension_id);

            let extension = Extension {
--- a/src-tauri/src/extension/core/manifest.rs
+++ b/src-tauri/src/extension/core/manifest.rs
@ -57,13 +57,20 @@ pub struct ExtensionManifest {
    pub name: String,
    pub version: String,
    pub author: Option<String>,
-    pub entry: String,
+    #[serde(default = "default_entry_value")]
+    pub entry: Option<String>,
    pub icon: Option<String>,
    pub public_key: String,
    pub signature: String,
    pub permissions: ExtensionPermissions,
    pub homepage: Option<String>,
    pub description: Option<String>,
+    #[serde(default)]
+    pub single_instance: Option<bool>,
+}
+
+fn default_entry_value() -> Option<String> {
+    Some("index.html".to_string())
 }

 impl ExtensionManifest {
@ -155,7 +162,6 @@ impl ExtensionPermissions {
                .and_then(|c| serde_json::from_value::<PermissionConstraints>(c.clone()).ok()),
            status: p.status.clone().unwrap_or(PermissionStatus::Ask),
            haex_timestamp: None,
-            haex_tombstone: None,
        })
    }
 }
@ -173,6 +179,8 @@ pub struct ExtensionInfoResponse {
    pub description: Option<String>,
    pub homepage: Option<String>,
    pub icon: Option<String>,
+    pub entry: Option<String>,
+    pub single_instance: Option<bool>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub dev_server_url: Option<String>,
 }
@ -198,6 +206,8 @@ impl ExtensionInfoResponse {
            description: extension.manifest.description.clone(),
            homepage: extension.manifest.homepage.clone(),
            icon: extension.manifest.icon.clone(),
+            entry: extension.manifest.entry.clone(),
+            single_instance: extension.manifest.single_instance,
            dev_server_url,
        })
    }
--- a/src-tauri/src/extension/crypto.rs
+++ b/src-tauri/src/extension/crypto.rs
@ -4,28 +4,13 @@ use std::{
 };

 // src-tauri/src/extension/crypto.rs
+use crate::extension::error::ExtensionError;
 use ed25519_dalek::{Signature, Verifier, VerifyingKey};
 use sha2::{Digest, Sha256};

 pub struct ExtensionCrypto;

 impl ExtensionCrypto {
-    /// Berechnet Hash vom Public Key (wie im SDK)
-    pub fn calculate_key_hash(public_key_hex: &str) -> Result<String, String> {
-        let public_key_bytes =
-            hex::decode(public_key_hex).map_err(|e| format!("Invalid public key hex: {}", e))?;
-
-        let public_key = VerifyingKey::from_bytes(&public_key_bytes.try_into().unwrap())
-            .map_err(|e| format!("Invalid public key: {}", e))?;
-
-        let mut hasher = Sha256::new();
-        hasher.update(public_key.as_bytes());
-        let result = hasher.finalize();
-
-        // Ersten 20 Hex-Zeichen (10 Bytes) - wie im SDK
-        Ok(hex::encode(&result[..10]))
-    }
-
    /// Verifiziert Extension-Signatur
    pub fn verify_signature(
        public_key_hex: &str,
@ -50,26 +35,64 @@ impl ExtensionCrypto {
    }

    /// Berechnet Hash eines Verzeichnisses (für Verifikation)
-    pub fn hash_directory(dir: &Path) -> Result<String, String> {
+    pub fn hash_directory(dir: &Path, manifest_path: &Path) -> Result<String, ExtensionError> {
        // 1. Alle Dateipfade rekursiv sammeln
        let mut all_files = Vec::new();
        Self::collect_files_recursively(dir, &mut all_files)
-            .map_err(|e| format!("Failed to collect files: {}", e))?;
-        all_files.sort();
+            .map_err(|e| ExtensionError::Filesystem { source: e })?;
+
+        // 2. Konvertiere zu relativen Pfaden für konsistente Sortierung (wie im SDK)
+        let mut relative_files: Vec<(String, PathBuf)> = all_files
+            .into_iter()
+            .map(|path| {
+                let relative = path.strip_prefix(dir)
+                    .unwrap_or(&path)
+                    .to_string_lossy()
+                    .to_string()
+                    // Normalisiere Pfad-Separatoren zu Unix-Style (/) für plattformübergreifende Konsistenz
+                    .replace('\\', "/");
+                (relative, path)
+            })
+            .collect();
+
+        // 3. Sortiere nach relativen Pfaden
+        relative_files.sort_by(|a, b| a.0.cmp(&b.0));

        let mut hasher = Sha256::new();
-        let manifest_path = dir.join("manifest.json");

-        // 2. Inhalte der sortierten Dateien hashen
-        for file_path in all_files {
-            if file_path == manifest_path {
+        // Canonicalize manifest path for comparison (important on Android where symlinks may differ)
+        // Also ensure the canonical path is still within the allowed directory (security check)
+        let canonical_manifest_path = manifest_path.canonicalize()
+            .unwrap_or_else(|_| manifest_path.to_path_buf());
+
+        // Security: Verify canonical manifest path is still within dir
+        let canonical_dir = dir.canonicalize()
+            .unwrap_or_else(|_| dir.to_path_buf());
+
+        if !canonical_manifest_path.starts_with(&canonical_dir) {
+            return Err(ExtensionError::ManifestError {
+                reason: format!("Manifest path resolves outside of extension directory (potential path traversal)"),
+            });
+        }
+
+        // 4. Inhalte der sortierten Dateien hashen
+        for (_relative, file_path) in relative_files {
+            // Canonicalize file_path for comparison
+            let canonical_file_path = file_path.canonicalize()
+                .unwrap_or_else(|_| file_path.clone());
+
+            if canonical_file_path == canonical_manifest_path {
                // FÜR DIE MANIFEST.JSON:
                let content_str = fs::read_to_string(&file_path)
-                    .map_err(|e| format!("Cannot read manifest file: {}", e))?;
+                    .map_err(|e| ExtensionError::Filesystem { source: e })?;

                // Parse zu einem generischen JSON-Wert
-                let mut manifest: serde_json::Value = serde_json::from_str(&content_str)
-                    .map_err(|e| format!("Cannot parse manifest JSON: {}", e))?;
+                let mut manifest: serde_json::Value =
+                    serde_json::from_str(&content_str).map_err(|e| {
+                        ExtensionError::ManifestError {
+                            reason: format!("Cannot parse manifest JSON: {}", e),
+                        }
+                    })?;

                // Entferne oder leere das Signaturfeld, um den "kanonischen Inhalt" zu erhalten
                if let Some(obj) = manifest.as_object_mut() {
@ -80,13 +103,23 @@ impl ExtensionCrypto {
                }

                // Serialisiere das modifizierte Manifest zurück (mit 2 Spaces, wie in JS)
-                let canonical_manifest_content = serde_json::to_string_pretty(&manifest).unwrap();
-                println!("canonical_manifest_content: {}", canonical_manifest_content);
-                hasher.update(canonical_manifest_content.as_bytes());
+                // serde_json sortiert die Keys automatisch alphabetisch
+                let canonical_manifest_content =
+                    serde_json::to_string_pretty(&manifest).map_err(|e| {
+                        ExtensionError::ManifestError {
+                            reason: format!("Failed to serialize manifest: {}", e),
+                        }
+                    })?;
+
+                // Normalisiere Zeilenenden zu Unix-Style (\n), wie Node.js JSON.stringify es macht
+                // Dies ist wichtig für plattformübergreifende Konsistenz (Desktop vs Android)
+                let normalized_content = canonical_manifest_content.replace("\r\n", "\n");
+
+                hasher.update(normalized_content.as_bytes());
            } else {
                // FÜR ALLE ANDEREN DATEIEN:
-                let content = fs::read(&file_path)
-                    .map_err(|e| format!("Cannot read file {}: {}", file_path.display(), e))?;
+                let content =
+                    fs::read(&file_path).map_err(|e| ExtensionError::Filesystem { source: e })?;
                hasher.update(&content);
            }
        }
--- a/src-tauri/src/extension/database/executor.rs
+++ b/src-tauri/src/extension/database/executor.rs
@ -1,121 +1,33 @@
-// src-tauri/src/extension/database/executor.rs (neu)
+// src-tauri/src/extension/database/executor.rs

 use crate::crdt::hlc::HlcService;
 use crate::crdt::transformer::CrdtTransformer;
 use crate::crdt::trigger;
 use crate::database::core::{convert_value_ref_to_json, parse_sql_statements, ValueConverter};
 use crate::database::error::DatabaseError;
-use rusqlite::Connection;
 use rusqlite::{params_from_iter, types::Value as SqliteValue, ToSql, Transaction};
-use serde_json::{Map, Value as JsonValue};
-use sqlparser::ast::{Insert, Statement, TableObject};
-use std::collections::{HashMap, HashSet};
-
-/// Repräsentiert PK-Werte für eine Zeile (kann single oder composite key sein)
-#[derive(Debug, Clone, PartialEq, Eq)]
-struct PkValues {
-    /// column_name -> value
-    values: HashMap<String, String>,
-}
-
-impl PkValues {
-    fn new() -> Self {
-        Self {
-            values: HashMap::new(),
-        }
-    }
-
-    fn insert(&mut self, column: String, value: String) {
-        self.values.insert(column, value);
-    }
-
-    fn get(&self, column: &str) -> Option<&String> {
-        self.values.get(column)
-    }
-}
-
-/// Context für PK-Remapping während einer Transaktion
-/// Trackt für jede Tabelle: welche PKs sollten eingefügt werden vs. welche sind tatsächlich in der DB
-#[derive(Debug, Default)]
-pub struct PkRemappingContext {
-    /// Für jede Tabelle: Liste von (original_pk_values, actual_pk_values) Mappings
-    /// Wird nur gespeichert wenn original != actual (d.h. ON CONFLICT hat PK geändert)
-    mappings: HashMap<String, Vec<(PkValues, PkValues)>>,
-}
-
-impl PkRemappingContext {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Fügt ein Mapping für eine Tabelle hinzu, aber nur wenn original != actual
-    /// original und actual sind die PK-Werte vor und nach dem INSERT
-    fn add_mapping(&mut self, table: String, original: PkValues, actual: PkValues) {
-        // Nur speichern wenn tatsächlich unterschiedlich (ON CONFLICT hat stattgefunden)
-        if original != actual {
-            eprintln!(
-                "DEBUG: PK Remapping for table '{}': {:?} -> {:?}",
-                table, original.values, actual.values
-            );
-            self.mappings
-                .entry(table)
-                .or_insert_with(Vec::new)
-                .push((original, actual));
-        }
-    }
-
-    /// Versucht einen FK-Wert zu remappen
-    /// referenced_table: Die Tabelle auf die der FK zeigt
-    /// referenced_column: Die PK-Spalte in der referenced_table
-    /// value: Der FK-Wert der ersetzt werden soll
-    fn remap_fk_value(
-        &self,
-        referenced_table: &str,
-        referenced_column: &str,
-        value: &str,
-    ) -> String {
-        self.mappings
-            .get(referenced_table)
-            .and_then(|mappings| {
-                mappings.iter().find_map(|(original, actual)| {
-                    if original.get(referenced_column)? == value {
-                        let actual_val = actual.get(referenced_column)?.clone();
-                        eprintln!(
-                            "DEBUG: FK Remapping for {}.{}: {} -> {}",
-                            referenced_table, referenced_column, value, actual_val
-                        );
-                        Some(actual_val)
-                    } else {
-                        None
-                    }
-                })
-            })
-            .unwrap_or_else(|| value.to_string())
-    }
-}
+use serde_json::Value as JsonValue;
+use sqlparser::ast::Statement;
+use std::collections::HashSet;

 /// SQL-Executor OHNE Berechtigungsprüfung - für interne Nutzung
 pub struct SqlExecutor;

 impl SqlExecutor {
-    /// Führt ein SQL Statement OHNE RETURNING aus (mit CRDT und PK-Remapping)
-    /// Unterstützt automatisches FK-Remapping wenn vorherige INSERTs ON CONFLICT getriggert haben
-    ///
-    /// Diese Variante akzeptiert &[&dyn ToSql] direkt (wie von rusqlite::params![] erzeugt)
+    /// Führt ein SQL Statement OHNE RETURNING aus (mit CRDT)
    /// Returns: modified_schema_tables
-    pub fn execute_internal_typed_with_context(
+    pub fn execute_internal_typed(
        tx: &Transaction,
        hlc_service: &HlcService,
        sql: &str,
        params: &[&dyn ToSql],
-        pk_context: &mut PkRemappingContext,
    ) -> Result<HashSet<String>, DatabaseError> {
        let mut ast_vec = parse_sql_statements(sql)?;

        if ast_vec.len() != 1 {
            return Err(DatabaseError::ExecutionError {
                sql: sql.to_string(),
-                reason: "execute_internal_typed_with_context sollte nur ein einzelnes SQL-Statement erhalten"
+                reason: "execute_internal_typed should only receive a single SQL statement"
                    .to_string(),
                table: None,
            });
@ -140,85 +52,45 @@ impl SqlExecutor {
        }

        let sql_str = statement.to_string();
-        eprintln!("DEBUG: Transformed SQL (execute path): {}", sql_str);
+        eprintln!("DEBUG: Transformed execute SQL: {}", sql_str);

-        // Spezielle Behandlung für INSERT Statements (mit FK-Remapping, OHNE RETURNING)
-        if let Statement::Insert(ref insert_stmt) = statement {
-            if let TableObject::TableName(ref table_name) = insert_stmt.table {
-                let table_name_str = table_name
-                    .to_string()
-                    .trim_matches('`')
-                    .trim_matches('"')
-                    .to_string();
-
-                // Konvertiere Params zu Vec für Manipulation
-                let mut param_vec = params_to_vec(params, tx)?;
-
-                // Hole Foreign Key Informationen
-                let fk_info = get_fk_info(tx, &table_name_str)?;
-
-                // Remap FK-Werte in params (falls Mappings existieren)
-                remap_fk_params(insert_stmt, &mut param_vec, &fk_info, pk_context)?;
-
-                let param_refs: Vec<&dyn ToSql> =
-                    param_vec.iter().map(|v| v as &dyn ToSql).collect();
-
-                let mut stmt = tx
-                    .prepare(&sql_str)
-                    .map_err(|e| DatabaseError::ExecutionError {
-                        sql: sql_str.clone(),
-                        table: Some(table_name_str.clone()),
-                        reason: format!("Prepare failed: {}", e),
-                    })?;
-
-                let mut rows = stmt
-                    .query(params_from_iter(param_refs.iter()))
-                    .map_err(|e| DatabaseError::ExecutionError {
-                        sql: sql_str.clone(),
-                        table: Some(table_name_str.clone()),
-                        reason: format!("INSERT query execution failed: {}", e),
-                    })?;
-
-                let _ = rows.next()?;
-            }
-        } else {
-            // Nicht-INSERT Statements normal ausführen
-            tx.execute(&sql_str, params)
-                .map_err(|e| DatabaseError::ExecutionError {
-                    sql: sql_str.clone(),
-                    table: None,
-                    reason: format!("Execute failed: {}", e),
-                })?;
-        }
+        // Führe Statement aus
+        tx.execute(&sql_str, params)
+            .map_err(|e| DatabaseError::ExecutionError {
+                sql: sql_str.clone(),
+                table: None,
+                reason: format!("Execute failed: {}", e),
+            })?;

        // Trigger-Logik für CREATE TABLE
        if let Statement::CreateTable(create_table_details) = statement {
-            let table_name_str = create_table_details.name.to_string();
+            let raw_name = create_table_details.name.to_string();
+            // Remove quotes from table name
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+            eprintln!("DEBUG: Setting up triggers for table: {}", table_name_str);
            trigger::setup_triggers_for_table(tx, &table_name_str, false)?;
        }

        Ok(modified_schema_tables)
    }

-    /// Führt ein SQL Statement MIT RETURNING aus (mit CRDT und PK-Remapping)
-    /// Unterstützt automatisches FK-Remapping wenn vorherige INSERTs ON CONFLICT getriggert haben
-    ///
-    /// Diese Variante akzeptiert &[&dyn ToSql] direkt (wie von rusqlite::params![] erzeugt)
+    /// Führt ein SQL Statement MIT RETURNING aus (mit CRDT)
    /// Returns: (modified_schema_tables, returning_results)
-    /// returning_results enthält ALLE RETURNING-Spalten für INSERT/UPDATE/DELETE mit RETURNING
-    pub fn query_internal_typed_with_context(
+    pub fn query_internal_typed(
        tx: &Transaction,
        hlc_service: &HlcService,
        sql: &str,
        params: &[&dyn ToSql],
-        pk_context: &mut PkRemappingContext,
    ) -> Result<(HashSet<String>, Vec<Vec<JsonValue>>), DatabaseError> {
        let mut ast_vec = parse_sql_statements(sql)?;

        if ast_vec.len() != 1 {
            return Err(DatabaseError::ExecutionError {
                sql: sql.to_string(),
-                reason: "query_internal_typed_with_context sollte nur ein einzelnes SQL-Statement erhalten"
+                reason: "query_internal_typed should only receive a single SQL statement"
                    .to_string(),
                table: None,
            });
@ -245,493 +117,168 @@ impl SqlExecutor {
        let sql_str = statement.to_string();
        eprintln!("DEBUG: Transformed SQL (with RETURNING): {}", sql_str);

-        // Spezielle Behandlung für INSERT Statements (mit PK-Remapping + RETURNING)
-        if let Statement::Insert(ref insert_stmt) = statement {
-            if let TableObject::TableName(ref table_name) = insert_stmt.table {
-                let table_name_str = table_name
-                    .to_string()
-                    .trim_matches('`')
-                    .trim_matches('"')
-                    .to_string();
-
-                // Konvertiere Params zu Vec für Manipulation
-                let mut param_vec = params_to_vec(params, tx)?;
-
-                // Hole Table Schema um PKs und FKs zu identifizieren
-                let table_columns =
-                    trigger::get_table_schema(tx, &table_name_str).map_err(|e| {
-                        DatabaseError::ExecutionError {
-                            sql: format!("PRAGMA table_info('{}')", table_name_str),
-                            reason: e.to_string(),
-                            table: Some(table_name_str.clone()),
-                        }
-                    })?;
-
-                let pk_columns: Vec<String> = table_columns
-                    .iter()
-                    .filter(|c| c.is_pk)
-                    .map(|c| c.name.clone())
-                    .collect();
-
-                // Hole Foreign Key Informationen
-                let fk_info = get_fk_info(tx, &table_name_str)?;
-
-                // 1. Extrahiere Original PK-Werte aus params (vor FK-Remapping)
-                let original_pk =
-                    extract_pk_values_from_params(insert_stmt, &param_vec, &pk_columns)?;
-
-                // 2. Remap FK-Werte in params (falls Mappings existieren)
-                remap_fk_params(insert_stmt, &mut param_vec, &fk_info, pk_context)?;
-
-                // 3. Führe INSERT mit query() aus um RETURNING zu lesen
-                let mut stmt = tx
-                    .prepare(&sql_str)
-                    .map_err(|e| DatabaseError::ExecutionError {
-                        sql: sql_str.clone(),
-                        table: Some(table_name_str.clone()),
-                        reason: e.to_string(),
-                    })?;
-
-                let column_names: Vec<String> = stmt
-                    .column_names()
-                    .into_iter()
-                    .map(|s| s.to_string())
-                    .collect();
-                let num_columns = column_names.len();
-
-                let param_refs: Vec<&dyn ToSql> =
-                    param_vec.iter().map(|v| v as &dyn ToSql).collect();
-
-                let mut rows = stmt
-                    .query(params_from_iter(param_refs.iter()))
-                    .map_err(|e| DatabaseError::ExecutionError {
-                        sql: sql_str.clone(),
-                        table: Some(table_name_str.clone()),
-                        reason: e.to_string(),
-                    })?;
-
-                let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
-
-                // 4. Lese ALLE RETURNING Werte und speichere PK-Mapping
-                while let Some(row) = rows.next().map_err(|e| DatabaseError::ExecutionError {
-                    sql: sql_str.clone(),
-                    table: Some(table_name_str.clone()),
-                    reason: e.to_string(),
-                })? {
-                    // Extrahiere PK-Werte für PK-Remapping
-                    let actual_pk = extract_pk_values_from_row(&row, &pk_columns)?;
-                    pk_context.add_mapping(
-                        table_name_str.clone(),
-                        original_pk.clone(),
-                        actual_pk.clone(),
-                    );
-
-                    // Extrahiere ALLE Spalten für RETURNING-Ergebnis
-                    let mut row_values: Vec<JsonValue> = Vec::with_capacity(num_columns);
-
-                    for i in 0..num_columns {
-                        let value_ref =
-                            row.get_ref(i)
-                                .map_err(|e| DatabaseError::RowProcessingError {
-                                    reason: format!("Failed to get column {}: {}", i, e),
-                                })?;
-                        let json_val = convert_value_ref_to_json(value_ref)?;
-                        row_values.push(json_val);
-                    }
-                    result_vec.push(row_values);
-                }
-
-                return Ok((modified_schema_tables, result_vec));
-            }
-        }
-
-        // Für UPDATE/DELETE mit RETURNING: query() verwenden (kein PK-Remapping nötig)
+        // Prepare und query ausführen
        let mut stmt = tx
            .prepare(&sql_str)
-            .map_err(|e| DatabaseError::PrepareError {
+            .map_err(|e| DatabaseError::ExecutionError {
+                sql: sql_str.clone(),
+                table: None,
                reason: e.to_string(),
            })?;

-        let num_columns = stmt.column_count();
+        let column_names: Vec<String> = stmt
+            .column_names()
+            .into_iter()
+            .map(|s| s.to_string())
+            .collect();
+        let num_columns = column_names.len();

-        let mut rows = stmt.query(params).map_err(|e| DatabaseError::QueryError {
-            reason: e.to_string(),
-        })?;
+        let mut rows = stmt
+            .query(params_from_iter(params.iter()))
+            .map_err(|e| DatabaseError::ExecutionError {
+                sql: sql_str.clone(),
+                table: None,
+                reason: e.to_string(),
+            })?;

        let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();

-        while let Some(row) = rows.next().map_err(|e| DatabaseError::RowProcessingError {
-            reason: format!("Row iteration error: {}", e),
+        // Lese alle RETURNING Zeilen
+        while let Some(row) = rows.next().map_err(|e| DatabaseError::ExecutionError {
+            sql: sql_str.clone(),
+            table: None,
+            reason: e.to_string(),
        })? {
-            let mut row_values: Vec<JsonValue> = Vec::with_capacity(num_columns);
-
+            let mut row_values: Vec<JsonValue> = Vec::new();
            for i in 0..num_columns {
-                let value_ref = row
-                    .get_ref(i)
-                    .map_err(|e| DatabaseError::RowProcessingError {
-                        reason: format!("Failed to get column {}: {}", i, e),
-                    })?;
-
-                let json_val = convert_value_ref_to_json(value_ref)?;
-                row_values.push(json_val);
+                let value_ref = row.get_ref(i).map_err(|e| DatabaseError::ExecutionError {
+                    sql: sql_str.clone(),
+                    table: None,
+                    reason: e.to_string(),
+                })?;
+                let json_value = convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
            }
            result_vec.push(row_values);
        }

+        // Trigger-Logik für CREATE TABLE
+        if let Statement::CreateTable(create_table_details) = statement {
+            let raw_name = create_table_details.name.to_string();
+            // Remove quotes from table name
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+            eprintln!("DEBUG: Setting up triggers for table (RETURNING): {}", table_name_str);
+            trigger::setup_triggers_for_table(tx, &table_name_str, false)?;
+        }
+
        Ok((modified_schema_tables, result_vec))
    }

-    /// Legacy-Methode ohne PK-Remapping Context
-    pub fn execute_internal_typed(
-        tx: &Transaction,
-        hlc_service: &HlcService,
-        sql: &str,
-        params: &[&dyn ToSql],
-    ) -> Result<HashSet<String>, DatabaseError> {
-        let mut context = PkRemappingContext::new();
-        Self::execute_internal_typed_with_context(tx, hlc_service, sql, params, &mut context)
-    }
-    /// Führt SQL aus (mit CRDT-Transformation) - OHNE Permission-Check
-    /// Wrapper um execute_internal_typed für JsonValue-Parameter
-    /// Nutzt PK-Remapping Logik für INSERT mit ON CONFLICT
+    /// Führt ein einzelnes SQL Statement OHNE Typinformationen aus (JSON params)
    pub fn execute_internal(
        tx: &Transaction,
        hlc_service: &HlcService,
        sql: &str,
        params: &[JsonValue],
    ) -> Result<HashSet<String>, DatabaseError> {
-        // Parameter validation
-        let total_placeholders = sql.matches('?').count();
-        if total_placeholders != params.len() {
-            return Err(DatabaseError::ParameterMismatchError {
-                expected: total_placeholders,
-                provided: params.len(),
-                sql: sql.to_string(),
-            });
-        }
-
-        // Convert JsonValue params to SqliteValue
-        let params_converted: Vec<SqliteValue> = params
+        let sql_params: Vec<SqliteValue> = params
            .iter()
-            .map(ValueConverter::json_to_rusqlite_value)
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
            .collect::<Result<Vec<_>, _>>()?;
-
-        // Convert to &dyn ToSql references
-        let param_refs: Vec<&dyn ToSql> =
-            params_converted.iter().map(|v| v as &dyn ToSql).collect();
-
-        // Call execute_internal_typed (mit PK-Remapping!)
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();
        Self::execute_internal_typed(tx, hlc_service, sql, &param_refs)
    }

-    /// Führt SELECT aus (mit CRDT-Transformation) - OHNE Permission-Check
-    pub fn select_internal(
-        conn: &Connection,
+    /// Query-Variante (mit RETURNING) OHNE Typinformationen (JSON params)
+    pub fn query_internal(
+        tx: &Transaction,
+        hlc_service: &HlcService,
        sql: &str,
        params: &[JsonValue],
-    ) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
-        // Parameter validation
-        let total_placeholders = sql.matches('?').count();
-        if total_placeholders != params.len() {
-            return Err(DatabaseError::ParameterMismatchError {
-                expected: total_placeholders,
-                provided: params.len(),
-                sql: sql.to_string(),
+    ) -> Result<(HashSet<String>, Vec<Vec<JsonValue>>), DatabaseError> {
+        let sql_params: Vec<SqliteValue> = params
+            .iter()
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
+            .collect::<Result<Vec<_>, _>>()?;
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();
+        Self::query_internal_typed(tx, hlc_service, sql, &param_refs)
+    }
+
+    /// Führt mehrere SQL Statements als Batch aus
+    pub fn execute_batch_internal(
+        tx: &Transaction,
+        hlc_service: &HlcService,
+        sqls: &[String],
+        params: &[Vec<JsonValue>],
+    ) -> Result<HashSet<String>, DatabaseError> {
+        if sqls.len() != params.len() {
+            return Err(DatabaseError::ExecutionError {
+                sql: format!("{} statements but {} param sets", sqls.len(), params.len()),
+                reason: "Statement count and parameter count mismatch".to_string(),
+                table: None,
            });
        }

+        let mut all_modified_tables = HashSet::new();
+
+        for (sql, param_set) in sqls.iter().zip(params.iter()) {
+            let modified_tables = Self::execute_internal(tx, hlc_service, sql, param_set)?;
+            all_modified_tables.extend(modified_tables);
+        }
+
+        Ok(all_modified_tables)
+    }
+
+    /// Query für SELECT-Statements (read-only, kein CRDT nötig außer Filter)
+    pub fn query_select(
+        conn: &rusqlite::Connection,
+        sql: &str,
+        params: &[JsonValue],
+    ) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
        let mut ast_vec = parse_sql_statements(sql)?;

-        if ast_vec.is_empty() {
-            return Ok(vec![]);
+        if ast_vec.len() != 1 {
+            return Err(DatabaseError::ExecutionError {
+                sql: sql.to_string(),
+                reason: "query_select should only receive a single SELECT statement".to_string(),
+                table: None,
+            });
        }

-        // Validate that all statements are queries
-        for stmt in &ast_vec {
-            if !matches!(stmt, Statement::Query(_)) {
-                return Err(DatabaseError::ExecutionError {
-                    sql: sql.to_string(),
-                    reason: "Only SELECT statements are allowed".to_string(),
-                    table: None,
-                });
-            }
-        }
-
-        let sql_params = ValueConverter::convert_params(params)?;
-
        // Hard Delete: Keine SELECT-Transformation mehr nötig
        let stmt_to_execute = ast_vec.pop().unwrap();
        let transformed_sql = stmt_to_execute.to_string();

        eprintln!("DEBUG: SELECT (no transformation): {}", transformed_sql);

+        // Convert JSON params to SQLite values
+        let sql_params: Vec<SqliteValue> = params
+            .iter()
+            .map(|v| crate::database::core::ValueConverter::json_to_rusqlite_value(v))
+            .collect::<Result<Vec<_>, _>>()?;
+
        let mut prepared_stmt = conn.prepare(&transformed_sql)?;

        let num_columns = prepared_stmt.column_count();

-        let mut rows = prepared_stmt
-            .query(params_from_iter(&sql_params[..]))
-            .map_err(|e| DatabaseError::QueryError {
-                reason: e.to_string(),
-            })?;
+        let param_refs: Vec<&dyn ToSql> = sql_params.iter().map(|p| p as &dyn ToSql).collect();

-        let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
-
-        while let Some(row) = rows.next().map_err(|e| DatabaseError::RowProcessingError {
-            reason: format!("Row iteration error: {}", e),
-        })? {
-            let mut row_values: Vec<JsonValue> = Vec::with_capacity(num_columns);
+        let mut rows = prepared_stmt.query(params_from_iter(param_refs.iter()))?;

+        let mut result: Vec<Vec<JsonValue>> = Vec::new();
+        while let Some(row) = rows.next()? {
+            let mut row_values: Vec<JsonValue> = Vec::new();
            for i in 0..num_columns {
-                let value_ref = row
-                    .get_ref(i)
-                    .map_err(|e| DatabaseError::RowProcessingError {
-                        reason: format!("Failed to get column {}: {}", i, e),
-                    })?;
-
-                let json_val = convert_value_ref_to_json(value_ref)?;
-                row_values.push(json_val);
+                let value_ref = row.get_ref(i)?;
+                let json_value = convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
            }
-            result_vec.push(row_values);
+            result.push(row_values);
        }

-        Ok(result_vec)
-    }
-
-    /// Führt SQL mit CRDT-Transformation aus und gibt RETURNING-Ergebnisse zurück
-    /// Speziell für INSERT/UPDATE/DELETE mit RETURNING (Drizzle-Integration)
-    /// Nutzt PK-Remapping für INSERT-Operationen
-    pub fn query_internal(
-        tx: &Transaction,
-        hlc_service: &HlcService,
-        sql: &str,
-        params: &[JsonValue],
-    ) -> Result<Vec<Vec<JsonValue>>, DatabaseError> {
-        // Parameter validation
-        let total_placeholders = sql.matches('?').count();
-        if total_placeholders != params.len() {
-            return Err(DatabaseError::ParameterMismatchError {
-                expected: total_placeholders,
-                provided: params.len(),
-                sql: sql.to_string(),
-            });
-        }
-
-        // Parameter konvertieren
-        let params_converted: Vec<SqliteValue> = params
-            .iter()
-            .map(ValueConverter::json_to_rusqlite_value)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        // Convert to &dyn ToSql references
-        let param_refs: Vec<&dyn ToSql> =
-            params_converted.iter().map(|v| v as &dyn ToSql).collect();
-
-        // Call query_internal_typed_with_context (mit PK-Remapping!)
-        let mut context = PkRemappingContext::new();
-        let (_tables, results) = Self::query_internal_typed_with_context(
-            tx,
-            hlc_service,
-            sql,
-            &param_refs,
-            &mut context,
-        )?;
-
-        Ok(results)
+        Ok(result)
    }
 }
-
-// =========================
-// Helper-Funktionen für FK-Remapping
-// =========================
-
-/// Strukturiert FK-Informationen für einfache Lookups
-#[derive(Debug)]
-struct FkInfo {
-    /// column_name -> (referenced_table, referenced_column)
-    mappings: HashMap<String, (String, String)>,
-}
-
-/// Hole Foreign Key Informationen für eine Tabelle
-fn get_fk_info(tx: &Transaction, table_name: &str) -> Result<FkInfo, DatabaseError> {
-    // Nutze PRAGMA foreign_key_list um FK-Beziehungen zu holen
-    let sql = format!("PRAGMA foreign_key_list('{}');", table_name);
-    let mut stmt = tx
-        .prepare(&sql)
-        .map_err(|e| DatabaseError::ExecutionError {
-            sql: sql.clone(),
-            reason: e.to_string(),
-            table: Some(table_name.to_string()),
-        })?;
-
-    let mut mappings = HashMap::new();
-    let rows = stmt
-        .query_map([], |row| {
-            Ok((
-                row.get::<_, String>("from")?,  // FK column in this table
-                row.get::<_, String>("table")?, // referenced table
-                row.get::<_, String>("to")?,    // referenced column
-            ))
-        })
-        .map_err(|e| DatabaseError::ExecutionError {
-            sql,
-            reason: e.to_string(),
-            table: Some(table_name.to_string()),
-        })?;
-
-    for row in rows {
-        let (from_col, ref_table, ref_col) = row.map_err(|e| DatabaseError::ExecutionError {
-            sql: format!("PRAGMA foreign_key_list('{}')", table_name),
-            reason: e.to_string(),
-            table: Some(table_name.to_string()),
-        })?;
-        mappings.insert(from_col, (ref_table, ref_col));
-    }
-
-    Ok(FkInfo { mappings })
-}
-
-/// Konvertiert &[&dyn ToSql] zu Vec<SqliteValue> für Manipulation
-/// Nutzt einen Dummy-Query um die Parameter-Werte zu extrahieren
-fn params_to_vec(
-    params: &[&dyn ToSql],
-    tx: &Transaction,
-) -> Result<Vec<SqliteValue>, DatabaseError> {
-    let mut values = Vec::new();
-
-    // Erstelle eine Dummy-Query mit genau so vielen Platzhaltern wie wir Parameter haben
-    // z.B. "SELECT ?, ?, ?"
-    if params.is_empty() {
-        return Ok(values);
-    }
-
-    let placeholders = vec!["?"; params.len()].join(", ");
-    let dummy_sql = format!("SELECT {}", placeholders);
-
-    let mut stmt = tx
-        .prepare(&dummy_sql)
-        .map_err(|e| DatabaseError::ExecutionError {
-            sql: dummy_sql.clone(),
-            reason: format!("Failed to prepare dummy query: {}", e),
-            table: None,
-        })?;
-
-    // Führe die Query aus und extrahiere die Werte aus der Row
-    let mut rows = stmt
-        .query(params)
-        .map_err(|e| DatabaseError::ExecutionError {
-            sql: dummy_sql.clone(),
-            reason: format!("Failed to execute dummy query: {}", e),
-            table: None,
-        })?;
-
-    if let Some(row) = rows.next().map_err(|e| DatabaseError::ExecutionError {
-        sql: dummy_sql,
-        reason: format!("Failed to read dummy query result: {}", e),
-        table: None,
-    })? {
-        // Extrahiere alle Spalten-Werte
-        for i in 0..params.len() {
-            let value: SqliteValue = row.get(i).map_err(|e| DatabaseError::ExecutionError {
-                sql: format!("SELECT ..."),
-                reason: format!("Failed to extract value at index {}: {}", i, e),
-                table: None,
-            })?;
-            values.push(value);
-        }
-    }
-
-    Ok(values)
-}
-
-/// Extrahiert PK-Werte aus den INSERT-Parametern
-fn extract_pk_values_from_params(
-    insert_stmt: &Insert,
-    params: &[SqliteValue],
-    pk_columns: &[String],
-) -> Result<PkValues, DatabaseError> {
-    let mut pk_values = PkValues::new();
-
-    // Finde die Positionen der PK-Spalten in der INSERT column list
-    for pk_col in pk_columns {
-        if let Some(pos) = insert_stmt.columns.iter().position(|c| &c.value == pk_col) {
-            // Hole den Parameter-Wert an dieser Position
-            if pos < params.len() {
-                // Konvertiere SqliteValue zu String
-                let value_str = value_to_string(&params[pos]);
-                pk_values.insert(pk_col.clone(), value_str);
-            }
-        }
-    }
-
-    Ok(pk_values)
-}
-
-/// Remapped FK-Werte in den Parametern basierend auf dem PK-Remapping Context
-fn remap_fk_params(
-    insert_stmt: &Insert,
-    params: &mut Vec<SqliteValue>,
-    fk_info: &FkInfo,
-    pk_context: &PkRemappingContext,
-) -> Result<(), DatabaseError> {
-    // Für jede FK-Spalte: prüfe ob Remapping nötig ist
-    for (col_name, (ref_table, ref_col)) in &fk_info.mappings {
-        // Finde Position der FK-Spalte in der INSERT column list
-        if let Some(pos) = insert_stmt
-            .columns
-            .iter()
-            .position(|c| &c.value == col_name)
-        {
-            if pos < params.len() {
-                // Hole aktuellen FK-Wert (als String)
-                let current_value = value_to_string(&params[pos]);
-
-                // Versuche zu remappen
-                let new_value = pk_context.remap_fk_value(ref_table, ref_col, &current_value);
-
-                if new_value != current_value {
-                    // Ersetze den Parameter-Wert
-                    params[pos] = SqliteValue::Text(new_value);
-                    eprintln!(
-                        "DEBUG: Remapped FK {}={} to {:?}",
-                        col_name, current_value, params[pos]
-                    );
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-/// Hilfsfunktion: Konvertiert SqliteValue zu String für Vergleiche
-fn value_to_string(value: &SqliteValue) -> String {
-    match value {
-        SqliteValue::Null => "NULL".to_string(),
-        SqliteValue::Integer(i) => i.to_string(),
-        SqliteValue::Real(r) => r.to_string(),
-        SqliteValue::Text(s) => s.clone(),
-        SqliteValue::Blob(b) => format!("BLOB({} bytes)", b.len()),
-    }
-}
-
-/// Extrahiert PK-Werte aus einer RETURNING Row
-fn extract_pk_values_from_row(
-    row: &rusqlite::Row,
-    pk_columns: &[String],
-) -> Result<PkValues, DatabaseError> {
-    let mut pk_values = PkValues::new();
-
-    for pk_col in pk_columns.iter() {
-        let value: String =
-            row.get(pk_col.as_str())
-                .map_err(|e| DatabaseError::ExecutionError {
-                    sql: "RETURNING clause".to_string(),
-                    reason: format!("Failed to extract PK column '{}': {}", pk_col, e),
-                    table: None,
-                })?;
-        pk_values.insert(pk_col.clone(), value);
-    }
-
-    Ok(pk_values)
-}
--- a/src-tauri/src/extension/database/mod.rs
+++ b/src-tauri/src/extension/database/mod.rs
@ -5,6 +5,7 @@ use crate::crdt::transformer::CrdtTransformer;
 use crate::crdt::trigger;
 use crate::database::core::{parse_sql_statements, with_connection, ValueConverter};
 use crate::database::error::DatabaseError;
+use crate::extension::database::executor::SqlExecutor;
 use crate::extension::error::ExtensionError;
 use crate::extension::permissions::validator::SqlPermissionValidator;
 use crate::AppState;
@ -110,7 +111,7 @@ pub async fn extension_sql_execute(
    public_key: String,
    name: String,
    state: State<'_, AppState>,
-) -> Result<Vec<String>, ExtensionError> {
+) -> Result<Vec<Vec<JsonValue>>, ExtensionError> {
    // Get extension to retrieve its ID
    let extension = state
        .extension_manager
@ -129,58 +130,87 @@ pub async fn extension_sql_execute(
    // SQL parsing
    let mut ast_vec = parse_sql_statements(sql)?;

+    if ast_vec.len() != 1 {
+        return Err(ExtensionError::Database {
+            source: DatabaseError::ExecutionError {
+                sql: sql.to_string(),
+                reason: "extension_sql_execute should only receive a single SQL statement"
+                    .to_string(),
+                table: None,
+            },
+        });
+    }
+
+    let mut statement = ast_vec.pop().unwrap();
+
+    // Check if statement has RETURNING clause
+    let has_returning = crate::database::core::statement_has_returning(&statement);
+
    // Database operation
    with_connection(&state.db, |conn| {
        let tx = conn.transaction().map_err(DatabaseError::from)?;

        let transformer = CrdtTransformer::new();
-        let executor = StatementExecutor::new(&tx);
+
+        // Get HLC service reference
+        let hlc_service = state.hlc.lock().map_err(|_| DatabaseError::MutexPoisoned {
+            reason: "Failed to lock HLC service".to_string(),
+        })?;

        // Generate HLC timestamp
-        let hlc_timestamp = state
-            .hlc
-            .lock()
-            .unwrap()
+        let hlc_timestamp = hlc_service
            .new_timestamp_and_persist(&tx)
            .map_err(|e| DatabaseError::HlcError {
                reason: e.to_string(),
            })?;

-        // Transform statements
-        let mut modified_schema_tables = HashSet::new();
-        for statement in &mut ast_vec {
-            if let Some(table_name) =
-                transformer.transform_execute_statement(statement, &hlc_timestamp)?
-            {
-                modified_schema_tables.insert(table_name);
-            }
-        }
+        // Transform statement
+        transformer.transform_execute_statement(&mut statement, &hlc_timestamp)?;

-        // Convert parameters
+        // Convert parameters to references
        let sql_values = ValueConverter::convert_params(&params)?;
+        let param_refs: Vec<&dyn rusqlite::ToSql> = sql_values.iter().map(|v| v as &dyn rusqlite::ToSql).collect();

-        // Execute statements
-        for statement in ast_vec {
-            executor.execute_statement_with_params(&statement, &sql_values)?;
+        let result = if has_returning {
+            // Use query_internal for statements with RETURNING
+            let (_, rows) = SqlExecutor::query_internal_typed(&tx, &hlc_service, &statement.to_string(), &param_refs)?;
+            rows
+        } else {
+            // Use execute_internal for statements without RETURNING
+            SqlExecutor::execute_internal_typed(&tx, &hlc_service, &statement.to_string(), &param_refs)?;
+            vec![]
+        };

-            if let Statement::CreateTable(create_table_details) = statement {
-                let table_name_str = create_table_details.name.to_string();
-                println!(
-                    "Table '{}' created by extension, setting up CRDT triggers...",
-                    table_name_str
-                );
-                trigger::setup_triggers_for_table(&tx, &table_name_str, false)?;
-                println!(
-                    "Triggers for table '{}' successfully created.",
-                    table_name_str
-                );
-            }
+        // Handle CREATE TABLE trigger setup
+        if let Statement::CreateTable(ref create_table_details) = statement {
+            // Extract table name and remove quotes (both " and `)
+            let raw_name = create_table_details.name.to_string();
+            println!("DEBUG: Raw table name from AST: {:?}", raw_name);
+            println!("DEBUG: Raw table name chars: {:?}", raw_name.chars().collect::<Vec<_>>());
+
+            let table_name_str = raw_name
+                .trim_matches('"')
+                .trim_matches('`')
+                .to_string();
+
+            println!("DEBUG: Cleaned table name: {:?}", table_name_str);
+            println!("DEBUG: Cleaned table name chars: {:?}", table_name_str.chars().collect::<Vec<_>>());
+
+            println!(
+                "Table '{}' created by extension, setting up CRDT triggers...",
+                table_name_str
+            );
+            trigger::setup_triggers_for_table(&tx, &table_name_str, false)?;
+            println!(
+                "Triggers for table '{}' successfully created.",
+                table_name_str
+            );
        }

        // Commit transaction
        tx.commit().map_err(DatabaseError::from)?;

-        Ok(modified_schema_tables.into_iter().collect())
+        Ok(result)
    })
    .map_err(ExtensionError::from)
 }
@ -192,7 +222,7 @@ pub async fn extension_sql_select(
    public_key: String,
    name: String,
    state: State<'_, AppState>,
-) -> Result<Vec<JsonValue>, ExtensionError> {
+) -> Result<Vec<Vec<JsonValue>>, ExtensionError> {
    // Get extension to retrieve its ID
    let extension = state
        .extension_manager
@ -229,10 +259,9 @@ pub async fn extension_sql_select(
        }
    }

-    // Database operation
+    // Database operation - return Vec<Vec<JsonValue>> like sql_select_with_crdt
    with_connection(&state.db, |conn| {
        let sql_params = ValueConverter::convert_params(&params)?;
-        // Hard Delete: Keine SELECT-Transformation mehr nötig
        let stmt_to_execute = ast_vec.pop().unwrap();
        let transformed_sql = stmt_to_execute.to_string();

@ -245,51 +274,34 @@ pub async fn extension_sql_select(
                    table: None,
                })?;

-        let column_names: Vec<String> = prepared_stmt
-            .column_names()
-            .into_iter()
-            .map(|s| s.to_string())
-            .collect();
-
-        let rows = prepared_stmt
-            .query_map(params_from_iter(sql_params.iter()), |row| {
-                row_to_json_value(row, &column_names)
-            })
+        let num_columns = prepared_stmt.column_count();
+        let mut rows = prepared_stmt
+            .query(params_from_iter(sql_params.iter()))
            .map_err(|e| DatabaseError::QueryError {
                reason: e.to_string(),
            })?;

-        let mut results = Vec::new();
-        for row_result in rows {
-            results.push(row_result.map_err(|e| DatabaseError::RowProcessingError {
-                reason: e.to_string(),
-            })?);
+        let mut result_vec: Vec<Vec<JsonValue>> = Vec::new();
+
+        while let Some(row) = rows.next().map_err(|e| DatabaseError::QueryError {
+            reason: e.to_string(),
+        })? {
+            let mut row_values: Vec<JsonValue> = Vec::new();
+            for i in 0..num_columns {
+                let value_ref = row.get_ref(i).map_err(|e| DatabaseError::QueryError {
+                    reason: e.to_string(),
+                })?;
+                let json_value = crate::database::core::convert_value_ref_to_json(value_ref)?;
+                row_values.push(json_value);
+            }
+            result_vec.push(row_values);
        }

-        Ok(results)
+        Ok(result_vec)
    })
    .map_err(ExtensionError::from)
 }

-/// Konvertiert eine SQLite-Zeile zu JSON
-fn row_to_json_value(
-    row: &rusqlite::Row,
-    columns: &[String],
-) -> Result<JsonValue, rusqlite::Error> {
-    let mut map = serde_json::Map::new();
-    for (i, col_name) in columns.iter().enumerate() {
-        let value = row.get::<usize, rusqlite::types::Value>(i)?;
-        let json_value = match value {
-            rusqlite::types::Value::Null => JsonValue::Null,
-            rusqlite::types::Value::Integer(i) => json!(i),
-            rusqlite::types::Value::Real(f) => json!(f),
-            rusqlite::types::Value::Text(s) => json!(s),
-            rusqlite::types::Value::Blob(blob) => json!(blob.to_vec()),
-        };
-        map.insert(col_name.clone(), json_value);
-    }
-    Ok(JsonValue::Object(map))
-}

 /// Validiert Parameter gegen SQL-Platzhalter
 fn validate_params(sql: &str, params: &[JsonValue]) -> Result<(), DatabaseError> {
--- a/src-tauri/src/extension/mod.rs
+++ b/src-tauri/src/extension/mod.rs
@ -1,7 +1,7 @@
 /// src-tauri/src/extension/mod.rs
 use crate::{
    extension::{
-        core::{EditablePermissions, ExtensionInfoResponse, ExtensionPreview},
+        core::{manager::ExtensionManager, EditablePermissions, ExtensionInfoResponse, ExtensionPreview},
        error::ExtensionError,
    },
    AppState,
@ -37,7 +37,7 @@ pub async fn get_all_extensions(
    state: State<'_, AppState>,
 ) -> Result<Vec<ExtensionInfoResponse>, String> {
    // Check if extensions are loaded, if not load them first
-    let needs_loading = {
+    /*  let needs_loading = {
        let prod_exts = state
            .extension_manager
            .production_extensions
@ -45,15 +45,15 @@ pub async fn get_all_extensions(
            .unwrap();
        let dev_exts = state.extension_manager.dev_extensions.lock().unwrap();
        prod_exts.is_empty() && dev_exts.is_empty()
-    };
+    }; */

-    if needs_loading {
-        state
-            .extension_manager
-            .load_installed_extensions(&app_handle, &state)
-            .await
-            .map_err(|e| format!("Failed to load extensions: {:?}", e))?;
-    }
+    /* if needs_loading { */
+    state
+        .extension_manager
+        .load_installed_extensions(&app_handle, &state)
+        .await
+        .map_err(|e| format!("Failed to load extensions: {:?}", e))?;
+    /* } */

    let mut extensions = Vec::new();

@ -82,12 +82,13 @@ pub async fn get_all_extensions(

 #[tauri::command]
 pub async fn preview_extension(
+    app_handle: AppHandle,
    state: State<'_, AppState>,
    file_bytes: Vec<u8>,
 ) -> Result<ExtensionPreview, ExtensionError> {
    state
        .extension_manager
-        .preview_extension_internal(file_bytes)
+        .preview_extension_internal(&app_handle, file_bytes)
        .await
 }

@ -193,13 +194,7 @@ pub async fn remove_extension(
 ) -> Result<(), ExtensionError> {
    state
        .extension_manager
-        .remove_extension_internal(
-            &app_handle,
-            &public_key,
-            &name,
-            &version,
-            &state,
-        )
+        .remove_extension_internal(&app_handle, &public_key, &name, &version, &state)
        .await
 }

@ -223,6 +218,16 @@ pub fn is_extension_installed(
 #[derive(serde::Deserialize, Debug)]
 struct HaextensionConfig {
    dev: DevConfig,
+    #[serde(default)]
+    keys: KeysConfig,
+}
+
+#[derive(serde::Deserialize, Debug, Default)]
+struct KeysConfig {
+    #[serde(default)]
+    public_key_path: Option<String>,
+    #[serde(default)]
+    private_key_path: Option<String>,
 }

 #[derive(serde::Deserialize, Debug)]
@ -231,6 +236,8 @@ struct DevConfig {
    port: u16,
    #[serde(default = "default_host")]
    host: String,
+    #[serde(default = "default_haextension_dir")]
+    haextension_dir: String,
 }

 fn default_port() -> u16 {
@ -241,10 +248,14 @@ fn default_host() -> String {
    "localhost".to_string()
 }

+fn default_haextension_dir() -> String {
+    "haextension".to_string()
+}
+
 /// Check if a dev server is reachable by making a simple HTTP request
 async fn check_dev_server_health(url: &str) -> bool {
-    use tauri_plugin_http::reqwest;
    use std::time::Duration;
+    use tauri_plugin_http::reqwest;

    // Try to connect with a short timeout
    let client = reqwest::Client::builder()
@ -276,29 +287,28 @@ pub async fn load_dev_extension(

    let extension_path_buf = PathBuf::from(&extension_path);

-    // 1. Read haextension.json to get dev server config
-    let config_path = extension_path_buf.join("haextension.json");
-    let (host, port) = if config_path.exists() {
-        let config_content = std::fs::read_to_string(&config_path).map_err(|e| {
-            ExtensionError::ValidationError {
-                reason: format!("Failed to read haextension.json: {}", e),
-            }
-        })?;
+    // 1. Read haextension.config.json to get dev server config and haextension directory
+    let config_path = extension_path_buf.join("haextension.config.json");
+    let (host, port, haextension_dir) = if config_path.exists() {
+        let config_content =
+            std::fs::read_to_string(&config_path).map_err(|e| ExtensionError::ValidationError {
+                reason: format!("Failed to read haextension.config.json: {}", e),
+            })?;

-        let config: HaextensionConfig = serde_json::from_str(&config_content).map_err(|e| {
-            ExtensionError::ValidationError {
-                reason: format!("Failed to parse haextension.json: {}", e),
-            }
-        })?;
+        let config: HaextensionConfig =
+            serde_json::from_str(&config_content).map_err(|e| ExtensionError::ValidationError {
+                reason: format!("Failed to parse haextension.config.json: {}", e),
+            })?;

-        (config.dev.host, config.dev.port)
+        (config.dev.host, config.dev.port, config.dev.haextension_dir)
    } else {
        // Default values if config doesn't exist
-        (default_host(), default_port())
+        (default_host(), default_port(), default_haextension_dir())
    };

    let dev_server_url = format!("http://{}:{}", host, port);
    eprintln!("📡 Dev server URL: {}", dev_server_url);
+    eprintln!("📁 Haextension directory: {}", haextension_dir);

    // 1.5. Check if dev server is running
    if !check_dev_server_health(&dev_server_url).await {
@ -311,35 +321,30 @@ pub async fn load_dev_extension(
    }
    eprintln!("✅ Dev server is reachable");

-    // 2. Build path to manifest: <extension_path>/haextension/manifest.json
-    let manifest_path = extension_path_buf.join("haextension").join("manifest.json");
-
-    // Check if manifest exists
-    if !manifest_path.exists() {
-        return Err(ExtensionError::ManifestError {
-            reason: format!(
-                "Manifest not found at: {}. Make sure you run 'npx @haexhub/sdk init' first.",
-                manifest_path.display()
-            ),
-        });
-    }
+    // 2. Validate and build path to manifest: <extension_path>/<haextension_dir>/manifest.json
+    let manifest_relative_path = format!("{}/manifest.json", haextension_dir);
+    let manifest_path = ExtensionManager::validate_path_in_directory(
+        &extension_path_buf,
+        &manifest_relative_path,
+        true,
+    )?
+    .ok_or_else(|| ExtensionError::ManifestError {
+        reason: format!(
+            "Manifest not found at: {}/manifest.json. Make sure you run 'npx @haexhub/sdk init' first.",
+            haextension_dir
+        ),
+    })?;

    // 3. Read and parse manifest
-    let manifest_content = std::fs::read_to_string(&manifest_path).map_err(|e| {
-        ExtensionError::ManifestError {
+    let manifest_content =
+        std::fs::read_to_string(&manifest_path).map_err(|e| ExtensionError::ManifestError {
            reason: format!("Failed to read manifest: {}", e),
-        }
-    })?;
+        })?;

    let manifest: ExtensionManifest = serde_json::from_str(&manifest_content)?;

-    // 4. Generate a unique ID for dev extension: dev_<public_key_first_8>_<name>
-    let key_prefix = manifest
-        .public_key
-        .chars()
-        .take(8)
-        .collect::<String>();
-    let extension_id = format!("dev_{}_{}", key_prefix, manifest.name);
+    // 4. Generate a unique ID for dev extension: dev_<public_key>_<name>
+    let extension_id = format!("dev_{}_{}", manifest.public_key, manifest.name);

    // 5. Check if dev extension already exists (allow reload)
    if let Some(existing) = state
@ -387,13 +392,11 @@ pub fn remove_dev_extension(
    state: State<'_, AppState>,
 ) -> Result<(), ExtensionError> {
    // Only remove from dev_extensions, not production_extensions
-    let mut dev_exts = state
-        .extension_manager
-        .dev_extensions
-        .lock()
-        .map_err(|e| ExtensionError::MutexPoisoned {
+    let mut dev_exts = state.extension_manager.dev_extensions.lock().map_err(|e| {
+        ExtensionError::MutexPoisoned {
            reason: e.to_string(),
-        })?;
+        }
+    })?;

    // Find and remove by public_key and name
    let to_remove = dev_exts
@ -406,10 +409,7 @@ pub fn remove_dev_extension(
        eprintln!("✅ Dev extension removed: {}", name);
        Ok(())
    } else {
-        Err(ExtensionError::NotFound {
-            public_key,
-            name,
-        })
+        Err(ExtensionError::NotFound { public_key, name })
    }
 }

--- a/src-tauri/src/extension/permissions/manager.rs
+++ b/src-tauri/src/extension/permissions/manager.rs
@ -197,6 +197,30 @@ impl PermissionManager {
        action: Action,
        table_name: &str,
    ) -> Result<(), ExtensionError> {
+        // Remove quotes from table name if present (from SDK's getTableName())
+        let clean_table_name = table_name.trim_matches('"');
+
+        // Auto-allow: Extensions have full access to their own tables
+        // Table format: {publicKey}__{extensionName}__{tableName}
+        // Extension ID format: dev_{publicKey}_{extensionName} or {publicKey}_{extensionName}
+
+        // Get the extension to check if this is its own table
+        let extension = app_state
+            .extension_manager
+            .get_extension(extension_id)
+            .ok_or_else(|| ExtensionError::ValidationError {
+                reason: format!("Extension with ID {} not found", extension_id),
+            })?;
+
+        // Build expected table prefix: {publicKey}__{extensionName}__
+        let expected_prefix = format!("{}__{}__", extension.manifest.public_key, extension.manifest.name);
+
+        if clean_table_name.starts_with(&expected_prefix) {
+            // This is the extension's own table - auto-allow
+            return Ok(());
+        }
+
+        // Not own table - check explicit permissions
        let permissions = Self::get_permissions(app_state, extension_id).await?;

        let has_permission = permissions
@ -205,7 +229,7 @@ impl PermissionManager {
            .filter(|perm| perm.resource_type == ResourceType::Db)
            .filter(|perm| perm.action == action) // action ist nicht mehr Option
            .any(|perm| {
-                if perm.target != "*" && perm.target != table_name {
+                if perm.target != "*" && perm.target != clean_table_name {
                    return false;
                }
                true
--- a/src-tauri/src/extension/permissions/types.rs
+++ b/src-tauri/src/extension/permissions/types.rs
@ -165,8 +165,6 @@ pub struct ExtensionPermission {
    pub constraints: Option<PermissionConstraints>,
    pub status: PermissionStatus,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub haex_tombstone: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub haex_timestamp: Option<String>,
 }

@ -341,9 +339,9 @@ impl From<&ExtensionPermission> for crate::database::generated::HaexExtensionPer
    fn from(perm: &ExtensionPermission) -> Self {
        Self {
            id: perm.id.clone(),
-            extension_id: Some(perm.extension_id.clone()),
+            extension_id: perm.extension_id.clone(),
            resource_type: Some(perm.resource_type.as_str().to_string()),
-            action: Some(perm.action.as_str()),
+            action: Some(perm.action.as_str().to_string()),
            target: Some(perm.target.clone()),
            constraints: perm
                .constraints
@ -352,7 +350,6 @@ impl From<&ExtensionPermission> for crate::database::generated::HaexExtensionPer
            status: perm.status.as_str().to_string(),
            created_at: None,
            updated_at: None,
-            haex_tombstone: perm.haex_tombstone,
            haex_timestamp: perm.haex_timestamp.clone(),
        }
    }
@ -382,13 +379,12 @@ impl From<crate::database::generated::HaexExtensionPermissions> for ExtensionPer

        Self {
            id: db_perm.id,
-            extension_id: db_perm.extension_id.unwrap_or_default(),
+            extension_id: db_perm.extension_id,
            resource_type,
            action,
            target: db_perm.target.unwrap_or_default(),
            constraints,
            status,
-            haex_tombstone: db_perm.haex_tombstone,
            haex_timestamp: db_perm.haex_timestamp,
        }
    }
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@ -68,6 +68,7 @@ pub fn run() {
        .invoke_handler(tauri::generate_handler![
            database::create_encrypted_database,
            database::delete_vault,
+            database::move_vault_to_trash,
            database::list_vaults,
            database::open_encrypted_database,
            database::sql_execute_with_crdt,
--- a/src/app.config.ts
+++ b/src/app.config.ts
@ -3,6 +3,8 @@ export default defineAppConfig({
    colors: {
      primary: 'sky',
      secondary: 'fuchsia',
+      warning: 'yellow',
+      danger: 'red',
    },
  },
 })
--- a/src/app.vue
+++ b/src/app.vue
@ -1,9 +1,7 @@
 <template>
  <UApp :locale="locales[locale]">
    <div data-vaul-drawer-wrapper>
-      <NuxtLayout>
-        <NuxtPage />
-      </NuxtLayout>
+      <NuxtPage />
    </div>
  </UApp>
 </template>
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@ -13,6 +13,46 @@
  [disabled] {
    @apply cursor-not-allowed;
  }
+
+  /* Define safe-area-insets as CSS custom properties for JavaScript access */
+  :root {
+    --safe-area-inset-top: env(safe-area-inset-top, 0px);
+    --safe-area-inset-bottom: env(safe-area-inset-bottom, 0px);
+    --safe-area-inset-left: env(safe-area-inset-left, 0px);
+    --safe-area-inset-right: env(safe-area-inset-right, 0px);
+  }
+
+  /* Verhindere Scrolling auf html und body */
+  html {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+    height: 100dvh;
+    height: 100vh; /* Fallback */
+    width: 100%;
+  }
+
+  body {
+    overflow: hidden;
+    margin: 0;
+    height: 100%;
+    width: 100%;
+    padding: 0;
+  }
+
+  #__nuxt {
+    /* Volle Höhe des body */
+    height: 100%;
+    width: 100%;
+
+    /* Safe-Area Paddings auf root element - damit ALLES davon profitiert */
+    padding-top: var(--safe-area-inset-top);
+    padding-bottom: var(--safe-area-inset-bottom);
+    padding-left: var(--safe-area-inset-left);
+    padding-right: var(--safe-area-inset-right);
+
+    box-sizing: border-box;
+  }
 }

@theme {
--- a/src/components/haex/debug/overlay.vue
+++ b/src/components/haex/debug/overlay.vue
@ -0,0 +1,61 @@
+<template>
+  <div
+    v-if="data"
+    class="fixed top-2 right-2 bg-black/90 text-white text-xs p-3 rounded-lg shadow-2xl max-w-sm z-[9999] backdrop-blur-sm"
+  >
+    <div class="flex justify-between items-start gap-3 mb-2">
+      <span class="font-bold text-sm">{{ title }}</span>
+      <div class="flex gap-1">
+        <button
+          class="bg-white/20 hover:bg-white/30 px-2 py-1 rounded text-xs transition-colors"
+          @click="copyToClipboardAsync"
+        >
+          Copy
+        </button>
+        <button
+          v-if="dismissible"
+          class="bg-white/20 hover:bg-white/30 px-2 py-1 rounded text-xs transition-colors"
+          @click="handleDismiss"
+        >
+          ✕
+        </button>
+      </div>
+    </div>
+    <pre class="text-xs whitespace-pre-wrap font-mono overflow-auto max-h-96">{{ formattedData }}</pre>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(
+  defineProps<{
+    data: Record<string, any> | null
+    title?: string
+    dismissible?: boolean
+  }>(),
+  {
+    title: 'Debug Info',
+    dismissible: false,
+  },
+)
+
+const emit = defineEmits<{
+  dismiss: []
+}>()
+
+const formattedData = computed(() => {
+  if (!props.data) return ''
+  return JSON.stringify(props.data, null, 2)
+})
+
+const copyToClipboardAsync = async () => {
+  try {
+    await navigator.clipboard.writeText(formattedData.value)
+  } catch (err) {
+    console.error('Failed to copy debug info:', err)
+  }
+}
+
+const handleDismiss = () => {
+  emit('dismiss')
+}
+</script>
--- a/src/components/haex/desktop/extension-frame.vue
+++ b/src/components/haex/desktop/extension-frame.vue
@ -36,7 +36,7 @@
      <div class="flex flex-col items-center gap-4">
        <div
          class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"
-        ></div>
+        />
        <p class="text-sm text-gray-600 dark:text-gray-400">
          Loading extension...
        </p>
--- a/src/components/haex/desktop/icon.vue
+++ b/src/components/haex/desktop/icon.vue
@ -69,7 +69,7 @@
 <script setup lang="ts">
 const props = defineProps<{
  id: string
-  itemType: 'extension' | 'file' | 'folder'
+  itemType: DesktopItemType
  referenceId: string
  initialX: number
  initialY: number
--- a/src/components/haex/desktop/index.vue
+++ b/src/components/haex/desktop/index.vue
@ -1,7 +1,7 @@
 <template>
  <div
    ref="desktopEl"
-    class="w-full h-full relative overflow-hidden isolate"
+    class="absolute inset-0 overflow-hidden"
  >
    <Swiper
      :modules="[SwiperNavigation]"
@ -10,14 +10,13 @@
      :initial-slide="currentWorkspaceIndex"
      :speed="300"
      :touch-angle="45"
-      :threshold="10"
      :no-swiping="true"
      no-swiping-class="no-swipe"
      :allow-touch-move="allowSwipe"
-      class="w-full h-full"
+      class="h-full w-full"
+      direction="vertical"
      @swiper="onSwiperInit"
      @slide-change="onSlideChange"
-      direction="vertical"
    >
      <SwiperSlide
        v-for="workspace in workspaces"
@ -25,9 +24,11 @@
        class="w-full h-full"
      >
        <div
-          class="w-full h-full relative isolate"
+          class="w-full h-full relative"
          @click.self.stop="handleDesktopClick"
          @mousedown.left.self="handleAreaSelectStart"
+          @dragover.prevent="handleDragOver"
+          @drop.prevent="handleDrop($event, workspace.id)"
        >
          <!-- Grid Pattern Background -->
          <div
@ -40,18 +41,16 @@
          />

          <!-- Snap Dropzones (only visible when window drag near edge) -->
-          <Transition name="fade">
-            <div
-              v-if="showLeftSnapZone"
-              class="absolute left-0 top-0 bottom-0 w-1/2 bg-blue-500/20 border-2 border-blue-500 pointer-events-none backdrop-blur-sm z-40"
-            />
-          </Transition>
-          <Transition name="fade">
-            <div
-              v-if="showRightSnapZone"
-              class="absolute right-0 top-0 bottom-0 w-1/2 bg-blue-500/20 border-2 border-blue-500 pointer-events-none backdrop-blur-sm z-40"
-            />
-          </Transition>
+
+          <div
+            class="absolute left-0 top-0 bottom-0 border-blue-500 pointer-events-none backdrop-blur-sm z-50 transition-all duration-500 ease-in-out"
+            :class="showLeftSnapZone ? 'w-1/2 bg-blue-500/20 border-2' : 'w-0'"
+          />
+
+          <div
+            class="absolute right-0 top-0 bottom-0 border-blue-500 pointer-events-none backdrop-blur-sm z-50 transition-all duration-500 ease-in-out"
+            :class="showRightSnapZone ? 'w-1/2 bg-blue-500/20 border-2' : 'w-0'"
+          />

          <!-- Area Selection Box -->
          <div
@ -79,83 +78,93 @@

          <!-- Windows for this workspace -->
          <template
-            v-for="(window, index) in getWorkspaceWindows(workspace.id)"
+            v-for="window in getWorkspaceWindows(workspace.id)"
            :key="window.id"
          >
-            <!-- Wrapper for Overview Mode Click/Drag -->
-            <div
-              v-if="false"
-              :style="
-                getOverviewWindowGridStyle(
-                  index,
-                  getWorkspaceWindows(workspace.id).length,
-                )
+            <!-- Overview Mode: Teleport to window preview -->
+            <Teleport
+              v-if="
+                windowManager.showWindowOverview &&
+                overviewWindowState.has(window.id)
              "
-              class="absolute cursor-pointer group"
-              :draggable="true"
-              @dragstart="handleOverviewWindowDragStart($event, window.id)"
-              @dragend="handleOverviewWindowDragEnd"
-              @click="handleOverviewWindowClick(window.id)"
+              :to="`#window-preview-${window.id}`"
            >
-              <!-- Overlay for click/drag events (prevents interaction with window content) -->
              <div
-                class="absolute inset-0 z-[100] bg-transparent group-hover:ring-4 group-hover:ring-purple-500 rounded-xl transition-all"
-              />
-
-              <HaexWindow
-                :id="window.id"
-                :title="window.title"
-                :icon="window.icon"
-                :initial-x="window.x"
-                :initial-y="window.y"
-                :initial-width="window.width"
-                :initial-height="window.height"
-                :is-active="windowManager.isWindowActive(window.id)"
-                :source-x="window.sourceX"
-                :source-y="window.sourceY"
-                :source-width="window.sourceWidth"
-                :source-height="window.sourceHeight"
-                :is-opening="window.isOpening"
-                :is-closing="window.isClosing"
-                class="no-swipe pointer-events-none"
-                @close="windowManager.closeWindow(window.id)"
-                @minimize="windowManager.minimizeWindow(window.id)"
-                @activate="windowManager.activateWindow(window.id)"
-                @position-changed="
-                  (x, y) => windowManager.updateWindowPosition(window.id, x, y)
-                "
-                @size-changed="
-                  (width, height) =>
-                    windowManager.updateWindowSize(window.id, width, height)
-                "
-                @drag-start="handleWindowDragStart(window.id)"
-                @drag-end="handleWindowDragEnd"
+                class="absolute origin-top-left"
+                :style="{
+                  transform: `scale(${overviewWindowState.get(window.id)!.scale})`,
+                  width: `${overviewWindowState.get(window.id)!.width}px`,
+                  height: `${overviewWindowState.get(window.id)!.height}px`,
+                }"
              >
-                {{ window }}
-                <!-- System Window: Render Vue Component -->
-                <component
-                  :is="getSystemWindowComponent(window.sourceId)"
-                  v-if="window.type === 'system'"
-                />
+                <HaexWindow
+                  v-show="
+                    windowManager.showWindowOverview || !window.isMinimized
+                  "
+                  :id="window.id"
+                  v-model:x="overviewWindowState.get(window.id)!.x"
+                  v-model:y="overviewWindowState.get(window.id)!.y"
+                  v-model:width="overviewWindowState.get(window.id)!.width"
+                  v-model:height="overviewWindowState.get(window.id)!.height"
+                  :title="window.title"
+                  :icon="window.icon"
+                  :is-active="windowManager.isWindowActive(window.id)"
+                  :source-x="window.sourceX"
+                  :source-y="window.sourceY"
+                  :source-width="window.sourceWidth"
+                  :source-height="window.sourceHeight"
+                  :is-opening="window.isOpening"
+                  :is-closing="window.isClosing"
+                  :warning-level="
+                    window.type === 'extension' &&
+                    availableExtensions.find(
+                      (ext) => ext.id === window.sourceId,
+                    )?.devServerUrl
+                      ? 'warning'
+                      : undefined
+                  "
+                  class="no-swipe"
+                  @close="windowManager.closeWindow(window.id)"
+                  @minimize="windowManager.minimizeWindow(window.id)"
+                  @activate="windowManager.activateWindow(window.id)"
+                  @position-changed="
+                    (x, y) =>
+                      windowManager.updateWindowPosition(window.id, x, y)
+                  "
+                  @size-changed="
+                    (width, height) =>
+                      windowManager.updateWindowSize(window.id, width, height)
+                  "
+                  @drag-start="handleWindowDragStart(window.id)"
+                  @drag-end="handleWindowDragEnd"
+                >
+                  <!-- System Window: Render Vue Component -->
+                  <component
+                    :is="getSystemWindowComponent(window.sourceId)"
+                    v-if="window.type === 'system'"
+                  />

-                <!-- Extension Window: Render iFrame -->
-                <HaexDesktopExtensionFrame
-                  v-else
-                  :extension-id="window.sourceId"
-                  :window-id="window.id"
-                />
-              </HaexWindow>
-            </div>
+                  <!-- Extension Window: Render iFrame -->
+                  <HaexDesktopExtensionFrame
+                    v-else
+                    :extension-id="window.sourceId"
+                    :window-id="window.id"
+                  />
+                </HaexWindow>
+              </div>
+            </Teleport>

-            <!-- Normal Mode (non-overview) -->
+            <!-- Desktop Mode: Render directly in workspace -->
            <HaexWindow
+              v-else
+              v-show="windowManager.showWindowOverview || !window.isMinimized"
              :id="window.id"
+              v-model:x="window.x"
+              v-model:y="window.y"
+              v-model:width="window.width"
+              v-model:height="window.height"
              :title="window.title"
              :icon="window.icon"
-              :initial-x="window.x"
-              :initial-y="window.y"
-              :initial-width="window.width"
-              :initial-height="window.height"
              :is-active="windowManager.isWindowActive(window.id)"
              :source-x="window.sourceX"
              :source-y="window.sourceY"
@ -163,6 +172,13 @@
              :source-height="window.sourceHeight"
              :is-opening="window.isOpening"
              :is-closing="window.isClosing"
+              :warning-level="
+                window.type === 'extension' &&
+                availableExtensions.find((ext) => ext.id === window.sourceId)
+                  ?.devServerUrl
+                  ? 'warning'
+                  : undefined
+              "
              class="no-swipe"
              @close="windowManager.closeWindow(window.id)"
              @minimize="windowManager.minimizeWindow(window.id)"
@ -195,53 +211,8 @@
      </SwiperSlide>
    </Swiper>

-    <!-- Workspace Drawer -->
-    <UDrawer
-      v-model:open="isOverviewMode"
-      direction="left"
-      :dismissible="false"
-      :overlay="false"
-      :modal="false"
-      should-scale-background
-      set-background-color-on-scale
-      title="Workspaces"
-      description="Workspaces"
-    >
-      <template #content>
-        <div class="p-6 h-full overflow-y-auto">
-          <UButton
-            block
-            trailing-icon="mdi-close"
-            class="text-2xl font-bold ext-gray-900 dark:text-white mb-4"
-            @click="isOverviewMode = false"
-          >
-            Workspaces
-          </UButton>
-
-          <!-- Workspace Cards -->
-          <div class="flex flex-col gap-3">
-            <HaexWorkspaceCard
-              v-for="workspace in workspaces"
-              :key="workspace.id"
-              :workspace
-            />
-          </div>
-
-          <!-- Add New Workspace Button -->
-          <UButton
-            block
-            variant="outline"
-            class="mt-6"
-            @click="handleAddWorkspace"
-          >
-            <template #leading>
-              <UIcon name="i-heroicons-plus" />
-            </template>
-            New Workspace
-          </UButton>
-        </div>
-      </template>
-    </UDrawer>
+    <!-- Window Overview Modal -->
+    <HaexWindowOverview />
  </div>
 </template>

@ -252,17 +223,12 @@ import type { Swiper as SwiperType } from 'swiper'
 import 'swiper/css'
 import 'swiper/css/navigation'

-import { eq } from 'drizzle-orm'
-import { haexDesktopItems } from '~~/src-tauri/database/schemas'
-
 const SwiperNavigation = Navigation

 const desktopStore = useDesktopStore()
 const extensionsStore = useExtensionsStore()
 const windowManager = useWindowManagerStore()
 const workspaceStore = useWorkspaceStore()
-
-const { currentVault } = storeToRefs(useVaultStore())
 const { desktopItems } = storeToRefs(desktopStore)
 const { availableExtensions } = storeToRefs(extensionsStore)
 const {
@ -315,7 +281,6 @@ const currentDraggedReferenceId = ref<string>()

 // Window drag state for snap zones
 const isWindowDragging = ref(false)
-const currentDraggingWindowId = ref<string | null>(null)
 const snapEdgeThreshold = 50 // pixels from edge to show snap zone

 // Computed visibility for snap zones (uses mouseX from above)
@ -329,37 +294,29 @@ const showRightSnapZone = computed(() => {
  return mouseX.value >= viewportWidth - snapEdgeThreshold
 })

-// Dropzone refs
-/* const removeDropzoneEl = ref<HTMLElement>()
-const uninstallDropzoneEl = ref<HTMLElement>() */
-
-// Setup dropzones with VueUse
-/* const { isOverDropZone: isOverRemoveZone } = useDropZone(removeDropzoneEl, {
-  onDrop: () => {
-    if (currentDraggedItemId.value) {
-      handleRemoveFromDesktop(currentDraggedItemId.value)
-    }
-  },
-}) */
-
-/* const { isOverDropZone: isOverUninstallZone } = useDropZone(uninstallDropzoneEl, {
-  onDrop: () => {
-    if (currentDraggedItemType.value && currentDraggedReferenceId.value) {
-      handleUninstall(currentDraggedItemType.value, currentDraggedReferenceId.value)
-    }
-  },
-}) */
-
 // Get icons for a specific workspace
 const getWorkspaceIcons = (workspaceId: string) => {
  return desktopItems.value
    .filter((item) => item.workspaceId === workspaceId)
    .map((item) => {
+      if (item.itemType === 'system') {
+        const systemWindow = windowManager
+          .getAllSystemWindows()
+          .find((win) => win.id === item.referenceId)
+
+        return {
+          ...item,
+          label: systemWindow?.name || 'Unknown',
+          icon: systemWindow?.icon || '',
+        }
+      }
+
      if (item.itemType === 'extension') {
        const extension = availableExtensions.value.find(
          (ext) => ext.id === item.referenceId,
        )

+        console.log('found ext', extension)
        return {
          ...item,
          label: extension?.name || 'Unknown',
@ -393,11 +350,9 @@ const getWorkspaceIcons = (workspaceId: string) => {
    })
 }

-// Get windows for a specific workspace
+// Get windows for a specific workspace (including minimized for teleport)
 const getWorkspaceWindows = (workspaceId: string) => {
-  return windowManager.windows.filter(
-    (w) => w.workspaceId === workspaceId && !w.isMinimized,
-  )
+  return windowManager.windows.filter((w) => w.workspaceId === workspaceId)
 }

 // Get Vue Component for system window
@ -431,26 +386,50 @@ const handleDragEnd = async () => {
  allowSwipe.value = true // Re-enable Swiper after drag
 }

-// Move desktop item to different workspace
-const moveItemToWorkspace = async (
-  itemId: string,
-  targetWorkspaceId: string,
-) => {
-  const item = desktopItems.value.find((i) => i.id === itemId)
-  if (!item) return
+// Handle drag over for launcher items
+const handleDragOver = (event: DragEvent) => {
+  if (!event.dataTransfer) return
+
+  // Check if this is a launcher item
+  if (event.dataTransfer.types.includes('application/haex-launcher-item')) {
+    event.dataTransfer.dropEffect = 'copy'
+  }
+}
+
+// Handle drop for launcher items
+const handleDrop = async (event: DragEvent, workspaceId: string) => {
+  if (!event.dataTransfer) return
+
+  const launcherItemData = event.dataTransfer.getData(
+    'application/haex-launcher-item',
+  )
+  if (!launcherItemData) return

  try {
-    if (!currentVault.value?.drizzle) return
+    const item = JSON.parse(launcherItemData) as {
+      id: string
+      name: string
+      icon: string
+      type: 'system' | 'extension'
+    }

-    await currentVault.value.drizzle
-      .update(haexDesktopItems)
-      .set({ workspaceId: targetWorkspaceId })
-      .where(eq(haexDesktopItems.id, itemId))
+    // Get drop position relative to desktop
+    const desktopRect = (
+      event.currentTarget as HTMLElement
+    ).getBoundingClientRect()
+    const x = Math.max(0, event.clientX - desktopRect.left - 32) // Center icon (64px / 2)
+    const y = Math.max(0, event.clientY - desktopRect.top - 32)

-    // Update local state
-    item.workspaceId = targetWorkspaceId
+    // Create desktop icon on the specific workspace
+    await desktopStore.addDesktopItemAsync(
+      item.type as DesktopItemType,
+      item.id,
+      x,
+      y,
+      workspaceId,
+    )
  } catch (error) {
-    console.error('Fehler beim Verschieben des Items:', error)
+    console.error('Failed to create desktop icon:', error)
  }
 }

@ -470,30 +449,51 @@ const handleDesktopClick = () => {
 }

 const handleWindowDragStart = (windowId: string) => {
+  console.log('[Desktop] handleWindowDragStart:', windowId)
  isWindowDragging.value = true
-  currentDraggingWindowId.value = windowId
+  windowManager.draggingWindowId = windowId // Set in store for workspace cards
+  console.log(
+    '[Desktop] draggingWindowId set to:',
+    windowManager.draggingWindowId,
+  )
  allowSwipe.value = false // Disable Swiper during window drag
 }

 const handleWindowDragEnd = async () => {
-  // Window handles snapping itself, we just need to cleanup state
+  console.log('[Desktop] handleWindowDragEnd')
+
+  // Check if window should snap to left or right
+  const draggingWindowId = windowManager.draggingWindowId
+
+  if (draggingWindowId) {
+    if (showLeftSnapZone.value) {
+      // Snap to left half
+      windowManager.updateWindowPosition(draggingWindowId, 0, 0)
+      windowManager.updateWindowSize(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        viewportHeight.value,
+      )
+    } else if (showRightSnapZone.value) {
+      // Snap to right half
+      windowManager.updateWindowPosition(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        0,
+      )
+      windowManager.updateWindowSize(
+        draggingWindowId,
+        viewportWidth.value / 2,
+        viewportHeight.value,
+      )
+    }
+  }
+
  isWindowDragging.value = false
-  currentDraggingWindowId.value = null
+  windowManager.draggingWindowId = null // Clear from store
  allowSwipe.value = true // Re-enable Swiper after drag
 }

-// Move window to different workspace
-const moveWindowToWorkspace = async (
-  windowId: string,
-  targetWorkspaceId: string,
-) => {
-  const window = windowManager.windows.find((w) => w.id === windowId)
-  if (!window) return
-
-  // Update window's workspaceId
-  window.workspaceId = targetWorkspaceId
-}
-
 // Area selection handlers
 const handleAreaSelectStart = (e: MouseEvent) => {
  if (!desktopEl.value) return
@ -568,24 +568,7 @@ const onSlideChange = (swiper: SwiperType) => {
  )
 }

-// Workspace control handlers
-const handleAddWorkspace = async () => {
-  await workspaceStore.addWorkspaceAsync()
-  // Swiper will auto-slide to new workspace because we switch in addWorkspaceAsync
-  nextTick(() => {
-    if (swiperInstance.value) {
-      swiperInstance.value.slideTo(workspaces.value.length - 1)
-    }
-  })
-}
-
-const handleSwitchToWorkspace = (index: number) => {
-  if (swiperInstance.value) {
-    swiperInstance.value.slideTo(index)
-  }
-}
-
-const handleRemoveWorkspace = async () => {
+/* const handleRemoveWorkspace = async () => {
  if (!currentWorkspace.value || workspaces.value.length <= 1) return

  const currentIndex = currentWorkspaceIndex.value
@ -600,13 +583,6 @@ const handleRemoveWorkspace = async () => {
  })
 }

-// Drawer handlers
-const handleSwitchToWorkspaceFromDrawer = (index: number) => {
-  handleSwitchToWorkspace(index)
-  // Close drawer after switch
-  isOverviewMode.value = false
-}
-
 const handleDropWindowOnWorkspace = async (
  event: DragEvent,
  targetWorkspaceId: string,
@ -616,116 +592,65 @@ const handleDropWindowOnWorkspace = async (
  if (windowId) {
    await moveWindowToWorkspace(windowId, targetWorkspaceId)
  }
-}
+} */

 // Overview Mode: Calculate grid positions and scale for windows
-const getOverviewWindowGridStyle = (index: number, totalWindows: number) => {
-  if (!viewportWidth.value || !viewportHeight.value) {
-    return {}
-  }
+// Calculate preview dimensions for window overview
+const MIN_PREVIEW_WIDTH = 300 // 50% increase from 200
+const MAX_PREVIEW_WIDTH = 600 // 50% increase from 400
+const MIN_PREVIEW_HEIGHT = 225 // 50% increase from 150
+const MAX_PREVIEW_HEIGHT = 450 // 50% increase from 300

-  // Determine grid layout based on number of windows
-  let cols = 1
-  let rows = 1
+// Store window state for overview (position only, size stays original)
+const overviewWindowState = ref(
+  new Map<
+    string,
+    { x: number; y: number; width: number; height: number; scale: number }
+  >(),
+)

-  if (totalWindows === 1) {
-    cols = 1
-    rows = 1
-  } else if (totalWindows === 2) {
-    cols = 2
-    rows = 1
-  } else if (totalWindows <= 4) {
-    cols = 2
-    rows = 2
-  } else if (totalWindows <= 6) {
-    cols = 3
-    rows = 2
-  } else if (totalWindows <= 9) {
-    cols = 3
-    rows = 3
-  } else {
-    cols = 4
-    rows = Math.ceil(totalWindows / 4)
-  }
+// Calculate scale and card dimensions for each window
+watch(
+  () => windowManager.showWindowOverview,
+  (isOpen) => {
+    if (isOpen) {
+      // Wait for the Overview modal to mount and create the teleport targets
+      nextTick(() => {
+        windowManager.windows.forEach((window) => {
+          const scaleX = MAX_PREVIEW_WIDTH / window.width
+          const scaleY = MAX_PREVIEW_HEIGHT / window.height
+          const scale = Math.min(scaleX, scaleY, 1)

-  // Calculate grid cell position
-  const col = index % cols
-  const row = Math.floor(index / cols)
+          // Ensure minimum card size
+          const scaledWidth = window.width * scale
+          const scaledHeight = window.height * scale

-  // Padding and gap
-  const padding = 40 // px from viewport edges
-  const gap = 30 // px between windows
+          let finalScale = scale
+          if (scaledWidth < MIN_PREVIEW_WIDTH) {
+            finalScale = MIN_PREVIEW_WIDTH / window.width
+          }
+          if (scaledHeight < MIN_PREVIEW_HEIGHT) {
+            finalScale = Math.max(
+              finalScale,
+              MIN_PREVIEW_HEIGHT / window.height,
+            )
+          }

-  // Available space
-  const availableWidth = viewportWidth.value - padding * 2 - gap * (cols - 1)
-  const availableHeight = viewportHeight.value - padding * 2 - gap * (rows - 1)
-
-  // Cell dimensions
-  const cellWidth = availableWidth / cols
-  const cellHeight = availableHeight / rows
-
-  // Window aspect ratio (assume 16:9 or use actual window dimensions)
-  const windowAspectRatio = 16 / 9
-
-  // Calculate scale to fit window in cell
-  const targetWidth = cellWidth
-  const targetHeight = cellHeight
-  const targetAspect = targetWidth / targetHeight
-
-  let scale = 0.25 // Default scale
-  let scaledWidth = 800 * scale
-  let scaledHeight = 600 * scale
-
-  if (targetAspect > windowAspectRatio) {
-    // Cell is wider than window aspect ratio - fit by height
-    scaledHeight = Math.min(targetHeight, 600 * 0.4)
-    scale = scaledHeight / 600
-    scaledWidth = 800 * scale
-  } else {
-    // Cell is taller than window aspect ratio - fit by width
-    scaledWidth = Math.min(targetWidth, 800 * 0.4)
-    scale = scaledWidth / 800
-    scaledHeight = 600 * scale
-  }
-
-  // Calculate position to center window in cell
-  const cellX = padding + col * (cellWidth + gap)
-  const cellY = padding + row * (cellHeight + gap)
-
-  // Center window in cell
-  const x = cellX + (cellWidth - scaledWidth) / 2
-  const y = cellY + (cellHeight - scaledHeight) / 2
-
-  return {
-    transform: `scale(${scale})`,
-    transformOrigin: 'top left',
-    left: `${x / scale}px`,
-    top: `${y / scale}px`,
-    width: '800px',
-    height: '600px',
-    zIndex: 91,
-    transition: 'all 0.3s ease',
-  }
-}
-
-// Overview Mode handlers
-const handleOverviewWindowClick = (windowId: string) => {
-  // Activate the window
-  windowManager.activateWindow(windowId)
-  // Close overview mode
-  isOverviewMode.value = false
-}
-
-const handleOverviewWindowDragStart = (event: DragEvent, windowId: string) => {
-  if (event.dataTransfer) {
-    event.dataTransfer.effectAllowed = 'move'
-    event.dataTransfer.setData('windowId', windowId)
-  }
-}
-
-const handleOverviewWindowDragEnd = () => {
-  // Cleanup after drag
-}
+          overviewWindowState.value.set(window.id, {
+            x: 0,
+            y: 0,
+            width: window.width,
+            height: window.height,
+            scale: finalScale,
+          })
+        })
+      })
+    } else {
+      // Clear state when overview is closed
+      overviewWindowState.value.clear()
+    }
+  },
+)

 // Disable Swiper in overview mode
 watch(isOverviewMode, (newValue) => {
--- a/src/components/haex/desktop/window.vue
+++ b/src/components/haex/desktop/window.vue
@ -1,480 +0,0 @@
-<template>
-  <div
-    ref="windowEl"
-    :style="windowStyle"
-    :class="[
-      'absolute  backdrop-blur-xl rounded-xl shadow-2xl overflow-hidden',
-      'border border-gray-200 dark:border-gray-700 transition-all ease-out duration-600',
-      'flex flex-col',
-
-      isActive ? 'z-50' : 'z-10',
-    ]"
-    @mousedown="handleActivate"
-  >
-    <!-- Window Titlebar -->
-    <div
-      ref="titlebarEl"
-      class="grid grid-cols-3 items-center px-3 py-1 bg-white/80 dark:bg-gray-800/80 border-b border-gray-200/50 dark:border-gray-700/50 cursor-move select-none touch-none"
-      @dblclick="handleMaximize"
-    >
-      <!-- Left: Icon -->
-      <div class="flex items-center gap-2">
-        <img
-          v-if="icon"
-          :src="icon"
-          :alt="title"
-          class="w-5 h-5 object-contain flex-shrink-0"
-        />
-      </div>
-
-      <!-- Center: Title -->
-      <div class="flex items-center justify-center">
-        <span
-          class="text-sm font-medium text-gray-900 dark:text-gray-100 truncate max-w-full"
-        >
-          {{ title }}
-        </span>
-      </div>
-
-      <!-- Right: Window Controls -->
-      <div class="flex items-center gap-1 justify-end">
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-700 flex items-center justify-center transition-colors"
-          @click.stop="handleMinimize"
-        >
-          <UIcon
-            name="i-heroicons-minus"
-            class="w-4 h-4 text-gray-600 dark:text-gray-400"
-          />
-        </button>
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-700 flex items-center justify-center transition-colors"
-          @click.stop="handleMaximize"
-        >
-          <UIcon
-            :name="
-              isMaximized
-                ? 'i-heroicons-arrows-pointing-in'
-                : 'i-heroicons-arrows-pointing-out'
-            "
-            class="w-4 h-4 text-gray-600 dark:text-gray-400"
-          />
-        </button>
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-red-100 dark:hover:bg-red-900/30 flex items-center justify-center transition-colors group"
-          @click.stop="handleClose"
-        >
-          <UIcon
-            name="i-heroicons-x-mark"
-            class="w-4 h-4 text-gray-600 dark:text-gray-400 group-hover:text-red-600 dark:group-hover:text-red-400"
-          />
-        </button>
-      </div>
-    </div>
-
-    <!-- Window Content -->
-    <div
-      :class="[
-        'flex-1 overflow-auto relative ',
-        isDragging || isResizing ? 'pointer-events-none select-none' : '',
-      ]"
-    >
-      <slot />
-    </div>
-
-    <!-- Resize Handles -->
-    <template v-if="!isMaximized">
-      <div
-        class="absolute top-0 left-0 w-2 h-2 cursor-nw-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('nw', $event)"
-      />
-      <div
-        class="absolute top-0 right-0 w-2 h-2 cursor-ne-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('ne', $event)"
-      />
-      <div
-        class="absolute bottom-0 left-0 w-2 h-2 cursor-sw-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('sw', $event)"
-      />
-      <div
-        class="absolute bottom-0 right-0 w-2 h-2 cursor-se-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('se', $event)"
-      />
-      <div
-        class="absolute top-0 left-2 right-2 h-2 cursor-n-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('n', $event)"
-      />
-      <div
-        class="absolute bottom-0 left-2 right-2 h-2 cursor-s-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('s', $event)"
-      />
-      <div
-        class="absolute left-0 top-2 bottom-2 w-2 cursor-w-resize bg-red-300 overflow-visible"
-        @mousedown.left.stop="handleResizeStart('w', $event)"
-      />
-      <div
-        class="absolute right-0 top-2 bottom-2 w-2 cursor-e-resize shrink-0"
-        @mousedown.left.stop="handleResizeStart('e', $event)"
-      />
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-const props = defineProps<{
-  id: string
-  title: string
-  icon?: string | null
-  initialX?: number
-  initialY?: number
-  initialWidth?: number
-  initialHeight?: number
-  isActive?: boolean
-  sourceX?: number
-  sourceY?: number
-  sourceWidth?: number
-  sourceHeight?: number
-  isOpening?: boolean
-  isClosing?: boolean
-}>()
-
-const emit = defineEmits<{
-  close: []
-  minimize: []
-  activate: []
-  positionChanged: [x: number, y: number]
-  sizeChanged: [width: number, height: number]
-  dragStart: []
-  dragEnd: []
-}>()
-
-const windowEl = ref<HTMLElement>()
-const titlebarEl = useTemplateRef('titlebarEl')
-
-// Inject viewport size from parent desktop
-const viewportSize = inject<{
-  width: Ref<number>
-  height: Ref<number>
-}>('viewportSize')
-
-// Window state
-const x = ref(props.initialX ?? 100)
-const y = ref(props.initialY ?? 100)
-const width = ref(props.initialWidth ?? 800)
-const height = ref(props.initialHeight ?? 600)
-const isMaximized = ref(false) // Don't start maximized
-
-// Store initial position/size for restore
-const preMaximizeState = ref({
-  x: props.initialX ?? 100,
-  y: props.initialY ?? 100,
-  width: props.initialWidth ?? 800,
-  height: props.initialHeight ?? 600,
-})
-
-// Dragging state
-const isDragging = ref(false)
-const dragStartX = ref(0)
-const dragStartY = ref(0)
-
-// Resizing state
-const isResizing = ref(false)
-const resizeDirection = ref<string>('')
-const resizeStartX = ref(0)
-const resizeStartY = ref(0)
-const resizeStartWidth = ref(0)
-const resizeStartHeight = ref(0)
-const resizeStartPosX = ref(0)
-const resizeStartPosY = ref(0)
-
-// Snap settings
-const snapEdgeThreshold = 50 // pixels from edge to trigger snap
-const { x: mouseX } = useMouse()
-
-// Setup drag with useDrag composable (supports mouse + touch)
-useDrag(
-  ({ movement: [mx, my], first, last }) => {
-    if (isMaximized.value) return
-
-    if (first) {
-      // Drag started - save initial position
-      isDragging.value = true
-      dragStartX.value = x.value
-      dragStartY.value = y.value
-      emit('dragStart')
-      return // Don't update position on first event
-    }
-
-    if (last) {
-      // Drag ended - apply snapping
-      isDragging.value = false
-
-      const viewportBounds = getViewportBounds()
-      if (viewportBounds) {
-        const viewportWidth = viewportBounds.width
-        const viewportHeight = viewportBounds.height
-
-        if (mouseX.value <= snapEdgeThreshold) {
-          // Snap to left half
-          x.value = 0
-          y.value = 0
-          width.value = viewportWidth / 2
-          height.value = viewportHeight
-          isMaximized.value = false
-        } else if (mouseX.value >= viewportWidth - snapEdgeThreshold) {
-          // Snap to right half
-          x.value = viewportWidth / 2
-          y.value = 0
-          width.value = viewportWidth / 2
-          height.value = viewportHeight
-          isMaximized.value = false
-        } else {
-          // Normal snap back to viewport
-          snapToViewport()
-        }
-      }
-
-      emit('positionChanged', x.value, y.value)
-      emit('sizeChanged', width.value, height.value)
-      emit('dragEnd')
-      return
-    }
-
-    // Dragging (not first, not last)
-    const newX = dragStartX.value + mx
-    const newY = dragStartY.value + my
-
-    // Apply constraints during drag
-    const constrained = constrainToViewportDuringDrag(newX, newY)
-    x.value = constrained.x
-    y.value = constrained.y
-  },
-  {
-    domTarget: titlebarEl,
-    eventOptions: { passive: false },
-    pointer: { touch: true },
-    drag: {
-      threshold: 10, // 10px threshold prevents accidental drags and improves performance
-      filterTaps: true, // Filter out taps (clicks) vs drags
-      delay: 0, // No delay for immediate response
-    },
-  },
-)
-
-const windowStyle = computed(() => {
-  const baseStyle: Record<string, string> = {}
-
-  // Opening animation: start from icon position
-  if (
-    props.isOpening &&
-    props.sourceX !== undefined &&
-    props.sourceY !== undefined
-  ) {
-    baseStyle.left = `${props.sourceX}px`
-    baseStyle.top = `${props.sourceY}px`
-    baseStyle.width = `${props.sourceWidth || 100}px`
-    baseStyle.height = `${props.sourceHeight || 100}px`
-    baseStyle.opacity = '0'
-    baseStyle.transform = 'scale(0.3)'
-  }
-  // Closing animation: shrink to icon position
-  else if (
-    props.isClosing &&
-    props.sourceX !== undefined &&
-    props.sourceY !== undefined
-  ) {
-    baseStyle.left = `${props.sourceX}px`
-    baseStyle.top = `${props.sourceY}px`
-    baseStyle.width = `${props.sourceWidth || 100}px`
-    baseStyle.height = `${props.sourceHeight || 100}px`
-    baseStyle.opacity = '0'
-    baseStyle.transform = 'scale(0.3)'
-  }
-  // Normal state
-  else if (isMaximized.value) {
-    baseStyle.left = '0px'
-    baseStyle.top = '0px'
-    baseStyle.width = '100%'
-    baseStyle.height = '100%'
-    baseStyle.borderRadius = '0'
-    baseStyle.opacity = '1'
-    baseStyle.transform = 'scale(1)'
-  } else {
-    baseStyle.left = `${x.value}px`
-    baseStyle.top = `${y.value}px`
-    baseStyle.width = `${width.value}px`
-    baseStyle.height = `${height.value}px`
-    baseStyle.opacity = '1'
-    baseStyle.transform = 'scale(1)'
-  }
-
-  // Performance optimization: hint browser about transforms
-  if (isDragging.value || isResizing.value) {
-    baseStyle.willChange = 'transform, width, height'
-  }
-
-  return baseStyle
-})
-
-const getViewportBounds = () => {
-  // Use reactive viewport size from parent if available
-  if (viewportSize) {
-    return {
-      width: viewportSize.width.value,
-      height: viewportSize.height.value,
-    }
-  }
-
-  // Fallback to parent element measurement
-  if (!windowEl.value?.parentElement) return null
-
-  const parent = windowEl.value.parentElement
-  return {
-    width: parent.clientWidth,
-    height: parent.clientHeight,
-  }
-}
-
-const constrainToViewportDuringDrag = (newX: number, newY: number) => {
-  const bounds = getViewportBounds()
-  if (!bounds) return { x: newX, y: newY }
-
-  const windowWidth = width.value
-  const windowHeight = height.value
-
-  // Allow max 1/3 of window to go outside viewport during drag
-  const maxOffscreenX = windowWidth / 3
-  const maxOffscreenY = windowHeight / 3
-
-  const maxX = bounds.width - windowWidth + maxOffscreenX
-  const minX = -maxOffscreenX
-  const maxY = bounds.height - windowHeight + maxOffscreenY
-  const minY = -maxOffscreenY
-
-  const constrainedX = Math.max(minX, Math.min(maxX, newX))
-  const constrainedY = Math.max(minY, Math.min(maxY, newY))
-
-  return { x: constrainedX, y: constrainedY }
-}
-
-const constrainToViewportFully = (
-  newX: number,
-  newY: number,
-  newWidth?: number,
-  newHeight?: number,
-) => {
-  const bounds = getViewportBounds()
-  if (!bounds) return { x: newX, y: newY }
-
-  const windowWidth = newWidth ?? width.value
-  const windowHeight = newHeight ?? height.value
-
-  // Keep entire window within viewport
-  const maxX = bounds.width - windowWidth
-  const minX = 0
-  const maxY = bounds.height - windowHeight
-  const minY = 0
-
-  const constrainedX = Math.max(minX, Math.min(maxX, newX))
-  const constrainedY = Math.max(minY, Math.min(maxY, newY))
-
-  return { x: constrainedX, y: constrainedY }
-}
-
-const snapToViewport = () => {
-  const bounds = getViewportBounds()
-  if (!bounds) return
-
-  const constrained = constrainToViewportFully(x.value, y.value)
-  x.value = constrained.x
-  y.value = constrained.y
-}
-
-const handleActivate = () => {
-  emit('activate')
-}
-
-const handleClose = () => {
-  emit('close')
-}
-
-const handleMinimize = () => {
-  emit('minimize')
-}
-
-const handleMaximize = () => {
-  if (isMaximized.value) {
-    // Restore
-    x.value = preMaximizeState.value.x
-    y.value = preMaximizeState.value.y
-    width.value = preMaximizeState.value.width
-    height.value = preMaximizeState.value.height
-    isMaximized.value = false
-  } else {
-    // Maximize
-    preMaximizeState.value = {
-      x: x.value,
-      y: y.value,
-      width: width.value,
-      height: height.value,
-    }
-    isMaximized.value = true
-  }
-}
-
-// Window resizing
-const handleResizeStart = (direction: string, e: MouseEvent) => {
-  isResizing.value = true
-  resizeDirection.value = direction
-  resizeStartX.value = e.clientX
-  resizeStartY.value = e.clientY
-  resizeStartWidth.value = width.value
-  resizeStartHeight.value = height.value
-  resizeStartPosX.value = x.value
-  resizeStartPosY.value = y.value
-}
-
-// Global mouse move handler (for resizing only, dragging handled by useDrag)
-useEventListener(window, 'mousemove', (e: MouseEvent) => {
-  if (isResizing.value) {
-    const deltaX = e.clientX - resizeStartX.value
-    const deltaY = e.clientY - resizeStartY.value
-
-    const dir = resizeDirection.value
-
-    // Handle width changes
-    if (dir.includes('e')) {
-      width.value = Math.max(300, resizeStartWidth.value + deltaX)
-    } else if (dir.includes('w')) {
-      const newWidth = Math.max(300, resizeStartWidth.value - deltaX)
-      const widthDiff = resizeStartWidth.value - newWidth
-      x.value = resizeStartPosX.value + widthDiff
-      width.value = newWidth
-    }
-
-    // Handle height changes
-    if (dir.includes('s')) {
-      height.value = Math.max(200, resizeStartHeight.value + deltaY)
-    } else if (dir.includes('n')) {
-      const newHeight = Math.max(200, resizeStartHeight.value - deltaY)
-      const heightDiff = resizeStartHeight.value - newHeight
-      y.value = resizeStartPosY.value + heightDiff
-      height.value = newHeight
-    }
-  }
-})
-
-// Global mouse up handler (for resizing only, dragging handled by useDrag)
-useEventListener(window, 'mouseup', () => {
-  if (isResizing.value) {
-    globalThis.getSelection()?.removeAllRanges()
-    isResizing.value = false
-
-    // Snap back to viewport after resize ends
-    snapToViewport()
-
-    emit('positionChanged', x.value, y.value)
-    emit('sizeChanged', width.value, height.value)
-  }
-})
-</script>
--- a/src/components/haex/extension/card.vue
+++ b/src/components/haex/extension/card.vue
@ -89,7 +89,11 @@ const removeExtensionAsync = async () => {
  }

  try {
-    await extensionStore.removeExtensionAsync(extension.id, extension.version)
+    await extensionStore.removeExtensionAsync(
+      extension.publicKey,
+      extension.name,
+      extension.version,
+    )
    await extensionStore.loadExtensionsAsync()

    add({
--- a/src/components/haex/extension/dialog/install.vue
+++ b/src/components/haex/extension/dialog/install.vue
@ -15,7 +15,7 @@
          <div class="flex items-start gap-4">
            <div
              v-if="preview?.manifest.icon"
-              class="w-16 h-16 flex-shrink-0"
+              class="w-16 h-16 shrink-0"
            >
              <UIcon
                :name="preview.manifest.icon"
@ -184,7 +184,6 @@ const shellPermissions = computed({
  },
 })

-
 const permissionAccordionItems = computed(() => {
  const items = []

--- a/src/components/haex/extension/launcher.vue
+++ b/src/components/haex/extension/launcher.vue
@ -1,5 +1,13 @@
 <template>
-  <UPopover v-model:open="open">
+  <UDrawer
+    v-model:open="open"
+    direction="right"
+    :title="t('launcher.title')"
+    :description="t('launcher.description')"
+    :ui="{
+      content: 'w-dvw max-w-md sm:max-w-fit',
+    }"
+  >
    <UButton
      icon="material-symbols:apps"
      color="neutral"
@ -9,48 +17,75 @@
    />

    <template #content>
-      <ul class="p-4 max-h-96 grid grid-cols-3 gap-2 overflow-scroll">
-        <!-- All launcher items (system windows + enabled extensions, alphabetically sorted) -->
-        <UiButton
-          v-for="item in launcherItems"
-          :key="item.id"
-          square
-          size="xl"
-          variant="ghost"
-          :ui="{
-            base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible',
-            leadingIcon: 'size-10',
-            label: 'w-full',
-          }"
-          :icon="item.icon"
-          :label="item.name"
-          :tooltip="item.name"
-          @click="openItem(item)"
-        />
+      <div class="p-4 h-full overflow-y-auto">
+        <div class="flex flex-wrap">
+          <!-- All launcher items (system windows + enabled extensions, alphabetically sorted) -->
+          <UContextMenu
+            v-for="item in launcherItems"
+            :key="item.id"
+            :items="getContextMenuItems(item)"
+          >
+            <UiButton
+              square
+              size="lg"
+              variant="ghost"
+              :ui="{
+                base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible cursor-grab active:cursor-grabbing',
+                leadingIcon: 'size-10',
+                label: 'w-full',
+              }"
+              :icon="item.icon"
+              :label="item.name"
+              :tooltip="item.name"
+              draggable="true"
+              @click="openItem(item)"
+              @dragstart="handleDragStart($event, item)"
+              @dragend="handleDragEnd"
+            />
+          </UContextMenu>

-        <!-- Disabled Extensions (grayed out) -->
-        <UiButton
-          v-for="extension in disabledExtensions"
-          :key="extension.id"
-          square
-          size="xl"
-          variant="ghost"
-          :disabled="true"
-          :ui="{
-            base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible opacity-40',
-            leadingIcon: 'size-10',
-            label: 'w-full',
-          }"
-          :icon="extension.icon || 'i-heroicons-puzzle-piece-solid'"
-          :label="extension.name"
-          :tooltip="`${extension.name} (${t('disabled')})`"
-        />
-      </ul>
+          <!-- Disabled Extensions (grayed out) -->
+          <UiButton
+            v-for="extension in disabledExtensions"
+            :key="extension.id"
+            square
+            size="xl"
+            variant="ghost"
+            :disabled="true"
+            :ui="{
+              base: 'size-24 flex flex-wrap text-sm items-center justify-center overflow-visible opacity-40',
+              leadingIcon: 'size-10',
+              label: 'w-full',
+            }"
+            :icon="extension.icon || 'i-heroicons-puzzle-piece-solid'"
+            :label="extension.name"
+            :tooltip="`${extension.name} (${t('disabled')})`"
+          />
+        </div>
+      </div>
    </template>
-  </UPopover>
+  </UDrawer>
+
+  <!-- Uninstall Confirmation Dialog -->
+  <UiDialogConfirm
+    v-model:open="showUninstallDialog"
+    :title="t('uninstall.confirm.title')"
+    :description="
+      t('uninstall.confirm.description', {
+        name: extensionToUninstall?.name || '',
+      })
+    "
+    :confirm-label="t('uninstall.confirm.button')"
+    confirm-icon="i-heroicons-trash"
+    @confirm="confirmUninstall"
+  />
 </template>

 <script setup lang="ts">
+defineOptions({
+  inheritAttrs: false,
+})
+
 const extensionStore = useExtensionsStore()
 const windowManagerStore = useWindowManagerStore()

@ -58,6 +93,10 @@ const { t } = useI18n()

 const open = ref(false)

+// Uninstall dialog state
+const showUninstallDialog = ref(false)
+const extensionToUninstall = ref<LauncherItem | null>(null)
+
 // Unified launcher item type
 interface LauncherItem {
  id: string
@ -119,14 +158,123 @@ const openItem = async (item: LauncherItem) => {
    console.log(error)
  }
 }
+
+// Uninstall extension - shows confirmation dialog first
+const uninstallExtension = async (item: LauncherItem) => {
+  extensionToUninstall.value = item
+  showUninstallDialog.value = true
+}
+
+// Confirm uninstall - actually removes the extension
+const confirmUninstall = async () => {
+  if (!extensionToUninstall.value) return
+
+  try {
+    const extension = extensionStore.availableExtensions.find(
+      (ext) => ext.id === extensionToUninstall.value!.id,
+    )
+    if (!extension) return
+
+    // Close all windows of this extension first
+    const extensionWindows = windowManagerStore.windows.filter(
+      (win) => win.type === 'extension' && win.sourceId === extension.id,
+    )
+
+    for (const win of extensionWindows) {
+      windowManagerStore.closeWindow(win.id)
+    }
+
+    // Uninstall the extension
+    await extensionStore.removeExtensionAsync(
+      extension.publicKey,
+      extension.name,
+      extension.version,
+    )
+
+    // Refresh available extensions list
+    await extensionStore.loadExtensionsAsync()
+
+    // Close dialog and reset state
+    showUninstallDialog.value = false
+    extensionToUninstall.value = null
+  } catch (error) {
+    console.error('Failed to uninstall extension:', error)
+  }
+}
+
+// Get context menu items for launcher item
+const getContextMenuItems = (item: LauncherItem) => {
+  const items = [
+    {
+      label: t('contextMenu.open'),
+      icon: 'i-heroicons-arrow-top-right-on-square',
+      onSelect: () => openItem(item),
+    },
+  ]
+
+  // Add uninstall option for extensions
+  if (item.type === 'extension') {
+    items.push({
+      label: t('contextMenu.uninstall'),
+      icon: 'i-heroicons-trash',
+      onSelect: () => uninstallExtension(item),
+    })
+  }
+
+  return items
+}
+
+// Drag & Drop handling
+const handleDragStart = (event: DragEvent, item: LauncherItem) => {
+  if (!event.dataTransfer) return
+
+  // Store the launcher item data
+  event.dataTransfer.effectAllowed = 'copy'
+  event.dataTransfer.setData(
+    'application/haex-launcher-item',
+    JSON.stringify(item),
+  )
+
+  // Set drag image (optional - uses default if not set)
+  const dragImage = event.target as HTMLElement
+  if (dragImage) {
+    event.dataTransfer.setDragImage(dragImage, 20, 20)
+  }
+}
+
+const handleDragEnd = () => {
+  // Cleanup if needed
+}
 </script>

 <i18n lang="yaml">
 de:
  disabled: Deaktiviert
  marketplace: Marketplace
+  launcher:
+    title: App Launcher
+    description: Wähle eine App zum Öffnen
+  contextMenu:
+    open: Öffnen
+    uninstall: Deinstallieren
+  uninstall:
+    confirm:
+      title: Erweiterung deinstallieren
+      description: Möchtest du wirklich "{name}" deinstallieren? Diese Aktion kann nicht rückgängig gemacht werden.
+      button: Deinstallieren

 en:
  disabled: Disabled
  marketplace: Marketplace
+  launcher:
+    title: App Launcher
+    description: Select an app to open
+  contextMenu:
+    open: Open
+    uninstall: Uninstall
+  uninstall:
+    confirm:
+      title: Uninstall Extension
+      description: Do you really want to uninstall "{name}"? This action cannot be undone.
+      button: Uninstall
 </i18n>
--- a/src/components/haex/extension/manifest/permissions/database.vue
+++ b/src/components/haex/extension/manifest/permissions/database.vue
@ -15,7 +15,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(read).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(read).at(0)"
@ -42,7 +42,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(write).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(write).at(0)"
@ -69,7 +69,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(create).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(create).at(0)"
--- a/src/components/haex/extension/manifest/permissions/filesystem.vue
+++ b/src/components/haex/extension/manifest/permissions/filesystem.vue
@ -14,7 +14,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(read).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(read).at(0)"
@ -41,7 +41,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(write).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(write).at(0)"
--- a/src/components/haex/extension/manifest/permissions/http.vue
+++ b/src/components/haex/extension/manifest/permissions/http.vue
@ -15,7 +15,7 @@
            type="checkbox"
            class="checkbox"
            :checked="Object.values(access).at(0)"
-          />
+          >
          <label
            class="label-text text-base"
            :for="Object.keys(access).at(0)"
--- a/src/components/haex/extension/marketplace-card.vue
+++ b/src/components/haex/extension/marketplace-card.vue
@ -8,7 +8,7 @@
  >
    <div class="flex items-start gap-4">
      <!-- Icon -->
-      <div class="flex-shrink-0">
+      <div class="shrink-0">
        <div
          v-if="extension.icon"
          class="w-16 h-16 rounded-lg bg-primary/10 flex items-center justify-center"
--- a/src/components/haex/system/marketplace.vue
+++ b/src/components/haex/system/marketplace.vue
@ -33,8 +33,8 @@
          :label="t('extension.installFromFile')"
          icon="i-heroicons-arrow-up-tray"
          color="neutral"
-          @click="onSelectExtensionAsync"
          block
+          @click="onSelectExtensionAsync"
        />
      </div>
    </div>
--- a/src/components/haex/system/settings.vue
+++ b/src/components/haex/system/settings.vue
@ -33,7 +33,7 @@
        />
      </div>

-      <div class="h-full"></div>
+      <div class="h-full"/>
    </div>
  </div>
 </template>
--- a/src/components/haex/vault/create.vue
+++ b/src/components/haex/vault/create.vue
@ -2,6 +2,7 @@
  <UiDialogConfirm
    :confirm-label="t('create')"
    @confirm="onCreateAsync"
+    :description="t('description')"
  >
    <UiButton
      :label="t('vault.create')"
@ -55,7 +56,9 @@
 <script setup lang="ts">
 import { vaultSchema } from './schema'

-const { t } = useI18n()
+const { t } = useI18n({
+  useScope: 'local',
+})

 const vault = reactive<{
  name: string
@ -118,6 +121,7 @@ de:
    name: HaexVault
  title: Neue {haexvault} erstellen
  create: Erstellen
+  description: Erstelle eine neue Vault für deine Daten

 en:
  vault:
@ -127,4 +131,5 @@ en:
    name: HaexVault
  title: Create new {haexvault}
  create: Create
+  description: Create a new vault for your data
 </i18n>
--- a/src/components/haex/vault/open.vue
+++ b/src/components/haex/vault/open.vue
@ -5,7 +5,7 @@
    :description="vault.path || path"
    @confirm="onOpenDatabase"
  >
-    <!-- <UiButton
+    <UiButton
      :label="t('vault.open')"
      :ui="{
        base: 'px-3 py-2',
@ -14,8 +14,7 @@
      size="xl"
      variant="outline"
      block
-      @click.stop="onLoadDatabase"
-    /> -->
+    />

    <template #title>
      <i18n-t
@ -59,7 +58,9 @@ const props = defineProps<{
  path?: string
 }>()

-const { t } = useI18n()
+const { t } = useI18n({
+  useScope: 'local',
+})

 const vault = reactive<{
  name: string
@ -100,9 +101,6 @@ const vault = reactive<{
  }
 } */

-const { syncLocaleAsync, syncThemeAsync, syncVaultNameAsync } =
-  useVaultSettingsStore()
-
 const check = ref(false)

 const initVault = () => {
@ -156,15 +154,17 @@ const onOpenDatabase = async () => {
        },
      }),
    )
-    await Promise.allSettled([
-      syncLocaleAsync(),
-      syncThemeAsync(),
-      syncVaultNameAsync(),
-    ])
  } catch (error) {
    open.value = false
-    console.error('handleError', error, typeof error)
-    add({ color: 'error', description: `${error}` })
+    if (error?.details?.reason === 'file is not a database') {
+      add({
+        color: 'error',
+        title: t('error.password.title'),
+        description: t('error.password.description'),
+      })
+    } else {
+      add({ color: 'error', description: JSON.stringify(error) })
+    }
  }
 }
 </script>
@ -178,7 +178,9 @@ de:
    open: Vault öffnen
  description: Öffne eine vorhandene Vault
  error:
-    open: Vault konnte nicht geöffnet werden. \n Vermutlich ist das Passwort falsch
+    password:
+      title: Vault konnte nicht geöffnet werden
+      description: Bitte üperprüfe das Passwort

 en:
  open: Unlock
@ -188,5 +190,7 @@ en:
  vault:
    open: Open Vault
  error:
-    open: Vault couldn't be opened. \n The password is probably wrong
+    password:
+      title: Vault couldn't be opened
+      description: Please check your password
 </i18n>
--- a/src/components/haex/window/button.vue
+++ b/src/components/haex/window/button.vue
@ -0,0 +1,83 @@
+<template>
+  <UTooltip :text="tooltip">
+    <button
+      class="size-8 shrink-0 rounded-lg flex justify-center transition-colors group"
+      :class="variantClasses.buttonClass"
+      @click="(e) => $emit('click', e)"
+    >
+      <UIcon
+        :name="icon"
+        class="size-4 text-gray-600 dark:text-gray-400"
+        :class="variantClasses.iconClass"
+      />
+    </button>
+  </UTooltip>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  variant: 'close' | 'maximize' | 'minimize'
+  isMaximized?: boolean
+}>()
+
+defineEmits(['click'])
+
+const icon = computed(() => {
+  switch (props.variant) {
+    case 'close':
+      return 'i-heroicons-x-mark'
+    case 'maximize':
+      return props.isMaximized
+        ? 'i-heroicons-arrows-pointing-in'
+        : 'i-heroicons-arrows-pointing-out'
+    default:
+      return 'i-heroicons-minus'
+  }
+})
+
+const variantClasses = computed(() => {
+  if (props.variant === 'close') {
+    return {
+      iconClass: 'group-hover:text-error',
+      buttonClass: 'hover:bg-error/30 items-center',
+    }
+  } else if (props.variant === 'maximize') {
+    return {
+      iconClass: 'group-hover:text-warning',
+      buttonClass: 'hover:bg-warning/30 items-center',
+    }
+  } else {
+    return {
+      iconClass: 'group-hover:text-success',
+      buttonClass: 'hover:bg-success/30 items-end pb-1',
+    }
+  }
+})
+
+const { t } = useI18n()
+
+const tooltip = computed(() => {
+  switch (props.variant) {
+    case 'close':
+      return t('close')
+    case 'maximize':
+      return props.isMaximized ? t('shrink') : t('maximize')
+    default:
+      return t('minimize')
+  }
+})
+</script>
+
+<i18n lang="yaml">
+de:
+  close: Schließen
+  maximize: Maximieren
+  shrink: Verkleinern
+  minimize: Minimieren
+
+en:
+  close: Close
+  maximize: Maximize
+  shrink: Shrink
+  minimize: Minimize
+</i18n>
--- a/src/components/haex/window/index.vue
+++ b/src/components/haex/window/index.vue
@ -3,11 +3,17 @@
    ref="windowEl"
    :style="windowStyle"
    :class="[
-      'absolute bg-default/80 backdrop-blur-xl rounded-xl shadow-2xl overflow-hidden isolate',
-      'border border-gray-200 dark:border-gray-700 transition-all ease-out duration-600 ',
+      'absolute bg-default/80 backdrop-blur-xl rounded-lg shadow-xl overflow-hidden',
+      'transition-all ease-out duration-600',
      'flex flex-col @container',
      { 'select-none': isResizingOrDragging },
-      isActive ? 'z-50' : 'z-10',
+      isActive ? 'z-20' : 'z-10',
+      // Border colors based on warning level
+      warningLevel === 'warning'
+        ? 'border-2 border-warning-500'
+        : warningLevel === 'danger'
+          ? 'border-2 border-danger-500'
+          : 'border border-gray-200 dark:border-gray-700',
    ]"
    @mousedown="handleActivate"
  >
@ -23,7 +29,7 @@
          v-if="icon"
          :src="icon"
          :alt="title"
-          class="w-5 h-5 object-contain flex-shrink-0"
+          class="w-5 h-5 object-contain shrink-0"
        />
      </div>

@ -38,37 +44,21 @@

      <!-- Right: Window Controls -->
      <div class="flex items-center gap-1 justify-end">
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-700 flex items-center justify-center transition-colors"
+        <HaexWindowButton
+          variant="minimize"
          @click.stop="handleMinimize"
-        >
-          <UIcon
-            name="i-heroicons-minus"
-            class="w-4 h-4 text-gray-600 dark:text-gray-400"
-          />
-        </button>
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-700 flex items-center justify-center transition-colors"
+        />
+
+        <HaexWindowButton
+          :is-maximized
+          variant="maximize"
          @click.stop="handleMaximize"
-        >
-          <UIcon
-            :name="
-              isMaximized
-                ? 'i-heroicons-arrows-pointing-in'
-                : 'i-heroicons-arrows-pointing-out'
-            "
-            class="w-4 h-4 text-gray-600 dark:text-gray-400"
-          />
-        </button>
-        <button
-          class="w-8 h-8 rounded-lg hover:bg-red-100 dark:hover:bg-red-900/30 flex items-center justify-center transition-colors group"
+        />
+
+        <HaexWindowButton
+          variant="close"
          @click.stop="handleClose"
-        >
-          <UIcon
-            name="i-heroicons-x-mark"
-            class="w-4 h-4 text-gray-600 dark:text-gray-400 group-hover:text-red-600 dark:group-hover:text-red-400"
-          />
-        </button>
+        />
      </div>
    </div>

@ -95,10 +85,6 @@ const props = defineProps<{
  id: string
  title: string
  icon?: string | null
-  initialX?: number
-  initialY?: number
-  initialWidth?: number
-  initialHeight?: number
  isActive?: boolean
  sourceX?: number
  sourceY?: number
@ -106,6 +92,7 @@ const props = defineProps<{
  sourceHeight?: number
  isOpening?: boolean
  isClosing?: boolean
+  warningLevel?: 'warning' | 'danger' // Warning indicator (e.g., dev extension, dangerous permissions)
 }>()

 const emit = defineEmits<{
@ -118,6 +105,12 @@ const emit = defineEmits<{
  dragEnd: []
 }>()

+// Use defineModel for x, y, width, height
+const x = defineModel<number>('x', { default: 100 })
+const y = defineModel<number>('y', { default: 100 })
+const width = defineModel<number>('width', { default: 800 })
+const height = defineModel<number>('height', { default: 600 })
+
 const windowEl = useTemplateRef('windowEl')
 const titlebarEl = useTemplateRef('titlebarEl')

@ -126,20 +119,14 @@ const viewportSize = inject<{
  width: Ref<number>
  height: Ref<number>
 }>('viewportSize')
-
-// Window state
-const x = ref(props.initialX ?? 100)
-const y = ref(props.initialY ?? 100)
-const width = ref(props.initialWidth ?? 800)
-const height = ref(props.initialHeight ?? 600)
 const isMaximized = ref(false) // Don't start maximized

 // Store initial position/size for restore
 const preMaximizeState = ref({
-  x: props.initialX ?? 100,
-  y: props.initialY ?? 100,
-  width: props.initialWidth ?? 800,
-  height: props.initialHeight ?? 600,
+  x: x.value,
+  y: y.value,
+  width: width.value,
+  height: height.value,
 })

 // Dragging state
@ -161,10 +148,6 @@ const isResizingOrDragging = computed(
  () => isResizing.value || isDragging.value,
 )

-// Snap settings
-const snapEdgeThreshold = 50 // pixels from edge to trigger snap
-const { x: mouseX } = useMouse()
-
 // Setup drag with useDrag composable (supports mouse + touch)
 useDrag(
  ({ movement: [mx, my], first, last }) => {
@ -180,34 +163,8 @@ useDrag(
    }

    if (last) {
-      // Drag ended - apply snapping
+      // Drag ended
      isDragging.value = false
-
-      const viewportBounds = getViewportBounds()
-      if (viewportBounds) {
-        const viewportWidth = viewportBounds.width
-        const viewportHeight = viewportBounds.height
-
-        if (mouseX.value <= snapEdgeThreshold) {
-          // Snap to left half
-          x.value = 0
-          y.value = 0
-          width.value = viewportWidth / 2
-          height.value = viewportHeight
-          isMaximized.value = false
-        } else if (mouseX.value >= viewportWidth - snapEdgeThreshold) {
-          // Snap to right half
-          x.value = viewportWidth / 2
-          y.value = 0
-          width.value = viewportWidth / 2
-          height.value = viewportHeight
-          isMaximized.value = false
-        } else {
-          // Normal snap back to viewport
-          snapToViewport()
-        }
-      }
-
      globalThis.getSelection()?.removeAllRanges()
      emit('positionChanged', x.value, y.value)
      emit('sizeChanged', width.value, height.value)
@ -229,7 +186,6 @@ useDrag(
    eventOptions: { passive: false },
    pointer: { touch: true },
    drag: {
-      threshold: 10, // 10px threshold prevents accidental drags and improves performance
      filterTaps: true, // Filter out taps (clicks) vs drags
      delay: 0, // No delay for immediate response
    },
@ -265,22 +221,18 @@ const windowStyle = computed(() => {
    baseStyle.opacity = '0'
    baseStyle.transform = 'scale(0.3)'
  }
-  // Normal state
-  else if (isMaximized.value) {
-    baseStyle.left = '0px'
-    baseStyle.top = '0px'
-    baseStyle.width = '100%'
-    baseStyle.height = '100%'
-    baseStyle.borderRadius = '0'
-    baseStyle.opacity = '1'
-    //baseStyle.transform = 'scale(1)'
-  } else {
+  // Normal state (maximized windows now use actual pixel dimensions)
+  else {
    baseStyle.left = `${x.value}px`
    baseStyle.top = `${y.value}px`
    baseStyle.width = `${width.value}px`
    baseStyle.height = `${height.value}px`
    baseStyle.opacity = '1'
-    //baseStyle.transform = 'scale(1)'
+
+    // Remove border-radius when maximized
+    if (isMaximized.value) {
+      baseStyle.borderRadius = '0'
+    }
  }

  // Performance optimization: hint browser about transforms
@ -318,38 +270,18 @@ const constrainToViewportDuringDrag = (newX: number, newY: number) => {
  const windowWidth = width.value
  const windowHeight = height.value

-  // Allow max 1/3 of window to go outside viewport during drag
+  // Allow sides and bottom to go out more
  const maxOffscreenX = windowWidth / 3
-  const maxOffscreenY = windowHeight / 3
+  const maxOffscreenBottom = windowHeight / 3

+  // For X axis: allow 1/3 to go outside on both sides
  const maxX = bounds.width - windowWidth + maxOffscreenX
  const minX = -maxOffscreenX
-  const maxY = bounds.height - windowHeight + maxOffscreenY
-  const minY = -maxOffscreenY

-  const constrainedX = Math.max(minX, Math.min(maxX, newX))
-  const constrainedY = Math.max(minY, Math.min(maxY, newY))
-
-  return { x: constrainedX, y: constrainedY }
-}
-
-const constrainToViewportFully = (
-  newX: number,
-  newY: number,
-  newWidth?: number,
-  newHeight?: number,
-) => {
-  const bounds = getViewportBounds()
-  if (!bounds) return { x: newX, y: newY }
-
-  const windowWidth = newWidth ?? width.value
-  const windowHeight = newHeight ?? height.value
-
-  // Keep entire window within viewport
-  const maxX = bounds.width - windowWidth
-  const minX = 0
-  const maxY = bounds.height - windowHeight
+  // For Y axis: HARD constraint at top (y=0), never allow window to go above header
  const minY = 0
+  // Bottom: allow 1/3 to go outside
+  const maxY = bounds.height - windowHeight + maxOffscreenBottom

  const constrainedX = Math.max(minX, Math.min(maxX, newX))
  const constrainedY = Math.max(minY, Math.min(maxY, newY))
@ -357,15 +289,6 @@ const constrainToViewportFully = (
  return { x: constrainedX, y: constrainedY }
 }

-const snapToViewport = () => {
-  const bounds = getViewportBounds()
-  if (!bounds) return
-
-  const constrained = constrainToViewportFully(x.value, y.value)
-  x.value = constrained.x
-  y.value = constrained.y
-}
-
 const handleActivate = () => {
  emit('activate')
 }
@ -387,14 +310,45 @@ const handleMaximize = () => {
    height.value = preMaximizeState.value.height
    isMaximized.value = false
  } else {
-    // Maximize
+    // Maximize - set position and size to viewport dimensions
    preMaximizeState.value = {
      x: x.value,
      y: y.value,
      width: width.value,
      height: height.value,
    }
-    isMaximized.value = true
+
+    // Get viewport bounds (desktop container, already excludes header)
+    const bounds = getViewportBounds()
+
+    if (bounds && bounds.width > 0 && bounds.height > 0) {
+      // Get safe-area-insets from CSS variables for debug
+      const safeAreaTop = parseFloat(
+        getComputedStyle(document.documentElement).getPropertyValue(
+          '--safe-area-inset-top',
+        ) || '0',
+      )
+      const safeAreaBottom = parseFloat(
+        getComputedStyle(document.documentElement).getPropertyValue(
+          '--safe-area-inset-bottom',
+        ) || '0',
+      )
+
+      // Desktop container uses 'absolute inset-0' which stretches over full viewport
+      // bounds.height = full viewport height (includes header area + safe-areas)
+      // We need to calculate available space properly
+
+      // Get header height from UI store (measured reactively in layout)
+      const uiStore = useUiStore()
+      const headerHeight = uiStore.headerHeight
+
+      x.value = 0
+      y.value = 0 // Start below header and status bar
+      width.value = bounds.width
+      // Height: viewport - header - both safe-areas
+      height.value = bounds.height - headerHeight - safeAreaTop - safeAreaBottom
+      isMaximized.value = true
+    }
  }
 }

@ -402,8 +356,30 @@ const handleMaximize = () => {
 const handleResizeStart = (direction: string, e: MouseEvent | TouchEvent) => {
  isResizing.value = true
  resizeDirection.value = direction
-  resizeStartX.value = e.clientX
-  resizeStartY.value = e.clientY
+  let clientX: number
+  let clientY: number
+
+  if ('touches' in e) {
+    // Es ist ein TouchEvent
+    const touch = e.touches[0] // Hole den ersten Touch
+
+    // Prüfe, ob 'touch' existiert (ist undefined, wenn e.touches leer ist)
+    if (touch) {
+      clientX = touch.clientX
+      clientY = touch.clientY
+    } else {
+      // Ungültiges Start-Event (kein Finger). Abbruch.
+      isResizing.value = false
+      return
+    }
+  } else {
+    // Es ist ein MouseEvent
+    clientX = e.clientX
+    clientY = e.clientY
+  }
+
+  resizeStartX.value = clientX
+  resizeStartY.value = clientY
  resizeStartWidth.value = width.value
  resizeStartHeight.value = height.value
  resizeStartPosX.value = x.value
@ -446,9 +422,6 @@ useEventListener(window, 'mouseup', () => {
    globalThis.getSelection()?.removeAllRanges()
    isResizing.value = false

-    // Snap back to viewport after resize ends
-    snapToViewport()
-
    emit('positionChanged', x.value, y.value)
    emit('sizeChanged', width.value, height.value)
  }
--- a/src/components/haex/window/overview.vue
+++ b/src/components/haex/window/overview.vue
@ -0,0 +1,222 @@
+<template>
+  <UDrawer
+    v-model:open="localShowWindowOverview"
+    direction="bottom"
+    :title="t('modal.title')"
+    :description="t('modal.description')"
+  >
+    <template #content>
+      <div class="h-full overflow-y-auto p-6 justify-center flex">
+        <!-- Window Thumbnails Flex Layout -->
+
+        <div
+          v-if="windows.length > 0"
+          class="flex flex-wrap gap-6 justify-center-safe items-start"
+        >
+          <div
+            v-for="window in windows"
+            :key="window.id"
+            class="relative group cursor-pointer"
+          >
+            <!-- Window Title Bar -->
+            <div class="flex items-center gap-3 mb-2 px-2">
+              <UIcon
+                v-if="window.icon"
+                :name="window.icon"
+                class="size-5 shrink-0"
+              />
+              <div class="flex-1 min-w-0">
+                <p class="font-semibold text-sm truncate">
+                  {{ window.title }}
+                </p>
+              </div>
+              <!-- Minimized Badge -->
+              <UBadge
+                v-if="window.isMinimized"
+                color="info"
+                size="xs"
+                :title="t('minimized')"
+              />
+            </div>
+
+            <!-- Scaled Window Preview Container / Teleport Target -->
+            <div
+              :id="`window-preview-${window.id}`"
+              class="relative bg-gray-100 dark:bg-gray-900 rounded-xl overflow-hidden border-2 border-gray-200 dark:border-gray-700 group-hover:border-primary-500 transition-all shadow-lg"
+              :style="getCardStyle(window)"
+              @click="handleRestoreAndActivateWindow(window.id)"
+            >
+              <!-- Hover Overlay -->
+              <div
+                class="absolute inset-0 bg-primary-500/10 opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none z-40"
+              />
+            </div>
+          </div>
+        </div>
+
+        <!-- Empty State -->
+        <div
+          v-else
+          class="flex flex-col items-center justify-center py-12 text-gray-500 dark:text-gray-400"
+        >
+          <UIcon
+            name="i-heroicons-window"
+            class="size-16 mb-4 shrink-0"
+          />
+          <p class="text-lg font-medium">No windows open</p>
+          <p class="text-sm">
+            Open an extension or system window to see it here
+          </p>
+        </div>
+      </div>
+    </template>
+  </UDrawer>
+</template>
+
+<script setup lang="ts">
+const { t } = useI18n()
+
+const windowManager = useWindowManagerStore()
+const workspaceStore = useWorkspaceStore()
+
+const { showWindowOverview, windows } = storeToRefs(windowManager)
+
+// Local computed for two-way binding with UModal
+const localShowWindowOverview = computed({
+  get: () => showWindowOverview.value,
+  set: (value) => {
+    showWindowOverview.value = value
+  },
+})
+
+const handleRestoreAndActivateWindow = (windowId: string) => {
+  const window = windowManager.windows.find((w) => w.id === windowId)
+  if (!window) return
+
+  // Switch to the workspace where this window is located
+  if (window.workspaceId) {
+    workspaceStore.slideToWorkspace(window.workspaceId)
+  }
+
+  // If window is minimized, restore it first
+  if (window.isMinimized) {
+    windowManager.restoreWindow(windowId)
+  } else {
+    // If not minimized, just activate it
+    windowManager.activateWindow(windowId)
+  }
+
+  // Close the overview
+  localShowWindowOverview.value = false
+}
+
+// Store original window sizes and positions to restore after overview closes
+const originalWindowState = ref<
+  Map<string, { width: number; height: number; x: number; y: number }>
+>(new Map())
+
+// Min/Max dimensions for preview cards
+const MIN_PREVIEW_WIDTH = 300
+const MAX_PREVIEW_WIDTH = 600
+const MIN_PREVIEW_HEIGHT = 225
+const MAX_PREVIEW_HEIGHT = 450
+
+// Calculate card size and scale based on window dimensions
+const getCardStyle = (window: (typeof windows.value)[0]) => {
+  const scaleX = MAX_PREVIEW_WIDTH / window.width
+  const scaleY = MAX_PREVIEW_HEIGHT / window.height
+  const scale = Math.min(scaleX, scaleY, 1) // Never scale up, only down
+
+  // Calculate scaled dimensions
+  const scaledWidth = window.width * scale
+  const scaledHeight = window.height * scale
+
+  // Ensure minimum card size
+  let finalScale = scale
+  if (scaledWidth < MIN_PREVIEW_WIDTH) {
+    finalScale = MIN_PREVIEW_WIDTH / window.width
+  }
+  if (scaledHeight < MIN_PREVIEW_HEIGHT) {
+    finalScale = Math.max(finalScale, MIN_PREVIEW_HEIGHT / window.height)
+  }
+
+  const cardWidth = window.width * finalScale
+  const cardHeight = window.height * finalScale
+
+  return {
+    width: `${cardWidth}px`,
+    height: `${cardHeight}px`,
+    '--window-scale': finalScale, // CSS variable for scale
+  }
+}
+
+// Watch for overview closing to restore windows
+watch(localShowWindowOverview, async (isOpen, wasOpen) => {
+  if (!isOpen && wasOpen) {
+    console.log('[WindowOverview] Overview closed, restoring windows...')
+
+    // Restore original window state
+    for (const window of windows.value) {
+      const originalState = originalWindowState.value.get(window.id)
+      if (originalState) {
+        console.log(
+          `[WindowOverview] Restoring window ${window.id} to:`,
+          originalState,
+        )
+
+        windowManager.updateWindowSize(
+          window.id,
+          originalState.width,
+          originalState.height,
+        )
+        windowManager.updateWindowPosition(
+          window.id,
+          originalState.x,
+          originalState.y,
+        )
+      }
+    }
+    originalWindowState.value.clear()
+  }
+})
+
+// Watch for overview opening to store original state
+watch(
+  () => localShowWindowOverview.value && windows.value.length,
+  (shouldStore) => {
+    if (shouldStore && originalWindowState.value.size === 0) {
+      console.log('[WindowOverview] Storing original window states...')
+
+      for (const window of windows.value) {
+        console.log(`[WindowOverview] Window ${window.id}:`, {
+          originalSize: { width: window.width, height: window.height },
+          originalPos: { x: window.x, y: window.y },
+        })
+
+        originalWindowState.value.set(window.id, {
+          width: window.width,
+          height: window.height,
+          x: window.x,
+          y: window.y,
+        })
+      }
+    }
+  },
+)
+</script>
+
+<i18n lang="yaml">
+de:
+  modal:
+    title: Fensterübersicht
+    description: Übersicht aller offenen Fenster auf allen Workspaces
+
+  minimized: Minimiert
+
+en:
+  modal:
+    title: Window Overview
+    description: Overview of all open windows on all workspaces
+
+  minimized: Minimized
+</i18n>
--- a/src/components/haex/workspace/card.vue
+++ b/src/components/haex/workspace/card.vue
@ -1,10 +1,12 @@
 <template>
  <UCard
-    class="cursor-pointer transition-all h-32 w-72 shrink-0 group duration-500"
+    ref="cardEl"
+    class="cursor-pointer transition-all h-32 w-72 shrink-0 group duration-500 rounded-lg"
    :class="[
      workspace.id === currentWorkspace?.id
        ? 'ring-2 ring-secondary bg-secondary/10'
        : 'hover:ring-2 hover:ring-gray-300',
+      isDragOver ? 'ring-4 ring-primary bg-primary/20 scale-105' : '',
    ]"
    @click="workspaceStore.slideToWorkspace(workspace.id)"
  >
@ -27,9 +29,70 @@
 </template>

 <script setup lang="ts">
-defineProps<{ workspace: IWorkspace }>()
+const props = defineProps<{ workspace: IWorkspace }>()

 const workspaceStore = useWorkspaceStore()
+const windowManager = useWindowManagerStore()

 const { currentWorkspace } = storeToRefs(workspaceStore)
+
+const cardEl = useTemplateRef('cardEl')
+const isDragOver = ref(false)
+
+// Use mouse position to detect if over card
+const { x: mouseX, y: mouseY } = useMouse()
+
+// Check if mouse is over this card while dragging
+watchEffect(() => {
+  if (!windowManager.draggingWindowId || !cardEl.value?.$el) {
+    isDragOver.value = false
+    return
+  }
+
+  // Get card bounding box
+  const rect = cardEl.value.$el.getBoundingClientRect()
+
+  // Check if mouse is within card bounds
+  const isOver =
+    mouseX.value >= rect.left &&
+    mouseX.value <= rect.right &&
+    mouseY.value >= rect.top &&
+    mouseY.value <= rect.bottom
+
+  isDragOver.value = isOver
+})
+
+// Handle drop when drag ends - check BEFORE draggingWindowId is cleared
+let wasOverThisCard = false
+
+watchEffect(() => {
+  if (isDragOver.value && windowManager.draggingWindowId) {
+    wasOverThisCard = true
+  }
+})
+
+watch(
+  () => windowManager.draggingWindowId,
+  (newValue, oldValue) => {
+    // Drag ended (from something to null)
+    if (oldValue && !newValue && wasOverThisCard) {
+      console.log(
+        '[WorkspaceCard] Drop detected! Moving window to workspace:',
+        props.workspace.name,
+      )
+      const window = windowManager.windows.find((w) => w.id === oldValue)
+      if (window) {
+        window.workspaceId = props.workspace.id
+        window.x = 0
+        window.y = 0
+        // Switch to the workspace after dropping
+        //workspaceStore.slideToWorkspace(props.workspace.id)
+      }
+      wasOverThisCard = false
+    } else if (!newValue) {
+      // Drag ended but not over this card
+      wasOverThisCard = false
+    }
+  },
+)
 </script>
--- a/src/components/ui/button/context.vue
+++ b/src/components/ui/button/context.vue
@ -0,0 +1,28 @@
+<template>
+  <UContextMenu :items="contextMenuItems">
+    <UiButton
+      v-bind="$attrs"
+      @click="$emit('click', $event)"
+    >
+      <template
+        v-for="(_, slotName) in $slots"
+        #[slotName]="slotProps"
+      >
+        <slot
+          :name="slotName"
+          v-bind="slotProps"
+        />
+      </template>
+    </UiButton>
+  </UContextMenu>
+</template>
+
+<script setup lang="ts">
+import type { ContextMenuItem } from '@nuxt/ui'
+
+defineProps<{
+  contextMenuItems: ContextMenuItem[]
+}>()
+
+defineEmits<{ click: [Event] }>()
+</script>
--- a/src/components/ui/button/index.vue
+++ b/src/components/ui/button/index.vue
@ -4,11 +4,10 @@
      <UButton
        class="pointer-events-auto"
        v-bind="{
-          ...{ size: isSmallScreen ? 'lg' : 'md' },
          ...buttonProps,
          ...$attrs,
        }"
-        @click="(e) => $emit('click', e)"
+        @click="$emit('click', $event)"
      >
        <template
          v-for="(_, slotName) in $slots"
--- a/src/components/ui/dropdown/theme.vue
+++ b/src/components/ui/dropdown/theme.vue
@ -11,10 +11,6 @@ const { availableThemes, currentTheme } = storeToRefs(useUiStore())

 const emit = defineEmits<{ select: [string] }>()

-watchImmediate(availableThemes, () =>
-  console.log('availableThemes', availableThemes),
-)
-
 const items = computed<DropdownMenuItem[]>(() =>
  availableThemes?.value.map((theme) => ({
    ...theme,
--- a/src/components/ui/select/color.vue
+++ b/src/components/ui/select/color.vue
@ -17,7 +17,7 @@
      :title="t('pick')"
      class="top-0 left-0 absolute size-0"
      type="color"
-    />
+    >

    <UiTooltip :tooltip="t('reset')">
      <UiButton
--- a/src/components/ui/select/icon.vue
+++ b/src/components/ui/select/icon.vue
@ -2,8 +2,8 @@
  <UDropdownMenu
    :items="icons"
    class="btn"
-    @select="(newIcon) => (iconName = newIcon)"
    :read_only
+    @select="(newIcon) => (iconName = newIcon)"
  >
    <template #activator>
      <Icon :name="iconName ? iconName : defaultIcon || icons.at(0)" />
@ -12,8 +12,8 @@
    <template #items="{ items }">
      <div class="grid grid-cols-6 -ml-2">
        <li
-          class="dropdown-item"
          v-for="item in items"
+          class="dropdown-item"
          @click="read_only ? '' : (iconName = item)"
        >
          <Icon
--- a/src/components/ui/select/index.vue
+++ b/src/components/ui/select/index.vue
@ -6,8 +6,8 @@
    <button
      :id
      class="advance-select-toogle flex justify-between grow p-3"
-      @click.prevent="toogleMenu"
      :disabled="read_only"
+      @click.prevent="toogleMenu"
    >
      <slot
        name="value"
@ -18,9 +18,9 @@
      </slot>
    </button>
    <button
-      @click.prevent="toogleMenu"
      class="flex items-center p-2 hover:shadow rounded-md hover:bg-primary hover:text-base-content"
      :disabled="read_only"
+      @click.prevent="toogleMenu"
    >
      <i class="i-[material-symbols--keyboard-arrow-down] size-4" />
    </button>
--- a/src/composables/extensionContextBroadcast.ts
+++ b/src/composables/extensionContextBroadcast.ts
@ -1,65 +0,0 @@
-// composables/extensionContextBroadcast.ts
-// NOTE: This composable is deprecated. Use tabsStore.broadcastToAllTabs() instead.
-// Keeping for backwards compatibility.
-
-import { getExtensionWindow } from './extensionMessageHandler'
-
-export const useExtensionContextBroadcast = () => {
-  // Globaler State für Extension IDs statt IFrames
-  const extensionIds = useState<Set<string>>(
-    'extension-ids',
-    () => new Set(),
-  )
-
-  const registerExtensionIframe = (_iframe: HTMLIFrameElement, extensionId: string) => {
-    extensionIds.value.add(extensionId)
-  }
-
-  const unregisterExtensionIframe = (_iframe: HTMLIFrameElement, extensionId: string) => {
-    extensionIds.value.delete(extensionId)
-  }
-
-  const broadcastContextChange = (context: {
-    theme: string
-    locale: string
-    platform: string
-  }) => {
-    const message = {
-      type: 'context.changed',
-      data: { context },
-      timestamp: Date.now(),
-    }
-
-    extensionIds.value.forEach((extensionId) => {
-      const win = getExtensionWindow(extensionId)
-      if (win) {
-        win.postMessage(message, '*')
-      }
-    })
-  }
-
-  const broadcastSearchRequest = (query: string, requestId: string) => {
-    const message = {
-      type: 'search.request',
-      data: {
-        query: { query, limit: 10 },
-        requestId,
-      },
-      timestamp: Date.now(),
-    }
-
-    extensionIds.value.forEach((extensionId) => {
-      const win = getExtensionWindow(extensionId)
-      if (win) {
-        win.postMessage(message, '*')
-      }
-    })
-  }
-
-  return {
-    registerExtensionIframe,
-    unregisterExtensionIframe,
-    broadcastContextChange,
-    broadcastSearchRequest,
-  }
-}
--- a/src/composables/extensionMessageHandler.ts
+++ b/src/composables/extensionMessageHandler.ts
@ -166,20 +166,18 @@ const registerGlobalMessageHandler = () => {
    try {
      let result: unknown

-      if (request.method.startsWith('extension.')) {
-        result = await handleExtensionMethodAsync(request, instance.extension)
-      } else if (request.method.startsWith('db.')) {
-        result = await handleDatabaseMethodAsync(request, instance.extension)
-      } else if (request.method.startsWith('fs.')) {
-        result = await handleFilesystemMethodAsync(request, instance.extension)
-      } else if (request.method.startsWith('http.')) {
-        result = await handleHttpMethodAsync(request, instance.extension)
-      } else if (request.method.startsWith('permissions.')) {
-        result = await handlePermissionsMethodAsync(request, instance.extension)
-      } else if (request.method.startsWith('context.')) {
+      if (request.method.startsWith('haextension.context.')) {
        result = await handleContextMethodAsync(request)
-      } else if (request.method.startsWith('storage.')) {
+      } else if (request.method.startsWith('haextension.storage.')) {
        result = await handleStorageMethodAsync(request, instance)
+      } else if (request.method.startsWith('haextension.db.')) {
+        result = await handleDatabaseMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.fs.')) {
+        result = await handleFilesystemMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.http.')) {
+        result = await handleHttpMethodAsync(request, instance.extension)
+      } else if (request.method.startsWith('haextension.permissions.')) {
+        result = await handlePermissionsMethodAsync(request, instance.extension)
      } else {
        throw new Error(`Unknown method: ${request.method}`)
      }
@ -328,30 +326,27 @@ export const getExtensionWindow = (extensionId: string): Window | undefined => {
  return getAllInstanceWindows(extensionId)[0]
 }

-// ==========================================
-// Extension Methods
-// ==========================================
+// Broadcast context changes to all extension instances
+export const broadcastContextToAllExtensions = (context: {
+  theme: string
+  locale: string
+  platform?: string
+}) => {
+  const message = {
+    type: 'haextension.context.changed',
+    data: { context },
+    timestamp: Date.now(),
+  }

-async function handleExtensionMethodAsync(
-  request: ExtensionRequest,
-  extension: IHaexHubExtension, // Direkter Typ, kein ComputedRef mehr
-) {
-  switch (request.method) {
-    case 'extension.getInfo': {
-      const info = (await invoke('get_extension_info', {
-        publicKey: extension.publicKey,
-        name: extension.name,
-      })) as Record<string, unknown>
-      // Override allowedOrigin with the actual window origin
-      // This fixes the dev-mode issue where Rust returns "tauri://localhost"
-      // but the actual origin is "http://localhost:3003"
-      return {
-        ...info,
-        allowedOrigin: window.location.origin,
-      }
+  console.log('[ExtensionHandler] Broadcasting context to all extensions:', context)
+
+  // Send to all registered extension windows
+  for (const [_, instance] of iframeRegistry.entries()) {
+    const win = windowIdToWindowMap.get(instance.windowId)
+    if (win) {
+      console.log('[ExtensionHandler] Sending context to:', instance.extension.name, instance.windowId)
+      win.postMessage(message, '*')
    }
-    default:
-      throw new Error(`Unknown extension method: ${request.method}`)
  }
 }

@ -369,11 +364,12 @@ async function handleDatabaseMethodAsync(
  }

  switch (request.method) {
-    case 'db.query': {
+    case 'haextension.db.query': {
      const rows = await invoke<unknown[]>('extension_sql_select', {
        sql: params.query || '',
        params: params.params || [],
-        extensionId: extension.id,
+        publicKey: extension.publicKey,
+        name: extension.name,
      })

      return {
@ -383,21 +379,22 @@ async function handleDatabaseMethodAsync(
      }
    }

-    case 'db.execute': {
-      await invoke<string[]>('extension_sql_execute', {
+    case 'haextension.db.execute': {
+      const rows = await invoke<unknown[]>('extension_sql_execute', {
        sql: params.query || '',
        params: params.params || [],
-        extensionId: extension.id,
+        publicKey: extension.publicKey,
+        name: extension.name,
      })

      return {
-        rows: [],
+        rows,
        rowsAffected: 1,
        lastInsertId: undefined,
      }
    }

-    case 'db.transaction': {
+    case 'haextension.db.transaction': {
      const statements =
        (request.params as { statements?: string[] }).statements || []

@ -405,7 +402,8 @@ async function handleDatabaseMethodAsync(
        await invoke('extension_sql_execute', {
          sql: stmt,
          params: [],
-          extensionId: extension.id,
+          publicKey: extension.publicKey,
+          name: extension.name,
        })
      }

@ -467,7 +465,7 @@ async function handlePermissionsMethodAsync(

 async function handleContextMethodAsync(request: ExtensionRequest) {
  switch (request.method) {
-    case 'context.get':
+    case 'haextension.context.get':
      if (!contextGetters) {
        throw new Error(
          'Context not initialized. Make sure useExtensionMessageHandler is called in a component.',
@ -499,25 +497,25 @@ async function handleStorageMethodAsync(
  )

  switch (request.method) {
-    case 'storage.getItem': {
+    case 'haextension.storage.getItem': {
      const key = request.params.key as string
      return localStorage.getItem(storageKey + key)
    }

-    case 'storage.setItem': {
+    case 'haextension.storage.setItem': {
      const key = request.params.key as string
      const value = request.params.value as string
      localStorage.setItem(storageKey + key, value)
      return null
    }

-    case 'storage.removeItem': {
+    case 'haextension.storage.removeItem': {
      const key = request.params.key as string
      localStorage.removeItem(storageKey + key)
      return null
    }

-    case 'storage.clear': {
+    case 'haextension.storage.clear': {
      // Remove only instance-specific keys
      const keys = Object.keys(localStorage).filter((k) =>
        k.startsWith(storageKey),
@ -526,7 +524,7 @@ async function handleStorageMethodAsync(
      return null
    }

-    case 'storage.keys': {
+    case 'haextension.storage.keys': {
      // Return only instance-specific keys (without prefix)
      const keys = Object.keys(localStorage)
        .filter((k) => k.startsWith(storageKey))
--- a/src/composables/useAndroidBackButton.ts
+++ b/src/composables/useAndroidBackButton.ts
@ -14,12 +14,20 @@ export function useAndroidBackButton() {

  // Track navigation history manually
  router.afterEach((to, from) => {
-    console.log('[AndroidBack] Navigation:', { to: to.path, from: from.path, stackSize: historyStack.value.length })
+    console.log('[AndroidBack] Navigation:', {
+      to: to.path,
+      from: from.path,
+      stackSize: historyStack.value.length,
+    })

    // If navigating forward (new page)
-    if (from.path && to.path !== from.path && !historyStack.value.includes(to.path)) {
+    if (
+      from.path &&
+      to.path !== from.path &&
+      !historyStack.value.includes(to.path)
+    ) {
      historyStack.value.push(from.path)
-      console.log('[AndroidBack] Added to stack:', from.path, 'Stack:', historyStack.value)
+      //console.log('[AndroidBack] Added to stack:', from.path, 'Stack:', historyStack.value)
    }
  })

@ -31,7 +39,10 @@ export function useAndroidBackButton() {

      // Listen to close requested event (triggered by Android back button)
      unlisten = await appWindow.onCloseRequested(async (event) => {
-        console.log('[AndroidBack] Back button pressed, stack size:', historyStack.value.length)
+        console.log(
+          '[AndroidBack] Back button pressed, stack size:',
+          historyStack.value.length,
+        )

        // Check if we have history
        if (historyStack.value.length > 0) {
@ -40,7 +51,10 @@ export function useAndroidBackButton() {

          // Remove current page from stack
          historyStack.value.pop()
-          console.log('[AndroidBack] Going back, new stack size:', historyStack.value.length)
+          console.log(
+            '[AndroidBack] Going back, new stack size:',
+            historyStack.value.length,
+          )

          // Navigate back in router
          router.back()
--- a/src/layouts/app.vue
+++ b/src/layouts/app.vue
@ -1,79 +0,0 @@
-<template>
-  <div class="flex flex-col w-full h-full overflow-hidden">
-    <div ref="headerRef">
-      <UPageHeader
-        as="header"
-        :ui="{
-          root: [
-            'bg-default border-b border-accented sticky top-0 z-50 pt-2 px-8 h-header',
-          ],
-          wrapper: [
-            'flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4',
-          ],
-        }"
-      >
-        <template #title>
-          <div class="flex items-center">
-            <UiLogoHaexhub class="size-12 shrink-0" />
-
-            <NuxtLinkLocale
-              class="link text-base-content link-neutral text-xl font-semibold no-underline flex items-center"
-              :to="{ name: 'desktop' }"
-            >
-              <UiTextGradient class="text-nowrap">
-                {{ currentVaultName }}
-              </UiTextGradient>
-            </NuxtLinkLocale>
-          </div>
-        </template>
-
-        <template #links>
-          <UButton
-            color="neutral"
-            variant="outline"
-            :block="isSmallScreen"
-            @click="isOverviewMode = !isOverviewMode"
-            icon="i-bi-person-workspace"
-            size="lg"
-          >
-          </UButton>
-          <HaexExtensionLauncher :block="isSmallScreen" />
-        </template>
-      </UPageHeader>
-    </div>
-
-    <main class="flex-1 overflow-hidden bg-elevated">
-      <NuxtPage />
-    </main>
-  </div>
-</template>
-
-<script setup lang="ts">
-const { currentVaultName } = storeToRefs(useVaultStore())
-
-const { isSmallScreen } = storeToRefs(useUiStore())
-
-const { isOverviewMode } = storeToRefs(useWorkspaceStore())
-</script>
-
-<i18n lang="yaml">
-de:
-  vault:
-    close: Vault schließen
-
-  sidebar:
-    close: Sidebar ausblenden
-    show: Sidebar anzeigen
-
-  search:
-    label: Suche
-en:
-  vault:
-    close: Close vault
-  sidebar:
-    close: close sidebar
-    show: show sidebar
-
-  search:
-    label: Search
-</i18n>
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@ -1,5 +1,155 @@
 <template>
-  <div class="bg-default isolate w-dvw h-dvh flex flex-col">
-    <slot />
+  <div class="w-full h-dvh flex flex-col">
+    <UPageHeader
+      ref="headerEl"
+      as="header"
+      :ui="{
+        root: ['px-8 py-0'],
+        wrapper: ['flex flex-row items-center justify-between gap-4'],
+      }"
+    >
+      <template #default>
+        <div class="flex justify-between items-center py-1">
+          <div>
+            <!-- <NuxtLinkLocale
+                class="link text-base-content link-neutral text-xl font-semibold no-underline flex items-center"
+                :to="{ name: 'desktop' }"
+              >
+                <UiTextGradient class="text-nowrap">
+                  {{ currentVaultName }}
+                </UiTextGradient>
+              </NuxtLinkLocale> -->
+            <UiButton
+              v-if="currentVaultId"
+              color="neutral"
+              variant="outline"
+              icon="i-bi-person-workspace"
+              size="lg"
+              :tooltip="t('workspaces.label')"
+              @click="isOverviewMode = !isOverviewMode"
+            />
+          </div>
+
+          <div>
+            <div v-if="!currentVaultId">
+              <UiDropdownLocale @select="onSelectLocale" />
+            </div>
+            <div
+              v-else
+              class="flex flex-row gap-2"
+            >
+              <UButton
+                v-if="openWindowsCount > 0"
+                color="primary"
+                variant="outline"
+                size="lg"
+                @click="showWindowOverview = !showWindowOverview"
+              >
+                {{ openWindowsCount }}
+              </UButton>
+              <HaexExtensionLauncher />
+            </div>
+          </div>
+        </div>
+      </template>
+    </UPageHeader>
+
+    <main class="overflow-hidden relative bg-elevated h-full">
+      <slot />
+    </main>
+
+    <!-- Workspace Drawer -->
+    <UDrawer
+      v-model:open="isOverviewMode"
+      direction="left"
+      :dismissible="false"
+      :overlay="false"
+      :modal="false"
+      title="Workspaces"
+      description="Workspaces"
+    >
+      <template #content>
+        <div class="p-6 h-full overflow-y-auto">
+          <UButton
+            block
+            trailing-icon="mdi-close"
+            class="text-2xl font-bold ext-gray-900 dark:text-white mb-4"
+            @click="isOverviewMode = false"
+          >
+            Workspaces
+          </UButton>
+
+          <!-- Workspace Cards -->
+          <div class="flex flex-col gap-3">
+            <HaexWorkspaceCard
+              v-for="workspace in workspaces"
+              :key="workspace.id"
+              :workspace
+            />
+          </div>
+
+          <!-- Add New Workspace Button -->
+          <UButton
+            block
+            variant="outline"
+            class="mt-6"
+            @click="handleAddWorkspace"
+            icon="i-heroicons-plus"
+            :label="t('workspaces.add')"
+          >
+          </UButton>
+        </div>
+      </template>
+    </UDrawer>
  </div>
 </template>
+
+<script setup lang="ts">
+import type { Locale } from 'vue-i18n'
+
+const { t, setLocale } = useI18n()
+const onSelectLocale = async (locale: Locale) => {
+  await setLocale(locale)
+}
+
+const { currentVaultId } = storeToRefs(useVaultStore())
+const { showWindowOverview, openWindowsCount } = storeToRefs(
+  useWindowManagerStore(),
+)
+
+const workspaceStore = useWorkspaceStore()
+const { workspaces, isOverviewMode } = storeToRefs(workspaceStore)
+
+const handleAddWorkspace = async () => {
+  const workspace = await workspaceStore.addWorkspaceAsync()
+  nextTick(() => {
+    workspaceStore.slideToWorkspace(workspace?.id)
+  })
+}
+
+// Measure header height and store it in UI store
+const headerEl = useTemplateRef('headerEl')
+const { height } = useElementSize(headerEl)
+const uiStore = useUiStore()
+
+watch(height, (newHeight) => {
+  uiStore.headerHeight = newHeight
+})
+</script>
+
+<i18n lang="yaml">
+de:
+  search:
+    label: Suche
+
+  workspaces:
+    label: Workspaces
+    add: Workspace hinzufügen
+en:
+  search:
+    label: Search
+
+  workspaces:
+    label: Workspaces
+    add: Add Workspace
+</i18n>
--- a/src/middleware/database.ts
+++ b/src/middleware/database.ts
@ -3,7 +3,6 @@ export default defineNuxtRouteMiddleware(async (to) => {

  const toVaultId = getSingleRouteParam(to.params.vaultId)

-  console.log('middleware', openVaults.value?.[toVaultId])
  if (!openVaults.value?.[toVaultId]) {
    return await navigateTo(useLocalePath()({ name: 'vaultOpen' }))
  }
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@ -1,113 +1,126 @@
 <template>
-  <div class="items-center justify-center flex w-full h-full relative">
-    <div class="absolute top-8 right-8 sm:top-4 sm:right-4">
-      <UiDropdownLocale @select="onSelectLocale" />
-    </div>
-
-    <div class="flex flex-col justify-center items-center gap-5 max-w-3xl">
-      <UiLogoHaexhub class="bg-primary p-3 size-16 rounded-full shrink-0" />
-      <span
-        class="flex flex-wrap font-bold text-pretty text-xl gap-2 justify-center"
-      >
-        <p class="whitespace-nowrap">
-          {{ t('welcome') }}
-        </p>
-        <UiTextGradient>Haex Hub</UiTextGradient>
-      </span>
-
-      <div class="flex flex-col md:flex-row gap-4 w-full h-24 md:h-auto">
-        <HaexVaultCreate />
-
-        <HaexVaultOpen
-          v-model:open="passwordPromptOpen"
-          :path="selectedVault?.path"
-        />
-      </div>
-
+  <div class="h-full">
+    <NuxtLayout>
      <div
-        v-show="lastVaults.length"
-        class="w-full"
+        class="flex flex-col justify-center items-center gap-5 mx-auto h-full overflow-scroll"
      >
-        <div class="font-thin text-sm justify-start px-2 pb-1">
-          {{ t('lastUsed') }}
+        <UiLogoHaexhub class="bg-primary p-3 size-16 rounded-full shrink-0" />
+        <span
+          class="flex flex-wrap font-bold text-pretty text-xl gap-2 justify-center"
+        >
+          <p class="whitespace-nowrap">
+            {{ t('welcome') }}
+          </p>
+          <UiTextGradient>Haex Hub</UiTextGradient>
+        </span>
+
+        <div class="flex flex-col gap-4 h-24 items-stretch justify-center">
+          <HaexVaultCreate />
+
+          <HaexVaultOpen
+            v-model:open="passwordPromptOpen"
+            :path="selectedVault?.path"
+          />
        </div>

        <div
-          class="relative border-base-content/25 divide-base-content/25 flex w-full flex-col divide-y rounded-md border overflow-scroll"
+          v-show="lastVaults.length"
+          class="max-w-md w-full sm:px-5"
        >
+          <div class="font-thin text-sm pb-1 w-full">
+            {{ t('lastUsed') }}
+          </div>
+
          <div
-            v-for="vault in lastVaults"
-            :key="vault.name"
-            class="flex items-center justify-between group overflow-x-scroll"
+            class="relative border-base-content/25 divide-base-content/25 flex w-full flex-col divide-y rounded-md border overflow-scroll"
          >
-            <UButton
-              variant="ghost"
-              color="neutral"
-              class="flex items-center no-underline justify-between text-nowrap text-sm md:text-base shrink w-full px-3"
-              @click="
-                () => {
-                  passwordPromptOpen = true
-                  selectedVault = vault
-                }
-              "
+            <div
+              v-for="vault in lastVaults"
+              :key="vault.name"
+              class="flex items-center justify-between group overflow-x-scroll"
            >
-              <span class="block">
-                {{ vault.name }}
-              </span>
-            </UButton>
+              <UiButtonContext
+                variant="ghost"
+                color="neutral"
+                size="xl"
+                class="flex items-center no-underline justify-between text-nowrap text-sm md:text-base shrink w-full hover:bg-default"
+                :context-menu-items="[
+                  {
+                    icon: 'mdi:trash-can-outline',
+                    label: t('remove.button'),
+                    onSelect: () => prepareRemoveVault(vault.name),
+                    color: 'error',
+                  },
+                ]"
+                @click="
+                  () => {
+                    passwordPromptOpen = true
+                    selectedVault = vault
+                  }
+                "
+              >
+                <span class="block">
+                  {{ vault.name }}
+                </span>
+              </UiButtonContext>
+              <UButton
+                color="error"
+                square
+                class="absolute right-2 hidden group-hover:flex min-w-6"
+              >
+                <Icon
+                  name="mdi:trash-can-outline"
+                  @click="prepareRemoveVault(vault.name)"
+                />
+              </UButton>
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col items-center gap-2">
+          <h4>{{ t('sponsors') }}</h4>
+          <div>
            <UButton
-              color="error"
-              square
-              class="absolute right-2 hidden group-hover:flex min-w-6"
+              variant="link"
+              @click="openUrl('https://itemis.com')"
            >
-              <Icon
-                name="mdi:trash-can-outline"
-                @click="prepareRemoveVault(vault.name)"
-              />
+              <UiLogoItemis class="text-[#00457C]" />
            </UButton>
          </div>
        </div>
      </div>

-      <div class="flex flex-col items-center gap-2">
-        <h4>{{ t('sponsors') }}</h4>
-        <div>
-          <UButton
-            variant="link"
-            @click="openUrl('https://itemis.com')"
-          >
-            <UiLogoItemis class="text-[#00457C]" />
-          </UButton>
-        </div>
-      </div>
-    </div>
-    <UiDialogConfirm
-      v-model:open="showRemoveDialog"
-      :title="t('remove.title')"
-      :description="t('remove.description', { vaultName: vaultToBeRemoved })"
-      @confirm="onConfirmRemoveAsync"
-    />
+      <UiDialogConfirm
+        v-model:open="showRemoveDialog"
+        :title="t('remove.title')"
+        :description="t('remove.description', { vaultName: vaultToBeRemoved })"
+        @confirm="onConfirmRemoveAsync"
+      />
+    </NuxtLayout>
  </div>
 </template>

 <script setup lang="ts">
 import { openUrl } from '@tauri-apps/plugin-opener'
-import type { Locale } from 'vue-i18n'
+
 import type { VaultInfo } from '@bindings/VaultInfo'

 definePageMeta({
  name: 'vaultOpen',
 })

-const { t, setLocale } = useI18n()
+const { t } = useI18n()

 const passwordPromptOpen = ref(false)
 const selectedVault = ref<VaultInfo>()

 const showRemoveDialog = ref(false)
-const { syncLastVaultsAsync, removeVaultAsync } = useLastVaultStore()
+
 const { lastVaults } = storeToRefs(useLastVaultStore())

+const { syncLastVaultsAsync, moveVaultToTrashAsync } = useLastVaultStore()
+const { syncDeviceIdAsync } = useDeviceStore()
+
 const vaultToBeRemoved = ref('')
 const prepareRemoveVault = (vaultName: string) => {
  vaultToBeRemoved.value = vaultName
@ -117,7 +130,7 @@ const prepareRemoveVault = (vaultName: string) => {
 const toast = useToast()
 const onConfirmRemoveAsync = async () => {
  try {
-    await removeVaultAsync(vaultToBeRemoved.value)
+    await moveVaultToTrashAsync(vaultToBeRemoved.value)
    showRemoveDialog.value = false
    await syncLastVaultsAsync()
  } catch (error) {
@ -127,17 +140,15 @@ const onConfirmRemoveAsync = async () => {
    })
  }
 }
+
 onMounted(async () => {
  try {
    await syncLastVaultsAsync()
+    await syncDeviceIdAsync()
  } catch (error) {
    console.error('ERROR: ', error)
  }
 })
-
-const onSelectLocale = async (locale: Locale) => {
-  await setLocale(locale)
-}
 </script>

 <i18n lang="yaml">
@ -146,6 +157,7 @@ de:
  lastUsed: 'Zuletzt verwendete Vaults'
  sponsors: Supported by
  remove:
+    button: Löschen
    title: Vault löschen
    description: Möchtest du die Vault {vaultName} wirklich löschen?

@ -154,6 +166,7 @@ en:
  lastUsed: 'Last used Vaults'
  sponsors: 'Supported by'
  remove:
+    button: Delete
    title: Delete Vault
    description: Are you sure you really want to delete {vaultName}?
 </i18n>
--- a/src/pages/vault.vue
+++ b/src/pages/vault.vue
@ -1,6 +1,6 @@
 <template>
-  <div class="w-full h-full overflow-y-auto">
-    <NuxtLayout name="app">
+  <div>
+    <NuxtLayout>
      <NuxtPage />
    </NuxtLayout>

@ -9,6 +9,7 @@
        v-model:open="showNewDeviceDialog"
        :confirm-label="t('newDevice.save')"
        :title="t('newDevice.title')"
+        :description="t('newDevice.setName')"
        confirm-icon="mdi:content-save-outline"
        @abort="showNewDeviceDialog = false"
        @confirm="onSetDeviceNameAsync"
@ -48,18 +49,25 @@ const newDeviceName = ref<string>('unknown')
 const { readNotificationsAsync } = useNotificationStore()
 const { isKnownDeviceAsync } = useDeviceStore()
 const { loadExtensionsAsync } = useExtensionsStore()
-const { setDeviceIdIfNotExistsAsync, addDeviceNameAsync } = useDeviceStore()
+const { addDeviceNameAsync } = useDeviceStore()
 const { deviceId } = storeToRefs(useDeviceStore())
+const { syncLocaleAsync, syncThemeAsync, syncVaultNameAsync } =
+  useVaultSettingsStore()

 onMounted(async () => {
  try {
-    await setDeviceIdIfNotExistsAsync()
-    await loadExtensionsAsync()
-    await readNotificationsAsync()
+    // Sync settings first before other initialization
+
+    await Promise.allSettled([
+      syncLocaleAsync(),
+      syncThemeAsync(),
+      syncVaultNameAsync(),
+      loadExtensionsAsync(),
+      readNotificationsAsync(),
+    ])

    const knownDevice = await isKnownDeviceAsync()

-    console.log('knownDevice', knownDevice)
    if (!knownDevice) {
      console.log('not known device')
      newDeviceName.value = hostname.value ?? 'unknown'
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
haex	471baec284	Simplify Android build: use default command for APK and AAB tauri android build creates both APK and AAB by default.	2025-11-01 16:44:32 +01:00
haex	8298d807f3	Fix Android build commands: use --apk and --aab flags Changed from incorrect --bundle aab to correct --aab flag.	2025-11-01 16:34:15 +01:00
haex	42e6459fbf	Prevent duplicate builds on tag pushes Build workflow now ignores all tags to avoid running alongside release workflow.	2025-11-01 16:06:35 +01:00
haex	6ae87fc694	Fix Android OpenSSL build by adding NDK toolchain to PATH Set proper CC, AR, and RANLIB environment variables for all Android targets to enable OpenSSL cross-compilation with SQLCipher encryption.	2025-11-01 16:03:46 +01:00
haex	f7867a5bde	Restore SQLCipher encryption for Android and fix CI build - Re-enable bundled-sqlcipher-vendored-openssl for Android - Add NDK environment variables for OpenSSL compilation - Install perl and make for OpenSSL build in CI - Ensures encryption works on all platforms including Android	2025-11-01 15:39:44 +01:00
haex	d82599f588	Fix Android build by using platform-specific rusqlite features - Use bundled-sqlcipher-vendored-openssl for non-Android platforms - Use bundled (standard SQLite) for Android to avoid OpenSSL compilation issues - Resolves OpenSSL build errors on Android targets	2025-11-01 15:36:20 +01:00
haex	72bb211a76	Fix secrets access in workflow conditional - Move secrets to env block instead of if condition - Use bash conditional to check if keystore is available - Provide clear logging for signed vs unsigned builds	2025-11-01 15:28:06 +01:00
haex	f14ce0d6ad	Add Android signing configuration to Gradle - Configure signingConfigs to read from environment variables - Apply signing to release builds when keystore is available - Support both signed and unsigned builds	2025-11-01 15:26:21 +01:00
haex	af09f4524d	Remove iOS builds from CI/CD workflows	2025-11-01 15:21:58 +01:00
haex	102832675d	Fix Android build commands syntax - Change from --apk to default build (produces APK) - Change from --aab to --bundle aab for AAB generation	2025-11-01 15:20:49 +01:00
haex	3490de2f51	Configure Android signing and disable iOS builds - Add optional Android signing for build workflow (unsigned for testing) - Require Android signing for release workflow - Disable iOS builds (commented out) until Apple Developer Account is available	2025-11-01 15:06:56 +01:00
haex	7c3af10938	Add Android and iOS builds to CI/CD pipelines	2025-11-01 15:00:33 +01:00
haex	5c5d0785b9	Fix pnpm version conflict in CI workflows	2025-11-01 14:48:58 +01:00
haex	121dd9dd00	Add GitHub Actions CI/CD pipelines - Add build pipeline for Windows, macOS, and Linux - Add release pipeline for automated releases - Remove CLAUDE.md from git tracking	2025-11-01 14:46:01 +01:00
haex	4ff6aee4d8	Fix Vue i18n warnings and component root node issues - Set useScope: 'global' in UI store to prevent i18n scope conflicts - Add wrapper div to vault page to ensure single root node for transitions - Fixes 'Duplicate useI18n calling by local scope' warning - Fixes 'Component inside <Transition> renders non-element root node' warning	2025-10-31 23:24:20 +01:00
haex	dceb49ae90	Add context menu for vault actions and trash functionality - Add UiButtonContext component for context menu support on buttons - Implement vault trash functionality using trash crate - Move vaults to system trash on desktop (with fallback to permanent delete on mobile) - Add context menu to vault list items for better mobile UX - Keep hover delete button for desktop users	2025-10-31 22:57:56 +01:00
haex	5ea04a80e0	Fix Android safe-area handling and window maximization - Fix extension signature verification on Android by canonicalizing paths (symlink compatibility) - Implement proper safe-area-inset handling for mobile devices - Add reactive header height measurement to UI store - Fix maximized window positioning to respect safe-areas and header - Create reusable HaexDebugOverlay component for mobile debugging - Fix Swiper navigation by using absolute positioning instead of flex-1 - Remove debug logging after Android compatibility confirmed 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-10-31 02:18:59 +01:00
haex	65cf2e2c3c	adjust gitignore	2025-10-30 22:01:31 +01:00
haex	68d542b4d7	Update extension system and database migrations Changes: - Added CLAUDE.md with project instructions - Updated extension manifest bindings (TypeScript) - Regenerated database migrations (consolidated into single migration) - Updated haex schema with table name handling - Enhanced extension manager and manifest handling in Rust - Updated extension store in frontend - Updated vault.db 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-10-30 21:59:13 +01:00
haex	f97cd4ad97	adjust drizzle backend. return array of arrays handle table names with quotes	2025-10-30 04:57:01 +01:00
haex	ef225b281f	refactored design	2025-10-28 14:16:17 +01:00
haex	16b71d9ea8	fix: Snap Dropzones	2025-10-27 11:26:12 +01:00
haex	5ee5ced8c0	desktopicons now with foreign key to extensions	2025-10-26 00:19:15 +02:00
haex	86b65f117d	cleanup. renamed postMessgages	2025-10-25 23:17:28 +02:00
haex	5fdea155d1	removed logs	2025-10-25 08:14:59 +02:00
haex	cb0c8d71f4	fix window on workspace rendering	2025-10-25 08:09:15 +02:00
haex	9281a85deb	fix linting	2025-10-24 14:37:20 +02:00
haex	8f8bbb5558	fix window overview	2025-10-24 14:33:56 +02:00
haex	252b8711de	feature: window overview	2025-10-24 13:17:29 +02:00
haex	4f839aa856	fixed trigger	2025-10-23 13:17:58 +02:00
haex	99ccadce00	removed pk fk mapping	2025-10-23 10:24:19 +02:00
				`@ -1 +0,0 @@`
				ALTER TABLE `haex_notifications` ADD `haex_timestamp` text;
				`@ -1 +0,0 @@`
				CREATE UNIQUE INDEX `haex_workspaces_name_unique` ON `haex_workspaces` (`name`);
				`@ -1 +0,0 @@`
				CREATE UNIQUE INDEX `haex_workspaces_position_unique` ON `haex_workspaces` (`position`);