Temp

2024-07-08 19:51:47 +02:00
393 changed files with 2289 additions and 7982 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 max_line_length = 120
 trim_trailing_whitespace = true

-[{*.har,*.json,*yml,*.sh}]
+[{*.har,*.json,*yml}]
 indent_size = 2

 [*.kt]
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -2,7 +2,7 @@ name: FlorisBoard CI

 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
    paths-ignore:
      - ".github/ISSUE_TEMPLATE/**"
      - ".github/FUNDING.yml"
@@ -14,28 +14,31 @@ on:
      - "README.md"
      - "ROADMAP.md"
  pull_request:
-    branches: [ main ]
+    branches: [ master ]

 jobs:
  build:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          submodules: recursive

-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/wrapper-validation-action@v1
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
          java-version: 17
          distribution: temurin
+          cache: gradle
      - name: Set up CMake and Ninja
        uses: lukka/get-cmake@latest
      - name: Build with Gradle
-        run: ./gradlew clean assembleDebug
-      - uses: actions/upload-artifact@v4
+        # MUST call gradlew separately because of an OSS license plugin issue.
+        # See https://github.com/google/play-services-plugins/issues/199
+        run: ./gradlew clean && ./gradlew assembleDebug
+      - uses: actions/upload-artifact@v3
        with:
          name: app-debug.apk
          path: app/build/outputs/apk/debug/app-debug.apk
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -2,7 +2,7 @@ name: Crowdin Upload Sources

 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
    paths:
      - "app/src/main/res/values/strings.xml"
      - ".github/workflows/crowdin-upload.yml"
@@ -13,9 +13,9 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
      - name: Upload
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@1.4.0
        with:
          config: "crowdin.yml"
          upload_sources: true
