editor: remove table view

editor: readonly table fixes
* fix tables not hiding under collapsed headings in readonly view * allow column resizing in readonly view * fix scrollbar not showing in readonly view Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
2026-08-29 10:09:26 +02:00 · 2025-11-27 12:03:43 +05:00 · 2025-11-27 11:56:52 +05:00 · 2025-11-27 11:43:27 +05:00 · 2025-11-27 11:43:27 +05:00 · 2025-11-27 11:43:27 +05:00
1793 changed files with 927718 additions and 367176 deletions
--- a/.commitlintrc.js
+++ b/.commitlintrc.js
@@ -10,11 +10,12 @@ const authors = readFileSync("AUTHORS", "utf-8");
 const isAuthor = authors.includes(`<${authorEmail}>`);

 const SCOPES = [
-  // for full list of scopes + details see: https://github.com/streetwriters/notesnook-private/blob/master/CONTRIBUTING.md#commit-guidelines
+  // for full list of scopes + details see: https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md#commit-guidelines

  "mobile",
  "web",
  "vericrypt",
+  "monograph",
  "desktop",
  "crypto",
  "editor",
@@ -34,7 +35,9 @@ const SCOPES = [
  "common",
  "global",
  "docs",
-  "themebuilder"
+  "themebuilder",
+  "intl",
+  "webclipper"
 ];

 module.exports = {
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,6 @@
 name: Bug Report
 description: Are you facing a bug or a crash in Notesnook?
-labels: ["Type: Bug", "Status: Pending"]
-assignees:
-  - thecodrr
+type: Bug
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
  - name: Notesnook Discord Community
-    url: https://discord.gg/6mHHyncHJE
+    url: https://go.notesnook.com/discord
    about: Reach out to us directly & discuss your issues, suggestions & other feedback!
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature you are missing in Notesnook
-labels: ["Type: Feature Request", "Status: Pending"]
+type: Feature
 body:
  - type: markdown
    attributes:
--- a/.github/actions/setup-node-with-cache/action.yml
+++ b/.github/actions/setup-node-with-cache/action.yml
@@ -7,13 +7,15 @@ runs:
    - name: Setup Node
      uses: actions/setup-node@v4
      with:
-        node-version: 20.x
+        node-version: 22.x
        cache: "npm"
        cache-dependency-path: |
          package-lock.json
          apps/mobile/package-lock.json
          apps/desktop/package-lock.json
          apps/web/package-lock.json
+          apps/monograph/package-lock.json
+          apps/theme-builder/package-lock.json
          extensions/web-clipper/package-lock.json
          packages/core/package-lock.json
          packages/crypto/package-lock.json
@@ -24,3 +26,4 @@ runs:
          packages/logger/package-lock.json
          packages/streamable-fs/package-lock.json
          packages/theme/package-lock.json
+          packages/intl/package-lock.json
--- a/.github/workflows/android.e2e.yml
+++ b/.github/workflows/android.e2e.yml
@@ -0,0 +1,105 @@
+name: e2e-android
+on: workflow_dispatch
+
+jobs:
+  e2e-android:
+    runs-on: ubuntu-latest
+    env:
+      API_LEVEL: 34
+      ARCH: x86_64
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Free Disk Space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: wrapper
+          cache-read-only: false
+
+      - name: Use specific Java version for the builds
+        uses: joschi/setup-jdk@v2
+        with:
+          java-version: "17"
+          architecture: "x64"
+
+      - name: Install Detox CLI
+        run: npm install detox-cli --global
+
+      - name: Check for typescript errors
+        run: |
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Detox build
+        run: |
+          yarn build:android
+          ls apps/mobile/native/android/app/build/outputs/apk
+          ls apps/mobile/native/android/app/build/outputs/apk/release
+
+      - name: Get device name
+        id: device
+        run: |
+          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
+          echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: ${{ steps.device.outputs.AVD_NAME }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.API_LEVEL }}
+          arch: ${{ env.ARCH }}
+          avd-name: ${{ steps.device.outputs.AVD_NAME }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Detox test
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.API_LEVEL }}
+          arch: ${{ env.ARCH }}
+          avd-name: ${{ steps.device.outputs.AVD_NAME }}
+          disable-animations: true
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          force-avd-creation: false
+          script: yarn test:android --headless --record-logs failing --record-videos failing --take-screenshots failing
+
+      - name: Upload artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: detox-artifacts
+          path: artifacts
+          retention-days: 14
--- a/.github/workflows/android.publish.internal.yml
+++ b/.github/workflows/android.publish.internal.yml
@@ -4,8 +4,7 @@ on: workflow_dispatch

 jobs:
  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
+    runs-on: ubuntu-22.04
    env:
      CMAKE_C_COMPILER_LAUNCHER: ccache
      CMAKE_CXX_COMPILER_LAUNCHER: ccache
@@ -22,7 +21,7 @@ jobs:
      - name: Use specific Java version for the builds
        uses: joschi/setup-jdk@v2
        with:
-          java-version: "11"
+          java-version: "17"
          architecture: "x64"

      - name: Install node modules
@@ -31,7 +30,23 @@ jobs:
          npm run bootstrap -- --scope=mobile

      - name: Make Gradlew Executable
-        run: cd apps/mobile/native/android && chmod +x ./gradlew
+        run: cd apps/mobile/android && chmod +x ./gradlew
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+          # all of these default to true, but feel free to set to
+          # "false" if necessary for your workflow
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true

      - name: Install CCache
        uses: hendrikmuhs/ccache-action@v1.2.11
@@ -58,7 +73,7 @@ jobs:
          ccache -p

      - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: |
            ~/.gradle/caches
@@ -69,12 +84,19 @@ jobs:
        run: |
          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
-          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
-          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle

      - name: CCache Stats Before Build
        run: ccache -sv

+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Remove debug keystore
+        run: rm -rf apps/mobile/android/app/debug.keystore
+
      - name: Build unsigned app bundle
        run: yarn release:android:bundle

@@ -85,7 +107,7 @@ jobs:
        id: sign_app
        uses: r0adkll/sign-android-release@master
        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/bundle/release
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.ALIAS }}
          keyStorePassword: ${{ secrets.KEY_PASSWORD }}
@@ -100,7 +122,7 @@ jobs:
        id: sign_apk
        uses: r0adkll/sign-android-release@master
        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/apk/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/apk/release
          signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
          alias: ${{ secrets.PUBLIC_ALIAS }}
          keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
@@ -110,7 +132,7 @@ jobs:

      - name: Rename apk files
        run: |
-          cd apps/mobile/native/android/app/build/outputs/apk/release/
+          cd apps/mobile/android/app/build/outputs/apk/release/
          mv app-arm64-v8a-release-unsigned-signed.apk notesnook-arm64-v8a.apk
          mv app-armeabi-v7a-release-unsigned-signed.apk notesnook-armeabi-v7a.apk
          mv app-x86-release-unsigned-signed.apk notesnook-x86.apk
@@ -118,7 +140,7 @@ jobs:

      - name: Get app version
        id: package-version
-        uses: martinbeentjes/npm-get-version-action@master
+        uses: saionaro/extract-package-version@master
        with:
          path: apps/mobile

@@ -129,28 +151,29 @@ jobs:
          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
          packageName: com.streetwriters.notesnook
          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
-          track: alpha
+          track: beta
          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+          whatsNewDirectory: apps/mobile/android/releasenotes/

      - name: Create release draft on Github
        uses: softprops/action-gh-release@v1
        with:
          draft: true
-          tag_name: ${{ steps.package-version.outputs.current-version}}-beta-android
-          name: Notesnook Android v${{ steps.package-version.outputs.current-version}} Beta
+          tag_name: ${{ steps.package-version.outputs.version}}-beta-android
+          name: Notesnook Android v${{ steps.package-version.outputs.version}}
          repository: streetwriters/notesnook
          token: ${{ secrets.GITHUB_TOKEN }}
          files: |
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+            ${{steps.sign_app.outputs.signedReleaseFile}}

      - name: Upload sourcemaps
        uses: actions/upload-artifact@v4
        with:
          name: sourcemaps
          path: |
-            apps/mobile/native/android/app/build/**/*.map
+            apps/mobile/android/app/build/**/*.map
            packages/editor-mobile/sourcemaps/*.map
--- a/.github/workflows/android.publish.yml
+++ b/.github/workflows/android.publish.yml
@@ -4,8 +4,7 @@ on: workflow_dispatch

 jobs:
  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
+    runs-on: ubuntu-22.04
    env:
      CMAKE_C_COMPILER_LAUNCHER: ccache
      CMAKE_CXX_COMPILER_LAUNCHER: ccache
@@ -31,7 +30,7 @@ jobs:
          npm run bootstrap -- --scope=mobile

      - name: Make Gradlew Executable
-        run: cd apps/mobile/native/android && chmod +x ./gradlew
+        run: cd apps/mobile/android && chmod +x ./gradlew

      - name: Install CCache
        uses: hendrikmuhs/ccache-action@v1.2.11
@@ -58,7 +57,7 @@ jobs:
          ccache -p

      - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: |
            ~/.gradle/caches
@@ -69,12 +68,19 @@ jobs:
        run: |
          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
          sed -i -e 's/arguments/arguments "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",/g' apps/mobile/node_modules/react-native-reanimated/android/build.gradle
-          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-reanimated//android/build.gradle
-          sed -i -e 's/defaultConfig {/ndkVersion safeExtGet('ndkVersion', "25.2.9519653")\n  defaultConfig {/g' apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle

      - name: CCache Stats Before Build
        run: ccache -sv

+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Remove debug keystore
+        run: rm -rf apps/mobile/android/app/debug.keystore
+
      - name: Build unsigned app bundle
        run: yarn release:android:bundle

@@ -85,7 +91,7 @@ jobs:
        id: sign_app
        uses: r0adkll/sign-android-release@master
        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/bundle/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/bundle/release
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.ALIAS }}
          keyStorePassword: ${{ secrets.KEY_PASSWORD }}
@@ -100,7 +106,7 @@ jobs:
        id: sign_apk
        uses: r0adkll/sign-android-release@master
        with:
-          releaseDirectory: apps/mobile/native/android/app/build/outputs/apk/release
+          releaseDirectory: apps/mobile/android/app/build/outputs/apk/release
          signingKeyBase64: ${{ secrets.PUBLIC_SIGNING_KEY }}
          alias: ${{ secrets.PUBLIC_ALIAS }}
          keyStorePassword: ${{ secrets.PUBLIC_KEY_PASSWORD }}
@@ -110,7 +116,7 @@ jobs:

      - name: Rename apk files
        run: |
-          cd apps/mobile/native/android/app/build/outputs/apk/release/
+          cd apps/mobile/android/app/build/outputs/apk/release/
          mv app-arm64-v8a-release-unsigned-signed.apk notesnook-arm64-v8a.apk
          mv app-armeabi-v7a-release-unsigned-signed.apk notesnook-armeabi-v7a.apk
          mv app-x86-release-unsigned-signed.apk notesnook-x86.apk
@@ -131,7 +137,7 @@ jobs:
          releaseFiles: ${{steps.sign_app.outputs.signedReleaseFile}}
          track: production
          status: completed
-          whatsNewDirectory: apps/mobile/native/android/releasenotes/
+          whatsNewDirectory: apps/mobile/android/releasenotes/

      - name: Create release draft on Github
        uses: softprops/action-gh-release@v1
@@ -142,15 +148,15 @@ jobs:
          repository: streetwriters/notesnook
          token: ${{ secrets.GITHUB_TOKEN }}
          files: |
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86.apk
-            apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-arm64-v8a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-armeabi-v7a.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86.apk
+            apps/mobile/android/app/build/outputs/apk/release/notesnook-x86_64.apk

      - name: Upload sourcemaps
        uses: actions/upload-artifact@v4
        with:
          name: sourcemaps
          path: |
-            apps/mobile/native/android/app/build/**/*.map
+            apps/mobile/android/app/build/**/*.map
            packages/editor-mobile/sourcemaps/*.map
--- a/.github/workflows/core.tests.yml
+++ b/.github/workflows/core.tests.yml
@@ -9,7 +9,13 @@ on:
      - "packages/core/**"
      # re-run workflow if workflow file changes
      - ".github/workflows/core.tests.yml"
-  pull_request:
+  pull_request_target:
+    branches:
+      - "master"
+    paths:
+      - "packages/core/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/core.tests.yml"
    types:
      - "ready_for_review"
      - "opened"
@@ -17,11 +23,21 @@ on:
      - "reopened"

 jobs:
-  test:
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository &&
+      'external' || 'internal' }}
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@v3
+      - run: echo true
+
+  test:
+    needs: authorize
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -36,7 +52,6 @@ jobs:
          echo "USER_PASSWORD=${{ secrets.USER_PASSWORD }}" >> $GITHUB_ENV
          echo "USER_TOTP_SECRET=${{ secrets.USER_TOTP_SECRET }}" >> $GITHUB_ENV
          echo "USER_HASHED_PASSWORD=${{ secrets.USER_HASHED_PASSWORD }}" >> $GITHUB_ENV
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV

      - name: Run all @notesnook/core tests
-        run: npx nx test:e2e @notesnook/core
+        run: npm run tx @notesnook/core:test:e2e
--- a/.github/workflows/desktop.publish.yml
+++ b/.github/workflows/desktop.publish.yml
@@ -33,14 +33,22 @@ on:
        required: true
        default: true
        description: "Build for macOS?"
+      release-track:
+        type: choice
+        required: true
+        default: stable
+        description: "Select the release track"
+        options:
+          - stable
+          - beta

 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -49,13 +57,25 @@ jobs:
        run: |
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=web
+          npm run bootstrap -- --scope=desktop

-      - name: Setup environment
+      - name: Install sqlite-better-trigram for all arch
        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+        working-directory: ./apps/desktop

-      - name: Generate desktop build
-        run: npx nx build:desktop @notesnook/web
+      - name: Generate desktop build (stable)
+        if: ${{ inputs.release-track == 'stable' }}
+        run: npm run tx @notesnook/web:build:desktop
+
+      - name: Generate desktop build (beta)
+        if: ${{ inputs.release-track == 'beta' }}
+        run: BETA=true npm run tx @notesnook/web:build:desktop
+
+      - name: Build desktop bundle
+        working-directory: ./apps/desktop
+        run: npm run bundle

      - name: Archive build artifact
        uses: actions/upload-artifact@v4
@@ -71,7 +91,8 @@ jobs:

      - name: Package desktop build
        run: |
-          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/web/build/
+          cp -r ./apps/web/build ./apps/desktop/
+          zip -r ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip ./apps/desktop/build/
          echo "Build folder archived to ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip"

      - name: Upload desktop build
@@ -82,6 +103,28 @@ jobs:
          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
          tag_name: v${{ steps.app_metadata.outputs.app_version }}
          files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
+          prerelease: ${{ inputs.release-track == 'beta' }}
+          target_commitish: ${{ github.ref }}
+
+      - name: Generate flatpak sources
+        if: inputs.publish-github && inputs.build-linux
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --quiet flatpak flatpak-builder pipx
+          git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
+          cd /tmp/flatpak-builder-tools/node
+          pipx install .
+          cd -
+          node scripts/generate-sources.mjs
+
+      - name: Upload flatpak sources
+        uses: softprops/action-gh-release@v1
+        if: inputs.publish-github && inputs.build-linux
+        with:
+          draft: true
+          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
+          tag_name: v${{ steps.app_metadata.outputs.app_version }}
+          files: ./generated-sources.json
          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}

  build-macos:
@@ -92,7 +135,7 @@ jobs:

    steps:
      - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -136,6 +179,12 @@ jobs:
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=desktop

+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+        working-directory: ./apps/desktop
+
      - name: Install provisioning profile
        run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
        working-directory: ./apps/desktop
@@ -146,9 +195,9 @@ jobs:
          CSC_LINK: ${{ secrets.mac_certs }}
          CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
        run: |
-          npx nx run release --project @notesnook/desktop -- --variant=mas
-          yarn electron-builder --mac mas --universal -p never
-        working-directory: ./apps/desktop
+          npm run tx @notesnook/desktop:release -- --variant=mas
+          cd apps/desktop
+          yarn electron-builder --config=electron-builder.config.js --mac mas --universal -p never

      - name: Build zip and dmg
        env:
@@ -159,13 +208,13 @@ jobs:
          APPLE_API_KEY_ID: ${{ secrets.api_key_id }}
          APPLE_API_ISSUER: ${{ secrets.api_key_issuer_id }}
        run: |
-          npx nx run release --project @notesnook/desktop
+          npm run tx @notesnook/desktop:release
+          cd apps/desktop
          if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --mac zip dmg --arm64 --x64 -p always
+            yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p always
          else
-            yarn electron-builder --mac zip dmg --arm64 --x64 -p never
+            yarn electron-builder --config=electron-builder.config.js --mac zip dmg --arm64 --x64 -p never
          fi
-        working-directory: ./apps/desktop

      - name: Deploy to Testflight
        if: inputs.publish-apple && steps.appstore.outputs.app-version-latest != steps.app_metadata.outputs.app_version
@@ -180,15 +229,15 @@ jobs:
          xcrun altool --upload-package $package -t osx --apiKey $API_KEY_ID --apiIssuer $API_KEY_ISSUER_ID --apple-id ${{ steps.app_metadata.outputs.apple_app_id }} --bundle-id ${{ steps.app_metadata.outputs.app_bundle_id }} --bundle-short-version-string ${{ steps.app_metadata.outputs.app_version }} --bundle-version ${{ steps.app_metadata.outputs.bundle_version }}
        working-directory: ./apps/desktop

-  build-linux:
-    name: Build for Linux
+  build-linux-x64:
+    name: Build for Linux x64
    needs: build
    if: inputs.build-linux
    runs-on: ubuntu-22.04

    steps:
      - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -198,7 +247,7 @@ jobs:
        run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV

      - name: Install Snapcraft
-        uses: samuelmeuli/action-snapcraft@v1
+        uses: samuelmeuli/action-snapcraft@v3
        if: inputs.publish-snap

      - name: Download build
@@ -212,14 +261,18 @@ jobs:
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=desktop

-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu x64 sqlite-better-trigram
        working-directory: ./apps/desktop

+      - name: Build Electron wrapper
+        run: npm run tx @notesnook/desktop:release
+
      - name: Build snap
        if: inputs.publish-snap
        run: |
-          yarn electron-builder --linux snap:x64 -p never
+          yarn electron-builder --config=electron-builder.config.js --linux snap:x64 -p never
        working-directory: ./apps/desktop

      - name: Build AppImage
@@ -227,18 +280,85 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          if [ ${{ inputs.publish-github }} == true ]; then
-            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p always
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 -p always
          else
-            yarn electron-builder --linux AppImage:x64 AppImage:arm64 -p never
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:x64 -p never
          fi
        working-directory: ./apps/desktop

      - name: Publish on Snapcraft
        if: inputs.publish-snap
        run: |
-          snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
+          if [ ${{ inputs.release-track }} == 'beta' ]; then
+            snapcraft upload --release=beta ./output/notesnook_linux_amd64.snap
+          else
+            snapcraft upload --release=stable ./output/notesnook_linux_amd64.snap
+          fi
        working-directory: ./apps/desktop

+  build-linux-arm64:
+    name: Build for Linux arm64
+    needs: build
+    if: inputs.build-linux
+    runs-on: ubuntu-22.04-arm
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      # - name: Setup Snapcraft Auth
+      #   if: inputs.publish-snap
+      #   run: echo "SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.snapcraft_token }}" >> $GITHUB_ENV
+
+      # - name: Install Snapcraft
+      #   uses: samuelmeuli/action-snapcraft@v1
+      #   if: inputs.publish-snap
+
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: ./apps/web/build
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+        working-directory: ./apps/desktop
+
+      - name: Build Electron wrapper
+        run: npm run tx @notesnook/desktop:release
+
+      # - name: Build snap
+      #   if: inputs.publish-snap
+      #   run: |
+      #     yarn electron-builder --config=electron-builder.config.js --linux snap:arm64 -p never
+      #   working-directory: ./apps/desktop
+
+      - name: Build AppImage
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [ ${{ inputs.publish-github }} == true ]; then
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:arm64 -p always
+          else
+            yarn electron-builder --config=electron-builder.config.js --linux AppImage:arm64 -p never
+          fi
+        working-directory: ./apps/desktop
+
+      # - name: Publish on Snapcraft
+      #   if: inputs.publish-snap
+      #   run: |
+      #     snapcraft upload --release=stable ./output/notesnook_linux_arm64.snap
+      #   working-directory: ./apps/desktop
+
  build-windows:
    name: Build for Windows
    needs: build
@@ -247,7 +367,7 @@ jobs:

    steps:
      - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup .NET Core SDK
        uses: actions/setup-dotnet@v2
@@ -272,8 +392,17 @@ jobs:
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=desktop

+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+
+          npm i --cpu arm64 sqlite3-fts5-html
+          npm i --cpu x64 sqlite3-fts5-html
+        working-directory: ./apps/desktop
+
      - name: Build
-        run: npx nx run release --project @notesnook/desktop
+        run: node scripts/execute.mjs @notesnook/desktop:release

      - name: Publish
        env:
@@ -283,8 +412,8 @@ jobs:
          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
        run: |
          if ($${{ inputs.publish-github }} -eq $true) {
-            yarn electron-builder --win --publish always
+            yarn electron-builder --config=electron-builder.config.js --win --publish always
          } else {
-            yarn electron-builder --win --publish never
+            yarn electron-builder --config=electron-builder.config.js --win --publish never
          }
        working-directory: ./apps/desktop
--- a/.github/workflows/desktop.tests.yml
+++ b/.github/workflows/desktop.tests.yml
@@ -0,0 +1,230 @@
+name: Test @notesnook/desktop
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "apps/desktop/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/desktop.tests.yml"
+  pull_request:
+    branches:
+      - "master"
+    paths:
+      - "apps/desktop/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/desktop.tests.yml"
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
+
+      - name: Generate desktop build
+        run: npm run tx @notesnook/web:build:desktop
+
+      - name: Archive build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build
+          path: apps/web/build/**/*
+
+  test-macos-x64:
+    name: Test macOS x64
+    needs: build
+    runs-on: macos-13
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: ./apps/web/build
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
+      - name: Build Electron wrapper
+        run: npm run tx @notesnook/desktop:release
+
+      - name: Build app
+        run: |
+          yarn electron-builder --config=electron-builder.config.js --mac --dir --x64
+        working-directory: ./apps/desktop
+
+      - name: Run tests x64
+        run: npm run test
+        working-directory: ./apps/desktop
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results-macos-x64
+          path: apps/desktop/test-results
+          retention-days: 5
+
+  test-macos:
+    name: Test macOS
+    needs: build
+    runs-on: macos-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: ./apps/web/build
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
+      - name: Build Electron wrapper
+        run: npm run tx @notesnook/desktop:release
+
+      - name: Build app
+        run: |
+          yarn electron-builder --config=electron-builder.config.js --mac --dir --arm64
+        working-directory: ./apps/desktop
+
+      - name: Run tests arm64
+        run: npm run test
+        working-directory: ./apps/desktop
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results-macos
+          path: apps/desktop/test-results
+          retention-days: 5
+
+  test-linux:
+    name: Test for Linux
+    needs: build
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: ./apps/web/build
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+        working-directory: ./apps/desktop
+
+      - name: Build Electron wrapper
+        run: npm run tx @notesnook/desktop:release
+
+      - name: Build app
+        run: |
+          yarn electron-builder --config=electron-builder.config.js --linux --dir --arm64 --x64
+        working-directory: ./apps/desktop
+
+      - name: Run tests
+        run: xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
+        working-directory: ./apps/desktop
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results-linux
+          path: apps/desktop/test-results
+          retention-days: 5
+
+  test-windows:
+    name: Test for Windows
+    needs: build
+    runs-on: windows-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build
+          path: ./apps/web/build
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=desktop
+
+      - name: Install sqlite-better-trigram for all arch
+        run: |
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu x64 sqlite-better-trigram
+
+          npm i --cpu arm64 sqlite3-fts5-html
+          npm i --cpu x64 sqlite3-fts5-html
+        working-directory: ./apps/desktop
+
+      - name: Build Electron wrapper
+        run: node scripts/execute.mjs @notesnook/desktop:release
+
+      - name: Build app
+        run: |
+          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --config=electron-builder.config.js --win --dir --arm64 --x64
+        working-directory: ./apps/desktop
+
+      - name: Run tests
+        run: npm run test
+        working-directory: ./apps/desktop
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results-win
+          path: apps/desktop/test-results
+          retention-days: 5
--- a/.github/workflows/editor.tests.yml
+++ b/.github/workflows/editor.tests.yml
@@ -10,6 +10,12 @@ on:
      # re-run workflow if workflow file changes
      - ".github/workflows/editor.tests.yml"
  pull_request:
