diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ee3a716a..8428758e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -98,6 +98,7 @@ jobs:
         run: |
           export PUB_CACHE=$HOME/.pub-cache
           flutter pub get
+          sed -i -e 's/-Wl,/-Wl,--build-id=none,/' ${PUB_CACHE}/hosted/*/jni-*/src/CMakeLists.txt
       - name: Setup Isar
         run: |
           sudo apt-get install -y tofrodos
@@ -138,7 +139,7 @@ jobs:
           custom_tag: ${{ needs.get_version.outputs.version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to GitHub releases
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           make_latest: true
           name: v${{ needs.get_version.outputs.version }}
diff --git a/.run/Generate files.run.xml b/.run/Generate files.run.xml
index 9879bd9b..ae87620c 100644
--- a/.run/Generate files.run.xml	
+++ b/.run/Generate files.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
     <configuration default="false" name="Generate files" type="ShConfigurationType">
-        <option name="SCRIPT_TEXT"
-                value="fvm dart run build_runner build --delete-conflicting-outputs" />
+        <option name="SCRIPT_TEXT" value="fvm dart run build_runner build" />
         <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
         <option name="SCRIPT_PATH" value="" />
         <option name="SCRIPT_OPTIONS" value="" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a790528c..8a8ff20a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.0.0 - 2026-07-09
+
+### Fixed
+
+- List of notes not updating when (un)deleting and (un)archiving notes
+- Rich text note not saving when toggling a checkbox and closing it
+
+### Miscellaneous
+
+- Reduce the APK size
+
 ## 2.1.5 - 2026-06-14
 
 ### Added
diff --git a/fastlane/metadata/android/en-US/changelogs/360.txt b/fastlane/metadata/android/en-US/changelogs/360.txt
new file mode 100644
index 00000000..f38e6c0a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/360.txt
@@ -0,0 +1,6 @@
+FIXED
+- List of notes not updating when (un)deleting and (un)archiving notes
+- Rich text note not saving when toggling a checkbox and closing it
+
+MISCELLANEOUS
+- Reduce the APK size
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/360.txt b/fastlane/metadata/android/fr-FR/changelogs/360.txt
new file mode 100644
index 00000000..50b882ba
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/360.txt
@@ -0,0 +1,6 @@
+CORRIGÉ
+- Les listes des notes ne se mettent pas correctement à jour lors de la suppression/restauration et l'archivage/désarchivage des notes
+- Les notes de textes riches ne s'enregistrent pas lorsque qu'une case à cocher est modifiée puis la note fermée
+
+DIVERS
+- Réduction de la taille de l'APK
\ No newline at end of file
diff --git a/lib/common/actions/backup.dart b/lib/common/actions/backup.dart
index 43e5ef28..1fad28f8 100644
--- a/lib/common/actions/backup.dart
+++ b/lib/common/actions/backup.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../../services/backup/auto_backup_service.dart';
@@ -7,6 +8,10 @@ import '../preferences/preference_key.dart';
 
 /// Requires the user to select a backup directory.
 Future<void> requireBackupDirectory(BuildContext context) async {
+  if (!kReleaseMode) {
+    return;
+  }
+
   final select = await showAdaptiveDialog<bool>(
     context: context,
     useRootNavigator: false,
diff --git a/lib/common/actions/notes/archive.dart b/lib/common/actions/notes/archive.dart
index 0f3cd55c..561cb288 100644
--- a/lib/common/actions/notes/archive.dart
+++ b/lib/common/actions/notes/archive.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../models/note/note.dart';
-import '../../../models/note/note_status.dart';
 import '../../../providers/notes/notes_provider.dart';
 import '../../../providers/notifiers/notifiers.dart';
 import '../../constants/constants.dart';
@@ -38,15 +37,16 @@ Future<bool> archiveNote(
 
   currentNoteNotifier.value = null;
 
-  final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
-      .setArchived([note], true);
+  final succeeded = await ref.read(notesProvider(status: note.status, label: currentLabelFilter).notifier).setArchived([
+    note,
+  ], true);
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_archived(1),
-      onCancel: (globalRef) async => await unarchiveNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await unarchiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -67,18 +67,19 @@ Future<bool> archiveNotes(BuildContext context, WidgetRef ref, {required List<No
   }
 
   final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
+      .read(notesProvider(status: notes.first.status, label: currentLabelFilter).notifier)
       .setArchived(notes, true);
 
   if (context.mounted) {
-    exitNotesSelectionMode(context, ref, notesStatus: NoteStatus.available);
+    exitNotesSelectionMode(context, ref, notesStatus: notes.first.status);
   }
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_archived(notes.length),
-      onCancel: (globalRef) async => await unarchiveNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await unarchiveNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 
diff --git a/lib/common/actions/notes/delete.dart b/lib/common/actions/notes/delete.dart
index 2d8813c6..53f0b4ab 100644
--- a/lib/common/actions/notes/delete.dart
+++ b/lib/common/actions/notes/delete.dart
@@ -41,17 +41,17 @@ Future<bool> deleteNote(
 
   final wasArchived = note.archived;
 
-  final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
-      .setDeleted([note], true);
+  final succeeded = await ref.read(notesProvider(status: note.status, label: currentLabelFilter).notifier).setDeleted([
+    note,
+  ], true);
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_deleted(1),
       onCancel: (globalRef) async => wasArchived
-          ? await archiveNote(context, globalRef, note: note, cancel: false)
-          : await restoreNote(context, globalRef, note: note, cancel: false),
+          ? await archiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false)
+          : await restoreNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -74,11 +74,11 @@ Future<bool> deleteNotes(BuildContext context, WidgetRef ref, {required List<Not
   final wereArchived = notes.first.archived;
 
   final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
+      .read(notesProvider(status: notes.first.status, label: currentLabelFilter).notifier)
       .setDeleted(notes, true);
 
   if (context.mounted) {
-    exitNotesSelectionMode(context, ref, notesStatus: NoteStatus.available);
+    exitNotesSelectionMode(context, ref, notesStatus: notes.first.status);
   }
 
   if (succeeded && cancel && context.mounted) {
@@ -86,8 +86,8 @@ Future<bool> deleteNotes(BuildContext context, WidgetRef ref, {required List<Not
       context,
       text: context.l.snack_bar_deleted(notes.length),
       onCancel: (globalRef) async => wereArchived
-          ? await archiveNotes(context, ref, notes: notes)
-          : await restoreNotes(context, globalRef, notes: notes, cancel: false),
+          ? await archiveNotes(rootNavigatorKey.currentContext!, ref, notes: notes)
+          : await restoreNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 
diff --git a/lib/common/actions/notes/restore.dart b/lib/common/actions/notes/restore.dart
index c62dfd65..1d71218a 100644
--- a/lib/common/actions/notes/restore.dart
+++ b/lib/common/actions/notes/restore.dart
@@ -44,7 +44,8 @@ Future<bool> restoreNote(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_restored(1),
-      onCancel: (globalRef) async => await deleteNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await deleteNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -74,7 +75,8 @@ Future<bool> restoreNotes(BuildContext context, WidgetRef ref, {required List<No
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_restored(notes.length),
-      onCancel: (globalRef) async => await deleteNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await deleteNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 
diff --git a/lib/common/actions/notes/unarchive.dart b/lib/common/actions/notes/unarchive.dart
index 25caa03c..d2a68f94 100644
--- a/lib/common/actions/notes/unarchive.dart
+++ b/lib/common/actions/notes/unarchive.dart
@@ -46,7 +46,8 @@ Future<bool> unarchiveNote(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_unarchived(1),
-      onCancel: (globalRef) async => await archiveNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await archiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -83,7 +84,8 @@ Future<bool> unarchiveNotes(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_unarchived(notes.length),
-      onCancel: (globalRef) async => await archiveNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await archiveNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 
diff --git a/lib/models/note/index/note_index.dart b/lib/models/note/index/note_index.dart
index 8e44aee3..9c4b6157 100644
--- a/lib/models/note/index/note_index.dart
+++ b/lib/models/note/index/note_index.dart
@@ -42,7 +42,7 @@ class NoteIndex {
     deleted: note.deleted,
     archived: note.archived,
     title: note.title,
-    content: note.plainText,
+    content: note.contentAsText,
     labels: note.labelsNamesVisibleSorted,
   );
 
diff --git a/lib/models/note/note.dart b/lib/models/note/note.dart
index 2dbd4c2c..af7584bb 100644
--- a/lib/models/note/note.dart
+++ b/lib/models/note/note.dart
@@ -115,7 +115,7 @@ sealed class Note implements Comparable<Note> {
 
   /// The content as plain text.
   @ignore
-  String get plainText;
+  String get contentAsText;
 
   /// The content as markdown.
   @ignore
@@ -131,11 +131,11 @@ sealed class Note implements Comparable<Note> {
 
   /// The number of words in the content.
   @ignore
-  int get wordsCount => _wordsCountRegex.allMatches(plainText).length;
+  int get wordsCount => _wordsCountRegex.allMatches(contentAsText).length;
 
   /// The number of characters in the content.
   @ignore
-  int get charactersCount => plainText.length;
+  int get charactersCount => contentAsText.length;
 
   /// Whether the title is empty.
   @ignore
@@ -185,6 +185,14 @@ sealed class Note implements Comparable<Note> {
   @ignore
   String get labelsAsMarkdown => '> ${labelsNamesVisibleSorted.join(', ')}';
 
+  /// The [title] indexed for full-text search.
+  @Index(type: IndexType.value, caseSensitive: false)
+  List<String> get titleIndexed => Isar.splitWords(title.toLowerCase());
+
+  /// The [contentAsText] indexed for full-text search.
+  @Index(type: IndexType.value, caseSensitive: false)
+  List<String> get contentIndexed => Isar.splitWords(contentAsText.toLowerCase());
+
   /// Notes are sorted according to:
   ///   1. Their pin state.
   ///   2. The sort method chosen by the user.
diff --git a/lib/models/note/types/checklist_note.dart b/lib/models/note/types/checklist_note.dart
index 680188c7..246ef58b 100644
--- a/lib/models/note/types/checklist_note.dart
+++ b/lib/models/note/types/checklist_note.dart
@@ -79,7 +79,7 @@ class ChecklistNote extends Note {
 
   @ignore
   @override
-  String get plainText {
+  String get contentAsText {
     StringBuffer plainText = StringBuffer();
 
     for (int index = 0; index < checkboxes.length; index++) {
@@ -109,7 +109,7 @@ class ChecklistNote extends Note {
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override
diff --git a/lib/models/note/types/markdown_note.dart b/lib/models/note/types/markdown_note.dart
index 47b779f7..371c518d 100644
--- a/lib/models/note/types/markdown_note.dart
+++ b/lib/models/note/types/markdown_note.dart
@@ -62,7 +62,7 @@ class MarkdownNote extends Note {
 
   @ignore
   @override
-  String get plainText => content.removeMarkdown();
+  String get contentAsText => content.removeMarkdown();
 
   @ignore
   @override
@@ -70,7 +70,7 @@ class MarkdownNote extends Note {
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override
diff --git a/lib/models/note/types/plain_text_note.dart b/lib/models/note/types/plain_text_note.dart
index 9828a1eb..ceb24af2 100644
--- a/lib/models/note/types/plain_text_note.dart
+++ b/lib/models/note/types/plain_text_note.dart
@@ -62,7 +62,7 @@ class PlainTextNote extends Note {
 
   @ignore
   @override
-  String get plainText => content;
+  String get contentAsText => content;
 
   @ignore
   @override
@@ -70,7 +70,7 @@ class PlainTextNote extends Note {
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override
diff --git a/lib/models/note/types/rich_text_note.dart b/lib/models/note/types/rich_text_note.dart
index 1447ee6e..a0e74086 100644
--- a/lib/models/note/types/rich_text_note.dart
+++ b/lib/models/note/types/rich_text_note.dart
@@ -95,7 +95,7 @@ class RichTextNote extends Note {
 
   @ignore
   @override
-  String get plainText => document.toPlainText();
+  String get contentAsText => document.toPlainText();
 
   @ignore
   @override
diff --git a/lib/pages/editor/widgets/editors/rich_text_editor.dart b/lib/pages/editor/widgets/editors/rich_text_editor.dart
index 30b2bf63..40cc6b0e 100644
--- a/lib/pages/editor/widgets/editors/rich_text_editor.dart
+++ b/lib/pages/editor/widgets/editors/rich_text_editor.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:fleather/fleather.dart';
@@ -44,6 +45,15 @@ class RichTextEditor extends ConsumerStatefulWidget {
 }
 
 class _RichTextEditorState extends ConsumerState<RichTextEditor> {
+  late StreamSubscription<ParchmentChange> changes;
+
+  @override
+  void initState() {
+    super.initState();
+
+    changes = widget.fleatherController.document.changes.listen((_) => onChanged());
+  }
+
   void onLaunchUrl(String? url) {
     if (url == null) {
       return;
@@ -68,13 +78,18 @@ class _RichTextEditorState extends ConsumerState<RichTextEditor> {
     ref.read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier).edit(note);
   }
 
+  @override
+  void dispose() {
+    changes.cancel();
+
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final useParagraphsSpacing = PreferenceKey.useParagraphsSpacing.preferenceOrDefault;
     final editorFont = Font.editorFromPreference();
 
-    widget.fleatherController.addListener(() => onChanged());
-
     final linkColor = Theme.brightnessOf(context) == Brightness.light ? Colors.blue[800] : Colors.blue[200];
 
     return Padding(
diff --git a/lib/providers/notes/notes_provider.dart b/lib/providers/notes/notes_provider.dart
index a390e761..a22fceb6 100644
--- a/lib/providers/notes/notes_provider.dart
+++ b/lib/providers/notes/notes_provider.dart
@@ -210,21 +210,19 @@ class Notes extends _$Notes {
       return false;
     }
 
-    final notes = (state.value ?? [])..removeWhere((note) => notesToSet.contains(note));
-
-    state = AsyncData(notes);
+    state = AsyncData(await get());
 
     _updateUnlabeledProvider();
-    _updateStatusProvider(archived ? NoteStatus.archived : NoteStatus.available);
+    _updateStatusProvider(NoteStatus.available);
+    _updateStatusProvider(NoteStatus.archived);
+    _updateStatusProvider(NoteStatus.deleted);
 
     return true;
   }
 
   /// Sets whether the [notesToSet] are deleted to [deleted] in the database.
   Future<bool> setDeleted(List<Note> notesToSet, bool deleted) async {
-    _checkStatus([NoteStatus.available, NoteStatus.deleted]);
-
-    final wereArchived = notesToSet.first.archived;
+    _checkStatus([NoteStatus.available, NoteStatus.archived, NoteStatus.deleted]);
 
     for (final note in notesToSet) {
       note.pinned = false;
@@ -241,16 +239,12 @@ class Notes extends _$Notes {
       return false;
     }
 
-    final notes = (state.value ?? [])..removeWhere((note) => notesToSet.contains(note));
-
-    state = AsyncData(notes);
+    state = AsyncData(await get());
 
     _updateUnlabeledProvider();
-    if (deleted) {
-      _updateStatusProvider(NoteStatus.deleted);
-    } else {
-      _updateStatusProvider(wereArchived ? NoteStatus.archived : NoteStatus.available);
-    }
+    _updateStatusProvider(NoteStatus.available);
+    _updateStatusProvider(NoteStatus.archived);
+    _updateStatusProvider(NoteStatus.deleted);
 
     return true;
   }
@@ -350,6 +344,10 @@ class Notes extends _$Notes {
 
   /// Updates the notes provider with the [status].
   void _updateStatusProvider(NoteStatus status) {
+    if (this.status == status) {
+      return;
+    }
+
     ref.read(notesProvider(status: status).notifier).get();
   }
 }
diff --git a/lib/services/database_service.dart b/lib/services/database_service.dart
index d06cd943..9ff7345b 100644
--- a/lib/services/database_service.dart
+++ b/lib/services/database_service.dart
@@ -1,6 +1,4 @@
-import 'package:flutter_mimir/flutter_mimir.dart';
 import 'package:isar_community/isar.dart';
-import 'package:mimir/mimir.dart';
 import 'package:path_provider/path_provider.dart';
 
 import '../models/deprecated/note.dart';
@@ -9,7 +7,6 @@ import '../models/note/note.dart';
 import 'bin/bin_service.dart';
 import 'labels/labels_service.dart';
 import 'migration/migration_service.dart';
-import 'notes/notes_index_service.dart';
 import 'notes/notes_service.dart';
 
 /// Abstract service for the database.
@@ -26,9 +23,6 @@ class DatabaseService {
   /// Isar database instance.
   late final Isar database;
 
-  /// Mimir index instance.
-  late final MimirInstance mimir;
-
   /// Ensures the service is initialized.
   Future<void> ensureInitialized() async {
     final databaseName = 'materialnotes';
@@ -41,12 +35,6 @@ class DatabaseService {
       directory: databaseDirectory,
     );
 
-    // Initialize mimir
-    mimir = await Mimir.defaultInstance;
-
-    // Initialize the indexes service
-    await NotesIndexService().ensureInitialized();
-
     // Initialize the models services
     await LabelsService().ensureInitialized();
     await NotesService().ensureInitialized();
diff --git a/lib/services/migration/migration_service.dart b/lib/services/migration/migration_service.dart
index f2d4f514..ac2e9859 100644
--- a/lib/services/migration/migration_service.dart
+++ b/lib/services/migration/migration_service.dart
@@ -5,13 +5,11 @@ import '../../common/preferences/preference_key.dart';
 import '../../models/deprecated/note.dart';
 import '../../models/note/note.dart';
 import '../database_service.dart';
-import '../notes/notes_index_service.dart';
 import '../notes/notes_service.dart';
 
 /// Database migration service.
 class MigrationService {
   final _databaseService = DatabaseService();
-  final _indexesService = NotesIndexService();
   final _notesService = NotesService();
 
   /// Migrates the database to the latest version if needed.
@@ -69,9 +67,6 @@ class MigrationService {
   ///
   /// Sets the new `id`, `archived` and `deletedTime` fields of each rich text note.
   Future<void> _migrateToV3() async {
-    // Clear the indexes to ensure their are rebuilt correctly
-    await _indexesService.clearIndexes();
-
     // Get the rich text notes
     final richTextNotes = await _databaseService.database.richTextNotes.where().findAll();
 
diff --git a/lib/services/notes/notes_index_service.dart b/lib/services/notes/notes_index_service.dart
deleted file mode 100644
index a6e3165a..00000000
--- a/lib/services/notes/notes_index_service.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:mimir/mimir.dart';
-
-import '../../common/constants/constants.dart';
-import '../../models/note/index/note_index.dart';
-import '../../models/note/note.dart';
-import '../database_service.dart';
-import 'notes_service.dart';
-
-/// Notes index service.
-///
-/// This class is a singleton.
-class NotesIndexService {
-  static final NotesIndexService _singleton = NotesIndexService._internal();
-
-  /// Notes index service.
-  factory NotesIndexService() => _singleton;
-
-  NotesIndexService._internal();
-
-  /// Notes index.
-  late final MimirIndex index;
-
-  /// Notes service.
-  late final NotesService _notesService;
-
-  /// Ensures the indexes service is initialized.
-  Future<void> ensureInitialized() async {
-    index = await DatabaseService().mimir.openIndex('notes', primaryKey: 'id', searchableFields: ['title', 'content']);
-
-    _notesService = NotesService();
-  }
-
-  /// Checks that each note has an index. If not, rebuilds the indexes.
-  Future<void> checkIndexes() async {
-    final notes = await _notesService.getAll();
-    final indexes = await index.getAllDocuments();
-
-    final notesIds = notes.map((note) => note.isarId).toList();
-    final indexesIds = indexes.map((index) => index['id'] as int).toList();
-
-    if (!notesIds.equals(indexesIds)) {
-      logger.i('Re-indexing all notes');
-
-      await clearIndexes();
-      await updateIndexes(await _notesService.getAll());
-    }
-  }
-
-  /// Updates the indexes of the [notes].
-  Future<void> updateIndexes(List<Note> notes) async {
-    final documents = notes.map((note) => NoteIndex.fromNote(note).toJson()).toList();
-    await index.addDocuments(documents);
-  }
-
-  /// Deletes the indexes of the [notes].
-  Future<void> deleteIndexes(List<Note> notes) async {
-    final notesIds = notes.map((note) => note.id).toList();
-    await index.deleteDocuments(notesIds);
-  }
-
-  /// Deletes all the indexes.
-  Future<void> clearIndexes() async {
-    await index.deleteAllDocuments();
-  }
-}
diff --git a/lib/services/notes/notes_service.dart b/lib/services/notes/notes_service.dart
index 17cfe75f..8d7d2759 100644
--- a/lib/services/notes/notes_service.dart
+++ b/lib/services/notes/notes_service.dart
@@ -1,6 +1,5 @@
 import 'package:is_first_run/is_first_run.dart';
 import 'package:isar_community/isar.dart';
-import 'package:mimir/mimir.dart';
 
 import '../../common/constants/constants.dart';
 import '../../common/constants/environment.dart';
@@ -10,7 +9,6 @@ import '../../models/label/label.dart';
 import '../../models/note/note.dart';
 import '../../models/note/note_status.dart';
 import '../database_service.dart';
-import 'notes_index_service.dart';
 
 /// Service for the notes database.
 ///
@@ -30,8 +28,6 @@ class NotesService {
   late final IsarCollection<RichTextNote> _richTextNotes;
   late final IsarCollection<ChecklistNote> _checklistNotes;
 
-  late final NotesIndexService _indexesService;
-
   /// Ensures the notes service is initialized.
   Future<void> ensureInitialized() async {
     _database = DatabaseService().database;
@@ -41,11 +37,6 @@ class NotesService {
     _richTextNotes = DatabaseService().database.richTextNotes;
     _checklistNotes = DatabaseService().database.checklistNotes;
 
-    _indexesService = NotesIndexService();
-
-    // Check that the notes are correctly indexed
-    await _indexesService.checkIndexes();
-
     // If the app runs with the 'SCREENSHOTS' environment parameter,
     // clear all the notes and add the notes for the screenshots
     if (Environment.screenshots) {
@@ -152,30 +143,57 @@ class NotesService {
   ///
   /// If [label] is set, the search should be performed on the notes that have that label.
   Future<List<Note>> search(String search, NoteStatus notesStatus, String? label) async {
-    final searchFilter = Mimir.and([
-      ...switch (notesStatus) {
-        NoteStatus.available => [
-          Mimir.where('deleted', isEqualTo: false.toString()),
-          Mimir.where('archived', isEqualTo: false.toString()),
-        ],
-        NoteStatus.archived => [Mimir.where('archived', isEqualTo: (true).toString())],
-        NoteStatus.deleted => [Mimir.where('deleted', isEqualTo: (true).toString())],
-      },
-      if (label != null) Mimir.where('labels', containsAtLeastOneOf: [label]),
-    ]);
-
-    final searchResults = await _indexesService.index.search(query: search, filter: searchFilter);
-
-    final notesIds = searchResults.map((noteIndex) => noteIndex['id'] as int).toList();
-    final notes = (await getAllByIds(notesIds));
-
-    // Check that all search results correspond to an existing note
-    if (notesIds.length != notes.length) {
-      final cases = notesIds.length - notes.length;
-      logger.w('Some notes search results have an ID that does not correspond to an existing note ($cases cases)');
-    }
+    final searchWords = Isar.splitWords(search.toLowerCase());
 
-    return notes;
+    final statusArchivedFilter = notesStatus == NoteStatus.archived;
+    final statusDeletedFilter = notesStatus == NoteStatus.deleted;
+
+    return [
+      ...await (_plainTextNotes
+          .filter()
+          .archivedEqualTo(statusArchivedFilter)
+          .deletedEqualTo(statusDeletedFilter)
+          .optional(label != null, (q) => q.labels((q2) => q2.nameEqualTo(label!)))
+          .allOf<String, PlainTextNote>(
+            searchWords,
+            (q, word) =>
+                q.group((q2) => q2.titleIndexedElementStartsWith(word).or().contentIndexedElementStartsWith(word)),
+          )
+          .findAll()),
+      ...await (_markdownNotes
+          .filter()
+          .archivedEqualTo(statusArchivedFilter)
+          .deletedEqualTo(statusDeletedFilter)
+          .optional(label != null, (q) => q.labels((q2) => q2.nameEqualTo(label!)))
+          .allOf<String, MarkdownNote>(
+            searchWords,
+            (q, word) =>
+                q.group((q2) => q2.titleIndexedElementStartsWith(word).or().contentIndexedElementStartsWith(word)),
+          )
+          .findAll()),
+      ...await (_richTextNotes
+          .filter()
+          .archivedEqualTo(statusArchivedFilter)
+          .deletedEqualTo(statusDeletedFilter)
+          .optional(label != null, (q) => q.labels((q2) => q2.nameEqualTo(label!)))
+          .allOf<String, RichTextNote>(
+            searchWords,
+            (q, word) =>
+                q.group((q2) => q2.titleIndexedElementStartsWith(word).or().contentIndexedElementStartsWith(word)),
+          )
+          .findAll()),
+      ...await (_checklistNotes
+          .filter()
+          .archivedEqualTo(statusArchivedFilter)
+          .deletedEqualTo(statusDeletedFilter)
+          .optional(label != null, (q) => q.labels((q2) => q2.nameEqualTo(label!)))
+          .allOf<String, ChecklistNote>(
+            searchWords,
+            (q, word) =>
+                q.group((q2) => q2.titleIndexedElementStartsWith(word).or().contentIndexedElementStartsWith(word)),
+          )
+          .findAll()),
+    ];
   }
 
   /// Puts the [note] in the database.
@@ -192,8 +210,6 @@ class NotesService {
           await _checklistNotes.put(note);
       }
     });
-
-    await _indexesService.updateIndexes([note]);
   }
 
   /// Puts the [notes] in the database.
@@ -209,8 +225,6 @@ class NotesService {
       await _richTextNotes.putAll(richTextNotes);
       await _checklistNotes.putAll(checklistNotes);
     });
-
-    await _indexesService.updateIndexes(notes);
   }
 
   /// Updates the [note] with the [labels] in the database.
@@ -220,8 +234,6 @@ class NotesService {
       note.labels.addAll(labels);
       await note.labels.save();
     });
-
-    await _indexesService.updateIndexes([note]);
   }
 
   /// Updates the [note] with the added [labels] in the database.
@@ -232,8 +244,6 @@ class NotesService {
         await note.labels.save();
       }
     });
-
-    await _indexesService.updateIndexes(notes);
   }
 
   /// Updates the [notes] with their corresponding [notesLabels] in the database.
@@ -253,8 +263,6 @@ class NotesService {
         await note.labels.save();
       }
     });
-
-    await _indexesService.updateIndexes(notes);
   }
 
   /// Deletes the [note] from the database.
@@ -271,8 +279,6 @@ class NotesService {
           await _checklistNotes.delete(note.isarId);
       }
     });
-
-    await _indexesService.deleteIndexes([note]);
   }
 
   /// Deletes the [notes] from the database.
@@ -288,22 +294,16 @@ class NotesService {
       await _richTextNotes.deleteAll(richTextNotesIds);
       await _checklistNotes.deleteAll(checklistNotesIds);
     });
-
-    await _indexesService.deleteIndexes(notes);
   }
 
   /// Deletes all the deleted notes from the database.
   Future<void> emptyBin() async {
-    final notes = await getAllDeleted();
-
     await _database.writeTxn(() async {
       await _plainTextNotes.where().deletedEqualTo(true).deleteAll();
       await _markdownNotes.where().deletedEqualTo(true).deleteAll();
       await _richTextNotes.where().deletedEqualTo(true).deleteAll();
       await _checklistNotes.where().deletedEqualTo(true).deleteAll();
     });
-
-    await _indexesService.deleteIndexes(notes);
   }
 
   /// Deletes all the notes from the database.
@@ -314,8 +314,6 @@ class NotesService {
       await _richTextNotes.clear();
       await _checklistNotes.clear();
     });
-
-    await _indexesService.index.deleteAllDocuments();
   }
 
   /// Deletes all the notes from the bin that have been deleted for longer than [delay].
diff --git a/pubspec.lock b/pubspec.lock
index a0a3edb2..2bf295f7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -109,34 +109,34 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10
+      sha256: "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "4.0.7"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71"
+      sha256: f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
+      sha256: fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.1.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6"
+      sha256: "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16"
       url: "https://pub.dev"
     source: hosted
-    version: "2.15.0"
+    version: "2.15.1"
   build_verify:
     dependency: "direct dev"
     description:
@@ -205,10 +205,10 @@ packages:
     dependency: transitive
     description:
       name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
+      sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.2.1"
   code_builder:
     dependency: transitive
     description:
@@ -261,10 +261,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
+      sha256: "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.5+2"
+    version: "0.3.5+4"
   crypto:
     dependency: transitive
     description:
@@ -309,10 +309,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65"
+      sha256: "0891702f96b2e465fe567b7ec448380e6b1c14f60af552a8536d9f583b6b8442"
       url: "https://pub.dev"
     source: hosted
-    version: "13.1.0"
+    version: "13.2.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -349,10 +349,10 @@ packages:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
+      sha256: "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
   fake_async:
     dependency: transitive
     description:
@@ -487,18 +487,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown_plus
-      sha256: "039177906850278e8fb1cd364115ee0a46281135932fa8ecea8455522166d2de"
+      sha256: "2e4b667a75c08e5710866ae010da392acf5af475f9ad0be9bf406525e9751b0c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.7"
-  flutter_mimir:
-    dependency: "direct main"
-    description:
-      name: flutter_mimir
-      sha256: e33eb20d666a15a3db74cd70496fc19877136345744f520714da3718b282673a
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0+5"
+    version: "1.0.11"
   flutter_native_splash:
     dependency: "direct main"
     description:
@@ -641,10 +633,10 @@ packages:
     dependency: transitive
     description:
       name: hooks
-      sha256: "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e"
+      sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.2"
   html:
     dependency: transitive
     description:
@@ -681,10 +673,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce
+      sha256: "6300175e00616bbc832e2fc91bfa4d776af5402c81c7151bee6905bb08473c52"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.9.1"
   intl:
     dependency: "direct main"
     description:
@@ -817,18 +809,18 @@ packages:
     dependency: "direct main"
     description:
       name: local_auth
-      sha256: ae6f382f638108c6becd134318d7c3f0a93875383a54010f61d7c97ac05d5137
+      sha256: ecf24edf2283c509ecd217e3595f6f71034b68888d28ad1dae6bfa0857b816ac
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   local_auth_android:
     dependency: transitive
     description:
       name: local_auth_android
-      sha256: b201c006fa769c23386f89aa6837ec0eb8179fcfb212eadcf87b422b3f9a6a78
+      sha256: fdb936d59ab945c7af297defd67bd1ed87b11b6db1bc16d01e94677a8f1c38ec
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.9"
   local_auth_darwin:
     dependency: transitive
     description:
@@ -905,10 +897,10 @@ packages:
     dependency: "direct main"
     description:
       name: material_symbols_icons
-      sha256: "10a74aaa9e566c92f8aa14809d2dd78156fb93743348ebffec0345c38eb35706"
+      sha256: "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2928.1"
+    version: "4.2951.0"
   meta:
     dependency: transitive
     description:
@@ -925,14 +917,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
-  mimir:
-    dependency: "direct main"
-    description:
-      name: mimir
-      sha256: "1568c5cac672212d0ebb839331306b46b2d8f366af898b123fde1a6c9aef2877"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+2"
   mockito:
     dependency: transitive
     description:
@@ -941,22 +925,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.6.4"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.6"
-  native_toolchain_rust:
-    dependency: transitive
-    description:
-      name: native_toolchain_rust
-      sha256: "26d4dcae954328af4ebfa8fc56cca0bf74b9ae8b4a6132de5da2071ac3d237b3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
   node_preamble:
     dependency: transitive
     description:
@@ -969,10 +937,10 @@ packages:
     dependency: transitive
     description:
       name: objective_c
-      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
+      sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed"
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.0"
+    version: "9.4.1"
   package_config:
     dependency: transitive
     description:
@@ -985,10 +953,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852"
+      sha256: f5c435dc0e0d461e5b32471a870f769b6a1cc46930637efe24fbc535314e78ad
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.2.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1025,10 +993,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
   path_provider_android:
     dependency: transitive
     description:
@@ -1049,18 +1017,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_windows:
     dependency: transitive
     description:
@@ -1117,14 +1085,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.5.0"
-  protobuf:
-    dependency: transitive
-    description:
-      name: protobuf
-      sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
   pub_semver:
     dependency: transitive
     description:
@@ -1153,10 +1113,10 @@ packages:
     dependency: transitive
     description:
       name: quick_actions_android
-      sha256: "6fbdda87fbedd0602b91f35d870c2cbcb6d053bc863efb76c6e7f60f1d8e3fd6"
+      sha256: af50d52d882a0f520c4be082636b5177b3de239bd468857d5da0b5a6eec61e07
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.30"
+    version: "1.0.32"
   quick_actions_ios:
     dependency: transitive
     description:
@@ -1281,10 +1241,10 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0
+      sha256: "9eee8283462d91a7a1c8bdb67d08874abd75a2f8fae3bc0ca033035e375fb3d8"
       url: "https://pub.dev"
     source: hosted
-    version: "13.1.0"
+    version: "13.2.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
@@ -1305,10 +1265,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53
+      sha256: "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.23"
+    version: "2.4.26"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1530,14 +1490,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.6"
-  toml:
-    dependency: transitive
-    description:
-      name: toml
-      sha256: "35a35f782228656a2af31e8c73d1353cc4ef3d683fd68af1111b44631879c05e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.18.0"
   typed_data:
     dependency: transitive
     description:
@@ -1566,10 +1518,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c"
+      sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.30"
+    version: "6.3.32"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1710,10 +1662,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
+      sha256: "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4"
       url: "https://pub.dev"
     source: hosted
-    version: "6.6.1"
+    version: "7.0.1"
   xxh3:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 9e8be7f4..f2395072 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ repository: https://github.com/maelchiotti/LocalMaterialNotes
 
 publish_to: none
 
-version: 2.1.5+35
+version: 2.2.0+36
 
 environment:
   sdk: ^3.12.0
@@ -32,7 +32,6 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_markdown_plus: ^1.0.7
-  flutter_mimir: ^0.2.0+5
   flutter_native_splash: ^2.4.8
   flutter_riverpod: ^3.3.1
   flutter_secure_storage: ^10.3.1
@@ -50,7 +49,6 @@ dependencies:
   logger: ^2.7.0
   markdown: ^7.3.1
   material_symbols_icons: ^4.2928.1
-  mimir: ^0.2.1+2
   package_info_plus: ^10.1.0
   parchment: any
   parchment_delta: any