--- a/.github/workflows/validate-strings-no-translations.yml
+++ b/.github/workflows/validate-strings-no-translations.yml
@@ -1,61 +0,0 @@
-name: Validate no translated strings.xml included
-
-on:
-  pull_request_target:
-    branches: [ main ]
-
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Precheck if validation is required
-        id: precheck
-        run: |
-          pr_author="${{ github.event.pull_request.user.login }}"
-          if [[ "$pr_author" == "florisboard-bot" ]]; then
-            echo "PR is by florisboard-bot, skipping validation!"
-            echo "require_validation=false" >> "$GITHUB_OUTPUT"
-          else
-            echo "PR is not by florisboard-bot, requiring validation!"
-            echo "require_validation=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Fetch PR changed files manually
-        id: fetch_changed_files
-        if: steps.precheck.outputs.require_validation == 'true'
-        run: |
-          pr_files="$(curl -sSf https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files?per_page=1000)" || exit 11
-          changed_files="$(jq -r '.[].filename' <<< "$pr_files")" || exit 12
-          illegal_changes_list="$(grep -E '^app/src/main/res/values-.+/strings.xml$' <<< "$changed_files")" || true
-          if [ -n "$illegal_changes_list" ]; then
-            echo -e "Illegal changes detected:\n$illegal_changes_list"
-          else
-            echo "No illegal changes detected"
-          fi
-          echo "illegal_changes_list<<EOF" >> "$GITHUB_OUTPUT"
-          echo "$illegal_changes_list" >> "$GITHUB_OUTPUT"
-          echo "EOF" >> "$GITHUB_OUTPUT"
-
-      - name: Create comment if illegal files detected
-        uses: peter-evans/create-or-update-comment@v4
-        if: steps.precheck.outputs.require_validation == 'true' && steps.fetch_changed_files.outputs.illegal_changes_list != ''
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            ⚠️ Illegal changes detected
-
-            Hey there!
-
-            We detected illegal changes that disobey the [contribution guidelines](https://github.com/florisboard/florisboard/blob/main/CONTRIBUTING.md#translation). This is a kind reminder that pull requests must not contain translated `strings.xml` files, as those are exclusively managed from Crowdin.
-
-            Please remove changes to the following files:
-            ```
-            ${{ steps.fetch_changed_files.outputs.illegal_changes_list }}
-            ```
-
-      - name: Fail workflow if illegal files detected
-        if: steps.precheck.outputs.require_validation == 'true' && steps.fetch_changed_files.outputs.illegal_changes_list != ''
-        run: echo -e "Illegal changes detected:\n${{ steps.fetch_changed_files.outputs.illegal_changes_list }}" && exit 1
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 # Built application files
 *.apk
-*.aab
 *.ap_

-# dotenv
-.env
-
 # Files for the ART/Dalvik VM
 *.dex

@@ -40,7 +36,6 @@ captures/
 # Intellij
 *.iml
 .idea/
-!/.idea/copyright/

 # Keystore files
 *.jks
@@ -59,5 +54,6 @@ result
 # Rust
 debug/
 target/
+Cargo.lock
 **/*.rs.bk
 *.pdb
--- a/.idea/copyright/copyright.xml
+++ b/.idea/copyright/copyright.xml
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright (C) &amp;#36;originalComment.match(&quot;Copyright \(C\) (\d+)&quot;, 1, &quot;-&quot;, &quot;&amp;#36;today.year&quot;)&amp;#36;today.year The FlorisBoard Contributors&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="myName" value="copyright" />
-  </copyright>
-</component>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,15 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="copyright">
-    <module2copyright>
-      <element module="Project Files" copyright="copyright" />
-    </module2copyright>
-    <LanguageOptions name="Shell Script">
-      <option name="fileTypeOverride" value="1" />
-    </LanguageOptions>
-    <LanguageOptions name="XML">
-      <option name="fileTypeOverride" value="1" />
-      <option name="prefixLines" value="false" />
-    </LanguageOptions>
-    <LanguageOptions name="__TEMPLATE__" />
-  </settings>
-</component>
--- a/2
+++ b/2
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2020-2025 The FlorisBoard Contributors
+   Copyright 2020 Patrick Goldinger

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -1,19 +1,21 @@
 <img align="left" width="80" height="80"
 src=".github/repo_icon.png" alt="App icon">

-# FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) [![Matrix badge](https://img.shields.io/badge/chat-%23florisboard%3amatrix.org-blue)](https://matrix.to/#/#florisboard:matrix.org) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) [![FlorisBoard CI](https://github.com/florisboard/florisboard/actions/workflows/android.yml/badge.svg?event=push)](https://github.com/florisboard/florisboard/actions/workflows/android.yml)
+# FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) [![Matrix badge](https://img.shields.io/badge/chat-%23florisboard%3amatrix.org-blue)](https://matrix.to/#/#florisboard:matrix.org) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) ![FlorisBoard CI](https://github.com/florisboard/florisboard/workflows/FlorisBoard%20CI/badge.svg?event=push)

 **FlorisBoard** is a free and open-source keyboard for Android 7.0+
 devices. It aims at being modern, user-friendly and customizable while
 fully respecting your privacy. Currently in early-beta state.

+*Note: Due to various reasons development has been quite stuck in the past year, but things are slowly improving again and new releases/features will follow in the near future, please see the [roadmap](ROADMAP.md) for details!*
+
 <table>
 <tr>
 <th align="center" width="50%">
-<h3>Stable <a href="https://github.com/florisboard/florisboard/releases/latest"><img alt="Latest stable release" src="https://img.shields.io/github/v/release/florisboard/florisboard?sort=semver&display_name=tag&color=28a745"></a></h3>
+<h3>Stable <a href="https://github.com/florisboard/florisboard/releases/latest"><img alt="Latest stable release" src="https://img.shields.io/github/v/release/florisboard/florisboard"></a></h3>
 </th>
 <th align="center" width="50%">
-<h3>Preview <a href="https://github.com/florisboard/florisboard/releases"><img alt="Latest preview release" src="https://img.shields.io/github/v/release/florisboard/florisboard?include_prereleases&sort=semver&display_name=tag&color=fd7e14"></a></h3>
+<h3>Beta <a href="https://github.com/florisboard/florisboard/releases"><img alt="Latest beta release" src="https://img.shields.io/github/v/release/florisboard/florisboard?include_prereleases"></a></h3>
 </th>
 </tr>
 <tr>
@@ -21,7 +23,7 @@ fully respecting your privacy. Currently in early-beta state.
 <p><i>Major versions only</i><br><br>Updates are more polished, new features are matured and tested through to ensure a stable experience.</p>
 </td>
 <td valign="top">
-<p><i>Major + Alpha/Beta/Rc versions</i><br><br>Updates contain new features that may not be fully matured yet and bugs are more likely to occur. Allows you to give early feedback.</p>
+<p><i>Alpha/Beta versions</i><br><br>Updates contain new features that may not be fully matured yet and bugs are more likely to occur. Allows you to give early feedback.</p>
 </td>
 </tr>
 <tr>
@@ -34,11 +36,6 @@ fully respecting your privacy. Currently in early-beta state.
 </p>
 <p>

-**Obtainium**: [Auto-import stable config][obtainium_stable]
-
-</p>
-<p>
-
 **Manual**: Download and install the APK from the release page.

 </p>
@@ -47,12 +44,7 @@ fully respecting your privacy. Currently in early-beta state.
 <p><a href="https://apt.izzysoft.de/fdroid/index/apk/dev.patrickgold.florisboard.beta"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="64" alt="IzzySoft repo badge"></a></p>
 <p>

-**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-public-alpha-test), then visit the [preview testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard.beta). Once joined and installed, updates will be delivered like for any other app. ([Store entry](https://play.google.com/store/apps/details?id=dev.patrickgold.florisboard.beta))
-
-</p>
-<p>
-
-**Obtainium**: [Auto-import preview config][obtainium_preview]
+**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-public-alpha-test), then visit the [beta testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard.beta). Once joined and installed, updates will be delivered like for any other app. ([Store entry](https://play.google.com/store/apps/details?id=dev.patrickgold.florisboard.beta))

 </p>
 <p>
@@ -64,17 +56,16 @@ fully respecting your privacy. Currently in early-beta state.
 </tr>
 </table>

+Beginning with v0.4.0 FlorisBoard will follow [SemVer](https://semver.org/#summary) versioning scheme.
 Beginning with v0.6.0 FlorisBoard will enter the public beta on Google Play.

 ## Highlighted features
 - Integrated clipboard manager / history
 - Advanced theming support and customization
 - Integrated extension support (still evolving)
- Emoji keyboard / history / suggestions
+- Emoji keyboard

-> [!IMPORTANT]
-> Word suggestions/spell checking are not included in the current releases
-> and are a major goal for the v0.5 milestone.
+Word suggestions/spell checking are not included in the current releases and are a major goal for the v0.5.0 milestone.

 Feature roadmap: See [ROADMAP.md](ROADMAP.md)

@@ -82,16 +73,6 @@ Feature roadmap: See [ROADMAP.md](ROADMAP.md)
 Want to contribute to FlorisBoard? That's great to hear! There are lots of
 different ways to help out, please see the [contribution guidelines](CONTRIBUTING.md) for more info.

-## Addons Store
-The official [Addons Store](https://beta.addons.florisboard.org) offers the possibility for the community to share and download FlorisBoard extensions.
-Instructions on how to publish addons can be found [here](https://github.com/florisboard/florisboard/wiki/How-to-publish-on-FlorisBoard-Addons).
-
-Many thanks to Ali ([@4H1R](https://github.com/4H1R)) for implementing the store!
-
-> [!NOTE]
-> During the initial beta release phase, the Addons Store _will_ only accept theme extensions.
-> Later on we plan to add support for language packs and keyboard extensions.
-
 ## List of permissions FlorisBoard requests
 Please refer to this [page](https://github.com/florisboard/florisboard/wiki/List-of-permissions-FlorisBoard-requests)
 to get more information on this topic.
@@ -99,6 +80,8 @@ to get more information on this topic.
 ## Used libraries, components and icons
 * [AndroidX libraries](https://github.com/androidx/androidx) by
  [Android Jetpack](https://github.com/androidx)
+* [Accompanist Compose UI libraries](https://github.com/google/accompanist/) by
+  [Google](https://github.com/google)
 * [AboutLibraries](https://github.com/mikepenz/AboutLibraries) by
  [mikepenz](https://github.com/mikepenz)
 * [Google Material icons](https://github.com/google/material-design-icons) by
@@ -109,12 +92,14 @@ to get more information on this topic.
  [Kotlin](https://github.com/Kotlin)
 * [KotlinX serialization library](https://github.com/Kotlin/kotlinx.serialization) by
  [Kotlin](https://github.com/Kotlin)
+* [ICU4C](https://github.com/unicode-org/icu) by
+  [The Unicode Consortium](https://github.com/unicode-org)

 Many thanks to [Nikolay Anzarov](https://www.behance.net/nikolayanzarov) ([@BloodRaven0](https://github.com/BloodRaven0)) for designing and providing the main app icons to this project!

 ## License
 ```
-Copyright 2020-2025 The FlorisBoard Contributors
+Copyright 2020-2024 Patrick Goldinger

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -128,12 +113,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
-
-Thanks to [The FlorisBoard Contributors](https://github.com/florisboard/florisboard/graphs/contributors) for making this project possible!
-
-<!-- BEGIN SECTION: obtainium_links -->
-<!-- auto-generated link templates, do NOT edit by hand -->
-<!-- see fastlane/update-readme.sh -->
-[obtainium_preview]: https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://app/%7B%22id%22%3A%22dev.patrickgold.florisboard.beta%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fflorisboard%2Fflorisboard%22%2C%22author%22%3A%22florisboard%22%2C%22name%22%3A%22FlorisBoard%20Preview%22%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22preview%5C%22%7D%22%7D%0A
-[obtainium_stable]: https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://app/%7B%22id%22%3A%22dev.patrickgold.florisboard%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fflorisboard%2Fflorisboard%22%2C%22author%22%3A%22florisboard%22%2C%22name%22%3A%22FlorisBoard%20Stable%22%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22stable%5C%22%7D%22%7D%0A
-<!-- END SECTION: obtainium_links -->
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,24 @@

 This feature roadmap intents to provide transparency to what is planned to be added to FlorisBoard in the foreseeable future. Note that there are no ETAs for any version milestones down below, experience has shown these won't hold anyways.

-Each major milestone has associated alpha/beta releases, so if you are interested in previewing features quicker, keep an eye out! Each major 0.x release has also patch releases after the initial major release, which will be published on both the stable and preview tracks.
+Each major milestone has associated alpha/beta releases, so if you are interested in previewing features quicker, keep an eye out! Each major 0.x release has also patch releases after the initial major release, which will be published on both the stable and beta tracks.
+
+## 0.4
+
+**Main focus**: Getting the project back on track, see [this announcement](https://github.com/florisboard/florisboard/discussions/2314) for details. Note that this has also replaced the previous roadmap, however this step is necessary for getting the project back on track again.
+
+This includes, but is not exclusive to:
+- Fixing the most reported bugs/issues
+- Merging in the Material You theme PR -> Adds Material You support (v0.4.0-alpha05)
+- Merging in other external PRs as best as possible
+- Reworking the Settings UI warning boxes and hiding any UI for features related to word suggestions until they are ready
+- Remove existing glide/swipe typing (see 0.5 milestone)
+- Improvements in clipboard / emoji functionality (v0.4.0-beta01/beta02)
+- Prepare project to have native code implemented in [Rust](https://www.rust-lang.org/) (v0.4.0-beta02)
+- - Upgrade Settings UI to Material 3 (v0.4.0-beta03)
+- Add support for importing extensions via system file handler APIs (relevant for Addons store) (v0.4.0-beta03)
+
+Note that the previous versioning scheme has been dropped in favor of using a major.minor.patch versioning scheme, so versions like `0.3.16` are a thing of the past :)

 ## 0.5

@@ -11,25 +28,25 @@ Each major milestone has associated alpha/beta releases, so if you are intereste
 - Add new extension type: Language Pack
  - Basically groups all locale-relevant data (predictive base model, emoji suggestion data, ...)
    in a dynamically importable extension file
- New text processing logic (maybe moved back / split to 0.6)
- Add floating keyboard mode
 - New keyboard layout engine + file syntax based on the upcoming Unicode Keyboard v3 standard
+  - RFC document with technical details will be released later
+- New text processing logic (maybe moved back to 0.6)
+  - RFC document with technical details will be released later
 - Add Tablet mode / Optimizations for landscape input based on new keyboard layout engine
+- Reimplementation of glide typing with the new layout engine and predictive text core
 - Add support for any remaining new features introduced with Android 13

 ## 0.6

 - Complete rework of the Emoji panel
+  - Recently used / Emoji history (already implemented with 0.3.14)
  - Emoji search
-  - Fully scrollable emoji list (soft category borders)
-  - More granular themeing options
-  - Layout customization (e.g. placement of category buttons)
+  - Emoji suggestions when using :emoji_name: syntax (already implemented with v0.4.0-beta02)
  - Maybe: consider upgrading to emoji2 for better unified system-wide emoji styles
- Reimplementation of glide typing with the new layout engine and predictive text core
 - Prepare FlorisBoard repository and app store presence for public beta release on Google Play (will go live with stable 0.6)
 - Rework branding images and texts of FlorisBoard for the app stores
 - Focus on stability and experience improvements of the app and keyboard
- Add support for new features introduced with Android 14 / 15
+- Add support for new features introduced with Android 14
 - Not finalized, but planned: raise minimum required Android version from Android 7 (SDK level 24) to Android 8 (SDK level 26)

 ## Backlog / Planned (unassigned)
@@ -41,6 +58,7 @@ Each major milestone has associated alpha/beta releases, so if you are intereste
 - Adaptive themes v2
 - Voice-to-text with Mozilla's open-source voice service (or any other oss voice provider)
 - Text translation
+- Floating keyboard
 - Stickers/GIFs
 - Kaomoji panel implementation
 - FlorisBoard landing web page for presentation
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,13 +14,11 @@
 * limitations under the License.
 */

-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import java.io.ByteArrayOutputStream

 plugins {
    alias(libs.plugins.agp.application)
    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.plugin.compose)
    alias(libs.plugins.kotlin.serialization)
    alias(libs.plugins.ksp)
    alias(libs.plugins.mannodermaus.android.junit5)
@@ -34,7 +32,7 @@ val projectBuildToolsVersion: String by project
 val projectNdkVersion: String by project
 val projectVersionCode: String by project
 val projectVersionName: String by project
-val projectVersionNameSuffix = projectVersionName.substringAfter("-", "")
+val projectVersionNameSuffix: String by project

 android {
    namespace = "dev.patrickgold.florisboard"
@@ -50,6 +48,7 @@ android {
    kotlinOptions {
        jvmTarget = "1.8"
        freeCompilerArgs = listOf(
+            "-Xallow-result-return-type",
            "-opt-in=kotlin.contracts.ExperimentalContracts",
            "-Xjvm-default=all-compatibility",
        )
@@ -60,13 +59,13 @@ android {
        minSdk = projectMinSdk.toInt()
        targetSdk = projectTargetSdk.toInt()
        versionCode = projectVersionCode.toInt()
-        versionName = projectVersionName.substringBefore("-")
+        versionName = projectVersionName

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

        buildConfigField("String", "BUILD_COMMIT_HASH", "\"${getGitCommitHash()}\"")
        buildConfigField("String", "FLADDONS_API_VERSION", "\"v~draft2\"")
-        buildConfigField("String", "FLADDONS_STORE_URL", "\"beta.addons.florisboard.org\"")
+        buildConfigField("String", "FLADDONS_STORE_URL", "\"fladdonstest.patrickgold.dev\"")

        ksp {
            arg("room.schemaLocation", "$projectDir/schemas")
@@ -100,10 +99,14 @@ android {
        compose = true
    }

+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
+
    buildTypes {
        named("debug") {
            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug+${getGitCommitHash(short = true)}"
+            versionNameSuffix = "-debug-${getGitCommitHash(short = true)}"

            isDebuggable = true
            isJniDebuggable = false
@@ -162,16 +165,16 @@ android {
    }
 }

-composeCompiler {
-    // DO NOT ENABLE STRONG SKIPPING! This project currently relies on
-    // recomposition on parent state change to update the UI correctly.
-    featureFlags.add(ComposeFeatureFlag.StrongSkipping.disabled())
-}
-
 tasks.withType<Test> {
    useJUnitPlatform()
 }

+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
+
 dependencies {
    implementation(libs.androidx.activity.compose)
    implementation(libs.androidx.activity.ktx)
--- a/app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase/3.json
+++ b/app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase/3.json
@@ -1,94 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 3,
-    "identityHash": "145ca5bf4bff8e98f71ebc70ab3b495b",
-    "entities": [
-      {
-        "tableName": "clipboard_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` INTEGER NOT NULL, `text` TEXT, `uri` TEXT, `creationTimestampMs` INTEGER NOT NULL, `isPinned` INTEGER NOT NULL, `mimeTypes` TEXT NOT NULL, `isSensitive` INTEGER NOT NULL DEFAULT 0, `isRemoteDevice` INTEGER NOT NULL DEFAULT 0)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uri",
-            "columnName": "uri",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "creationTimestampMs",
-            "columnName": "creationTimestampMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPinned",
-            "columnName": "isPinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mimeTypes",
-            "columnName": "mimeTypes",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isSensitive",
-            "columnName": "isSensitive",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isRemoteDevice",
-            "columnName": "isRemoteDevice",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_clipboard_history__id",
-            "unique": false,
-            "columnNames": [
-              "_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_clipboard_history__id` ON `${TABLE_NAME}` (`_id`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '145ca5bf4bff8e98f71ebc70ab3b495b')"
-    ]
-  }
-}
--- a/app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase/4.json
+++ b/app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase/4.json
@@ -1,94 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 4,
-    "identityHash": "1dd181d116dcb4530fb5b33451ea9ab5",
-    "entities": [
-      {
-        "tableName": "clipboard_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` INTEGER NOT NULL, `text` TEXT, `uri` TEXT, `creationTimestampMs` INTEGER NOT NULL, `isPinned` INTEGER NOT NULL, `mimeTypes` TEXT NOT NULL, `is_sensitive` INTEGER NOT NULL DEFAULT 0, `is_remote_device` INTEGER NOT NULL DEFAULT 0)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uri",
-            "columnName": "uri",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "creationTimestampMs",
-            "columnName": "creationTimestampMs",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isPinned",
-            "columnName": "isPinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mimeTypes",
-            "columnName": "mimeTypes",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isSensitive",
-            "columnName": "is_sensitive",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isRemoteDevice",
-            "columnName": "is_remote_device",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_clipboard_history__id",
-            "unique": false,
-            "columnNames": [
-              "_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_clipboard_history__id` ON `${TABLE_NAME}` (`_id`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1dd181d116dcb4530fb5b33451ea9ab5')"
-    ]
-  }
-}
--- a/app/src/androidTest/kotlin/dev/patrickgold/florisboard/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/kotlin/dev/patrickgold/florisboard/ExampleInstrumentedTest.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package dev.patrickgold.florisboard

 import androidx.test.ext.junit.runners.AndroidJUnit4
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020-2022 Patrick Goldinger
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

@@ -28,11 +42,10 @@
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/floris_app_icon"
        android:label="@string/floris_app_name"
-        android:enableOnBackInvokedCallback="true"
        android:roundIcon="@mipmap/floris_app_icon_round"
        android:supportsRtl="true"
        android:theme="@style/FlorisAppTheme"
-        tools:targetApi="tiramisu">
+        tools:targetApi="s">

        <!-- Allow app to be profiled for benchmarking and baseline profile generation -->
        <profileable android:shell="true"/>
@@ -73,10 +86,7 @@
            android:theme="@style/FlorisAppTheme.Splash"
            android:exported="true">
            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="ui" android:host="florisboard" android:pathPrefix="/" />
+                <data android:scheme="florisboard" android:host="app-ui"/>
            </intent-filter>
            <intent-filter android:label="Import Extension">
                <action android:name="android.intent.action.VIEW"/>
@@ -118,7 +128,7 @@

        <!-- Copy to Clipboard Activity -->
        <activity
-            android:name="dev.patrickgold.florisboard.ime.clipboard.FlorisCopyToClipboardActivity"
+            android:name="dev.patrickgold.florisboard.FlorisCopyToClipboardActivity"
            android:theme="@style/FlorisAppTheme.Transparent"
            android:exported="true">
            <intent-filter>
--- a/app/src/main/assets/ime/keyboard/org.florisboard.layouts/extension.json
+++ b/app/src/main/assets/ime/keyboard/org.florisboard.layouts/extension.json
@@ -392,12 +392,6 @@
        "authors": [ "patrickgold" ],
        "direction": "ltr"
      },
-      {
-        "id": "tamil",
-        "label": "Tamil",
-        "authors": [ "Clem0908" ],
-        "direction": "ltr"
-      },
      {
        "id": "thai_kedmanee",
        "label": "Thai Kedmanee",
--- a/app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/ipa.json
+++ b/app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/ipa.json
@@ -64,7 +64,7 @@
        { "code":   11816, "label": "⸨" },
        { "code":   10214, "label": "⟦" },
        { "code":   10216, "label": "⟨" },
-        { "code":   10218, "label": "⟪" },
+        { "code":   10218, "label": "⟩" },
        { "code":  123, "label": "{" }
      ]
    } },
@@ -72,7 +72,7 @@
      "relevant": [
        { "code":   41, "label": ")" },
        { "code":   11817, "label": "⸩" },
-        { "code":   10215, "label": "⟧" },
+        { "code":   10215, "label": "⟦" },
        { "code":   10217, "label": "⟩" },
        { "code":   10219, "label": "⟫" },
        { "code":  125, "label": "}" }
--- a/app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/bn-BD.json
+++ b/app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/bn-BD.json
@@ -72,7 +72,7 @@
    "র": {
      "main": { "$": "auto_text_key", "code":  2482, "label": "ল" },
      "relevant": [
-        { "code": -255, "label": "র‍্য" }
+        { "code": -255, "label": "র‌্য" }
      ]
    },
    "ন": {
--- a/app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/sl-SI.json
+++ b/app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/sl-SI.json
@@ -2,7 +2,7 @@
  "all": {
    "c": {
      "relevant": [
-        { "$": "auto_text_key", "code":  269, "label": "č" }
+        { "$": "auto_text_key", "code":  269, "label": "č" },
      ]
    },
    "s": {
--- a/app/src/main/assets/ime/media/emoji/de.txt
+++ b/app/src/main/assets/ime/media/emoji/de.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;grinsendes Gesicht;Gesicht|grinsendes Gesicht|lol|lustig
 😃;grinsendes Gesicht mit großen Augen;Gesicht|grinsendes Gesicht mit großen Augen|lächeln|lol|lustig
--- a/app/src/main/assets/ime/media/emoji/en.txt
+++ b/app/src/main/assets/ime/media/emoji/en.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;grinning face;face|grin|grinning face
 😃;grinning face with big eyes;face|grinning face with big eyes|mouth|open|smile
@@ -3791,4 +3788,3 @@
 🏴󠁧󠁢󠁥󠁮󠁧󠁿;flag: England;flag|flag: England
 🏴󠁧󠁢󠁳󠁣󠁴󠁿;flag: Scotland;flag|flag: Scotland
 🏴󠁧󠁢󠁷󠁬󠁳󠁿;flag: Wales;flag|flag: Wales
-
--- a/app/src/main/assets/ime/media/emoji/es.txt
+++ b/app/src/main/assets/ime/media/emoji/es.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;cara sonriendo;cara|cara sonriendo|divertido|feliz|sonrisa
 😃;cara sonriendo con ojos grandes;cara|cara sonriendo con ojos grandes|divertido|risa|sonriendo
--- a/app/src/main/assets/ime/media/emoji/fr.txt
+++ b/app/src/main/assets/ime/media/emoji/fr.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;visage rieur;sourire|visage rieur
 😃;visage souriant avec de grands yeux;sourire|visage souriant avec de grands yeux
--- a/app/src/main/assets/ime/media/emoji/it.txt
+++ b/app/src/main/assets/ime/media/emoji/it.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;faccina con un gran sorriso;faccina|faccina che sogghigna|faccina con un gran sorriso|risata|sogghignare
 😃;faccina con un gran sorriso e occhi spalancati;faccina|faccina con un gran sorriso e occhi spalancati|faccina sorridente|risata|sorridere
--- a/app/src/main/assets/ime/media/emoji/pt.txt
+++ b/app/src/main/assets/ime/media/emoji/pt.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;rosto risonho;lol|rindo|risada|rosto|rosto risonho
 😃;rosto risonho com olhos bem abertos;aberto|boca|rosto|rosto risonho com olhos bem abertos|sorriso
--- a/app/src/main/assets/ime/media/emoji/root.txt
+++ b/app/src/main/assets/ime/media/emoji/root.txt
@@ -1,6 +1,3 @@
-# Auto-generated by emojicon.py using CLDR v45
-# DO NOT EDIT MANUALLY!
-
 [smileys_emotion]
 😀;;
 😃;;
@@ -3791,4 +3788,3 @@
 🏴󠁧󠁢󠁥󠁮󠁧󠁿;;
 🏴󠁧󠁢󠁳󠁣󠁴󠁿;;
 🏴󠁧󠁢󠁷󠁬󠁳󠁿;;
-
--- a/app/src/main/assets/license/project_license.txt
+++ b/app/src/main/assets/license/project_license.txt
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2020-2025 The FlorisBoard Contributors
+   Copyright 2020 Patrick Goldinger

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/app/src/main/ic_app_icon_preview-playstore.png
+++ b/app/src/main/ic_app_icon_preview-playstore.png
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisApplication.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisApplication.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/FlorisCopyToClipboardActivity.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/FlorisCopyToClipboardActivity.kt
@@ -1,20 +1,4 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dev.patrickgold.florisboard.ime.clipboard
+package dev.patrickgold.florisboard

 import android.content.ClipData
 import android.content.Intent
@@ -26,11 +10,9 @@ import android.provider.MediaStore
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
@@ -46,7 +28,6 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.apptheme.FlorisAppTheme
 import dev.patrickgold.florisboard.app.florisPreferenceModel
 import dev.patrickgold.florisboard.lib.compose.ProvideLocalizedResources
@@ -103,7 +84,6 @@ class FlorisCopyToClipboardActivity : ComponentActivity() {
                    } else {
                        val uri: Uri? =
                            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                                @Suppress("DEPRECATION")
                                intent.getParcelableExtra(Intent.EXTRA_STREAM)
                            } else {
                                intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
@@ -134,14 +114,12 @@ class FlorisCopyToClipboardActivity : ComponentActivity() {
                            )
                        }
                        bitmap?.let {
-                            Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-                                Image(
-                                    modifier = Modifier
-                                        .padding(start = 64.dp, end = 64.dp, top = 32.dp, bottom = 8.dp),
-                                    bitmap = bitmap!!.asImageBitmap(),
-                                    contentDescription = null
-                                )
-                            }
+                            Image(
+                                modifier = Modifier
+                                    .padding(start = 64.dp, end = 64.dp, top = 32.dp, bottom = 8.dp),
+                                bitmap = bitmap!!.asImageBitmap(),
+                                contentDescription = null
+                            )
                        }
                    }
                }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisImeService.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisImeService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.runtime.Composable
@@ -88,7 +87,6 @@ import dev.patrickgold.florisboard.ime.keyboard.ProvideKeyboardRowBaseHeight
 import dev.patrickgold.florisboard.ime.landscapeinput.LandscapeInputUiMode
 import dev.patrickgold.florisboard.ime.lifecycle.LifecycleInputMethodService
 import dev.patrickgold.florisboard.ime.media.MediaInputLayout
-import dev.patrickgold.florisboard.ime.nlp.NlpInlineAutofill
 import dev.patrickgold.florisboard.ime.onehanded.OneHandedMode
 import dev.patrickgold.florisboard.ime.onehanded.OneHandedPanel
 import dev.patrickgold.florisboard.ime.sheet.BottomSheetHostUi
@@ -107,6 +105,13 @@ import dev.patrickgold.florisboard.lib.devtools.flogError
 import dev.patrickgold.florisboard.lib.devtools.flogInfo
 import dev.patrickgold.florisboard.lib.devtools.flogWarning
 import dev.patrickgold.florisboard.lib.observeAsTransformingState
+import org.florisboard.lib.snygg.ui.SnyggSurface
+import org.florisboard.lib.snygg.ui.shape
+import org.florisboard.lib.snygg.ui.snyggBackground
+import org.florisboard.lib.snygg.ui.snyggBorder
+import org.florisboard.lib.snygg.ui.snyggShadow
+import org.florisboard.lib.snygg.ui.solidColor
+import org.florisboard.lib.snygg.ui.spSize
 import dev.patrickgold.florisboard.lib.util.ViewUtils
 import dev.patrickgold.florisboard.lib.util.debugSummarize
 import dev.patrickgold.florisboard.lib.util.launchActivity
@@ -118,13 +123,6 @@ import org.florisboard.lib.android.isOrientationPortrait
 import org.florisboard.lib.android.showShortToast
 import org.florisboard.lib.android.systemServiceOrNull
 import org.florisboard.lib.kotlin.collectLatestIn
-import org.florisboard.lib.snygg.ui.SnyggSurface
-import org.florisboard.lib.snygg.ui.shape
-import org.florisboard.lib.snygg.ui.snyggBackground
-import org.florisboard.lib.snygg.ui.snyggBorder
-import org.florisboard.lib.snygg.ui.snyggShadow
-import org.florisboard.lib.snygg.ui.solidColor
-import org.florisboard.lib.snygg.ui.spSize
 import java.lang.ref.WeakReference

 /**
@@ -372,7 +370,7 @@ class FlorisImeService : LifecycleInputMethodService() {
        flogInfo { "(no args)" }
        super.onFinishInput()
        editorInstance.handleFinishInput()
-        NlpInlineAutofill.clearInlineSuggestions()
+        nlpManager.clearInlineSuggestions()
    }

    override fun onWindowShown() {
@@ -439,26 +437,23 @@ class FlorisImeService : LifecycleInputMethodService() {

    @RequiresApi(Build.VERSION_CODES.R)
    override fun onCreateInlineSuggestionsRequest(uiExtras: Bundle): InlineSuggestionsRequest? {
-        if (!prefs.smartbar.enabled.get() || !prefs.suggestion.api30InlineSuggestionsEnabled.get()) {
+        return if (prefs.smartbar.enabled.get() && prefs.suggestion.api30InlineSuggestionsEnabled.get()) {
+            flogInfo(LogTopic.IMS_EVENTS) {
+                "Creating inline suggestions request because Smartbar and inline suggestions are enabled."
+            }
+            val stylesBundle = themeManager.createInlineSuggestionUiStyleBundle(this)
+            val spec = InlinePresentationSpec.Builder(InlineSuggestionUiSmallestSize, InlineSuggestionUiBiggestSize)
+                .setStyle(stylesBundle)
+                .build()
+            InlineSuggestionsRequest.Builder(listOf(spec)).let { request ->
+                request.setMaxSuggestionCount(InlineSuggestionsRequest.SUGGESTION_COUNT_UNLIMITED)
+                request.build()
+            }
+        } else {
            flogInfo(LogTopic.IMS_EVENTS) {
                "Ignoring inline suggestions request because Smartbar and/or inline suggestions are disabled."
            }
-            return null
-        }
-
-        flogInfo(LogTopic.IMS_EVENTS) { "Creating inline suggestions request" }
-        val stylesBundle = themeManager.createInlineSuggestionUiStyleBundle(this)
-        val spec = InlinePresentationSpec.Builder(
-            InlineSuggestionUiSmallestSize,
-            InlineSuggestionUiBiggestSize,
-        ).run {
-            setStyle(stylesBundle)
-            build()
-        }
-
-        return InlineSuggestionsRequest.Builder(listOf(spec)).run {
-            setMaxSuggestionCount(InlineSuggestionsRequest.SUGGESTION_COUNT_UNLIMITED)
-            build()
+            null
        }
    }

@@ -468,7 +463,8 @@ class FlorisImeService : LifecycleInputMethodService() {
        flogInfo(LogTopic.IMS_EVENTS) {
            "Received inline suggestions response with ${inlineSuggestions.size} suggestion(s) provided."
        }
-        return NlpInlineAutofill.showInlineSuggestions(this, inlineSuggestions)
+        nlpManager.showInlineSuggestions(inlineSuggestions)
+        return true
    }

    override fun onComputeInsets(outInsets: Insets?) {
@@ -552,7 +548,7 @@ class FlorisImeService : LifecycleInputMethodService() {
                                        .fillMaxWidth()
                                        .weight(1f),
                                ) {
-                                    DevtoolsOverlay(modifier = Modifier.fillMaxSize())
+                                    DevtoolsUi()
                                }
                            }
                            ImeUi()
@@ -598,7 +594,6 @@ class FlorisImeService : LifecycleInputMethodService() {
                    modifier = Modifier
                        .fillMaxWidth()
                        .wrapContentHeight()
-                        .safeDrawingPadding()
                        // FIXME: removing this fixes the Smartbar sizing but breaks one-handed-mode
                        //.height(IntrinsicSize.Min)
                        .padding(bottom = bottomOffset),
@@ -639,6 +634,14 @@ class FlorisImeService : LifecycleInputMethodService() {
        }
    }

+    @Composable
+    private fun DevtoolsUi() {
+        val devtoolsEnabled by prefs.devtools.enabled.observeAsState()
+        if (devtoolsEnabled) {
+            DevtoolsOverlay(modifier = Modifier.fillMaxSize())
+        }
+    }
+
    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean =
        if (keyboardManager.onHardwareKeyDown(keyCode, event)) true
        else super.onKeyDown(keyCode, event)
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisSpellCheckerService.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/FlorisSpellCheckerService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/AppPrefs.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/AppPrefs.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,9 +31,8 @@ import dev.patrickgold.florisboard.ime.keyboard.IncognitoMode
 import dev.patrickgold.florisboard.ime.keyboard.SpaceBarMode
 import dev.patrickgold.florisboard.ime.landscapeinput.LandscapeInputUiMode
 import dev.patrickgold.florisboard.ime.media.emoji.EmojiHairStyle
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiHistory
+import dev.patrickgold.florisboard.ime.media.emoji.EmojiRecentlyUsedHelper
 import dev.patrickgold.florisboard.ime.media.emoji.EmojiSkinTone
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiSuggestionType
 import dev.patrickgold.florisboard.ime.nlp.SpellingLanguageMode
 import dev.patrickgold.florisboard.ime.onehanded.OneHandedMode
 import dev.patrickgold.florisboard.ime.smartbar.CandidatesDisplayMode
@@ -47,18 +46,16 @@ import dev.patrickgold.florisboard.ime.text.key.KeyHintMode
 import dev.patrickgold.florisboard.ime.text.key.UtilityKeyAction
 import dev.patrickgold.florisboard.ime.theme.ThemeMode
 import dev.patrickgold.florisboard.ime.theme.extCoreTheme
+import org.florisboard.lib.android.isOrientationPortrait
 import dev.patrickgold.florisboard.lib.ext.ExtensionComponentName
 import dev.patrickgold.florisboard.lib.observeAsTransformingState
+import org.florisboard.lib.snygg.SnyggLevel
 import dev.patrickgold.florisboard.lib.util.VersionName
 import dev.patrickgold.jetpref.datastore.JetPref
 import dev.patrickgold.jetpref.datastore.model.PreferenceMigrationEntry
 import dev.patrickgold.jetpref.datastore.model.PreferenceModel
 import dev.patrickgold.jetpref.datastore.model.PreferenceType
 import dev.patrickgold.jetpref.datastore.model.observeAsState
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import org.florisboard.lib.android.isOrientationPortrait
-import org.florisboard.lib.snygg.SnyggLevel

 fun florisPreferenceModel() = JetPref.getOrCreatePreferenceModel(AppPrefs::class, ::AppPrefs)

@@ -118,14 +115,6 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
            key = "clipboard__clean_up_after",
            default = 20,
        )
-        val autoCleanSensitive = boolean(
-            key = "clipboard__auto_clean_sensitive",
-            default = false,
-        )
-        val autoCleanSensitiveAfter = int(
-            key = "clipboard__auto_clean_sensitive_after",
-            default = 20,
-        )
        val limitHistorySize = boolean(
            key = "clipboard__limit_history_size",
            default = true,
@@ -166,8 +155,8 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
            key = "devtools__enabled",
            default = false,
        )
-        val showLastLayoutComputation = boolean(
-            key = "devtools__show_last_layout_computation",
+        val showHeapMemoryStats = boolean(
+            key = "devtools__show_heap_memory_stats",
            default = false,
        )
        val showPrimaryClip = boolean(
@@ -182,10 +171,6 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
            key = "devtools__show_spelling_overlay",
            default = false,
        )
-        val showInlineAutofillOverlay = boolean(
-            key = "devtools__show_inline_autofill_overlay",
-            default = false,
-        )
        val showKeyTouchBoundaries = boolean(
            key = "devtools__show_touch_boundaries",
            default = false,
@@ -208,67 +193,6 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
        )
    }

-    val emoji = Emoji()
-    inner class Emoji {
-        val preferredSkinTone = enum(
-            key = "emoji__preferred_skin_tone",
-            default = EmojiSkinTone.DEFAULT,
-        )
-        val preferredHairStyle = enum(
-            key = "emoji__preferred_hair_style",
-            default = EmojiHairStyle.DEFAULT,
-        )
-        val historyEnabled = boolean(
-            key = "emoji__history_enabled",
-            default = true,
-        )
-        val historyData = custom(
-            key = "emoji__history_data",
-            default = EmojiHistory.Empty,
-            serializer = EmojiHistory.Serializer,
-        )
-        val historyPinnedUpdateStrategy = enum(
-            key = "emoji__history_pinned_update_strategy",
-            default = EmojiHistory.UpdateStrategy.MANUAL_SORT_PREPEND,
-        )
-        val historyPinnedMaxSize = int(
-            key = "emoji__history_pinned_max_size",
-            default = EmojiHistory.MaxSizeUnlimited,
-        )
-        val historyRecentUpdateStrategy = enum(
-            key = "emoji__history_recent_update_strategy",
-            default = EmojiHistory.UpdateStrategy.AUTO_SORT_PREPEND,
-        )
-        val historyRecentMaxSize = int(
-            key = "emoji__history_recent_max_size",
-            default = 90,
-        )
-        val suggestionEnabled = boolean(
-            key = "emoji__suggestion_enabled",
-            default = true,
-        )
-        val suggestionType = enum(
-            key = "emoji__suggestion_type",
-            default = EmojiSuggestionType.LEADING_COLON,
-        )
-        val suggestionUpdateHistory = boolean(
-            key = "emoji__suggestion_update_history",
-            default = true,
-        )
-        val suggestionCandidateShowName = boolean(
-            key = "emoji__suggestion_candidate_show_name",
-            default = false,
-        )
-        val suggestionQueryMinLength = int(
-            key = "emoji__suggestion_query_min_length",
-            default = 3,
-        )
-        val suggestionCandidateMaxCount = int(
-            key = "emoji__suggestion_candidate_max_count",
-            default = 5,
-        )
-    }
-
    val gestures = Gestures()
    inner class Gestures {
        val swipeUp = enum(
@@ -606,6 +530,27 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
        )
    }

+    val media = Media()
+    inner class Media {
+        val emojiRecentlyUsed = custom(
+            key = "media__emoji_recently_used",
+            default = emptyList(),
+            serializer = EmojiRecentlyUsedHelper.Serializer,
+        )
+        val emojiRecentlyUsedMaxSize = int(
+            key = "media__emoji_recently_used_max_size",
+            default = 90,
+        )
+        val emojiPreferredSkinTone = enum(
+            key = "media__emoji_preferred_skin_tone",
+            default = EmojiSkinTone.DEFAULT,
+        )
+        val emojiPreferredHairStyle = enum(
+            key = "media__emoji_preferred_hair_style",
+            default = EmojiHairStyle.DEFAULT,
+        )
+    }
+
    val smartbar = Smartbar()
    inner class Smartbar {
        val enabled = boolean(
@@ -629,7 +574,6 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
            key = "smartbar__shared_actions_expanded",
            default = false,
        )
-        @Deprecated("Always enabled due to UX issues")
        val sharedActionsAutoExpandCollapse = boolean(
            key = "smartbar__shared_actions_auto_expand_collapse",
            default = true,
@@ -739,7 +683,8 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
            "gestures__space_bar_swipe_right", "gestures__space_bar_long_press", "gestures__delete_key_swipe_left",
            "gestures__delete_key_long_press", "keyboard__hinted_number_row_mode", "keyboard__hinted_symbols_mode",
            "keyboard__utility_key_action", "keyboard__one_handed_mode", "keyboard__landscape_input_ui_mode",
-            "localization__display_language_names_in", "smartbar__primary_actions_row_type",
+            "localization__display_language_names_in", "media__emoji_preferred_skin_tone",
+            "media__emoji_preferred_hair_style", "smartbar__primary_actions_row_type",
            "smartbar__secondary_actions_placement", "smartbar__secondary_actions_row_type", "spelling__language_mode",
            "suggestion__display_mode", "theme__mode", "theme__editor_display_colors_as",
            "theme__editor_display_kbd_after_dialogs", "theme__editor_level",
@@ -761,32 +706,6 @@ class AppPrefs : PreferenceModel("florisboard-app-prefs") {
                }
            }

-            // Migrate media prefs to emoji prefs
-            // Keep migration rule until: 0.6 dev cycle
-            "media__emoji_recently_used" -> {
-                val emojiValues = entry.rawValue.split(";")
-                val recent = emojiValues.map {
-                    dev.patrickgold.florisboard.ime.media.emoji.Emoji(it, "", emptyList())
-                }
-                val data = EmojiHistory(emptyList(), recent)
-                entry.transform(key = "emoji__history_data", rawValue = Json.encodeToString(data))
-            }
-            "media__emoji_recently_used_max_size" -> {
-                entry.transform(key = "emoji__history_recent_max_size")
-            }
-            "media__emoji_preferred_skin_tone" -> {
-                entry.transform(
-                    key = "emoji__preferred_skin_tone",
-                    rawValue = entry.rawValue.uppercase(), // keep until: 0.5 dev cycle
-                )
-            }
-            "media__emoji_preferred_hair_style" -> {
-                entry.transform(
-                    key = "emoji__preferred_hair_style",
-                    rawValue = entry.rawValue.uppercase(), // keep until: 0.5 dev cycle
-                )
-            }
-
            // Default: keep entry
            else -> entry.keepAsIs()
        }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/EnumDisplayEntries.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/EnumDisplayEntries.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package dev.patrickgold.florisboard.app

 import androidx.compose.runtime.Composable
@@ -27,9 +11,7 @@ import dev.patrickgold.florisboard.ime.input.InputFeedbackActivationMode
 import dev.patrickgold.florisboard.ime.keyboard.IncognitoMode
 import dev.patrickgold.florisboard.ime.keyboard.SpaceBarMode
 import dev.patrickgold.florisboard.ime.landscapeinput.LandscapeInputUiMode
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiHistory
 import dev.patrickgold.florisboard.ime.media.emoji.EmojiSkinTone
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiSuggestionType
 import dev.patrickgold.florisboard.ime.nlp.SpellingLanguageMode
 import dev.patrickgold.florisboard.ime.onehanded.OneHandedMode
 import dev.patrickgold.florisboard.ime.smartbar.CandidatesDisplayMode
@@ -156,30 +138,6 @@ private val ENUM_DISPLAY_ENTRIES = mapOf<Pair<KClass<*>, String>, @Composable ()
            )
        }
    },
-    EmojiHistory.UpdateStrategy::class to DEFAULT to {
-        listPrefEntries {
-            entry(
-                key = EmojiHistory.UpdateStrategy.AUTO_SORT_PREPEND,
-                label = stringRes(R.string.enum__emoji_history_update_strategy__auto_sort_prepend),
-                description = stringRes(R.string.enum__emoji_history_update_strategy__auto_sort_prepend__description),
-            )
-            entry(
-                key = EmojiHistory.UpdateStrategy.AUTO_SORT_APPEND,
-                label = stringRes(R.string.enum__emoji_history_update_strategy__auto_sort_append),
-                description = stringRes(R.string.enum__emoji_history_update_strategy__auto_sort_append__description),
-            )
-            entry(
-                key = EmojiHistory.UpdateStrategy.MANUAL_SORT_PREPEND,
-                label = stringRes(R.string.enum__emoji_history_update_strategy__manual_sort_prepend),
-                description = stringRes(R.string.enum__emoji_history_update_strategy__manual_sort_prepend__description),
-            )
-            entry(
-                key = EmojiHistory.UpdateStrategy.MANUAL_SORT_APPEND,
-                label = stringRes(R.string.enum__emoji_history_update_strategy__manual_sort_append),
-                description = stringRes(R.string.enum__emoji_history_update_strategy__manual_sort_append__description),
-            )
-        }
-    },
    EmojiSkinTone::class to DEFAULT to {
        listPrefEntries {
            entry(
@@ -226,20 +184,6 @@ private val ENUM_DISPLAY_ENTRIES = mapOf<Pair<KClass<*>, String>, @Composable ()
            )
        }
    },
-    EmojiSuggestionType::class to DEFAULT to {
-        listPrefEntries {
-            entry(
-                key = EmojiSuggestionType.LEADING_COLON,
-                label = stringRes(R.string.enum__emoji_suggestion_type__leading_colon),
-                description = stringRes(R.string.enum__emoji_suggestion_type__leading_colon__description),
-            )
-            entry(
-                key = EmojiSuggestionType.INLINE_TEXT,
-                label = stringRes(R.string.enum__emoji_suggestion_type__inline_text),
-                description = stringRes(R.string.enum__emoji_suggestion_type__inline_text__description),
-            )
-        }
-    },
    ExtendedActionsPlacement::class to DEFAULT to {
        listPrefEntries {
            entry(
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/FlorisAppActivity.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/FlorisAppActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.material3.MaterialTheme
@@ -31,12 +30,12 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavController
@@ -47,18 +46,17 @@ import dev.patrickgold.florisboard.app.ext.ExtensionImportScreenType
 import dev.patrickgold.florisboard.app.setup.NotificationPermissionState
 import dev.patrickgold.florisboard.cacheManager
 import dev.patrickgold.florisboard.lib.FlorisLocale
+import org.florisboard.lib.android.AndroidVersion
+import org.florisboard.lib.android.hideAppIcon
+import org.florisboard.lib.android.showAppIcon
 import dev.patrickgold.florisboard.lib.compose.LocalPreviewFieldController
 import dev.patrickgold.florisboard.lib.compose.PreviewKeyboardField
 import dev.patrickgold.florisboard.lib.compose.ProvideLocalizedResources
-import dev.patrickgold.florisboard.lib.compose.conditional
 import dev.patrickgold.florisboard.lib.compose.rememberPreviewFieldController
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.util.AppVersionUtils
 import dev.patrickgold.jetpref.datastore.model.observeAsState
 import dev.patrickgold.jetpref.datastore.ui.ProvideDefaultDialogPrefStrings
-import org.florisboard.lib.android.AndroidVersion
-import org.florisboard.lib.android.hideAppIcon
-import org.florisboard.lib.android.showAppIcon

 enum class AppTheme(val id: String) {
    AUTO("auto"),
@@ -78,7 +76,7 @@ class FlorisAppActivity : ComponentActivity() {
    private var appTheme by mutableStateOf(AppTheme.AUTO)
    private var showAppIcon = true
    private var resourcesContext by mutableStateOf(this as Context)
-    private var intentToBeHandled by mutableStateOf<Intent?>(null)
+    private var fileImportIntent by mutableStateOf<Intent?>(null)

    override fun onCreate(savedInstanceState: Bundle?) {
        // Splash screen should be installed before calling super.onCreate()
@@ -143,23 +141,19 @@ class FlorisAppActivity : ComponentActivity() {
        }
    }

-    override fun onNewIntent(intent: Intent) {
+    override fun onNewIntent(intent: Intent?) {
        super.onNewIntent(intent)
        setIntent(intent)

-        if (intent.action == Intent.ACTION_VIEW && intent.categories?.contains(Intent.CATEGORY_BROWSABLE) == true) {
-            intentToBeHandled = intent
+        if (intent?.action == Intent.ACTION_VIEW && intent.data != null) {
+            fileImportIntent = intent
            return
        }
-        if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
-            intentToBeHandled = intent
+        if (intent?.action == Intent.ACTION_SEND && intent.clipData != null) {
+            fileImportIntent = intent
            return
        }
-        if (intent.action == Intent.ACTION_SEND && intent.clipData != null) {
-            intentToBeHandled = intent
-            return
-        }
-        intentToBeHandled = null
+        fileImportIntent = null
    }

    @Composable
@@ -182,9 +176,6 @@ class FlorisAppActivity : ComponentActivity() {
                    modifier = Modifier
                        //.statusBarsPadding()
                        .navigationBarsPadding()
-                        .conditional(LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                            displayCutoutPadding()
-                        }
                        .imePadding(),
                ) {
                    Routes.AppNavHost(
@@ -197,22 +188,22 @@ class FlorisAppActivity : ComponentActivity() {
            }
        }

-        LaunchedEffect(intentToBeHandled) {
-            val intent = intentToBeHandled
+        LaunchedEffect(fileImportIntent) {
+            val intent = fileImportIntent
            if (intent != null) {
-                if (intent.action == Intent.ACTION_VIEW && intent.categories?.contains(Intent.CATEGORY_BROWSABLE) == true) {
-                    navController.handleDeepLink(intent)
+                val data = if (intent.action == Intent.ACTION_VIEW) {
+                    intent.data!!
                } else {
-                    val data = if (intent.action == Intent.ACTION_VIEW) {
-                        intent.data!!
-                    } else {
-                        intent.clipData!!.getItemAt(0).uri
-                    }
-                    val workspace = runCatching { cacheManager.readFromUriIntoCache(data) }.getOrNull()
-                    navController.navigate(Routes.Ext.Import(ExtensionImportScreenType.EXT_ANY, workspace?.uuid))
+                    intent.clipData!!.getItemAt(0).uri
                }
+                val workspace = runCatching { cacheManager.readFromUriIntoCache(data) }.getOrNull()
+                navController.navigate(Routes.Ext.Import(ExtensionImportScreenType.EXT_ANY, workspace?.uuid))
            }
-            intentToBeHandled = null
+            fileImportIntent = null
+        }
+
+        SideEffect {
+            navController.setOnBackPressedDispatcher(this.onBackPressedDispatcher)
        }
    }
 }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/Routes.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/Routes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,25 +16,15 @@

 package dev.patrickgold.florisboard.app

-import androidx.compose.animation.AnimatedContentScope
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideIn
-import androidx.compose.animation.slideOut
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.IntOffset
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.navDeepLink
 import dev.patrickgold.florisboard.app.devtools.AndroidLocalesScreen
 import dev.patrickgold.florisboard.app.devtools.AndroidSettingsScreen
 import dev.patrickgold.florisboard.app.devtools.DevtoolsScreen
 import dev.patrickgold.florisboard.app.devtools.ExportDebugLogScreen
-import dev.patrickgold.florisboard.app.ext.CheckUpdatesScreen
 import dev.patrickgold.florisboard.app.ext.ExtensionEditScreen
 import dev.patrickgold.florisboard.app.ext.ExtensionExportScreen
 import dev.patrickgold.florisboard.app.ext.ExtensionHomeScreen
@@ -154,8 +144,6 @@ object Routes {

        const val View = "ext/view/{id}"
        fun View(id: String) = View.curlyFormat("id" to id)
-
-        const val CheckUpdates = "ext/check-updates"
    }

    @Composable
@@ -164,106 +152,83 @@ object Routes {
        navController: NavHostController,
        startDestination: String,
    ) {
-        fun NavGraphBuilder.composableWithDeepLink(
-            route: String,
-            content: @Composable (AnimatedContentScope.(NavBackStackEntry) -> Unit),
-        ) {
-            composable(
-                route = route,
-                deepLinks = listOf(navDeepLink { uriPattern = "ui://florisboard/$route" }),
-                content = content,
-            )
-        }
-
        NavHost(
            modifier = modifier,
            navController = navController,
            startDestination = startDestination,
-            enterTransition = {
-                slideIn { IntOffset(it.width, 0) } + fadeIn()
-            },
-            exitTransition = {
-                slideOut { IntOffset(-it.width, 0) } + fadeOut()
-            },
-            popEnterTransition = {
-                slideIn { IntOffset(-it.width, 0) } + fadeIn()
-            },
-            popExitTransition = {
-                slideOut { IntOffset(it.width, 0) } + fadeOut()
-            }
        ) {
            composable(Setup.Screen) { SetupScreen() }

-            composableWithDeepLink(Settings.Home) { HomeScreen() }
+            composable(Settings.Home) { HomeScreen() }

-            composableWithDeepLink(Settings.Localization) { LocalizationScreen() }
-            composableWithDeepLink(Settings.SelectLocale) { SelectLocaleScreen() }
-            composableWithDeepLink(Settings.LanguagePackManager) { navBackStack ->
+            composable(Settings.Localization) { LocalizationScreen() }
+            composable(Settings.SelectLocale) { SelectLocaleScreen() }
+            composable(Settings.LanguagePackManager) { navBackStack ->
                val action = navBackStack.arguments?.getString("action")?.let { actionId ->
                    LanguagePackManagerScreenAction.entries.firstOrNull { it.id == actionId }
                }
                LanguagePackManagerScreen(action)
            }
-            composableWithDeepLink(Settings.SubtypeAdd) { SubtypeEditorScreen(null) }
-            composableWithDeepLink(Settings.SubtypeEdit) { navBackStack ->
+            composable(Settings.SubtypeAdd) { SubtypeEditorScreen(null) }
+            composable(Settings.SubtypeEdit) { navBackStack ->
                val id = navBackStack.arguments?.getString("id")?.toLongOrNull()
                SubtypeEditorScreen(id)
            }

-            composableWithDeepLink(Settings.Theme) { ThemeScreen() }
-            composableWithDeepLink(Settings.ThemeManager) { navBackStack ->
+            composable(Settings.Theme) { ThemeScreen() }
+            composable(Settings.ThemeManager) { navBackStack ->
                val action = navBackStack.arguments?.getString("action")?.let { actionId ->
                    ThemeManagerScreenAction.entries.firstOrNull { it.id == actionId }
                }
                ThemeManagerScreen(action)
            }

-            composableWithDeepLink(Settings.Keyboard) { KeyboardScreen() }
-            composableWithDeepLink(Settings.InputFeedback) { InputFeedbackScreen() }
+            composable(Settings.Keyboard) { KeyboardScreen() }
+            composable(Settings.InputFeedback) { InputFeedbackScreen() }

-            composableWithDeepLink(Settings.Smartbar) { SmartbarScreen() }
+            composable(Settings.Smartbar) { SmartbarScreen() }

-            composableWithDeepLink(Settings.Typing) { TypingScreen() }
+            composable(Settings.Typing) { TypingScreen() }

-            composableWithDeepLink(Settings.Dictionary) { DictionaryScreen() }
-            composableWithDeepLink(Settings.UserDictionary) { navBackStack ->
+            composable(Settings.Dictionary) { DictionaryScreen() }
+            composable(Settings.UserDictionary) { navBackStack ->
                val type = navBackStack.arguments?.getString("type")?.let { typeId ->
                    UserDictionaryType.entries.firstOrNull { it.id == typeId }
                }
                UserDictionaryScreen(type!!)
            }

-            composableWithDeepLink(Settings.Gestures) { GesturesScreen() }
+            composable(Settings.Gestures) { GesturesScreen() }

-            composableWithDeepLink(Settings.Clipboard) { ClipboardScreen() }
+            composable(Settings.Clipboard) { ClipboardScreen() }

-            composableWithDeepLink(Settings.Media) { MediaScreen() }
+            composable(Settings.Media) { MediaScreen() }

-            composableWithDeepLink(Settings.Advanced) { AdvancedScreen() }
-            composableWithDeepLink(Settings.Backup) { BackupScreen() }
-            composableWithDeepLink(Settings.Restore) { RestoreScreen() }
+            composable(Settings.Advanced) { AdvancedScreen() }
+            composable(Settings.Backup) { BackupScreen() }
+            composable(Settings.Restore) { RestoreScreen() }

-            composableWithDeepLink(Settings.About) { AboutScreen() }
-            composableWithDeepLink(Settings.ProjectLicense) { ProjectLicenseScreen() }
-            composableWithDeepLink(Settings.ThirdPartyLicenses) { ThirdPartyLicensesScreen() }
+            composable(Settings.About) { AboutScreen() }
+            composable(Settings.ProjectLicense) { ProjectLicenseScreen() }
+            composable(Settings.ThirdPartyLicenses) { ThirdPartyLicensesScreen() }

-            composableWithDeepLink(Devtools.Home) { DevtoolsScreen() }
-            composableWithDeepLink(Devtools.AndroidLocales) { AndroidLocalesScreen() }
-            composableWithDeepLink(Devtools.AndroidSettings) { navBackStack ->
+            composable(Devtools.Home) { DevtoolsScreen() }
+            composable(Devtools.AndroidLocales) { AndroidLocalesScreen() }
+            composable(Devtools.AndroidSettings) { navBackStack ->
                val name = navBackStack.arguments?.getString("name")
                AndroidSettingsScreen(name)
            }
-            composableWithDeepLink(Devtools.ExportDebugLog) { ExportDebugLogScreen() }
+            composable(Devtools.ExportDebugLog) { ExportDebugLogScreen() }

-            composableWithDeepLink(Ext.Home) { ExtensionHomeScreen() }
-            composableWithDeepLink(Ext.List) { navBackStack ->
+            composable(Ext.Home) { ExtensionHomeScreen() }
+            composable(Ext.List) { navBackStack ->
                val type = navBackStack.arguments?.getString("type")?.let { typeId ->
                    ExtensionListScreenType.entries.firstOrNull { it.id == typeId }
                } ?: error("unknown type")
                val showUpdate = navBackStack.arguments?.getString("showUpdate")
                ExtensionListScreen(type, showUpdate == "true")
            }
-            composableWithDeepLink(Ext.Edit) { navBackStack ->
+            composable(Ext.Edit) { navBackStack ->
                val extensionId = navBackStack.arguments?.getString("id")
                val serialType = navBackStack.arguments?.getString("serial_type")
                ExtensionEditScreen(
@@ -271,24 +236,21 @@ object Routes {
                    createSerialType = serialType.takeIf { !it.isNullOrBlank() },
                )
            }
-            composableWithDeepLink(Ext.Export) { navBackStack ->
+            composable(Ext.Export) { navBackStack ->
                val extensionId = navBackStack.arguments?.getString("id")
                ExtensionExportScreen(id = extensionId.toString())
            }
-            composableWithDeepLink(Ext.Import) { navBackStack ->
+            composable(Ext.Import) { navBackStack ->
                val type = navBackStack.arguments?.getString("type")?.let { typeId ->
                    ExtensionImportScreenType.entries.firstOrNull { it.id == typeId }
                } ?: ExtensionImportScreenType.EXT_ANY
                val uuid = navBackStack.arguments?.getString("uuid")?.takeIf { it != "null" }
                ExtensionImportScreen(type, uuid)
            }
-            composableWithDeepLink(Ext.View) { navBackStack ->
+            composable(Ext.View) { navBackStack ->
                val extensionId = navBackStack.arguments?.getString("id")
                ExtensionViewScreen(id = extensionId.toString())
            }
-            composableWithDeepLink(Ext.CheckUpdates) {
-                CheckUpdatesScreen()
-            }
        }
    }
 }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Color.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Color.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Shape.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Shape.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Theme.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Theme.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,13 +18,17 @@ package dev.patrickgold.florisboard.app.apptheme

 import android.app.Activity
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Type.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/apptheme/Type.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/AndroidLocalesScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/AndroidLocalesScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/AndroidSettingsScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/AndroidSettingsScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/DevtoolsOverlay.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/DevtoolsOverlay.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@

 package dev.patrickgold.florisboard.app.devtools

-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -42,14 +40,10 @@ import androidx.compose.ui.unit.sp
 import dev.patrickgold.florisboard.app.florisPreferenceModel
 import dev.patrickgold.florisboard.clipboardManager
 import dev.patrickgold.florisboard.editorInstance
-import dev.patrickgold.florisboard.ime.keyboard.CachedLayout
-import dev.patrickgold.florisboard.ime.nlp.NlpInlineAutofill
-import dev.patrickgold.florisboard.keyboardManager
 import dev.patrickgold.florisboard.lib.FlorisLocale
 import dev.patrickgold.florisboard.lib.observeAsNonNullState
 import dev.patrickgold.florisboard.nlpManager
 import dev.patrickgold.jetpref.datastore.model.observeAsState
-import org.florisboard.lib.android.AndroidVersion
 import java.text.SimpleDateFormat
 import java.util.*

@@ -58,39 +52,26 @@ private val DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss", FlorisLocale.

@Composable
 fun DevtoolsOverlay(modifier: Modifier = Modifier) {
-    val context = LocalContext.current
    val prefs by florisPreferenceModel()
-    val keyboardManager by context.keyboardManager()

-    val devtoolsEnabled by prefs.devtools.enabled.observeAsState()
    val showPrimaryClip by prefs.devtools.showPrimaryClip.observeAsState()
    val showInputStateOverlay by prefs.devtools.showInputStateOverlay.observeAsState()
-    val showLastLayoutComputation by prefs.devtools.showLastLayoutComputation.observeAsState()
    val showSpellingOverlay by prefs.devtools.showSpellingOverlay.observeAsState()
-    val showInlineAutofillOverlay by prefs.devtools.showInlineAutofillOverlay.observeAsState()
-
-    val debugLayoutResult by keyboardManager.layoutManager.debugLayoutComputationResultFlow.collectAsState()

    CompositionLocalProvider(
        LocalContentColor provides Color.White,
        LocalLayoutDirection provides LayoutDirection.Ltr,
    ) {
        Column(modifier = modifier) {
-            if (devtoolsEnabled && showPrimaryClip) {
+            if (showPrimaryClip) {
                DevtoolsClipboardOverlay()
            }
-            if (devtoolsEnabled && showInputStateOverlay) {
+            if (showInputStateOverlay) {
                DevtoolsInputStateOverlay()
            }
-            if (devtoolsEnabled && showLastLayoutComputation || debugLayoutResult?.allLayoutsSuccess() == false) {
-                DevtoolsLastLayoutComputationOverlay()
-            }
-            if (devtoolsEnabled && showSpellingOverlay) {
+            if (showSpellingOverlay) {
                DevtoolsSpellingOverlay()
            }
-            if (devtoolsEnabled && showInlineAutofillOverlay && AndroidVersion.ATLEAST_API30_R) {
-                DevtoolsInlineAutofillOverlay()
-            }
        }
    }
 }
@@ -136,37 +117,6 @@ private fun DevtoolsInputStateOverlay() {
    }
 }

-@Composable
-private fun DevtoolsLastLayoutComputationOverlay() {
-    val context = LocalContext.current
-    val keyboardManager by context.keyboardManager()
-    val debugLayoutResult by keyboardManager.layoutManager.debugLayoutComputationResultFlow.collectAsState()
-
-    @Composable
-    fun PrintResult(result: Result<CachedLayout>) {
-        if (result.isSuccess) {
-            DevtoolsText(text = "loaded: ${result.getOrNull()?.name}")
-        } else {
-            DevtoolsText(text = "error: ${result.exceptionOrNull()}")
-        }
-    }
-
-    DevtoolsOverlayBox(title = "Last layout computation") {
-        if (debugLayoutResult == null) {
-            DevtoolsText(text = "No layout computation result available.")
-            return@DevtoolsOverlayBox
-        }
-        DevtoolsSubGroup(title = "main") {
-            PrintResult(debugLayoutResult!!.main)
-        }
-        DevtoolsSubGroup(title = "mod") {
-            PrintResult(debugLayoutResult!!.mod)
-        }
-        DevtoolsSubGroup(title = "ext") {
-            PrintResult(debugLayoutResult!!.ext)
-        }
-    }
-}

@Composable
 private fun DevtoolsSpellingOverlay() {
@@ -210,25 +160,6 @@ private fun DevtoolsSpellingOverlay() {
    }
 }

-@RequiresApi(Build.VERSION_CODES.R)
-@Composable
-private fun DevtoolsInlineAutofillOverlay() {
-    val inlineSuggestions by NlpInlineAutofill.suggestions.collectAsState()
-
-    DevtoolsOverlayBox(title = "Inline autofill overlay (${inlineSuggestions.size})") {
-        for (inlineSuggestion in inlineSuggestions) {
-            DevtoolsSubGroup(title = "NlpInlineSuggestion") {
-                val info = inlineSuggestion.info
-                DevtoolsText(text = "info.type:     ${info.type}")
-                DevtoolsText(text = "info.source:   ${info.source}")
-                DevtoolsText(text = "info.isPinned: ${info.isPinned}")
-                val view = inlineSuggestion.view
-                DevtoolsText(text = "view: ${view?.javaClass?.name}")
-            }
-        }
-    }
-}
-
@Composable
 private fun DevtoolsOverlayBox(
    title: String,
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/DevtoolsScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/DevtoolsScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ import dev.patrickgold.jetpref.datastore.model.observeAsState
 import dev.patrickgold.jetpref.datastore.ui.Preference
 import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
 import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
-import org.florisboard.lib.android.AndroidVersion

 class DebugOnPurposeCrashException : Exception(
    "Success! The app crashed purposely to display this beautiful screen we all love :)"
@@ -61,6 +60,12 @@ fun DevtoolsScreen() = FlorisScreen {
        )

        PreferenceGroup(title = stringRes(R.string.devtools__title)) {
+            SwitchPreference(
+                prefs.devtools.showHeapMemoryStats,
+                title = stringRes(R.string.devtools__show_heap_memory_stats__label),
+                summary = stringRes(R.string.devtools__show_heap_memory_stats__summary),
+                enabledIf = { prefs.devtools.enabled isEqualTo true },
+            )
            SwitchPreference(
                prefs.devtools.showPrimaryClip,
                title = stringRes(R.string.devtools__show_primary_clip__label),
@@ -73,25 +78,12 @@ fun DevtoolsScreen() = FlorisScreen {
                summary = stringRes(R.string.devtools__show_input_state_overlay__summary),
                enabledIf = { prefs.devtools.enabled isEqualTo true },
            )
-            SwitchPreference(
-                prefs.devtools.showLastLayoutComputation,
-                title = "Show last layout computation",
-                summary = "Show the last layout computation in a dialog",
-                enabledIf = { prefs.devtools.enabled isEqualTo true },
-            )
            SwitchPreference(
                prefs.devtools.showSpellingOverlay,
                title = stringRes(R.string.devtools__show_spelling_overlay__label),
                summary = stringRes(R.string.devtools__show_spelling_overlay__summary),
                enabledIf = { prefs.devtools.enabled isEqualTo true },
            )
-            SwitchPreference(
-                prefs.devtools.showInlineAutofillOverlay,
-                title = stringRes(R.string.devtools__show_inline_autofill_overlay__label),
-                summary = stringRes(R.string.devtools__show_inline_autofill_overlay__summary),
-                enabledIf = { prefs.devtools.enabled isEqualTo true },
-                visibleIf = { AndroidVersion.ATLEAST_API30_R },
-            )
            SwitchPreference(
                prefs.devtools.showKeyTouchBoundaries,
                title = stringRes(R.string.devtools__show_key_touch_boundaries__label),
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/ExportDebugLogScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/devtools/ExportDebugLogScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@

 package dev.patrickgold.florisboard.app.devtools

-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
@@ -37,21 +35,19 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.sp
-import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.florisPreferenceModel
 import dev.patrickgold.florisboard.clipboardManager
+import org.florisboard.lib.android.showShortToast
 import dev.patrickgold.florisboard.lib.compose.FlorisButton
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.florisHorizontalScroll
 import dev.patrickgold.florisboard.lib.compose.florisScrollbar
-import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.devtools.Devtools
-import org.florisboard.lib.android.showShortToast

-// TODO: This screen is just a quick thrown-together thing and needs further enhancing in the UI
+// TODO: This screen is just a quick thrown-together thing and needs further enhancing in the UI and in localization
@Composable
 fun ExportDebugLogScreen() = FlorisScreen {
-    title = stringRes(R.string.devtools__debuglog__title)
+    title = "Debug log"
    scrollable = false

    val prefs by florisPreferenceModel()
@@ -59,36 +55,21 @@ fun ExportDebugLogScreen() = FlorisScreen {
    val clipboardManager by context.clipboardManager()

    var debugLog by remember { mutableStateOf<List<String>?>(null) }
-    var formattedDebugLog by remember { mutableStateOf<List<String>?>(null) }

    LaunchedEffect(Unit) {
        debugLog = Devtools.generateDebugLog(context, prefs, includeLogcat = true).lines()
-        formattedDebugLog = Devtools.generateDebugLogForGithub(context, prefs, includeLogcat = true).lines()
    }

    bottomBar {
-        Row(
-            horizontalArrangement = Arrangement.SpaceEvenly,
+        FlorisButton(
+            onClick = {
+                clipboardManager.addNewPlaintext(debugLog!!.joinToString("\n"))
+                context.showShortToast("Copied debug log to clipboard")
+            },
            modifier = Modifier.fillMaxWidth(),
-        ) {
-            FlorisButton(
-                onClick = {
-                    clipboardManager.addNewPlaintext(debugLog!!.joinToString("\n"))
-                    context.showShortToast(context.getString(R.string.devtools__debuglog__copied_to_clipboard))
-                },
-                modifier = Modifier,
-                text = stringRes(R.string.devtools__debuglog__copy_log),
-                enabled = debugLog != null,
-            )
-            FlorisButton(
-                onClick = {
-                    clipboardManager.addNewPlaintext(formattedDebugLog!!.joinToString("\n"))
-                    context.showShortToast(context.getString(R.string.devtools__debuglog__copied_to_clipboard))
-                },
-                text = stringRes(R.string.devtools__debuglog__copy_for_github),
-                enabled = debugLog != null,
-            )
-        }
+            text = "Export (copy to clipboard)",
+            enabled = debugLog != null,
+        )
    }

    content {
@@ -105,7 +86,7 @@ fun ExportDebugLogScreen() = FlorisScreen {
                val log = debugLog
                if (log == null) {
                    item {
-                        Text(stringRes(R.string.devtools__debuglog__loading))
+                        Text("Loading...")
                    }
                } else {
                    items(log) { logLine ->
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/AddonBox.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/AddonBox.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package dev.patrickgold.florisboard.app.ext

 import androidx.compose.foundation.layout.Row
@@ -32,13 +16,13 @@ import androidx.compose.ui.unit.dp
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
+import dev.patrickgold.florisboard.lib.util.launchUrl
 import dev.patrickgold.florisboard.lib.compose.FlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.FlorisTextButton
 import dev.patrickgold.florisboard.lib.compose.defaultFlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.ext.Extension
 import dev.patrickgold.florisboard.lib.ext.generateUpdateUrl
-import dev.patrickgold.florisboard.lib.util.launchUrl
 import org.florisboard.lib.kotlin.curlyFormat

@Composable
@@ -59,7 +43,7 @@ fun UpdateBox(extensionIndex: List<Extension>) {
        ) {
            FlorisTextButton(
                onClick = {
-                    context.launchUrl(extensionIndex.generateUpdateUrl())
+                    context.launchUrl(extensionIndex.generateUpdateUrl(version = "v~draft2", host = "fladdonstest.patrickgold.dev"))
                },
                icon = Icons.Outlined.FileDownload,
                text = stringRes(id = R.string.ext__update_box__search_for_updates)
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/CheckUpdatesScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/CheckUpdatesScreen.kt
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dev.patrickgold.florisboard.app.ext
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import dev.patrickgold.florisboard.R
-import dev.patrickgold.florisboard.extensionManager
-import dev.patrickgold.florisboard.lib.compose.FlorisScreen
-import dev.patrickgold.florisboard.lib.compose.stringRes
-
-@Composable
-fun CheckUpdatesScreen() = FlorisScreen {
-    title = stringRes(R.string.ext__check_updates__title)
-
-    val context = LocalContext.current
-    val extensionManager by context.extensionManager()
-    val extensionIndex = extensionManager.combinedExtensionList()
-
-    content {
-        UpdateBox(extensionIndex)
-    }
-}
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionComponentView.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionComponentView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionEditScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionEditScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.outlined.LibraryBooks
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.outlined.LibraryBooks
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextFieldDefaults
 import androidx.compose.material3.Text
@@ -322,17 +322,17 @@ private fun EditScreen(
        FlorisOutlinedBox(
            modifier = Modifier.defaultFlorisOutlinedBox(),
        ) {
-            Preference(
+            this@content.Preference(
                onClick = { workspace.currentAction = EditorAction.ManageMetaData },
                icon = Icons.Default.Code,
                title = stringRes(R.string.ext__editor__metadata__title),
            )
-            Preference(
+            this@content.Preference(
                onClick = { workspace.currentAction = EditorAction.ManageDependencies },
-                icon = Icons.AutoMirrored.Outlined.LibraryBooks,
+                icon = Icons.Outlined.LibraryBooks,
                title = stringRes(R.string.ext__editor__dependencies__title),
            )
-            Preference(
+            this@content.Preference(
                onClick = { workspace.currentAction = EditorAction.ManageFiles },
                icon = vectorResource(R.drawable.ic_file_blank),
                title = stringRes(R.string.ext__editor__files__title),
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionExportScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionExportScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionHomeScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionHomeScreen.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package dev.patrickgold.florisboard.app.ext

 import androidx.compose.foundation.layout.Row
@@ -37,13 +21,14 @@ import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
 import dev.patrickgold.florisboard.extensionManager
+import dev.patrickgold.florisboard.lib.util.launchUrl
 import dev.patrickgold.florisboard.lib.compose.FlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.FlorisTextButton
 import dev.patrickgold.florisboard.lib.compose.defaultFlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.stringRes
-import dev.patrickgold.florisboard.lib.util.launchUrl
 import dev.patrickgold.jetpref.datastore.ui.Preference
+import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup

@Composable
 fun ExtensionHomeScreen() = FlorisScreen {
@@ -89,26 +74,28 @@ fun ExtensionHomeScreen() = FlorisScreen {

        UpdateBox(extensionIndex = extensionIndex)

-        Preference(
-            icon = Icons.Default.Palette,
-            title = stringRes(R.string.ext__list__ext_theme),
-            onClick = {
-                navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_THEME, false))
-            },
-        )
-        Preference(
-            icon = Icons.Default.Keyboard,
-            title = stringRes(R.string.ext__list__ext_keyboard),
-            onClick = {
-                navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_KEYBOARD, false))
-            },
-        )
-        Preference(
-            icon = Icons.Default.Language,
-            title = stringRes(R.string.ext__list__ext_languagepack),
-            onClick = {
-                navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_LANGUAGEPACK, false))
-            },
-        )
+        PreferenceGroup(title = stringRes(id = R.string.ext__home__visit_store)) {
+            Preference(
+                icon = Icons.Default.Palette,
+                title = stringRes(R.string.ext__list__ext_theme),
+                onClick = {
+                    navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_THEME,false))
+                },
+            )
+            Preference(
+                icon = Icons.Default.Keyboard,
+                title = stringRes(R.string.ext__list__ext_keyboard),
+                onClick = {
+                    navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_KEYBOARD,false))
+                },
+            )
+            Preference(
+                icon = Icons.Default.Language,
+                title = stringRes(R.string.ext__list__ext_languagepack),
+                onClick = {
+                    navController.navigate(Routes.Ext.List(ExtensionListScreenType.EXT_LANGUAGEPACK,false))
+                },
+            )
+        }
    }
 }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionImportScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionImportScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionKeywordChip.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionKeywordChip.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionList.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionList.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionListScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionListScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 The FlorisBoard Contributors
+ * Copyright (C) 2024 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,15 +17,10 @@
 package dev.patrickgold.florisboard.app.ext

 import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Edit
@@ -38,13 +33,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import dev.patrickgold.florisboard.R
@@ -56,7 +46,6 @@ import dev.patrickgold.florisboard.lib.compose.FlorisOutlinedBox
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.FlorisTextButton
 import dev.patrickgold.florisboard.lib.compose.defaultFlorisOutlinedBox
-import dev.patrickgold.florisboard.lib.compose.florisScrollbar
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.ext.ExtensionManager
 import dev.patrickgold.florisboard.lib.observeAsNonNullState
@@ -91,66 +80,49 @@ enum class ExtensionListScreenType(
 fun ExtensionListScreen(type: ExtensionListScreenType, showUpdate: Boolean) = FlorisScreen {
    title = stringRes(type.titleResId)
    previewFieldVisible = false
-    scrollable = false

    val context = LocalContext.current
    val navController = LocalNavController.current
    val extensionManager by context.extensionManager()
    val extensionIndex by type.getExtensionIndex(extensionManager).observeAsNonNullState()

-    var fabHeight by remember {
-        mutableStateOf(0)
-    }
-    val fabHeightDp = with(LocalDensity.current) { fabHeight.toDp()+16.dp }
-    val listState = rememberLazyListState()
-
    content {
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .florisScrollbar(state = listState, isVertical = true),
-            state = listState,
-            contentPadding = PaddingValues(bottom = fabHeightDp),
-        ) {
-            if (showUpdate) {
-                item {
-                    UpdateBox(extensionIndex = extensionIndex)
-                }
-            }
-            items(extensionIndex) { ext ->
-                FlorisOutlinedBox(
-                    modifier = Modifier.defaultFlorisOutlinedBox(),
-                    title = ext.meta.title,
-                    subtitle = ext.meta.id,
+        if (showUpdate) {
+            UpdateBox(extensionIndex = extensionIndex)
+        }
+        for (ext in extensionIndex) {
+            FlorisOutlinedBox(
+                modifier = Modifier.defaultFlorisOutlinedBox(),
+                title = ext.meta.title,
+                subtitle = ext.meta.id,
+            ) {
+                Text(
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
+                    text = ext.meta.description ?: "",
+                    style = MaterialTheme.typography.bodySmall,
+                )
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 6.dp),
                ) {
-                    Text(
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
-                        text = ext.meta.description ?: "",
-                        style = MaterialTheme.typography.bodySmall,
+                    FlorisTextButton(
+                        onClick = {
+                            navController.navigate(Routes.Ext.View(ext.meta.id))
+                        },
+                        icon = Icons.Outlined.Info,
+                        text = stringRes(id = R.string.ext__list__view_details),//stringRes(R.string.action__add),
+                        colors = ButtonDefaults.textButtonColors(),
+                    )
+                    Spacer(modifier = Modifier.weight(1f))
+                    FlorisTextButton(
+                        onClick = {
+                            navController.navigate(Routes.Ext.Edit(ext.meta.id))
+                        },
+                        icon = Icons.Default.Edit,
+                        text = stringRes(R.string.action__edit),
+                        enabled = extensionManager.canDelete(ext),
                    )
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(horizontal = 6.dp),
-                    ) {
-                        FlorisTextButton(
-                            onClick = {
-                                navController.navigate(Routes.Ext.View(ext.meta.id))
-                            },
-                            icon = Icons.Outlined.Info,
-                            text = stringRes(id = R.string.ext__list__view_details),//stringRes(R.string.action__add),
-                            colors = ButtonDefaults.textButtonColors(),
-                        )
-                        Spacer(modifier = Modifier.weight(1f))
-                        FlorisTextButton(
-                            onClick = {
-                                navController.navigate(Routes.Ext.Edit(ext.meta.id))
-                            },
-                            icon = Icons.Default.Edit,
-                            text = stringRes(R.string.action__edit),
-                            enabled = extensionManager.canDelete(ext),
-                        )
-                    }
                }
            }
        }
@@ -170,9 +142,6 @@ fun ExtensionListScreen(type: ExtensionListScreenType, showUpdate: Boolean) = Fl
                        text = stringRes(id = R.string.ext__editor__title_create_any),
                    )
                },
-                modifier = Modifier.onGloballyPositioned {
-                    fabHeight = it.size.height
-                },
                shape = FloatingActionButtonDefaults.extendedFabShape,
                onClick = { type.launchExtensionCreate.invoke(navController) },
            )
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionMaintainerChip.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionMaintainerChip.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionNotFoundScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionNotFoundScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionViewScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/ext/ExtensionViewScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -224,7 +224,7 @@ private fun ExtensionMetaRowSimpleText(
    content: @Composable RowScope.() -> Unit,
 ) {
    if (showDividerAbove) {
-        HorizontalDivider()
+        Divider()
    }
    Row(
        modifier = modifier
@@ -246,7 +246,7 @@ private fun ExtensionMetaRowScrollableChips(
    content: @Composable RowScope.() -> Unit,
 ) {
    if (showDividerAbove) {
-        HorizontalDivider()
+        Divider()
    }
    Row(
        modifier = modifier.fillMaxWidth(),
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/HomeScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/HomeScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/AboutScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/AboutScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/ProjectLicenseScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/ProjectLicenseScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/ThirdPartyLicensesScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/about/ThirdPartyLicensesScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/AdvancedScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/AdvancedScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/BackupScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/BackupScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,17 +25,13 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.RadioButton
-import androidx.compose.material3.TriStateCheckbox
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.state.ToggleableState
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
@@ -90,23 +86,10 @@ object Backup {
        var clipboardTextItems by mutableStateOf(false)
        var clipboardImageItems by mutableStateOf(false)
        var clipboardVideoItems by mutableStateOf(false)
+        var clipboardData by mutableStateOf(false)

-        private var _clipboardData: MutableState<ToggleableState> = mutableStateOf(ToggleableState.Off)
-        val clipboardData: State<ToggleableState> = _clipboardData
-
-        fun updateCheckboxState() {
-            val newValue = if (
-                !clipboardVideoItems && !clipboardImageItems && !clipboardTextItems
-            ) {
-                ToggleableState.Off
-            } else if (
-                clipboardVideoItems && clipboardImageItems && clipboardTextItems
-            ) {
-                ToggleableState.On
-            } else {
-                ToggleableState.Indeterminate
-            }
-            _clipboardData.value = newValue
+        fun validateClipboardCheckbox(): Boolean {
+            return clipboardTextItems && clipboardImageItems && clipboardVideoItems
        }

        fun provideClipboardItems(): Boolean {
@@ -326,31 +309,28 @@ internal fun BackupFilesSelector(
            text = stringRes(R.string.backup_and_restore__back_up__files_ime_theme),
        )

-        TriStateCheckboxListItem(
+        CheckboxListItem(
            onClick = {
-                if (
-                    filesSelector.clipboardData.value == ToggleableState.Off ||
-                    filesSelector.clipboardData.value == ToggleableState.Indeterminate
-                ) {
+                if (!filesSelector.clipboardData) {
+                    filesSelector.clipboardTextItems = true
                    filesSelector.clipboardImageItems = true
                    filesSelector.clipboardVideoItems = true
-                    filesSelector.clipboardTextItems = true
                } else {
+                    filesSelector.clipboardTextItems = false
                    filesSelector.clipboardImageItems = false
                    filesSelector.clipboardVideoItems = false
-                    filesSelector.clipboardTextItems = false
                }
-                filesSelector.updateCheckboxState()
+                filesSelector.clipboardData = filesSelector.validateClipboardCheckbox()
            },
-            state = filesSelector.clipboardData.value,
-            text = stringRes(R.string.backup_and_restore__back_up__files_clipboard_history),
+            checked = filesSelector.clipboardTextItems && filesSelector.clipboardImageItems && filesSelector.clipboardVideoItems,
+            text = stringRes(R.string.backup_and_restore__back_up__files_clipboard_history)
        )


        CheckboxListItem(
            onClick = {
                filesSelector.clipboardTextItems = !filesSelector.clipboardTextItems
-                filesSelector.updateCheckboxState()
+                filesSelector.clipboardData = filesSelector.validateClipboardCheckbox()
            },
            checked = filesSelector.clipboardTextItems,
            text = stringRes(R.string.backup_and_restore__back_up__files_clipboard_history__clipboard_text_items),
@@ -359,7 +339,7 @@ internal fun BackupFilesSelector(
        CheckboxListItem(
            onClick = {
                filesSelector.clipboardImageItems = !filesSelector.clipboardImageItems
-                filesSelector.updateCheckboxState()
+                filesSelector.clipboardData = filesSelector.validateClipboardCheckbox()
            },
            checked = filesSelector.clipboardImageItems,
            text = stringRes(R.string.backup_and_restore__back_up__files_clipboard_history__clipboard_image_items),
@@ -368,7 +348,7 @@ internal fun BackupFilesSelector(
        CheckboxListItem(
            onClick = {
                filesSelector.clipboardVideoItems = !filesSelector.clipboardVideoItems
-                filesSelector.updateCheckboxState()
+                filesSelector.clipboardData = filesSelector.validateClipboardCheckbox()
            },
            checked = filesSelector.clipboardVideoItems,
            text = stringRes(R.string.backup_and_restore__back_up__files_clipboard_history__clipboard_video_items),
@@ -402,30 +382,6 @@ internal fun CheckboxListItem(
    )
 }

-@Composable
-internal fun TriStateCheckboxListItem(
-    onClick: () -> Unit,
-    state: ToggleableState,
-    text: String,
-    isSecondaryListItem: Boolean = false,
-) {
-    JetPrefListItem(
-        modifier = Modifier.rippleClickable(onClick = onClick),
-        icon = {
-            Row {
-                if (isSecondaryListItem) {
-                    Spacer(modifier = Modifier.width(40.dp))
-                }
-                TriStateCheckbox(
-                    state = state,
-                    onClick = null,
-                )
-            }
-        },
-        text = text,
-    )
-}
-
@Composable
 internal fun RadioListItem(
    onClick: () -> Unit,
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/RestoreScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/advanced/RestoreScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -138,10 +138,7 @@ fun RestoreScreen() = FlorisScreen {
                }
                restoreWorkspace = workspace
            }.onFailure { error ->
-                context.showLongToast(
-                    R.string.backup_and_restore__restore__failure,
-                    "error_message" to error.localizedMessage,
-                )
+                context.showLongToast(R.string.backup_and_restore__restore__failure, "error_message" to error.localizedMessage)
            }
        },
    )
@@ -179,20 +176,15 @@ fun RestoreScreen() = FlorisScreen {
                srcDir.copyRecursively(dstDir, overwrite = true)
            }
        }
-        val clipboardManager = context.clipboardManager().value
-        if (shouldReset) {
-            clipboardManager.clearFullHistory()
-            ClipboardFileStorage.resetClipboardFileStorage(context)
-        }
-
        if (restoreFilesSelector.provideClipboardItems()) {
            val clipboardFilesDir = workspace.outputDir.subDir("clipboard")
+            val clipboardManager = context.clipboardManager().value

            if (restoreFilesSelector.clipboardTextItems) {
                val clipboardItems = clipboardFilesDir.subFile(Backup.CLIPBOARD_TEXT_ITEMS_JSON_NAME)
                if (clipboardItems.exists()) {
                    val clipboardItemsList = clipboardItems.readJson<List<ClipboardItem>>()
-                    clipboardManager.restoreHistory(items = clipboardItemsList.filter { it.type == ItemType.TEXT })
+                    clipboardManager.restoreHistory(shouldReset = shouldReset, items = clipboardItemsList.filter { it.type == ItemType.TEXT }, itemType = ItemType.TEXT)
                }
            }
            if (restoreFilesSelector.clipboardImageItems) {
@@ -200,18 +192,14 @@ fun RestoreScreen() = FlorisScreen {
                if (clipboardItems.exists()) {
                    val clipboardItemsList = clipboardItems.readJson<List<ClipboardItem>>()
                    for (item in clipboardItemsList.filter { it.type == ItemType.IMAGE }) {
-                        ClipboardFileStorage.insertFileFromBackupIfNotExisting(
+                        ClipboardFileStorage.instertFileFromBackup(
                            context,
                            clipboardFilesDir.subFile(
-                                relPath = "${ClipboardFileStorage.CLIPBOARD_FILES_PATH}/${
-                                    item.uri!!.path!!.split(
-                                        '/'
-                                    ).last()
-                                }"
+                                relPath = "${ClipboardFileStorage.CLIPBOARD_FILES_PATH}/${item.uri!!.path!!.split('/').last()}"
                            )
                        )
                    }
-                    clipboardManager.restoreHistory(items = clipboardItemsList.filter { it.type == ItemType.IMAGE })
+                    clipboardManager.restoreHistory(shouldReset = shouldReset, items = clipboardItemsList.filter { it.type == ItemType.IMAGE }, itemType = ItemType.IMAGE)
                }
            }
            if (restoreFilesSelector.clipboardVideoItems) {
@@ -219,18 +207,14 @@ fun RestoreScreen() = FlorisScreen {
                if (clipboardItems.exists()) {
                    val clipboardItemsList = clipboardItems.readJson<List<ClipboardItem>>()
                    for (item in clipboardItemsList.filter { it.type == ItemType.VIDEO }) {
-                        ClipboardFileStorage.insertFileFromBackupIfNotExisting(
+                        ClipboardFileStorage.instertFileFromBackup(
                            context,
                            clipboardFilesDir.subFile(
-                                relPath = "${ClipboardFileStorage.CLIPBOARD_FILES_PATH}/${
-                                    item.uri!!.path!!.split(
-                                        '/'
-                                    ).last()
-                                }"
+                                relPath = "${ClipboardFileStorage.CLIPBOARD_FILES_PATH}/${item.uri!!.path!!.split('/').last()}"
                            )
                        )
                    }
-                    clipboardManager.restoreHistory(items = clipboardItemsList.filter { it.type == ItemType.VIDEO })
+                    clipboardManager.restoreHistory(shouldReset = shouldReset, items = clipboardItemsList.filter { it.type == ItemType.VIDEO }, itemType = ItemType.VIDEO)
                }
            }
        }
@@ -254,11 +238,7 @@ fun RestoreScreen() = FlorisScreen {
                            context.showLongToast(R.string.backup_and_restore__restore__success)
                            navController.navigateUp()
                        } catch (e: Throwable) {
-                            e.printStackTrace()
-                            context.showLongToast(
-                                R.string.backup_and_restore__restore__failure,
-                                "error_message" to e.localizedMessage,
-                            )
+                            context.showLongToast(R.string.backup_and_restore__restore__failure, "error_message" to e.localizedMessage)
                        }
                    }
                },
@@ -293,10 +273,7 @@ fun RestoreScreen() = FlorisScreen {
                runCatching {
                    restoreDataFromFileSystemLauncher.launch("*/*")
                }.onFailure { error ->
-                    context.showLongToast(
-                        R.string.backup_and_restore__restore__failure,
-                        "error_message" to error.localizedMessage,
-                    )
+                    context.showLongToast(R.string.backup_and_restore__restore__failure, "error_message" to error.localizedMessage)
                }
            },
            modifier = Modifier
@@ -318,15 +295,15 @@ fun RestoreScreen() = FlorisScreen {
                modifier = Modifier.defaultFlorisOutlinedBox(),
                title = stringRes(R.string.backup_and_restore__restore__metadata),
            ) {
-                Preference(
+                this@content.Preference(
                    icon = Icons.Default.Code,
                    title = workspace.metadata.packageName,
                )
-                Preference(
+                this@content.Preference(
                    icon = Icons.Outlined.Info,
                    title = "${workspace.metadata.versionName} (${workspace.metadata.versionCode})",
                )
-                Preference(
+                this@content.Preference(
                    icon = Icons.Default.Schedule,
                    title = remember(workspace.metadata.timestamp) {
                        val formatter = DateFormat.getDateTimeInstance()
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/clipboard/ClipboardScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/clipboard/ClipboardScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import dev.patrickgold.jetpref.datastore.ui.DialogSliderPreference
 import dev.patrickgold.jetpref.datastore.ui.ExperimentalJetPrefDatastoreUi
 import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
 import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
-import org.florisboard.lib.android.AndroidVersion

@OptIn(ExperimentalJetPrefDatastoreUi::class)
@Composable
@@ -72,22 +71,6 @@ fun ClipboardScreen() = FlorisScreen {
                stepIncrement = 5,
                enabledIf = { prefs.clipboard.historyEnabled isEqualTo true && prefs.clipboard.cleanUpOld isEqualTo true },
            )
-            SwitchPreference(
-                prefs.clipboard.autoCleanSensitive,
-                title = stringRes(R.string.pref__clipboard__auto_clean_sensitive__label),
-                enabledIf = { prefs.clipboard.historyEnabled isEqualTo true },
-                visibleIf = { AndroidVersion.ATLEAST_API33_T },
-            )
-            DialogSliderPreference(
-                prefs.clipboard.autoCleanSensitiveAfter,
-                title = stringRes(R.string.pref__clipboard__auto_clean_sensitive_after__label),
-                valueLabel = { pluralsRes(R.plurals.unit__seconds__written, it, "v" to it) },
-                min = 0,
-                max = 300,
-                stepIncrement = 10,
-                enabledIf = { prefs.clipboard.historyEnabled isEqualTo true && prefs.clipboard.autoCleanSensitive isEqualTo true },
-                visibleIf = { AndroidVersion.ATLEAST_API33_T },
-            )
            SwitchPreference(
                prefs.clipboard.limitHistorySize,
                title = stringRes(R.string.pref__clipboard__limit_history_size__label),
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/dictionary/DictionaryScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/dictionary/DictionaryScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/dictionary/UserDictionaryScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/dictionary/UserDictionaryScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.DropdownMenu
@@ -193,7 +193,7 @@ fun UserDictionaryScreen(type: UserDictionaryType) = FlorisScreen {
            icon = if (currentLocale != null) {
                Icons.Default.Close
            } else {
-                Icons.AutoMirrored.Filled.ArrowBack
+                Icons.Default.ArrowBack
            },
        )
    }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/gestures/GesturesScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/gestures/GesturesScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/keyboard/InputFeedbackScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/keyboard/InputFeedbackScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/keyboard/KeyboardScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/keyboard/KeyboardScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@ fun KeyboardScreen() = FlorisScreen {
            title = stringRes(R.string.pref__keyboard__hinted_number_row_mode__label),
            summarySwitchDisabled = stringRes(R.string.state__disabled),
            entries = enumDisplayEntriesOf(KeyHintMode::class),
-            enabledIf = { prefs.keyboard.numberRow.isFalse() }
        )
        ListPreference(
            listPref = prefs.keyboard.hintedSymbolsMode,
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/LanguagePackManagerScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/LanguagePackManagerScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ fun LanguagePackManagerScreen(action: LanguagePackManagerScreenAction?) = Floris
            FlorisOutlinedBox(
                modifier = Modifier.defaultFlorisOutlinedBox(),
            ) {
-                Preference(
+                this@content.Preference(
                    onClick = { navController.navigate(
                        Routes.Ext.Import(ExtensionImportScreenType.EXT_LANGUAGEPACK, null)
                    ) },
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/LocalizationScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/LocalizationScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@

 package dev.patrickgold.florisboard.app.settings.localization

-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
@@ -26,13 +24,8 @@ import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
@@ -40,8 +33,8 @@ import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
 import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
+import dev.patrickgold.florisboard.cacheManager
 import dev.patrickgold.florisboard.ime.core.DisplayLanguageNamesIn
-import dev.patrickgold.florisboard.ime.core.Subtype
 import dev.patrickgold.florisboard.ime.keyboard.LayoutType
 import dev.patrickgold.florisboard.keyboardManager
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
@@ -53,20 +46,7 @@ import dev.patrickgold.jetpref.datastore.model.observeAsState
 import dev.patrickgold.jetpref.datastore.ui.ListPreference
 import dev.patrickgold.jetpref.datastore.ui.Preference
 import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
-import dev.patrickgold.jetpref.material.ui.JetPrefAlertDialog
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json

-internal val SubtypeSaver = Saver<MutableState<Subtype?>, String>(
-    save = {
-        Json.encodeToString<Subtype?>(it.value)
-    },
-    restore = {
-        mutableStateOf(Json.decodeFromString(it))
-    },
-)
-
-@OptIn(ExperimentalFoundationApi::class)
@Composable
 fun LocalizationScreen() = FlorisScreen {
    title = stringRes(R.string.settings__localization__title)
@@ -77,7 +57,7 @@ fun LocalizationScreen() = FlorisScreen {
    val context = LocalContext.current
    val keyboardManager by context.keyboardManager()
    val subtypeManager by context.subtypeManager()
-    var chosenSubtypeToDelete: Subtype? by rememberSaveable(saver = SubtypeSaver) { mutableStateOf(null) }
+    val cacheManager by context.cacheManager()

    floatingActionButton {
        ExtendedFloatingActionButton(
@@ -104,6 +84,7 @@ fun LocalizationScreen() = FlorisScreen {
            entries = enumDisplayEntriesOf(DisplayLanguageNamesIn::class),
        )
        Preference(
+//            icon = R.drawable.ic_edit,
            title = stringRes(R.string.settings__localization__language_pack_title),
            summary = stringRes(R.string.settings__localization__language_pack_summary),
            onClick = {
@@ -137,50 +118,17 @@ fun LocalizationScreen() = FlorisScreen {
                            DisplayLanguageNamesIn.NATIVE_LOCALE -> subtype.primaryLocale.displayName(subtype.primaryLocale)
                        },
                        summary = summary,
-                        modifier = Modifier.combinedClickable(
-                            onClick = {
-                                navController.navigate(
-                                    Routes.Settings.SubtypeEdit(subtype.id)
-                                )
-                            },
-                            onLongClick = {
-                                chosenSubtypeToDelete = subtype
-                            },
-                        )
+                        onClick = {
+                            navController.navigate(
+                                Routes.Settings.SubtypeEdit(subtype.id)
+                            )
+                        },
                    )
                }
            }
        }
-    }

-    DeleteSubtypeConfirmationDialog(
-        subtypeToDelete = chosenSubtypeToDelete,
-        onDismiss = {
-            chosenSubtypeToDelete = null
-        },
-        onConfirm = {
-            chosenSubtypeToDelete?.let { subtypeManager.removeSubtype(subtypeToRemove = it) }
-            chosenSubtypeToDelete = null
-        }
-    )
-
-}
-
-@Composable
-fun DeleteSubtypeConfirmationDialog(
-    subtypeToDelete: Subtype?,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-)   {
-    subtypeToDelete?.let {
-        JetPrefAlertDialog(
-            title = stringRes(R.string.settings__localization__subtype_delete_confirmation_title),
-            confirmLabel = stringRes(R.string.action__yes),
-            dismissLabel = stringRes(R.string.action__no),
-            onDismiss = onDismiss,
-            onConfirm = onConfirm,
-            ) {
-                Text(stringRes(R.string.settings__localization__subtype_delete_confirmation_warning))
-            }
+        //PreferenceGroup(title = stringRes(R.string.settings__localization__group_layouts__label)) {
+        //}
    }
 }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/SelectLocaleScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/SelectLocaleScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/SubtypeEditorScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/localization/SubtypeEditorScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,17 +25,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.AlertDialogDefaults
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -52,11 +47,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Observer
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
@@ -78,7 +73,6 @@ import dev.patrickgold.florisboard.lib.compose.FlorisButtonBar
 import dev.patrickgold.florisboard.lib.compose.FlorisDropdownLikeButton
 import dev.patrickgold.florisboard.lib.compose.FlorisDropdownMenu
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
-import dev.patrickgold.florisboard.lib.compose.florisScrollbar
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.florisboard.lib.ext.ExtensionComponentName
 import dev.patrickgold.florisboard.lib.observeAsNonNullState
@@ -184,7 +178,7 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
    })

    val selectValue = stringRes(R.string.settings__localization__subtype_select_placeholder)
-    val selectListValues = remember(selectValue) { listOf(selectValue) }
+    val selectListValues = remember (selectValue) { listOf(selectValue) }

    val prefs by florisPreferenceModel()
    val navController = LocalNavController.current
@@ -213,7 +207,7 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
    var layoutMap by subtypeEditor.layoutMap
    var nlpProviders by subtypeEditor.nlpProviders

-    var showSubtypePresetsDialog by rememberSaveable { mutableStateOf(id == null) }
+    var showSubtypePresetsDialog by rememberSaveable { mutableStateOf(false) }
    var showSelectAsError by rememberSaveable { mutableStateOf(false) }
    var errorDialogStrId by rememberSaveable { mutableStateOf<Int?>(null) }

@@ -231,24 +225,6 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
        onDispose { selectLocaleScreenResult?.removeObserver(observer) }
    }

-
-    @Composable
-    fun SubtypePropertyDropdown(
-        title: String,
-        layoutType: LayoutType,
-    ) {
-        SubtypeProperty(title) {
-            SubtypeLayoutDropdown(
-                layoutType = layoutType,
-                layouts = layoutExtensions[layoutType] ?: mapOf(),
-                showSelectAsError = showSelectAsError,
-                layoutMap = layoutMap,
-                onLayoutMapChanged = { layoutMap = it },
-                selectListValues = selectListValues,
-            )
-        }
-    }
-
    actions {
        if (id != null) {
            IconButton(onClick = {
@@ -333,7 +309,6 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
                                        DisplayLanguageNamesIn.NATIVE_LOCALE -> suggestedPreset.locale.displayName(suggestedPreset.locale)
                                    },
                                    secondaryText = suggestedPreset.preferred.characters.componentId,
-                                    colors = ListItemDefaults.colors(containerColor = CardDefaults.cardColors().containerColor),
                                )
                            }
                        } else {
@@ -387,7 +362,17 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
                    onDismissRequest = { expanded = false },
                )
            }
-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_characters_layout), LayoutType.CHARACTERS)
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_characters_layout)) {
+                val layoutType = LayoutType.CHARACTERS
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }

            SubtypeGroupSpacer()

@@ -423,9 +408,28 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {

            SubtypeGroupSpacer()

-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_symbols_layout), LayoutType.SYMBOLS)
-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_symbols2_layout), LayoutType.SYMBOLS2)
-
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_symbols_layout)) {
+                val layoutType = LayoutType.SYMBOLS
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_symbols2_layout)) {
+                val layoutType = LayoutType.SYMBOLS2
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
            SubtypeProperty(stringRes(R.string.settings__localization__subtype_composer)) {
                val composerIds = remember(composers) {
                    SelectListKeys + composers.keys
@@ -465,17 +469,64 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {

            SubtypeGroupSpacer()

-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_numeric_layout), LayoutType.NUMERIC)
-
-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_numeric_advanced_layout), LayoutType.NUMERIC_ADVANCED)
-
-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_numeric_row_layout), LayoutType.NUMERIC_ROW)
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_numeric_layout)) {
+                val layoutType = LayoutType.NUMERIC
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_numeric_advanced_layout)) {
+                val layoutType = LayoutType.NUMERIC_ADVANCED
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_numeric_row_layout)) {
+                val layoutType = LayoutType.NUMERIC_ROW
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }

            SubtypeGroupSpacer()