+    branches:
+      - "master"
+    paths:
+      - "packages/editor/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/editor.tests.yml"
    types:
      - "ready_for_review"
      - "opened"
@@ -19,10 +25,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -32,12 +38,8 @@ jobs:
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=editor

-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
      - name: Build editor
-        run: npx nx build @notesnook/editor
+        run: npm run tx @notesnook/editor:build

      - name: Run all @notesnook/editor tests
-        run: npx nx test @notesnook/editor
+        run: npm run tx @notesnook/editor:test
--- a/.github/workflows/help.publish.yml
+++ b/.github/workflows/help.publish.yml
@@ -1,6 +1,6 @@
 name: Publish Notesnook Help

-on: 
+on:
  workflow_dispatch:
  push:
    branches:
@@ -11,10 +11,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
--- a/.github/workflows/ios.publish.yml
+++ b/.github/workflows/ios.publish.yml
@@ -4,23 +4,28 @@ on: workflow_dispatch

 jobs:
  build:
-    runs-on: macos-13
+    runs-on: macos-14
    timeout-minutes: 60

    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache

+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "16.1"
+
      - name: Install node modules
        run: |
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=mobile

      - name: Build packages
-        run: npx nx run @notesnook/mobile:build
+        run: npm run tx @notesnook/mobile:build

      - name: ccache
        uses: hendrikmuhs/ccache-action@v1.2.11
@@ -47,14 +52,23 @@ jobs:
          ccache -p

      - name: Cache Pods
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        id: pods-cache
        with:
          path: apps/mobile/native/ios/Pods
          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/native/ios/Podfile.lock') }}

      - name: Install Pods
-        run: npm run prepare:ios
+        run: |
+          cd apps/mobile/native/ios
+          bundle install
+          RCT_NEW_ARCH_ENABLED=0 bundle exec pod install
+
+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit

      - name: CCache Stats Before Build
        run: ccache -sv
--- a/.github/workflows/monograph.publish.yml
+++ b/.github/workflows/monograph.publish.yml
@@ -0,0 +1,89 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+
+name: Publish @notesnook/monograph
+
+on: workflow_dispatch
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-22.04
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=monograph
+
+      - name: Collect package metadata
+        id: package_metadata
+        working-directory: ./apps/monograph
+        run: |
+          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
+
+      - name: Generate build
+        run: npm run tx @notesnook/monograph:build
+
+      # Setup Buildx
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          ecr: auto
+          logout: true
+
+      # Pull previous image from docker hub to use it as cache to improve the image build time.
+      - name: docker pull cache image
+        continue-on-error: true
+        run: docker pull streetwriters/monograph:latest
+
+      # Setup QEMU
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v2
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: streetwriters/monograph
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: apps/monograph
+          file: apps/monograph/Dockerfile
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: streetwriters/monograph:${{ steps.package_metadata.outputs.app_version }},streetwriters/monograph:latest
+          cache-from: streetwriters/monograph:latest
+
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: index.docker.io/streetwriters/monograph
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
--- a/.github/workflows/theme-builder.publish.yml
+++ b/.github/workflows/theme-builder.publish.yml
@@ -5,10 +5,10 @@ on: workflow_dispatch
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -20,7 +20,6 @@ jobs:

      - name: Setup environment
        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV

--- a/.github/workflows/vericrypt.publish.yml
+++ b/.github/workflows/vericrypt.publish.yml
@@ -5,10 +5,10 @@ on: workflow_dispatch
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -20,7 +20,6 @@ jobs:

      - name: Setup environment
        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV

--- a/.github/workflows/web.benchmarks.yml
+++ b/.github/workflows/web.benchmarks.yml
@@ -0,0 +1,40 @@
+name: Benchmark @notesnook/web
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "apps/web/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/web.benchmarks.yml"
+  pull_request:
+
+jobs:
+  bench:
+    name: Bench
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Install packages
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=web
+
+      - name: Build
+        run: npm run build:web
+
+      - name: Install Playwright Browsers
+        run: npx playwright install chromium --with-deps
+        working-directory: apps/web
+
+      - name: Run benchmarks
+        id: benchmark
+        run: node __bench__/app.bench.mjs
+        working-directory: apps/web
--- a/.github/workflows/web.publish.yml
+++ b/.github/workflows/web.publish.yml
@@ -1,14 +1,24 @@
 name: Publish @notesnook/web

-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      release-track:
+        type: choice
+        required: true
+        default: stable
+        description: "Select the release track"
+        options:
+          - stable
+          - beta

 jobs:
  build:
    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -20,12 +30,23 @@ jobs:

      - name: Setup environment
        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_ACCOUNT_ID=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}" >> $GITHUB_ENV
          echo "CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }}" >> $GITHUB_ENV

-      - name: Generate build
+      - name: Generate build (stable)
+        if: ${{ inputs.release-track == 'stable' }}
        run: npm run build:web

-      - name: Publish to Cloudflare Pages
-        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./apps/web/build/
+      - name: Publish to Cloudflare Pages (stable)
+        if: ${{ inputs.release-track == 'stable' }}
+        working-directory: ./apps/web
+        run: npx --yes wrangler pages deploy --project-name=notesnook-app ./build/
+
+      - name: Generate build (beta)
+        if: ${{ inputs.release-track == 'beta' }}
+        run: npm run build:beta:web
+
+      - name: Publish to Cloudflare Pages (beta)
+        if: ${{ inputs.release-track == 'beta' }}
+        working-directory: ./apps/web
+        run: npx --yes wrangler pages deploy --branch=beta --project-name=notesnook-app-beta ./build/
--- a/.github/workflows/web.tests.yml
+++ b/.github/workflows/web.tests.yml
@@ -9,7 +9,13 @@ on:
      - "apps/web/**"
      # re-run workflow if workflow file changes
      - ".github/workflows/web.tests.yml"
-  pull_request:
+  pull_request_target:
+    branches:
+      - "master"
+    paths:
+      - "apps/web/**"
+      # re-run workflow if workflow file changes
+      - ".github/workflows/web.tests.yml"
    types:
      - "ready_for_review"
      - "opened"
@@ -17,12 +23,23 @@ on:
      - "reopened"

 jobs:
-  build:
-    name: Build
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' &&
+      github.event.pull_request.head.repo.full_name != github.repository &&
+      'external' || 'internal' }}
    runs-on: ubuntu-latest
+    steps:
+      - run: echo true
+
+  build:
+    needs: authorize
+    name: Build
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}

      - name: Setup Node
        uses: ./.github/actions/setup-node-with-cache
@@ -32,10 +49,6 @@ jobs:
          npm ci --ignore-scripts --prefer-offline --no-audit
          npm run bootstrap -- --scope=web

-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
      - name: Generate test build
        run: npm run build:test:web

@@ -49,11 +62,13 @@ jobs:
    name: 🧪 Test (${{ matrix.shard }}/${{ strategy.job-total }})
    strategy:
      matrix:
-        shard: [1, 2, 3, 4]
+        shard: [1, 2, 3, 4, 5]
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}

      - name: Download build
        uses: actions/download-artifact@v4
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ nx-cloud.env
 site
 node_modules.backup
 .nx
