Add .cxx directories to clean command

This should improve compile performance for workflow runners.

.dockerignore

@@ -1,11 +0,0 @@
-**/.*/
-!.git/
-**/build/
-**/dist/
-**/out/
-**/target/
-utils/
-!utils/repr_build/scripts/
-.env
-gradlew.bat
-local.properties

.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]

.envrc

@@ -0,0 +1 @@
+use_flake

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help FlorisBoard improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Thank you for your help in making FlorisBoard better!
+
+Guide to a good bug-report:
+• Please search existing bug/crash reports reports to avoid creating duplicates.
+• Give your bug report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
+• Describe the bug in a short but concise way.
+• If you have a screenshot or screen recording of the bug, link them at the end of this issue.
+• Also make sure to fill out the environment information. This info is valuable when trying to fix your described bug.
+-->
+
+#### Short description
+Describe the bug in a short but concise way.
+
+#### Steps to reproduce
+1. Go to '…'
+2. Click on '…'
+3. Scroll down to '…'
+4. See error
+
+#### Environment information
+- FlorisBoard Version: <!-- e.g. 0.X.X -->
+- Install Source: <!-- Google PlayStore/F-Droid/GitHub/? -->
+- Device: <!-- e.g. OnePlus 7T -->
+- Android: <!-- e.g. 10, Stock -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,76 +0,0 @@
-name: 🐛 Bug Report
-description: Create a report to help FlorisBoard improve
-labels:
-  - "bug"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for your help in making FlorisBoard better!
-        Guide to a good bug-report:
-        • Please search existing bug/crash reports reports to avoid creating duplicates.
-        • Give your bug report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
-        • Describe the bug in a short but concise way.
-        • If you have a screenshot or screen recording of the bug, link them at the end of this issue.
-        • Also make sure to fill out the environment information. This info is valuable when trying to fix your described bug.
-  - type: textarea
-    id: description
-    attributes:
-      label: Short description
-      description: Describe the bug in a short but concise way.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      value: |
-        1. Go to '…'
-        2. Click on '…'
-        3. Scroll down to '…'
-        4. See error
-    validations:
-      required: true
-  - type: input
-    id: florisversion
-    attributes:
-      label: FlorisBoard Version
-      placeholder: e.g. 0.X.X
-    validations:
-      required: true
-  - type: dropdown
-    id: installsource
-    attributes:
-      label: Install Source
-      options:
-        - Google PlayStore
-        - F-Droid (F-Droid Main)
-        - F-Droid (IzzyOnDroid)
-        - GitHub
-    validations:
-      required: true
-  - type: input
-    id: device
-    attributes:
-      label: Device
-      placeholder: e.g. OnePlus 7T
-    validations:
-      required: true
-  - type: input
-    id: androidversion
-    attributes:
-      label: Android
-      placeholder: e.g. 10, Stock
-    validations:
-      required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: "Checklist"
-      options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/florisboard/florisboard/issues) or [closed](https://github.com/florisboard/florisboard/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
-          required: true
-        - label: "I have read and understood the [contribution guidelines](https://github.com/florisboard/florisboard/blob/main/CONTRIBUTING.md)."
-          required: true
-        - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 💬 Matrix
-    url: https://matrix.to/#/#florisboard:matrix.org
-    about: General chat about FlorisBoard and quick Q/A
-  - name: ❓ Questions / Feedback
-    url: https://github.com/florisboard/florisboard/discussions/new/choose
-    about: Post your questions or feedback in the discussions panel
+  - name: Ask a question
+    url: https://github.com/florisboard/florisboard/discussions/new?category=q-a
+    about: Ask here if you have a question about FlorisBoard or need assistance
+  - name: General feedback
+    url: https://github.com/florisboard/florisboard/discussions/new?category=feedback
+    about: Give general feedback about this project

.github/ISSUE_TEMPLATE/crash_report.md

@@ -0,0 +1,28 @@
+---
+name: Crash report
+about: Create a report with a generated crash log attached to help FlorisBoard improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Thank you for your help in making FlorisBoard better!
+
+Guide to a good crash-report:
+• Please search existing bug/crash reports to avoid creating duplicates.
+• Give your crash report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
+• Describe what you were doing what could've led to the crash and whether the crash is random or reproducible.
+-->
+
+#### Short description
+Describe what you were doing that could've led to the crash.
+
+#### Steps to reproduce
+1. Go to '…'
+2. Click on '…'
+3. Scroll down to '…'
+4. See crash
+
+<!-- Paste the generated crash log below -->

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -1,49 +0,0 @@
-name: 💥 Crash report
-description: Create a report with a generated crash log attached to help FlorisBoard improve
-labels:
-  - "bug"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for your help in making FlorisBoard better!
-        Guide to a good crash-report:
-        • Please search existing bug/crash reports to avoid creating duplicates.
-        • Give your crash report a good name (no generics like "Error" or "Crash"), so others can easily identify the topic of your issue.
-        • Describe what you were doing what could've led to the crash and whether the crash is random or reproducible.
-  - type: textarea
-    id: description
-    attributes:
-      label: Short description
-      description: Describe the bug in a short but concise way.
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      value: |
-        1. Go to '…'
-        2. Click on '…'
-        3. Scroll down to '…'
-        4. See crash
-    validations:
-      required: true
-  - type: textarea
-    id: crashlog
-    attributes:
-      label: Crash log
-      description: Paste the generated crash log below
-    validations:
-      required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: "Checklist"
-      options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/florisboard/florisboard/issues) or [closed](https://github.com/florisboard/florisboard/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
-          required: true
-        - label: "I have read and understood the [contribution guidelines](https://github.com/florisboard/florisboard/blob/main/CONTRIBUTING.md)."
-          required: true
-        - label: "I have taken the time to fill in all the required details. I understand that the crash report will be dismissed otherwise."
-          required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request / Suggestion
+about: Suggest an idea for this project
+title: ''
+labels: proposal
+assignees: ''
+
+---
+
+<!--
+Thank you for your help in making FlorisBoard better!
+
+Guide to a good feature-request:
+• Please search existing proposals to avoid creating duplicates.
+• If you have multiple ideas which are not directly connected to other, file a new issue for each idea. This makes it easier to implement your proposals.
+• Describe your idea in a short but concise way.
+• If you have any examples, e.g. screenshots or other keyboards have the proposed feature implemented, feel free to post them after your description.
+-->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,33 +0,0 @@
-name: ✨ Feature request
-description: Suggest an idea for this project
-labels:
-  - "proposal"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for your help in making FlorisBoard better!
-
-        Guide to a good feature-request:
-        • Please search existing proposals to avoid creating duplicates.
-        • If you have multiple ideas which are not directly connected to other, file a new issue for each idea. This makes it easier to implement your proposals.
-        • Describe your idea in a short but concise way.
-        • If you have any examples, e.g. screenshots or other keyboards have the proposed feature implemented, feel free to post them after your description.
-  - type: textarea
-    id: feature
-    attributes:
-      label: Feature idea
-      description: Please explain your idea in a precise way.
-    validations:
-      required: true
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: "Checklist"
-      options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/florisboard/florisboard/issues) or [closed](https://github.com/florisboard/florisboard/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
-          required: true
-        - label: "I have read and understood the [contribution guidelines](https://github.com/florisboard/florisboard/blob/main/CONTRIBUTING.md)."
-          required: true
-        - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
-          required: true

.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@v4
+      - 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@v4.0.2
+        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

.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

.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

.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
@@ -52,12 +47,3 @@ crowdin.properties
 # Nix stuff
 .direnv/
 result
-
-# VSCode
-.vscode/
-
-# Rust
-debug/
-target/
-**/*.rs.bk
-*.pdb

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/cpp/nlp"]
+	path = app/src/main/cpp/nlp
+	url = https://github.com/florisboard/nlp

.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>

.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>

.idea/icon.svg

@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="vector"
-   width="108"
-   height="108"
-   viewBox="0 0 108 108"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs10">
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="20.594"
-       cx="54.141998"
-       cy="48.769001"
-       id="gradient_0"
-       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
-      <stop
-         offset="0"
-         stop-color="#55E032FF"
-         id="stop1" />
-      <stop
-         offset="1"
-         stop-color="#227C53FF"
-         id="stop2" />
-    </radialGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="20.594"
-       cx="54.141998"
-       cy="48.769001"
-       id="gradient_1"
-       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
-      <stop
-         offset="0"
-         stop-color="#55E032FF"
-         id="stop3" />
-      <stop
-         offset="1"
-         stop-color="#227C53FF"
-         id="stop4" />
-    </radialGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="12.849"
-       cx="54.029999"
-       cy="39.144001"
-       id="gradient_2"
-       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
-      <stop
-         offset="0"
-         stop-color="#FE7901FF"
-         id="stop5" />
-      <stop
-         offset="1"
-         stop-color="#FEBE01FF"
-         id="stop6" />
-    </radialGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="20.594"
-       cx="54.141998"
-       cy="48.769001"
-       id="gradient_3"
-       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
-      <stop
-         offset="0"
-         stop-color="#55E032FF"
-         id="stop7" />
-      <stop
-         offset="1"
-         stop-color="#227C53FF"
-         id="stop8" />
-    </radialGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="17.913"
-       cx="54.131001"
-       cy="49.819"
-       id="gradient_4"
-       gradientTransform="matrix(2.193116,0,0,2.193116,-64.427669,-59.442216)">
-      <stop
-         offset="0"
-         stop-color="#FE7901FF"
-         id="stop9" />
-      <stop
-         offset="1"
-         stop-color="#FEBE01FF"
-         id="stop10" />
-    </radialGradient>
-  </defs>
-  <path
-     fill="url(#gradient_0)"
-     d="m 12.291915,34.438502 0.434238,0.0066 c 20.014377,0.256595 36.184221,16.58873 36.184221,36.666707 v 6.504782 C 46.434346,77.090222 43.999987,76.362108 41.642388,75.436613 27.045007,69.710386 16.044337,56.538532 13.081437,41.131892 12.655973,38.923423 12.392799,36.686445 12.289722,34.440694 Z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_0"
-     style="fill:url(#gradient_0);stroke-width:2.19311" />
-  <path
-     fill="url(#gradient_1)"
-     d="m 41.438428,33.83978 c 1.451843,-7.875479 5.219616,-15.404446 11.305513,-21.490344 0.497838,-0.497837 1.004447,-0.980322 1.524216,-1.449649 0.517575,0.469327 1.026378,0.951812 1.526409,1.449649 6.074931,6.077125 9.842705,13.595127 11.29674,21.459641 -5.296375,4.153762 -9.689186,9.412854 -12.829729,15.428571 -3.136156,-5.974047 -7.53774,-11.23314 -12.823149,-15.395674 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_1"
-     style="fill:url(#gradient_1);stroke-width:2.19311" />
-  <path
-     fill="url(#gradient_2)"
-     d="M 33.758135,28.900884 C 35.892037,20.613098 40.199317,12.774901 46.684361,6.2876637 48.478331,4.4936948 50.377569,2.8642095 52.362338,1.4035943 L 54.268157,0 56.176168,1.4035943 c 1.984769,1.4628084 3.884009,3.0901005 5.677977,4.8840694 6.480658,6.4806583 10.790132,14.3210483 12.924033,22.6022543 -2.015473,1.030764 -3.949802,2.199695 -5.783247,3.49802 C 67.332549,24.486141 63.437574,16.961559 57.307815,10.833993 56.548998,10.072982 55.768249,9.3492537 54.965567,8.6584222 L 54.265964,8.0553153 53.56636,8.6584222 C 52.765872,9.3492537 51.985123,10.072982 51.226304,10.833993 45.089966,16.970332 41.190606,24.503686 39.53261,32.414255 37.694779,31.111545 35.764837,29.933841 33.753749,28.900884 Z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_2"
-     style="fill:url(#gradient_2);stroke-width:2.19311" />
-  <path
-     fill="url(#gradient_3)"
-     d="m 96.244398,34.438502 -0.434237,0.0066 c -20.01657,0.256595 -36.186415,16.58873 -36.186415,36.666707 v 6.506976 C 79.890332,73.322449 95.279427,55.74901 96.244398,34.440694 Z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_3"
-     style="fill:url(#gradient_3);stroke-width:2.19311" />
-  <path
-     fill="url(#gradient_4)"
-     d="m 12.68887,25.874383 0.149132,0.0022 c 4.506853,0.05702 8.996162,0.787328 13.290282,2.168991 11.959063,3.851112 21.891685,12.759549 27.168322,24.058483 l 0.973744,2.083461 0.969357,-2.085654 C 62.347596,36.789522 77.776168,26.104661 95.702698,25.876577 l 0.149133,-0.0022 c 0.291684,2.098811 0.443009,4.241486 0.445201,6.421443 l -0.510995,0.0066 C 74.600536,32.576546 57.485458,49.860493 57.485458,71.111788 v 6.917088 c -1.048309,0.155711 -2.046178,0.188608 -3.079135,0.192995 h -0.13378 c -1.068047,0 -2.144867,-0.07238 -3.212915,-0.219313 v -6.89077 c 0,-21.251295 -17.117271,-38.535242 -38.300578,-38.809382 l -0.510997,-0.0066 c 0,-2.147061 0.149133,-4.296315 0.445203,-6.421443 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_4"
-     style="fill:url(#gradient_4);stroke-width:2.19311" />
-  <path
-     fill="#53cd53"
-     d="m 101.9772,99.716601 c 0,-2.46287 -1.997925,-4.462992 -4.460795,-4.462992 H 85.243728 c -2.460676,0 -4.460798,1.997929 -4.460798,4.462992 v 3.822599 c 0,2.46068 1.997928,4.4608 4.460798,4.4608 h 12.272677 c 2.460676,0 4.460795,-1.99793 4.460795,-4.4608 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_5"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 78.620517,84.818763 c 0,-2.460676 -1.997928,-4.460798 -4.460797,-4.460798 h -6.096864 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.096864 c 2.460676,0 4.460797,-1.997929 4.460797,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_6"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 61.450612,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_7"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 27.11738,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.096863 c -2.460676,0 -4.460798,1.997929 -4.460798,4.460798 v 3.824795 c 0,2.460676 1.997929,4.460798 4.460798,4.460798 h 6.096863 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_8"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 95.78823,84.818763 c 0,-2.460676 -1.997929,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.462869,0 -4.462991,1.997929 -4.462991,4.460798 v 3.824795 c 0,2.460676 1.997928,4.460798 4.462991,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_9"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 21.038062,69.923119 c 0,-2.46287 -1.997928,-4.462991 -4.460797,-4.462991 h -6.09467 c -2.4606765,0 -4.4607984,1.997929 -4.4607984,4.462991 v 3.822601 c 0,2.460676 1.9979288,4.460798 4.4607984,4.460798 h 6.09467 c 2.460676,0 4.460797,-1.997928 4.460797,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_10"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 101.9772,69.923119 c 0,-2.46287 -1.997925,-4.462991 -4.460795,-4.462991 h -6.09467 c -2.460676,0 -4.460797,1.997929 -4.460797,4.462991 v 3.822601 c 0,2.460676 1.997928,4.460798 4.460797,4.460798 h 6.09467 c 2.460676,0 4.460795,-1.997928 4.460795,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_11"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 44.282899,84.818763 c 0,-2.460676 -1.997928,-4.460798 -4.460798,-4.460798 h -6.09467 c -2.462869,0 -4.462991,1.997929 -4.462991,4.460798 v 3.824795 c 0,2.460676 1.99793,4.460798 4.462991,4.460798 h 6.09467 c 2.460676,0 4.460798,-1.997929 4.460798,-4.460798 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_12"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#fe9801"
-     d="m 27.21607,99.716601 c 0,-2.46287 -1.997928,-4.462992 -4.460798,-4.462992 H 10.482595 c -2.4606765,0 -4.4607984,1.997929 -4.4607984,4.462992 v 3.822599 c 0,2.46068 1.9979288,4.4608 4.4607984,4.4608 h 12.272677 c 2.460676,0 4.460798,-1.99793 4.460798,-4.4608 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_13"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 83.756795,67.041365 c 0.655742,0.776363 1.054889,1.783003 1.054889,2.881754 v 3.822601 c 0,2.460676 -1.997928,4.460798 -4.460798,4.460798 h -6.096863 c -1.557112,0 -2.927809,-0.798293 -3.723911,-2.006701 4.91258,-2.307158 9.377765,-5.414803 13.226683,-9.158452 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_14"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 24.529503,66.738714 c 3.796284,3.76558 8.20664,6.919282 13.066585,9.263722 -0.774169,1.320257 -2.210661,2.204082 -3.848919,2.204082 h -6.096862 c -2.460676,0 -4.460798,-1.997928 -4.460798,-4.460798 v -3.822601 c 0,-1.247883 0.510996,-2.375144 1.337801,-3.186598 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_15"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 14.015705,51.362778 c 1.868535,4.322632 4.359915,8.346999 7.366677,11.950289 h -4.822663 c -2.460676,0 -4.460798,-1.997928 -4.460798,-4.460797 v -3.824795 c 0,-1.517637 0.758819,-2.85763 1.916784,-3.664697 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_16"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 94.369284,51.764118 c 0.87286,0.813646 1.418946,1.975997 1.418946,3.263357 v 3.824795 c 0,2.460676 -1.997929,4.460797 -4.460798,4.460797 h -4.116479 c 2.897106,-3.471703 5.313921,-7.355711 7.156137,-11.548949 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_17"
-     style="stroke-width:2.19311" />
-  <path
-     fill="#ffffff"
-     d="m 78.782808,99.819677 c 0,-2.432165 -1.971611,-4.40597 -4.403777,-4.40597 H 33.738397 c -2.432166,0 -4.405969,1.973805 -4.405969,4.40597 v 3.774353 c 0,2.43217 1.973803,4.40378 4.405969,4.40378 h 40.640634 c 2.432166,0 4.403777,-1.97161 4.403777,-4.40378 z"
-     stroke-linejoin="round"
-     fill-rule="evenodd"
-     id="path_18"
-     style="stroke-width:2.19311" />
-</svg>

Android.bp

@@ -1,39 +0,0 @@
-android_app {
-    name: "FlorisBoard",
-    srcs: [
-        "app/src/main/kotlin/**/*.kt",
-        "app/src/main/java/**/*.java",
-    ],
-    resource_dirs: ["app/src/main/res"],
-    manifest: "app/src/main/AndroidManifest.xml",
-    certificate: "platform",
-    system_ext_specific: true,
-    platform_apis: true,
-    optimize: {
-        enabled: true,
-    },
-    overrides: ["FlorisBoard"],
-    static_libs: [
-        "androidx.core_core",
-        "androidx.emoji2_emoji2",
-        "androidx.emoji2_emoji2-views",
-        "androidx.startup_startup",
-        "androidx.appcompat_appcompat",
-        "androidx.preference_preference",
-        "androidx.recyclerview_recyclerview",
-        "androidx.constraintlayout_constraintlayout",
-    ],
-    required: ["android.permission.VIBRATE"],
-    optional: ["android.permission.POST_NOTIFICATIONS"],
-    allow_backup: true,
-    backup_config: "res/xml/backup_rules.xml",
-    full_backup_content: "res/xml/backup_rules.xml",
-    enable_on_back_invoked_callback: true,
-    profileable: true,
-    package: "dev.patrickgold.florisboard",
-    privileged: false,
-    dex_preopt: {
-        enabled: false,
-    },
-    asset_dirs: ["app/src/main/assets"],
-}

CONTRIBUTING.md

@@ -1,72 +1,97 @@
-# Contribution guidelines
+# Contributing
 
-Thanks for considering contributing to FlorisBoard!
+First off, thanks for considering contributing to FlorisBoard!
 
 There are several ways to contribute to FlorisBoard. This document provides some general guidelines for each type of contribution.
 