-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_phone_layout), LayoutType.PHONE)
-
-            SubtypePropertyDropdown(stringRes(R.string.settings__localization__subtype_phone2_layout), LayoutType.PHONE2)
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_phone_layout)) {
+                val layoutType = LayoutType.PHONE
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
+            SubtypeProperty(stringRes(R.string.settings__localization__subtype_phone2_layout)) {
+                val layoutType = LayoutType.PHONE2
+                SubtypeLayoutDropdown(
+                    layoutType = layoutType,
+                    layouts = layoutExtensions[layoutType] ?: mapOf(),
+                    showSelectAsError = showSelectAsError,
+                    layoutMap = layoutMap,
+                    onLayoutMapChanged = { layoutMap = it },
+                    selectListValues = selectListValues,
+                )
+            }
        }

        if (showSubtypePresetsDialog) {
@@ -488,30 +539,20 @@ fun SubtypeEditorScreen(id: Long?) = FlorisScreen {
                    showSubtypePresetsDialog = false
                },
            ) {
-                Column {
-                    HorizontalDivider()
-                    val lazyListState = rememberLazyListState()
-                    LazyColumn(
-                        modifier = Modifier
-                            .florisScrollbar(lazyListState, isVertical = true).weight(1f),
-                        state = lazyListState,
-                    ) {
-                        items(subtypePresets) { subtypePreset ->
-                            JetPrefListItem(
-                                modifier = Modifier.clickable {
-                                    subtypeEditor.applySubtype(subtypePreset.toSubtype())
-                                    showSubtypePresetsDialog = false
-                                },
-                                text = when (displayLanguageNamesIn) {
-                                    DisplayLanguageNamesIn.SYSTEM_LOCALE -> subtypePreset.locale.displayName()
-                                    DisplayLanguageNamesIn.NATIVE_LOCALE -> subtypePreset.locale.displayName(subtypePreset.locale)
-                                },
-                                secondaryText = subtypePreset.preferred.characters.componentId,
-                                colors = ListItemDefaults.colors(containerColor = AlertDialogDefaults.containerColor),
-                            )
-                        }
+                LazyColumn {
+                    items(subtypePresets) { subtypePreset ->
+                        JetPrefListItem(
+                            modifier = Modifier.clickable {
+                                subtypeEditor.applySubtype(subtypePreset.toSubtype())
+                                showSubtypePresetsDialog = false
+                            },
+                            text = when (displayLanguageNamesIn) {
+                                DisplayLanguageNamesIn.SYSTEM_LOCALE -> subtypePreset.locale.displayName()
+                                DisplayLanguageNamesIn.NATIVE_LOCALE -> subtypePreset.locale.displayName(subtypePreset.locale)
+                            },
+                            secondaryText = subtypePreset.preferred.characters.componentId,
+                        )
                    }
-                    HorizontalDivider()
                }
            }
        }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/media/MediaScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/media/MediaScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,202 +16,43 @@

 package dev.patrickgold.florisboard.app.settings.media

-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.EmojiSymbols
-import androidx.compose.material.icons.outlined.Schedule
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
-import dev.patrickgold.florisboard.app.florisPreferenceModel
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiHistory
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiHistoryHelper
 import dev.patrickgold.florisboard.ime.media.emoji.EmojiSkinTone
-import dev.patrickgold.florisboard.ime.media.emoji.EmojiSuggestionType
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
 import dev.patrickgold.florisboard.lib.compose.pluralsRes
 import dev.patrickgold.florisboard.lib.compose.stringRes
 import dev.patrickgold.jetpref.datastore.ui.DialogSliderPreference
 import dev.patrickgold.jetpref.datastore.ui.ExperimentalJetPrefDatastoreUi
 import dev.patrickgold.jetpref.datastore.ui.ListPreference
-import dev.patrickgold.jetpref.datastore.ui.Preference
-import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
-import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
-import dev.patrickgold.jetpref.material.ui.JetPrefAlertDialog
-import kotlinx.coroutines.launch

@OptIn(ExperimentalJetPrefDatastoreUi::class)
@Composable
 fun MediaScreen() = FlorisScreen {
    title = stringRes(R.string.settings__media__title)
    previewFieldVisible = true
-    iconSpaceReserved = true
-
-    val prefs by florisPreferenceModel()
-
-    var shouldDelete by remember { mutableStateOf<ShouldDelete?>(null) }
-    val scope = rememberCoroutineScope()
+    iconSpaceReserved = false

    content {
        ListPreference(
-            prefs.emoji.preferredSkinTone,
+            prefs.media.emojiPreferredSkinTone,
            title = stringRes(R.string.prefs__media__emoji_preferred_skin_tone),
            entries = enumDisplayEntriesOf(EmojiSkinTone::class),
        )
-
-        PreferenceGroup(title = stringRes(R.string.prefs__media__emoji_history__title)) {
-            SwitchPreference(
-                prefs.emoji.historyEnabled,
-                icon = Icons.Outlined.Schedule,
-                title = stringRes(R.string.prefs__media__emoji_history_enabled),
-                summary = stringRes(R.string.prefs__media__emoji_history_enabled__summary),
-            )
-            ListPreference(
-                prefs.emoji.historyPinnedUpdateStrategy,
-                title = stringRes(R.string.prefs__media__emoji_history_pinned_update_strategy),
-                entries = enumDisplayEntriesOf(EmojiHistory.UpdateStrategy::class),
-                enabledIf = { prefs.emoji.historyEnabled.isTrue() },
-            )
-            ListPreference(
-                prefs.emoji.historyRecentUpdateStrategy,
-                title = stringRes(R.string.prefs__media__emoji_history_recent_update_strategy),
-                entries = enumDisplayEntriesOf(EmojiHistory.UpdateStrategy::class),
-                enabledIf = { prefs.emoji.historyEnabled.isTrue() },
-            )
-            DialogSliderPreference(
-                primaryPref = prefs.emoji.historyPinnedMaxSize,
-                secondaryPref = prefs.emoji.historyRecentMaxSize,
-                title = stringRes(R.string.prefs__media__emoji_history_max_size),
-                primaryLabel = stringRes(R.string.emoji__history__pinned),
-                secondaryLabel = stringRes(R.string.emoji__history__recent),
-                valueLabel = { maxSize ->
-                    if (maxSize == EmojiHistory.MaxSizeUnlimited) {
-                        stringRes(R.string.general__unlimited)
-                    } else {
-                        pluralsRes(R.plurals.unit__items__written, maxSize, "v" to maxSize)
-                    }
-                },
-                min = 0,
-                max = 120,
-                stepIncrement = 1,
-                enabledIf = { prefs.emoji.historyEnabled.isTrue() },
-            )
-            Preference(
-                title = stringRes(R.string.prefs__media__emoji_history_pinned_reset),
-                onClick = {
-                    shouldDelete = ShouldDelete(true)
-                },
-                enabledIf = { prefs.emoji.historyEnabled.isTrue() },
-            )
-            Preference(
-                title = stringRes(R.string.prefs__media__emoji_history_reset),
-                onClick = {
-                    shouldDelete = ShouldDelete(false)
-                },
-                enabledIf = { prefs.emoji.historyEnabled.isTrue() },
-            )
-
-        }
-
-        PreferenceGroup(title = stringRes(R.string.prefs__media__emoji_suggestion__title)) {
-            SwitchPreference(
-                prefs.emoji.suggestionEnabled,
-                icon = Icons.Outlined.EmojiSymbols,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_enabled),
-                summary = stringRes(R.string.prefs__media__emoji_suggestion_enabled__summary),
-            )
-            ListPreference(
-                prefs.emoji.suggestionType,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_type),
-                entries = enumDisplayEntriesOf(EmojiSuggestionType::class),
-                enabledIf = { prefs.emoji.suggestionEnabled.isTrue() },
-            )
-            SwitchPreference(
-                prefs.emoji.suggestionUpdateHistory,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_update_history),
-                summary = stringRes(R.string.prefs__media__emoji_suggestion_update_history__summary),
-                enabledIf = {
-                    prefs.emoji.suggestionEnabled.isTrue() && prefs.emoji.historyEnabled.isTrue()
-                },
-            )
-            SwitchPreference(
-                prefs.emoji.suggestionCandidateShowName,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_candidate_show_name),
-                summary = stringRes(R.string.prefs__media__emoji_suggestion_candidate_show_name__summary),
-                enabledIf = { prefs.emoji.suggestionEnabled.isTrue() },
-            )
-            DialogSliderPreference(
-                prefs.emoji.suggestionQueryMinLength,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_query_min_length),
-                valueLabel = { length ->
-                    pluralsRes(R.plurals.unit__characters__written, length, "v" to length)
-                },
-                min = 1,
-                max = 5,
-                stepIncrement = 1,
-                enabledIf = { prefs.emoji.suggestionEnabled.isTrue() },
-            )
-            DialogSliderPreference(
-                prefs.emoji.suggestionCandidateMaxCount,
-                title = stringRes(R.string.prefs__media__emoji_suggestion_candidate_max_count),
-                valueLabel = { count ->
-                    pluralsRes(R.plurals.unit__candidates__written, count, "v" to count)
-                },
-                min = 1,
-                max = 10,
-                stepIncrement = 1,
-                enabledIf = { prefs.emoji.suggestionEnabled.isTrue() },
-            )
-        }
-    }
-
-    DeleteEmojiHistoryConfirmDialog(
-        shouldDelete = shouldDelete,
-        onDismiss = {
-            shouldDelete = null
-        },
-        onConfirm = {
-            shouldDelete?.let {
-                scope.launch {
-                    if (it.pinned) {
-                        EmojiHistoryHelper.deletePinned(prefs = prefs)
-                    } else {
-                        EmojiHistoryHelper.deleteHistory(prefs = prefs)
-                    }
+        DialogSliderPreference(
+            prefs.media.emojiRecentlyUsedMaxSize,
+            title = stringRes(R.string.prefs__media__emoji_recently_used_max_size),
+            valueLabel = { maxSize ->
+                if (maxSize == 0) {
+                    stringRes(R.string.general__unlimited)
+                } else {
+                    pluralsRes(R.plurals.unit__items__written, maxSize, "v" to maxSize)
                }
-                shouldDelete = null
-            }
-        },
-    )
-}
-
-@Composable
-fun DeleteEmojiHistoryConfirmDialog(
-    shouldDelete: ShouldDelete?,
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-) {
-    shouldDelete?.let {
-        JetPrefAlertDialog(
-            title = stringRes(R.string.action__reset_confirm_title),
-            confirmLabel = stringRes(R.string.action__yes),
-            dismissLabel = stringRes(R.string.action__no),
-            onDismiss = onDismiss,
-            onConfirm = onConfirm,
-        ) {
-            if (it.pinned) {
-                Text(stringRes(R.string.action__reset_confirm_message, "name" to "pinned emojis"))
-            } else {
-                Text(stringRes(R.string.action__reset_confirm_message, "name" to "emoji history"))
-            }
-
-        }
+            },
+            min = 0,
+            max = 120,
+            stepIncrement = 1,
+        )
    }
 }