+/*.patch
+.taskcache
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ Notesnook is built using the following technologies:
 3. React Native — For mobile apps we are using React Native
 4. Electron — For desktop app
 5. NPM — listed here because we **don't** use Yarn or PNPM or XYZ across any of our projects.
-6. Nx — maintaining monorepos is hard but Nx makes it easier.

 > **Note: Each project in the monorepo contains its own architecture details which you can refer to.**

@@ -66,7 +65,7 @@ We take all queries, issues and bug reports that you might have. Feel free to as

 ## Additional Resources

- [Migrating & Importing your data from other apps — Importer](https://importer.notesnook.com/)
+- [Migrating & Importing your data from other apps — Importer](https://help.notesnook.com/importing-notes)
 - [Privacy policy](https://notesnook.com/privacy) & [Terms of service](https://notesnook.com/terms)
 - [Verify Notesnook encryption claims yourself — Vericrypt](https://vericrypt.notesnook.com/)
 - [Why Notesnook requires an email address?](https://blog.notesnook.com/why-notesnook-requires-an-email-address/)
--- a/apps/desktop/.gitignore
+++ b/apps/desktop/.gitignore
@@ -2,4 +2,6 @@ node_modules
 build
 output
 dist
-_catalog
+_catalog
+test-results
+test-artifacts
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -24,7 +24,7 @@ Requirements:

 Before you can do anything, you'll need to [install Node.js](https://nodejs.org/en/download/) v16 or later on your system.

-Once you have completed the setup, the first step is to `clone` the monorepo:
+1. `clone` the monorepo:

 ```bash
 git clone https://github.com/streetwriters/notesnook.git
@@ -33,19 +33,28 @@ git clone https://github.com/streetwriters/notesnook.git
 cd notesnook
 ```

-Once you are inside the `./notesnook` directory, run the preparation step:
+2. Install dependencies:

 ```bash
 # this might take a while to complete
 npm install
 ```

-Now you can finally start the desktop app for development:
+3. Run the webapp for desktop environment:
+
+```bash
+cd apps/web
+npm run start:desktop
+```
+
+4. In a separate terminal session, run the desktop app from the root of the project:

 ```bash
 npm run start:desktop
 ```

+### Release mode
+
 To run the app in release mode:

 ```bash
@@ -58,13 +67,13 @@ This will compile and run the app in production mode but it won't generate any p
 npm run release -- --rebuild

 # For macOS
-npx electron-builder --mac dmg --arm64 --x64 -publish never
+npx electron-builder --config=electron-builder.config.js --mac dmg --arm64 --x64 --publish never

 # For Linux (AppImage)
-npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never
+npx electron-builder --config=electron-builder.config.js --linux AppImage:x64 AppImage:arm64 --publish never

 # For Windows
-npx electron-builder --win --publish never
+npx electron-builder --config=electron-builder.config.js --win --publish never
 ```

 Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.
--- a/apps/desktop/tests/auto-updates.test.ts
+++ b/apps/desktop/tests/auto-updates.test.ts
@@ -0,0 +1,242 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { testCleanup, test } from "./test-override.js";
+import { writeFile } from "fs/promises";
+import { Page } from "playwright";
+import { gt, lt } from "semver";
+import { describe } from "vitest";
+
+test("update starts downloading if version is outdated", async ({
+  ctx: { page },
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
+
+  await page.waitForSelector("#authForm");
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
+
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
+
+  await skipDialog(page);
+
+  await page.waitForSelector(".ProseMirror");
+
+  await page
+    .locator(".theme-scope-statusBar")
+    .getByRole("button", { name: /updating/i })
+    .waitFor({ state: "attached" });
+});
+
+test("update is only shown if version is outdated and auto updates are disabled", async ({
+  ctx,
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
+
+  await ctx.app.close();
+  await writeFile(
+    ctx.configPath,
+    JSON.stringify({
+      automaticUpdates: false
+    })
+  );
+
+  await ctx.relaunch();
+
+  const { page } = ctx;
+
+  await page.waitForSelector("#authForm");
+
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
+
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
+
+  await skipDialog(page);
+
+  await page.waitForSelector(".ProseMirror");
+
+  await page
+    .locator(".theme-scope-statusBar")
+    .getByRole("button", { name: /available/i })
+    .waitFor({ state: "attached" });
+});
+
+describe("update to stable if it is newer", () => {
+  test.scoped({ options: { version: "3.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
+
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "beta"
+      })
+    );
+
+    await ctx.relaunch();
+
+    const { page } = ctx;
+
+    await page.waitForSelector("#authForm");
+
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
+
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
+
+    await skipDialog(page);
+
+    await page.waitForSelector(".ProseMirror");
+
+    const updateButton = page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /available/i });
+    await updateButton.waitFor({ state: "visible" });
+    const content = await updateButton.textContent();
+    const version = content?.split(" ")?.[0] || "";
+    expect(gt(version, "3.0.0-beta.0")).toBe(true);
+  });
+});
+
+describe("update is not available if it latest stable version is older", () => {
+  test.scoped({ options: { version: "99.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
+
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "beta"
+      })
+    );
+
+    await ctx.relaunch();
+
+    const { page } = ctx;
+
+    await page.waitForSelector("#authForm");
+
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
+
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
+
+    await skipDialog(page);
+
+    await page.waitForSelector(".ProseMirror");
+
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /checking for updates/i })
+      .waitFor({ state: "hidden" });
+
+    expect(
+      await page
+        .locator(".theme-scope-statusBar")
+        .getByRole("button", { name: /available/i })
+        .isHidden()
+    ).toBe(true);
+  });
+});
+
+describe("downgrade to stable on switching to stable release track", () => {
+  test.scoped({ options: { version: "99.0.0-beta.0" } });
+  test("test", async ({ ctx, expect, onTestFinished }) => {
+    onTestFinished(testCleanup);
+
+    await ctx.app.close();
+    await writeFile(
+      ctx.configPath,
+      JSON.stringify({
+        automaticUpdates: false,
+        releaseTrack: "stable"
+      })
+    );
+
+    await ctx.relaunch();
+
+    const { page } = ctx;
+
+    await page.waitForSelector("#authForm");
+
+    expect(
+      await page.getByRole("button", { name: "Create account" }).isVisible()
+    ).toBe(true);
+
+    await page
+      .getByRole("button", { name: "Skip & go directly to the app" })
+      .click();
+
+    await skipDialog(page);
+
+    await page.waitForSelector(".ProseMirror");
+
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /checking for updates/i })
+      .waitFor({ state: "hidden" });
+
+    const updateButton = page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /available/i });
+    await updateButton.waitFor({ state: "visible" });
+    const content = await updateButton.textContent();
+    const version = content?.split(" ")?.[0] || "";
+    expect(lt(version, "99.0.0-beta.0")).toBe(true);
+  });
+});
+
+async function skipDialog(page: Page) {
+  try {
+    const dialog = page.locator(".ReactModal__Content");
+    const positiveButton = dialog.locator(
+      "button[data-role='positive-button']"
+    );
+    const negativeButton = dialog.locator(
+      "button[data-role='negative-button']"
+    );
+    if (await positiveButton.isVisible())
+      await positiveButton.click({ timeout: 1000 });
+    else if (await negativeButton.isVisible())
+      await negativeButton.click({ timeout: 1000 });
+  } catch (e) {
+    // ignore error
+  }
+}
--- a/apps/desktop/tests/global-setup.ts
+++ b/apps/desktop/tests/global-setup.ts
@@ -17,13 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-function isMobile(): boolean {
-  return window.matchMedia("(max-width: 480px)").matches;
-}
+import { buildApp } from "./utils";

-function isTablet(): boolean {
-  return window.matchMedia("(min-width: 480px) and (max-width: 1000px)")
-    .matches;
+export default async function setup() {
+  await buildApp();
 }
-
-export { isMobile, isTablet };
--- a/apps/desktop/tests/launch.test.ts
+++ b/apps/desktop/tests/launch.test.ts
@@ -0,0 +1,40 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { testCleanup, test } from "./test-override.js";
+
+test("make sure app loads", async ({
+  ctx: { page },
+  expect,
+  onTestFinished
+}) => {
+  onTestFinished(testCleanup);
+
+  await page.waitForSelector("#authForm");
+
+  expect(
+    await page.getByRole("button", { name: "Create account" }).isVisible()
+  ).toBe(true);
+
+  await page
+    .getByRole("button", { name: "Skip & go directly to the app" })
+    .click();
+
+  await page.waitForSelector(".ProseMirror");
+});
--- a/apps/desktop/tests/test-override.ts
+++ b/apps/desktop/tests/test-override.ts
@@ -0,0 +1,64 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { test as vitestTest, TestContext } from "vitest";
+import { buildAndLaunchApp, Fixtures, TestOptions } from "./utils";
+import { mkdir, rm } from "fs/promises";
+import path from "path";
+import slugify from "slugify";
+
+export const test = vitestTest.extend<Fixtures>({
+  options: { version: "3.0.0" } as TestOptions,
+  ctx: async ({ options }, use) => {
+    const ctx = await buildAndLaunchApp(options);
+    await use(ctx);
+  }
+});
+
+export async function testCleanup(context: TestContext) {
+  const ctx = (context.task.context as unknown as Fixtures).ctx;
+  if (context.task.result?.state === "fail") {
+    await mkdir("test-results", { recursive: true });
+    await ctx.page.screenshot({
+      path: path.join(
+        "test-results",
+        `${slugify(context.task.name)}-${process.platform}-${
+          process.arch
+        }-error.png`
+      )
+    });
+  }
+  await ctx.app.close();
+  await rm(ctx.userDataDir, {
+    force: true,
+    recursive: true,
+    maxRetries: 3,
+    retryDelay: 5000
+  }).catch(() => {
+    /*ignore */
+  });
+  await rm(ctx.outputDir, {
+    force: true,
+    recursive: true,
+    maxRetries: 3,
+    retryDelay: 5000
+  }).catch(() => {
+    /*ignore */
+  });
+}
--- a/apps/desktop/tests/utils.ts
+++ b/apps/desktop/tests/utils.ts
@@ -0,0 +1,226 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { execSync } from "child_process";
+import { cp } from "fs/promises";
+import { fileURLToPath } from "node:url";
+import path, { join, resolve } from "path";
+import { _electron as electron } from "playwright";
+import { existsSync } from "fs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const IS_DEBUG = process.env.NN_DEBUG === "true" || process.env.CI === "true";
+const productName = `NotesnookTestHarness`;
+const SOURCE_DIR = resolve("output", productName);
+
+export interface AppContext {
+  app: import("playwright").ElectronApplication;
+  page: import("playwright").Page;
+  configPath: string;
+  userDataDir: string;
+  outputDir: string;
+  relaunch: () => Promise<void>;
+}
+
+export interface TestOptions {
+  version: string;
+}
+
+export interface Fixtures {
+  options: TestOptions;
+  ctx: AppContext;
+}
+
+export async function buildAndLaunchApp(
+  options?: TestOptions
+): Promise<AppContext> {
+  const productName = `notesnooktest${makeid(10)}`;
+  const outputDir = path.join("test-artifacts", `${productName}-output`);
+  const executablePath = await copyBuild({
+    ...options,
+    outputDir
+  });
+  const { app, page, configPath, userDataDir } = await launchApp(
+    executablePath,
+    productName,
+    options?.version
+  );
+  const ctx: AppContext = {
+    app,
+    page,
+    configPath,
+    userDataDir,
+    outputDir,
+    relaunch: async () => {
+      const { app, page, configPath, userDataDir } = await launchApp(
+        executablePath,
+        productName,
+        options?.version
+      );
+      ctx.app = app;
+      ctx.page = page;
+      ctx.userDataDir = userDataDir;
+      ctx.configPath = configPath;
+    }
+  };
+  return ctx;
+}
+
+async function launchApp(
+  executablePath: string,
+  packageName: string,
+  version?: string
+) {
+  const userDataDir = resolve(
+    __dirname,
+    "..",
+    "test-artifacts",
+    "user_data_dirs",
+    packageName
+  );
+  const app = await electron.launch({
+    executablePath,
+    args: IS_DEBUG ? [] : ["--hidden"],
+    env: {
+      ...(process.platform === "linux"
+        ? {
+            ...(process.env as Record<string, string>),
+            APPIMAGE: "true"
+          }
+        : (process.env as Record<string, string>)),
+      CUSTOM_USER_DATA_DIR: userDataDir,
+      ...(version
+        ? {
+            CUSTOM_APP_VERSION: version
+          }
+        : {})
+    }
+  });
+
+  const page = await app.firstWindow();
+
+  const configPath = path.join(userDataDir, "UserData", "config.json");
+  return {
+    app,
+    page,
+    configPath,
+    userDataDir
+  };
+}
+
+let MAX_RETRIES = 3;
+export async function buildApp(version?: string) {
+  if (!existsSync(SOURCE_DIR)) {
+    const args = [
+      "electron-builder",
+      "--dir",
+      `--${process.arch}`,
+      `--config electron-builder.config.js`,
+      `--c.extraMetadata.productName=${productName}`,
+      `--c.compression=store`,
+      "--publish=never"
+    ];
+    if (version) args.push(`--c.extraMetadata.version=${version}`);
+    try {
+      execSync(`npx ${args.join(" ")}`, {
+        stdio: IS_DEBUG ? "inherit" : "ignore",
+        env: {
+          ...process.env,
+          NOTESNOOK_STAGING: "true",
+          NN_PRODUCT_NAME: productName,
+          NN_APP_ID: `com.notesnook.test.${productName}`,
+          NN_OUTPUT_DIR: SOURCE_DIR
+        }
+      });
+    } catch (e) {
+      if (--MAX_RETRIES) {
+        console.log("retrying...");
+        return await buildApp(version);
+      } else throw e;
+    }
+  }
+}
+
+async function copyBuild({ outputDir }: { outputDir: string }) {
+  return process.platform === "win32"
+    ? await makeBuildCopyWindows(outputDir, productName)
+    : process.platform === "darwin"
+    ? await makeBuildCopyMacOS(outputDir, productName)
+    : await makeBuildCopyLinux(outputDir, productName);
+}
+
+async function makeBuildCopyLinux(outputDir: string, productName: string) {
+  const platformDir =
+    process.arch === "arm64" ? "linux-arm64-unpacked" : "linux-unpacked";
+  const appDir = await makeBuildCopy(outputDir, platformDir);
+  return resolve(
+    __dirname,
+    "..",
+    appDir,
+    productName.toLowerCase().replace(/\s+/g, "-")
+  );
+}
+
+async function makeBuildCopyWindows(outputDir: string, productName: string) {
+  const platformDir =
+    process.arch === "arm64" ? "win-arm64-unpacked" : "win-unpacked";
+  const appDir = await makeBuildCopy(outputDir, platformDir);
+  return resolve(__dirname, "..", appDir, `${productName}.exe`);
+}
+
+async function makeBuildCopyMacOS(outputDir: string, productName: string) {
+  const platformDir = process.arch === "arm64" ? "mac-arm64" : "mac";
+  const appDir = await makeBuildCopy(outputDir, platformDir);
+  return resolve(
+    __dirname,
+    "..",
+    appDir,
+    `${productName}.app`,
+    "Contents",
+    "MacOS",
+    productName
+  );
+}
+
+async function makeBuildCopy(outputDir: string, platformDir: string) {
+  const appDir = outputDir;
+  await cp(join(SOURCE_DIR, platformDir), outputDir, {
+    recursive: true,
+    preserveTimestamps: true,
+    verbatimSymlinks: true,
+    dereference: false,
+    force: true
+  });
+
+  return appDir;
+}
+
+function makeid(length: number) {
+  let result = "";
+  const characters =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  const charactersLength = characters.length;
+  let counter = 0;
+  while (counter < length) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    counter += 1;
+  }
+  return result.toLowerCase();
+}
--- a/apps/desktop/assets/icons/app.icns
+++ b/apps/desktop/assets/icons/app.icns
--- a/apps/desktop/electron-builder.config.js
+++ b/apps/desktop/electron-builder.config.js
@@ -0,0 +1,223 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+const path = require("path");
+const pkg = require("./package.json");
+
+const buildRoot = process.env.NN_BUILD_ROOT || ".";
+const buildFiles = [
+  `${buildRoot}/build/`,
+  `!${buildRoot}/build/screenshots\${/*}`,
+  `!${buildRoot}/build/banner.jpg`,
+  `!${buildRoot}/build/*.ico`,
+  `!${buildRoot}/build/*.png`
+];
+
+const productName = process.env.NN_PRODUCT_NAME || "Notesnook";
+const appId = process.env.NN_APP_ID || "org.streetwriters.notesnook";
+const outputDir = process.env.NN_OUTPUT_DIR || "output";
+const linuxExecutableName = process.env.NN_PRODUCT_NAME
+  ? process.env.NN_PRODUCT_NAME.toLowerCase().replace(/\s+/g, "-")
+  : "notesnook";
+const year = new Date().getFullYear();
+const isBeta = pkg.version.includes("-beta");
+
+/**
+ * @type {import("app-builder-lib").Configuration}
+ */
+module.exports = {
+  appId: appId,
+  productName: productName,
+  copyright: `Copyright © ${year} Streetwriters (Private) Limited`,
+  artifactName: "notesnook_${os}_${arch}.${ext}",
+  generateUpdatesFilesForAllChannels: true,
+  asar: true,
+  asarUnpack: [
+    "node_modules/sqlite-better-trigram-@(linux|darwin|windows)-${arch}/**/*",
+    "node_modules/sqlite3-fts5-html-@(linux|darwin|windows)-${arch}/**/*"
+  ],
+  files: [
+    "!*.chunk.js.map",
+    "!*.chunk.js.LICENSE.txt",
+    ...buildFiles,
+    "!node_modules${/*}",
+    "node_modules/better-sqlite3-multiple-ciphers/build/Release/better_sqlite3.node",
+    "node_modules/better-sqlite3-multiple-ciphers/lib",
+    "node_modules/better-sqlite3-multiple-ciphers/package.json",
+    "node_modules/file-uri-to-path",
+    "node_modules/bindings",
+    "node_modules/node-gyp-build",
+    "node_modules/sqlite-better-trigram",
+    "node_modules/sqlite3-fts5-html",
+    "node_modules/sodium-native/prebuilds/${platform}-${arch}",
+    {
+      from: "node_modules/sqlite-better-trigram-linux-${arch}",
+      to: "node_modules/sqlite-better-trigram-linux-${arch}"
+    },
+    {
+      from: "node_modules/sqlite-better-trigram-darwin-${arch}",
+      to: "node_modules/sqlite-better-trigram-darwin-${arch}"
+    },
+    {
+      from: "node_modules/sqlite-better-trigram-windows-${arch}",
+      to: "node_modules/sqlite-better-trigram-windows-${arch}"
+    },
+
+    {
+      from: "node_modules/sqlite3-fts5-html-linux-${arch}",
+      to: "node_modules/sqlite3-fts5-html-linux-${arch}"
+    },
+    {
+      from: "node_modules/sqlite3-fts5-html-darwin-${arch}",
+      to: "node_modules/sqlite3-fts5-html-darwin-${arch}"
+    },
+    {
+      from: "node_modules/sqlite3-fts5-html-windows-${arch}",
+      to: "node_modules/sqlite3-fts5-html-windows-${arch}"
+    },
+
+    "node_modules/sodium-native/index.js",
+    "node_modules/sodium-native/package.json"
+  ],
+  afterPack: "./scripts/removeLocales.js",
+  mac: {
+    bundleVersion: "240",
+    minimumSystemVersion: "10.12.0",
+    target: [
+      {
+        target: "dmg",
+        arch: ["arm64", "x64"]
+      },
+      {
+        target: "zip",
+        arch: ["arm64", "x64"]
+      }
+    ],
+    category: "public.app-category.productivity",
+    darkModeSupport: true,
+    type: "distribution",
+    hardenedRuntime: true,
+    entitlements: "assets/entitlements.mac.plist",
+    entitlementsInherit: "assets/entitlements.mac.plist",
+    gatekeeperAssess: false,
+    icon: "assets/icons/app.icns",
+    notarize: true
+  },
+  dmg: {
+    contents: [
+      {
+        x: 130,
+        y: 220
+      },
+      {
+        x: 410,
+        y: 220,
+        type: "link",
+        path: "/Applications"
+      }
+    ],
+    icon: "assets/icons/app.icns",
+    title: "Install Notesnook"
+  },
+  mas: {
+    entitlements: "assets/entitlements.mas.plist",
+    entitlementsInherit: "assets/entitlements.mas.inherit.plist",
+    entitlementsLoginHelper: "assets/entitlements.mas.loginhelper.plist",
+    hardenedRuntime: true
+  },
+  win: {
+    target: [
+      {
+        target: "nsis",
+        arch: ["x64", "arm64"]
+      },
+      {
+        target: "portable",
+        arch: ["x64", "arm64"]
+      }
+    ],
+    signtoolOptions: {
+      signingHashAlgorithms: ["sha256"],
+      sign: "./scripts/sign.js"
+    },
+    icon: "assets/icons/app.ico"
+  },
+  portable: {
+    artifactName: "notesnook_${os}_${arch}_portable.${ext}"
+  },
+  nsis: {
+    oneClick: true,
+    createDesktopShortcut: "always",
+    deleteAppDataOnUninstall: true
+  },
+  linux: {
+    target: [
+      {
+        target: "AppImage",
+        arch: ["x64", "arm64"]
+      },
+      {
+        target: "snap",
+        arch: ["x64", "arm64"]
+      }
+    ],
+    category: "Office",
+    icon: "assets/icons/app.icns",
+    description: "Your private note taking space",
+    executableName: linuxExecutableName,
+    desktop: {
+      desktopActions: {
+        "new-note": {
+          Name: "New note",
+          Exec: `${linuxExecutableName} new note`
+        },
+        "new-notebook": {
+          Name: "New notebook",
+          Exec: `${linuxExecutableName} new notebook`
+        },
+        "new-reminder": {
+          Name: "New reminder",
+          Exec: `${linuxExecutableName} new reminder`
+        }
+      }
+    }
+  },
+  snap: {
+    autoStart: false,
+    confinement: "strict",
+    allowNativeWayland: true,
+    base: "core22"
+  },
+  extraResources: ["app-update.yml", "./assets/**"],
+  extraMetadata: {
+    main: path.join(buildRoot, "build", "electron.js")
+  },
+  directories: {
+    buildResources: "assets",
+    output: outputDir
+  },
+  publish: [
+    {
+      provider: "github",
+      repo: "notesnook",
+      owner: "streetwriters",
+      channel: isBeta ? "beta" : "latest"
+    }
+  ]
+};
--- a/apps/desktop/package-lock.json
+++ b/apps/desktop/package-lock.json
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -2,226 +2,82 @@
  "name": "@notesnook/desktop",
  "productName": "Notesnook",
  "description": "Your private note taking space",