-The FlorisBoard community is international, as such we require all contributions, including issues, pull requests, and participation in the Matrix chat to be in English and follow the [code of conduct](https://github.com/florisboard/florisboard/blob/main/CODE_OF_CONDUCT.md). Contributions not adhering to these requirements will be dismissed. Thanks for making the FlorisBoard community an inclusive and safe space for everyone!
-
-## Non-code contributions
-
-### Translations
-
-To make FlorisBoard accessible in as many languages as possible, the platform [Crowdin](https://crowdin.florisboard.org) is used to crowdsource and manage translations.  The list of languages in Crowdin covers a good range of languages, but feel free to email [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev) to request a new language.
-
-> [!IMPORTANT]
-> This is the only source of translations - **PRs that add/update translations are not accepted.**
-
-### Bug reporting
-
-Allows us to see where FlorisBoard has flaws and should be improved to maximize stability and user experience. To make this process as smooth as possible, please use the pre-made [bug report template](https://github.com/florisboard/florisboard/issues/new?template=bug_report.yml). This makes it easy for us to understand what the bug is and how to solve it.
-
-#### Capturing error logs
-
-Logs are captured by FlorisBoard's crash handler, which gives you the ability to copy it to the clipboard and paste it in the crash report [issue template](https://github.com/florisboard/florisboard/issues/new?template=crash_report.yml). This is the preferred way to capture logs.
-
-Alternatively, you can also use ADB (Android Debug Bridge) to capture the error log. This is recommended for experienced users only.
-
-### Feature proposals
-
-Use the feature proposal [issue template](https://github.com/florisboard/florisboard/issues/new?template=feature_request.yml) to suggest a new idea or improvement for this project.
-
-### Feedback
+## Giving general feedback
 
 You can [give general feedback](https://github.com/florisboard/florisboard/discussions/new?category=feedback) directly here on GitHub. This is the preferred way to give feedback, as it allows not only for me to read and respond to feedback, but for everyone in this community.
 
-## Code contributions
+Optionally you can also use the review function within Google Play or email me at [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev). I love to hear from you! Note, that the amount of feedback emails I get is overwhelmingly high - so if I don't answer or answer really late, I apologize - I guarantee though that I read through every email and that I will use every feedback to improve FlorisBoard :)
 
-You are always welcome to contribute new features or work on existing issues, there are a lot to choose from :) It is always best to quickly ask if someone is already working on this issue to avoid duplicate issues.
+## Translations
 
-> [!NOTE]
-> If you intend to implement a bigger feature please coordinate with us so we can prevent that there's a major difference in expected implementation.
+To make FlorisBoard accessible in as many languages as possible, the platform [Crowdin](https://crowdin.florisboard.patrickgold.dev) is used to crowdsource and manage translations. This is
+the only source of translations from now on - **PRs that add/update translations are no longer accepted.** The list of languages in Crowdin covers the top 20 languages, but feel free to email me at [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev) to request a language and I'll add it.
 
-If you are overwhelmed by the code don't hesitate to ask for help in the [dev chat](https://matrix.to/#/#florisboard-dev:matrix.org) or the discussions tab! Some issues are also marked as good first issue, which are easy to do tasks.
+## Joining the team
 
-### System requirements for development
+If you want to join the FlorisBoard maintainer/moderator team and be part of this project's journey that's great to hear! For more info see [this announcement](https://github.com/florisboard/florisboard/discussions/2314)!
 
-- Desktop PC with Linux or WSL2 (Windows)
-  - MacOS and Windows without WSL2 probably works too however there's no official support
-- At least 16GB of RAM (because of Android Studio / IntelliJ)
-- The following tools must be installed:
-  - Android Studio (bundles SDK and NDK) or IntelliJ with Android and Compose plugin
-  - Java 17
-  - CMake 3.22+
-  - Clang 15+
-  - Git
-  - [Rust](https://www.rust-lang.org/tools/install)
-- Utilities (optional)
-  - Python 3.10+
-  - Bash, realpath, grep, ...
+## Adding a new feature or making large changes
 
-### Manual build without Android Studio
+If you intend to add a new feature or to make large changes, please discuss this first through a proposal on GitHub. Discussing your idea enables both you and the dev team that we are on the same page before you start on working on your change. If you have any questions, feel free to ask for help at any time!
 
-If you want to manually build the project without Android Studio you must ensure that the Android SDK and NDK are properly installed on your system. Then issue
+## Adding a new keyboard layout
 
-```./gradlew clean && ./gradlew assembleDebug```
+Adding a layout to FlorisBoard is very simple and does not require any coding skills, although you should understand the
+basics of the JSON syntax (it is very easy though by just looking at some other layout files). Most of the time is
+enough to look at the existing layout files, but the following attempts to help you in creating layouts from scratch.
 
-and Gradle should take care of every build task.
+### Adding the layout
+
+Since v0.3.14-beta06 it is possible to add custom layouts for all types using the new extension format, Flex.
+
+Keyboard layout assets are grouped in [`app/src/main/assets/ime/keyboard`](app/src/main/assets/ime/keyboard) and are
+further sub-grouped into the following:
+
+- `org.florisboard.composers`: Defines standard composers for interpreting input, currently supports basic typing and
+  Korean input. Most of the time you won't need to add new composers, so if you don't know what they are always
+  assume `appender` (the default composer which does not alter input in any way) is in use.
+- `org.florisboard.currencysets`: Lists all currency sets, which can be chosen for each subtype. If you consider adding
+  a new one, make sure that the first currency symbol matches the name of the currency set and also ensure that you have
+  exactly 6 currency symbols. This is important as the symbol layouts have exactly 6 slots available to fill these
+  defined currency symbols in.
+- `org.florisboard.layouts`: Contains the actual layout files for all layout types.
+- `org.florisboard.localization`: Contains all popup mappings and subtype presets (formally the `config.json` file). The
+  subtype presets are a list of all pre-made subtypes. Each time the user selects a language in the `Subtype Add`
+  -dialog, all options configured here will get selected if found in the presets. The language tag must adhere to the
+  IETF BCP 47 code ([ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+  and [ISO 3166-1 region code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements)). For
+  example, Dutch as spoken in Belgium is `nl-be`.
+
+To add a new layout, head to above directory and add the necessary files to each extension group.
+
+For the `code` field of each key, make sure to use the UTF-8 code. An useful tool for finding the correct code
+is [unicode-table.com](https://unicode-table.com/en/). From there, you search for your letter and then use the HTML
+code, but without the `&#;`
+For internal codes of functional or UI keys, see
+[`app/src/main/kotlin/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt`](app/src/main/kotlin/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt)
+.
+
+The label is equally important and should always match up with the defined code. If `code` and `label` don't match up,
+FlorisBoard won't crash but it will most likely lead to confusion in the key processing logic.
+
+Any accents or diacritics that should be exposed via long press can be added
+at [`app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/<languageTag>.json`](app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings)
+. For each key, you can add 1 main and several relevant accents. The main accent should be used for accents which are
+important for the language you add. The main field is used for determining if a hint or an accent should take priority,
+so please make sure to leave main empty and just use relevant for accents which are not-so important.
+
+For popups of non-`characters` layout, simply add the popup directly to each key via the `popup` field.
+
+## Adding a new dictionary for a language
+
+Currently any kind of dictionaries are not accepted until the suggestion implementation has been sorted out.
+
+## Bug reporting
+
+This kind of contribution is the most important, as it tells where FlorisBoard has flaws and thus should be improved to
+maximize stability and user experience. To make this process as smooth as possible, please use the
+pre-made [issue template](.github/ISSUE_TEMPLATE/bug_report.md)
+for bug reporting. This makes it easy for us to understand what the bug is and how to solve it.
+
+### Capturing error logs
+
+Logs are captured by FlorisBoard's crash handler, which gives you the ability to copy it to the clipboard and paste it
+in GitHub. This is the preferred way to capture logs.
+
+Alternatively, you can also use ADB (Android Debug Bridge) to capture the error log. This is recommended for experienced
+users only.
 
 ## Donating
 
-You can also show your support by buying me a coffee, so I can stay up all night and chase away bugs or add new cool stuff :)
+If none of the above options are feasible for you but you still want to show your support, you can also buy me a coffee,
+so I can stay up all night and chase away bugs or add new cool stuff :)
 See the `Sponsors` button for available options!

LICENSE

@@ -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.

README.md

@@ -1,43 +1,35 @@
 <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.org) [![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 8.0+
+**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 beta state.
+fully respecting your privacy. Currently in early-beta state.
 
 <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>
 <td valign="top">
-<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>
+<p><i>Major versions only, 1 release per 1-5 months</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>Beta versions, up to 1-2 releases per week</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>
 <td valign="top">
-<p>
-<a href="https://apt.izzysoft.de/fdroid/index/apk/dev.patrickgold.florisboard"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="64" alt="IzzySoft repo badge"></a>
-<a href="https://f-droid.org/packages/dev.patrickgold.florisboard"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="64" alt="F-Droid badge"></a>
-</p>
+<p><a href="https://f-droid.org/packages/dev.patrickgold.florisboard"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="64" alt="F-Droid badge"></a></p>
 <p>
 
-**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-closed-beta-test), then visit the [testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard). 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))
-
-</p>
-<p>
-
-**Obtainium**: [Auto-import stable config][obtainium_stable]
+**Google Play**: Join the [FlorisBoard Test Group](https://groups.google.com/g/florisboard-public-alpha-test), then visit the [testing page](https://play.google.com/apps/testing/dev.patrickgold.florisboard). 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))
 
 </p>
 <p>
@@ -50,12 +42,7 @@ fully respecting your privacy. Currently in 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-closed-beta-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>
@@ -67,57 +54,37 @@ fully respecting your privacy. Currently in beta state.
 </tr>
 </table>
 
-Beginning with v0.7 FlorisBoard will enter the public beta on Google Play.
+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
+- Spell checking service
+- Glide typing (currently English only)
 
-> [!IMPORTANT]
-> Word suggestions/spell checking are not included in the current releases
-> and are a major goal for the v0.6 milestone.
+Word suggestions are not included in the current releases and are a major goal for the v0.4.0 milestone.
 
 Feature roadmap: See [ROADMAP.md](ROADMAP.md)
 
 ## Contributing
-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.
+Wanna contribute to FlorisBoard? That's great to hear! There are lots of
+different ways to help out. Bug reporting, making pull requests,
+translating FlorisBoard to make it more accessible, etc. For more
+information see the [contributing guidelines](CONTRIBUTING.md). Thank
+you for your help!
 
 ## 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.
 
-## APK signing certificate hashes
-
-The package names and SHA-256 hashes of the signature certificate are listed below, so you can verify both FlorisBoard variants with apksigner by using `apksigner verify --print-certs florisboard-<version>-<track>.apk` when you download the APK.
-If you have [AppVerifier](https://github.com/soupslurpr/AppVerifier) installed, you can alternatively copy both the package name and the hash of the corresponding track and share them to AppVerifier.
-
-##### Stable track:
-
-dev.patrickgold.florisboard<br>
-0B:80:71:64:50:8E:AF:EB:1F:BB:81:5B:E7:A2:3C:77:FE:68:9D:94:B1:43:75:C9:9B:DA:A9:B6:57:7F:D6:D6
-
-##### Preview track:
-
-dev.patrickgold.florisboard.beta<br>
-0B:80:71:64:50:8E:AF:EB:1F:BB:81:5B:E7:A2:3C:77:FE:68:9D:94:B1:43:75:C9:9B:DA:A9:B6:57:7F:D6:D6
-
-
 ## 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
@@ -128,12 +95,16 @@ dev.patrickgold.florisboard.beta<br>
   [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)
+* [Nuspell](https://github.com/nuspell/nuspell) by
+  [Nuspell](https://github.com/nuspell)
 
 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-2023 Patrick Goldinger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -147,12 +118,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 -->

ROADMAP.md

@@ -1,67 +1,67 @@
 # Roadmap
 
-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 anyway.
+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.5 (currently in development)
+## 0.4
 
-> [!NOTE]
-> The milestone 0.5 was split, thus the word suggestions now come with version 0.6. The old version 0.6 has been moved down and is now 0.7. The time it takes to implement word suggestions will not change, but we can now release the new theme editor earlier, which would otherwise lie dormant.
+**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.
 
-- [x] Theme rework part II / Snygg v2
-  - [x] See https://github.com/florisboard/florisboard/pull/2855
-  - [x] Spaces in URI bug (See https://github.com/florisboard/florisboard/issues/2898)
-  - [x] Re-add time based theme switching (See https://github.com/florisboard/florisboard/pull/2977)
-- [x] Add support for any remaining new features introduced with Android 13 / 14
-- [x] Raise minimum required Android version from Android 7 (SDK level 24) to Android 8 (SDK level 26)
+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)
+- Fix compilation issues introduced with the 0.4 alphas as best as possible
+
+Maybe in this release, but no guarantee and may be delayed to 0.5:
+- Develop usable preview of an on-device statistical word suggestion algorithm (see the main [NLP project](https://github.com/florisboard/nlp) for details)
+- Add experimental plugin system which supports communication with the aforementioned native suggestion algorithm
+- Include precompiled dictionaries for major languages: English (US/UK), German, Spanish, French, Italian & Russian
+
+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
+
+- New text processing logic
+  - RFC document with technical details will be released later
+- New keyboard layout engine + file syntax based on the upcoming Unicode Keyboard v3 standard
+  - 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 word suggestion core
+- Add support for any remaining new features introduced with Android 13
 
 ## 0.6
 
-- [ ] Implement predictive text support / spell checking
-- [ ] Add new extension type: Language Pack
-    - Basically groups all locale-relevant data (predictive base model, emoji suggestion data, ...)
-      in a dynamically importable extension file
-- [ ] Proper physical keyboard support (See https://github.com/florisboard/florisboard/issues/1972)
-- [ ] Rework cache manager (See https://github.com/florisboard/florisboard/issues/2870)
-
-## k3lp
-
-> [!NOTE]
-> The development of k3lp is not tied to a florisboard version and takes place on [codeberg.org](https://codeberg.org/k3lp/k3lp) simultaneously.
-
-- [ ] New keyboard layout engine + file syntax based on the upcoming Unicode Keyboard v3 standard
-- [ ] Add Tablet mode / Optimizations for landscape input based on new keyboard layout engine
-
-## 0.7+
-
-> [!NOTE]
-> From 0.6 onwards we plan to have more stable 0.X releases but with at most one large feature per release, thus having a much quicker iteration of new features on the stable track, which is a benefit for everyone involved.
-
-- [ ] Add floating keyboard mode
-- [ ] New text processing logic
-- [ ] Complete rework of the Emoji panel
-  - [ ] Emoji search
-  - [ ] Fully scrollable emoji list (soft category borders)
-  - [ ] Side scrollable emoji list (swipe for next category)
-  - [ ] More granular theming options
-  - [ ] Layout customization (e.g. placement of category buttons)
-  - [ ] 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.7)
-- [ ] 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 15 / 16
+- Complete rework of the Emoji panel
+  - Recently used / Emoji history (already implemented with 0.3.14)
+  - Emoji search
+  - Emoji suggestions when using :emoji_name: syntax
+  - Kaomoji panel implementation (the third tab which currently has "not yet implemented")
+  - Maybe: consider upgrading to emoji2 for better unified system-wide emoji styles)
+- 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
+- Not finalized, but planned: raise minimum required Android version from Android 7 (SDK level 24) to Android 8 (SDK level 26)
 
 ## Backlog / Planned (unassigned)
 
 **Features that MAY be added (even in versions mentioned above) or dismissed**
 
+- Upgrade Settings UI to Material 3
 - Full on-board layout editor which allows users to create their own layouts without writing a JSON file
+- Import/Export of custom layout files packed in Flex extensions
+- Theme rework part II
+- Adaptive themes v2
 - Voice-to-text with Mozilla's open-source voice service (or any other oss voice provider)
 - Text translation
+- Proximity-based key typo detection
+- Floating keyboard
 - Stickers/GIFs
-- Kaomoji panel implementation
+- FlorisBoard landing web page for presentation
 - Implementing additional layouts
 - Support for Tasker/Automate/MacroDroid plugins
 - Support for WearOS/Smartwatches

app/.gitignore

@@ -1,2 +1,2 @@
 # Exclude auto-generated icu4c assets
-src/main/assets/icu4c/
+.cxx_icu4c

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,47 +14,45 @@
  * limitations under the License.
  */
 
+// Suppress needed until https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@file:Suppress("DSL_SCOPE_VIOLATION")
+
 import java.io.ByteArrayOutputStream
+import java.io.File
 
 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)
     alias(libs.plugins.mikepenz.aboutlibraries)
 }
 
+val projectCompileSdk: String by project
 val projectMinSdk: String by project
 val projectTargetSdk: String by project
-val projectCompileSdk: String by project
 val projectVersionCode: String by project
 val projectVersionName: String by project
-val projectVersionNameSuffix = projectVersionName.substringAfter("-", "").let { suffix ->
-    if (suffix.isNotEmpty()) {
-        "-$suffix"
-    } else {
-        suffix
-    }
-}
+val projectVersionNameSuffix: String by project
 
 android {
     namespace = "dev.patrickgold.florisboard"
     compileSdk = projectCompileSdk.toInt()
-    buildToolsVersion = tools.versions.buildTools.get()
-    ndkVersion = tools.versions.ndk.get()
+    buildToolsVersion = "33.0.2"
+    ndkVersion = "26.1.10909125"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "1.8"
         freeCompilerArgs = listOf(
+            "-Xallow-result-return-type",
             "-opt-in=kotlin.contracts.ExperimentalContracts",
             "-Xjvm-default=all-compatibility",
-            "-Xwhen-guards",
         )
     }
 
@@ -63,13 +61,11 @@ 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\"")
 
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
@@ -77,10 +73,28 @@ android {
             arg("room.expandProjection", "true")
         }
 
+        externalNativeBuild {
+            cmake {
+                targets("florisboard-native")
+                cppFlags("-std=c++20", "-stdlib=libc++")
+                arguments(
+                    "-DCMAKE_ANDROID_API=" + minSdk.toString(),
+                    "-DICU_ASSET_EXPORT_DIR=" + project.file(".cxx_icu4c/android/assets/icu4c").absolutePath,
+                    "-DICU_BUILD_DIR=" + project.file(".cxx_icu4c").absolutePath,
+                    "-DBUILD_SHARED_LIBS=false",
+                    "-DANDROID_STL=c++_static",
+                )
+            }
+        }
+
+        ndk {
+            abiFilters += listOf("armeabi-v7a", "arm64-v8a")
+        }
+
         sourceSets {
             maybeCreate("main").apply {
                 assets {
-                    srcDirs("src/main/assets")
+                    srcDirs("src/main/assets", ".cxx_icu4c/android/assets")
                 }
                 java {
                     srcDirs("src/main/kotlin")
@@ -99,18 +113,32 @@ android {
     }
 
     buildFeatures {
-        buildConfig = true
         compose = true
     }
 
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
+
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+        }
+    }
+
     buildTypes {
         named("debug") {
             applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug+${getGitCommitHash(short = true)}"
+            versionNameSuffix = "-debug-${getGitCommitHash(short = true)}"
 
             isDebuggable = true
             isJniDebuggable = false
 
+            ndk {
+                // For running FlorisBoard on the emulator
+                // abiFilters += listOf("x86", "x86_64")
+            }
+
             resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_debug")
             resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_debug_round")
             resValue("drawable", "floris_app_icon_foreground", "@drawable/ic_app_icon_debug_foreground")
@@ -148,17 +176,26 @@ android {
             initWith(getByName("release"))
             signingConfig = signingConfigs.getByName("debug")
             matchingFallbacks += listOf("release")
+
+            ndk {
+                // For running FlorisBoard on the emulator
+                abiFilters += listOf("x86", "x86_64")
+            }
         }
     }
 
     aboutLibraries {
-        collect {
-            configPath = file("src/main/config")
-        }
+        configPath = "app/src/main/config"
     }
 
-    lint {
-        baseline = file("lint.xml")
+    // This specific block is crucial as it forces the assets packing to be done AFTER the native code has been
+    // compiled. This is important as CMake generates the ICU4C data file which needs to be placed inside the assets
+    // dir, especially though for clean builds on workflow runners and for F-Droid.
+    applicationVariants.all {
+        assembleProvider.configure {
+            dependsOn(javaCompileProvider.get())
+            dependsOn(externalNativeBuildProviders)
+        }
     }
 
     testOptions {
@@ -175,17 +212,28 @@ tasks.withType<Test> {
     useJUnitPlatform()
 }
 
-dependencies {
-    val composeBom = platform(libs.androidx.compose.bom)
-    implementation(composeBom)
-    // testImplementation(composeBom)
-    // androidTestImplementation(composeBom)
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
 
+val customClean by tasks.registering(Delete::class) {
+    delete(file(".cxx").absolutePath)
+    delete(file(".cxx_icu4c").absolutePath)
+}
+tasks.getByName("clean").dependsOn(customClean)
+
+dependencies {
+    implementation(project(":ime-lib"))
+    implementation(project(":plugin"))
+    implementation(libs.accompanist.flowlayout)
+    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.autofill)
     implementation(libs.androidx.collection.ktx)
-    implementation(libs.androidx.compose.material.icons)
+    implementation(libs.androidx.compose.material)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.runtime.livedata)
     implementation(libs.androidx.compose.ui)
@@ -194,31 +242,26 @@ dependencies {
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.emoji2)
     implementation(libs.androidx.emoji2.views)
-    implementation(libs.androidx.exifinterface)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
     ksp(libs.androidx.room.compiler)
     implementation(libs.androidx.room.runtime)
     implementation(libs.cache4k)
-    implementation(libs.kotlin.reflect)
     implementation(libs.kotlinx.coroutines)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.mikepenz.aboutlibraries.core)
     implementation(libs.mikepenz.aboutlibraries.compose)
     implementation(libs.patrickgold.compose.tooltip)
     implementation(libs.patrickgold.jetpref.datastore.model)
-    ksp(libs.patrickgold.jetpref.datastore.model.processor)
     implementation(libs.patrickgold.jetpref.datastore.ui)
     implementation(libs.patrickgold.jetpref.material.ui)
 
-    implementation(project(":lib:android"))
-    implementation(project(":lib:color"))
-    implementation(project(":lib:compose"))
-    implementation(project(":lib:kotlin"))
-    implementation(project(":lib:native"))
-    implementation(project(":lib:snygg"))
+    testImplementation(libs.equalsverifier)
+    testImplementation(libs.kotest.assertions.core)
+    testImplementation(libs.kotest.extensions.roboelectric)
+    testImplementation(libs.kotest.property)
+    testImplementation(libs.kotest.runner.junit5)
 
-    testImplementation(libs.kotlin.test.junit5)
     androidTestImplementation(libs.androidx.test.ext)
     androidTestImplementation(libs.androidx.test.espresso.core)
 }

app/lint.xml

@@ -1,3 +0,0 @@
-<lint>
-    <issue id="ExtraTranslation" severity="warning"/>
-</lint>

app/schemas/dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardFilesDatabase/2.json

@@ -1,68 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 2,
-    "identityHash": "dc886df9792fe6b6ad532cc7aa7c4a84",
-    "entities": [
-      {
-        "tableName": "clipboard_files",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `_display_name` TEXT NOT NULL, `_size` INTEGER NOT NULL, `orientation` INTEGER NOT NULL, `mimeTypes` TEXT NOT NULL, PRIMARY KEY(`_id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayName",
-            "columnName": "_display_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "size",
-            "columnName": "_size",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "orientation",
-            "columnName": "orientation",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "mimeTypes",
-            "columnName": "mimeTypes",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_clipboard_files__id",
-            "unique": false,
-            "columnNames": [
-              "_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_clipboard_files__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, 'dc886df9792fe6b6ad532cc7aa7c4a84')"
-    ]
-  }
-}

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')"
-    ]
-  }
-}

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')"
-    ]
-  }
-}

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

app/src/main/AndroidManifest.xml

@@ -1,16 +1,28 @@
 <?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">
 
     <!-- Permission needed to vibrate if the user has key press vibration enabled -->
     <uses-permission android:name="android.permission.VIBRATE"/>
 
-    <!-- Permission needed to create notifications on devices running Android 13+ -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
     <!-- Android 11+ only: Define that FlorisBoard requests to see all apps that
-          ship with an IME or Spell Check service. This is used to guide the user
-          in the Settings Ui why FlorisBoard may not be working.
+          ship with an IME, Spell Check or FlorisBoard Plugin service. This is used
+          to guide the user in the Settings UI why FlorisBoard may not be working and
+          to provide plugin support.
      -->
     <queries>
         <intent>
@@ -19,6 +31,9 @@
         <intent>
             <action android:name="android.service.textservice.SpellCheckerService"/>
         </intent>
+        <intent>
+            <action android:name="org.florisboard.plugin.FlorisPluginService"/>
+        </intent>
     </queries>
 
     <application
@@ -28,11 +43,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"/>
@@ -62,6 +76,16 @@
             <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker"/>
         </service>
 
+        <!-- Internal LatinLanguageProvider plugin service -->
+        <service
+            android:name=".ime.nlp.latin.LatinLanguageProviderService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="org.florisboard.plugin.FlorisPluginService"/>
+            </intent-filter>
+            <meta-data android:name="org.florisboard.plugin.flp" android:resource="@xml/latin_language_provider"/>
+        </service>
+
         <!-- Main App Activity -->
         <activity
             android:name="dev.patrickgold.florisboard.app.FlorisAppActivity"
@@ -71,25 +95,9 @@
             android:roundIcon="@mipmap/floris_app_icon_round"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/FlorisAppTheme.Splash"
-            android:exported="true">
+            android:exported="false">
             <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="/" />
-            </intent-filter>
-            <intent-filter android:label="Import Extension">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="content"/>
-                <data android:mimeType="application/vnd.florisboard.extension+zip"/>
-                <data android:mimeType="application/octet-stream"/><!-- Firefox looking at you :eyes: -->
-            </intent-filter>
-            <intent-filter android:label="Import Extension">
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="application/vnd.florisboard.extension+zip"/>
-                <data android:mimeType="application/octet-stream"/><!-- Firefox looking at you :eyes: -->
+                <data android:scheme="florisboard" android:host="app-ui"/>
             </intent-filter>
         </activity>
 
@@ -109,26 +117,31 @@
             </intent-filter>
         </activity-alias>
 
+        <!-- Import File Bridging Activity -->
+        <activity
+            android:name="dev.patrickgold.florisboard.app.ext.ImportFileActivity"
+            android:icon="@mipmap/floris_app_icon"
+            android:label="@string/settings__title"
+            android:launchMode="singleTask"
+            android:roundIcon="@mipmap/floris_app_icon_round"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/FlorisAppTheme"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="*" android:host="*" android:pathPattern=".*\\.flex"/>
+                <data android:scheme="*" android:host="*" android:pathPattern=".*\\.xpi"/>
+            </intent-filter>
+        </activity>
+
         <!-- Crash Dialog Activity -->
         <activity
             android:name="dev.patrickgold.florisboard.lib.crashutility.CrashDialogActivity"
             android:icon="@mipmap/floris_app_icon"
             android:label="@string/crash_dialog__title"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/CrashDialogTheme"/>
 
-        <!-- Copy to Clipboard Activity -->
-        <activity
-            android:name="dev.patrickgold.florisboard.ime.clipboard.FlorisCopyToClipboardActivity"
-            android:theme="@style/FlorisAppTheme.Transparent"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="image/*"/>
-            </intent-filter>
-        </activity>
-
         <!-- Clipboard Media File Provider -->
         <provider
             android:name="dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardMediaProvider"

app/src/main/assets/ime/keyboard/org.florisboard.composers/extension.json

@@ -57,89 +57,12 @@
         "ừz": "ư", "ửz": "ư", "ữz": "ư", "ứz": "ư", "ựz": "ư",
         "ỳz": "y", "ỷz": "y", "ỹz": "y", "ýz": "y", "ỵz": "y",
 
-        "áf": "à", "ár": "ả", "áx": "ã", "áj": "ạ", 
-        "às": "á", "àr": "ả", "àx": "ã", "àj": "ạ", 
-        "ảs": "á", "ảf": "à", "ảx": "ã", "ảj": "ạ", 
-        "ãs": "á", "ãf": "à", "ãr": "ả", "ãj": "ạ", 
-        "ạs": "á", "ạf": "à", "ạr": "ả", "ạx": "ã", 
-        "ấf": "ầ", "ấr": "ẩ", "ấx": "ẫ", "ấj": "ậ", 
-        "ầs": "ấ", "ầr": "ẩ", "ầx": "ẫ", "ầj": "ậ", 
-        "ẩs": "ấ", "ẩf": "ầ", "ẩx": "ẫ", "ẩj": "ậ", 
-        "ẫs": "ấ", "ẫf": "ầ", "ẫr": "ẩ", "ẫj": "ậ", 
-        "ậs": "ấ", "ậf": "ầ", "ậr": "ẩ", "ậx": "ẫ", 
-        "ắf": "ằ", "ắr": "ẳ", "ắx": "ẵ", "ắj": "ặ", 
-        "ằs": "ắ", "ằr": "ẳ", "ằx": "ẵ", "ằj": "ặ", 
-        "ẳs": "ắ", "ẳf": "ằ", "ẳx": "ẵ", "ẳj": "ặ", 
-        "ẵs": "ắ", "ẵf": "ằ", "ẵr": "ẳ", "ẵj": "ặ", 
-        "ặs": "ắ", "ặf": "ằ", "ặr": "ẳ", "ặx": "ẵ",
-        "éf": "è", "ér": "ẻ", "éx": "ẽ", "éj": "ẹ", 
-        "ès": "é", "èr": "ẻ", "èx": "ẽ", "èj": "ẹ", 
-        "ẻs": "é", "ẻf": "è", "ẻx": "ẽ", "ẻj": "ẹ", 
-        "ẽs": "é", "ẽf": "è", "ẽr": "ẻ", "ẽj": "ẹ", 
-        "ẹs": "é", "ẹf": "è", "ẹr": "ẻ", "ẹx": "ẽ",
-        "ếf": "ề", "ếr": "ể", "ếx": "ễ", "ếj": "ệ", 
-        "ềs": "ế", "ềr": "ể", "ềx": "ễ", "ềj": "ệ", 
-        "ểs": "ế", "ểf": "ề", "ểx": "ễ", "ểj": "ệ", 
-        "ễs": "ế", "ễf": "ề", "ễr": "ể", "ễj": "ệ", 
-        "ệs": "ế", "ệf": "ề", "ệr": "ể", "ệx": "ễ",
-        "íf": "ì", "ír": "ỉ", "íx": "ĩ", "íj": "ị", 
-        "ìs": "í", "ìr": "ỉ", "ìx": "ĩ", "ìj": "ị", 
-        "ỉs": "í", "ỉf": "ì", "ỉx": "ĩ", "ỉj": "ị", 
-        "ĩs": "í", "ĩf": "ì", "ĩr": "ỉ", "ĩj": "ị", 
-        "ịs": "í", "ịf": "ì", "ịr": "ỉ", "ịx": "ĩ", 
-        "óf": "ò", "ór": "ỏ", "óx": "õ", "ój": "ọ", 
-        "òs": "ó", "òr": "ỏ", "òx": "õ", "òj": "ọ", 
-        "ỏs": "ó", "ỏf": "ò", "ỏx": "õ", "ỏj": "ọ", 
-        "õs": "ó", "õf": "ò", "õr": "ỏ", "õj": "ọ", 
-        "ọs": "ó", "ọf": "ò", "ọr": "ỏ", "ọx": "õ", 
-        "ốf": "ồ", "ốr": "ổ", "ốx": "ỗ", "ốj": "ộ", 
-        "ồs": "ố", "ồr": "ổ", "ồx": "ỗ", "ồj": "ộ", 
-        "ổs": "ố", "ổf": "ồ", "ổx": "ỗ", "ổj": "ộ", 
-        "ỗs": "ố", "ỗf": "ồ", "ỗr": "ổ", "ỗj": "ộ", 
-        "ộs": "ố", "ộf": "ồ", "ộr": "ổ", "ộx": "ỗ", 
-        "ớf": "ờ", "ớr": "ở", "ớx": "ỡ", "ớj": "ợ", 
-        "ờs": "ớ", "ờr": "ở", "ờx": "ỡ", "ờj": "ợ", 
-        "ởs": "ớ", "ởf": "ờ", "ởx": "ỡ", "ởj": "ợ", 
-        "ỡs": "ớ", "ỡf": "ờ", "ỡr": "ở", "ỡj": "ợ", 
-        "ợs": "ớ", "ợf": "ờ", "ợr": "ở", "ợx": "ỡ", 
-        "úf": "ù", "úr": "ủ", "úx": "ũ", "új": "ụ", 
-        "ùs": "ú", "ùr": "ủ", "ùx": "ũ", "ùj": "ụ", 
-        "ủs": "ú", "ủf": "ù", "ủx": "ũ", "ủj": "ụ", 
-        "ũs": "ú", "ũf": "ù", "ũr": "ủ", "ũj": "ụ", 
-        "ụs": "ú", "ụf": "ù", "ụr": "ủ", "ụx": "ũ", 
-        "ứf": "ừ", "ứr": "ử", "ứx": "ữ", "ứj": "ự", 
-        "ừs": "ứ", "ừr": "ử", "ừx": "ữ", "ừj": "ự", 
-        "ửs": "ứ", "ửf": "ừ", "ửx": "ữ", "ửj": "ự", 
-        "ữs": "ứ", "ữf": "ừ", "ữr": "ử", "ữj": "ự", 
-        "ựs": "ứ", "ựf": "ừ", "ựr": "ử", "ựx": "ữ", 
-        "ýf": "ỳ", "ýr": "ỷ", "ýx": "ỹ", "ýj": "ỵ", 
-        "ỳs": "ý", "ỳr": "ỷ", "ỳx": "ỹ", "ỳj": "ỵ", 
-        "ỷs": "ý", "ỷf": "ỳ", "ỷx": "ỹ", "ỷj": "ỵ", 
-        "ỹs": "ý", "ỹf": "ỳ", "ỹr": "ỷ", "ỹj": "ỵ", 
-        "ỵs": "ý", "ỵf": "ỳ", "ỵr": "ỷ", "ỵx": "ỹ", 
-
-        "gias": "giá", "giaf": "già", "giar": "giả", "giax": "giã", "giaj": "giạ",
-        "gía": "giá", "gìa": "già", "gỉa": "giả", "gĩa": "giã", "gịa": "giạ",
-        "gíă": "giắ", "gìă": "giằ", "gỉă": "giẳ", "gĩă": "giẵ", "gịă": "giặ",
-        "gíâ": "giấ", "gìâ": "giầ", "gỉâ": "giẩ", "gĩẫ": "giẫ", "gịâ": "giậ",
-        "gíe": "gié", "gìe": "giè", "gỉe": "giẻ", "gĩe": "giẽ", "gịe": "giẹ",
-        "gíê": "giế", "gìê": "giề", "gỉê": "giể", "gĩê": "giễ", "gịê": "giệ",
-        "gío": "gió", "gìo": "giò", "gỉo": "giỏ", "gĩo": "giõ", "gịo": "giọ",
-        "gíô": "giố", "gìô": "giồ", "gỉô": "giổ", "gĩô": "giỗ", "gịô": "giộ",
-        "gíơ": "giớ", "gìơ": "giờ", "gỉơ": "giở", "gĩơ": "giỡ", "gịơ": "giợ",
-        "gius": "giú", "giuf": "giù", "giur": "giủ", "giux": "giũ", "giuj": "giụ",
-        "gíu": "giú", "gìu": "giù", "gỉu": "giủ", "gĩu": "giũ", "gịu": "giụ",
-        "gíư": "giứ", "gìư": "giừ", "gỉư": "giử", "gĩư": "giữ", "gịư": "giự",
-
-        "ghíê": "ghiế", "ghìê": "ghiề", "ghỉê": "ghiể", "ghĩê": "ghiễ", "ghịê": "ghiệ",
-
-
         "acw": "ăc", "amw": "ăm", "anw": "ăn", "apw": "ăp", "atw": "ăt", "angw": "ăng",
         "aca": "âc", "ama": "âm", "ana": "ân", "apa": "âp", "ata": "ât", "aua": "âu", "aya": "ây", "anga": "âng",
         "eme": "êm", "ene": "ên", "epe": "êp", "ete": "êt", "enhe": "ênh",
         "oio": "ôi","omo": "ôm", "ono": "ôn", "opo": "ôp", "oto": "ôt", "ongo": "ông",
         "oiw": "ơi", "omw": "ơm", "onw": "ơn", "opw": "ơp", "otw": "ơt",
-        "uaw": "ưa", "ucw": "ưc", "uiw": "ưi", "umw": "ưm", "unw": "ưn", "utw": "ưt", "uuw": "ưu", "ungw": "ưng",
+        "uaw": "ưa", "uiw": "ưi", "umw": "ưm", "unw": "ưn", "utw": "ưt", "uuw": "ưu", "ungw": "ưng",
         "ieme": "iêm", "iene": "iên", "iepe": "iêp", "iete": "iêt", "ieue": "iêu", "ienge": "iêng", 
         "uocw": "ươc", "uoiw": "ươi", "uomw": "ươm", "uonw": "ươn", "uotw": "ươt", "uongw": "ương",
         "uoco": "uôc", "uoio": "uôi", "uomo": "uôm", "uono": "uôn", "uoto": "uôt", "uongo": "uông",
@@ -156,7 +79,7 @@
         "ême": "eme", "êne": "ene", "êpe": "epe", "ête": "ete",
         "ôio": "oio", "ômo": "omo", "ôno": "ono", "ôpo": "opo", "ôto": "oto", "ôngo": "ongo",
         "ơmw": "omw", "ơnw": "onw", "ơpw": "opw", "ơtw": "otw",
-        "ưaw": "uaw", "ưcw": "ucw", "ưiw": "uiw", "ưmw": "umw", "ưnw": "unw" , "ưtw": "utw", "ưuw": "uuw", "ưngw": "ungw",
+        "ưaw": "uaw", "ưiw": "uiw", "ưmw": "umw", "ưnw": "unw" , "ưtw": "utw", "ưuw": "uuw", "ưngw": "ungw",
         "iême": "ieme", "iêne": "iene", "iêpe": "iepe", "iête": "iete", "iêue": "ieue", "iênge": "ienge",
         "ươcw": "uocw", "ươiw": "uoiw", "ươmw": "uomw", "ươnw": "uonw", "ươtw": "uotw", "ươngw": "uongw",
         "uyêne": "uyene", "uyêt": "uyete",
@@ -215,7 +138,6 @@
         "inhs": "ính", "inhf": "ình", "inhr": "ỉnh", "inhx": "ĩnh", "inhj": "ịnh",
 
         "ías": "ias", "ìaf": "iaf", "ỉar": "iar", "ĩax": "iax", "ịaj": "iaj",
-        "iás": "ias", "iàf": "iaf", "iảr": "iar", "iãx": "iax", "iạj": "iaj",
         "ícs": "ics", "ịcj": "icj",
         "íms": "ims", "ìmf": "imf", "ỉmr": "imr", "ĩmx": "imx", "ịmj": "imj",
         "íns": "ins", "ìnf": "inf", "ỉnr": "inr", "ĩnx": "inx", "ịnj": "inj",
@@ -463,8 +385,6 @@
 
         "ưas": "ứa", "ưaf": "ừa", "ưar": "ửa", "ưax": "ữa", "ưaj": "ựa",
         "úaw": "ứa", "ùaw": "ừa", "ủaw": "ửa", "ũaw": "ữa", "ụaw": "ựa",
-        "ưcs": "ức", "ưcj": "ực",
-        "úcw": "ức", "ụcw": "ực",
         "ưis": "ứi", "ưif": "ừi", "ưir": "ửi", "ưix": "ữi", "ưij": "ựi",
         "úiw": "ứi", "ùiw": "ừi", "ủiw": "ửi", "ũiw": "ữi", "ụiw": "ựi",
         "ưms": "ứm", "ưmf": "ừm", "ưmr": "ửm", "ưmx": "ữm", "ưmj": "ựm",
@@ -483,8 +403,6 @@
         "ửar": "ưar", "ửaw": "ủaw", "ưarw": "uarw", "ủawr": "uawr",
         "ữax": "ưax", "ữaw": "ũaw", "ưaxw": "uaxw", "ũawx": "uawx",
         "ựaj": "ưaj", "ựaw": "ụaw", "ưajw": "uajw", "ụawj": "uawj",
-        "ứcs": "ưcs", "ứcw": "úcw", "ưcsw": "ucsw", "úcws": "ucws",        
-        "ựcj": "ưcj", "ựcw": "ụcw", "ưcjw": "ucjw", "ụcwj": "ucwj",
         "ứis": "ưis", "ứiw": "úiw", "ưisw": "uisw", "úiws": "uiws",
         "ừif": "ưif", "ừiw": "ùiw", "ưifw": "uifw", "ùiwf": "uiwf",
         "ửir": "ưir", "ửiw": "ủiw", "ưirw": "uirw", "ủiwr": "uiwr",
@@ -532,11 +450,6 @@
         "iénge": "iếng", "iènge": "iềng", "iẻnge": "iểng", "iẽnge": "iễng", "iẹnge": "iệng",
         "iêngs": "iếng", "iêngf": "iềng", "iêngr": "iểng", "iêngx": "iễng", "iêngj": "iệng",
 
-        "iếs": "iês", "iếe": "iée", "iêse": "iese", "iées": "iees",
-        "iềf": "iêf", "iềe": "ièe", "iêfe": "iefe", "ièef": "ieef",
-        "iểr": "iêr", "iểe": "iẻe", "iêre": "iere", "iẻer": "ieer",
-        "iễx": "iêx", "iễe": "iẽe", "iêxe": "iexe", "iẽex": "ieex",
-        "iệj": "iêj", "iệe": "iẹe", "iêje": "ieje", "iẹej": "ieej",
         "iếms": "iêms", "iếme": "iéme", "iêmse": "iemse", "iémes": "iemes",
         "iềmf": "iêmf", "iềme": "ième", "iêmfe": "iemfe", "ièmef": "iemef",
         "iểmr": "iêmr", "iểme": "iẻme", "iêmre": "iemre", "iẻmer": "iemer",

app/src/main/assets/ime/keyboard/org.florisboard.layouts/extension.json

@@ -17,13 +17,6 @@
         "direction": "rtl",
         "modifier": "org.florisboard.layouts:arabic"
       },
-      {
-        "id": "armenian_alt_phonetic",
-        "label": "Armenian Alt Phonetic",
-        "authors": [ "MikayelB" ],
-        "direction": "ltr",
-        "modifier": "org.florisboard.layouts:armenian"
-      },
       {
         "id": "western_armenian",
         "label": "Armenian (Western)",
@@ -56,12 +49,6 @@
         "authors": [ "iamrasel" ],
         "direction": "ltr"
       },
-      {
-        "id": "hindi_in",
-        "label": "हिंदी",
-        "authors": [ "npnpatidar" ],
-        "direction": "ltr"
-      },
       {
         "id": "bepo",
         "label": "BÉPO",
@@ -117,25 +104,12 @@
         "authors": [ "blucin" ],
         "direction": "ltr"
       },
-      {
-        "id": "colemak_dhm",
-        "label": "ColemakDHm",
-        "authors": [ "SteveP", "oneilljp" ],
-        "direction": "ltr"
-      },
       {
         "id": "danish",
         "label": "Danish (QWERTY)",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
-      {
-        "id": "diktor",
-        "label": "Diktor",
-        "authors": [ "kuroya2mouse" ],
-        "direction": "ltr",
-        "modifier": "org.florisboard.layouts:diktor"
-      },
       {
         "id": "dvorak",
         "label": "Dvorak",
@@ -143,13 +117,6 @@
         "direction": "ltr",
         "modifier": "org.florisboard.layouts:dvorak"
       },
-      {
-        "id": "dvorak_de",
-        "label": "Dvorak (DE)",
-        "authors": [ "msrd0" ],
-        "direction": "ltr",
-        "modifier": "org.florisboard.layouts:dvorak_de"
-      },
       {
         "id": "dvorak_es",
         "label": "Dvorak (ÑÇ)",
@@ -157,13 +124,6 @@
         "direction": "ltr",
         "modifier": "org.florisboard.layouts:dvorak"
       },
-      {
-        "id": "dvorak_se",
-        "label": "Dvorak (SE)",
-        "authors": [ "iceaway" ],
-        "direction": "ltr",
-        "modifier": "org.florisboard.layouts:dvorak_se"
-      },
       {
         "id": "esperanto",
         "label": "Esperanto",
@@ -274,12 +234,6 @@
         "authors": [ "patrickgold", "Hayleia" ],
         "direction": "ltr"
       },
-      {
-        "id": "korean_phonetic",
-        "label": "South Korean Phonetic",
-        "authors": [ "Shunnuo" ],
-        "direction": "ltr"
-      },
       {
         "id": "kurdish",
         "label": "کوردی (قوەرتی نوێ)",
@@ -418,12 +372,6 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
-      {
-        "id": "tamil",
-        "label": "Tamil",
-        "authors": [ "Clem0908" ],
-        "direction": "ltr"
-      },
       {
         "id": "thai_kedmanee",
         "label": "Thai Kedmanee",
@@ -448,18 +396,6 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
-      {
-        "id": "udmurt_compact",
-        "label": "Udmurt (3 чур)",
-        "authors": [ "vorgoron" ],
-        "direction": "ltr"
-      },
-      {
-        "id": "udmurt_extended",
-        "label": "Udmurt (4 чур)",
-        "authors": [ "vorgoron" ],
-        "direction": "ltr"
-      },
       {
         "id": "urdu_phonetic",
         "label": "Urdu Phonetic",
@@ -478,12 +414,6 @@
         "label": "Workman",
         "authors": [ "icyphox" ],
         "direction": "ltr"
-      },
-      {
-        "id": "jcuken_interslavic",
-        "label": "Interslavic (ЈЦУКЕН)",
-        "authors": [ "victorbnl" ],
-        "direction": "ltr"
       }
     ],
     "charactersMod": [
@@ -505,30 +435,12 @@
         "authors": [ "HeiWiper" ],
         "direction": "rtl"
       },
-      {
-        "id": "diktor",
-        "label": "Diktor",
-        "authors": [ "kuroya2mouse" ],
-        "direction": "ltr"
-      },
       {
         "id": "dvorak",
         "label": "Dvorak",
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
-      {
-        "id": "dvorak_de",
-        "label": "Dvorak (DE)",
-        "authors": [ "msrd0" ],
-        "direction": "ltr"
-      },
-      {
-        "id": "dvorak_se",
-        "label": "Dvorak (SE)",
-        "authors": [ "iceaway" ],
-        "direction": "ltr"
-      },
       {
         "id": "hebrew",
         "label": "עברית",
@@ -627,12 +539,6 @@
         "authors": [ "waelwindows" ],
         "direction": "ltr"
       },
-      {
-        "id": "czech",
-        "label": "Czech",
-        "authors": [ "bmondream" ],
-        "direction": "ltr"
-      },
       {
         "id": "devanagari",
         "label": "Devanagari",

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/armenian_alt_phonetic.json

@@ -1,49 +0,0 @@
-[
-    [
-      { "$": "auto_text_key", "code": 1383, "label": "է" },
-      { "$": "auto_text_key", "code": 1385, "label": "թ" },
-      { "$": "auto_text_key", "code": 1411, "label": "փ" },
-      { "$": "auto_text_key", "code": 1393, "label": "ձ" },
-      { "$": "auto_text_key", "code": 1403, "label": "ջ" },
-      { "$": "auto_text_key", "code": 1408, "label": "ր" },
-      { "$": "auto_text_key", "code": 1401, "label": "չ" },
-      { "$": "auto_text_key", "code": 1395, "label": "ճ" },
-      { "$": "auto_text_key", "code": 1386, "label": "ժ" },
-      { "$": "auto_text_key", "code": 1390, "label": "ծ" }
-    ],
-    [
-      { "$": "auto_text_key", "code": 1412, "label": "ք" },
-      { "$": "auto_text_key", "code": 1400, "label": "ո" },
-      { "$": "auto_text_key", "code": 1381, "label": "ե" },
-      { "$": "auto_text_key", "code": 1404, "label": "ռ" },
-      { "$": "auto_text_key", "code": 1407, "label": "տ" },
-      { "$": "auto_text_key", "code": 1384, "label": "ը" },
-      { "$": "auto_text_key", "code": 1410, "label": "ւ" },
-      { "$": "auto_text_key", "code": 1387, "label": "ի" },
-      { "$": "auto_text_key", "code": 1413, "label": "օ" },
-      { "$": "auto_text_key", "code": 1402, "label": "պ" }
-    ],
-    [
-      { "$": "auto_text_key", "code": 1377, "label": "ա" },
-      { "$": "auto_text_key", "code": 1405, "label": "ս" },
-      { "$": "auto_text_key", "code": 1380, "label": "դ" },
-      { "$": "auto_text_key", "code": 1414, "label": "ֆ" },
-      { "$": "auto_text_key", "code": 1379, "label": "գ" },
-      { "$": "auto_text_key", "code": 1392, "label": "հ" },
-      { "$": "auto_text_key", "code": 1397, "label": "յ" },
-      { "$": "auto_text_key", "code": 1391, "label": "կ" },
-      { "$": "auto_text_key", "code": 1388, "label": "լ" },
-      { "$": "auto_text_key", "code": 1389, "label": "խ" }
-    ],
-    [
-      { "$": "auto_text_key", "code": 1382, "label": "զ" },
-      { "$": "auto_text_key", "code": 1394, "label": "ղ" },
-      { "$": "auto_text_key", "code": 1409, "label": "ց" },
-      { "$": "auto_text_key", "code": 1406, "label": "վ" },
-      { "$": "auto_text_key", "code": 1378, "label": "բ" },
-      { "$": "auto_text_key", "code": 1398, "label": "ն" },
-      { "$": "auto_text_key", "code": 1396, "label": "մ" },
-      { "$": "auto_text_key", "code": 1399, "label": "շ" }
-    ]
-  ]
-  

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/bengali_bd.json

@@ -42,9 +42,9 @@
 	}
   ],
   [
-  { "$": "case_selector",
+    { "$": "case_selector",
 	  "lower": { "code": 2499, "label": "ৃ" },
-    "upper": { "code": 2435, "label": "ঃ" }
+	  "upper": { "$": "multi_text_key", "codePoints": [2480, 2509], "label": "র্" }
 	},
 	{ "$": "case_selector",
 	  "lower": { "code": 2497, "label": "ু" },
@@ -109,4 +109,4 @@
       "upper": { "code": 2486, "label": "শ" }
     }
   ]
-]
+]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/colemak_dhm.json

@@ -1,46 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  113, "label": "q" },
-    { "$": "auto_text_key", "code":  119, "label": "w" },
-    { "$": "auto_text_key", "code":  102, "label": "f" },
-    { "$": "auto_text_key", "code":  112, "label": "p" },
-    { "$": "auto_text_key", "code":   98, "label": "b" },
-    { "$": "auto_text_key", "code":  106, "label": "j" },
-    { "$": "auto_text_key", "code":  108, "label": "l" },
-    { "$": "auto_text_key", "code":  117, "label": "u" },
-    { "$": "auto_text_key", "code":  121, "label": "y" },
-    { "$": "case_selector",
-      "lower": { "code":   59, "label": ";", "popup": {
-        "relevant": [
-          { "code":   58, "label": ":" }
-        ]
-      } },
-      "upper": { "code":   58, "label": ":", "popup": {
-        "relevant": [
-          { "code":   59, "label": ";" }
-        ]
-      } }
-    }
-  ],
-  [
-    { "$": "auto_text_key", "code":   97, "label": "a" },
-    { "$": "auto_text_key", "code":  114, "label": "r" },
-    { "$": "auto_text_key", "code":  115, "label": "s" },
-    { "$": "auto_text_key", "code":  116, "label": "t" },
-    { "$": "auto_text_key", "code":  103, "label": "g" },
-    { "$": "auto_text_key", "code":  109, "label": "m" },
-    { "$": "auto_text_key", "code":  110, "label": "n" },
-    { "$": "auto_text_key", "code":  101, "label": "e" },
-    { "$": "auto_text_key", "code":  105, "label": "i" },
-    { "$": "auto_text_key", "code":  111, "label": "o" }
-  ],
-  [
-    { "$": "auto_text_key", "code":  122, "label": "z" },
-    { "$": "auto_text_key", "code":  120, "label": "x" },
-    { "$": "auto_text_key", "code":   99, "label": "c" },
-    { "$": "auto_text_key", "code":  100, "label": "d" },
-    { "$": "auto_text_key", "code":  118, "label": "v" },
-    { "$": "auto_text_key", "code":  107, "label": "k" },
-    { "$": "auto_text_key", "code":  104, "label": "h" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/diktor.json

@@ -1,49 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  1094, "label": "ц" },
-    { "$": "auto_text_key", "code":  1100, "label": "ь" },
-    { "$": "auto_text_key", "code":  1103, "label": "я" },
-    { "$": "case_selector",
-      "lower": { "code":   44, "label": ",", "popup": {
-        "relevant": [
-          { "code":   46, "label": "." }
-        ]
-      } },
-      "upper": { "code":   46, "label": ".", "popup": {
-        "relevant": [
-          { "code":   44, "label": "," }
-        ]
-      } }
-    },
-    { "$": "auto_text_key", "code":  1079, "label": "з" },
-    { "$": "auto_text_key", "code":  1074, "label": "в" },
-    { "$": "auto_text_key", "code":  1082, "label": "к" },
-    { "$": "auto_text_key", "code":  1076, "label": "д" },
-    { "$": "auto_text_key", "code":  1095, "label": "ч" },
-    { "$": "auto_text_key", "code":  1096, "label": "ш" },
-    { "$": "auto_text_key", "code":  1097, "label": "щ" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1091 , "label": "у" },
-    { "$": "auto_text_key", "code": 1080 , "label": "и" },
-    { "$": "auto_text_key", "code": 1077 , "label": "е" },
-    { "$": "auto_text_key", "code": 1086 , "label": "о" },
-    { "$": "auto_text_key", "code": 1072 , "label": "а" },
-    { "$": "auto_text_key", "code": 1083 , "label": "л" },
-    { "$": "auto_text_key", "code": 1085 , "label": "н" },
-    { "$": "auto_text_key", "code": 1090 , "label": "т" },
-    { "$": "auto_text_key", "code": 1089 , "label": "с" },
-    { "$": "auto_text_key", "code": 1088 , "label": "р" },
-    { "$": "auto_text_key", "code": 1081 , "label": "й" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1101 , "label": "э" },
-    { "$": "auto_text_key", "code": 1093 , "label": "х" },
-    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
-    { "$": "auto_text_key", "code": 1102 , "label": "ю" },
-    { "$": "auto_text_key", "code": 1073 , "label": "б" },
-    { "$": "auto_text_key", "code": 1084 , "label": "м" },
-    { "$": "auto_text_key", "code": 1087 , "label": "п" },
-    { "$": "auto_text_key", "code": 1075 , "label": "г" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/dvorak_de.json

@@ -1,71 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  252, "label": "ü" },
-    { "$": "shift_state_selector",
-      "shiftedManual": { "code":   59, "label": ";", "popup": {
-        "relevant": [
-          { "code":   44, "label": "," }
-        ]
-      } },
-      "default": { "code":   44, "label": ",", "popup": {
-        "relevant": [
-          { "code":   59, "label": ";" }
-        ]
-      } }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": { "code":   58, "label": ":", "popup": {
-        "relevant": [
-          { "code":   46, "label": "." }
-        ]
-      } },
-      "default": { "code":   46, "label": ".", "popup": {
-        "relevant": [
-          { "code":   58, "label": ":" }
-        ]
-      } }
-    },
-    { "$": "auto_text_key", "code":  112, "label": "p" },
-    { "$": "auto_text_key", "code":  121, "label": "y" },
-    { "$": "auto_text_key", "code":  102, "label": "f" },
-    { "$": "auto_text_key", "code":  103, "label": "g" },
-    { "$": "auto_text_key", "code":   99, "label": "c" },
-    { "$": "auto_text_key", "code":  116, "label": "t" },
-    { "$": "auto_text_key", "code":  122, "label": "z" },
-    { "$": "shift_state_selector",
-      "shiftedManual": { "code":  223, "label": "ß", "popup": {
-        "relevant": [
-          { "code":   63, "label": "?" }
-        ]
-      } },
-      "default": { "code":   63, "label": "?", "popup": {
-        "relevant": [
-          { "code":  223, "label": "ß" }
-        ]
-      } }
-    }
-  ],
-  [
-    { "$": "auto_text_key", "code":   97, "label": "a" },
-    { "$": "auto_text_key", "code":  111, "label": "o" },
-    { "$": "auto_text_key", "code":  101, "label": "e" },
-    { "$": "auto_text_key", "code":  105, "label": "i" },
-    { "$": "auto_text_key", "code":  117, "label": "u" },
-    { "$": "auto_text_key", "code":  104, "label": "h" },
-    { "$": "auto_text_key", "code":  100, "label": "d" },
-    { "$": "auto_text_key", "code":  114, "label": "r" },
-    { "$": "auto_text_key", "code":  110, "label": "n" },
-    { "$": "auto_text_key", "code":  115, "label": "s" },
-    { "$": "auto_text_key", "code":  108, "label": "l" }
-  ],
-  [
-    { "$": "auto_text_key", "code":  113, "label": "q" },
-    { "$": "auto_text_key", "code":  106, "label": "j" },
-    { "$": "auto_text_key", "code":  107, "label": "k" },
-    { "$": "auto_text_key", "code":  120, "label": "x" },
-    { "$": "auto_text_key", "code":   98, "label": "b" },
-    { "$": "auto_text_key", "code":  109, "label": "m" },
-    { "$": "auto_text_key", "code":  119, "label": "w" },
-    { "$": "auto_text_key", "code":  118, "label": "v" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/dvorak_se.json

@@ -1,37 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  229, "label": "å" },
-    { "$": "auto_text_key", "code":  228, "label": "ä" },
-    { "$": "auto_text_key", "code":  246, "label": "ö" },
-    { "$": "auto_text_key", "code":  112, "label": "p" },
-    { "$": "auto_text_key", "code":  121, "label": "y" },
-    { "$": "auto_text_key", "code":  102, "label": "f" },
-    { "$": "auto_text_key", "code":  103, "label": "g" },
-    { "$": "auto_text_key", "code":   99, "label": "c" },
-    { "$": "auto_text_key", "code":  114, "label": "r" },
-    { "$": "auto_text_key", "code":  108, "label": "l" }
-  ],
-  [
-    { "$": "auto_text_key", "code":   97, "label": "a" },
-    { "$": "auto_text_key", "code":  111, "label": "o" },
-    { "$": "auto_text_key", "code":  101, "label": "e" },
-    { "$": "auto_text_key", "code":  117, "label": "u" },
-    { "$": "auto_text_key", "code":  105, "label": "i" },
-    { "$": "auto_text_key", "code":  100, "label": "d" },
-    { "$": "auto_text_key", "code":  104, "label": "h" },
-    { "$": "auto_text_key", "code":  116, "label": "t" },
-    { "$": "auto_text_key", "code":  110, "label": "n" },
-    { "$": "auto_text_key", "code":  115, "label": "s" }
-  ],
-  [
-    { "$": "auto_text_key", "code":  113, "label": "q" },
-    { "$": "auto_text_key", "code":  106, "label": "j" },
-    { "$": "auto_text_key", "code":  107, "label": "k" },
-    { "$": "auto_text_key", "code":  120, "label": "x" },
-    { "$": "auto_text_key", "code":   98, "label": "b" },
-    { "$": "auto_text_key", "code":  109, "label": "m" },
-    { "$": "auto_text_key", "code":  119, "label": "w" },
-    { "$": "auto_text_key", "code":  118, "label": "v" },
-    { "$": "auto_text_key", "code":  122, "label": "z" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/hindi_in.json

@@ -1,42 +0,0 @@
-[
-  [
-    { "$": "case_selector", "lower": { "code": 2335, "label": "ट" }, "upper": { "code": 2336, "label": "ठ" } },
-    { "$": "case_selector", "lower": { "code": 2337, "label": "ड" }, "upper": { "code": 2338, "label": "ढ" } },
-    { "$": "case_selector", "lower": { "code": 2375, "label": "े" }, "upper": { "code": 2376, "label": "ै" } },
-    { "$": "case_selector", "lower": { "code": 2352, "label": "र" }, "upper": { "code": 2371, "label": "ृ" } },
-    { "$": "case_selector", "lower": { "code": 2340, "label": "त" }, "upper": { "code": 2341, "label": "थ" } },
-    { "$": "case_selector", "lower": { "code": 2351, "label": "य" }, "upper": { "code": 2399, "label": "य़" } },
-    { "$": "case_selector", "lower": { "code": 2369, "label": "ु" }, "upper": { "code": 2370, "label": "ू" } },
-    { "$": "case_selector", "lower": { "code": 2367, "label": "ि" }, "upper": { "code": 2368, "label": "ी" } },
-    { "$": "case_selector", "lower": { "code": 2379, "label": "ो" }, "upper": { "code": 2380, "label": "ौ" } },
-    { "$": "case_selector", "lower": { "code": 2346, "label": "प" }, "upper": { "code": 2398, "label": "फ़" } }
-  ],
-  [
-    { "$": "case_selector", "lower": { "code": 2366, "label": "ा" }, "upper": { "code": 2309, "label": "अ" } },
-    { "$": "case_selector", "lower": { "code": 2360, "label": "स" }, "upper": { "code": 2358, "label": "श" } },
-    { "$": "case_selector", "lower": { "code": 2342, "label": "द" }, "upper": { "code": 2343, "label": "ध" } },
-    { "$": "case_selector", "lower": { "code": 2347, "label": "फ" }, "upper": { "code": 2364, "label": " ़" } },
-    { "$": "case_selector", "lower": { "code": 2327, "label": "ग" }, "upper": { "code": 2328, "label": "घ" } },
-    { "$": "case_selector", "lower": { "code": 2361, "label": "ह" }, "upper": { "code": 2307, "label": "ः" } },
-    { "$": "case_selector", "lower": { "code": 2332, "label": "ज" }, "upper": { "code": 2333, "label": "झ" } },
-    { "$": "case_selector", "lower": { "code": 2325, "label": "क" }, "upper": { "code": 2326, "label": "ख" } },
-    { "$": "case_selector", "lower": { "code": 2354, "label": "ल" }, "upper": { "code": 2355, "label": "ळ" } }
-  ],
-  [
-    {
-      "$": "case_selector",
-      "lower": { "$": "multi_text_key", "codePoints": [2332, 2381, 2334], "label": "ज्ञ" },
-      "upper": { "code": 2395, "label": "ज़" }
-    },
-    {
-      "$": "case_selector",
-      "lower": { "$": "multi_text_key", "codePoints": [2325, 2381, 2359], "label": "क्ष" },
-      "upper": { "code": 2359, "label": "ष" }
-    },
-    { "$": "case_selector", "lower": { "code": 2330, "label": "च" }, "upper": { "code": 2331, "label": "छ" } },
-    { "$": "case_selector", "lower": { "code": 2357, "label": "व" }, "upper": { "code": 2381, "label": "्" } },
-    { "$": "case_selector", "lower": { "code": 2348, "label": "ब" }, "upper": { "code": 2349, "label": "भ" } },
-    { "$": "case_selector", "lower": { "code": 2344, "label": "न" }, "upper": { "code": 2339, "label": "ण" } },
-    { "$": "case_selector", "lower": { "code": 2350, "label": "म" }, "upper": { "code": 2306, "label": "ं" } }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/jcuken_interslavic.json

@@ -1,36 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  1112, "label": "ј" },
-    { "$": "auto_text_key", "code":  1094, "label": "ц" },
-    { "$": "auto_text_key", "code":  1091, "label": "у" },
-    { "$": "auto_text_key", "code":  1082, "label": "к" },
-    { "$": "auto_text_key", "code":  1077, "label": "е" },
-    { "$": "auto_text_key", "code":  1085, "label": "н" },
-    { "$": "auto_text_key", "code":  1114, "label": "њ" },
-    { "$": "auto_text_key", "code":  1075, "label": "г" },
-    { "$": "auto_text_key", "code":  1096, "label": "ш" },
-    { "$": "auto_text_key", "code":  1079, "label": "з" },
-    { "$": "auto_text_key", "code":  1093, "label": "х" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
-    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
-    { "$": "auto_text_key", "code": 1074 , "label": "в" },
-    { "$": "auto_text_key", "code": 1072 , "label": "а" },
-    { "$": "auto_text_key", "code": 1087 , "label": "п" },
-    { "$": "auto_text_key", "code": 1088 , "label": "р" },
-    { "$": "auto_text_key", "code": 1086 , "label": "о" },
-    { "$": "auto_text_key", "code": 1083 , "label": "л" },
-    { "$": "auto_text_key", "code": 1113 , "label": "љ" },
-    { "$": "auto_text_key", "code": 1078 , "label": "ж" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1108 , "label": "є" },
-    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
-    { "$": "auto_text_key", "code": 1089 , "label": "с" },
-    { "$": "auto_text_key", "code": 1084 , "label": "м" },
-    { "$": "auto_text_key", "code": 1080 , "label": "и" },
-    { "$": "auto_text_key", "code": 1090 , "label": "т" },
-    { "$": "auto_text_key", "code": 1073 , "label": "б" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/korean_phonetic.json

@@ -1,55 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code": 12615, "label": "ㅇ"},
-    { "$": "auto_text_key", "code": 12641, "label": "ㅡ"},
-    { "$": "case_selector",
-      "lower": { "code": 12628, "label": "ㅔ" },
-      "upper": { "code": 12630, "label": "ㅖ" }
-    },
-    { "$": "auto_text_key", "code": 12601, "label": "ㄹ"},
-    { "$": "auto_text_key", "code": 12620, "label": "ㅌ"},
-    { "$": "case_selector",
-      "lower": { "code": 12624, "label": "ㅐ" },
-      "upper": { "code": 12626, "label": "ㅒ" }
-    },
-    { "$": "auto_text_key", "code": 12636, "label": "ㅜ"},
-    { "$": "auto_text_key", "code": 12643, "label": "ㅣ"},
-    { "$": "auto_text_key", "code": 12631, "label": "ㅗ"},
-    { "$": "auto_text_key", "code": 12621, "label": "ㅍ"}
-  ],
-  [
-    { "$": "auto_text_key", "code": 12623, "label": "ㅏ"},
-    { "$": "case_selector",
-      "lower": { "code": 12613, "label": "ㅅ" },
-      "upper": { "code": 12614, "label": "ㅆ" }
-    },
-    { "$": "case_selector",
-      "lower": { "code": 12599, "label": "ㄷ" },
-      "upper": { "code": 12600, "label": "ㄸ" }
-    },
-    { "$": "auto_text_key", "code": 12625, "label": "ㅑ"},
-    { "$": "case_selector",
-      "lower": { "code": 12593, "label": "ㄱ" },
-      "upper": { "code": 12594, "label": "ㄲ" }
-    },
-    { "$": "auto_text_key", "code": 12622, "label": "ㅎ"},
-    { "$": "case_selector",
-      "lower": { "code": 12616, "label": "ㅈ" },
-      "upper": { "code": 12617, "label": "ㅉ" }
-    },
-    { "$": "auto_text_key", "code": 12619, "label": "ㅋ"},
-    { "$": "auto_text_key", "code": 12635, "label": "ㅛ"}
-  ],
-  [
-    { "$": "auto_text_key", "code": 12629, "label": "ㅕ"},
-    { "$": "auto_text_key", "code": 12640, "label": "ㅠ"},
-    { "$": "auto_text_key", "code": 12618, "label": "ㅊ"},
-    { "$": "auto_text_key", "code": 12627, "label": "ㅓ"},
-    { "$": "case_selector",
-      "lower": { "code": 12610, "label": "ㅂ" },
-      "upper": { "code": 12611, "label": "ㅃ" }
-    },
-    { "$": "auto_text_key", "code": 12596, "label": "ㄴ"},
-    { "$": "auto_text_key", "code": 12609, "label": "ㅁ"}
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/udmurt_compact.json

@@ -1,39 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  1081, "label": "й" },
-    { "$": "auto_text_key", "code":  1094, "label": "ц" },
-    { "$": "auto_text_key", "code":  1091, "label": "у" },
-    { "$": "auto_text_key", "code":  1082, "label": "к" },
-    { "$": "auto_text_key", "code":  1077, "label": "е" },
-    { "$": "auto_text_key", "code":  1085, "label": "н" },
-    { "$": "auto_text_key", "code":  1075, "label": "г" },
-    { "$": "auto_text_key", "code":  1096, "label": "ш" },
-    { "$": "auto_text_key", "code":  1097, "label": "щ" },
-    { "$": "auto_text_key", "code":  1079, "label": "з" },
-    { "$": "auto_text_key", "code":  1093, "label": "х" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
-    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
-    { "$": "auto_text_key", "code": 1074 , "label": "в" },
-    { "$": "auto_text_key", "code": 1072 , "label": "а" },
-    { "$": "auto_text_key", "code": 1087 , "label": "п" },
-    { "$": "auto_text_key", "code": 1088 , "label": "р" },
-    { "$": "auto_text_key", "code": 1086 , "label": "о" },
-    { "$": "auto_text_key", "code": 1083 , "label": "л" },
-    { "$": "auto_text_key", "code": 1076 , "label": "д" },
-    { "$": "auto_text_key", "code": 1078 , "label": "ж" },
-    { "$": "auto_text_key", "code": 1101 , "label": "э" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1103 , "label": "я" },
-    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
-    { "$": "auto_text_key", "code": 1089 , "label": "с" },
-    { "$": "auto_text_key", "code": 1084 , "label": "м" },
-    { "$": "auto_text_key", "code": 1080 , "label": "и" },
-    { "$": "auto_text_key", "code": 1090 , "label": "т" },
-    { "$": "auto_text_key", "code": 1100 , "label": "ь" },
-    { "$": "auto_text_key", "code": 1073 , "label": "б" },
-    { "$": "auto_text_key", "code": 1102 , "label": "ю" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/characters/udmurt_extended.json

@@ -1,48 +0,0 @@
-[
-  [
-    { "$": "auto_text_key", "code":  1081, "label": "ё" },
-    { "$": "auto_text_key", "code":  1245, "label": "ӝ" },
-    { "$": "auto_text_key", "code":  1255, "label": "ӧ" },
-    { "$": "auto_text_key", "code":  1269, "label": "ӵ" },
-    { "$": "auto_text_key", "code":  1253, "label": "ӥ" },
-    { "$": "auto_text_key", "code":  1247, "label": "ӟ" },
-    { "$": "auto_text_key", "code":  1100, "label": "ь" },
-    { "$": "auto_text_key", "code":  1098, "label": "ъ" },
-    { "$": "auto_text_key", "code":  1093, "label": "х" },
-    { "$": "auto_text_key", "code":  1101, "label": "э" }
-  ],
-  [
-    { "$": "auto_text_key", "code":  1081, "label": "й" },
-    { "$": "auto_text_key", "code":  1094, "label": "ц" },
-    { "$": "auto_text_key", "code":  1091, "label": "у" },
-    { "$": "auto_text_key", "code":  1082, "label": "к" },
-    { "$": "auto_text_key", "code":  1077, "label": "е" },
-    { "$": "auto_text_key", "code":  1085, "label": "н" },
-    { "$": "auto_text_key", "code":  1075, "label": "г" },
-    { "$": "auto_text_key", "code":  1096, "label": "ш" },
-    { "$": "auto_text_key", "code":  1097, "label": "щ" },
-    { "$": "auto_text_key", "code":  1079, "label": "з" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1092 , "label": "ф" },
-    { "$": "auto_text_key", "code": 1099 , "label": "ы" },
-    { "$": "auto_text_key", "code": 1074 , "label": "в" },
-    { "$": "auto_text_key", "code": 1072 , "label": "а" },
-    { "$": "auto_text_key", "code": 1087 , "label": "п" },
-    { "$": "auto_text_key", "code": 1088 , "label": "р" },
-    { "$": "auto_text_key", "code": 1086 , "label": "о" },
-    { "$": "auto_text_key", "code": 1083 , "label": "л" },
-    { "$": "auto_text_key", "code": 1076 , "label": "д" },
-    { "$": "auto_text_key", "code": 1078 , "label": "ж" }
-  ],
-  [
-    { "$": "auto_text_key", "code": 1103 , "label": "я" },
-    { "$": "auto_text_key", "code": 1095 , "label": "ч" },
-    { "$": "auto_text_key", "code": 1089 , "label": "с" },
-    { "$": "auto_text_key", "code": 1084 , "label": "м" },
-    { "$": "auto_text_key", "code": 1080 , "label": "и" },
-    { "$": "auto_text_key", "code": 1090 , "label": "т" },
-    { "$": "auto_text_key", "code": 1073 , "label": "б" },
-    { "$": "auto_text_key", "code": 1102 , "label": "ю" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/diktor.json

@@ -1,16 +0,0 @@
-[
-  [
-    { "code":  -11, "label": "shift", "type": "modifier" },
-    { "code":    0, "type": "placeholder" },
-    { "code":   -7, "label": "delete", "type": "enter_editing" }
-  ],
-  [
-    { "code": -202, "label": "view_symbols", "type": "system_gui" },
-    { "$": "auto_text_key", "code":  1092, "label": "ф", "groupId": 1 },
-    { "code": -227, "label": "language_switch", "type": "system_gui" },
-    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
-    { "code":   32, "label": "space" },
-    { "$": "auto_text_key", "code":  1078, "label": "ж", "groupId": 2 },
-    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/dvorak_de.json

@@ -1,16 +0,0 @@
-[
-  [
-    { "code":  -11, "label": "shift", "type": "modifier" },
-    { "code":    0, "type": "placeholder" },
-    { "code":   -7, "label": "delete", "type": "enter_editing" }
-  ],
-  [
-    { "code": -202, "label": "view_symbols", "type": "system_gui" },
-    { "$": "auto_text_key", "code":  228, "label": "ä", "groupId": 1 },
-    { "code": -227, "label": "language_switch", "type": "system_gui" },
-    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
-    { "code":   32, "label": "space" },
-    { "$": "auto_text_key", "code":  246, "label": "ö", "groupId": 2 },
-    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/charactersMod/dvorak_se.json

@@ -1,16 +0,0 @@
-[
-  [
-    { "code":  -11, "label": "shift", "type": "modifier" },
-    { "code":    0, "type": "placeholder" },
-    { "code":   -7, "label": "delete", "type": "enter_editing" }
-  ],
-  [
-    { "code": -202, "label": "view_symbols", "type": "system_gui" },
-    { "$": "auto_text_key", "code":  44, "label": "," },
-    { "code": -227, "label": "language_switch", "type": "system_gui" },
-    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
-    { "code":   32, "label": "space" },
-    { "$": "auto_text_key", "code":  46, "label": "." },
-    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/bengali.json

@@ -3,52 +3,46 @@
     { "code": 2535, "label": "১", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 2536, "label": "২", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 2537, "label": "৩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 2538, "label": "৪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 2539, "label": "৫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 2540, "label": "৬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 2542, "label": "৮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 2543, "label": "৯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 2534, "label": "০", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/cjk.json

@@ -33,7 +33,7 @@
         { "code": 32902, "label": "肆" },
         { "code": 18825, "label": "䦉" },
         { "code": 20118, "label": "亖" },
-        { "code": 65300, "label": "４" }
+        { "code": 65300, "label": "３" }
       ]
     } },
     { "code": 20116, "label": "五", "type": "numeric", "popup": {

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/czech.json

@@ -1,119 +0,0 @@
-[
-  [
-    { "$": "shift_state_selector",
-      "default": {
-        "code": 43, "label": "+", "type": "numeric", "popup": {
-          "main": { "code": 49, "label": "1" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 282, "label": "Ě", "type": "numeric", "popup": {
-          "main": { "code": 50, "label": "2" }
-        }
-      },
-      "default": {
-        "code": 283, "label": "ě", "type": "numeric", "popup": {
-          "main": { "code": 50, "label": "2" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 352, "label": "Š", "type": "numeric", "popup": {
-          "main": { "code": 51, "label": "3" }
-        }
-      },
-      "default": {
-        "code": 353, "label": "š", "type": "numeric", "popup": {
-          "main": { "code": 51, "label": "3" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 268, "label": "Č", "type": "numeric", "popup": {
-          "main": { "code": 52, "label": "4" }
-        }
-      },
-      "default": {
-        "code": 269, "label": "č", "type": "numeric", "popup": {
-          "main": { "code": 52, "label": "4" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 344, "label": "Ř", "type": "numeric", "popup": {
-          "main": { "code": 53, "label": "5" }
-        }
-      },
-      "default": {
-        "code": 345, "label": "ř", "type": "numeric", "popup": {
-          "main": { "code": 53, "label": "5" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 381, "label": "Ž", "type": "numeric", "popup": {
-          "main": { "code": 54, "label": "6" }
-        }
-      },
-      "default": {
-        "code": 382, "label": "ž", "type": "numeric", "popup": {
-          "main": { "code": 54, "label": "6" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 221, "label": "Ý", "type": "numeric", "popup": {
-          "main": { "code": 55, "label": "7" }
-        }
-      },
-      "default": {
-        "code": 253, "label": "ý", "type": "numeric", "popup": {
-          "main": { "code": 55, "label": "7" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 193, "label": "Á", "type": "numeric", "popup": {
-          "main": { "code": 56, "label": "8" }
-        }
-      },
-      "default": {
-        "code": 225, "label": "á", "type": "numeric", "popup": {
-          "main": { "code": 56, "label": "8" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 205, "label": "Í", "type": "numeric", "popup": {
-          "main": { "code": 57, "label": "9" }
-        }
-      },
-      "default": {
-        "code": 237, "label": "í", "type": "numeric", "popup": {
-          "main": { "code": 57, "label": "9" }
-        }
-      }
-    },
-    { "$": "shift_state_selector",
-      "shiftedManual": {
-        "code": 201, "label": "É", "type": "numeric", "popup": {
-          "main": { "code": 48, "label": "0" }
-        }
-      },
-      "default": {
-        "code": 233, "label": "é", "type": "numeric", "popup": {
-          "main": { "code": 48, "label": "0" }
-        }
-      }
-    }
-  ]
-]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/devanagari.json

@@ -3,52 +3,46 @@
     { "code": 2407, "label": "१", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 2408, "label": "२", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 2409, "label": "३", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 2410, "label": "४", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 2411, "label": "५", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 2412, "label": "६", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 2414, "label": "८", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 2415, "label": "९", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 2406, "label": "०", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/eastern_arabic.json

@@ -3,52 +3,46 @@
     { "code": 1633, "label": "١", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 1634, "label": "٢", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 1635, "label": "٣", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 1636, "label": "٤", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 1637, "label": "٥", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 1638, "label": "٦", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 1640, "label": "٨", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 1641, "label": "٩", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 1632, "label": "٠", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/gujarati.json

@@ -3,52 +3,46 @@
     { "code": 2791, "label": "૧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 2792, "label": "૨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 2793, "label": "૩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 2794, "label": "૪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 2795, "label": "૫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 2796, "label": "૬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 2798, "label": "૮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 2799, "label": "૯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 2790, "label": "૦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/gurmukhi.json

@@ -3,52 +3,46 @@
     { "code": 2663, "label": "੧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 2664, "label": "੨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 2665, "label": "੩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 2666, "label": "੪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 2667, "label": "੫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 2668, "label": "੬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 2670, "label": "੮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 2671, "label": "੯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 2662, "label": "੦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/kannada.json

@@ -3,52 +3,46 @@
     { "code": 3303, "label": "೧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 3304, "label": "೨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 3305, "label": "೩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 3306, "label": "೪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 3307, "label": "೫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 3308, "label": "೬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 3310, "label": "೮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 3311, "label": "೯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 3302, "label": "೦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/malayalam.json

@@ -3,52 +3,46 @@
     { "code": 3431, "label": "൧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 3432, "label": "൨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 3433, "label": "൩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 3434, "label": "൪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 3435, "label": "൫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 3436, "label": "൬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 3438, "label": "൮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 3439, "label": "൯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 3430, "label": "൦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/oriya.json

@@ -3,52 +3,46 @@
     { "code": 2919, "label": "୧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 2920, "label": "୨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 2921, "label": "୩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 2922, "label": "୪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 2923, "label": "୫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 2924, "label": "୬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 2926, "label": "୮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 2927, "label": "୯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 2918, "label": "୦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/persian.json

@@ -3,52 +3,46 @@
     { "code": 1777, "label": "۱", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 1778, "label": "۲", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 1779, "label": "۳", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 1780, "label": "۴", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 1781, "label": "۵", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 1782, "label": "۶", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 1784, "label": "۸", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 1785, "label": "۹", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 1776, "label": "۰", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/tamil.json

@@ -3,52 +3,46 @@
     { "code": 3047, "label": "௧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 3048, "label": "௨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 3049, "label": "௩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 3050, "label": "௪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 3051, "label": "௫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 3052, "label": "௬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 3054, "label": "௮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 3055, "label": "௯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 3046, "label": "௦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/telugu.json

@@ -3,52 +3,46 @@
     { "code": 3175, "label": "౧", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 3176, "label": "౨", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 3177, "label": "౩", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 3178, "label": "౪", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 3179, "label": "౫", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 3180, "label": "౬", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 3182, "label": "౮", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 3183, "label": "౯", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 3174, "label": "౦", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/thai.json

@@ -3,23 +3,20 @@
     { "code":  3665, "label": "๑", "type": "numeric", "popup": {
       "main": { "code":  185, "label": "¹" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code":  3666, "label": "๒", "type": "numeric", "popup": {
       "main": { "code":  178, "label": "²" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
         { "code": 8532, "label": "⅔" },
         { "code": 8534, "label": "⅖" }
       ]
@@ -27,59 +24,44 @@
     { "code":  3667, "label": "๓", "type": "numeric", "popup": {
       "main": { "code":  179, "label": "³" },
       "relevant": [
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
+        { "code": 8535, "label": "⅗" },
         { "code":  190, "label": "¾" },
-        { "code": 8535, "label": "⅗" }
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code":  3668, "label": "๔", "type": "numeric", "popup": {
       "main": { "code": 8308, "label": "⁴" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
         { "code": 8536, "label": "⅘" }
       ]
     } },
     { "code":  3669, "label": "๕", "type": "numeric", "popup": {
       "main": { "code": 8309, "label": "⁵" },
       "relevant": [
-        { "code": 8325, "label": "₅" },
         { "code": 8538, "label": "⅚" },
         { "code": 8541, "label": "⅝" }
       ]
     } },
     { "code":  3670, "label": "๖", "type": "numeric", "popup": {
-      "main": { "code": 8310, "label": "⁶" },
-      "relevant": [
-        { "code": 8326, "label": "₆" }
-      ]
+      "main": { "code": 8310, "label": "⁶" }
     } },
     { "code":  3671, "label": "๗", "type": "numeric", "popup": {
       "main": { "code": 8311, "label": "⁷" },
       "relevant": [
-        { "code": 8327, "label": "₇" },
         { "code": 8542, "label": "⅞" }
       ]
     } },
     { "code":  3672, "label": "๘", "type": "numeric", "popup": {
-      "main": { "code": 8312, "label": "⁸" },
-      "relevant": [
-        { "code": 8328, "label": "₈" }
-      ]
+      "main": { "code": 8312, "label": "⁸" }
     } },
     { "code":  3673, "label": "๙", "type": "numeric", "popup": {
-      "main": { "code": 8313, "label": "⁹" },
-      "relevant": [
-        { "code": 8329, "label": "₉" }
-      ]
+      "main": { "code": 8313, "label": "⁹" }
     } },
     { "code":  3664, "label": "๐", "type": "numeric", "popup": {
       "main": { "code": 8304, "label": "⁰" },
       "relevant": [
         { "code": 8709, "label": "∅" },
-        { "code": 8319, "label": "ⁿ" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8319, "label": "ⁿ" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/warang_citi.json

@@ -3,52 +3,46 @@
     { "code": 71905, "label": "𑣡", "type": "numeric", "popup": {
       "main": { "code":   49, "label": "1" },
       "relevant": [
-        { "code": 8321, "label": "₁" },
+        { "code": 8537, "label": "⅙" },
         { "code": 8528, "label": "⅐" },
         { "code": 8539, "label": "⅛" },
         { "code": 8529, "label": "⅑" },
         { "code": 8530, "label": "⅒" },
-        { "code": 8543, "label": "⅟" },
         { "code":  185, "label": "¹" },
         { "code":  189, "label": "½" },
         { "code": 8531, "label": "⅓" },
         { "code":  188, "label": "¼" },
-        { "code": 8533, "label": "⅕" },
-        { "code": 8537, "label": "⅙" }
+        { "code": 8533, "label": "⅕" }
       ]
     } },
     { "code": 71906, "label": "𑣢", "type": "numeric", "popup": {
       "main": { "code":   50, "label": "2" },
       "relevant": [
-        { "code": 8322, "label": "₂"},
-        { "code":  178, "label": "²" },
         { "code": 8532, "label": "⅔" },
+        { "code":  178, "label": "²" },
         { "code": 8534, "label": "⅖" }
       ]
     } },
     { "code": 71907, "label": "𑣣", "type": "numeric", "popup": {
       "main": { "code":   51, "label": "3" },
       "relevant": [
-        { "code":  190, "label": "¾" },
         { "code": 8535, "label": "⅗" },
-        { "code": 8540, "label": "⅜" },
-        { "code": 8323, "label": "₃"},
-        { "code":  179, "label": "³" }
+        { "code":  190, "label": "¾" },
+        { "code":  179, "label": "³" },
+        { "code": 8540, "label": "⅜" }
       ]
     } },
     { "code": 71908, "label": "𑣤", "type": "numeric", "popup": {
       "main": { "code":   52, "label": "4" },
       "relevant": [
-        { "code": 8324, "label": "₄" },
-        { "code": 8308, "label": "⁴" },
-        { "code": 8536, "label": "⅘" }
+        { "code": 8536, "label": "⅘" },
+        { "code": 8308, "label": "⁴" }
       ]
     } },
     { "code": 71909, "label": "𑣥", "type": "numeric", "popup": {
       "main": { "code":   53, "label": "5" },
       "relevant": [
         { "code": 8538, "label": "⅚" },
-        { "code": 8325, "label": "₅" },
         { "code": 8309, "label": "⁵" },
         { "code": 8541, "label": "⅝" }
       ]
@@ -56,7 +50,6 @@
     { "code": 71910, "label": "𑣦", "type": "numeric", "popup": {
       "main": { "code":   54, "label": "6" },
       "relevant": [
-        { "code": 8326, "label": "₆" },
         { "code": 8310, "label": "⁶" }
       ]
     } },
@@ -64,32 +57,27 @@
       "main": { "code":   55, "label": "7" },
       "relevant": [
         { "code": 8542, "label": "⅞" },
-        { "code": 8327, "label": "₇" },
         { "code": 8311, "label": "⁷" }
       ]
     } },
     { "code": 71912, "label": "𑣨", "type": "numeric", "popup": {
       "main": { "code":   56, "label": "8" },
       "relevant": [
-        { "code": 8328, "label": "₈" },
         { "code": 8312, "label": "⁸" }
       ]
     } },
     { "code": 71913, "label": "𑣩", "type": "numeric", "popup": {
       "main": { "code":   57, "label": "9" },
       "relevant": [
-        { "code": 8329, "label": "₉" },
         { "code": 8313, "label": "⁹" }
       ]
     } },
     { "code": 71904, "label": "𑣠", "type": "numeric", "popup": {
       "main": { "code":   48, "label": "0" },
       "relevant": [
-        { "code": 8709, "label": "∅" },
         { "code": 8319, "label": "ⁿ" },
-        { "code": 8304, "label": "⁰" },
-        { "code": 8585, "label": "↉" },
-        { "code": 8320, "label": "₀" }
+        { "code": 8709, "label": "∅" },
+        { "code": 8304, "label": "⁰" }
       ]
     } }
   ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/numericRow/western_arabic.json

@@ -10,17 +10,15 @@
         "code": 49, "label": "1", "type": "numeric", "popup": {
           "main": { "code": 185, "label": "¹" },
           "relevant": [
-            { "code": 8321, "label": "₁" },
+            { "code": 8537, "label": "⅙" },
             { "code": 8528, "label": "⅐" },
             { "code": 8539, "label": "⅛" },
             { "code": 8529, "label": "⅑" },
             { "code": 8530, "label": "⅒" },
-            { "code": 8543, "label": "⅟" },
             { "code":  189, "label": "½" },
             { "code": 8531, "label": "⅓" },
             { "code":  188, "label": "¼" },
-            { "code": 8533, "label": "⅕" },
-            { "code": 8537, "label": "⅙" }
+            { "code": 8533, "label": "⅕" }
           ]
         }
       }
@@ -31,7 +29,6 @@
         "code": 50, "label": "2", "type": "numeric", "popup": {
           "main": { "code": 178, "label": "²" },
           "relevant": [
-            { "code": 8322, "label": "₂"},
             { "code": 8532, "label": "⅔" },
             { "code": 8534, "label": "⅖" }
           ]
@@ -48,10 +45,9 @@
         "code": 51, "label": "3", "type": "numeric", "popup": {
           "main": { "code": 179, "label": "³" },
           "relevant": [
-            { "code": 8540, "label": "⅜" },
-            { "code": 8323, "label": "₃"},
+            { "code": 8535, "label": "⅗" },
             { "code":  190, "label": "¾" },
-            { "code": 8535, "label": "⅗" }
+            { "code": 8540, "label": "⅜" }
           ]
         }
       }
@@ -72,7 +68,6 @@
         "code": 52, "label": "4", "type": "numeric", "popup": {
           "main": { "code": 8308, "label": "⁴" },
           "relevant": [
-            { "code": 8324, "label": "₄" },
             { "code": 8536, "label": "⅘" }
           ]
         }
@@ -91,7 +86,6 @@
         "code": 53, "label": "5", "type": "numeric", "popup": {
           "main": { "code": 8309, "label": "⁵" },
           "relevant": [
-            { "code": 8325, "label": "₅" },
             { "code": 8538, "label": "⅚" },
             { "code": 8541, "label": "⅝" }
           ]
@@ -111,10 +105,7 @@
       },
       "default": {
         "code": 54, "label": "6", "type": "numeric", "popup": {
-          "main": { "code": 8310, "label": "⁶" },
-          "relevant": [
-            { "code": 8326, "label": "₆" }
-          ]
+          "main": { "code": 8310, "label": "⁶" }
         }
       }
     },
@@ -124,7 +115,6 @@
         "code": 55, "label": "7", "type": "numeric", "popup": {
           "main": { "code": 8311, "label": "⁷" },
           "relevant": [
-            { "code": 8327, "label": "₇" },
             { "code": 8542, "label": "⅞" }
           ]
         }
@@ -142,10 +132,7 @@
       },
       "default": {
         "code": 56, "label": "8", "type": "numeric", "popup": {
-          "main": { "code": 8312, "label": "⁸" },
-          "relevant": [
-            { "code": 8328, "label": "₈" }
-          ]
+          "main": { "code": 8312, "label": "⁸" }
         }
       }
     },
@@ -173,10 +160,7 @@
       },
       "default": {
         "code":   57, "label": "9", "type": "numeric", "popup": {
-          "main": { "code": 8313, "label": "⁹" },
-          "relevant": [
-            { "code": 8329, "label": "₉" }
-          ]
+          "main": { "code": 8313, "label": "⁹" }
         }
       }
     },
@@ -207,9 +191,7 @@
           "main": { "code": 8304, "label": "⁰" },
           "relevant": [
             { "code": 8709, "label": "∅" },
-            { "code": 8319, "label": "ⁿ" },
-            { "code": 8585, "label": "↉" },
-            { "code": 8320, "label": "₀" }
+            { "code": 8319, "label": "ⁿ" }
           ]
         }
       }

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/cjk.json

@@ -8,13 +8,15 @@
       },
       "half": { "code": 64, "label": "@" }
     },
+    { "code": 12306, "label": "〒", "popup": {
+        "main": { "code": 12320, "label": "〠" }
+      }
+    },
     {
       "$": "char_width_selector",
       "full": { "code": 65283, "label": "＃", "popup": {
           "main": { "code": 35, "label": "#" },
           "relevant": [
-            { "code": 12306, "label": "〒"},
-            { "code": 12320, "label": "〠" },
             { "code": 8470, "label": "№" }
           ]
         }
@@ -22,8 +24,6 @@
       "half": { "code": 35, "label": "#", "popup": {
           "main": { "code": 65283, "label": "＃" },
           "relevant": [
-            { "code": 12306, "label": "〒"},
-            { "code": 12320, "label": "〠" },
             { "code": 8470, "label": "№" }
           ]
         }
@@ -99,18 +99,14 @@
       "full": { "code": 65291, "label": "＋", "popup": {
           "main": { "code": 43, "label": "+" },
           "relevant": [
-            { "code":   177, "label": "±" },
-            { "code":    61, "label": "=" },
-            { "code": 65309, "label": "＝" }
+            { "code": 177, "label": "±" }
           ]
         }
       },
       "half": { "code": 43, "label": "+", "popup": {
           "main": { "code": 65291, "label": "＋" },
           "relevant": [
-            { "code":   177, "label": "±" },
-            { "code":    61, "label": "=" },
-            { "code": 65309, "label": "＝" }
+            { "code": 177, "label": "±" }
           ]
         }
       }
@@ -121,20 +117,16 @@
           "main": { "code": 12302, "label": "『" },
           "relevant": [
             { "code": 12304, "label": "【" },
-            { "code": 12310, "label": "〖" },
-            { "code": 65288, "label": "（" },
-            { "code": 65339, "label": "［" }
+            { "code": 12310, "label": "〖" }
           ]
         }
       },
       "half": { "code": 65378, "label": "｢", "popup": {
-          "main": { "code": 12300, "label": "「" },
+          "main": { "code": 12301, "label": "」" },
           "relevant": [
-            { "code": 12302, "label": "『" },
+            { "code": 12303, "label": "』" },
             { "code": 12304, "label": "【" },
-            { "code": 12310, "label": "〖" },
-            { "code":    40, "label": "(" },
-            { "code":    91, "label": "[" }
+            { "code": 12310, "label": "〖" }
           ]
         }
       }
@@ -145,9 +137,7 @@
           "main": { "code": 12303, "label": "』" },
           "relevant": [
             { "code": 12305, "label": "】" },
-            { "code": 12311, "label": "〗" },
-            { "code": 65289, "label": "）" },
-            { "code": 65341, "label": "］" }
+            { "code": 12311, "label": "〗" }
           ]
         }
       },
@@ -156,9 +146,7 @@
           "relevant": [
             { "code": 12303, "label": "』" },
             { "code": 12305, "label": "】" },
-            { "code": 12311, "label": "〗" },
-            { "code":    41, "label": ")" },
-            { "code":    93, "label": "]" }
+            { "code": 12311, "label": "〗" }
           ]
         }
       }

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": "}" }

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols/western.json

@@ -23,17 +23,13 @@
     { "code":   45, "label": "-", "popup": {
       "main": { "code":   95, "label": "_" },
       "relevant": [
-        { "code": 8315, "label": "⁻" },
         { "code": 8212, "label": "—" },
         { "code": 8211, "label": "–" },
         { "code":  183, "label": "·" }
       ]
     } },
     { "code":   43, "label": "+", "popup": {
-      "main": { "code":  177, "label": "±" },
-      "relevant": [
-        { "code": 8314, "label": "⁺" }
-      ]
+      "main": { "code":  177, "label": "±" }
     } },
     { "$": "layout_direction_selector",
       "ltr": { "code":   40, "label": "(", "popup": {

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols2/cjk.json

@@ -54,9 +54,7 @@
           ]
         } }
     },
-    { "code": 8730, "label": "√", "popup": {
-      "main": { "code": 10003, "label": "✓" }
-    } },
+    { "code": 8730, "label": "√" },
     { "code":  960, "label": "π", "popup": {
       "main": { "code":  928, "label": "Π" },
       "relevant": [
@@ -106,7 +104,7 @@
         { "code":   61, "label": "=", "popup": {
           "main": { "code": 8800, "label": "≠" },
           "relevant": [
-            { "code": 65309, "label": "＝" },
+            { "code":   61, "label": "=" },
             { "code": 8734, "label": "∞" },
             { "code": 8776, "label": "≈" }
           ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbols2Mod/cjk.json

@@ -6,28 +6,15 @@
   ],
   [
     { "code": -201, "label": "view_characters", "type": "system_gui" },
-    { "$": "char_width_selector",
-      "full": { "code": 12296, "label": "〈", "popup": {
-        "main": { "code": 12298, "label": "《" },
-        "relevant": [
-          { "code":    60, "label": "<" },
-          { "code":  8804, "label": "≤" },
-          { "code":  8249, "label": "‹" },
-          { "code": 10216, "label": "⟨" },
-          { "code": 65308, "label": "＜" }
-        ]
-      } },
-      "half": { "code":    60, "label": "<", "popup": {
-        "main": { "code": 12298, "label": "《" },
-        "relevant": [
-          { "code": 12296, "label": "〈" },
-          { "code":  8804, "label": "≤" },
-          { "code":  8249, "label": "‹" },
-          { "code": 10216, "label": "⟨" },
-          { "code": 65308, "label": "＜" }
-        ]
-      } }
-    },
+    { "code": 12296, "label": "〈", "popup": {
+      "main": { "code": 12298, "label": "《" },
+      "relevant": [
+        { "code":  8804, "label": "≤" },
+        { "code":  8249, "label": "‹" },
+        { "code": 10216, "label": "⟨" },
+        { "code": 65308, "label": "＜" }
+      ]
+    } },
     { "code": -205, "label": "view_numeric_advanced", "type": "system_gui" },
     { "code": 12288, "label": "空白" },
     { "code": -9701, "label": "char_width_switcher", "type": "system_gui", "popup": {
@@ -37,28 +24,15 @@
         ]
       }
     },
-    { "$": "char_width_selector",
-      "full": { "code": 12297, "label": "〉", "popup": {
-        "main": { "code": 12299, "label": "》" },
-        "relevant": [
-          { "code":    62, "label": ">" },
-          { "code":  8805, "label": "≥" },
-          { "code":  8250, "label": "›" },
-          { "code": 10217, "label": "⟩" },
-          { "code": 65310, "label": "＞" }
-        ]
-      } },
-      "half": { "code":    62, "label": ">", "popup": {
-        "main": { "code": 12299, "label": "》" },
-        "relevant": [
-          { "code": 12297, "label": "〉" },
-          { "code":  8805, "label": "≥" },
-          { "code":  8250, "label": "›" },
-          { "code": 10217, "label": "⟩" },
-          { "code": 65310, "label": "＞" }
-        ]
-      } }
-    },
+    { "code": 12297, "label": "〉", "popup": {
+      "main": { "code": 12299, "label": "》" },
+      "relevant": [
+        { "code":    62, "label": ">" },
+        { "code":  8805, "label": "≥" },
+        { "code": 10217, "label": "⟩" },
+        { "code": 65310, "label": "＞" }
+      ]
+    } },
     { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
   ]
 ]

app/src/main/assets/ime/keyboard/org.florisboard.layouts/layouts/symbolsMod/cjk.json

@@ -8,17 +8,11 @@
     { "code": -201, "label": "view_characters", "type": "system_gui" },
     { "$": "char_width_selector",
       "full": { "code": 12289, "label": "、", "popup": {
-          "main": { "code":   65292, "label": "，" },
-          "relevant": [
-            { "code":   44, "label": "," }
-          ]
+          "main": { "code": 65292, "label": "，" }
         }
       },
       "half": { "code": 65380, "label": "､", "popup": {
-          "main": { "code":   44, "label": "," },
-          "relevant": [
-            { "code":   65292, "label": "，" }
-          ]
+          "main": { "code":   44, "label": "," }
         }
       }
     },

app/src/main/assets/ime/keyboard/org.florisboard.localization/extension.json

@@ -31,7 +31,6 @@
     { "id": "bg", "authors": [ "iorvethe" ] },
     { "id": "bn-BD", "authors": [ "iamrasel" ] },
     { "id": "ca", "authors": [ "mikelloc" ] },
-    { "id": "cjk", "authors": [ "moonbeamcelery" ] },
     { "id": "ckb", "authors": [ "GoRaN" ] },
     { "id": "cs", "authors": [ "stefan-misik" ] },
     { "id": "da", "authors": [ "patrickgold" ] },
@@ -48,7 +47,6 @@
     { "id": "fi", "authors": [ "patrickgold" ] },
     { "id": "fo", "authors": [ "BinFlush" ] },
     { "id": "fr", "authors": [ "patrickgold" ] },
-    { "id": "hi-IN", "authors": [ "npnpatidar" ] },
     { "id": "hr", "authors": [ "hedidnothingwrong" ] },
     { "id": "hu", "authors": [ "zoli111, gabik65" ] },
     { "id": "hy", "authors": [ "PJTSearch" ] },
@@ -59,7 +57,6 @@
     { "id": "ja-JP-jis", "authors": [ "waelwindows" ] },
     { "id": "kab", "authors": [ "yanis867" ] },
     { "id": "ko", "authors": [ "patrickgold", "Hayleia" ] },
-    { "id": "ko-KR", "authors": [ "Shunnuo" ] },
     { "id": "ku", "authors": [ "GoRaN" ] },
     { "id": "lt", "authors": [ "patrickgold" ] },
     { "id": "lv", "authors": [ "patrickgold", "eandersons" ] },
@@ -75,7 +72,6 @@
     { "id": "sr", "authors": [ "hedidnothingwrong", "GrbavaCigla" ] },
     { "id": "sv", "authors": [ "patrickgold" ] },
     { "id": "tr", "authors": [ "kisekinopureya", "patrickgold", "dvrnynr" ] },
-    { "id": "udm", "authors": [ "vorgoron" ] },
     { "id": "uk", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
     { "id": "uk-cyr-ext", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
     { "id": "ur-PK", "authors": [ "mubashir-rehman", "mirfatif" ] },
@@ -402,16 +398,6 @@
         "characters": "org.florisboard.layouts:qwertz"
       }
     },
-    {
-      "languageTag": "hy",
-      "composer": "org.florisboard.composers:appender",
-      "currencySet": "org.florisboard.currencysets:armenian_dram",
-      "popupMapping": "org.florisboard.localization:hy",
-      "preferred": {
-        "characters": "org.florisboard.layouts:armenian_alt_phonetic",
-        "symbols": "org.florisboard.layouts:armenian"
-      }
-    },
     {
       "languageTag": "hy",
       "composer": "org.florisboard.composers:appender",
@@ -607,15 +593,6 @@
         "characters": "org.florisboard.layouts:korean"
       }
     },
-    {
-      "languageTag": "ko-KR",
-      "composer": "org.florisboard.composers:hangul-unicode",
-      "currencySet": "org.florisboard.currencysets:south_korean_won",
-      "popupMapping": "org.florisboard.localization:ko",
-      "preferred": {
-        "characters": "org.florisboard.layouts:korean_phonetic"
-      }
-    },
     {
       "languageTag": "lt-LT",
       "composer": "org.florisboard.composers:appender",
@@ -672,15 +649,6 @@
         "numericRow": "org.florisboard.layouts:warang_citi"
       }
     },
-    {
-      "languageTag": "udm",
-      "composer": "org.florisboard.composers:appender",
-      "currencySet": "org.florisboard.currencysets:russian_ruble",
-      "popupMapping": "org.florisboard.localization:udm",
-      "preferred": {
-        "characters": "org.florisboard.layouts:udmurt_extended"
-      }
-    },
     {
       "languageTag": "ur-PK",
       "composer": "org.florisboard.composers:appender",
@@ -698,7 +666,7 @@
         "suggestion": "org.florisboard.nlp.providers.han.shape"
       },
       "currencySet": "org.florisboard.currencysets:yen",
-      "popupMapping": "org.florisboard.localization:cjk",
+      "popupMapping": "org.florisboard.localization:en",
       "preferred": {
         "characters": "org.florisboard.layouts:qwerty",
         "symbols": "org.florisboard.layouts:cjk",
@@ -716,16 +684,6 @@
         "numericAdvanced": "org.florisboard.layouts:bengali"
       }
     },
-    {
-      "languageTag": "hi-IN",
-      "composer": "org.florisboard.composers:appender",
-      "currencySet": "org.florisboard.currencysets:indian_rupee",
-      "popupMapping": "org.florisboard.localization:hi-IN",
-      "preferred": {
-        "characters": "org.florisboard.layouts:hindi_in",
-        "numericRow": "org.florisboard.layouts:devanagari"
-      }
-    },
     {
       "languageTag": "ast",
       "composer": "org.florisboard.composers:appender",

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/ar.json

@@ -70,9 +70,8 @@
       ]
     },
     "~right": {
-      "main": { "code": 1567, "label": "؟" },
+      "main": { "code": 1611, "label": "ً" },
       "relevant": [
-        { "code": 1611, "label": "ً" },
         { "code": 1622, "label": "ٖ" },
         { "code": 1648, "label": "ٰ" },
         { "code": 1619, "label": "ٓ" },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/ast.json

@@ -34,7 +34,9 @@
         ]
       },
       "h": {
-        "main": { "$": "auto_text_key", "code":  7717, "label": "ḥ" }
+        "relevant": [
+          { "$": "auto_text_key", "code":  7717, "label": "ḥ" }
+        ]
       },
       "i": {
         "main": { "$": "auto_text_key", "code":  237, "label": "í" },
@@ -47,11 +49,13 @@
         ]
       },
       "l": {
-        "main": { "$": "auto_text_key", "code":  7735, "label": "ḷ" }
+        "relevant": [
+          { "$": "auto_text_key", "code":  7735, "label": "ḷ" }
+        ]
       },
       "n": {
-        "main": { "$": "auto_text_key", "code":  241, "label": "ñ" },
         "relevant": [
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
           { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
@@ -69,7 +73,9 @@
         ]
       },
       "r": {
-        "main": { "$": "auto_text_key", "code":  691, "label": "ʳ" }
+        "relevant": [
+          { "$": "auto_text_key", "code":  691, "label": "ʳ" }
+        ]
       },
       "s": {
         "relevant": [
@@ -106,4 +112,4 @@
       }
     }
   }
-  
+  

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/bn-BD.json

@@ -30,97 +30,102 @@
     "ড়": {
       "main": { "$": "auto_text_key", "code":  2525, "label": "ঢ়" }
     },
-    "ৃ": {
-      "main": { "$": "auto_text_key", "code":  2443, "label": "ঋ" }
+	"ৃ": {
+      "main": { "$": "auto_text_key", "code":  2443, "label": "ঋ" },
+	  "relevant": [
+		{ "$": "auto_text_key", "code":  2500, "label": "ৄ" },
+		{ "$": "auto_text_key", "code":  2528, "label": "ৠ" },
+		{ "$": "auto_text_key", "code":  2529, "label": "ৡ" },
+		{ "$": "auto_text_key", "code":  2530, "label": "ৢ" },
+		{ "$": "auto_text_key", "code":  2531, "label": "ৣ" }
+      ]
     },
-    "ু": {
+	"ু": {
       "main": { "$": "auto_text_key", "code":  2441, "label": "উ" }
     },
-    "ি": {
+	"ি": {
       "main": { "$": "auto_text_key", "code":  2439, "label": "ই" }
     },
-    "া": {
+	"া": {
       "main": { "$": "auto_text_key", "code":  2438, "label": "আ" },
-      "relevant": [
+	  "relevant": [
         { "$": "auto_text_key", "code":  2437, "label": "অ" }
       ]
     },
-    "্": {
+	"্": {
       "main": { "$": "auto_text_key", "code":  2433, "label": "ঁ" }
     },
-    "ব": {
+	"ব": {
       "main": { "$": "auto_text_key", "code":  2477, "label": "ভ" }
     },
-    "ক": {
+	"ক": {
       "main": { "$": "auto_text_key", "code":  2454, "label": "খ" }
     },
-    "ত": {
+	"ত": {
       "main": { "$": "auto_text_key", "code":  2469, "label": "থ" },
-      "relevant": [
+	  "relevant": [
         { "$": "auto_text_key", "code":  2510, "label": "ৎ" }
       ]
     },
-    "দ": {
+	"দ": {
       "main": { "$": "auto_text_key", "code":  2471, "label": "ধ" }
     },
-    "ো": {
+	"ো": {
       "main": { "$": "auto_text_key", "code":  2451, "label": "ও" }
     },
-    "ে": {
+	"ে": {
       "main": { "$": "auto_text_key", "code":  2447, "label": "এ" }
     },
-    "র": {
+	"র": {
       "main": { "$": "auto_text_key", "code":  2482, "label": "ল" },
-      "relevant": [
-        { "code": -255, "label": "র‍্য" }
+	  "relevant": [
+        { "code": -255, "label": "র‌্য" }
       ]
     },
-    "ন": {
+	"ন": {
       "main": { "$": "auto_text_key", "code":  2467, "label": "ণ" }
     },
-    "স": {
+	"স": {
       "main": { "$": "auto_text_key", "code":  2487, "label": "ষ" }
     },
-    "ম": {
+	"ম": {
       "main": { "$": "auto_text_key", "code":  2486, "label": "শ" }
     },
-    "ূ": {
+	"ূ": {
       "main": { "$": "auto_text_key", "code":  2442, "label": "ঊ" }
     },
-    "ী": {
+	"ী": {
       "main": { "$": "auto_text_key", "code":  2440, "label": "ঈ" }
     },
-    "ঁ": {
-      "main": { "$": "auto_text_key", "code":  2492, "label": "়" },
+	"ঁ": {
       "relevant": [
-        { "$": "auto_text_key", "code":  2500, "label": "ৄ" },
-        { "$": "auto_text_key", "code":  2530, "label": "ৢ" },
-        { "$": "auto_text_key", "code":  2531, "label": "ৣ" },
-        { "$": "auto_text_key", "code":  2528, "label": "ৠ" },
-        { "$": "auto_text_key", "code":  2444, "label": "ঌ" },
-        { "$": "auto_text_key", "code":  2529, "label": "ৡ" },
-        { "$": "auto_text_key", "code":  2544, "label": "ৰ" },
-        { "$": "auto_text_key", "code":  2545, "label": "ৱ" },
-        { "$": "auto_text_key", "code":  2493, "label": "ঽ" },
-        { "$": "auto_text_key", "code":  2554, "label": "৺" },
-        { "$": "auto_text_key", "code":  2519, "label": "ৗ" }
+		{ "$": "auto_text_key", "code":  2493, "label": "ঽ" },
+		{ "$": "auto_text_key", "code":  2544, "label": "ৰ" },
+		{ "$": "auto_text_key", "code":  2545, "label": "ৱ" },
+		{ "$": "auto_text_key", "code":  2492, "label": "়" },
+		{ "$": "auto_text_key", "code":  2554, "label": "৺" },
+		{ "$": "auto_text_key", "code":  2519, "label": "ৗ" }
       ]
     },
-    "ৌ": {
+	"ৌ": {
       "main": { "$": "auto_text_key", "code":  2452, "label": "ঔ" }
     },
-    "ৈ": {
+	"ৈ": {
       "main": { "$": "auto_text_key", "code":  2448, "label": "ঐ" }
     },
     "~right": {
       "main": { "code":   2404, "label": "।" },
       "relevant": [
-      	{ "code":   37, "label": "%" },
-      	{ "code":   43, "label": "+" },
-      	{ "code":   45, "label": "-" },
-      	{ "code":   58, "label": ":" },
-      	{ "code":   59, "label": ";" },
-      	{ "code":   47, "label": "/" },
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   2435, "label": "ঃ" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "code":   59, "label": ";" },
+        { "code":   47, "label": "/" },
         { "$": "layout_direction_selector",
           "ltr": { "code":   40, "label": "(" },
           "rtl": { "code":   41, "label": "(" }
@@ -129,13 +134,9 @@
           "ltr": { "code":   41, "label": ")" },
           "rtl": { "code":   40, "label": ")" }
         },
-        { "code":   64, "label": "@" },
         { "code":   35, "label": "#" },
-        { "code":   8205, "label": ">⁞<" },
-        { "code":   8204, "label": "<⁞>" },
         { "code":   33, "label": "!" },
-        { "code":   63, "label": "?" },
-        { "code":   2405, "label": "॥" }
+        { "code":   63, "label": "?" }
       ]
     }
   },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/cjk.json

@@ -1,117 +0,0 @@
-{
-  "all": {
-    "a": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  257, "label": "ā" },
-        { "$": "auto_text_key", "code":  225, "label": "á" },
-        { "$": "auto_text_key", "code":  462, "label": "ǎ" },
-        { "$": "auto_text_key", "code":  224, "label": "à" },
-        { "$": "auto_text_key", "code":  230, "label": "æ" },
-        { "$": "auto_text_key", "code":  227, "label": "ã" },
-        { "$": "auto_text_key", "code":  229, "label": "å" },
-        { "$": "auto_text_key", "code":  226, "label": "â" },
-        { "$": "auto_text_key", "code":  228, "label": "ä" }
-      ]
-    },
-    "c": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  231, "label": "ç" }
-      ]
-    },
-    "e": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  275, "label": "ē" },
-        { "$": "auto_text_key", "code":  233, "label": "é" },
-        { "$": "auto_text_key", "code":  283, "label": "ě" },
-        { "$": "auto_text_key", "code":  232, "label": "è" },
-        { "$": "auto_text_key", "code":  234, "label": "ê" },
-        { "$": "auto_text_key", "code":  235, "label": "ë" }
-      ]
-    },
-    "i": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  299, "label": "ī" },
-        { "$": "auto_text_key", "code":  237, "label": "í" },
-        { "$": "auto_text_key", "code":  464, "label": "ǐ" },
-        { "$": "auto_text_key", "code":  236, "label": "ì" },
-        { "$": "auto_text_key", "code":  239, "label": "ï" },
-        { "$": "auto_text_key", "code":  238, "label": "î" }
-      ]
-    },
-    "n": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  241, "label": "ñ" },
-        { "$": "auto_text_key", "code":  324, "label": "ń" }
-      ]
-    },
-    "o": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  333, "label": "ō" },
-        { "$": "auto_text_key", "code":  243, "label": "ó" },
-        { "$": "auto_text_key", "code":  466, "label": "ǒ" },
-        { "$": "auto_text_key", "code":  242, "label": "ò" },
-        { "$": "auto_text_key", "code":  245, "label": "õ" },
-        { "$": "auto_text_key", "code":  339, "label": "œ" },
-        { "$": "auto_text_key", "code":  248, "label": "ø" },
-        { "$": "auto_text_key", "code":  246, "label": "ö" },
-        { "$": "auto_text_key", "code":  244, "label": "ô" }
-      ]
-    },
-    "s": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  223, "label": "ß" }
-      ]
-    },
-    "u": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  363, "label": "ū" },
-        { "$": "auto_text_key", "code":  250, "label": "ú" },
-        { "$": "auto_text_key", "code":  468, "label": "ǔ" },
-        { "$": "auto_text_key", "code":  249, "label": "ù" },
-        { "$": "auto_text_key", "code":  252, "label": "ü" },
-        { "$": "auto_text_key", "code":  470, "label": "ǖ" },
-        { "$": "auto_text_key", "code":  472, "label": "ǘ" },
-        { "$": "auto_text_key", "code":  474, "label": "ǚ" },
-        { "$": "auto_text_key", "code":  476, "label": "ǜ" },
-        { "$": "auto_text_key", "code":  251, "label": "û" }
-      ]
-    },
-    "~right": {
-      "main": { "code":   44, "label": "," },
-      "relevant": [
-        { "code":   38, "label": "&" },
-        { "code":   37, "label": "%" },
-        { "code":   43, "label": "+" },
-        { "code":   34, "label": "\"" },
-        { "code":   45, "label": "-" },
-        { "code":   58, "label": ":" },
-        { "code":   39, "label": "'" },
-        { "code":   64, "label": "@" },
-        { "code":   59, "label": ";" },
-        { "code":   47, "label": "/" },
-        { "$": "layout_direction_selector",
-          "ltr": { "code":   40, "label": "(" },
-          "rtl": { "code":   41, "label": "(" }
-        },
-        { "$": "layout_direction_selector",
-          "ltr": { "code":   41, "label": ")" },
-          "rtl": { "code":   40, "label": ")" }
-        },
-        { "code":   35, "label": "#" },
-        { "code":   33, "label": "!" },
-        { "code":   63, "label": "?" }
-      ]
-    }
-  },
-  "uri": {
-    "~right": {
-      "main": { "code": -255, "label": ".com" },
-      "relevant": [
-        { "code": -255, "label": ".gov" },
-        { "code": -255, "label": ".edu" },
-        { "code": -255, "label": ".org" },
-        { "code": -255, "label": ".net" }
-      ]
-    }
-  }
-}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/fa.json

@@ -30,7 +30,6 @@
     },
     "ک": {
       "relevant": [
-        { "code": 1603, "label": "ك" },
         { "code": 1706, "label": "ڪ"}
       ]
     },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/hi-IN.json

@@ -1,173 +0,0 @@
-{
-  "all": {
-    "क": {
-      "main": { "$": "auto_text_key", "code": 2392, "label": "क़" },
-      "relevant": [{ "$": "auto_text_key", "code": 2393, "label": "ख़" }]
-    },
-    "ग": {
-      "main": { "$": "auto_text_key", "code": 2394, "label": "ग़" },
-      "relevant": [{ "$": "auto_text_key", "code": 2427, "label": "ॻ" }]
-    },
-    "च": {
-      "relevant": [
-        { "$": "auto_text_key", "code": 2385, "label": " ॑" },
-        { "$": "auto_text_key", "code": 2386, "label": " ॒" }
-      ]
-    },
-    "ज": {
-      "main": { "$": "auto_text_key", "code": 2395, "label": "ज़" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2428, "label": "ॼ" },
-        { "$": "auto_text_key", "code": 2425, "label": "ॹ" }
-      ]
-    },
-    "ड": {
-      "main": { "$": "auto_text_key", "code": 2396, "label": "ड़" },
-      "relevant": [{ "$": "auto_text_key", "code": 2397, "label": "ढ़" }]
-    },
-    "त": {
-      "main": { "$": "multi_text_key", "codePoints": [2340, 2381, 2352], "label": "त्र" }
-    },
-    "द": {
-      "main": { "$": "auto_text_key", "code": 2396, "label": "ड़" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2430, "label": "ॾ" },
-        { "$": "auto_text_key", "code": 2397, "label": "ढ़" },
-        { "$": "auto_text_key", "code": 2424, "label": "ॸ" }
-      ]
-    },
-    "न": {
-      "main": { "$": "auto_text_key", "code": 2329, "label": "ङ" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2345, "label": "ऩ" },
-        { "$": "auto_text_key", "code": 2334, "label": "ञ" }
-      ]
-    },
-    "फ": {
-      "main": { "$": "auto_text_key", "code": 2398, "label": "फ़" }
-    },
-    "ब": {
-      "relevant": [
-        { "$": "auto_text_key", "code": 2431, "label": "ॿ" },
-        { "$": "auto_text_key", "code": 2365, "label": "ऽ" },
-        { "$": "auto_text_key", "code": 2416, "label": "॰" }
-      ]
-    },
-    "म": {
-      "main": { "$": "auto_text_key", "code": 2305, "label": "ँ" },
-      "relevant": [{ "$": "auto_text_key", "code": 2304, "label": "ऀ" }]
-    },
-    "य": {
-      "main": { "$": "auto_text_key", "code": 2426, "label": "ॺ" }
-    },
-    "र": {
-      "main": { "$": "auto_text_key", "code": 2315, "label": "ऋ" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2400, "label": "ॠ" },
-        { "$": "auto_text_key", "code": 2372, "label": "ॄ" },
-        { "$": "auto_text_key", "code": 2353, "label": "ऱ" }
-      ]
-    },
-    "ल": {
-      "relevant": [
-        { "$": "auto_text_key", "code": 2402, "label": "ॢ" },
-        { "$": "auto_text_key", "code": 2403, "label": "ॣ" },
-        { "$": "auto_text_key", "code": 2316, "label": "ऌ" },
-        { "$": "auto_text_key", "code": 2401, "label": "ॡ" },
-        { "$": "auto_text_key", "code": 2356, "label": "ऴ" }
-      ]
-    },
-    "व": {
-      "relevant": [
-        { "$": "auto_text_key", "code": 2387, "label": " ॓" },
-        { "$": "auto_text_key", "code": 2388, "label": " ॔" }
-      ]
-    },
-    "स": {
-      "main": { "$": "multi_text_key", "codePoints": [2358, 2381, 2352], "label": "श्र" },
-      "relevant": [{ "$": "auto_text_key", "code": 2359, "label": "ष" }]
-    },
-    "ा": {
-      "main": { "$": "auto_text_key", "code": 2310, "label": "आ" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2373, "label": "ॅ" },
-        { "$": "auto_text_key", "code": 2418, "label": "ॲ" },
-        { "$": "auto_text_key", "code": 2308, "label": "ऄ" }
-      ]
-    },
-    "ि": {
-      "main": { "$": "auto_text_key", "code": 2311, "label": "इ" },
-      "relevant": [{ "$": "auto_text_key", "code": 2312, "label": "ई" }]
-    },
-    "ु": {
-      "main": { "$": "auto_text_key", "code": 2313, "label": "उ" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2422, "label": "ॶ" },
-        { "$": "auto_text_key", "code": 2423, "label": "ॷ" },
-        { "$": "auto_text_key", "code": 2390, "label": " ॖ" },
-        { "$": "auto_text_key", "code": 2314, "label": "ऊ" },
-        { "$": "auto_text_key", "code": 2391, "label": " ॗ" }
-      ]
-    },
-    "े": {
-      "main": { "$": "auto_text_key", "code": 2319, "label": "ए" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2317, "label": "ऍ" },
-        { "$": "auto_text_key", "code": 2318, "label": "ऎ" },
-        { "$": "auto_text_key", "code": 2374, "label": " ॆ" },
-        { "$": "auto_text_key", "code": 2320, "label": "ऐ" },
-        { "$": "auto_text_key", "code": 2382, "label": " ॎ" },
-        { "$": "auto_text_key", "code": 2389, "label": " ॕ" }
-      ]
-    },
-    "ो": {
-      "main": { "$": "auto_text_key", "code": 2323, "label": "ओ" },
-      "relevant": [
-        { "$": "auto_text_key", "code": 2322, "label": "ऒ" },
-        { "$": "auto_text_key", "code": 2378, "label": " ॊ" },
-        { "$": "auto_text_key", "code": 2383, "label": " ॏ" },
-        { "$": "auto_text_key", "code": 2421, "label": "ॵ" },
-        { "$": "auto_text_key", "code": 2384, "label": "ॐ" },
-        { "$": "auto_text_key", "code": 2377, "label": "ॉ" },
-        { "$": "auto_text_key", "code": 2419, "label": "ॳ" },
-        { "$": "auto_text_key", "code": 2420, "label": "ॴ" },
-        { "$": "auto_text_key", "code": 2362, "label": " ऺ" },
-        { "$": "auto_text_key", "code": 2363, "label": " ऻ" },
-        { "$": "auto_text_key", "code": 2324, "label": "औ" },
-        { "$": "auto_text_key", "code": 2321, "label": "ऑ" }
-      ]
-    },
-
-    "~right": {
-      "main": { "code": 2404, "label": "।" },
-      "relevant": [
-        { "code": 37, "label": "%" },
-        { "code": 43, "label": "+" },
-        { "code": 45, "label": "-" },
-        { "code": 58, "label": ":" },
-        { "code": 59, "label": ";" },
-        { "code": 47, "label": "/" },
-        { "$": "layout_direction_selector", "ltr": { "code": 40, "label": "(" }, "rtl": { "code": 41, "label": "(" } },
-        { "$": "layout_direction_selector", "ltr": { "code": 41, "label": ")" }, "rtl": { "code": 40, "label": ")" } },
-        { "code": 8205, "label": ">⁞<" },
-        { "code": 8204, "label": "<⁞>" },
-        { "code": 2417, "label": "ॱ" },
-        { "code": 2429, "label": "ॽ" },
-        { "code": 33, "label": "!" },
-        { "code": 63, "label": "?" },
-        { "code": 2405, "label": "॥" }
-      ]
-    }
-  },
-  "uri": {
-    "~right": {
-      "main": { "code": -255, "label": ".com" },
-      "relevant": [
-        { "code": -255, "label": ".org" },
-        { "code": -255, "label": ".net" },
-        { "code": -255, "label": ".in" },
-        { "code": -255, "label": ".co.in" }
-      ]
-    }
-  }
-}

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/hu.json

@@ -1,62 +1,68 @@
 {
   "all": {
     "a": {
-      "main": { "$": "auto_text_key","code" : 225, "label": "á" }
+      "relevant": [
+        { "$": "auto_text_key", "code":  225, "label": "á" }
+      ]
     },
     "e": {
-      "main": {"$": "auto_text_key", "code" : 233, "label": "é" }
+      "relevant": [
+        { "$": "auto_text_key", "code":  233, "label": "é" }
+      ]
     },
     "i": {
-      "main": { "$": "auto_text_key" ,"code" : 237, "label": "í" }
+      "relevant": [
+        { "$": "auto_text_key", "code":  237, "label": "í" }
+      ]
     },
     "o": {
-      "main": { "$": "auto_text_key", "code" : 243, "label": "ó" },
       "relevant": [
-        { "$": "auto_text_key", "code" : 246, "label": "ö" },
-        { "$": "auto_text_key", "code" : 337, "label": "ő" }
+        { "$": "auto_text_key", "code":  243, "label": "ó" },
+        { "$": "auto_text_key", "code":  246, "label": "ö" },
+        { "$": "auto_text_key", "code":  337, "label": "ő" }
       ]
     },
     "ö": {
       "relevant": [
-        { "$": "auto_text_key", "code" : 337, "label": "ő" }
+        { "$": "auto_text_key", "code":  337, "label": "ő" }
       ]
     },
     "u": {
-      "main": { "$": "auto_text_key", "code" : 250, "label": "ú" },
       "relevant": [
-        { "$": "auto_text_key", "code" : 252, "label": "ü" },
-        { "$": "auto_text_key", "code" : 369, "label": "ű" }
+        { "$": "auto_text_key", "code":  250, "label": "ú" },
+        { "$": "auto_text_key", "code":  252, "label": "ü" },
+        { "$": "auto_text_key", "code":  369, "label": "ű" }
       ]
     },
     "ü": {
       "relevant": [
-        { "$": "auto_text_key", "code" : 369, "label": "ű" }
+        { "$": "auto_text_key", "code":  369, "label": "ű" }
       ]
-    },
+    },    
     "~right": {
-      "main": { "code" : 44, "label": "," },
+      "main": { "code":   44, "label": "," },
       "relevant": [
-        { "code" : 37, "label": "%" },
-        { "code" : 38, "label": "&" },
-        { "code" : 43, "label": "+" },
-        { "code" : 34, "label": "\"" },
-        { "code" : 45, "label": "-" },
-        { "code" : 58, "label": ":" },
-        { "code" : 39, "label": "'" },
-        { "code" : 64, "label": "@" },
-        { "code" : 59, "label": ";" },
-        { "code" : 47, "label": "/" },
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":   34, "label": "\"" },
+        { "code":   45, "label": "-" },
+        { "code":   58, "label": ":" },
+        { "code":   39, "label": "'" },
+        { "code":   64, "label": "@" },
+        { "code":   59, "label": ";" },
+        { "code":   47, "label": "/" },
         { "$": "layout_direction_selector",
-          "ltr": { "code" : 40, "label": "(" },
-          "rtl": { "code" : 41, "label": "(" }
+          "ltr": { "code":   40, "label": "(" },
+          "rtl": { "code":   41, "label": "(" }
         },
         { "$": "layout_direction_selector",
-          "ltr": { "code" : 41, "label": ")" },
-          "rtl": { "code" : 40, "label": ")" }
+          "ltr": { "code":   41, "label": ")" },
+          "rtl": { "code":   40, "label": ")" }
         },
-        { "code" : 35, "label": "#" },
-        { "code" : 33, "label": "!" },
-        { "code" : 63, "label": "?" }
+        { "code":   35, "label": "#" },
+        { "code":   33, "label": "!" },
+        { "code":   63, "label": "?" }
       ]
     }
   },
@@ -68,7 +74,7 @@
         { "code": -255, "label": ".net" },
         { "code": -255, "label": ".org" },
         { "code": -255, "label": ".eu" },
-        { "code": -255, "label": ".gov.hu" }
+        { "code": -255, "label": ".gov.hu" }        
       ]
     }
   }

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/hy-am.json

@@ -1,46 +0,0 @@
-{
-    "all": {
-      "ե": {
-        "main": { "$": "auto_text_key", "code": 1415, "label": "և" }
-      },
-      "յ": {
-        "main": { "$": "auto_text_key", "code": 1416, "label": "ֈ" }
-      },
-      "ա": {
-        "main": { "$": "auto_text_key", "code": 1376, "label": "ՠ" }
-      },
-      "~right": {
-        "main": { "code":   44, "label": "," },
-        "relevant": [
-          { "code": 1417, "label": "։" },
-          { "code": 1418, "label": "֊" },
-          { "code": 1369, "label": "ՙ" },
-          { "code": 1370, "label": "՚" },
-          { "code": 1373, "label": "՝" },
-          { "code": 1371, "label": "՛" },
-          { "code": 1375, "label": "՟" },
-          { "code":   47, "label": "/" },
-          { "code":   40, "label": "(" },
-          { "code":   41, "label": ")" },
-          { "code":   46, "label": "." },
-          { "code": 1372, "label": "՜" },
-          { "code":   33, "label": "!" },
-          { "code":   63, "label": "?" },
-          { "code": 1374, "label": "՞" }
-        ]
-      }
-    },
-    "uri": {
-      "~right": {
-        "main": { "code": -255, "label": ".com" },
-        "relevant": [
-          { "code": -255, "label": ".gov" },
-          { "code": -255, "label": ".edu" },
-          { "code": -255, "label": ".gr" },
-          { "code": -255, "label": ".org" },
-          { "code": -255, "label": ".net" }
-        ]
-      }
-    }
-  }
-  

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": {

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/udm.json

@@ -1,71 +0,0 @@
-{
-  "all": {
-    "о": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1255, "label": "ӧ" }
-      ]
-    },
-    "з": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1247, "label": "ӟ" }
-      ]
-    },
-    "ж": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1245, "label": "ӝ" }
-      ]
-    },
-    "ч": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1269, "label": "ӵ" }
-      ]
-    },
-    "и": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1253, "label": "ӥ" }
-      ]
-    },
-    "е": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1105, "label": "ё" }
-      ]
-    },
-    "ь": {
-      "relevant": [
-        { "$": "auto_text_key", "code":  1098, "label": "ъ" }
-      ]
-    },
-    "~right": {
-      "main": { "code":   44, "label": "," },
-      "relevant": [
-        { "code":   38, "label": "&" },
-        { "code":   37, "label": "%" },
-        { "code":   34, "label": "\"" },
-        { "code":   45, "label": "-" },
-        { "code":   58, "label": ":" },
-        { "code":   39, "label": "'" },
-        { "code":   64, "label": "@" },
-        { "$": "layout_direction_selector",
-          "ltr": { "code":   40, "label": "(" },
-          "rtl": { "code":   41, "label": "(" }
-        },
-        { "$": "layout_direction_selector",
-          "ltr": { "code":   41, "label": ")" },
-          "rtl": { "code":   40, "label": ")" }
-        },
-        { "code":   35, "label": "#" },
-        { "code":   33, "label": "!" },
-        { "code":   63, "label": "?" }
-      ]
-    }
-  },
-  "uri": {
-    "~right": {
-      "main": { "code": -255, "label": ".com" },
-      "relevant": [
-        { "code": -255, "label": ".ru" },
-        { "code": -255, "label": ".udm.ru" }
-      ]
-    }
-  }
-}

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]
 😀;;
 😃;;
@@ -51,9 +48,6 @@
 😬;;
 😮‍💨;;
 🤥;;
-🫨;;
-🙂‍↔️;;
-🙂‍↕️;;
 😌;;
 😔;;
 😪;;
@@ -131,6 +125,7 @@
 🙈;;
 🙉;;
 🙊;;
+💋;;
 💌;;
 💘;;
 💝;;
@@ -145,18 +140,14 @@
 ❤️‍🔥;;
 ❤️‍🩹;;
 ❤️;;
-🩷;;
 🧡;;
 💛;;
 💚;;
 💙;;
-🩵;;
 💜;;
 🤎;;
 🖤;;
-🩶;;
 🤍;;
-💋;;
 💯;;
 💢;;
 💥;;
@@ -164,6 +155,7 @@
 💦;;
 💨;;
 🕳️;;
+💣;;
 💬;;
 👁️‍🗨️;;
 🗨️;;
@@ -226,18 +218,6 @@
 	🫴🏽;;
 	🫴🏾;;
 	🫴🏿;;
-🫷;;
-	🫷🏻;;
-	🫷🏼;;
-	🫷🏽;;
-	🫷🏾;;
-	🫷🏿;;
-🫸;;
-	🫸🏻;;
-	🫸🏼;;
-	🫸🏽;;
-	🫸🏾;;
-	🫸🏿;;
 👌;;
 	👌🏻;;
 	👌🏼;;
@@ -1549,24 +1529,6 @@
 	🚶🏽‍♀️;;
 	🚶🏾‍♀️;;
 	🚶🏿‍♀️;;
-🚶‍➡️;;
-	🚶🏻‍➡️;;
-	🚶🏼‍➡️;;
-	🚶🏽‍➡️;;
-	🚶🏾‍➡️;;
-	🚶🏿‍➡️;;
-🚶‍♀️‍➡️;;
-	🚶🏻‍♀️‍➡️;;
-	🚶🏼‍♀️‍➡️;;
-	🚶🏽‍♀️‍➡️;;
-	🚶🏾‍♀️‍➡️;;
-	🚶🏿‍♀️‍➡️;;
-🚶‍♂️‍➡️;;
-	🚶🏻‍♂️‍➡️;;
-	🚶🏼‍♂️‍➡️;;
-	🚶🏽‍♂️‍➡️;;
-	🚶🏾‍♂️‍➡️;;
-	🚶🏿‍♂️‍➡️;;
 🧍;;
 	🧍🏻;;
 	🧍🏼;;
@@ -1603,132 +1565,60 @@
 	🧎🏽‍♀️;;
 	🧎🏾‍♀️;;
 	🧎🏿‍♀️;;
-🧎‍➡️;;
-	🧎🏻‍➡️;;
-	🧎🏼‍➡️;;
-	🧎🏽‍➡️;;
-	🧎🏾‍➡️;;
-	🧎🏿‍➡️;;
-🧎‍♀️‍➡️;;
-	🧎🏻‍♀️‍➡️;;
-	🧎🏼‍♀️‍➡️;;
-	🧎🏽‍♀️‍➡️;;
-	🧎🏾‍♀️‍➡️;;
-	🧎🏿‍♀️‍➡️;;
-🧎‍♂️‍➡️;;
-	🧎🏻‍♂️‍➡️;;
-	🧎🏼‍♂️‍➡️;;
-	🧎🏽‍♂️‍➡️;;
-	🧎🏾‍♂️‍➡️;;
-	🧎🏿‍♂️‍➡️;;
 🧑‍🦯;;
 	🧑🏻‍🦯;;
 	🧑🏼‍🦯;;
 	🧑🏽‍🦯;;
 	🧑🏾‍🦯;;
 	🧑🏿‍🦯;;
-🧑‍🦯‍➡️;;
-	🧑🏻‍🦯‍➡️;;
-	🧑🏼‍🦯‍➡️;;
-	🧑🏽‍🦯‍➡️;;
-	🧑🏾‍🦯‍➡️;;
-	🧑🏿‍🦯‍➡️;;
 👨‍🦯;;
 	👨🏻‍🦯;;
 	👨🏼‍🦯;;
 	👨🏽‍🦯;;
 	👨🏾‍🦯;;
 	👨🏿‍🦯;;
-👨‍🦯‍➡️;;
-	👨🏻‍🦯‍➡️;;
-	👨🏼‍🦯‍➡️;;
-	👨🏽‍🦯‍➡️;;
-	👨🏾‍🦯‍➡️;;
-	👨🏿‍🦯‍➡️;;
 👩‍🦯;;
 	👩🏻‍🦯;;
 	👩🏼‍🦯;;
 	👩🏽‍🦯;;
 	👩🏾‍🦯;;
 	👩🏿‍🦯;;
-👩‍🦯‍➡️;;
-	👩🏻‍🦯‍➡️;;
-	👩🏼‍🦯‍➡️;;
-	👩🏽‍🦯‍➡️;;
-	👩🏾‍🦯‍➡️;;
-	👩🏿‍🦯‍➡️;;
 🧑‍🦼;;
 	🧑🏻‍🦼;;
 	🧑🏼‍🦼;;
 	🧑🏽‍🦼;;
 	🧑🏾‍🦼;;
 	🧑🏿‍🦼;;
-🧑‍🦼‍➡️;;
-	🧑🏻‍🦼‍➡️;;
-	🧑🏼‍🦼‍➡️;;
-	🧑🏽‍🦼‍➡️;;
-	🧑🏾‍🦼‍➡️;;
-	🧑🏿‍🦼‍➡️;;
 👨‍🦼;;
 	👨🏻‍🦼;;
 	👨🏼‍🦼;;
 	👨🏽‍🦼;;
 	👨🏾‍🦼;;
 	👨🏿‍🦼;;
-👨‍🦼‍➡️;;
-	👨🏻‍🦼‍➡️;;
-	👨🏼‍🦼‍➡️;;
-	👨🏽‍🦼‍➡️;;
-	👨🏾‍🦼‍➡️;;
-	👨🏿‍🦼‍➡️;;
 👩‍🦼;;
 	👩🏻‍🦼;;
 	👩🏼‍🦼;;
 	👩🏽‍🦼;;
 	👩🏾‍🦼;;
 	👩🏿‍🦼;;
-👩‍🦼‍➡️;;
-	👩🏻‍🦼‍➡️;;
-	👩🏼‍🦼‍➡️;;
-	👩🏽‍🦼‍➡️;;
-	👩🏾‍🦼‍➡️;;
-	👩🏿‍🦼‍➡️;;
 🧑‍🦽;;
 	🧑🏻‍🦽;;
 	🧑🏼‍🦽;;
 	🧑🏽‍🦽;;
 	🧑🏾‍🦽;;
 	🧑🏿‍🦽;;
-🧑‍🦽‍➡️;;
-	🧑🏻‍🦽‍➡️;;
-	🧑🏼‍🦽‍➡️;;
-	🧑🏽‍🦽‍➡️;;
-	🧑🏾‍🦽‍➡️;;
-	🧑🏿‍🦽‍➡️;;
 👨‍🦽;;
 	👨🏻‍🦽;;
 	👨🏼‍🦽;;
 	👨🏽‍🦽;;
 	👨🏾‍🦽;;
 	👨🏿‍🦽;;
-👨‍🦽‍➡️;;
-	👨🏻‍🦽‍➡️;;
-	👨🏼‍🦽‍➡️;;
-	👨🏽‍🦽‍➡️;;
-	👨🏾‍🦽‍➡️;;
-	👨🏿‍🦽‍➡️;;
 👩‍🦽;;
 	👩🏻‍🦽;;
 	👩🏼‍🦽;;
 	👩🏽‍🦽;;
 	👩🏾‍🦽;;
 	👩🏿‍🦽;;
-👩‍🦽‍➡️;;
-	👩🏻‍🦽‍➡️;;
-	👩🏼‍🦽‍➡️;;
-	👩🏽‍🦽‍➡️;;
-	👩🏾‍🦽‍➡️;;
-	👩🏿‍🦽‍➡️;;
 🏃;;
 	🏃🏻;;
 	🏃🏼;;
@@ -1747,24 +1637,6 @@
 	🏃🏽‍♀️;;
 	🏃🏾‍♀️;;
 	🏃🏿‍♀️;;
-🏃‍➡️;;
-	🏃🏻‍➡️;;
-	🏃🏼‍➡️;;
-	🏃🏽‍➡️;;
-	🏃🏾‍➡️;;
-	🏃🏿‍➡️;;
-🏃‍♀️‍➡️;;
-	🏃🏻‍♀️‍➡️;;
-	🏃🏼‍♀️‍➡️;;
-	🏃🏽‍♀️‍➡️;;
-	🏃🏾‍♀️‍➡️;;
-	🏃🏿‍♀️‍➡️;;
-🏃‍♂️‍➡️;;
-	🏃🏻‍♂️‍➡️;;
-	🏃🏼‍♂️‍➡️;;
-	🏃🏽‍♂️‍➡️;;
-	🏃🏾‍♂️‍➡️;;
-	🏃🏿‍♂️‍➡️;;
 💃;;
 	💃🏻;;
 	💃🏼;;
@@ -2397,6 +2269,7 @@
 	👩🏿‍❤️‍👩🏽;;
 	👩🏿‍❤️‍👩🏾;;
 	👩🏿‍❤️‍👩🏿;;
+👪;;
 👨‍👩‍👦;;
 👨‍👩‍👧;;
 👨‍👩‍👧‍👦;;
@@ -2426,11 +2299,6 @@
 👤;;
 👥;;
 🫂;;
-👪;;
-🧑‍🧑‍🧒;;
-🧑‍🧑‍🧒‍🧒;;
-🧑‍🧒;;
-🧑‍🧒‍🧒;;
 👣;;
 
 [animals_nature]
@@ -2454,8 +2322,6 @@
 🐅;;
 🐆;;
 🐴;;
-🫎;;
-🫏;;
 🐎;;
 🦄;;
 🦓;;
@@ -2518,10 +2384,6 @@
 🦩;;
 🦚;;
 🦜;;
-🪽;;
-🐦‍⬛;;
-🪿;;
-🐦‍🔥;;
 🐸;;
 🐊;;
 🐢;;
@@ -2542,7 +2404,6 @@
 🐙;;
 🐚;;
 🪸;;
-🪼;;
 🐌;;
 🦋;;
 🐛;;
@@ -2570,7 +2431,6 @@
 🌻;;
 🌼;;
 🌷;;
-🪻;;
 🌱;;
 🪴;;
 🌲;;
@@ -2586,7 +2446,6 @@
 🍃;;
 🪹;;
 🪺;;
-🍄;;
 
 [food_drink]
 🍇;;
@@ -2594,7 +2453,6 @@
 🍉;;
 🍊;;
 🍋;;
-🍋‍🟩;;
 🍌;;
 🍍;;
 🥭;;
@@ -2621,12 +2479,10 @@
 🥦;;
 🧄;;
 🧅;;
+🍄;;
 🥜;;
 🫘;;
 🌰;;
-🫚;;
-🫛;;
-🍄‍🟫;;
 🍞;;
 🥐;;
 🥖;;
@@ -3003,10 +2859,11 @@
 🎯;;
 🪀;;
 🪁;;
-🔫;;
 🎱;;
 🔮;;
 🪄;;
+🧿;;
+🪬;;
 🎮;;
 🕹️;;
 🎰;;
@@ -3053,7 +2910,6 @@
 🩳;;
 👙;;
 👚;;
-🪭;;
 👛;;
 👜;;
 👝;;
@@ -3068,7 +2924,6 @@
 👡;;
 🩰;;
 👢;;
-🪮;;
 👑;;
 👒;;
 🎩;;
@@ -3107,8 +2962,6 @@
 🪕;;
 🥁;;
 🪘;;
-🪇;;
-🪈;;
 📱;;
 📲;;
 ☎️;;
@@ -3228,7 +3081,7 @@
 🛠️;;
 🗡️;;
 ⚔️;;
-💣;;
+🔫;;
 🪃;;
 🏹;;
 🛡️;;
@@ -3241,7 +3094,6 @@
 ⚖️;;
 🦯;;
 🔗;;
-⛓️‍💥;;
 ⛓️;;
 🪝;;
 🧰;;
@@ -3290,8 +3142,6 @@
 ⚰️;;
 🪦;;
 ⚱️;;
-🧿;;
-🪬;;
 🗿;;
 🪧;;
 🪪;;
@@ -3356,7 +3206,6 @@
 ☮️;;
 🕎;;
 🔯;;
-🪯;;
 ♈;;
 ♉;;
 ♊;;
@@ -3392,7 +3241,6 @@
 🔅;;
 🔆;;
 📶;;
-🛜;;
 📳;;
 📴;;
 ♀️;;

app/src/main/assets/ime/theme/org.florisboard.themes/extension.json

@@ -2,10 +2,10 @@
   "$": "ime.extension.theme",
   "meta": {
     "id": "org.florisboard.themes",
-    "version": "0.2.0",
+    "version": "0.1.0",
     "title": "FlorisBoard default themes",
     "description": "Default themes (both day and night) for the keyboard UI",
-    "maintainers": [ "patrickgold <patrick@patrickgold.dev>", "lm41 <lm41@lm41.xyz>" ],
+    "maintainers": [ "patrickgold <patrick@patrickgold.dev>" ],
     "license": "apache-2.0"
   },
   "themes": [
@@ -13,37 +13,49 @@
       "id": "floris_day",
       "label": "Floris Day",
       "authors": [ "patrickgold" ],
-      "isNight": false
+      "isNight": false,
+      "isBorderless": false,
+      "isMaterialYouAware": false
     },
     {
       "id": "floris_day_borderless",
       "label": "Floris Day (Borderless)",
       "authors": [ "patrickgold" ],
-      "isNight": false
+      "isNight": false,
+      "isBorderless": true,
+      "isMaterialYouAware": false
     },
     {
       "id": "floris_night",
       "label": "Floris Night",
       "authors": [ "patrickgold" ],
-      "isNight": true
+      "isNight": true,
+      "isBorderless": false,
+      "isMaterialYouAware": false
     },
     {
       "id": "floris_night_borderless",
       "label": "Floris Night (Borderless)",
       "authors": [ "patrickgold" ],
-      "isNight": true
+      "isNight": true,
+      "isBorderless": true,
+      "isMaterialYouAware": false
     },
     {
       "id": "floris_pure_night",
       "label": "Floris Pure Night",
       "authors": [ "serebit" ],
-      "isNight": true
+      "isNight": true,
+      "isBorderless": false,
+      "isMaterialYouAware": false
     },
     {
       "id": "floris_pure_night_borderless",
       "label": "Floris Pure Night (Borderless)",
       "authors": [ "serebit" ],
-      "isNight": true
+      "isNight": true,
+      "isBorderless": true,
+      "isMaterialYouAware": false
     }
   ]
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_day.json

@@ -1,40 +1,23 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#4caf50",
     "--primary-variant": "#388e3c",
     "--secondary": "#ff9800",
     "--secondary-variant": "#e65100",
     "--background": "#e0e0e0",
-    "--background-variant": "#d0d0d0",
     "--surface": "#ffffff",
     "--surface-variant": "#f5f5f5",
 
-    "--popup-surface": "#eeeeee",
-    "--focused-popup-surface": "#bdbdbd",
-
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(0 ,0, 0, 0.25)",
-
-    "--one-hand-background": "#e8f5e9",
-    "--one-hand-foreground": "#424242",
-
-    "--incognito-icon-color": "#00000011",
-
-    "--on-primary": "#f0f0f0",
     "--on-background": "#121212",
-    "--on-background-disabled": "rgb(175,175,175)",
     "--on-surface": "#000000",
     "--on-surface-variant": "#5f5f5f",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
@@ -42,322 +25,170 @@
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "1"
+    "shadow-elevation": "2dp"
   },
   "key:pressed": {
     "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
+    "foreground": "var(--secondary)"
+  },
+  "key[code={c:space}]": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
     "font-size": "12sp"
   },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
-    "foreground": "var(--secondary)"
-  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-family": "monospace",
-    "font-size": "12sp",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#eeeeee",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#bdbdbd",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
+  "smartbar-action-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#12121248"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#12121248"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
-    "foreground": "var(--secondary)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-spacer": {
-    "foreground": "var(--spacer-color)"
+    "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#eeeeee",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -382,82 +213,15 @@
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#00000011"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#e8f5e9",
+    "foreground": "#424242"
   },
 
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_day_borderless.json

@@ -1,124 +1,83 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#4caf50",
     "--primary-variant": "#388e3c",
     "--secondary": "#ff9800",
     "--secondary-variant": "#e65100",
     "--background": "#e0e0e0",
-    "--background-variant": "#d0d0d0",
     "--surface": "#f0f0f0",
     "--surface-variant": "#ffffff",
 
-    "--popup-surface": "#eeeeee",
-    "--focused-popup-surface": "#bdbdbd",
-
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(0 ,0, 0, 0.25)",
-
-    "--one-hand-background": "#e8f5e9",
-    "--one-hand-foreground": "#424242",
-
-    "--incognito-icon-color": "#00000011",
-
-    "--on-primary": "#f0f0f0",
     "--on-background": "#121212",
-    "--on-background-disabled": "#12121248",
     "--on-surface": "#000000",
     "--on-surface-variant": "#5f5f5f",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
     "background": "transparent",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
-    "shape": "var(--shape)",
-    "text-max-lines": "1"
+    "shape": "var(--shape)"
   },
   "key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
-    "foreground": "var(--on-surface)",
-    "margin": "0dp 6dp"
+    "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
+    "foreground": "var(--secondary)"
+  },
+  "key[code={c:space}]": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "margin": "0dp 6dp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
     "font-size": "12sp"
   },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
-    "foreground": "var(--secondary)"
-  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "font-family": "monospace",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#eeeeee",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#bdbdbd",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
   "smartbar-action-key:pressed": {
@@ -126,244 +85,109 @@
     "foreground": "var(--on-surface)"
   },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#12121248"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#12121248"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
     "foreground": "var(--on-background)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
-  },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
-  },
   "smartbar-candidate-spacer": {
     "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#eeeeee",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -388,82 +212,15 @@
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#00000011"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#e8f5e9",
+    "foreground": "#424242"
   },
 
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_night.json

@@ -1,35 +1,23 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#4caf50",
     "--primary-variant": "#388e3c",
     "--secondary": "#f57c00",
     "--secondary-variant": "#e65100",
     "--background": "#212121",
-    "--background-variant": "#313131",
     "--surface": "#424242",
     "--surface-variant": "#616161",
-    "--popup-surface": "#757575",
-    "--focused-popup-surface": "#bdbdbd",
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(255, 255, 255, 0.25)",
-    "--one-hand-background": "#1b5e20",
-    "--one-hand-foreground": "#eeeeee",
-    "--incognito-icon-color": "#ffffff11",
-    "--on-primary": "#f0f0f0",
+
     "--on-background": "#dcdcdc",
-    "--on-background-disabled": "#dcdcdc48",
     "--on-surface": "#ffffff",
     "--on-surface-variant": "#a0a0a0",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
@@ -37,322 +25,170 @@
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "1"
+    "shadow-elevation": "2dp"
   },
   "key:pressed": {
     "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
+    "foreground": "var(--secondary)"
+  },
+  "key[code={c:space}]": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
     "font-size": "12sp"
   },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
-    "foreground": "var(--secondary)"
-  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-family": "monospace",
-    "font-size": "12sp",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#bdbdbd",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
+  "smartbar-action-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
-    "foreground": "var(--secondary)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-spacer": {
-    "foreground": "var(--spacer-color)"
+    "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -377,81 +213,15 @@
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#ffffff11"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#1b5e20",
+    "foreground": "#eeeeee"
   },
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_night_borderless.json

@@ -1,119 +1,83 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#4caf50",
     "--primary-variant": "#388e3c",
     "--secondary": "#f57c00",
     "--secondary-variant": "#e65100",
     "--background": "#212121",
-    "--background-variant": "#313131",
     "--surface": "#424242",
     "--surface-variant": "#616161",
-    "--popup-surface": "#757575",
-    "--focused-popup-surface": "#bdbdbd",
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(255, 255, 255, 0.25)",
-    "--one-hand-background": "#1b5e20",
-    "--one-hand-foreground": "#eeeeee",
-    "--incognito-icon-color": "#ffffff11",
-    "--on-primary": "#f0f0f0",
+
     "--on-background": "#dcdcdc",
-    "--on-background-disabled": "#dcdcdc48",
     "--on-surface": "#ffffff",
     "--on-surface-variant": "#a0a0a0",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
     "background": "transparent",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
-    "shape": "var(--shape)",
-    "text-max-lines": "1"
+    "shape": "var(--shape)"
   },
   "key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
-    "foreground": "var(--on-surface)",
-    "margin": "0dp 6dp"
+    "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
+    "foreground": "var(--secondary)"
+  },
+  "key[code={c:space}]": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "margin": "0dp 6dp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
     "font-size": "12sp"
   },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
-    "foreground": "var(--secondary)"
-  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "font-family": "monospace",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#bdbdbd",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
   "smartbar-action-key:pressed": {
@@ -121,244 +85,109 @@
     "foreground": "var(--on-surface)"
   },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
     "foreground": "var(--on-background)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
-  },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
-  },
   "smartbar-candidate-spacer": {
     "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -383,81 +212,15 @@
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#ffffff11"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#1b5e20",
+    "foreground": "#eeeeee"
   },
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_pure_night.json

@@ -1,35 +1,23 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#388e3c",
     "--primary-variant": "#306d32",
     "--secondary": "#ff9800",
     "--secondary-variant": "#804c00",
     "--background": "#000000",
-    "--background-variant": "#111111",
     "--surface": "#212121",
     "--surface-variant": "#3d3d3d",
-    "--popup-surface": "#424242",
-    "--focused-popup-surface": "#707070",
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(255, 255, 255, 0.25)",
-    "--one-hand-background": "#1b5e20",
-    "--one-hand-foreground": "#eeeeee",
-    "--incognito-icon-color": "#ffffff11",
-    "--on-primary": "#f0f0f0",
-    "--on-background-disabled": "#dcdcdc48",
+
     "--on-background": "#eeeeee",
     "--on-surface": "#eeeeee",
     "--on-surface-variant": "#ffffff73",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
@@ -37,81 +25,60 @@
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "1"
+    "shadow-elevation": "2dp"
   },
   "key:pressed": {
     "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
+    "foreground": "var(--secondary)"
+  },
+  "key[code={c:space}]": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
     "font-size": "12sp"
   },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
-    "foreground": "var(--secondary)"
-  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-family": "monospace",
-    "font-size": "12sp",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#424242",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#707070",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
   "smartbar-action-key:pressed": {
@@ -119,244 +86,109 @@
     "foreground": "var(--on-surface)"
   },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
-    "foreground": "var(--secondary)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "foreground": "var(--on-background)",
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
+    "foreground": "var(--on-background)"
   },
   "smartbar-candidate-spacer": {
-    "foreground": "var(--spacer-color)"
+    "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -367,95 +199,29 @@
     "foreground": "var(--on-background)",
     "font-size": "16sp",
     "shape": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "border-color": "var(--secondary)",
-    "border-width": "2dp"
+    "border-color": "var(--secondary-variant)",
+    "border-width": "1dp"
   },
   "extracted-landscape-input-action": {
-    "background": "var(--primary)",
+    "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "rounded-corner(4dp, 4dp, 4dp, 4dp)"
   },
 
   "glide-trail": {
-    "foreground": "var(--primary)"
+    "foreground": "var(--primary-variant)"
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#ffffff11"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#000000",
+    "foreground": "#eeeeee"
   },
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

app/src/main/assets/ime/theme/org.florisboard.themes/stylesheets/floris_pure_night_borderless.json

@@ -1,119 +1,83 @@
 {
-  "$schema": "https://schemas.florisboard.org/snygg/v2/stylesheet",
   "@defines": {
     "--primary": "#388e3c",
     "--primary-variant": "#306d32",
     "--secondary": "#ff9800",
     "--secondary-variant": "#804c00",
     "--background": "#000000",
-    "--background-variant": "#111111",
     "--surface": "#212121",
     "--surface-variant": "#3d3d3d",
-    "--popup-surface": "#424242",
-    "--focused-popup-surface": "#707070",
-    "--drag-marker": "rgb(255,0,0)",
-    "--spacer-color": "rgba(255, 255, 255, 0.25)",
-    "--one-hand-background": "#1b5e20",
-    "--one-hand-foreground": "#eeeeee",
-    "--incognito-icon-color": "#ffffff11",
-    "--on-primary": "#f0f0f0",
-    "--on-background-disabled": "#dcdcdc48",
+
     "--on-background": "#eeeeee",
     "--on-surface": "#eeeeee",
     "--on-surface-variant": "#ffffff73",
 
     "--shape": "rounded-corner(8dp, 8dp, 8dp, 8dp)",
-    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "--shape-chip": "rounded-corner(50%, 50%, 50%, 50%)"
+    "--shape-variant": "rounded-corner(12dp, 12dp, 12dp, 12dp)"
   },
 
-  "window": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)"
+  "keyboard": {
+    "background": "var(--background)"
   },
 
   "key": {
     "background": "transparent",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
-    "shape": "var(--shape)",
-    "text-max-lines": "1"
+    "shape": "var(--shape)"
   },
   "key:pressed": {
-    "background": "var(--surface)",
+    "background": "#6161617f",
     "foreground": "var(--on-surface)"
   },
-  "key[code=10]": {
+  "key[code={c:enter}]": {
     "background": "var(--primary)",
-    "foreground": "var(--on-surface)",
-    "margin": "0dp 6dp"
+    "foreground": "var(--on-surface)"
   },
-  "key[code=10]:pressed": {
+  "key[code={c:enter}]:pressed": {
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code=32]": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "margin": "0dp 6dp",
-    "text-overflow": "ellipsis"
-  },
-  "key[code=-201,-202,-203]": {
-    "font-size": "18sp"
-  },
-  "key[code=-204,-205]": {
-    "font-size": "12sp"
-  },
-  "key[code=-205]": {
-    "text-max-lines": "2"
-  },
-  "key[code=-11][shiftstate=`caps_lock`]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
     "foreground": "var(--secondary)"
   },
+  "key[code={c:space}]": {
+    "background": "#61616146",
+    "foreground": "var(--on-surface-variant)",
+    "font-size": "12sp"
+  },
   "key-hint": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "font-size": "12sp",
-    "font-family": "monospace",
-    "padding": "0dp 1dp 1dp 0dp",
-    "text-max-lines": "1"
+    "font-size": "12sp"
   },
-  "key-popup-box": {
-    "background": "var(--popup-surface)",
+  "key-popup": {
+    "background": "#363636",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
     "shape": "var(--shape)",
     "shadow-elevation": "2dp"
   },
-  "key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape)"
-  },
-  "key-popup-extended-indicator": {
-    "font-size": "16sp"
+  "key-popup:focus": {
+    "background": "#5F5F5F",
+    "foreground": "var(--on-surface)"
   },
 
-  "smartbar": {
-    "font-size": "18sp"
-  },
   "smartbar-shared-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "margin": "6dp",
     "shape": "circle()",
     "shadow-elevation": "2dp"
   },
   "smartbar-extended-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
-    "margin": "6dp",
     "shape": "circle()"
   },
   "smartbar-action-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
+    "font-size": "18sp",
     "shape": "var(--shape)"
   },
   "smartbar-action-key:pressed": {
@@ -121,244 +85,109 @@
     "foreground": "var(--on-surface)"
   },
   "smartbar-action-key:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-
-  "smartbar-actions-overflow": {
-    "margin": "4dp"
-  },
-  "smartbar-actions-overflow-customize-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "font-size": "14sp",
-    "margin": "0dp 8dp 0dp 0dp",
-    "shape": "rounded-corner(24dp, 24dp, 24dp, 24dp)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
   "smartbar-action-tile": {
-    "background": "var(--background-variant)",
+    "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "4dp",
-    "shape": "rounded-corner(20%, 20%, 20%, 20%)",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-action-tile:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
   },
   "smartbar-action-tile:disabled": {
-    "foreground": "var(--on-background-disabled)"
+    "background": "transparent",
+    "foreground": "#dcdcdc48"
   },
-  "smartbar-action-tile-icon": {
-    "font-size": "24sp",
-    "margin": "0dp 0dp 0dp 8dp"
+  "smartbar-actions-overflow-customize-button": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-
   "smartbar-actions-editor": {
     "background": "var(--background)",
-    "foreground": "var(--on-background)",
     "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
   },
   "smartbar-actions-editor-header": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "16sp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
+    "font-size": "16sp"
   },
   "smartbar-actions-editor-subheader": {
     "foreground": "var(--on-background)",
-    "font-size": "16sp",
-    "font-weight": "bold",
-    "padding": "12dp 16dp 12dp 8dp",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "font-size": "16sp"
   },
-  "smartbar-actions-editor-tile-grid": {
-    "margin": "4dp 0dp"
-  },
-  "smartbar-actions-editor-tile": {
-    "margin": "4dp",
-    "padding": "8dp",
-    "text-align": "center",
-    "text-max-lines": "2",
-    "text-overflow": "ellipsis"
-  },
-  "smartbar-actions-editor-tile[code=-999]": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "smartbar-actions-editor-tile[code=-991]": {
-    "foreground": "var(--drag-marker)"
-  },
-
   "smartbar-candidate-word": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rectangle()",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rectangle()"
   },
   "smartbar-candidate-word:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-word-secondary-text": {
-    "font-size": "8sp",
-    "margin": "0dp 2dp 0dp 0dp"
-  },
   "smartbar-candidate-clip": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "font-size": "14sp",
-    "margin": "4dp",
-    "padding": "8dp 0dp",
-    "shape": "rounded-corner(8%, 8%, 8%, 8%)",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+    "shape": "rounded-corner(8%, 8%, 8%, 8%)"
   },
   "smartbar-candidate-clip:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-background)"
   },
-  "smartbar-candidate-clip-icon": {
-    "margin": "0dp 0dp 4dp 0dp"
-  },
   "smartbar-candidate-spacer": {
     "foreground": "var(--surface)"
   },
 
   "clipboard-header": {
-    "foreground": "var(--on-background)",
-    "font-size": "16sp"
-  },
-  "clipboard-header-button": {
-    "margin": "4dp",
-    "shape": "circle()"
-  },
-  "clipboard-header-button:disabled": {
-    "foreground": "var(--on-background-disabled)"
-  },
-  "clipboard-header-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-subheader": {
-    "font-size": "14sp",
-    "margin": "6dp 10dp 6dp 6dp"
-  },
-  "clipboard-content": {
-    "padding": "10dp 0dp"
-  },
-  "clipboard-filter-row": {
-    "background": "var(--background-variant)",
-    "foreground": "var(--on-background)",
-    "padding": "0dp 0dp 4dp 0dp",
-    "shape": "var(--shape-variant)"
-  },
-  "clipboard-filter-chip": {
-    "background": "var(--surface)",
+    "background": "transparent",
     "foreground": "var(--on-surface)",
-    "margin": "4dp 4dp 0dp 4dp",
-    "padding": "8dp 4dp",
-    "shape": "var(--shape-chip)"
-  },
-  "clipboard-filter-chip[state=`active`]": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)"
-  },
-  "clipboard-filter-chip-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-grid": {
-    "shape": "var(--shape-variant)"
+    "font-size": "16sp"
   },
   "clipboard-item": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp",
-    "text-max-lines": "10",
-    "text-overflow": "ellipsis"
-  },
-  "clipboard-item[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-description": {
-    "font-size": "12sp",
-    "font-style": "italic"
+    "shadow-elevation": "2dp"
   },
   "clipboard-item-popup": {
-    "background": "var(--surface)",
+    "background": "var(--surface-variant)",
     "foreground": "var(--on-surface)",
     "font-size": "14sp",
-    "margin": "4dp",
     "shape": "var(--shape-variant)",
     "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup[type=`text`]": {
-    "padding": "12dp 8dp"
-  },
-  "clipboard-item-timestamp": {
-    "font-size": "11sp",
-    "padding": "16dp 8dp"
-  },
-  "clipboard-item-actions": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "margin": "4dp",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "2dp"
-  },
-  "clipboard-item-action": {
-    "font-size": "16sp",
-    "padding": "12dp"
-  },
-  "clipboard-item-action-text": {
-    "margin": "4dp 0dp 0dp 0dp"
-  },
-  "clipboard-clear-all-dialog": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)",
-    "shadow-elevation": "1dp"
-  },
-  "clipboard-clear-all-dialog-message": {
-    "padding": "16dp"
-  },
-  "clipboard-clear-all-dialog-buttons": {
-    "padding": "4dp"
-  },
-  "clipboard-clear-all-dialog-button": {
+
+  "emoji-key": {
     "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "22sp",
+    "shape": "var(--shape)"
+  },
+  "emoji-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "emoji-key-popup": {
+    "background": "#757575",
     "foreground": "var(--on-surface)",
-    "shape": "var(--shape-variant)"
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-history-disabled-title": {
-    "font-weight": "bold"
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
   },
-  "clipboard-history-disabled-message": {
-    "padding": "0dp 4dp 0dp 8dp"
-  },
-  "clipboard-history-disabled-button": {
-    "background": "var(--primary)",
-    "foreground": "var(--on-primary)",
-    "shape": "rounded-corner(24dp,24dp,24dp,24dp)"
-  },
-  "clipboard-history-locked-title": {
-    "font-weight": "bold",
-    "text-align": "center"
-  },
-  "clipboard-history-locked-message": {
-    "padding": "0dp 4dp 0dp 0dp",
-    "text-align": "center"
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
   },
 
   "extracted-landscape-input-layout": {
@@ -369,95 +198,29 @@
     "foreground": "var(--on-background)",
     "font-size": "16sp",
     "shape": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
-    "border-color": "var(--secondary)",
-    "border-width": "2dp"
+    "border-color": "var(--secondary-variant)",
+    "border-width": "1dp"
   },
   "extracted-landscape-input-action": {
-    "background": "var(--primary)",
+    "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "shape": "rounded-corner(4dp, 4dp, 4dp, 4dp)"
   },
 
   "glide-trail": {
-    "foreground": "var(--primary)"
+    "foreground": "var(--primary-variant)"
   },
 
   "incognito-mode-indicator": {
-    "foreground": "var(--incognito-icon-color)"
-  },
-
-  "inline-autofill-chip": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-
-  "media-emoji-subheader": {
-    "font-weight": "bold",
-    "margin": "4dp"
-  },
-  "media-emoji-key": {
-    "background": "transparent",
-    "foreground": "var(--on-background)",
-    "font-size": "22sp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key:pressed": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)"
-  },
-  "media-emoji-key-popup-box": {
-    "background": "var(--popup-surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "22sp",
-    "shape": "var(--shape)",
-    "shadow-elevation": "2dp"
-  },
-  "media-emoji-key-popup-element:focus": {
-    "background": "var(--focused-popup-surface)",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "media-emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-  "media-bottom-row-button": {
-    "padding": "16dp 0dp",
-    "shape": "var(--shape)"
-  },
-  "media-emoji-key-popup-extended-indicator": {
-    "foreground": "inherit"
+    "foreground": "#ffffff11"
   },
 
   "one-handed-panel": {
-    "background": "var(--one-hand-background)",
-    "foreground": "var(--one-hand-foreground)"
+    "background": "#000000",
+    "foreground": "#eeeeee"
   },
-  "subtype-panel": {
-    "background": "var(--background)",
-    "foreground": "var(--on-background)",
-    "shape": "rounded-corner(24dp, 24dp, 0dp, 0dp)"
-  },
-  "subtype-panel-header": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "font-size": "18sp",
-    "padding": "12dp",
-    "text-align": "center",
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
-  },
-  "subtype-panel-list-item": {
-    "font-size": "16sp",
-    "padding": "16dp"
-  },
-  "subtype-panel-list-item-icon-leading": {
-    "font-size": "24sp",
-    "padding": "0dp 0dp 16dp 0dp"
-  },
-  "subtype-panel-list-item-text": {
-    "text-max-lines": "1",
-    "text-overflow": "ellipsis"
+
+  "system-nav-bar": {
+    "background": "var(--background)"
   }
 }

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.

app/src/main/cpp/.clang-format

@@ -0,0 +1 @@
+nlp/.clang-format

app/src/main/cpp/.clang-tidy

@@ -0,0 +1 @@
+nlp/.clang-tidy

app/src/main/cpp/.editorconfig

@@ -0,0 +1 @@
+nlp/.editorconfig

app/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.22)
+
+project(florisboard)
+
+set(CMAKE_CXX_STANDARD 20)
+
+include_directories(.)
+
+### FlorisBoard ###
+add_subdirectory(utils)
+add_subdirectory(nlp)
+
+add_library(
+        florisboard-native
+        SHARED
+        FlorisApplication.cpp
+        LatinLanguageProviderService.cpp
+        LatinNlpSession.cpp
+)
+
+target_compile_options(florisboard-native PRIVATE -ffunction-sections -fdata-sections -fexceptions)
+target_link_libraries(
+        # Destination
+        florisboard-native
+
+        # Sources
+        android
+        log
+        fl::nlp::core
+        utils
+)