-
-data class ShouldDelete(val pinned: Boolean)
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package dev.patrickgold.florisboard.app.settings.smartbar

 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
 import dev.patrickgold.florisboard.ime.smartbar.CandidatesDisplayMode
@@ -65,16 +64,11 @@ fun SmartbarScreen() = FlorisScreen {
                        prefs.smartbar.layout isEqualTo SmartbarLayout.SUGGESTIONS_ACTIONS_EXTENDED
                },
            )
-            // TODO: schedule to remove this preference in the future, but keep it for now so users
-            //  know why the setting is not available anymore. Also force enable it for UI display.
-            SideEffect {
-                prefs.smartbar.sharedActionsAutoExpandCollapse.set(true)
-            }
            SwitchPreference(
                prefs.smartbar.sharedActionsAutoExpandCollapse,
                title = stringRes(R.string.pref__smartbar__shared_actions_auto_expand_collapse__label),
-                summary = "[Since v0.4.1] Always enabled due to UX issues",
-                enabledIf = { false },
+                summary = stringRes(R.string.pref__smartbar__shared_actions_auto_expand_collapse__summary),
+                enabledIf = { prefs.smartbar.enabled isEqualTo true },
                visibleIf = { prefs.smartbar.layout isEqualTo SmartbarLayout.SUGGESTIONS_ACTIONS_SHARED },
            )
            ListPreference(
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/DisplayColorsAs.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/DisplayColorsAs.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/DisplayKbdAfterDialog.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/DisplayKbdAfterDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/EditPropertyDialog.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/EditPropertyDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.HelpOutline
+import androidx.compose.material.icons.filled.HelpOutline
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -455,7 +455,7 @@ private fun PropertyValueEditor(
                        FlorisIconButton(
                            onClick = { showSyntaxHelp = !showSyntaxHelp },
                            modifier = Modifier.offset(x = 12.dp),
-                            icon = Icons.AutoMirrored.Filled.HelpOutline,
+                            icon = Icons.Default.HelpOutline,
                        )
                    },
                ) {
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/EditRuleDialog.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/EditRuleDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -40,8 +40,8 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.text.selection.LocalTextSelectionColors
 import androidx.compose.foundation.text.selection.TextSelectionColors
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.HelpOutline
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.HelpOutline
 import androidx.compose.material.icons.filled.Pageview
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -225,6 +225,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.snygg__rule_selector__pressed)
                        },
                        selected = pressedSelector,