-  "version": "3.0.17",
+  "version": "3.3.6-beta.0",
  "appAppleId": "1544027013",
  "private": true,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "sideEffects": [
+    "src/overrides.ts"
+  ],
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/types/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      },
+      "import": {
+        "types": "./dist/types/index.d.ts",
+        "default": "./dist/esm/index.js"
+      }
+    }
+  },
  "homepage": "https://notesnook.com/",
  "repository": "https://github.com/streetwriters/notesnook",
  "license": "GPL-3.0-or-later",
  "dependencies": {
-    "@trpc/client": "10.38.3",
-    "@trpc/server": "10.38.3",
-    "better-sqlite3-multiple-ciphers": "^9.5.0",
-    "electron-trpc": "0.5.2",
-    "electron-updater": "^6.2.1",
-    "icojs": "^0.17.1",
+    "@lingui/core": "5.1.2",
+    "@notesnook/intl": "file:../../packages/intl",
+    "@notesnook/ui": "file:../../packages/ui",
+    "@trpc/client": "10.45.2",
+    "@trpc/server": "10.45.2",
+    "better-sqlite3-multiple-ciphers": "^12.4.1",
+    "electron-trpc": "0.7.1",
+    "electron-updater": "^6.6.2",
+    "icojs": "^0.19.5",
+    "sqlite-better-trigram": "0.0.3",
+    "sqlite3-fts5-html": "^0.0.4",
    "typed-emitter": "^2.1.0",
-    "yargs": "^17.6.2",
-    "zod": "^3.21.4"
+    "yargs": "^17.7.2",
+    "zod": "3.24.3"
  },
  "devDependencies": {
-    "@types/node": "18.16.1",
-    "@types/yargs": "^17.0.24",
-    "chokidar": "^3.5.3",
-    "electron": "^29.3.1",
-    "electron-builder": "^24.13.3",
-    "esbuild": "^0.23.0",
-    "kysely": "^0.27.3",
-    "node-gyp-build": "^4.8.0",
+    "@streetwriters/kysely": "^0.27.4",
+    "@types/node": "22.15.3",
+    "@types/yargs": "^17.0.33",
+    "chokidar": "^4.0.3",
+    "electron": "^37.0.0",
+    "electron-builder": "^26.0.12",
+    "esbuild": "0.21.5",
+    "node-abi": "^4.5.0",
+    "node-gyp-build": "^4.8.4",
+    "playwright": "1.48.2",
    "prebuildify": "^6.0.1",
+    "slugify": "1.6.6",
    "tree-kill": "^1.2.2",
-    "undici": "^6.14.1"
+    "undici": "^7.8.0",
+    "vitest": "^3.2.4"
  },
  "optionalDependencies": {
    "dmg-license": "^1.0.11"
  },
+  "overrides": {
+    "@electron/node-gyp": "^10.2.0-electron.2"
+  },
  "scripts": {
    "start": "node scripts/dev.mjs",
    "staging": "node scripts/build.mjs --run",
    "release": "node scripts/build.mjs",
-    "build": "tsc",
-    "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
+    "build": "node ../../scripts/build.mjs",
+    "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
    "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "postinstall": "patch-package"
+    "postinstall": "patch-package",
+    "test": "vitest run"
  },
  "author": {
    "name": "Streetwriters (Private) Limited",
    "email": "support@streetwriters.co",
    "url": "https://streetwriters.co"
-  },
-  "build": {
-    "appId": "org.streetwriters.notesnook",
-    "productName": "Notesnook",
-    "copyright": "Copyright © 2023 Streetwriters (Private) Limited",
-    "artifactName": "notesnook_${os}_${arch}.${ext}",
-    "generateUpdatesFilesForAllChannels": true,
-    "asar": false,
-    "files": [
-      "!*.chunk.js.map",
-      "!*.chunk.js.LICENSE.txt",
-      "build/",
-      "!build/screenshots${/*}",
-      "!build/banner.jpg",
-      "!build/*.ico",
-      "!build/*.png",
-      "!node_modules${/*}",
-      "node_modules/better-sqlite3-multiple-ciphers/build/Release/better_sqlite3.node",
-      "node_modules/better-sqlite3-multiple-ciphers/lib",
-      "node_modules/better-sqlite3-multiple-ciphers/package.json",
-      "node_modules/file-uri-to-path",
-      "node_modules/bindings",
-      "node_modules/node-gyp-build",
-      "node_modules/sodium-native/prebuilds/${platform}-${arch}",
-      "node_modules/sodium-native/index.js",
-      "node_modules/sodium-native/package.json"
-    ],
-    "afterPack": "./scripts/removeLocales.js",
-    "mac": {
-      "bundleVersion": "240",
-      "minimumSystemVersion": "10.12.0",
-      "target": [
-        {
-          "target": "dmg",
-          "arch": [
-            "arm64",
-            "x64"
-          ]
-        },
-        {
-          "target": "zip",
-          "arch": [
-            "arm64",
-            "x64"
-          ]
-        }
-      ],
-      "category": "public.app-category.productivity",
-      "darkModeSupport": true,
-      "type": "distribution",
-      "hardenedRuntime": true,
-      "entitlements": "assets/entitlements.mac.plist",
-      "entitlementsInherit": "assets/entitlements.mac.plist",
-      "gatekeeperAssess": false,
-      "icon": "assets/icons/app.icns",
-      "notarize": true
-    },
-    "dmg": {
-      "contents": [
-        {
-          "x": 130,
-          "y": 220
-        },
-        {
-          "x": 410,
-          "y": 220,
-          "type": "link",
-          "path": "/Applications"
-        }
-      ],
-      "icon": "assets/icons/app.icns",
-      "title": "Install Notesnook"
-    },
-    "mas": {
-      "entitlements": "assets/entitlements.mas.plist",
-      "entitlementsInherit": "assets/entitlements.mas.inherit.plist",
-      "entitlementsLoginHelper": "assets/entitlements.mas.loginhelper.plist",
-      "hardenedRuntime": true
-    },
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        },
-        {
-          "target": "portable",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        }
-      ],
-      "signingHashAlgorithms": [
-        "sha256"
-      ],
-      "sign": "./scripts/sign.js",
-      "icon": "assets/icons/app.ico"
-    },
-    "portable": {
-      "artifactName": "notesnook_${os}_${arch}_portable.${ext}"
-    },
-    "nsis": {
-      "oneClick": true,
-      "createDesktopShortcut": "always"
-    },
-    "linux": {
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        },
-        {
-          "target": "snap",
-          "arch": [
-            "x64",
-            "arm64"
-          ]
-        }
-      ],
-      "category": "Office",
-      "icon": "assets/icons/app.icns",
-      "description": "Your private note taking space",
-      "executableName": "notesnook",
-      "desktop": {
-        "actions": [
-          {
-            "id": "new-note",
-            "name": "New note",
-            "args": "new note"
-          },
-          {
-            "id": "new-notebook",
-            "name": "New notebook",
-            "args": "new notebook"
-          },
-          {
-            "id": "new-reminder",
-            "name": "New reminder",
-            "args": "new reminder"
-          }
-        ]
-      }
-    },
-    "snap": {
-      "autoStart": false,
-      "confinement": "strict",
-      "allowNativeWayland": true
-    },
-    "extraResources": [
-      "app-update.yml",
-      "./assets/**"
-    ],
-    "extraMetadata": {
-      "main": "./build/electron.js"
-    },
-    "directories": {
-      "buildResources": "assets",
-      "output": "./output/"
-    },
-    "publish": [
-      {
-        "provider": "github",
-        "repo": "notesnook",
-        "owner": "streetwriters"
-      }
-    ]
  }
 }
--- a/apps/desktop/patches/app-builder-lib+24.6.4.patch
+++ b/apps/desktop/patches/app-builder-lib+24.6.4.patch
@@ -1,36 +0,0 @@
-diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index fcb7f54..cb1c7f7 100644
--- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-+++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-@@ -116,6 +116,7 @@ class LinuxTargetHelper {
-             StartupWMClass: appInfo.productName,
-             ...extra,
-             ...targetSpecificOptions.desktop,
-+            actions: undefined
-         };
-         const description = this.getDescription(targetSpecificOptions);
-         if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
-@@ -159,6 +160,23 @@ class LinuxTargetHelper {
-             data += `\n${name}=${desktopMeta[name]}`;
-         }
-         data += "\n";
-+               
-+        if (targetSpecificOptions.desktop.actions) {
-+            let actionsData = "";
-+            const validActions = [];
-+            for (const action of targetSpecificOptions.desktop.actions) {
-+                if (!action.id || !action.name || !action.args) continue;
-+                actionsData += "\n";
-+                actionsData += `[Desktop Action ${action.id}]
-+Name=${action.name}
-+Exec=${desktopMeta.Exec} ${action.args}`;
-+                actionsData += "\n";
-+
-+                validActions.push(action.id);
-+            }
-+
-+            data += `Actions=${validActions.join(";")};\n${actionsData}`
-+        }
-         return Promise.resolve(data);
-     }
- }
--- a/apps/desktop/patches/app-builder-lib+26.0.12.patch
+++ b/apps/desktop/patches/app-builder-lib+26.0.12.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/app-builder-lib/out/targets/snap.js b/node_modules/app-builder-lib/out/targets/snap.js
+index 0b5405e..753f6c6 100644
+--- a/node_modules/app-builder-lib/out/targets/snap.js
+++ b/node_modules/app-builder-lib/out/targets/snap.js
+@@ -115,7 +115,7 @@ class SnapTarget extends core_1.Target {
+         else {
+             const archTriplet = archNameToTriplet(arch);
+             appDescriptor.environment = {
+-                DISABLE_WAYLAND: options.allowNativeWayland ? "" : "1",
+                DISABLE_WAYLAND: options.allowNativeWayland ? "0" : "1",
+                 PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH",
+                 SNAP_DESKTOP_RUNTIME: "$SNAP/gnome-platform",
+                 LD_LIBRARY_PATH: [
--- a/apps/desktop/patches/better-sqlite3-multiple-ciphers+11.10.0.patch
+++ b/apps/desktop/patches/better-sqlite3-multiple-ciphers+11.10.0.patch
@@ -0,0 +1,11 @@
+diff --git a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
+index 1a14ecd..ff938f1 100644
+--- a/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
+++ b/node_modules/better-sqlite3-multiple-ciphers/deps/defines.gypi
+@@ -38,5 +38,6 @@
+     'SQLITE_TRACE_SIZE_LIMIT=32',
+     'SQLITE_USER_AUTHENTICATION=0',
+     'SQLITE_USE_URI=0',
+    'SQLITE_ENABLE_REGEXP',
+   ],
+ }
--- a/apps/desktop/patches/electron-trpc+0.5.2.patch
+++ b/apps/desktop/patches/electron-trpc+0.5.2.patch
@@ -1,23 +0,0 @@
-diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
-index 379cf3b..2644e5d 100644
--- a/node_modules/electron-trpc/dist/main.mjs
-+++ b/node_modules/electron-trpc/dist/main.mjs
-@@ -221,9 +221,16 @@ class G {
-     i(this, c).includes(r) || (i(this, c).push(r), I(this, T, W).call(this, r));
-   }
-   detachWindow(r) {
-+    
-     y(this, c, i(this, c).filter((n) => n !== r));
-    for (const [n, t] of i(this, u).entries())
-      n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
-+    for (const [n, t] of i(this, u).entries()) {
-+      try {
-+        n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
-+      } catch(e) {
-+        console.error(e);
-+        // ignore
-+      }
-+    }
-   }
- }
- c = new WeakMap(), u = new WeakMap(), T = new WeakSet(), W = function(r) {
--- a/apps/desktop/patches/node-gyp-build+4.8.0.patch
+++ b/apps/desktop/patches/node-gyp-build+4.8.0.patch
@@ -1,46 +0,0 @@
-diff --git a/node_modules/node-gyp-build/bin.js b/node_modules/node-gyp-build/bin.js
-index 3fbcdf0..7ca3ab5 100644
--- a/node_modules/node-gyp-build/bin.js
-+++ b/node_modules/node-gyp-build/bin.js
-@@ -16,7 +16,8 @@ if (!buildFromSource()) {
- }
- 
- function build () {
-  var args = [os.platform() === 'win32' ? 'node-gyp.cmd' : 'node-gyp', 'rebuild']
-+  var win32 = os.platform() === 'win32'
-+  var args = [win32 ? 'node-gyp.cmd' : 'node-gyp', 'rebuild']
- 
-   try {
-     var pkg = require('node-gyp/package.json')
-@@ -27,7 +28,7 @@ function build () {
-     ]
-   } catch (_) {}
- 
-  proc.spawn(args[0], args.slice(1), { stdio: 'inherit' }).on('exit', function (code) {
-+  proc.spawn(args[0], args.slice(1), { stdio: 'inherit', shell: win32, windowsHide: true }).on('exit', function (code) {
-     if (code || !process.argv[3]) process.exit(code)
-     exec(process.argv[3]).on('exit', function (code) {
-       process.exit(code)
-@@ -45,15 +46,18 @@ function preinstall () {
- 
- function exec (cmd) {
-   if (process.platform !== 'win32') {
-    var shell = os.platform() === 'android' ? 'sh' : '/bin/sh'
-    return proc.spawn(shell, ['-c', '--', cmd], {
-+    var shell = os.platform() === 'android' ? 'sh' : true
-+    return proc.spawn(cmd, [], {
-+      shell,
-       stdio: 'inherit'
-     })
-   }
- 
-  return proc.spawn(process.env.comspec || 'cmd.exe', ['/s', '/c', '"' + cmd + '"'], {
-+  return proc.spawn(cmd, [], {
-     windowsVerbatimArguments: true,
-    stdio: 'inherit'
-+    stdio: 'inherit',
-+    shell: true,
-+    windowsHide: true
-   })
- }
- 
--- a/apps/desktop/scripts/build.mjs
+++ b/apps/desktop/scripts/build.mjs
@@ -17,60 +17,72 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+console.log("starting build...");
 import path from "path";
-import fs, { readFile, writeFile } from "fs/promises";
-import { existsSync, readFileSync } from "fs";
+import fs from "fs/promises";
+import { existsSync } from "fs";
 import yargs from "yargs-parser";
 import os from "os";
 import * as childProcess from "child_process";
 import { fileURLToPath } from "url";
+import { patchBetterSQLite3 } from "./patch-better-sqlite3.mjs";

+console.log("imports done...");
 const args = yargs(process.argv);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const packageJson = JSON.parse(
-  readFileSync(path.join(__dirname, "..", "package.json"), "utf-8")
-);
+const root = args.root || path.join(__dirname, "..");
+const skipTscBuild = args.skipTscBuild || false;

 const webAppPath = path.resolve(path.join(__dirname, "..", "..", "web"));

-await fs.rm("./build/", { force: true, recursive: true });
+console.log("loaded args", {
+  args,
+  __filename,
+  __dirname,
+  root,
+  skipTscBuild,
+  webAppPath
+});
+await fs.rm(path.join(root, "build"), { force: true, recursive: true });
+
+console.log("removed build folder");

 if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
+  console.log("rebuilding...");
  await exec(
-    "yarn nx build:desktop @notesnook/web",
+    "node scripts/execute.mjs @notesnook/web:build:desktop",
    path.join(__dirname, "..", "..", "..")
  );
 }

-// temporary until there's support for prebuilt binaries for linux ARM
-if (os.platform() === "linux") await patchBetterSQLite3();
+await patchBetterSQLite3();

-// if (os.platform() === "win32")
-//   await exec(
-//     `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
-//     path.join(__dirname, "..", "node_modules", "sodium-native")
-//   );
-
-await fs.cp(path.join(webAppPath, "build"), "build", {
+await fs.cp(path.join(webAppPath, "build"), path.join(root, "build"), {
  recursive: true,
  force: true
 });

 if (args.variant === "mas") {
-  await exec(`yarn run bundle:mas`);
+  await exec(`yarn run bundle:mas --outdir=${path.join(root, "build")}`);
 } else {
-  await exec(`yarn run bundle`);
+  await exec(`yarn run bundle --outdir=${path.join(root, "build")}`);
 }

-await exec(`yarn tsc`);
+if (!skipTscBuild) {
+  await exec(`yarn run build`);
+}

 if (args.run) {
-  await exec(`yarn electron-builder --dir --x64`);
+  await exec(
+    `yarn electron-builder --dir --${process.arch} --config=electron-builder.config.js`
+  );
  if (process.platform === "win32") {
    await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
  } else if (process.platform === "darwin") {
-    await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
+    if (process.arch === "arm64")
+      await exec(`./output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook`);
+    else await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
  } else {
    await exec(`./output/linux-unpacked/Notesnook`);
  }
@@ -83,21 +95,3 @@ async function exec(cmd, cwd) {
    cwd: cwd || process.cwd()
  });
 }
-
-async function patchBetterSQLite3() {
-  const jsonPath = path.join(
-    __dirname,
-    "..",
-    "node_modules",
-    "better-sqlite3-multiple-ciphers",
-    "package.json"
-  );
-  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
-
-  json.version = "9.5.1";
-  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
-  json.repository.url =
-    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
-
-  await writeFile(jsonPath, JSON.stringify(json));
-}
--- a/apps/desktop/scripts/dev.mjs
+++ b/apps/desktop/scripts/dev.mjs
@@ -36,6 +36,8 @@ const ENV = {
  FORCE_COLOR: "false",
  COLOR: "0"
 };
+process.chdir(path.join(__dirname, ".."));
+
 await onChange(true);

 console.log("Watching...");
@@ -53,11 +55,13 @@ async function onChange(first) {
  if (first) {
    await fs.rm("./build/", { force: true, recursive: true });

+    await exec("npm rebuild electron --verbose --foreground-scripts");
+
    await exec("yarn electron-builder install-app-deps");
  }

  await exec(`yarn run bundle`);
-  execAsync(`yarn`, [`tsc`]);
+  await exec(`yarn run build`);

  if (await isBundleSame()) {
    console.log("Bundle is same. Doing nothing.");
@@ -66,8 +70,8 @@ async function onChange(first) {

  if (first) {
    await spawnAndWaitUntil(
-      ["yarn", "nx", "start:desktop", "@notesnook/web"],
-      path.join(__dirname, "..", "..", ".."),
+      ["npm", "run", "start:desktop"],
+      path.join(__dirname, "..", "..", "web"),
      (data) => data.includes("Network: use --host to expose")
    );
  }
--- a/apps/desktop/scripts/patch-better-sqlite3.mjs
+++ b/apps/desktop/scripts/patch-better-sqlite3.mjs
@@ -0,0 +1,58 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { readFile, rm, writeFile } from "fs/promises";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function patchBetterSQLite3() {
+  console.log("Patching better-sqlite3");
+
+  const jsonPath = path.join(
+    __dirname,
+    "..",
+    "node_modules",
+    "better-sqlite3-multiple-ciphers",
+    "package.json"
+  );
+  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
+
+  delete json.homepage;
+  delete json.repository;
+
+  await writeFile(jsonPath, JSON.stringify(json));
+
+  await rm(
+    path.join(
+      __dirname,
+      "..",
+      "node_modules",
+      "better-sqlite3-multiple-ciphers",
+      "build"
+    ),
+    { force: true, recursive: true }
+  );
+}
+
+if (process.argv[1] === __filename) {
+  patchBetterSQLite3();
+}
--- a/apps/desktop/src/api/os-integration.ts
+++ b/apps/desktop/src/api/os-integration.ts
@@ -19,7 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 import { initTRPC } from "@trpc/server";
 import { z } from "zod";
-import { app, dialog, nativeTheme, Notification, shell } from "electron";
+import {
+  app,
+  dialog,
+  Menu,
+  MenuItem,
+  nativeImage,
+  nativeTheme,
+  Notification,
+  shell
+} from "electron";
 import { AutoLaunch } from "../utils/autolaunch";
 import { config, DesktopIntegration } from "../utils/config";
 import { bringToFront } from "../utils/bring-to-front";
@@ -29,10 +38,11 @@ import { dirname } from "path";
 import { resolvePath } from "../utils/resolve-path";
 import { observable } from "@trpc/server/observable";
 import { AssetManager } from "../utils/asset-manager";
-import { isFlatpak } from "../utils";
+import { isFlatpak, isSnap } from "../utils";
 import { setupDesktopIntegration } from "../utils/desktop-integration";
 import { rm } from "fs/promises";
 import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
+import type { MenuItem as NNMenuItem } from "@notesnook/ui";

 const t = initTRPC.create();

@@ -49,6 +59,7 @@ const NotificationOptions = z.object({

 export const osIntegrationRouter = t.router({
  isFlatpak: t.procedure.query(() => isFlatpak()),
+  isSnap: t.procedure.query(() => isSnap()),

  zoomFactor: t.procedure.query(() => config.zoomFactor),
  setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
@@ -224,5 +235,63 @@ export const osIntegrationRouter = t.router({
        nativeTheme.off("updated", updated);
      };
    })
-  )
+  ),
+
+  showMenu: t.procedure
+    .input(
+      z.object({
+        menuItems: z.array(z.any())
+      })
+    )
+    .subscription(({ input: { menuItems } }) =>
+      observable<string[]>((emit) => {
+        const items = menuItems as NNMenuItem[];
+        const menu = new Menu();
+        for (const item of items) {
+          const menuItem = toMenuItem(item, (id) => emit.next(id));
+          if (menuItem) menu.append(menuItem);
+        }
+        if (menu.items.length > 0) menu.popup();
+        return () => {
+          menu.removeAllListeners();
+          menu.closePopup();
+        };
+      })
+    )
 });
+
+function toMenuItem(
+  item: NNMenuItem,
+  onClick: (id: string[]) => void,
+  parentKey?: string
+): MenuItem | undefined {
+  switch (item.type) {
+    case "lazy-loader":
+      return undefined;
+    case "separator":
+      return new MenuItem({ type: "separator" });
+    case "button": {
+      const submenu = item.menu ? new Menu() : undefined;
+      if (submenu && item.menu) {
+        for (const subitem of item.menu.items) {
+          const subMenuItem = toMenuItem(subitem, onClick, item.key);
+          if (subMenuItem) submenu.append(subMenuItem);
+        }
+      }
+
+      return new MenuItem({
+        label: item.title,
+        enabled: !item.isDisabled,
+        visible: !item.isHidden,
+        toolTip: item.tooltip,
+        sublabel: item.tooltip,
+        checked: item.isChecked,
+        type: submenu ? "submenu" : item.isChecked ? "checkbox" : "normal",
+        id: item.key,
+        submenu,
+        click: () => onClick(parentKey ? [parentKey, item.key] : [item.key]),
+        accelerator: item.modifier?.replace("Mod", "CommandOrControl")
+      });
+    }
+  }
+}
--- a/apps/desktop/src/api/sqlite-kysely.ts
+++ b/apps/desktop/src/api/sqlite-kysely.ts
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 import type { Database, Statement } from "better-sqlite3-multiple-ciphers";
-import type { QueryResult } from "kysely";
+import type { QueryResult } from "@streetwriters/kysely";

 type SQLiteCompatibleType =
  | number
@@ -33,6 +33,8 @@ export class SQLite {
  initialized = false;
  preparedStatements: Map<string, Statement<unknown[]>> = new Map();
  retryCounter: Record<string, number> = {};
+  extensionsLoaded = false;
+
  constructor() {
    console.log("new sqlite worker");
  }
@@ -113,9 +115,29 @@ export class SQLite {
    } catch (e) {
      if (e instanceof Error) e.message += ` (query: ${sql})`;
      throw e;
+    } finally {
+      // Since SQLite 3.48.0 (SQLite3MC v2.0.2) it's not possible to load fts5
+      // extensions before database has been decrypting. This is because
+      // executing a `SELECT` now accesses the underlying databases resulting in
+      // an error. Since FTS5 extensions depend on `SELECT fts5` to load the
+      // fts5 API, we must wait decrypt the database before we can load
+      // the extensions.
+      if (!this.extensionsLoaded && (await this.isDatabaseReady())) {
+        this.loadExtensions();
+      }
    }
  }

+  private loadExtensions() {
+    this.sqlite?.loadExtension(
+      getExtensionPath("sqlite-better-trigram", "better-trigram")
+    );
+    this.sqlite?.loadExtension(
+      getExtensionPath("sqlite3-fts5-html", "fts5-html")
+    );
+    this.extensionsLoaded = true;
+  }
+
  async run<R>(
    sql: string,
    parameters?: SQLiteCompatibleType[]
@@ -140,4 +162,53 @@ export class SQLite {
      retryDelay: 500
    });
  }
+
+  /**
+   * This just executes `SELECT 1` on the database to make sure its ready.
+   * On an encrypted database, this will fail until `PRAGMA key` has been
+   * called.
+   */
+  private async isDatabaseReady() {
+    // return this.exec(`SELECT 1;`)
+    //   .then(() => true)
+    //   .catch(() => false);
+    if (!this.sqlite) return false;
+    try {
+      this.sqlite.prepare(`SELECT 1;`).run();
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+
+function getExtensionPath(extensionName: string, entryPoint: string) {
+  const path = require("path");
+  const { statSync } = require("fs");
+
+  const os = process.platform === "win32" ? "windows" : process.platform;
+  const packageName = `${extensionName}-${os}-${process.arch}`;
+  const extensionSuffix =
+    process.platform === "win32"
+      ? "dll"
+      : process.platform === "darwin"
+      ? "dylib"
+      : "so";
+  let loadablePath = path.join(
+    require.resolve(extensionName),
+    "..",
+    "..",
+    packageName,
+    `${entryPoint}.${extensionSuffix}`
+  );
+
+  if (loadablePath.includes(".asar"))
+    loadablePath = loadablePath
+      .replace("electron.asar", "app.asar")
+      .replace(".asar", ".asar.unpacked");
+
+  if (!statSync(loadablePath, { throwIfNoEntry: false })) {
+    throw new Error(`${extensionName} not found at ${loadablePath}.`);
+  }
+  return loadablePath;
 }
--- a/apps/desktop/src/api/updater.ts
+++ b/apps/desktop/src/api/updater.ts
@@ -23,6 +23,7 @@ import { CancellationToken, autoUpdater } from "electron-updater";
 import type { AppUpdaterEvents } from "electron-updater/out/AppUpdater";
 import { z } from "zod";
 import { config } from "../utils/config";
+import { app } from "electron";

 type UpdateInfo = { version: string };
 type Progress = { percent: number };
@@ -33,6 +34,7 @@ let downloadTimeout: NodeJS.Timeout | undefined = undefined;

 export const updaterRouter = t.router({
  autoUpdates: t.procedure.query(() => config.automaticUpdates),
+  releaseTrack: t.procedure.query(() => config.releaseTrack),
  install: t.procedure.query(() => autoUpdater.quitAndInstall()),
  download: t.procedure.query(async () => {
    if (cancellationToken) return;
@@ -67,7 +69,13 @@ export const updaterRouter = t.router({
    .mutation(({ input: { enabled } }) => {
      config.automaticUpdates = enabled;
    }),
-
+  changeReleaseTrack: t.procedure
+    .input(z.object({ track: z.string() }))
+    .mutation(({ input: { track } }) => {
+      config.releaseTrack = track;
+      app.relaunch();
+      app.exit();
+    }),
  onChecking: createSubscription("checking-for-update"),
  onDownloaded: createSubscription<"update-downloaded", UpdateInfo>(
    "update-downloaded"
--- a/apps/desktop/src/index.ts
+++ b/apps/desktop/src/index.ts
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-export * from "./constants";
+export { PATHS } from "./constants";
 export type { AppRouter } from "./api";
 export { type UpdateInfo } from "builder-util-runtime";
 export { type DesktopIntegration } from "./utils/config";
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -17,7 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import { app, BrowserWindow, nativeTheme, shell } from "electron";
+import "./overrides";
+import { app, BrowserWindow, nativeTheme, shell, dialog } from "electron";
 import { isDevelopment } from "./utils";
 import { registerProtocol, PROTOCOL_URL } from "./utils/protocol";
 import { configureAutoUpdater } from "./utils/autoupdater";
@@ -36,6 +37,20 @@ import { bringToFront } from "./utils/bring-to-front";
 import { bridge } from "./api/bridge";
 import { setupDesktopIntegration } from "./utils/desktop-integration";
 import { disableCustomDns, enableCustomDns } from "./utils/custom-dns";
+import { Messages, setI18nGlobal } from "@notesnook/intl";
+import { i18n } from "@lingui/core";
+
+const locale =
+  process.env.NODE_ENV === "development"
+    ? import("@notesnook/intl/locales/$pseudo-LOCALE.json")
+    : import("@notesnook/intl/locales/$en.json");
+locale.then(({ default: locale }) => {
+  i18n.load({
+    en: locale.messages as unknown as Messages
+  });
+  i18n.activate("en");
+});
+setI18nGlobal(i18n);

 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
@@ -71,6 +86,8 @@ async function createWindow() {
  const mainWindowState = new WindowState({});
  const mainWindow = new BrowserWindow({
    show: !cliOptions.hidden,
+    paintWhenInitiallyHidden: cliOptions.hidden,
+    skipTaskbar: cliOptions.hidden,
    x: mainWindowState.x,
    y: mainWindowState.y,
    width: mainWindowState.width,
@@ -87,7 +104,10 @@ async function createWindow() {
    ...(config.desktopSettings.nativeTitlebar
      ? {}
      : {
-          titleBarStyle: "hidden",
+          titleBarStyle:
+            process.platform === "win32" || process.platform === "darwin"
+              ? "hidden"
+              : "default",
          frame: process.platform === "win32" || process.platform === "darwin",
          titleBarOverlay: {
            height: 37,
@@ -128,6 +148,11 @@ async function createWindow() {
  await AssetManager.loadIcons();
  setupDesktopIntegration(config.desktopSettings);

+  mainWindow.webContents.session.setPermissionRequestHandler(
+    (webContents, permission, callback) => {
+      callback(permission === "geolocation" ? false : true);
+    }
+  );
  mainWindow.webContents.session.setSpellCheckerDictionaryDownloadURL(
    "http://dictionaries.notesnook.com/"
  );
@@ -157,6 +182,17 @@ async function createWindow() {
 app.once("ready", async () => {
  console.info("App ready. Opening window.");

+  if (app.runningUnderARM64Translation) {
+    console.log("App is running under ARM64 translation");
+    dialog.showMessageBoxSync({
+      message:
+        "Notesnook detected that it is running under ARM64 translation. For the best performance, please download the ARM64 build of Notesnook from our website.",
+      type: "warning",
+      buttons: ["Okay"],
+      title: "Degraded Performance Warning"
+    });
+  }
+
  if (config.customDns) enableCustomDns();
  else disableCustomDns();

--- a/apps/desktop/src/overrides.ts
+++ b/apps/desktop/src/overrides.ts
@@ -0,0 +1,41 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import { app } from "electron";
+import path from "path";
+
+const customVersion = process.env.CUSTOM_APP_VERSION;
+if (customVersion) {
+  app.getVersion = () => customVersion;
+  console.log("setting custom version:", customVersion);
+}
+
+if (process.env.CUSTOM_USER_DATA_DIR) {
+  app.setPath(
+    "appData",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "AppData")
+  );
+  app.setPath(
+    "userData",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "UserData")
+  );
+  app.setPath(
+    "documents",
+    path.join(process.env.CUSTOM_USER_DATA_DIR, "Documents")
+  );
+}
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -19,22 +19,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable no-var */

 import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
-import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
 // import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";

 declare global {
  var os: () => "mas" | ReturnType<typeof platform>;
-  var electronTRPC: RendererGlobalElectronTRPC;
+  var electronTRPC: any;
  // var NativeNNCrypto: (new () => NNCrypto) | undefined;
 }

 process.once("loaded", async () => {
-  const electronTRPC: RendererGlobalElectronTRPC = {
-    sendMessage: (operation) =>
+  const electronTRPC = {
+    sendMessage: (operation: any) =>
      ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback) =>
+    onMessage: (callback: any) =>
      ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
  };
  globalThis.electronTRPC = electronTRPC;
--- a/apps/desktop/src/utils/asset-manager.ts
+++ b/apps/desktop/src/utils/asset-manager.ts
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { NativeImage, nativeImage } from "electron";
 import path from "path";
 import { isDevelopment } from "./index";
-import { parse, ParsedImage } from "icojs";
+import { ParsedImage, parseICO } from "icojs";
 import { getSystemTheme } from "./theme";
 import { readFile } from "fs/promises";

@@ -71,7 +71,7 @@ export class AssetManager {
          `${icon}${prefix}.ico`
        );
        const icoBuffer = await readFile(icoPath);
-        const images = await parse(icoBuffer, "image/png");
+        const images = await parseICO(icoBuffer, "image/png");
        ALL_ICONS.push({ id: icon, images, prefix });
      }
    }
--- a/apps/desktop/src/utils/autoupdater.ts
+++ b/apps/desktop/src/utils/autoupdater.ts
@@ -20,19 +20,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { autoUpdater } from "electron-updater";
 import { config } from "./config";

-const CHANNEL = autoUpdater.currentVersion.raw.endsWith("-beta")
-  ? "beta"
-  : "latest";
 async function configureAutoUpdater() {
+  const releaseTrack =
+    config.releaseTrack === "stable" ? "latest" : config.releaseTrack;
  autoUpdater.setFeedURL({
    provider: "generic",
-    url: `https://notesnook.com/api/v1/releases/${process.platform}/${CHANNEL}`,
+    url: `https://notesnook.com/api/v1/releases/${process.platform}/${releaseTrack}`,
    useMultipleRangeRequest: false,
-    channel: CHANNEL
+    channel: releaseTrack
  });

  autoUpdater.autoDownload = config.automaticUpdates;
-  autoUpdater.allowDowngrade = false;
+  autoUpdater.allowDowngrade =
+    // only allow downgrade if the current version is a prerelease
+    // and the user has changed the release track to stable
+    config.releaseTrack === "stable" &&
+    autoUpdater.currentVersion.prerelease.length > 0;
  autoUpdater.allowPrerelease = false;
  autoUpdater.autoInstallOnAppQuit = true;
  autoUpdater.disableWebInstaller = true;
--- a/apps/desktop/src/utils/config.ts
+++ b/apps/desktop/src/utils/config.ts
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { nativeTheme } from "electron";
 import { JSONStorage } from "./json-storage";
 import { z } from "zod";
+import { autoUpdater } from "electron-updater";

 export const DesktopIntegration = z.object({
  autoStart: z.boolean().optional(),
@@ -46,6 +47,9 @@ export const config = {
  automaticUpdates: true,
  proxyRules: "",
  customDns: true,
+  releaseTrack: autoUpdater.currentVersion.raw.includes("-beta")
+    ? "beta"
+    : "stable",

  backgroundColor: nativeTheme.themeSource === "dark" ? "#0f0f0f" : "#ffffff",
  windowControlsIconColor:
--- a/apps/desktop/src/utils/index.ts
+++ b/apps/desktop/src/utils/index.ts
@@ -29,3 +29,7 @@ export function isDevelopment() {
 export function isFlatpak() {
  return existsSync("/.flatpak-info");
 }
+
+export function isSnap() {
+  return process.env.SNAP !== undefined;
+}
--- a/apps/desktop/src/utils/menu.ts
+++ b/apps/desktop/src/utils/menu.ts
@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+import { strings } from "@notesnook/intl";
 import { Menu, MenuItem, clipboard, shell } from "electron";

 function setupMenu() {
@@ -40,7 +41,7 @@ function setupMenu() {
    if (params.misspelledWord) {
      menu.append(
        new MenuItem({
-          label: "Add to dictionary",
+          label: strings.addToDictionary(),
          click: () =>
            globalThis.window?.webContents.session.addWordToSpellCheckerDictionary(
              params.misspelledWord
@@ -59,7 +60,7 @@ function setupMenu() {
    if (params.linkURL.length) {
      menu.append(
        new MenuItem({
-          label: "Open in browser",
+          label: strings.openInBrowser(),
          click: () => shell.openExternal(params.linkURL)
        })
      );
@@ -68,7 +69,7 @@ function setupMenu() {
    if (params.isEditable) {
      menu.append(
        new MenuItem({
-          label: "Undo",
+          label: strings.undo(),
          role: "undo",
          enabled: params.isEditable,
          accelerator: "CommandOrControl+Z"
@@ -77,7 +78,7 @@ function setupMenu() {

      menu.append(
        new MenuItem({
-          label: "Redo",
+          label: strings.redo(),
          role: "redo",
          enabled: params.isEditable,
          accelerator: "CommandOrControl+Y"
@@ -94,7 +95,7 @@ function setupMenu() {
    if (params.isEditable)
      menu.append(
        new MenuItem({
-          label: "Cut",
+          label: strings.cut(),
          role: "cut",
          enabled: params.selectionText.length > 0,
          accelerator: "CommandOrControl+X"
@@ -104,7 +105,7 @@ function setupMenu() {
    if (params.linkURL?.length) {
      menu.append(
        new MenuItem({
-          label: "Copy link",
+          label: strings.copyLink(),
          click() {
            clipboard.writeText(params.linkURL);
          }
@@ -113,7 +114,7 @@ function setupMenu() {

      menu.append(
        new MenuItem({
-          label: "Copy link text",
+          label: strings.copyLinkText(),
          click() {
            clipboard.writeText(params.linkText);
          }
@@ -124,7 +125,7 @@ function setupMenu() {
    if (params.selectionText.length) {
      menu.append(
        new MenuItem({
-          label: "Copy",
+          label: strings.copy(),
          role: "copy",
          accelerator: "CommandOrControl+C"
        })
@@ -135,23 +136,51 @@ function setupMenu() {
      menu.append(
        new MenuItem({
          id: "copy-image",
-          label: "Copy Image",
+          label: strings.copyImage(),
          click() {
            globalThis.window?.webContents.copyImageAt(params.x, params.y);
          }
        })
      );

-    if (params.isEditable)
+    if (params.isEditable) {
      menu.append(
        new MenuItem({
-          label: "Paste",
-          role: "pasteAndMatchStyle",
+          label: strings.paste(),
+          role: "paste",
          enabled: clipboard.readText("clipboard").length > 0,
          accelerator: "CommandOrControl+V"
        })
      );

+      menu.append(
+        new MenuItem({
+          label:
+            process.platform === "darwin"
+              ? strings.pasteAndMatchStyle()
+              : strings.pasteWithoutFormatting(),
+          role: "pasteAndMatchStyle",
+          enabled: clipboard.readText("clipboard").length > 0,
+          accelerator:
+            process.platform === "darwin"
+              ? "Option+Shift+Command+V"
+              : "Shift+CommandOrControl+V"
+        })
+      );
+
+      menu.append(
+        new MenuItem({
+          type: "separator"
+        })
+      );
+      menu.append(
+        new MenuItem({
+          label: strings.spellCheck(),
+          role: "toggleSpellChecker"
+        })
+      );
+    }
+
    if (menu.items.length > 0) menu.popup();
  });
 }
--- a/apps/desktop/src/utils/theme.ts
+++ b/apps/desktop/src/utils/theme.ts
@@ -57,7 +57,8 @@ function getSystemTheme() {
  nativeTheme.themeSource = oldThemeSource;

  setTimeout(
-    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
+    () =>
+      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
    1000
  );
  return currentTheme;
@@ -72,7 +73,8 @@ function changeTheme(theme: Theme) {
  nativeTheme.themeSource = theme;

  setTimeout(
-    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
+    () =>
+      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
    1000
  );
 }
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -2,7 +2,8 @@
  "extends": "../../tsconfig",
  "compilerOptions": {
    "outDir": "./dist/",
-    "lib": ["ESNext"]
+    "lib": ["ESNext"],
+    "moduleResolution": "Bundler"
  },
  "include": ["src", "global.d.ts"]
 }
--- a/apps/desktop/vitest.config.ts
+++ b/apps/desktop/vitest.config.ts
@@ -0,0 +1,42 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    testTimeout: 120 * 1000,
+    hookTimeout: 120 * 1000,
+    sequence: {
+      concurrent: true,
+      shuffle: true
+    },
+    globalSetup: "./__tests__/global-setup.ts",
+    dir: "./__tests__/",
+    exclude: [
+      "**/node_modules/**",
+      "**/dist/**",
+      "**/cypress/**",
+      "**/.{idea,git,cache,output,temp}/**",
+      "**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build,eslint,prettier}.config.*",
+      "**/test-results/**",
+      "**/test-artifacts/**"
+    ]
+  }
+});
--- a/apps/mobile/.detoxrc.js
+++ b/apps/mobile/.detoxrc.js
@@ -0,0 +1,92 @@
+/** @type {Detox.DetoxConfig} */
+module.exports = {
+  testRunner: {
+    args: {
+      $0: "jest",
+      config: "e2e/jest.config.js"
+    },
+    jest: {
+      setupTimeout: 120000
+    }
+  },
+  apps: {
+    "ios.debug": {
+      type: "ios.app",
+      binaryPath:
+        "ios/build/Build/Products/Debug-iphonesimulator/Notesnook.app",
+      build:
+        "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build"
+    },
+    "ios.release": {
+      type: "ios.app",
+      binaryPath:
+        "ios/build/Build/Products/Release-iphonesimulator/Notesnook.app",
+      build:
+        "xcodebuild -workspace ios/Notesnook.xcworkspace -scheme YOUR_APP -configuration Release -sdk iphonesimulator -derivedDataPath ios/build"
+    },
+    "android.debug": {
+      type: "android.apk",
+      binaryPath: "android/app/build/outputs/apk/debug/app-arm64-v8a-debug.apk",
+      testBinaryPath:
+        "android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk",
+      build:
+        "cd android ; ENVFILE=.env.test ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
+      reversePorts: [8081]
+    },
+    "android.release": {
+      type: "android.apk",
+      binaryPath:
+        "android/app/build/outputs/apk/release/app-arm64-v8a-release.apk",
+      testBinaryPath:
+        "android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk",
+      build:
+        "cd android ; ENVFILE=.env.test ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release ; cd .."
+    }
+  },
+  devices: {
+    simulator: {
+      type: "ios.simulator",
+      device: {
+        type: "iPhone 12"
+      }
+    },
+    attached: {
+      type: "android.attached",
+      device: {
+        adbName: ".*"
+      }
+    },
+    emulator: {
+      type: "android.emulator",
+      device: {
+        avdName: "Pixel_5_API_34"
+      }
+    }
+  },
+  configurations: {
+    "ios.sim.debug": {
+      device: "simulator",
+      app: "ios.debug"
+    },
+    "ios.sim.release": {
+      device: "simulator",
+      app: "ios.release"
+    },
+    "android.att.debug": {
+      device: "attached",
+      app: "android.debug"
+    },
+    "android.att.release": {
+      device: "attached",
+      app: "android.release"
+    },
+    "android.emu.debug": {
+      device: "emulator",
+      app: "android.debug"
+    },
+    "android.emu.release": {
+      device: "emulator",
+      app: "android.release"
+    }
+  }
+};
--- a/apps/mobile/native/.env
+++ b/apps/mobile/native/.env
--- a/apps/mobile/native/.env.public
+++ b/apps/mobile/native/.env.public
--- a/apps/mobile/native/.env.test
+++ b/apps/mobile/native/.env.test
--- a/apps/mobile/.gitignore
+++ b/apps/mobile/.gitignore
@@ -4,7 +4,7 @@ artifacts/
 #
 .DS_Store

-native/android/app/src/main/assets/
+android/app/src/main/assets/
 *Issues.md
 build_cache/
 #
@@ -16,11 +16,12 @@ build_cache/
 .cxx/
 *.keystore
 !debug.keystore
+.kotlin/

 # Xcode
 #
-native/ios/Pods
-native/ios/DerivedData
+ios/Pods
+ios/DerivedData
 build/
 *.pbxuser
 !default.pbxuser
@@ -39,6 +40,7 @@ DerivedData
 *.xcuserstate
 *.hprof
 **/.xcode.env.local
+cache
 # Android/IntelliJ
 #
 rn-build-deps/
@@ -56,7 +58,7 @@ yarn-error.log
 # BUCK
 buck-out/
 \.buckd/
-*.keystore
+

 # fastlane
 #
@@ -68,6 +70,7 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+vendor

 # Bundle artifact
 *.jsbundle
--- a/apps/mobile/native/.ruby-version
+++ b/apps/mobile/native/.ruby-version
--- a/apps/mobile/Gemfile
+++ b/apps/mobile/Gemfile
@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'
--- a/apps/mobile/native/Gemfile.lock
+++ b/apps/mobile/native/Gemfile.lock
@@ -1,30 +1,41 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
      rexml
-    activesupport (6.1.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
    algoliasearch (1.27.5)
      httpclient (~> 2.8, >= 2.8.3)
      json (>= 1.5.1)
    atomos (0.1.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.1)
    claide (1.1.0)
-    cocoapods (1.11.3)
+    cocoapods (1.15.2)
      addressable (~> 2.8)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.15.2)
      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
      cocoapods-try (>= 1.1.0, < 2.0)
      colored2 (~> 3.1)
      escape (~> 0.0.4)
@@ -32,10 +43,10 @@ GEM
      gh_inspector (~> 1.0)
      molinillo (~> 0.8.0)
      nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.2)
+      activesupport (>= 5.0, < 8)
      addressable (~> 2.8)
      algoliasearch (~> 1.0)
      concurrent-ruby (~> 1.1)
@@ -45,7 +56,7 @@ GEM
      public_suffix (~> 4.0)
      typhoeus (~> 1.0)
    cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.1)
@@ -54,47 +65,60 @@ GEM
      netrc (~> 0.11)
    cocoapods-try (1.2.0)
    colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.5.3)
+    drb (2.2.3)
    escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
      ffi (>= 1.15.0)
-    ffi (1.15.5)
+    ffi (1.17.2)
    fourflusher (2.3.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.10.0)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.15.0)
+    json (2.12.2)
+    logger (1.7.0)
+    minitest (5.25.5)
    molinillo (0.8.0)
+    mutex_m (0.3.0)
    nanaimo (0.3.0)
    nap (1.1.0)
    netrc (0.11.0)
+    nkf (0.2.0)
    public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.4.1)
    ruby-macho (2.5.1)
-    typhoeus (1.4.0)
+    securerandom (0.4.1)
+    typhoeus (1.4.1)
      ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.25.1)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
+      rexml (>= 3.3.6, < 4.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  cocoapods (~> 1.11, >= 1.11.2)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  benchmark
+  bigdecimal
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
+  concurrent-ruby (< 1.3.4)
+  logger
+  mutex_m
+  xcodeproj (< 1.26.0)

 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.4.1p0

 BUNDLED WITH
-   2.2.27
+   2.6.2
--- a/apps/mobile/native/android/.project
+++ b/apps/mobile/native/android/.project
--- a/apps/mobile/native/android/.settings/org.eclipse.buildship.core.prefs
+++ b/apps/mobile/native/android/.settings/org.eclipse.buildship.core.prefs
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -11,13 +11,13 @@ import org.apache.tools.ant.taskdefs.condition.Os
 react {
    /* Folders */
    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    root = file("$rootDir/../")
+    //root = file("$rootDir/..")
    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    reactNativeDir = file("$rootDir/../../node_modules/react-native")
+    //reactNativeDir = file("$rootDir/../node_modules/react-native")
    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    codegenDir = file("$rootDir/../../node_modules/react-native-codegen")
+    //codegenDir = file("$rootDir/../node_modules/react-native-codegen")
    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    cliFile = file("$rootDir/../../node_modules/react-native/cli.js")
+    // cliFile = file("$rootDir/../node_modules/react-native/cli.js")
    /* Variants */
    //   The list of variants to that are debuggable. For those we're going to
    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
@@ -44,10 +44,13 @@ react {
    // extraPackagerArgs = []
    /* Hermes Commands */
    //   The hermes compiler command to run. By default it is 'hermesc'
-    hermesCommand = "$rootDir/../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = "$rootDir/../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
    //
    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
    hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }

 /**
@@ -69,14 +72,14 @@ def enableProguardInReleaseBuilds = true
 * The preferred build flavor of JavaScriptCore.
 *
 * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
 *
 * The international variant includes ICU i18n library and necessary data
 * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
 * give correct results when using with locales other than en-US.  Note that
 * this variant is about 6MiB larger per architecture than default.
 */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'

 /**
 * Architectures to build native code for.
@@ -91,7 +94,7 @@ def fdroidBuild() {
 }

 def getNpmVersion() {
-    def inputFile = file("$rootDir/../../package.json")
+    def inputFile = file("$rootDir/../package.json")
    def jsonPackage = new JsonSlurper().parseText(inputFile.text)
    print(jsonPackage["version"])
    return jsonPackage["version"]
@@ -100,6 +103,11 @@ def getNpmVersion() {
 def isBuildingAAB = gradle.startParameter.getTaskNames().any { it.contains("bundleRelease") }

 android {
+
+    androidResources {
+        noCompress += ["bundle"]
+    }
+
    compileSdkVersion rootProject.ext.compileSdkVersion
    ndkVersion rootProject.ext.ndkVersion
    buildToolsVersion rootProject.ext.buildToolsVersion
@@ -116,7 +124,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        multiDexEnabled true
-        versionCode 3027
+        versionCode 3079
        versionName getNpmVersion()
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -157,17 +165,14 @@ android {
            minifyEnabled enableProguardInReleaseBuilds
            shrinkResources false
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            proguardFile "${rootProject.projectDir}/../../node_modules/detox/android/detox/proguard-rules-app.pro"
+            proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
            buildConfigField "boolean", "FDROID_BUILD", "${fdroidBuild()}"
        
        }
    }

     packagingOptions {
-      pickFirst 'lib/x86/libc++_shared.so'
-      pickFirst 'lib/x86_64/libc++_shared.so'
-      pickFirst 'lib/armeabi-v7a/libc++_shared.so'
-      pickFirst 'lib/arm64-v8a/libc++_shared.so'
+      pickFirst '**/libc++_shared.so'
      jniLibs {
            useLegacyPackaging isBuildingAAB == false
    }
@@ -215,6 +220,9 @@ dependencies {
    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.2'
    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.2'
+    implementation 'com.google.code.gson:gson:2.11.0'
+    
+    implementation project(":react-native-config")

    androidTestImplementation('com.wix:detox:+')
    implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -226,16 +234,14 @@ dependencies {
    }
    

-}  
-
-
+}

 task deleteFiles(type: Delete) {
  delete './src/main/assets/static'
 }

 task copyEditorBundle(type: Copy) {
-    from '../../../../../packages/editor-mobile/build.bundle'
+    from '../../../../packages/editor-mobile/build.bundle'
    into './src/main/assets'
 }

@@ -255,7 +261,3 @@ copyFontFiles.dependsOn(copyEditorBundle);
 copyPlainEditorBundle.dependsOn(copyFontFiles);
 preBuild.dependsOn(copyPlainEditorBundle)

-apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
-
-
--- a/apps/mobile/android/app/debug.keystore
+++ b/apps/mobile/android/app/debug.keystore
--- a/apps/mobile/native/android/app/proguard-rules.pro
+++ b/apps/mobile/native/android/app/proguard-rules.pro
@@ -57,4 +57,10 @@
 -keep class org.apache.commons.io.** { *; }

 # Background fetch
-keep class com.transistorsoft.rnbackgroundfetch.HeadlessTask { *; }
+-keep class com.transistorsoft.rnbackgroundfetch.HeadlessTask { *; }
+
+#Gson
+-keepattributes Signature
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep class com.streetwriters.notesnook.datatypes.* { *; }
--- a/apps/mobile/native/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java
+++ b/apps/mobile/native/android/app/src/androidTest/java/com/streetwriters/notesnook/DetoxTest.java
--- a/apps/mobile/native/android/app/src/debug/AndroidManifest.xml
+++ b/apps/mobile/native/android/app/src/debug/AndroidManifest.xml
--- a/apps/mobile/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.streetwriters.notesnook">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:node="remove" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission
+        android:name="android.permission.USE_FULL_SCREEN_INTENT"
+        tools:node="remove" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <data android:mimeType="application/pdf" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <data android:mimeType="text/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <data android:mimeType="image/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+
+            <data android:mimeType="video/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <!-- If you don't know the MIME type in advance, set "mimeType" to "*/*". -->
+            <data android:mimeType="audio/*" />
+        </intent>
+    </queries>
+
+    <application
+        android:name=".MainApplication"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@style/BootTheme">
+
+        <receiver
+            android:name=".NoteWidget"
+            android:exported="false"
+            android:label="@string/quick_note">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/new_note_widget_info" />
+        </receiver>
+
+        <receiver
+            android:name=".NotePreviewWidget"
+            android:exported="false"
+            android:label="@string/note">
+            <intent-filter>"
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/note_widget_info" />
+        </receiver>
+
+        <receiver
+            android:name=".ReminderWidgetProvider"
+            android:exported="false"
+            android:label="@string/reminders_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_reminders_info" />
+        </receiver>
+
+        <activity
+            android:name=".NotePreviewConfigureActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:exported="true"
+            android:label="NotePreviewConfigure"
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:resizeableActivity="true"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter android:label="Notesnook">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="app.notesnook.com"
+                    android:scheme="https" />
+            </intent-filter>
+
+            <intent-filter android:label="Notesnook">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="notesnook" />
+            </intent-filter>
+
+        </activity>
+        <activity
+            android:name="com.facebook.react.devsupport.DevSettingsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ShareActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:label="@string/title_activity_share"
+            android:noHistory="true"
+            android:taskAffinity=""
+            android:theme="@style/AppThemeB"
+            android:windowSoftInputMode="adjustResize">
+
+            <intent-filter android:label="Make Note">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
+
+            <intent-filter android:label="Make Note">
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="application/*" />
+            </intent-filter>
+
+            <intent-filter android:label="Make Note">
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/*" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".OnClearFromRecentService"
+            android:enabled="true"
+            android:exported="true"
+            android:stopWithTask="false" />
+        <service android:name="com.asterinet.react.bgactions.RNBackgroundActionsTask" />
+
+        <service
+            android:name="com.streetwriters.notesnook.BootTaskService"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="The service is required by the app to restore notifications of pinned notes, restore notification with reply input for creating notes and restore data in note preview widgets on device reboot." />
+        </service>
+
+        <service
+            android:name=".NotesnookTileService"
+            android:exported="true"
+            android:icon="@drawable/add_note"
+            android:label="New note"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".ReminderViewsService"
+            android:exported="true"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_viewer_provider_paths" />
+        </provider>
+
+        <provider
+            android:name="com.vinzscam.reactnativefileviewer.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_viewer_provider_paths" />
+        </provider>
+
+        <receiver
+            android:name=".BootRecieverService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
+
+    </application>
+
+</manifest>
--- a/apps/mobile/native/android/app/src/main/ic_launcher-playstore.png
+++ b/apps/mobile/native/android/app/src/main/ic_launcher-playstore.png
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java
@@ -14,19 +14,21 @@ public class BootRecieverService extends BroadcastReceiver {

    @Override
    public void onReceive(Context context, Intent intent) {
-          if (!isAppOnForeground((context))) {
-            /**
-             We will start our service and send extra info about
-             network connections
-             **/
-            Intent serviceIntent = new Intent(context, BootTaskService.class);
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                  context.startForegroundService(serviceIntent);
-              } else {
-                  context.startService(serviceIntent);
-              }
-              HeadlessJsTaskService.acquireWakeLockNow(context);
-        }
+         try {
+             if (!isAppOnForeground((context))) {
+                 /**
+                  We will start our service and send extra info about
+                  network connections
+                  **/
+                 Intent serviceIntent = new Intent(context, BootTaskService.class);
+                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                     context.startForegroundService(serviceIntent);
+                 } else {
+                     context.startService(serviceIntent);
+                 }
+                 HeadlessJsTaskService.acquireWakeLockNow(context);
+             }
+         } catch (Exception ignored) {}
    }

    private boolean isAppOnForeground(Context context) {
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java
@@ -5,6 +5,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.util.Log;

 import androidx.core.app.NotificationCompat;
@@ -12,20 +13,22 @@ import androidx.core.app.NotificationCompat;
 import com.facebook.react.HeadlessJsTaskService;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.jstasks.HeadlessJsTaskConfig;
+
 import javax.annotation.Nullable;

 public class BootTaskService extends HeadlessJsTaskService {
    Notification notification;
+
    @Override
-  protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
-      Log.d("BootTask", "Task Started");
-      return new HeadlessJsTaskConfig(
-              "com.streetwriters.notesnook.BOOT_TASK",
-              Arguments.createMap(),
-              30000, // timeout for the task
-              false // optional: defines whether or not the task is allowed in foreground. Default is false
-      );
-  }
+    protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
+        Log.d("BootTask", "Task Started");
+        return new HeadlessJsTaskConfig(
+                "com.streetwriters.notesnook.BOOT_TASK",
+                Arguments.createMap(),
+                30000, // timeout for the task
+                false // optional: defines whether or not the task is allowed in foreground. Default is false
+        );
+    }

    @Override
    public void onHeadlessJsTaskFinish(int taskId) {
@@ -36,7 +39,6 @@ public class BootTaskService extends HeadlessJsTaskService {

    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
-
        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
            NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
                    "Default",
@@ -48,7 +50,17 @@ public class BootTaskService extends HeadlessJsTaskService {
                    .setContentText("")
                    .setSmallIcon(R.drawable.ic_stat_name)
                    .build();
-            startForeground(1, notification);
+            if (android.os.Build.VERSION.SDK_INT >= 34) {
+                this.startForeground(
+                        1,
+                        notification,
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            } else {
+                this.startForeground(
+                        1,
+                        notification);
+            }
+
        }

        return super.onStartCommand(intent, flags, startId);
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainActivity.java
@@ -3,31 +3,48 @@ package com.streetwriters.notesnook;
 import com.facebook.react.ReactActivity;
 import android.content.Intent;
 import android.content.res.Configuration;
+import androidx.core.graphics.Insets;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 import android.webkit.WebView;
+
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
 import com.zoontek.rnbootsplash.RNBootSplash;

 public class MainActivity extends ReactActivity {
-
-
  @Override
    protected void onCreate(Bundle savedInstanceState) {
-    RNBootSplash.init(this);
+    RNBootSplash.init(this, R.style.BootTheme);
+
    super.onCreate(null);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && BuildConfig.DEBUG) {
+    if (BuildConfig.DEBUG) {
      WebView.setWebContentsDebuggingEnabled(true);
    }

    try {
      startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
-    } catch (Exception e) {
+    } catch (Exception ignored) {}

+    if (Build.VERSION.SDK_INT >= 35) {
+      final View rootView = findViewById(android.R.id.content);
+      ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, insets) -> {
+        Insets innerPadding = insets.getInsets(WindowInsetsCompat.Type.ime());
+        rootView.setPadding(
+                innerPadding.left,
+                innerPadding.top,
+                innerPadding.right,
+                innerPadding.bottom
+        );
+        return insets;
+      });
    }
-
  }

  /**
@@ -49,7 +66,7 @@ public void onNewIntent(Intent intent) {
  setIntent(intent);
 }

- @Override
+@Override
 public void onConfigurationChanged(Configuration newConfig) {
  super.onConfigurationChanged(newConfig);
  getReactInstanceManager().onConfigurationChanged(this, newConfig);
@@ -63,7 +80,6 @@ public void onConfigurationChanged(Configuration newConfig) {
    return "Notesnook";
  }

-
  @Override
  public void invokeDefaultOnBackPressed() {
    moveTaskToBack(true);
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt
@@ -0,0 +1,27 @@
+package com.streetwriters.notesnook
+ 
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
+ 
+class MainApplication : Application(), ReactApplication {
+    override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+          add(NNativeModulePackage());
+        },
+    )
+  }
+ 
+  override fun onCreate() {
+    super.onCreate()
+    loadReactNative(this)
+  }
+}
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NNativeModulePackage.java
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewConfigureActivity.java
@@ -0,0 +1,71 @@
+package com.streetwriters.notesnook;
+
+import android.app.Activity;
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
+import com.google.gson.Gson;
+import com.streetwriters.notesnook.datatypes.Note;
+
+public class NotePreviewConfigureActivity extends ReactActivity {
+
+    static int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+    static NotePreviewConfigureActivity activity;
+
+    /**
+     * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
+     * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
+     * (aka React 18) with two boolean flags.
+     */
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new DefaultReactActivityDelegate(
+                this,
+                getMainComponentName(),
+                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+                DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
+                // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
+                DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
+        );
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(null);
+        Intent intent = getIntent();
+        Bundle extras = intent.getExtras();
+        int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+        if (extras != null) {
+            appWidgetId = extras.getInt(
+                    AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID);
+            NotePreviewConfigureActivity.appWidgetId = appWidgetId;
+        }
+        Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        setResult(Activity.RESULT_CANCELED, resultValue);
+        activity = this;
+    }
+
+    public static void saveAndFinish(Context context) {
+        if (NotePreviewConfigureActivity.activity == null || appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) return;
+        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+        NotePreviewWidget.updateAppWidget(context, appWidgetManager, appWidgetId);
+        Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        NotePreviewConfigureActivity.activity.setResult(RESULT_OK, resultValue);
+        NotePreviewConfigureActivity.activity.finish();
+    }
+
+    @Override
+    protected String getMainComponentName() {
+        return "NotePreviewConfigure";
+    }
+
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NotePreviewWidget.java
@@ -0,0 +1,75 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+import com.google.gson.Gson;
+import com.streetwriters.notesnook.datatypes.Note;
+
+
+public class NotePreviewWidget extends AppWidgetProvider {
+    static String OpenNoteId = "com.streetwriters.notesnook.OpenNoteId";
+    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
+                                int appWidgetId) {
+        String data = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
+        if (data.isEmpty()) {
+            return;
+        }
+        Gson gson = new Gson();
+        Note note = gson.fromJson(data, Note.class);
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+        views.setTextViewText(R.id.widget_title, note.getTitle());
+        views.setTextViewText(R.id.widget_body, note.getHeadline());
+
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.putExtra(OpenNoteId, note.getId());
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
+        intent.setData(Uri.parse("https://app.notesnook.com/open_note?id=" + note.getId()));
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
+
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+
+    @Override
+    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+    }
+
+    private static Bundle getActivityOptionsBundle() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            ActivityOptions activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            return activityOptions.toBundle();
+        } else
+            return null;
+    }
+
+    @Override
+    public void onDeleted(Context context, int[] appWidgetIds) {
+        super.onDeleted(context, appWidgetIds);
+        SharedPreferences.Editor edit = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).edit();
+        for (int id: appWidgetIds) {
+            edit.remove(String.valueOf(id));
+        }
+        edit.apply();
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // There may be multiple widgets active, so update all of them
+        for (int appWidgetId : appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId);
+        }
+    }
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/NoteWidget.java
@@ -0,0 +1,65 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+/**
+ * Implementation of App Widget functionality.
+ */
+public class NoteWidget extends AppWidgetProvider {
+
+    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
+                                int appWidgetId) {
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.new_note_widget);
+        setClickIntent(context, views);
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+
+    static void setClickIntent(Context context, RemoteViews views) {
+        Intent intent = new Intent(context, ShareActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        views.setOnClickPendingIntent(R.id.new_note, pendingIntent);
+    }
+
+    private static Bundle getActivityOptionsBundle() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            ActivityOptions activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            return activityOptions.toBundle();
+        } else
+            return null;
+    }
+
+    @Override
+    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+        updateAppWidget(context, appWidgetManager, appWidgetId, newOptions);
+    }
+
+    private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle options) {
+        int minWidth = options != null ? options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH) : 0;
+        int minHeight = options != null ? options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT) : 0;
+
+        int layoutId = (minWidth < 100) ? R.layout.new_note_widget_icon : R.layout.new_note_widget;
+
+        RemoteViews views = new RemoteViews(context.getPackageName(), layoutId);
+        setClickIntent(context, views);
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        for (int appWidgetId : appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId);
+        }
+    }
+}
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/OnClearFromRecentService.java
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
@@ -0,0 +1,242 @@
+package com.streetwriters.notesnook;
+
+import android.app.Activity;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.WindowManager;
+import android.widget.RemoteViews;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.google.gson.Gson;
+import com.streetwriters.notesnook.datatypes.Note;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+
+public class RCTNNativeModule extends ReactContextBaseJavaModule {
+    Intent lastIntent;
+    ReactContext mContext;
+    static String IntentType = "com.streetwriters.notesnook.IntentType";
+
+    public RCTNNativeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        mContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "NNativeModule";
+    }
+
+
+    @ReactMethod
+    public void setBackgroundColor(final String color) {
+        try {
+           getCurrentActivity().getWindow().getDecorView().setBackgroundColor(Color.parseColor(color));
+        } catch (Exception e) {
+
+        }
+    }
+
+    @ReactMethod
+    public void getActivityName(Promise promise) {
+        try {
+            promise.resolve(getCurrentActivity().getClass().getSimpleName());
+        } catch (Exception e) {
+            promise.resolve(null);
+        }
+    }
+
+    @ReactMethod
+    public void setSecureMode(final boolean mode) {
+        try {
+
+            getCurrentActivity().runOnUiThread(() -> {
+
+                try {
+                    if (mode)
+                        getCurrentActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                    else
+                        getCurrentActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                } catch (Exception e) {
+                }
+
+            });
+        } catch (Exception e) {
+
+        }
+    }
+
+    @ReactMethod
+    public void setAppState(final String appState) {
+        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = appStateDetails.edit();
+        edit.putString("appState", appState);
+        edit.apply();
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String getAppState() {
+        SharedPreferences appStateDetails = getReactApplicationContext().getSharedPreferences("appStateDetails", Context.MODE_PRIVATE);
+        String appStateValue = appStateDetails.getString("appState", "");
+        return appStateValue.isEmpty() ? null : appStateValue;
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public int getWidgetId() {
+        return NotePreviewConfigureActivity.appWidgetId;
+    }
+
+    @ReactMethod
+    public void setString(final String storeName, final String key, final String value) {
+        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = details.edit();
+        edit.putString(key, value);
+        edit.apply();
+    }
+
+    @ReactMethod
+    public void removeString(final String storeName, final String key) {
+        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = details.edit();
+        edit.remove(key);
+        edit.apply();
+    }
+
+    @ReactMethod
+    public void getString(final String storeName, final String key, Promise promise) {
+        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
+        String value = details.getString(key, "");
+        promise.resolve(value.isEmpty() ? null : value);
+    }
+
+    @ReactMethod
+    public void saveAndFinish() {
+        NotePreviewConfigureActivity.saveAndFinish(mContext);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public WritableMap getIntent() {
+        WritableMap map = Arguments.createMap();
+        if (getCurrentActivity() != null) {
+            Intent intent = getCurrentActivity().getIntent();
+            Bundle extras = getCurrentActivity().getIntent().getExtras();
+
+            if (extras != null && intent != lastIntent) {
+                lastIntent = intent;
+                if (Objects.equals(extras.getString(IntentType), "NewReminder")) {
+                    map.putString(ReminderWidgetProvider.NewReminder, extras.getString(ReminderWidgetProvider.NewReminder));
+                } else if (Objects.equals(extras.getString(IntentType), "OpenReminder")) {
+                    map.putString(ReminderViewsService.OpenReminderId, extras.getString(ReminderViewsService.OpenReminderId));
+                } else if (Objects.equals(extras.getString(IntentType), "OpenNote")) {
+                    map.putString(NotePreviewWidget.OpenNoteId, extras.getString(NotePreviewWidget.OpenNoteId));
+                }
+
+            }
+        }
+        return map;
+    }
+
+    @ReactMethod
+    public void cancelAndFinish() {
+        NotePreviewConfigureActivity.activity.setResult(Activity.RESULT_CANCELED);
+        NotePreviewConfigureActivity.activity.finish();
+    }
+
+    @ReactMethod
+    public void getWidgetNotes(Promise promise) {
+        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+        Map<String, ?> map = pref.getAll();
+        WritableArray arr = Arguments.createArray();
+        for(Map.Entry<String,?> entry : map.entrySet()){
+            if (entry.getKey().equals("remindersList")) continue;
+            String value = (String) entry.getValue();
+            Gson gson = new Gson();
+            Note note = gson.fromJson(value, Note.class);
+            arr.pushString(note.getId());
+        }
+        promise.resolve(arr);
+    }
+
+    @ReactMethod
+    public void hasWidgetNote(final String noteId, Promise promise) {
+        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+        Map<String, ?> map = pref.getAll();
+        boolean found = false;
+        for(Map.Entry<String,?> entry : map.entrySet()){
+            String value = (String) entry.getValue();
+            if (value.contains(noteId)) {
+                found = true;
+            }
+        }
+        promise.resolve(found);
+    }
+    @ReactMethod
+    public void updateWidgetNote(final String noteId, final String data) {
+        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+        Map<String, ?> map = pref.getAll();
+        SharedPreferences.Editor edit = pref.edit();
+        ArrayList<String> ids = new ArrayList<>();
+        for(Map.Entry<String,?> entry : map.entrySet()) {
+            String value = (String) entry.getValue();
+            if (value.contains(noteId)) {
+                edit.putString(entry.getKey(), data);
+                ids.add(entry.getKey());
+            }
+        }
+        edit.apply();
+        for (String id: ids) {
+            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), Integer.parseInt(id));
+        }
+    }
+
+    @ReactMethod
+    public void updateReminderWidget() {
+        AppWidgetManager wm = AppWidgetManager.getInstance(mContext);
+        int[] ids = wm.getAppWidgetIds(ComponentName.createRelative(mContext.getPackageName(), ReminderWidgetProvider.class.getName()));
+        for (int id: ids) {
+            Log.d("Reminders", "Updating" + id);
+            RemoteViews views = new RemoteViews(mContext.getPackageName(), R.layout.widget_reminders);
+            ReminderWidgetProvider.updateAppWidget(mContext, wm, id, views);
+            wm.notifyAppWidgetViewDataChanged(id, R.id.widget_list_view);
+        }
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public boolean isGestureNavigationEnabled() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            try {
+                String navBarMode = Settings.Secure.getString(
+                        mContext.getContentResolver(),
+                        "navigation_mode"
+                );
+                return "2".equals(navBarMode);
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+
+
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java
@@ -0,0 +1,106 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.RemoteViewsService;
+import android.content.Context;
+import android.widget.RemoteViews;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.streetwriters.notesnook.datatypes.Reminder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReminderViewsService extends RemoteViewsService {
+    static String OpenReminderId = "com.streetwriters.notesnook.OpenReminderId";
+    @Override
+    public RemoteViewsFactory onGetViewFactory(Intent intent) {
+        return new ReminderRemoteViewsFactory(this.getApplicationContext(), intent);
+    }
+}
+
+class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
+    private Context context;
+    private List<Reminder> reminders;
+
+    public ReminderRemoteViewsFactory(Context context, Intent intent) {
+        this.context = context;
+    }
+
+    @Override
+    public void onCreate() {
+        // Initialize reminders list
+        reminders = new ArrayList<Reminder>();
+    }
+
+    @Override
+    public void onDataSetChanged() {
+        reminders.clear();
+        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+        Gson gson = new Gson();
+        reminders = gson.fromJson(preferences.getString("remindersList","[]"), new TypeToken<List<Reminder>>(){}.getType());
+
+    }
+
+    @Override
+    public void onDestroy() {
+        reminders.clear();
+    }
+
+    @Override
+    public int getCount() {
+        return reminders.size();
+    }
+
+    @Override
+    public RemoteViews getViewAt(int position) {
+        Reminder reminder = reminders.get(position);
+
+        boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
+
+        RemoteViews views = new RemoteViews(context.getPackageName(), useMiniLayout ? R.layout.widget_reminder_layout_small :  R.layout.widget_reminder_layout);
+
+        views.setTextViewText(R.id.reminder_title, reminder.getTitle());
+        if (!useMiniLayout) {
+               views.setTextViewText(R.id.reminder_description, reminder.getDescription());
+        }
+        views.setTextViewText(R.id.reminder_time, reminder.getFormattedTime());
+        final Intent fillInIntent = new Intent();
+        final Bundle extras = new Bundle();
+        extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());
+        fillInIntent.setData(Uri.parse("https://app.notesnook.com/open_reminder?id=" + reminder.getId()));
+        fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
+        fillInIntent.putExtras(extras);
+        views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
+        return views;
+    }
+
+
+    @Override
+    public RemoteViews getLoadingView() {
+        return null;
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return 2;
+    }
+
+    @Override
+    public long getItemId(int position) {
+
+        return position;
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java
@@ -0,0 +1,56 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+public class ReminderWidgetProvider extends AppWidgetProvider {
+    static String NewReminder = "com.streetwriters.notesnook.NewReminder";
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        for (int appWidgetId : appWidgetIds) {
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_reminders);
+            updateAppWidget(context, appWidgetManager, appWidgetId, views);
+        }
+    }
+
+
+    private static Bundle getActivityOptionsBundle() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            ActivityOptions activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+            return activityOptions.toBundle();
+        } else
+            return null;
+    }
+
+    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, RemoteViews views) {
+        Intent listview_intent_template = new Intent(context, MainActivity.class);
+        listview_intent_template.setAction(Intent.ACTION_VIEW);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, getActivityOptionsBundle());
+        views.setPendingIntentTemplate(R.id.widget_list_view, pendingIntent);
+
+        Intent new_reminder_intent = new Intent(context, MainActivity.class);
+        new_reminder_intent.putExtra(NewReminder, NewReminder);
+        new_reminder_intent.setAction(Intent.ACTION_VIEW);
+        new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
+        new_reminder_intent.setData(Uri.parse("https://app.notesnook.com/new_reminder"));
+        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        views.setOnClickPendingIntent(R.id.add_button, pendingIntent2);
+
+        Intent list_remote_adapter_intent = new Intent(context, ReminderViewsService.class);
+        list_remote_adapter_intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        views.setRemoteAdapter(R.id.widget_list_view, list_remote_adapter_intent);
+        views.setEmptyView(R.id.widget_list_view, R.id.empty_view);
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+}
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareActivity.java
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/BaseItem.java
@@ -0,0 +1,92 @@
+package com.streetwriters.notesnook.datatypes;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class BaseItem {
+    private String id;
+    private String type;
+    private long dateModified;
+    private long dateCreated;
+    private Boolean migrated;
+    private Boolean remote;
+    private Boolean synced;
+    private Boolean deleted;
+    /**
+     * @deprecated only kept here for migration purposes
+     */
+    private Object deleteReason; // Assuming never can be represented as Object
+
+    // Getters and Setters
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public long getDateModified() {
+        return dateModified;
+    }
+
+    public void setDateModified(long dateModified) {
+        this.dateModified = dateModified;
+    }
+
+    public long getDateCreated() {
+        return dateCreated;
+    }
+
+    public void setDateCreated(long dateCreated) {
+        this.dateCreated = dateCreated;
+    }
+
+    public Boolean getMigrated() {
+        return migrated;
+    }
+
+    public void setMigrated(Boolean migrated) {
+        this.migrated = migrated;
+    }
+
+    public Boolean getRemote() {
+        return remote;
+    }
+
+    public void setRemote(Boolean remote) {
+        this.remote = remote;
+    }
+
+    public Boolean getSynced() {
+        return synced;
+    }
+
+    public void setSynced(Boolean synced) {
+        this.synced = synced;
+    }
+
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public Object getDeleteReason() {
+        return deleteReason;
+    }
+
+    public void setDeleteReason(Object deleteReason) {
+        this.deleteReason = deleteReason;
+    }
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Note.java
@@ -0,0 +1,125 @@
+package com.streetwriters.notesnook.datatypes;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class Note extends BaseItem {
+private String title;
+private String headline;
+private String contentId;
+private Boolean locked;
+private boolean pinned;
+private boolean favorite;
+private boolean localOnly;
+private boolean conflicted;
+private boolean readonly;
+private long dateEdited;
+private Object dateDeleted; // Assuming null can be represented as Object
+private Object itemType; // Assuming null can be represented as Object
+private Object deletedBy; // Assuming null can be represented as Object
+
+// Getters and Setters
+public String getTitle() {
+    return title;
+}
+
+public void setTitle(String title) {
+    this.title = title;
+}
+
+public String getHeadline() {
+    return headline;
+}
+
+public void setHeadline(String headline) {
+    this.headline = headline;
+}
+
+public String getContentId() {
+    return contentId;
+}
+
+public void setContentId(String contentId) {
+    this.contentId = contentId;
+}
+
+public Boolean getLocked() {
+    return locked;
+}
+
+public void setLocked(Boolean locked) {
+    this.locked = locked;
+}
+
+public boolean isPinned() {
+    return pinned;
+}
+
+public void setPinned(boolean pinned) {
+    this.pinned = pinned;
+}
+
+public boolean isFavorite() {
+    return favorite;
+}
+
+public void setFavorite(boolean favorite) {
+    this.favorite = favorite;
+}
+
+public boolean isLocalOnly() {
+    return localOnly;
+}
+
+public void setLocalOnly(boolean localOnly) {
+    this.localOnly = localOnly;
+}
+
+public boolean isConflicted() {
+    return conflicted;
+}
+
+public void setConflicted(boolean conflicted) {
+    this.conflicted = conflicted;
+}
+
+public boolean isReadonly() {
+    return readonly;
+}
+
+public void setReadonly(boolean readonly) {
+    this.readonly = readonly;
+}
+
+public long getDateEdited() {
+    return dateEdited;
+}
+
+public void setDateEdited(long dateEdited) {
+    this.dateEdited = dateEdited;
+}
+
+public Object getDateDeleted() {
+    return dateDeleted;
+}
+
+public void setDateDeleted(Object dateDeleted) {
+    this.dateDeleted = dateDeleted;
+}
+
+public Object getItemType() {
+    return itemType;
+}
+
+public void setItemType(Object itemType) {
+    this.itemType = itemType;
+}
+
+public Object getDeletedBy() {
+    return deletedBy;
+}
+
+public void setDeletedBy(Object deletedBy) {
+    this.deletedBy = deletedBy;
+}
+}
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java
@@ -0,0 +1,138 @@
+package com.streetwriters.notesnook.datatypes;
+
+import androidx.annotation.Keep;
+
+import java.util.concurrent.TimeUnit;
+
+@Keep
+public class Reminder extends BaseItem {
+    private String title;
+    private String description;
+    private String formattedTime;
+    private String priority; // "silent", "vibrate", "urgent"
+    private long date;
+    private String mode; // "repeat", "once", "permanent"
+    private String recurringMode; // "week", "month", "day", "year"
+    private int[] selectedDays;
+    private boolean localOnly;
+    private boolean disabled;
+    private long snoozeUntil;
+
+    // Getters and Setters
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getPriority() {
+        return priority;
+    }
+
+    public void setPriority(String priority) {
+        this.priority = priority;
+    }
+
+    public long getDate() {
+        return date;
+    }
+
+    public void setDate(long date) {
+        this.date = date;
+    }
+
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public String getRecurringMode() {
+        return recurringMode;
+    }
+
+    public void setRecurringMode(String recurringMode) {
+        this.recurringMode = recurringMode;
+    }
+
+    public int[] getSelectedDays() {
+        return selectedDays;
+    }
+
+    public void setSelectedDays(int[] selectedDays) {
+        this.selectedDays = selectedDays;
+    }
+
+    public boolean isLocalOnly() {
+        return localOnly;
+    }
+
+    public void setLocalOnly(boolean localOnly) {
+        this.localOnly = localOnly;
+    }
+
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    public long getSnoozeUntil() {
+        return snoozeUntil;
+    }
+
+    public void setSnoozeUntil(long snoozeUntil) {
+        this.snoozeUntil = snoozeUntil;
+    }
+
+    public String getFormattedTime() {
+        return formattedTime;
+    }
+
+    public void setFormattedTime(String formattedTime) {
+        this.formattedTime = formattedTime;
+    }
+
+    public String formatTime(long timeInMillis) {
+        long currentTime = System.currentTimeMillis();
+        long diff = timeInMillis - currentTime;
+
+        if (diff < TimeUnit.MINUTES.toMillis(1)) {
+            return "in " + (diff / 1000) + " seconds";
+        } else if (diff < TimeUnit.HOURS.toMillis(1)) {
+            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
+            return "in " + minutes + " minute" + (minutes > 1 ? "s" : "");
+        } else if (diff < TimeUnit.DAYS.toMillis(1)) {
+            long hours = TimeUnit.MILLISECONDS.toHours(diff);
+            return "in " + hours + " hour" + (hours > 1 ? "s" : "");
+        } else if (diff < TimeUnit.DAYS.toMillis(2)) {
+            return "tomorrow";
+        } else if (diff < TimeUnit.DAYS.toMillis(7)) {
+            long days = TimeUnit.MILLISECONDS.toDays(diff);
+            return "in " + days + " day" + (days > 1 ? "s" : "");
+        } else if (diff < TimeUnit.DAYS.toMillis(30)) {
+            long weeks = TimeUnit.MILLISECONDS.toDays(diff) / 7;
+            return "in " + weeks + " week" + (weeks > 1 ? "s" : "");
+        } else if (diff < TimeUnit.DAYS.toMillis(365)) {
+            long months = TimeUnit.MILLISECONDS.toDays(diff) / 30;
+            return "in " + months + " month" + (months > 1 ? "s" : "");
+        } else {
+            long years = TimeUnit.MILLISECONDS.toDays(diff) / 365;
+            return "in " + years + " year" + (years > 1 ? "s" : "");
+        }
+    }
+}
--- a/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_action_name.xml
+++ b/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_action_name.xml
--- a/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_newnote.xml
+++ b/apps/mobile/native/android/app/src/main/res/drawable-anydpi/ic_newnote.xml
--- a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_action_name.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_action_name.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_newnote.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_newnote.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-hdpi/ic_stat_name.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_action_name.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_action_name.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_newnote.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_newnote.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-mdpi/ic_stat_name.png
--- a/apps/mobile/native/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png
+++ b/apps/mobile/native/android/app/src/main/res/drawable-nodpi/example_appwidget_preview.png
--- a/Show More
+++ b/Show More