+                        color = if (pressedSelector) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                    FlorisChip(
                        onClick = { focusSelector = !focusSelector },
@@ -234,6 +235,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.snygg__rule_selector__focus)
                        },
                        selected = focusSelector,
+                        color = if (focusSelector) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                    FlorisChip(
                        onClick = { disabledSelector = !disabledSelector },
@@ -242,6 +244,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.snygg__rule_selector__disabled)
                        },
                        selected = disabledSelector,
+                        color = if (disabledSelector) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                }
            }
@@ -288,6 +291,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.enum__input_shift_state__unshifted)
                        },
                        selected = shiftStateUnshifted,
+                        color = if (shiftStateUnshifted) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                    FlorisChip(
                        onClick = { shiftStateShiftedManual = !shiftStateShiftedManual },
@@ -298,6 +302,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.enum__input_shift_state__shifted_manual)
                        },
                        selected = shiftStateShiftedManual,
+                        color = if (shiftStateShiftedManual) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                    FlorisChip(
                        onClick = { shiftStateShiftedAutomatic = !shiftStateShiftedAutomatic },
@@ -308,6 +313,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.enum__input_shift_state__shifted_automatic)
                        },
                        selected = shiftStateShiftedAutomatic,
+                        color = if (shiftStateShiftedAutomatic) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                    FlorisChip(
                        onClick = { shiftStateCapsLock = !shiftStateCapsLock },
@@ -318,6 +324,7 @@ internal fun EditRuleDialog(
                            else -> stringRes(R.string.enum__input_shift_state__caps_lock)
                        },
                        selected = shiftStateCapsLock,
+                        color = if (shiftStateCapsLock) MaterialTheme.colorScheme.secondary else Color.Unspecified,
                    )
                }
            }
@@ -472,7 +479,7 @@ private fun EditCodeValueDialog(
            FlorisIconButton(
                onClick = { showKeyCodesHelp = !showKeyCodesHelp },
                modifier = Modifier.offset(x = 12.dp),
-                icon = Icons.AutoMirrored.Filled.HelpOutline,
+                icon = Icons.Default.HelpOutline,
            )
        },
    ) {
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/FineTuneDialog.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/FineTuneDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/SnyggValueIcon.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/SnyggValueIcon.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeEditorScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeEditorScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeManagerScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeManagerScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeTranslations.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeTranslations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/SpellCheckerServiceSelector.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/SpellCheckerServiceSelector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
 import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
 import dev.patrickgold.florisboard.ime.nlp.SpellingLanguageMode
+import org.florisboard.lib.android.AndroidVersion
 import dev.patrickgold.florisboard.lib.compose.FlorisErrorCard
 import dev.patrickgold.florisboard.lib.compose.FlorisHyperlinkText
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
@@ -47,7 +48,6 @@ import dev.patrickgold.jetpref.datastore.ui.ListPreference
 import dev.patrickgold.jetpref.datastore.ui.Preference
 import dev.patrickgold.jetpref.datastore.ui.PreferenceGroup
 import dev.patrickgold.jetpref.datastore.ui.SwitchPreference
-import org.florisboard.lib.android.AndroidVersion

@OptIn(ExperimentalJetPrefDatastoreUi::class)
@Composable
@@ -58,11 +58,11 @@ fun TypingScreen() = FlorisScreen {
    val navController = LocalNavController.current

    content {
-        // This card is temporary and is therefore not using a string resource (not so temporary as we thought...)
+        // This card is temporary and is therefore not using a string resource
        FlorisErrorCard(
            modifier = Modifier.padding(8.dp),
            text = """
-                Suggestions (except system autofill) and spell checking are not available in this release. All
+                Suggestions (except system autofill) and spell checking are not available in this alpha release. All
                preferences in the "Corrections" group are properly implemented though.
            """.trimIndent().replace('\n', ' '),
        )
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/setup/NotificationPermissionState.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/setup/NotificationPermissionState.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2025 The FlorisBoard Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package dev.patrickgold.florisboard.app.setup

 /**
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/setup/SetupScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/setup/SetupScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/ImeUiMode.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/ImeUiMode.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/ClipboardInputLayout.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/ClipboardInputLayout.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -48,16 +48,15 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.outlined.Backspace
 import androidx.compose.material.icons.filled.ClearAll
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.ToggleOff
 import androidx.compose.material.icons.filled.ToggleOn
 import androidx.compose.material.icons.filled.Videocam
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
-import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -88,8 +87,6 @@ import dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardFileStorage
 import dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardItem
 import dev.patrickgold.florisboard.ime.clipboard.provider.ItemType
 import dev.patrickgold.florisboard.ime.keyboard.FlorisImeSizing
-import dev.patrickgold.florisboard.ime.media.KeyboardLikeButton
-import dev.patrickgold.florisboard.ime.text.keyboard.TextKeyData
 import dev.patrickgold.florisboard.ime.theme.FlorisImeTheme
 import dev.patrickgold.florisboard.ime.theme.FlorisImeUi
 import dev.patrickgold.florisboard.keyboardManager
@@ -196,13 +193,6 @@ fun ClipboardInputLayout(
                iconColor = headerStyle.foreground.solidColor(context),
                enabled = !deviceLocked && historyEnabled && !isPopupSurfaceActive(),
            )
-            KeyboardLikeButton(
-                inputEventDispatcher = keyboardManager.inputEventDispatcher,
-                keyData = TextKeyData.DELETE,
-                element = FlorisImeUi.ClipboardHeader,
-            ) {
-                Icon(Icons.AutoMirrored.Outlined.Backspace, null)
-            }
        }
    }

@@ -222,7 +212,7 @@ fun ClipboardInputLayout(
            clip = true,
            clickAndSemanticsModifier = Modifier.combinedClickable(
                interactionSource = remember { MutableInteractionSource() },
-                indication = ripple(),
+                indication = rememberRipple(),
                enabled = popupItem == null,
                onLongClick = {
                    popupItem = item
@@ -317,7 +307,7 @@ fun ClipboardInputLayout(
                            .fillMaxWidth()
                            .run { if (contentScrollInsteadOfClip) this.florisVerticalScroll() else this }
                            .padding(ItemPadding),
-                        text = item.displayText(),
+                        text = text,
                        style = TextStyle(textDirection = TextDirection.ContentOrLtr),
                        color = style.foreground.solidColor(context),
                        fontSize = style.fontSize.spSize(),
@@ -587,7 +577,7 @@ fun ClipboardInputLayout(
    Column(
        modifier = modifier
            .fillMaxWidth()
-            .height(FlorisImeSizing.imeUiHeight()),
+            .wrapContentHeight(),
    ) {
        HeaderRow()
        if (deviceLocked) {
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/ClipboardManager.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/ClipboardManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,6 +28,11 @@ import dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDao
 import dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardHistoryDatabase
 import dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardItem
 import dev.patrickgold.florisboard.ime.clipboard.provider.ItemType
+import org.florisboard.lib.android.AndroidClipboardManager
+import org.florisboard.lib.android.AndroidClipboardManager_OnPrimaryClipChangedListener
+import org.florisboard.lib.android.setOrClearPrimaryClip
+import org.florisboard.lib.android.showShortToast
+import org.florisboard.lib.android.systemService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -40,11 +45,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.florisboard.lib.android.AndroidClipboardManager
-import org.florisboard.lib.android.AndroidClipboardManager_OnPrimaryClipChangedListener
-import org.florisboard.lib.android.setOrClearPrimaryClip
-import org.florisboard.lib.android.showShortToast
-import org.florisboard.lib.android.systemService
 import org.florisboard.lib.kotlin.tryOrNull
 import java.io.Closeable

@@ -110,9 +110,7 @@ class ClipboardManager(
    val primaryClipFlow = _primaryClipFlow.asStateFlow()
    inline var primaryClip
        get() = primaryClipFlow.value
-        private set(v) {
-            _primaryClipFlow.value = v
-        }
+        private set(v) { _primaryClipFlow.value = v }

    init {
        systemClipboardManager.addPrimaryClipChangedListener(this)
@@ -254,20 +252,14 @@ class ClipboardManager(
    }

    private fun enforceExpiryDate(clipHistory: ClipboardHistory) {
-        val itemsToRemove = mutableSetOf<ClipboardItem>()
        if (prefs.clipboard.cleanUpOld.get()) {
            val nonPinnedItems = clipHistory.recent + clipHistory.other
            val expiryTime = System.currentTimeMillis() - (prefs.clipboard.cleanUpAfter.get() * 60 * 1000)
-            itemsToRemove.addAll(nonPinnedItems.filter { it.creationTimestampMs < expiryTime })
-        }
-        if (prefs.clipboard.autoCleanSensitive.get()) {
-            val sensitiveData = clipHistory.all.filter { it.isSensitive }
-            val expiryTime = System.currentTimeMillis() - (prefs.clipboard.autoCleanSensitiveAfter.get() * 1000)
-            itemsToRemove.addAll(sensitiveData.filter { it.creationTimestampMs < expiryTime })
-        }
-        if (itemsToRemove.isNotEmpty()) {
-            ioScope.launch {
-                clipHistoryDao?.delete(itemsToRemove.toList())
+            val itemsToRemove = nonPinnedItems.filter { it.creationTimestampMs < expiryTime }
+            if (itemsToRemove.isNotEmpty()) {
+                ioScope.launch {
+                    clipHistoryDao?.delete(itemsToRemove)
+                }
            }
        }
    }
@@ -286,9 +278,6 @@ class ClipboardManager(
        }
    }

-    /**
-     * Clears all unpinned items from the clipboard history
-     */
    fun clearHistory() {
        ioScope.launch {
            for (item in history().all) {
@@ -298,9 +287,6 @@ class ClipboardManager(
        }
    }

-    /**
-     * Clears the full clipboard history
-     */
    fun clearFullHistory() {
        ioScope.launch {
            for (item in history().all) {
@@ -314,15 +300,26 @@ class ClipboardManager(
    /**
     * Restore the clipboard history from a [List]
     *
+     * @param shouldReset if the history should be reset
     * @param items the [ClipboardItem] list with the new items
     */
-    fun restoreHistory(items: List<ClipboardItem>) {
+    fun restoreHistory(items: List<ClipboardItem>, shouldReset: Boolean, itemType: ItemType) {
        ioScope.launch {
-            val currentHistory = this@ClipboardManager.history().all
-            for (item in items) {
-                if (!currentHistory.map { it.copy(id = 0) }.contains(item.copy(id = 0))) {
+            if (shouldReset) {
+                for (item in history().all) {
+                    item.close(appContext)
+                }
+                clipHistoryDao?.deleteAllFromType(itemType)
+                for (item in items) {
                    this@ClipboardManager.insertClip(item.copy(id = 0))
                }
+            } else {
+                val currentHistory = this@ClipboardManager.history().all
+                for (item in items) {
+                    if (!currentHistory.map { it.copy(id = 0) }.contains(item.copy(id = 0))) {
+                        this@ClipboardManager.insertClip(item.copy(id = 0))
+                    }
+                }
            }
        }
    }
@@ -347,7 +344,7 @@ class ClipboardManager(

    fun unpinClip(item: ClipboardItem) {
        ioScope.launch {
-            clipHistoryDao?.update(item.copy(isPinned = false))
+            clipHistoryDao?.update(item.copy(isPinned =  false))
        }
    }

--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardDatabase.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package dev.patrickgold.florisboard.ime.clipboard.provider

 import android.content.ClipData
-import android.content.ClipDescription.EXTRA_IS_REMOTE_DEVICE
-import android.content.ClipDescription.EXTRA_IS_SENSITIVE
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
@@ -26,11 +24,8 @@ import android.net.Uri
 import android.provider.BaseColumns
 import android.provider.MediaStore.Images.Media
 import android.provider.OpenableColumns
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import androidx.core.database.getStringOrNull
 import androidx.lifecycle.LiveData
-import androidx.room.AutoMigration
 import androidx.room.ColumnInfo
 import androidx.room.Dao
 import androidx.room.Database
@@ -39,21 +34,14 @@ import androidx.room.Entity
 import androidx.room.Insert
 import androidx.room.PrimaryKey
 import androidx.room.Query
-import androidx.room.RenameColumn
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
 import androidx.room.Update
-import androidx.room.migration.AutoMigrationSpec
-import dev.patrickgold.florisboard.R
-import kotlinx.serialization.EncodeDefault
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.Serializable
-import org.florisboard.lib.android.AndroidVersion
 import org.florisboard.lib.android.UriSerializer
 import org.florisboard.lib.android.query
-import org.florisboard.lib.android.stringRes
+import kotlinx.serialization.Serializable
 import org.florisboard.lib.kotlin.tryOrNull

 private const val CLIPBOARD_HISTORY_TABLE = "clipboard_history"
@@ -79,7 +67,7 @@ enum class ItemType(val value: Int) {
 */
@Serializable
@Entity(tableName = CLIPBOARD_HISTORY_TABLE)
-data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor(
+data class ClipboardItem(
    @PrimaryKey(autoGenerate = true)
    @ColumnInfo(name = BaseColumns._ID, index = true)
    var id: Long = 0,
@@ -90,12 +78,6 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
    val creationTimestampMs: Long,
    val isPinned: Boolean,
    val mimeTypes: Array<String>,
-    @EncodeDefault
-    @ColumnInfo(name = "is_sensitive", defaultValue = "0")
-    val isSensitive: Boolean = false,
-    @EncodeDefault
-    @ColumnInfo(name= "is_remote_device", defaultValue = "0")
-    val isRemoteDevice: Boolean = false,
 ) {
    companion object {
        /**
@@ -131,18 +113,6 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
                else -> ItemType.TEXT
            }

-            val isSensitive = if (AndroidVersion.ATLEAST_API33_T) {
-                data.description?.extras?.getBoolean(EXTRA_IS_SENSITIVE) ?: false
-            } else {
-                false
-            }
-
-            val isRemoteDevice = if (AndroidVersion.ATLEAST_API34_U) {
-                data.description?.extras?.getBoolean(EXTRA_IS_REMOTE_DEVICE) ?: false
-            } else {
-                false
-            }
-
            val uri = if (type == ItemType.IMAGE || type == ItemType.VIDEO) {
                if (dataItem.uri.authority == ClipboardMediaProvider.AUTHORITY || !cloneUri) {
                    dataItem.uri
@@ -181,21 +151,7 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
                }
            }

-            return ClipboardItem(0, type, text, uri, System.currentTimeMillis(), false, mimeTypes, isSensitive, isRemoteDevice)
-        }
-    }
-
-    @Composable
-    inline fun displayText(): String {
-        val context = LocalContext.current
-        return displayText(context)
-    }
-
-    fun displayText(context: Context): String {
-        return if (isSensitive) {
-            context.stringRes(R.string.clipboard__sensitive_clip_content)
-        } else {
-            stringRepresentation()
+            return ClipboardItem(0, type, text, uri, System.currentTimeMillis(), false, mimeTypes)
        }
    }

@@ -242,7 +198,6 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
        if (uri != other.uri) return false
        if (creationTimestampMs != other.creationTimestampMs) return false
        if (!mimeTypes.contentEquals(other.mimeTypes)) return false
-        if (isSensitive != other.isSensitive) return false

        return true
    }
@@ -254,7 +209,6 @@ data class ClipboardItem @OptIn(ExperimentalSerializationApi::class) constructor
        result = 31 * result + (uri?.hashCode() ?: 0)
        result = 31 * result + creationTimestampMs.hashCode()
        result = 31 * result + mimeTypes.contentHashCode()
-        result = 31 * result + isSensitive.hashCode()
        return result
    }

@@ -339,30 +293,11 @@ interface ClipboardHistoryDao {
    fun deleteAllUnpinned()
 }

-@Database(
-    entities = [ClipboardItem::class],
-    version = 4,
-    autoMigrations = [
-        AutoMigration(from = 2, to = 4),
-        AutoMigration(from = 3, to = 4, spec = ClipboardHistoryDatabase.MIGRATE_3_TO_4::class),
-    ],
-)
+@Database(entities = [ClipboardItem::class], version = 2)
@TypeConverters(Converters::class)
 abstract class ClipboardHistoryDatabase : RoomDatabase() {
    abstract fun clipboardItemDao(): ClipboardHistoryDao

-    @RenameColumn(
-        tableName = CLIPBOARD_HISTORY_TABLE,
-        fromColumnName = "isSensitive",
-        toColumnName = "is_sensitive",
-    )
-    @RenameColumn(
-        tableName = CLIPBOARD_HISTORY_TABLE,
-        fromColumnName = "isRemoteDevice",
-        toColumnName = "is_remote_device",
-    )
-    class MIGRATE_3_TO_4 : AutoMigrationSpec
-
    companion object {
        fun new(context: Context): ClipboardHistoryDatabase {
            return Room
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardFileStorage.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardFileStorage.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -61,28 +61,7 @@ object ClipboardFileStorage {
        return context.clipboardFilesDir.subFile(id.toString())
    }

-
-    /**
-     * Insert file from backup if not existing
-     *
-     * @param context the application context
-     * @param file the file to be inserted
-     */
-    fun insertFileFromBackupIfNotExisting(context: Context, file: FsFile) {
-        if (!context.clipboardFilesDir.subFile(file.name).isFile) {
-            file.copyTo(context.clipboardFilesDir.subFile(file.name), overwrite = false)
-        }
+    fun instertFileFromBackup(context: Context, file: FsFile) {
+        file.copyTo(context.clipboardFilesDir.subFile(file.name), overwrite = false)
    }
-
-    /**
-     * Deletes all files from the clipboard subdirectory
-     *
-     * @param context the application context
-     */
-    fun resetClipboardFileStorage(context: Context) {
-        context.clipboardFilesDir.listFiles()?.forEach {
-            it.delete()
-        }
-    }
-
 }
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardMediaProvider.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/clipboard/provider/ClipboardMediaProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/DisplayLanguageNamesIn.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/DisplayLanguageNamesIn.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2025 The FlorisBoard Contributors
+ * Copyright (C) 2022 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/Subtype.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/Subtype.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/SubtypeManager.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/ime/core/SubtypeManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2025 The FlorisBoard Contributors
+ * Copyright (C) 2021 Patrick Goldinger
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More