Release v0.3.16

Improve input feedback controller performance

.github/workflows/android.yml

@@ -29,14 +29,6 @@ jobs:
           java-version: 11
       - name: Setup CMake and Ninja
         uses: lukka/get-cmake@v3.20.1
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Build with Gradle
         # MUST call gradlew separately because of an OSS license plugin issue.
         # See https://github.com/google/play-services-plugins/issues/199

.gitignore

@@ -43,6 +43,3 @@ crowdin.properties
 
 # C++
 .cxx/
-
-# AndroidX Room schema JSONs
-/app/schemas/

CONTRIBUTING.md

@@ -2,127 +2,104 @@
 
 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.
+There are several ways to contribute to FlorisBoard. This document provides some general guidelines for each type of
+contribution.
 
 ## Giving general feedback
 
 NEW! You can now [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.
+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.
 
 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 :)
+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 :)
 
 ## Translations
 
 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.
+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.
 
 ## Adding a new feature or making large changes
 
-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 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!
 
 ## Adding a new keyboard layout
 
-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).
-There are two main steps in adding new layouts, though the config step can
-be skipped if you only add a layout without a new default language support.
-
-### The config file ([`app/src/main/assets/ime/config.json`](app/src/main/assets/ime/config.json))
-
-This file is very important, as it defines all default currency sets as
-well as all default subtypes available in the Settings Subtype UI. Note
-that you don't have to modify this file if you add a layout for an already
-pre-configured language.
-
-- `currencySets`: This is a list of 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.
-- `defaultSubtyes`: This is 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 pre-selected. 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`. Use a unique value
-  for `id` to avoid possible crashes caused by duplicate ids.
+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.
 
 ### Adding the layout
 
-Since v0.3.10-beta05 it is possible to add custom layouts for all types.
+Since v0.3.14-beta06 it is possible to add custom layouts for all types using the new extension format, Flex.
 
-To add a new layout, head to [`app/src/main/assets/ime/text`](app/src/main/assets/ime/text) and then select
-the correct sub-directory for the type of layout you want to add. In most cases
-this will be `characters` to add a layout like QWERTY etc.
+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:
 
-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 `&#;`
+- `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/java/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt`](app/src/main/java/dev/patrickgold/florisboard/ime/text/key/KeyCode.kt).
+[`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.
+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/text/characters/extended_popups/<languageTag_name_here>.json`](app/src/main/assets/ime/text/characters/extended_popups).
-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.
+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.
+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 the suggestions implementation is highly experimental and will
-get a major if not complete rework, so dictionaries are currently not
-accepted.
+Currently the suggestions implementation is highly experimental and not available until 0.4.0, so dictionaries are
+currently not accepted.
 
 ## 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.
+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.
+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.
+Alternatively, you can also use ADB (Android Debug Bridge) to capture the error log. This is recommended for experienced
+users only.
 
 ## Donating
 
-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 :)
+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!

README.md

@@ -1,9 +1,9 @@
 <img align="left" width="80" height="80"
-src="fastlane/metadata/android/en-US/images/icon.png" alt="App icon">
+src=".github/repo_icon.png" alt="App icon">
 
 # FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) [![Matrix badge](https://img.shields.io/badge/chat-%23florisboard%3amatrix.org-blue)](https://matrix.to/#/#florisboard:matrix.org) ![FlorisBoard CI](https://github.com/florisboard/florisboard/workflows/FlorisBoard%20CI/badge.svg?event=push)
 
-**FlorisBoard** is a free and open-source keyboard for Android 6.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 early-beta state.
 
@@ -57,12 +57,14 @@ fully respecting your privacy. Currently in early-beta state.
 Beginning with v0.4.0 FlorisBoard will follow [SemVer](https://semver.org/#summary) versioning scheme and enter the public beta on Google Play.
 
 ## Highlighted features
-- Spell checking service
-- Word suggestions (currently English only and may not work on all devices)
-- Glide typing (currently English only)
-- Advanced theming support and customization
 - Integrated clipboard manager / history
-- Emoji keyboard (although lacking some features)
+- Advanced theming support and customization
+- Integrated extension support (still evolving)
+- Emoji keyboard
+- Spell checking service
+- Glide typing (currently English only)
+
+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)
 
@@ -78,26 +80,30 @@ Please refer to this [page](https://github.com/florisboard/florisboard/wiki/List
 to get more information on this topic.
 
 ## Used libraries, components and icons
-* [Google Flexbox Layout for Android](https://github.com/google/flexbox-layout)
-  by [google](https://github.com/google)
+* [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
-  [google](https://github.com/google)
+  [Google](https://github.com/google)
+* [JetPref preference library](https://github.com/patrickgold/jetpref) by
+  [patrickgold](https://github.com/patrickgold)
+* [KotlinX coroutines library](https://github.com/Kotlin/kotlinx.coroutines) by
+  [Kotlin](https://github.com/Kotlin)
 * [KotlinX serialization library](https://github.com/Kotlin/kotlinx.serialization) by
   [Kotlin](https://github.com/Kotlin)
-* [ColorPicker preference](https://github.com/jaredrummler/ColorPicker) by
-  [Jared Rummler](https://github.com/jaredrummler)
-* [Timber](https://github.com/JakeWharton/timber) by
-  [JakeWharton](https://github.com/JakeWharton)
-* [expandable-fab](https://github.com/nambicompany/expandable-fab) by
-  [Nambi](https://github.com/nambicompany)
 * [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 Patrick Goldinger
+Copyright 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.

ROADMAP.md

@@ -1,89 +1,63 @@
+
 # FlorisBoard's feature roadmap & milestones
 
-This feature roadmap intents to provide transparency to what I want to add
-to FlorisBoard in the foreseeable future. Note that there are no ETAs for any
-version milestones down below, experience says these won't hold anyways.
+This feature roadmap intents to provide transparency to what I want to add to FlorisBoard in the foreseeable future.
+Note that there are no ETAs for any version milestones down below, experience says these won't hold anyways.
 
-I try my best to release regularly, though some features take a lot longer
-than others and thus releases can be spaced out a bit on the stable track.
-If you are interested in following the development more closely, make sure to
-follow along the beta track releases! These are generally more unstable but
-you get new stuff faster and can provide early feedback, which helps a lot!
+I try my best to release regularly, though some features take a lot longer than others and thus releases can be spaced
+out a bit on the stable track. If you are interested in following the development more closely, make sure to follow
+along the beta track releases! These are generally more unstable but you get new stuff faster and can provide early
+feedback, which helps a lot!
 
 ## 0.3.x
-Releases in this section still follow the old versioning scheme, meaning the
-patch number is a feature upgrade. As this naming convention is more confusing
-than useful, beginning with v0.4.0 development a new release/development cycle will be
-introduced.
 
-### 0.3.14 (currently in progress, much is already implemented and working well)
-- Re-write of the Preference core
-  - Reduce redundancy in key/default value definitions
-  - Avoid having to manually add redundant code for adding a new pref
-  - Goes hand-in-hand with the Settings UI re-write
-- Re-write of the Settings UI with Jetpack Compose
-  - Also re-structure UI into a more list-like panel
-  - Adjust theme colors of Settings a bit to make it more modern
-  - Preview the keyboard at any time from within the Settings
-  - Settings language different than device language
-- Re-write the Setup UI in Jetpack Compose
-  - Simplify screen based on previously discussed ideas and mock-ups
-  - Improve backend setup logic
-- Implement base-UI for extensions and further continue development
-  of existing Flex (FlorisBoard extension) format
-  - Allows for a continuous experience of customizing FlorisBoard in different areas
-  - Planned what will use Flex:
-    - Themes
-    - Layouts (Characters, symbols, numeric, ...)
-    - Composers for non-Latin script languages
-    - Word suggestion dictionaries (in 0.4.0)
-    - Spell check dictionaries
-    - User dictionaries (not in 0.3.14)
-    - Other features that require only data and no logic (not in 0.3.14)
-- Maybe full backup of preferences? Not 100% confirmed though and may be pushed back
-- Theme rework part I:
-    - Custom key corner radius
-    - Custom key border color (not shadow!!)
-    - Re-work theme internals so they use Flex extension format and FlexCSS
-- Improvement of the Smartbar
-  - Allow to have multiple Smartbars
-  - Better candidate view (in prep for 0.4.0)
+Releases in this section still follow the old versioning scheme, meaning the patch number is a feature upgrade. As this
+naming convention is more confusing than useful, beginning with v0.4.0 development a new release/development cycle will
+be introduced.
 
-### 0.3.15
-- Hotfix release for possible bugs in the preference rework, may be skipped and 0.4.0 is directly released.
+### 0.3.15 & 0.3.16 (currently 0.3.15 done, 0.3.16 in work)
+
+- Hotfix releases for possible bugs in the preference rework (in work)
+- Lots and lots of bug fixing in general (in work)
+- Preparation work for 0.4.0, fixing text state logic and use break iterator (done)
+- Reducing or getting rid of input lag some devices experience (done)
+- Clean up of project structure for better future development (done)
 
 ## 0.4.0
+
 - Re-adding word suggestions (at least for Latin-based languages at first)
-  - Importing the dictionaries as well as management relies on the Flex extension core and UI in Kotlin
-  - Actually parsing and generating suggestions happens in C++ to avoid another OOM catastrophe like in 0.3.9/10
-  - The actual format of the dictionary and word list source is not decided yet
+    - Importing the dictionaries as well as management relies on the Flex extension core and UI in Kotlin
+    - Actually parsing and generating suggestions happens in C++ to avoid another OOM catastrophe like in 0.3.9/10
+    - The actual format of the dictionary and word list source is not decided yet
 - Community repository on GitHub for theme sharing across users (may be 0.5.0)
 
-With this release the versioning scheme changes: the second number now indicates new features,
-changes in the third "patch" number now indicates bug fixes for the stable track. The development
-cycle for each 0.x release will have `-alphaXX`, `-betaXX` and `-rcXX` (release candidate) releases on the beta
-track for interested people to follow along the development. The first release to follow the new scheme will be `0.4.0-alpha01`
-on the beta track.
+With this release the versioning scheme changes: the second number now indicates new features, changes in the third "
+patch" number now indicates bug fixes and minor feature additions for the stable track. The development cycle for each
+0.x release will have `-alphaXX` (optional and only for large releases), `-betaXX` and `-rcXX` (release candidate)
+releases on the beta track for interested people to follow along the development. The first release to follow the new
+scheme will be `0.4.0-alpha01` on the beta track.
 
 ## 0.5.0
+
 - Complete rework of the Emoji panel
-  - Recently used / Emoji history
-  - Emoji search
-  - Emoji suggestions when using :emoji_name: syntax
-  - Kaomoji panel implementation (the third tab which currently has "not yet implemented")
+    - 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")
 - Smartbar customization improvements
-  - Quick actions customization (order and which buttons to show)
-- Prepare FlorisBoard repository and app store presence for public beta release
-  on Google Play (will go live with stable 0.5.0!!)
+    - Quick actions customization (order and which buttons to show)
+- Prepare FlorisBoard repository and app store presence for public beta release on Google Play (will go live with stable
+  0.5.0!!)
 - Rework branding images and texts of FlorisBoard for the app stores
 - Focus on stability and experience improvements of the app and keyboard
 
 ## 0.6.0
-- Full on-board layout editor which allows users to create their own layouts
-  without writing a JSON file
+
+- 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
 
 ## Backlog / Features that MAY be added, even in versions not mentioned above if the feature implementation fits perfectly with another feature
+
 - Theme rework part II
 - Adaptive themes v2
 - Voice-to-text with Mozilla's open-source voice service

app/build.gradle.kts

@@ -1,13 +1,36 @@
+/*
+ * 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.
+ * 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.
+ */
+
+// 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 {
-    id("com.android.application")
-    kotlin("android")
-    kotlin("kapt")
-    kotlin("plugin.serialization")
-    id("com.google.android.gms.oss-licenses-plugin")
-    id("de.mannodermaus.android-junit5")
+    alias(libs.plugins.agp.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.mannodermaus.android.junit5)
+    alias(libs.plugins.mikepenz.aboutlibraries)
 }
 
 android {
+    namespace = "dev.patrickgold.florisboard"
     compileSdk = 31
     buildToolsVersion = "31.0.0"
     ndkVersion = "22.1.7171670"
@@ -18,7 +41,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = "1.8"
         freeCompilerArgs = listOf(
             "-Xallow-result-return-type",
             "-Xopt-in=kotlin.RequiresOptIn",
@@ -29,21 +52,19 @@ android {
 
     defaultConfig {
         applicationId = "dev.patrickgold.florisboard"
-        minSdk = 23
+        minSdk = 24
         targetSdk = 31
-        versionCode = 69
-        versionName = "0.3.14"
+        versionCode = 86
+        versionName = "0.3.16"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += mapOf(
-                    Pair("room.schemaLocation", "$projectDir/schemas"),
-                    Pair("room.incremental", "true"),
-                    Pair("room.expandProjection", "true")
-                )
-            }
+        buildConfigField("String", "BUILD_COMMIT_HASH", "\"${getGitCommitHash()}\"")
+
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("room.incremental", "true")
+            arg("room.expandProjection", "true")
         }
 
         externalNativeBuild {
@@ -66,16 +87,28 @@ android {
                 jniLibs {
                     srcDirs("src/main/icu4c/prebuilt/jniLibs")
                 }
+                java {
+                    srcDirs("src/main/kotlin")
+                }
             }
         }
     }
 
+    bundle {
+        language {
+            // We disable language split because FlorisBoard does not use
+            // runtime Google Play Service APIs and thus cannot dynamically
+            // request to download the language resources for a specific locale.
+            enableSplit = false
+        }
+    }
+
     buildFeatures {
         compose = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.1.0"
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.get()
     }
 
     externalNativeBuild {
@@ -85,9 +118,9 @@ android {
     }
 
     buildTypes {
-        named("debug").configure {
+        named("debug") {
             applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
+            versionNameSuffix = "-debug-${getGitCommitHash(short = true)}"
 
             isDebuggable = true
             isJniDebuggable = false
@@ -103,11 +136,13 @@ android {
             resValue("string", "floris_app_name", "FlorisBoard Debug")
         }
 
-        create("beta") // Needed because by default the "beta" BuildType does not exist
-        named("beta").configure {
+        create("beta") {
             applicationIdSuffix = ".beta"
-            versionNameSuffix = "-beta13"
-            proguardFiles.add(getDefaultProguardFile("proguard-android-optimize.txt"))
+            versionNameSuffix = ""
+
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            isShrinkResources = true
 
             resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_beta")
             resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_beta_round")
@@ -115,14 +150,31 @@ android {
             resValue("string", "floris_app_name", "FlorisBoard Beta")
         }
 
-        named("release").configure {
-            proguardFiles.add(getDefaultProguardFile("proguard-android-optimize.txt"))
+        named("release") {
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            isMinifyEnabled = true
+            isShrinkResources = true
 
-            resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_release")
-            resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_release_round")
-            resValue("drawable", "floris_app_icon_foreground", "@drawable/ic_app_icon_release_foreground")
+            resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_stable")
+            resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_stable_round")
+            resValue("drawable", "floris_app_icon_foreground", "@drawable/ic_app_icon_stable_foreground")
             resValue("string", "floris_app_name", "@string/app_name")
         }
+
+        create("benchmark") {
+            initWith(getByName("release"))
+            signingConfig = signingConfigs.getByName("debug")
+            matchingFallbacks += listOf("release")
+
+            ndk {
+                // For running FlorisBoard on the emulator
+                abiFilters += listOf("x86", "x86_64")
+            }
+        }
+    }
+
+    aboutLibraries {
+        configPath = "app/src/main/config"
     }
 
     testOptions {
@@ -140,36 +192,57 @@ tasks.withType<Test> {
 }
 
 dependencies {
-    implementation("androidx.activity:activity-compose:1.4.0")
-    implementation("androidx.activity:activity-ktx:1.4.0")
-    implementation("androidx.autofill:autofill:1.1.0")
-    implementation("androidx.collection:collection-ktx:1.2.0")
-    implementation("androidx.compose.material:material:1.1.0")
-    implementation("androidx.compose.runtime:runtime-livedata:1.1.0")
-    implementation("androidx.compose.ui:ui:1.1.0")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.1.0")
-    implementation("androidx.core:core-ktx:1.7.0")
-    implementation("androidx.core:core-splashscreen:1.0.0-beta01")
-    implementation("androidx.emoji2:emoji2:1.1.0")
-    implementation("androidx.emoji2:emoji2-views:1.1.0")
-    implementation("androidx.navigation:navigation-compose:2.4.1")
-    implementation("com.google.accompanist:accompanist-flowlayout:0.23.0")
-    implementation("com.google.accompanist:accompanist-insets:0.23.0")
-    implementation("com.google.accompanist:accompanist-systemuicontroller:0.23.0")
-    implementation("dev.patrickgold.jetpref:jetpref-datastore-model:0.1.0-beta08")
-    implementation("dev.patrickgold.jetpref:jetpref-datastore-ui:0.1.0-beta08")
-    implementation("dev.patrickgold.jetpref:jetpref-material-ui:0.1.0-beta08")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
-    implementation("androidx.room:room-runtime:2.4.1")
-    kapt("androidx.room:room-compiler:2.4.1")
+    implementation(libs.accompanist.flowlayout)
+    implementation(libs.accompanist.insets)
+    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)
+    implementation(libs.androidx.compose.runtime.livedata)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.emoji2)
+    implementation(libs.androidx.emoji2.views)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.profileinstaller)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.cache4k)
+    implementation(libs.jetpref.datastore.model)
+    implementation(libs.jetpref.datastore.ui)
+    implementation(libs.jetpref.material.ui)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.mikepenz.aboutlibraries.core)
+    implementation(libs.mikepenz.aboutlibraries.compose)
 
-    testImplementation("io.kotest:kotest-runner-junit5:5.1.0")
-    testImplementation("io.kotest:kotest-assertions-core:5.1.0")
-    testImplementation("io.kotest:kotest-property:5.1.0")
-    testImplementation("io.kotest.extensions:kotest-extensions-robolectric:0.5.0")
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:3.8.3")
+    testImplementation(libs.equalsverifier)
+    testImplementation(libs.kotest.assertions.core)
+    testImplementation(libs.kotest.extensions.roboelectric)
+    testImplementation(libs.kotest.property)
+    testImplementation(libs.kotest.runner.junit5)
 
-    androidTestImplementation("androidx.test.ext", "junit", "1.1.2")
-    androidTestImplementation("androidx.test.espresso", "espresso-core", "3.3.0")
+    androidTestImplementation(libs.androidx.test.ext)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}
+
+fun getGitCommitHash(short: Boolean = false): String {
+    if (!File(".git").exists()) {
+        return "null"
+    }
+
+    val stdout = ByteArrayOutputStream()
+    exec {
+        if (short) {
+            commandLine("git", "rev-parse", "--short", "HEAD")
+        } else {
+            commandLine("git", "rev-parse", "HEAD")
+        }
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
 }

app/proguard-rules.pro

@@ -0,0 +1,29 @@
+# Disable obfuscation (we use Proguard exclusively for optimization)
+-dontobfuscate
+
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault

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

@@ -0,0 +1,62 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "d573e2ae2cbe7026957bc8d8fda291f3",
+    "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, `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": "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, 'd573e2ae2cbe7026957bc8d8fda291f3')"
+    ]
+  }
+}

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

@@ -0,0 +1,80 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "6fbec9d7ea017f8aefac4fb84dbd5189",
+    "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)",
+        "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "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, '6fbec9d7ea017f8aefac4fb84dbd5189')"
+    ]
+  }
+}

app/schemas/dev.patrickgold.florisboard.ime.dictionary.FlorisUserDictionaryDatabase/1.json

@@ -0,0 +1,68 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "787af4a2df15bf9d2c0597519d3fb273",
+    "entities": [
+      {
+        "tableName": "words",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `word` TEXT NOT NULL, `frequency` INTEGER NOT NULL, `locale` TEXT, `shortcut` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "word",
+            "columnName": "word",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "freq",
+            "columnName": "frequency",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "shortcut",
+            "columnName": "shortcut",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "_id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_words__id",
+            "unique": false,
+            "columnNames": [
+              "_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_words__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, '787af4a2df15bf9d2c0597519d3fb273')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 Patrick Goldinger
+<!-- 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.
@@ -13,10 +13,8 @@
      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"
-    package="dev.patrickgold.florisboard">
+    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"/>
@@ -46,14 +44,16 @@
         android:theme="@style/FlorisAppTheme"
         tools:targetApi="s">
 
+        <!-- Allow app to be profiled for benchmarking and baseline profile generation -->
+        <profileable android:shell="true"/>
+
         <!-- IME service -->
         <service
             android:name="dev.patrickgold.florisboard.FlorisImeService"
             android:label="@string/floris_app_name"
             android:permission="android.permission.BIND_INPUT_METHOD"
             android:directBootAware="true"
-            android:exported="true"
-            tools:targetApi="n">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.view.InputMethod"/>
             </intent-filter>
@@ -105,7 +105,7 @@
 
         <!-- Import File Bridging Activity -->
         <activity
-            android:name="dev.patrickgold.florisboard.app.ui.ext.ImportFileActivity"
+            android:name="dev.patrickgold.florisboard.app.ext.ImportFileActivity"
             android:icon="@mipmap/floris_app_icon"
             android:label="@string/settings__title"
             android:launchMode="singleTask"
@@ -123,14 +123,15 @@
 
         <!-- Crash Dialog Activity -->
         <activity
-            android:name="dev.patrickgold.florisboard.crashutility.CrashDialogActivity"
+            android:name="dev.patrickgold.florisboard.lib.crashutility.CrashDialogActivity"
             android:icon="@mipmap/floris_app_icon"
             android:label="@string/crash_dialog__title"
             android:theme="@style/CrashDialogTheme"/>
 
+        <!-- Clipboard Media File Provider -->
         <provider
-            android:name="dev.patrickgold.florisboard.ime.clipboard.provider.FlorisContentProvider"
-            android:authorities="${applicationId}.provider.clip"
+            android:name="dev.patrickgold.florisboard.ime.clipboard.provider.ClipboardMediaProvider"
+            android:authorities="${applicationId}.provider.clipboard"
             android:grantUriPermissions="true"
             android:exported="false">
         </provider>
@@ -146,6 +147,17 @@
                 android:resource="@xml/file_paths"/>
         </provider>
 
+        <!-- Disable default EmojiCompat initializer -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
+                tools:node="remove"/>
+        </provider>
+
     </application>
 
 </manifest>

app/src/main/assets/ime/config.json

@@ -1,57 +0,0 @@
-{
-  "package": "dev.patrickgold.florisboard",
-  "composers": [
-    { "$": "appender" },
-    { "$": "hangul-unicode" },
-    { "$": "kana-unicode" },
-    { "$": "with-rules",
-      "name": "basic-telex",
-      "label": "Basic Telex",
-      "rules": {
-        "aw": "ă", "aa": "â", "dd": "đ", "ee": "ê", "oo": "ô", "ow": "ơ", "uw": "ư", "w": "ư",
-        "uow": "ươ",
-        "af": "à", "ar": "ả", "ax": "ã", "as": "á", "aj": "ạ",
-        "ăf": "ằ", "ăr": "ẳ", "ăx": "ẵ", "ăs": "ắ", "ăj": "ặ",
-        "âf": "ầ", "âr": "ẩ", "âx": "ẫ", "âs": "ấ", "âj": "ậ",
-        "ef": "è", "er": "ẻ", "ex": "ẽ", "es": "é", "ej": "ẹ",
-        "êf": "ề", "êr": "ể", "êx": "ễ", "ês": "ế", "êj": "ệ",
-        "if": "ì", "ir": "ỉ", "ix": "ĩ", "is": "í", "ij": "ị",
-        "of": "ò", "or": "ỏ", "ox": "õ", "os": "ó", "oj": "ọ",
-        "ôf": "ồ", "ôr": "ổ", "ôx": "ỗ", "ôs": "ố", "ôj": "ộ",
-        "ơf": "ờ", "ơr": "ở", "ơx": "ỡ", "ơs": "ớ", "ơj": "ợ",
-        "uf": "ù", "ur": "ủ", "ux": "ũ", "us": "ú", "uj": "ụ",
-        "ưf": "ừ", "ưr": "ử", "ưx": "ữ", "ưs": "ứ", "ưj": "ự",
-        "yf": "ỳ", "yr": "ỷ", "yx": "ỹ", "ys": "ý", "yj": "ỵ",
-        "ăw": "aw", "âa": "aa", "đd": "dd", "êe": "ee", "ôo": "oo", "ơw": "ow", "ưw": "w",
-        "ươw": "uow",
-        "àf": "af", "ảr": "ar", "ãx": "ax", "ás": "as", "ạj": "aj",
-        "ằf": "ăf", "ẳr": "ăr", "ẵx": "ăx", "ắs": "ăs", "ặj": "ăj",
-        "ầf": "âf", "ẩr": "âr", "ẫx": "âx", "ấs": "âs", "ậj": "âj",
-        "èf": "ef", "ẻr": "er", "ẽx": "ex", "és": "es", "ẹj": "ej",
-        "ềf": "êf", "ểr": "êr", "ễx": "êx", "ếs": "ês", "ệj": "êj",
-        "ìf": "if", "ỉr": "ir", "ĩx": "ix", "ís": "is", "ịj": "ij",
-        "òf": "of", "ỏr": "or", "õx": "ox", "ós": "os", "ọj": "oj",
-        "ồf": "ôf", "ổr": "ôr", "ỗx": "ôx", "ốs": "ôs", "ộj": "ôj",
-        "ờf": "ơf", "ởr": "ơr", "ỡx": "ơx", "ớs": "ơs", "ợj": "ơj",
-        "ùf": "uf", "ủr": "ur", "ũx": "ux", "ús": "us", "ụj": "uj",
-        "ừf": "ưf", "ửr": "ưr", "ữx": "ưx", "ứs": "ưs", "ựj": "ưj",
-        "ỳf": "yf", "ỷr": "yr", "ỹx": "yx", "ýs": "ys", "ỵj": "yj",
-        "àz": "a", "ảz": "a", "ãz": "a", "áz": "a", "ạz": "a",
-        "ằz": "ă", "ẳz": "ă", "ẵz": "ă", "ắz": "ă", "ặz": "ă",
-        "ầz": "â", "ẩz": "â", "ẫz": "â", "ấz": "â", "ậz": "â",
-        "èz": "e", "ẻz": "e", "ẽz": "e", "éz": "e", "ẹz": "e",
-        "ềz": "ê", "ểz": "ê", "ễz": "ê", "ếz": "ê", "ệz": "ê",
-        "ìz": "i", "ỉz": "i", "ĩz": "i", "íz": "i", "ịz": "i",
-        "òz": "o", "ỏz": "o", "õz": "o", "óz": "o", "ọz": "o",
-        "ồz": "ô", "ổz": "ô", "ỗz": "ô", "ốz": "ô", "ộz": "ô",
-        "ờz": "ơ", "ởz": "ơ", "ỡz": "ơ", "ớz": "ơ", "ợz": "ơ",
-        "ùz": "u", "ủz": "u", "ũz": "u", "úz": "u", "ụz": "u",
-        "ừz": "ư", "ửz": "ư", "ữz": "ư", "ứz": "ư", "ựz": "ư",
-        "ỳz": "y", "ỷz": "y", "ỹz": "y", "ýz": "y", "ỵz": "y"
-      }
-    }
-  ],
-  "currencySets": [],
-  "defaultSubtypes": [
-  ]
-}

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

@@ -0,0 +1,678 @@
+{
+  "$": "ime.extension.keyboard",
+  "meta": {
+    "id": "org.florisboard.composers",
+    "version": "0.1.1",
+    "title": "Default composers",
+    "description": "Default composers which are always available.",
+    "maintainers": [ "patrickgold <patrick@patrickgold.dev>", "thanhhocse96 <thanh.hoquang@pm.me>" ],
+    "license": "apache-2.0"
+  },
+  "composers": [
+    { "$": "appender" },
+    { "$": "hangul-unicode" },
+    { "$": "kana-unicode" },
+    { "$": "with-rules",
+      "id": "telex",
+      "label": "Telex",
+      "rules": {
+        "aw": "ă", "aa": "â", "dd": "đ", "ee": "ê", "oo": "ô", "ow": "ơ", "uw": "ư", "w": "ư", 
+        "uow": "ươ",
+        "af": "à", "ar": "ả", "ax": "ã", "as": "á", "aj": "ạ",
+        "ăf": "ằ", "ăr": "ẳ", "ăx": "ẵ", "ăs": "ắ", "ăj": "ặ",
+        "âf": "ầ", "âr": "ẩ", "âx": "ẫ", "âs": "ấ", "âj": "ậ",
+        "ef": "è", "er": "ẻ", "ex": "ẽ", "es": "é", "ej": "ẹ",
+        "êf": "ề", "êr": "ể", "êx": "ễ", "ês": "ế", "êj": "ệ",
+        "if": "ì", "ir": "ỉ", "ix": "ĩ", "is": "í", "ij": "ị",
+        "of": "ò", "or": "ỏ", "ox": "õ", "os": "ó", "oj": "ọ",
+        "ôf": "ồ", "ôr": "ổ", "ôx": "ỗ", "ôs": "ố", "ôj": "ộ",
+        "ơf": "ờ", "ơr": "ở", "ơx": "ỡ", "ơs": "ớ", "ơj": "ợ",
+        "uf": "ù", "ur": "ủ", "ux": "ũ", "us": "ú", "uj": "ụ",
+        "ưf": "ừ", "ưr": "ử", "ưx": "ữ", "ưs": "ứ", "ưj": "ự",
+        "yf": "ỳ", "yr": "ỷ", "yx": "ỹ", "ys": "ý", "yj": "ỵ",
+        "ăw": "aw", "âa": "aa", "đd": "dd", "êe": "ee", "ôo": "oo", "ơw": "ow", "ưw": "w", "iêe": "iee",
+        "ươw": "uow",
+        "àf": "af", "ảr": "ar", "ãx": "ax", "ás": "as", "ạj": "aj",
+        "ằf": "ăf", "ẳr": "ăr", "ẵx": "ăx", "ắs": "ăs", "ặj": "ăj",
+        "ầf": "âf", "ẩr": "âr", "ẫx": "âx", "ấs": "âs", "ậj": "âj",
+        "èf": "ef", "ẻr": "er", "ẽx": "ex", "és": "es", "ẹj": "ej",
+        "ềf": "êf", "ểr": "êr", "ễx": "êx", "ếs": "ês", "ệj": "êj",
+        "ìf": "if", "ỉr": "ir", "ĩx": "ix", "ís": "is", "ịj": "ij",
+        "òf": "of", "ỏr": "or", "õx": "ox", "ós": "os", "ọj": "oj",
+        "ồf": "ôf", "ổr": "ôr", "ỗx": "ôx", "ốs": "ôs", "ộj": "ôj",
+        "ờf": "ơf", "ởr": "ơr", "ỡx": "ơx", "ớs": "ơs", "ợj": "ơj",
+        "ùf": "uf", "ủr": "ur", "ũx": "ux", "ús": "us", "ụj": "uj",
+        "ừf": "ưf", "ửr": "ưr", "ữx": "ưx", "ứs": "ưs", "ựj": "ưj",
+        "ỳf": "yf", "ỷr": "yr", "ỹx": "yx", "ýs": "ys", "ỵj": "yj",
+        "àz": "a", "ảz": "a", "ãz": "a", "áz": "a", "ạz": "a",
+        "ằz": "ă", "ẳz": "ă", "ẵz": "ă", "ắz": "ă", "ặz": "ă",
+        "ầz": "â", "ẩz": "â", "ẫz": "â", "ấz": "â", "ậz": "â",
+        "èz": "e", "ẻz": "e", "ẽz": "e", "éz": "e", "ẹz": "e",
+        "ềz": "ê", "ểz": "ê", "ễz": "ê", "ếz": "ê", "ệz": "ê",
+        "ìz": "i", "ỉz": "i", "ĩz": "i", "íz": "i", "ịz": "i",
+        "òz": "o", "ỏz": "o", "õz": "o", "óz": "o", "ọz": "o",
+        "ồz": "ô", "ổz": "ô", "ỗz": "ô", "ốz": "ô", "ộz": "ô",
+        "ờz": "ơ", "ởz": "ơ", "ỡz": "ơ", "ớz": "ơ", "ợz": "ơ",
+        "ùz": "u", "ủz": "u", "ũz": "u", "úz": "u", "ụz": "u",
+        "ừz": "ư", "ửz": "ư", "ữz": "ư", "ứz": "ư", "ựz": "ư",
+        "ỳz": "y", "ỷz": "y", "ỹz": "y", "ýz": "y", "ỵz": "y",
+
+        "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", "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",
+        "uyene": "uyên", "uyete": "uyêt",
+        "yeme": "yêm", "yene": "yên", "yete": "yêt", "yeue": "yêu", "yenge": "yêng",
+        
+        "ăca": "âc", "ăma": "âm", "ăna": "ân", "ăpa": "âp", "ăta": "ât", "ănga": "âng",
+        "âcw": "ăc", "âmw": "ăm", "ânw": "ăn", "âpw": "ăp", "âtw": "ăt", "ângw": "ăng",
+        "ôiw": "ơi", "ômw": "ơm", "ônw": "ơn", "ôpw": "ơp", "ôtw": "ơt",
+        "ơio": "ôi", "ơmo": "ôm", "ơno": "ôn", "ơpo": "ôp", "ơto": "ôt",
+
+        "ăcw": "acw", "ămw": "amw", "ănw": "anw", "ăpw": "apw", "ătw": "atw", "ăngw": "angw",
+        "âca": "aca", "âma": "ama", "âna": "ana", "âpa": "apa", "âta": "ata", "âua": "aua", "âya": "aya", "ânga": "anga",
+        "ê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", "ư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",
+        "yême": "yeme", "yêne": "yene", "yête": "yete", "yêue": "yeue", "yênge": "yenge",
+        
+        "acs": "ác", "acj": "ạc",
+        "achs": "ách", "achj": "ạch",
+        "ais": "ái", "aif": "ài", "air": "ải", "aix": "ãi", "aij": "ại",
+        "ams": "ám", "amf": "àm", "amr": "ảm", "amx": "ãm", "amj": "ạm",
+        "ans": "án" , "anf": "àn", "anr": "ản", "anx": "ãn", "anj": "ạn",
+        "aos": "áo", "aof": "ào", "aor": "ảo", "aox": "ão", "aoj": "ạo",
+        "aps":"áp", "apj": "ạp",
+        "ats":"át", "atj": "ạt",
+        "aus":"áu", "auf": "àu", "aur": "ảu", "aux": "ãu", "auj": "ạu",
+        "ays": "áy", "ayf": "ày", "ayr": "ảy", "ayx": "ãy", "ayj": "ạy",
+        "angs": "áng", "angf": "àng", "angr": "ảng", "angx": "ãng", "angj": "ạng",
+        "anhs": "ánh", "anhf": "ành", "anhr": "ảnh", "anhx": "ãnh", "anhj": "ạnh",
+        
+        "ács": "acs", "ạcj": "acj",
+        "áchs": "achs", "ạchj": "achj",
+        "áis": "ais", "àif": "aif", "ảir": "air", "ãix": "aix", "ạij": "aij",
+        "áms": "ams", "àmf": "amf", "ảmr": "amr", "ãmx": "amx", "ạmj": "amj",
+        "áns": "ans", "ànf": "anf", "ảnr": "anr", "ãnx": "anx", "ạnj": "anj",
+        "áos": "aos", "àof": "aof", "ảor": "aor", "ãox": "aox", "ạoj":"aoj",
+        "áps": "aps", "ạpj": "apj",
+        "áts": "ats", "ạtj": "atj",
+        "áus": "aus", "àuf": "auf", "ảur": "aur", "ãux": "aux", "ạuj": "auj",
+        "áys": "ays", "àyf": "ayf", "ảyr": "ayr", "ãyx": "ayx", "ạyj": "ayj",
+        "ángs": "angs", "àngf": "angf", "ảngr": "angr", "ãngx": "angx", "ạngj": "angj",
+        "ánhs": "anhs", "ànhf": "anhf", "ảnhr": "anhr", "ãnhx": "anhx", "ạnhj": "anhj",
+        
+        "ecs": "éc", "ecj": "ẹc",
+        "ems": "ém", "emf": "èm", "emr": "ẻm", "emx": "ẽm", "emj": "ẹm", 
+        "ens": "én", "enf": "èn", "enr": "ẻn", "enx": "ẽn", "enj": "ẹn",
+        "eps": "ép", "epj": "ẹp",
+        "ets": "ét", "etj": "ẹt",
+        "engs": "éng", "engf": "èng", "engr": "ẻng", "engx": "ẽng", "engj": "ẹng",
+        "enhs": "énh", "enhf": "ènh", "enhr": "ẻnh", "enhx": "ẽnh", "enhj": "ẹnh",
+
+        "écs": "ecs", "ẹcj": "ecj",
+        "éms": "ems", "èmf": "emf", "ẻmr": "emr", "ẽmx": "emx", "ẹmj": "emj", 
+        "éns": "ens", "ènf": "enf","ẻnr": "enr", "ẽnx": "enx", "ẹnj": "enj",
+        "éps": "eps", "ẹpj": "epj",
+        "éts": "ets", "ẹtj": "etj",
+        "éngs": "engs", "èngf": "engf", "ẻngr": "engr", "ẽngx":"engx", "ẹngj": "engj",
+        "énhs": "enhs", "ènhf": "enhf", "ẻnhr": "enhr", "ẽnh": "enhx", "ẹnh": "enhj",
+
+        "ias": "ía", "iaf": "ìa", "iar": "ỉa", "iax": "ĩa", "iaj": "ịa",
+        "ics": "íc", "icj": "ịc",      
+        "ims": "ím", "imf": "ìm", "imr": "ỉm", "imx": "ĩm", "imj": "ịm",
+        "ins": "ín", "inf": "ìn", "inr": "ỉn", "inx": "ĩn", "inj": "ịn",
+        "ips": "íp", "ipj": "ịp",
+        "its": "ít", "itj": "ịt",
+        "ius": "íu", "iuf": "ìu", "iur": "ỉu", "iux": "ĩu", "iuj": "ịu",
+        "ichs": "ích", "ichj": "ịch",
+        "inhs": "ính", "inhf": "ình", "inhr": "ỉnh", "inhx": "ĩnh", "inhj": "ịnh",
+
+        "ías": "ias", "ìaf": "iaf", "ỉar": "iar", "ĩax": "iax", "ịaj": "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",
+        "íps": "ips", "ịpj": "ipj",
+        "íts": "its", "ịtj": "itj",
+        "íus": "ius", "ìuf": "iuf", "ỉur": "iur", "ĩux": "iux", "ịuj": "iuj",
+        "íchs": "ichs", "ịchj": "ichj",
+        "ínhs": "inhs", "ìnhf": "inhf", "ỉnhr": "inhr", "ĩnhx": "inhx", "ịnhj": "inhj",
+
+        "oas": "óa", "oaf": "òa", "oar": "ỏa", "oax": "õa", "oaj": "ọa",
+        "ocs": "óc", "ocj": "ọc",
+        "ois": "ói", "oif": "òi", "oir": "ỏi", "oix": "õi", "oij": "ọi",
+        "oms": "óm", "omf": "òm", "omr": "ỏm", "omx": "õm", "omj": "ọm",
+        "ons": "ón", "onf": "òn", "onr": "ỏn", "onx": "õn", "onj": "ọn",
+        "ops": "óp", "opj": "ọp",
+        "ots": "ót", "otj": "ọt",
+        "ongs": "óng", "ongf": "òng", "ongr": "ỏng", "ongx": "õng", "ongj": "ọng",
+
+        "óas": "oas", "òaf": "oaf", "ỏar": "oar", "õax": "oax", "ọaj": "oaj",
+        "ócs": "ocs", "ọcj": "ocj",
+        "óis": "ois", "òif": "oif", "ỏir": "oir", "õix": "oix", "ọij": "oij",
+        "óms": "oms", "òmf": "omf", "ỏmr": "omr", "õmx": "omx", "ọmj": "omj",
+        "óns": "ons", "ònf": "onf", "ỏnr": "onr", "õnx": "onx", "ọnj": "onj",
+        "óps": "ops", "ọpj": "opj",
+        "óts": "ots", "ọtj": "otj",
+        "óngs": "ongs", "òngf": "ongf", "ỏngr": "ongr", "õngx": "ongx", "ọngj": "ongj",
+
+        "uas": "úa", "uaf": "ùa", "uar": "ủa", "uax": "ũa", "uaj": "ụa",
+        "ucs": "úc", "ucj": "ục",
+        "uis": "úi", "uif": "ùi", "uir": "ủi", "uix": "ũi", "uij": "ụi",
+        "ums": "úm", "umf": "ùm", "umr": "ủm", "umx": "ũm", "umj": "ụm",     
+        "uns": "ún", "unf": "ùn", "unr": "ủn", "unx": "ũn", "unj": "ụn",
+        "ups": "úp", "upj": "ụp",
+        "uts": "út", "utj": "ụt",
+        "uus": "úu", "uuf": "ùu", "uur": "ủu", "uux": "ũu", "uuj": "ụu",
+        "uys": "úy", "uyf": "ùy", "uyr": "ủy", "uyx": "ũy", "uyj": "ụy",
+        "ungs": "úng", "ungf": "ùng", "ungr": "ủng", "ungx": "ũng", "ungj": "ụng",
+
+        "úas": "uas", "ùaf": "uaf", "ủar": "uar", "ũax": "uax", "ụaj": "uaj",
+        "úcs": "ucs", "ụcj": "ucj",
+        "úis": "uis", "ùif": "uif", "ủir": "uir", "ũix": "uix", "ụij": "uij",
+        "úms": "ums", "ùmf": "umf", "ủmr": "umr", "ũmx": "umx", "ụmj": "umj",
+        "úns": "uns", "ùnf": "unf", "ủnr": "unr", "ũnx": "unx", "ụnj": "unj",
+        "úps": "ups", "ụpj": "upj",
+        "úts": "uts", "ụtj": "utj",
+        "úus": "uus", "ùuf": "uuf", "ủur": "uur", "ũux": "uux", "ụuj": "uuj",
+        "úu ": "uus", "ùu ": "uuf", "ủu ": "uur", "ũu ": "uux", "ụu ": "uuj",
+        "úys": "uys", "ùyf": "uyf", "ủyr": "uyr", "ũyx": "uyx", "ụyj": "uyj",
+        "úngs": "ungs", "ùngf": "ungf", "ủngr": "ungr", "ũngx": "ungx", "ụngj": "ungj",
+
+        "ăcs": "ắc", "ăcj": "ặc",
+        "ácw": "ắc", "ạcw": "ặc",
+        "ăms": "ắm", "ămf": "ằm", "ămr": "ẳm", "ămx": "ẵm", "ămj": "ặm",
+        "ámw": "ắm", "àmw": "ằm", "ảmw": "ẳm", "ãmw": "ẵm", "ạmw": "ặm",
+        "ăns": "ắn", "ănf": "ằn", "ănr": "ẳn", "ănx": "ẵn", "ănj": "ặn",
+        "ánw": "ắn", "ànw": "ằn", "ảnw": "ẳn", "ãnw": "ẵn", "ạnw": "ặn",
+        "ăps": "ắp", "ăpj": "ặp",
+        "ápw": "ắp", "ạpw": "ặp",
+        "ăts": "ắt", "ătj": "ặt",
+        "átw": "ắt", "ạtw": "ặt",
+        "ăngs": "ắng", "ăngf": "ằng", "ăngr": "ẳng", "ăngx": "ẵng", "ăngj": "ặng",
+        "ángw": "ắng", "àngw": "ằng", "ảngw": "ẳng", "ãngw":"ẵng", "ạngw": "ặng",
+
+        "ắcw": "ácw", "ắcs": "ăcs", "ăcsw": "acsw", "ácws": "acws", 
+        "ặcw": "ạcw", "ặcj": "ăcj", "ăcjw": "acjw", "ạcwj": "acwj", 
+        "ắms": "ăms", "ắmw": "ámw", "ămsw": "amsw", "ámws": "amws", 
+        "ằmf": "ămf", "ằmw": "àmw", "ămfw": "amfw", "àmwf": "amwf",
+        "ẳmr": "ămr", "ẳmw": "ảmw", "ămrw": "amrw", "ảmwr": "amwr",
+        "ẵmx": "ămx", "ẵmw": "ãmw", "ămxw": "amxw", "ãmwx": "amwx", 
+        "ặmj": "ămj", "ặmw": "ạmw", "ămjw": "amjw", "ạmwj": "amwj",
+        "ắns": "ăns", "ắnw": "ánw", "ănsw": "answ", "ánws": "anws",
+        "ằnf": "ănf", "ằnw": "ànw", "ănfw": "anfw", "ànwf": "anwf", 
+        "ẳnr": "ănr", "ẳnw": "ảnw", "ănrw": "anrw", "ảnwr": "anwr",
+        "ẵnx": "ănx", "ẵnw": "ãnw", "ănxw": "anxw", "ãnwx": "anwx",
+        "ặnj": "ănj", "ặnw": "ạnw", "ănjw": "anjw", "ạnwj": "anwj",
+        "ắps": "ăps", "ắpw": "ápw", "ăpsw": "apsw", "ápws": "apws",
+        "ặpj": "ăpj", "ặpw": "ạpw", "ăpjw": "apjw", "ạpwj": "apwj",
+        "ắts": "ăts", "ắtw": "átw", "ătsw": "atws", "átws": "atws",
+        "ặtj": "ătj", "ặtw": "ạtw", "ătjw": "atjw", "ạtwj": "atwj",
+        "ắngs": "ăngs", "ắngw": "ángw", "ăngsw": "angsw", "ángws": "angws",
+        "ằngf": "ăngf", "ằngw": "àngw", "ăngfw": "angfw", "àngwf": "angwf",
+        "ẳngr": "ăngr", "ẳngw": "ảngw", "ăngrw": "angrw", "ảngwr": "angwr",
+        "ẵngx": "ăngx", "ẵngw": "ãngw", "ăngxw": "angxw", "ãngwx": "angwx",
+        "ặngj": "ăngj", "ặngw": "ạngw", "ăngjw": "angjw", "ạngwj": "angwj",
+
+        "âcs": "ấc", "âcj": "ậc",
+        "áca": "ấc", "ạca": "ậc",
+        "âms": "ấm", "âmf": "ầm", "âmr": "ẩm", "âmx": "ẫm", "âmj": "ậm",
+        "áma": "ấm", "àma": "ầm", "ảma": "ẩm", "ãma": "ẫm", "ạma": "ậm",
+        "âns": "ấn", "ânf": "ần", "ânr": "ẩn", "ânx": "ẫn", "ânj": "ận",
+        "ána": "ấn", "àna": "ần", "ảna": "ẩn", "ãna": "ẫn", "ạna": "ận",
+        "âps": "ấp", "âpj": "ập",
+        "ápa": "ấp", "ạpa": "ập",
+        "âts": "ất", "âtj": "ật",
+        "áta": "ất", "ạta": "ật",
+        "âus": "ấu", "âuf": "ầu", "âur": "ẩu", "âux": "ẫu", "âuj": "ậu",
+        "áua": "ấu", "àua": "ầu", "ảua": "ẩu", "ãua": "ẫu", "ạua": "ậu",
+        "âys": "ấy", "âyf": "ầy", "âyr": "ẩy", "âyx": "ẫy", "âyj": "ậy",
+        "áya": "ấy", "àya": "ầy", "ảya": "ẩy", "ãya": "ẫy", "ạya": "ậy",
+        "ângs": "ấng", "ângf": "ầng", "ângr": "ẩng", "ângx": "ẫng", "ângj": "ậng",
+        "ánga": "ấng", "ànga": "ầng", "ảnga": "ẩng", "ãnga": "ẫng", "ạnga": "ậng",
+
+        "ấcs": "âcs", "ấca": "áca", "âcsa": "acsa", "ácas": "acas",
+        "ậcj": "âcj", "ậca": "ạca", "âcja": "acja", "ạcaj": "acaj",
+        "ấms": "âms", "ấma": "áma", "âmsa": "amsa", "ámas": "amas", 
+        "ầmf": "âmf", "ầma": "àma", "âmfa": "amfa", "àmaf": "amaf",
+        "ẩmr": "âmr", "ẩma": "ảma", "âmra": "amra", "ảmar": "amar",
+        "ẫmx": "âmx", "ẫma": "ãma", "âmxa": "amxa", "ãmax": "amax", 
+        "ậmj": "âmj", "ậma": "ạma", "âmja": "amja", "ạmaj": "amaj",
+        "ấns": "âns", "ấna": "ána", "ânsa": "ansa", "ánas": "anas",
+        "ầnf": "ânf", "ầna": "àna", "ânfa": "anfa", "ànaf": "anaf", 
+        "ẩnr": "ânr", "ẩna": "ảna", "ânra": "anra", "ảnar": "anar",
+        "ẫnx": "ânx", "ẫna": "ãna", "ânxa": "anxa", "ãnax": "anax",
+        "ậnj": "ânj", "ậna": "ạna", "ânja": "anja", "ạnaj": "anaj",
+        "ấps": "âps", "ấpa": "ápa", "âpsa": "apsa", "ápas": "apas",
+        "ậpj": "âpj", "ậpa": "ạpa", "âpja": "apja", "ạpaj": "apaj",
+        "ấts": "âts", "ấta": "áta", "âtsa": "atas", "átas": "atas",
+        "ậtj": "âtj", "ậta": "ạta", "âtja": "atja", "ạtaj": "ataj",
+        "ấus": "âus", "ấua": "áua", "âusa": "ausa", "áuas": "auas", 
+        "ầuf": "âuf", "ầua": "àua", "âufa": "aufa", "àuaf": "auaf",
+        "ẩur": "âur", "ẩua": "ảua", "âura": "aura", "ảuar": "auar",
+        "ẫux": "âux", "ẫua": "ãua", "âuxa": "auxa", "ãuax": "auax", 
+        "ậuj": "âuj", "ậua": "ạua", "âuja": "auja", "ạuaj": "auaj",
+        "ấys": "âys", "ấya": "áya", "âysa": "aysa", "áyas": "ayas", 
+        "ầyf": "âyf", "ầya": "àya", "âyfa": "ayfa", "àyaf": "ayaf",
+        "ẩyr": "âyr", "ẩya": "ảya", "âyra": "ayra", "ảyar": "ayar",
+        "ẫyx": "âyx", "ẫya": "ãya", "âyxa": "ayxa", "ãyax": "ayax", 
+        "ậyj": "âyj", "ậya": "ạya", "âyja": "ayja", "ạyaj": "ayaj",
+        "ấngs": "ângs", "ấnga": "ánga", "ângsa": "angsa", "ángas": "angas", 
+        "ầngf": "ângf", "ầnga": "ànga", "ângfa": "angfa", "àngaf": "angaf",
+        "ẩngr": "ângr", "ẩnga": "ảnga", "ângra": "angra", "ảngar": "angar",
+        "ẫngx": "ângx", "ẫnga": "ãnga", "ângxa": "angxa", "ãngax": "angax", 
+        "ậngj": "ângj", "ậnga": "ạnga", "ângja": "angja", "ạngaj": "angaj",
+
+        "êcs": "ếc", "êcj": "ệc",
+        "éce": "ếc", "ẹce": "ệc",
+        "êms": "ếm", "êmf": "ềm", "êmr": "ểm", "êmx": "ễm", "êmj": "ệm",
+        "éme": "ếm", "ème": "ềm", "ẻme": "ểm", "ẽme": "ễm", "ẹme": "ệm",
+        "êns": "ến", "ênf": "ền", "ênr": "ển", "ênx": "ễn", "ênj": "ện",
+        "éne": "ến", "ène": "ền", "ẻne": "ển", "ẽne": "ễn", "ẹne": "ện",
+        "êps": "ếp", "êpj": "ệp",
+        "épe": "ếp", "ẹpe": "ệp",
+        "êts": "ết", "êtj": "ệt",
+        "éte": "ết", "ẹte": "ệt",
+        "êchs": "ếch", "êchj": "ệch",
+        "echs": "éch", "echj": "ẹch",
+        "éche": "ếch", "ẹche": "ệch",
+        "ênhs": "ếnh", "ênhf": "ềnh", "ênhr": "ểnh", "ênhx": "ễnh", "ênhj": "ệnh",
+        "énhe": "ếnh", "ènhe": "ềnh", "ẻnhe": "ểnh", "ẽnhe": "ễnh", "ẹnhe": "ệnh",
+
+        "ếms": "êms", "ếme": "éme", "êmse": "emse", "émes": "emes",
+        "ềmf": "êmf", "ềme": "ème", "êmfe": "emfe", "èmef": "emef",
+        "ểmr": "êmr", "ểme": "ẻme", "êmre": "emre", "ẻmer": "emer",
+        "ễmx": "êmx", "ễme": "ẽme", "êmxe": "emxe", "ẽmex": "emex",
+        "ệmj": "êmj", "ệme": "ẹme", "êmje": "emje", "ẹmej": "emej",
+        "ếns": "êns", "ếne": "éne", "ênse": "ense", "énes": "enes",
+        "ềnf": "ênf", "ềne": "ène", "ênfe": "enfe", "ènef": "enef", 
+        "ểnr": "ênr", "ểne": "ẻne", "ênre": "enre", "ẻner": "ener",
+        "ễnx": "ênx", "ễne": "ẽne", "ênxe": "enxe", "ẽnex": "enex",
+        "ệnj": "ênj", "ệne": "ẹne", "ênje": "enje", "ẹnej": "enej",
+        "ếps": "êps", "ếpe": "épe", "êpse": "epse", "épes": "epes",
+        "ệpj": "êpj", "ệpe": "ẹpe", "êpje": "epje", "ẹpej": "epej",
+        "ếts": "êts", "ếte": "éte", "êtse": "etes", "étes": "etes",
+        "ệtj": "êtj", "ệte": "ẹte", "êtje": "etje", "ẹtej": "etej",
+        "ếchs": "êchs", "ếche": "éche", "êchse": "eches", "éches": "eches",
+        "ệchj": "êchj", "ệche": "ẹche", "êchje": "echje", "ẹchej": "echej",
+        "ếnhs": "ênhs", "ếnhe": "énhe", "ênhse": "enhse", "énhes": "enhes",
+        "ềnhf": "ênhf", "ềnhe": "ènhe", "ênhfe": "enhfe", "ènhef": "enhef",
+        "ểnhr": "ênhr", "ểnhe": "ẻnhe", "ênhre": "enhre", "ẻnher": "enher",
+        "ễnhx": "ênhx", "ễnhe": "ẽnhe", "ênhxe": "enhxe", "ẽnhex": "enhex",
+        "ệnhj": "ênhj", "ệnhe": "ẹnhe", "ênhje": "enhje", "ẹnhej": "enhej",
+
+        "ôcs": "ốc", "ôcj": "ộc",
+        "óco": "ốc", "ọco": "ộc",
+        "ôis": "ối", "ôif": "ồi", "ôir": "ổi", "ôix": "ỗi", "ôij": "ội",
+        "óio": "ối", "òio": "ồi", "ỏio": "ổi", "õio": "ỗi", "ọio": "ội",
+        "ôms": "ốm", "ômf": "ồm", "ômr": "ổm", "ômx": "ỗm", "ômj": "ộm",
+        "ómo": "ốm", "òmo": "ồm", "ỏmo": "ổm", "õmo": "ỗm", "ọmo": "ộm",
+        "ôns": "ốn", "ônf": "ồn", "ônr": "ổn", "ônx": "ỗn", "ônj": "ộn",
+        "óno": "ốn", "òno": "ồn", "ỏno": "ổn", "õno": "ỗn", "ọno": "ộn",
+        "ôps": "ốp", "ôpj": "ộp",
+        "ópo": "ốp", "ọpo": "ộp",
+        "ôts": "ốt", "ôtj": "ột",
+        "óto": "ốt", "ọto": "ột",
+        "ôngs": "ống", "ôngf": "ồng", "ôngr": "ổng", "ôngx": "ỗng", "ôngj": "ộng",
+        "óngo": "ống", "òngo": "ồng", "ỏngo": "ổng", "õngo": "ỗng", "ọngo": "ộng",
+
+        "ốcs": "ôcs", "ốco": "óco", "ôcso": "ocso", "ócos": "ocos",       
+        "ộcj": "ôcj", "ộco": "ọco", "ôcjo": "ocjo", "ọcoj": "ocoj",
+        "ốis": "ôis", "ốio": "óio", "ôiso": "oiso", "óios": "oios",
+        "ồif": "ôif", "ồio": "òio", "ôifo": "oifo", "òiof": "oiof",
+        "ổir": "ôir", "ổio": "ỏio", "ôiro": "oiro", "ỏior": "oior",
+        "ỗix": "ôix", "ỗio": "õio", "ôixo": "oixo", "õiox": "oiox",
+        "ộij": "ôij", "ộio": "ọio", "ôijo": "oijo", "ọioj": "oioj",
+        "ốms": "ôms", "ốmo": "ómo", "ômso": "omso", "ómos": "omos",
+        "ồmf": "ômf", "ồmo": "òmo", "ômfo": "omfo", "òmof": "omof",
+        "ổmr": "ômr", "ổmo": "ỏmo", "ômro": "omro", "ỏmor": "omor",
+        "ỗmx": "ômx", "ỗmo": "õmo", "ômxo": "omxo", "õmox": "omox",
+        "ộmj": "ômj", "ộmo": "ọmo", "ômjo": "omjo", "ọmoj": "omoj",
+        "ốns": "ôns", "ốno": "óno", "ônso": "onso", "ónos": "onos",
+        "ồnf": "ônf", "ồno": "òno", "ônfo": "onfo", "ònof": "onof",
+        "ổnr": "ônr", "ổno": "ỏno", "ônro": "onro", "ỏnor": "onor",
+        "ỗnx": "ônx", "ỗno": "õno", "ônxo": "onxo", "õnox": "onox",
+        "ộnj": "ônj", "ộno": "ọno", "ônjo": "onjo", "ọnoj": "onoj",
+        "ốps": "ôps", "ốpo": "ópo", "ôpso": "opso", "ópos": "opos",       
+        "ộpj": "ôpj", "ộpo": "ọpo", "ôpjo": "opjo", "ọpoj": "opoj",
+        "ốts": "ôts", "ốto": "óto", "ôtso": "otso", "ótos": "otos",       
+        "ộtj": "ôtj", "ộto": "ọto", "ôtjo": "otjo", "ọtoj": "otoj",
+        "ốngs": "ôngs", "ốngo": "óngo", "ôngso": "ongso", "óngos": "ongos",
+        "ồngf": "ôngf", "ồngo": "òngo", "ôngfo": "ongfo", "òngof": "ongof",
+        "ổngr": "ôngr", "ổngo": "ỏngo", "ôngro": "ongro", "ỏngor": "ongor",
+        "ỗngx": "ôngx", "ỗngo": "õngo", "ôngxo": "ongxo", "õngox": "ongox",
+        "ộngj": "ôngj", "ộngo": "ọngo", "ôngjo": "ongjo", "ọngoj": "ongoj",
+
+        "ơ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",
+        "ómw": "ớm", "òmw": "ờm", "ỏmw": "ởm", "õmw": "ỡm", "ọmw": "ợm",
+        "ơns": "ớn", "ơnf": "ờn", "ơnr": "ởn", "ơnx": "ỡn", "ơnj": "ợn",
+        "ónw": "ớn", "ònw": "ờn", "ỏnw": "ởn", "õnw": "ỡn", "ọnw": "ợn",
+        "ơps": "ớp", "ơpj": "ợp",
+        "ópw": "ớp", "ọpw": "ợp",
+        "ơts": "ớt", "ơtj": "ợt",
+        "ótw": "ớt", "ọtw": "ợt",
+
+        "ớis": "ơis", "ớiw": "óiw", "ơisw": "oisw", "óiws": "oiws",
+        "ờif": "ơif", "ờiw": "òiw", "ơifw": "oifw", "òiwf": "oiwf",
+        "ởir": "ơir", "ởiw": "ỏiw", "ơirw": "oirw", "ỏiwr": "oiwr",
+        "ỡix": "ơix", "ỡiw": "õiw", "ơixw": "oixw", "õiwx": "oiwx",
+        "ợij": "ơij", "ợiw": "ọiw", "ơijw": "oijw", "ọiwj": "oiwj",
+        "ớms": "ơms", "ớmw": "ómw", "ơmsw": "omsw", "ómws": "omws",
+        "ờmf": "ơmf", "ờmw": "òmw", "ơmfw": "omfw", "òmwf": "omwf",
+        "ởmr": "ơmr", "ởmw": "ỏmw", "ơmrw": "omrw", "ỏmwr": "omwr",
+        "ỡmx": "ơmx", "ỡmw": "õmw", "ơmxw": "omxw", "õmwx": "omwx",
+        "ợmj": "ơmj", "ợmw": "ọmw", "ơmjw": "omjw", "ọmwj": "omwj",
+        "ớns": "ơns", "ớnw": "ónw", "ơnsw": "onsw", "ónws": "onws",
+        "ờnf": "ơnf", "ờnw": "ònw", "ơnfw": "onfw", "ònwf": "onwf",
+        "ởnr": "ơnr", "ởnw": "ỏnw", "ơnrw": "onrw", "ỏnwr": "onwr",
+        "ỡnx": "ơnx", "ỡnw": "õnw", "ơnxw": "onxw", "õnwx": "onwx",
+        "ợnj": "ơnj", "ợnw": "ọnw", "ơnjw": "onjw", "ọnwj": "onwj",
+        "ớps": "ơps", "ớpw": "ópw", "ơpsw": "opsw", "ópws": "opws",       
+        "ợpj": "ơpj", "ợpw": "ọpw", "ơpjw": "opjw", "ọpwj": "opwj",
+        "ớts": "ơts", "ớtw": "ótw", "ơtsw": "otsw", "ótws": "otws",       
+        "ợtj": "ơtj", "ợtw": "ọtw", "ơtjw": "otjw", "ọtwj": "otwj",
+
+        "ưas": "ứa", "ưaf": "ừa", "ưar": "ửa", "ưax": "ữa", "ưaj": "ựa",
+        "úaw": "ứa", "ùaw": "ừa", "ủaw": "ửa", "ũaw": "ữa", "ụaw": "ựa",
+        "ư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",
+        "úmw": "ứm", "ùmw": "ừm", "ủmw": "ửm", "ũmw": "ữm", "ụmw": "ựm",
+        "ưns": "ứn", "ưnf": "ừn", "ưnr": "ửn", "ưnx": "ữn", "ưnj": "ựn",
+        "únw": "ứn", "ùnw": "ừn", "ủnw": "ửn", "ũnw": "ữn", "ụnw": "ựn",
+        "ưts": "ứt", "ưtj": "ựt",
+        "útw": "ứt", "ụtw": "ựt",
+        "ưus": "ứu", "ưuf": "ừu", "ưur": "ửu", "ưux": "ữu", "ưuj": "ựu",
+        "úuw": "ứu", "ùuw": "ừu", "ủuw": "ửu", "ũuw": "ữu", "ụuw": "ựu",
+        "ưngs": "ứng", "ưngf": "ừng", "ưngr": "ửng", "ưngx": "ững", "ưngj": "ựng",
+        "úngw": "ứng", "ùngw": "ừng", "ủngw": "ửng", "ũngw": "ững", "ụngw": "ựng",
+
+        "ứas": "ưas", "ứaw": "úaw", "ưasw": "uasw", "úaws": "uaws",
+        "ừaf": "ưaf", "ừaw": "ùaw", "ưafw": "uafw", "ùawf": "uawf",
+        "ửar": "ưar", "ửaw": "ủaw", "ưarw": "uarw", "ủawr": "uawr",
+        "ữax": "ưax", "ữaw": "ũaw", "ưaxw": "uaxw", "ũawx": "uawx",
+        "ựaj": "ưaj", "ựaw": "ụaw", "ưajw": "uajw", "ụawj": "uawj",
+        "ứis": "ưis", "ứiw": "úiw", "ưisw": "uisw", "úiws": "uiws",
+        "ừif": "ưif", "ừiw": "ùiw", "ưifw": "uifw", "ùiwf": "uiwf",
+        "ửir": "ưir", "ửiw": "ủiw", "ưirw": "uirw", "ủiwr": "uiwr",
+        "ữix": "ưix", "ữiw": "ũiw", "ưixw": "uixw", "ũiwx": "uiwx",
+        "ựij": "ưij", "ựiw": "ụiw", "ưijw": "uijw", "ụiwj": "uiwj",
+        "ứms": "ưms", "ứmw": "úmw", "ưmsw": "umsw", "úmws": "umws",
+        "ừmf": "ưmf", "ừmw": "ùmw", "ưmfw": "umfw", "ùmwf": "umwf",
+        "ửmr": "ưmr", "ửmw": "ủmw", "ưmrw": "umrw", "ủmwr": "umwr",
+        "ữmx": "ưmx", "ữmw": "ũmw", "ưmxw": "umxw", "ũmwx": "umwx",
+        "ựmj": "ưmj", "ựmw": "ụmw", "ưmjw": "umjw", "ụmwj": "umwj",
+        "ứns": "ưns", "ứnw": "únw", "ưnsw": "unsw", "únws": "unws",
+        "ừnf": "ưnf", "ừnw": "ùnw", "ưnfw": "unfw", "ùnwf": "unwf",
+        "ửnr": "ưnr", "ửnw": "ủnw", "ưnrw": "unrw", "ủnwr": "unwr",
+        "ữnx": "ưnx", "ữnw": "ũnw", "ưnxw": "unxw", "ũnwx": "unwx",
+        "ựnj": "ưnj", "ựnw": "ụnw", "ưnjw": "unjw", "ụnwj": "unwj",
+        "ứts": "ưts", "ứtw": "útw", "ưtsw": "utsw", "útws": "utws",        
+        "ựtj": "ưtj", "ựtw": "ụtw", "ưtjw": "utjw", "ụtwj": "utwj",
+        "ứus": "ưus", "ứuw": "úuw", "ưusw": "uusw", "úuws": "uuws",
+        "ừuf": "ưuf", "ừuw": "ùuw", "ưufw": "uufw", "ùuwf": "uuwf",
+        "ửur": "ưur", "ửuw": "ủuw", "ưurw": "uurw", "ủuwr": "uuwr",
+        "ữux": "ưux", "ữuw": "ũuw", "ưuxw": "uuxw", "ũuwx": "uuwx",
+        "ựuj": "ưuj", "ựuw": "ụuw", "ưujw": "uujw", "ụuwj": "uuwj",
+        "ứngs": "ưngs", "ứngw": "úngw", "ưngsw": "ungsw", "úngws": "ungws",
+        "ừngf": "ưngf", "ừngw": "ùngw", "ưngfw": "ungfw", "ùngwf": "ungwf",
+        "ửngr": "ưngr", "ửngw": "ủngw", "ưngrw": "ungrw", "ủngwr": "ungwr",
+        "ữngx": "ưngx", "ữngw": "ũngw", "ưngxw": "ungxw", "ũngwx": "ungwx",
+        "ựngj": "ưngj", "ựngw": "ụngw", "ưngjw": "ungjw", "ụngwj": "ungwj",
+
+        "iems": "iém", "iemf": "ièm", "iemr": "iẻm", "iemx": "iẽm", "iemj": "iẹm",
+        "iéme": "iếm", "ième": "iềm", "iẻme": "iểm", "iẽme": "iễm", "iẹme": "iệm",
+        "iêms": "iếm", "iêmf": "iềm", "iêmr": "iểm", "iêmx": "iễm", "iêmj": "iệm",
+        "iens": "ién", "ienf": "ièn", "ienr": "iẻn", "ienx": "iẽn", "ienj": "iẹn",
+        "iéne": "iến", "iène": "iền", "iẻne": "iển", "iẽne": "iễn", "iẹne": "iện",
+        "iêns": "iến", "iênf": "iền", "iênr": "iển", "iênx": "iễn", "iênj": "iện",
+        "ieps": "iép", "iepj": "iẹp",
+        "iépe": "iếp", "iẹpe": "iệp",
+        "iêps": "iếp", "iêpj": "iệp",
+        "iets": "iét", "ietj": "iẹt",
+        "iéte": "iết", "iẹte": "iệt",
+        "iêts": "iết", "iêtj": "iệt",
+        "ieus": "iéu", "ieuf": "ièu", "ieur": "iẻu", "ieux": "iẽu", "ieuj": "iẹu",
+        "iéue": "iếu", "ièue": "iều", "iẻue": "iểu", "iẽue": "iễu", "iẹue": "iệu",
+        "iêus": "iếu", "iêuf": "iều", "iêur": "iểu", "iêux": "iễu", "iêuj": "iệu",
+        "iengs": "iéng", "iengf": "ièng", "iengr": "iẻng", "iengx": "iẽng", "iengj": "iẹng",
+        "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ế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",
+        "iễmx": "iêmx", "iễme": "iẽme", "iêmxe": "iemxe", "iẽmex": "iemex",
+        "iệmj": "iêmj", "iệme": "iẹme", "iêmje": "iemje", "iẹmej": "iemej",
+        "iếns": "iêns", "iếne": "iéne", "iênse": "iense", "iénes": "ienes",
+        "iềnf": "iênf", "iềne": "iène", "iênfe": "ienfe", "iènef": "ienef",
+        "iểnr": "iênr", "iểne": "iẻne", "iênre": "ienre", "iẻner": "iener",
+        "iễnx": "iênx", "iễne": "iẽne", "iênxe": "ienxe", "iẽnex": "ienex",
+        "iệnj": "iênj", "iệne": "iẹne", "iênje": "ienje", "iẹnej": "ienej",
+        "iếps": "iêps", "iếpe": "iépe", "iêpse": "iepse", "iépes": "iepes",
+        "iệpj": "iêpj", "iệpe": "iẹpe", "iêpje": "iepje", "iẹpej": "iepej",
+        "iếts": "iêts", "iếte": "iéte", "iêtse": "ietse", "iétes": "ietes",
+        "iệtj": "iêtj", "iệte": "iẹte", "iêtje": "ietje", "iẹtej": "ietej",
+        "iếus": "iêus", "iếue": "iéue", "iêuse": "ieuse", "iéues": "ieues",
+        "iềuf": "iêuf", "iềue": "ièue", "iêufe": "ieufe", "ièuef": "ieuef",
+        "iểur": "iêur", "iểue": "iẻue", "iêure": "ieure", "iẻuer": "ieuer",
+        "iễux": "iêux", "iễue": "iẽue", "iêuxe": "ieuxe", "iẽuex": "ieuex",
+        "iệuj": "iêuj", "iệue": "iẹue", "iêuje": "ieuje", "iẹuej": "ieuej",
+        "iếngs": "iêngs", "iếnge": "iénge", "iêngse": "iengse", "iénges": "ienges",
+        "iềngf": "iêngf", "iềnge": "iènge", "iêngfe": "iengfe", "ièngef": "iengef",
+        "iểngr": "iêngr", "iểnge": "iẻnge", "iêngre": "iengre", "iẻnger": "ienger",
+        "iễngx": "iêngx", "iễnge": "iẽnge", "iêngxe": "iengxe", "iẽngex": "iengex",
+        "iệngj": "iêngj", "iệnge": "iẹnge", "iêngje": "iengje", "iẹngej": "iengej",
+
+        "uyens": "uyén", "uyenf": "uyèn", "uyenr": "uyẻn", "uyenx": "uyẽn", "uyenj": "uyẹn",
+        "uyéne": "uyến", "uyène": "uyền", "uyẻne": "uyển", "uyẽne": "uyễn", "uyẹne": "uyện",
+        "uyêns": "uyến", "uyênf": "uyền", "uyênr": "uyển", "uyênx": "uyễn", "uyênj": "uyện",
+        "uyets": "uyét", "uyetf": "uyèt", "uyetr": "uyẻt", "uyetx": "uyẽt", "uyetj": "uyẹt",
+        "uyéte": "uyết", "uyète": "uyềt", "uyẻte": "uyểt", "uyẽte": "uyễt", "uyẹte": "uyệt",
+        "uyêts": "uyết", "uyêtf": "uyềt", "uyêtr": "uyểt", "uyêtx": "uyễt", "uyêtj": "uyệt",
+
+        "uyếns": "uyêns", "uyếne": "uyéne", "uyênse": "uyense", "uyénes": "uyenes",
+        "uyềnf": "uyênf", "uyềne": "uyène", "uyênfe": "uyenfe", "uyènef": "uyenef",
+        "uyểnr": "uyênr", "uyểne": "uyẻne", "uyênre": "uyenre", "uyẻner": "uyener",
+        "uyễnx": "uyênx", "uyễne": "uyẽne", "uyênxe": "uyenxe", "uyẽnex": "uyenex",
+        "uyệnj": "uyênj", "uyệne": "uyẹne", "uyênje": "uyenje", "uyẹnej": "uyenej",
+        "uyếts": "uyêts", "uyếte": "uyéte", "uyêtse": "uyetse", "uyétes": "uyetes",
+        "uyềtf": "uyêtf", "uyềte": "uyète", "uyêtfe": "uyetfe", "uyètef": "uyetef",
+        "uyểtr": "uyêtr", "uyểte": "uyẻte", "uyêtre": "uyetre", "uyẻter": "uyeter",
+        "uyễtx": "uyêtx", "uyễte": "uyẽte", "uyêtxe": "uyetxe", "uyẽtex": "uyetex",
+        "uyệtj": "uyêtj", "uyệte": "uyẹte", "uyêtje": "uyetje", "uyẹtej": "uyetej",
+
+        "uyts": "uýt", "uytj": "uỵt",
+        "uynhs": "uýnh", "uynhf": "uỳnh", "uynhr": "uỷnh", "uynhx": "uỹnh", "uynhj": "uỵnh",
+
+        "uýts": "uyts", "uỵtj": "uytj",
+        "uýnhs": "uynhs", "uỳnhf": "uynhf", "uỷnhr": "uynhr", "uỹnh": "uynhx", "uỵnhj": "uynhj",
+        
+        "uits": "uít", "uitj": "uịt",
+
+        "uíts": "uits", "uịtj": "uitj",
+
+        "uos": "úo", "uof": "ùo", "uor": "ủo", "uox": "ũo", "uoj": "ụo",
+        "úoc": "uóc", "ụoc": "uọc",
+        "uocs": "uóc", "uocj": "uọc",
+        "uócw": "ước", "uọcw": "ược",
+        "ươcs": "ước", "ươcj": "ược",
+        "úoi": "uói", "ùoi" : "uòi", "ủoi": "uỏi", "ũoi": "uõi", "ụoi": "uọi",
+        "uois": "uói", "uoif": "uòi", "uoir": "uỏi", "uoix": "uõi", "uoij": "uọi",
+        "uóiw": "ưới", "uòiw": "ười", "uỏiw": "ưởi", "uõiw": "ưỡi", "uọiw": "ượi",
+        "ươis": "ưới", "ươif": "ười", "ươir": "ưởi", "ươix": "ưỡi", "ươij": "ượi",
+        "úom": "uóm", "ùom" : "uòm", "ủom": "uỏm", "ũom": "uõm", "ụom": "uọm",
+        "uoms": "uóm", "uomf": "uòm", "uomr": "uỏm", "uomx": "uõm", "uomj": "uọm",
+        "uómw": "ướm", "uòmw": "ườm", "uỏmw": "ưởm", "uõmw": "ưỡm", "uọmw": "ượm",
+        "ươms": "ướm", "ươmf": "ườm", "ươmr": "ưởm", "ươmx": "ưỡm", "ươmj": "ượm",
+        "úon": "uón", "ùon" : "uòn", "ủon": "uỏn", "ũon": "uõn", "ụon": "uọn",
+        "uons": "uón", "uonf": "uòn", "uonr": "uỏn", "uonx": "uõn", "uonj": "uọn",
+        "uónw": "ướn", "uònw": "ườn", "uỏnw": "ưởn", "uõnw": "ưỡn", "uọnw": "ượn",
+        "ươns": "ướn", "ươnf": "ườn", "ươnr": "ưởn", "ươnx": "ưỡn", "ươnj": "ượn",
+        "úop": "uóp", "ụop": "uọp",
+        "uops": "uóp", "uopj": "uọp",
+        "uópw": "ướp", "uọpw": "ượp",
+        "ươps": "ướp", "ươpj": "ượp",
+        "úot": "uót", "ụot": "uọt",
+        "uots": "uót", "uotj": "uọt",
+        "uótw": "ướt", "uọtw": "ượt",
+        "ươts": "ướt", "ươtj": "ượt",
+        "úou": "uóu", "ùou" : "uòu", "ủou": "uỏu", "ũou": "uõu", "ụou": "uọu",
+        "uous": "uóu", "uouf": "uòu", "uour": "uỏu", "uoux": "uõu", "uouj": "uọu",
+        "uóuw": "ướu", "uòuw": "ườu", "uỏuw": "ưởu", "uõuw": "ưỡu", "uọuw": "ượu",
+        "ươus": "ướu", "ươuf": "ườu", "ươur": "ưởu", "ươux": "ưỡu", "ươuj": "ượu",
+        "úong": "uóng", "ùong" : "uòng", "ủong": "uỏng", "ũong": "uõng", "ụong": "uọng",
+        "uongs": "uóng", "uongf": "uòng", "uongr": "uỏng", "uongx": "uõng", "uongj": "uọng",
+        "uóngw": "ướng", "uòngw": "ường", "uỏngw": "ưởng", "uõngw": "ưỡng", "uọngw": "ượng",
+        "ươngs": "ướng", "ươngf": "ường", "ươngr": "ưởng", "ươngx": "ưỡng", "ươngj": "ượng",
+
+        "úos": "uos", "ùof": "uof", "ủor": "uor", "ũo": "uox", "ụoj": "uoj",
+        "uócs": "uocs", "uọcj": "uocj",
+        "ướcs": "ươcs", "ướcw": "uócw", "ươcsw": "uocsw", "uócws": "uocws",
+        "ượcj": "ươcj", "ượcw": "uọcw", "ươcjw": "uocjw", "uọcwj": "uocwj",
+        "uóis": "uois", "uòif": "uoif", "uỏir": "uoir", "uõix": "uoix", "uọij": "uoij",
+        "ướis": "ươis", "ướiw": "uóiw", "ươisw": "uoisw", "uóiws": "uoiws",
+        "ườif": "ươif", "ườiw": "uòiw", "ươifw": "uoifw", "uòiwf": "uoiwf", 
+        "ưởir": "ươir", "ưởiw": "uỏiw", "ươirw": "uoirw", "uỏiwr": "uoiwr", 
+        "ưỡix": "ươix", "ưỡiw": "uõiw", "ươixw": "uoixw", "uõiwx": "uoiwx", 
+        "ượij": "ươij", "ượiw": "uóiw", "ươijw": "uoijw", "uọiwj": "uoiwj",
+        "uóms": "uoms", "uòmf": "uomf", "uỏmr": "uomr", "uõmx": "uomx", "uọmj": "uomj",
+        "ướms": "ươms", "ướmw": "uómw", "ươmsw": "uomsw", "uómws": "uomws",
+        "ườmf": "ươmf", "ườmw": "uòmw", "ươmfw": "uomfw", "uòmwf": "uomwf", 
+        "ưởmr": "ươmr", "ưởmw": "uỏmw", "ươmrw": "uomrw", "uỏmwr": "uomwr", 
+        "ưỡmx": "ươmx", "ưỡmw": "uõmw", "ươmxw": "uomxw", "uõmwx": "uomwx", 
+        "ượmj": "ươmj", "ượmw": "uómw", "ươmjw": "uomjw", "uọmwj": "uomwj",
+        "uóns": "uons", "uònf": "uonf", "uỏnr": "uonr", "uõnx": "uonx", "uọnj": "uonj",
+        "ướns": "ươns", "ướnw": "uónw", "ươnsw": "uonsw", "uónws": "uonws",
+        "ườnf": "ươnf", "ườnw": "uònw", "ươnfw": "uonfw", "uònwf": "uonwf", 
+        "ưởnr": "ươnr", "ưởnw": "uỏnw", "ươnrw": "uonrw", "uỏnwr": "uonwr", 
+        "ưỡnx": "ươnx", "ưỡnw": "uõnw", "ươnxw": "uonxw", "uõnwx": "uonwx", 
+        "ượnj": "ươnj", "ượnw": "uónw", "ươnjw": "uonjw", "uọnwj": "uonwj",
+        "uóps": "uops", "uọpj": "uopj",
+        "ướps": "ươps", "ướpw": "uópw", "ươpsw": "uopsw", "uópws": "uopws",
+        "ượpj": "ươpj", "ượpw": "uọpw", "ươpjw": "uopjw", "uọpwj": "uopwj",
+        "uóts": "uots", "uọtj": "uotj",
+        "ướts": "ươts", "ướtw": "uótw", "ươtsw": "uotsw", "uótws": "uotws",
+        "ượtj": "ươtj", "ượtw": "uọtw", "ươtjw": "uotjw", "uọtwj": "uotwj",
+        "uóus": "uous", "uòuf": "uouf", "uỏur": "uour", "uõux": "uoux", "uọuj": "uouj",
+        "ướus": "ươus", "ướuw": "uóuw", "ươusw": "uousw", "uóuws": "uouws",
+        "ườuf": "ươuf", "ườuw": "uòuw", "ươufw": "uoufw", "uòuwf": "uouwf", 
+        "ưởur": "ươur", "ưởuw": "uỏuw", "ươurw": "uourw", "uỏuwr": "uouwr", 
+        "ưỡux": "ươux", "ưỡuw": "uõuw", "ươuxw": "uouxw", "uõuwx": "uouwx", 
+        "ượuj": "ươuj", "ượuw": "uóuw", "ươujw": "uoujw", "uọuwj": "uouwj",
+        "uóngs": "uongs", "uòngf": "uongf", "uỏngr": "uongr", "uõngx": "uongx", "uọngj": "uongj",
+        "ướngs": "ươngs", "ướngw": "uóngw", "ươngsw": "uongsw", "uóngws": "uongws",
+        "ườngf": "ươngf", "ườngw": "uòngw", "ươngfw": "uongfw", "uòngwf": "uongwf", 
+        "ưởngr": "ươngr", "ưởngw": "uỏngw", "ươngrw": "uongrw", "uỏngwr": "uongwr", 
+        "ưỡngx": "ươngx", "ưỡngw": "uõngw", "ươngxw": "uongxw", "uõngwx": "uongwx", 
+        "ượngj": "ươngj", "ượngw": "uóngw", "ươngjw": "uongjw", "uọngwj": "uongwj",
+
+        "uóco": "uốc", "uọco": "uộc",
+        "uôcs": "uốc", "uôcj": "uộc",
+        "uóio": "uối", "uòio": "uồi", "uỏio": "uổi", "uõio": "uỗi", "uọio": "uội",
+        "uôis": "uối", "uôif": "uồi", "uôir": "uổi", "uôix": "uỗi", "uôij": "uội",
+        "uómo": "uốm", "uòmo": "uồm", "uỏmo": "uổm", "uõmo": "uỗm", "uọmo": "uộm",
+        "uôms": "uốm", "uômf": "uồm", "uômr": "uổm", "uômx": "uỗm", "uômj": "uộm",
+        "uóno": "uốn", "uòno": "uồn", "uỏno": "uổn", "uõno": "uỗn", "uọno": "uộn",
+        "uôns": "uốn", "uônf": "uồn", "uônr": "uổn", "uônx": "uỗn", "uônj": "uộn",
+        "uópo": "uốp", "uọpo": "uộp",
+        "uôps": "uốp", "uôpj": "uộp",
+        "uóto": "uốt", "uọto": "uột",
+        "uôts": "uốt", "uôtj": "uột",
+        "uóuo": "uốu", "uòuo": "uồu", "uỏuo": "uổu", "uõuo": "uỗu", "uọuo": "uộu",
+        "uôus": "uốu", "uôuf": "uồu", "uôur": "uổu", "uôux": "uỗu", "uôuj": "uộu",
+        "uóngo": "uống", "uòngo": "uồng", "uỏngo": "uổng", "uõngo": "uỗng", "uọngo": "uộng",
+        "uôngs": "uống", "uôngf": "uồng", "uôngr": "uổng", "uôngx": "uỗng", "uôngj": "uộng",
+
+        "uốcs": "uôcs", "uốco": "uóco", "uôcso": "uocso", "uócos": "uocos",
+        "uộcj": "uôcj", "uộco": "uọco", "uôcjo": "uocjo", "uọcoj": "uocoj",
+        "uốis": "uôis", "uốio": "uóio", "uôiso": "uoiso", "uóios": "uoios",
+        "uồif": "uôif", "uồio": "uòio", "uôifo": "uoifo", "uòiof": "uoiof", 
+        "uổir": "uôir", "uổio": "uỏio", "uôiro": "uoiro", "uỏior": "uoior", 
+        "uỗix": "uôix", "uỗio": "uõio", "uôixo": "uoixo", "uõiox": "uoiox", 
+        "uộij": "uôij", "uộio": "uóio", "uôijo": "uoijo", "uọioj": "uoioj",
+        "uốms": "uôms", "uốmo": "uómo", "uômso": "uomso", "uómos": "uomos",
+        "uồmf": "uômf", "uồmo": "uòmo", "uômfo": "uomfo", "uòmof": "uomof", 
+        "uổmr": "uômr", "uổmo": "uỏmo", "uômro": "uomro", "uỏmor": "uomor", 
+        "uỗmx": "uômx", "uỗmo": "uõmo", "uômxo": "uomxo", "uõmox": "uomox", 
+        "uộmj": "uômj", "uộmo": "uómo", "uômjo": "uomjo", "uọmoj": "uomoj",
+        "uốns": "uôns", "uốno": "uóno", "uônso": "uonso", "uónos": "uonos",
+        "uồnf": "uônf", "uồno": "uòno", "uônfo": "uonfo", "uònof": "uonof", 
+        "uổnr": "uônr", "uổno": "uỏno", "uônro": "uonro", "uỏnor": "uonor", 
+        "uỗnx": "uônx", "uỗno": "uõno", "uônxo": "uonxo", "uõnox": "uonox", 
+        "uộnj": "uônj", "uộno": "uóno", "uônjo": "uonjo", "uọnoj": "uonoj",
+        "uốps": "uôps", "uốpo": "uópo", "uôpso": "uopso", "uópos": "uopos",
+        "uộpj": "uôpj", "uộpo": "uọpo", "uôpjo": "uopjo", "uọpoj": "uopoj",
+        "uốts": "uôts", "uốto": "uóto", "uôtso": "uotso", "uótos": "uotos",
+        "uộtj": "uôtj", "uộto": "uọto", "uôtjo": "uotjo", "uọtoj": "uotoj",
+        "uốus": "uôus", "uốuo": "uóuo", "uôuso": "uouso", "uóuos": "uouos",
+        "uồuf": "uôuf", "uồuo": "uòuo", "uôufo": "uoufo", "uòuof": "uouof", 
+        "uổur": "uôur", "uổuo": "uỏuo", "uôuro": "uouro", "uỏuor": "uouor", 
+        "uỗux": "uôux", "uỗuo": "uõuo", "uôuxo": "uouxo", "uõuox": "uouox", 
+        "uộuj": "uôuj", "uộuo": "uóuo", "uôujo": "uoujo", "uọuoj": "uouoj",
+        "uốngs": "uôngs", "uốngo": "uóngo", "uôngso": "uongso", "uóngos": "uongos",
+        "uồngf": "uôngf", "uồngo": "uòngo", "uôngfo": "uongfo", "uòngof": "uongof", 
+        "uổngr": "uôngr", "uổngo": "uỏngo", "uôngro": "uongro", "uỏngor": "uongor", 
+        "uỗngx": "uôngx", "uỗngo": "uõngo", "uôngxo": "uongxo", "uõngox": "uongox", 
+        "uộngj": "uôngj", "uộngo": "uóngo", "uôngjo": "uongjo", "uọngoj": "uongoj",
+
+        "yes": "ýe", "yef": "ỳe", "yer": "ỷe", "yex": "ỹe", "yej": "ỵe",
+        "ýem": "yém", "ỳem": "yèm", "ỷem": "yẻm", "ỹem": "yẽm", "ỵem": "yẹm",
+        "yems": "yém", "yemf": "yèm", "yemr": "yẻm", "yemx": "yẽm", "yemj": "yẹm",
+        "yêms": "yếm", "yêmf": "yềm", "yêmr": "yểm", "yêmx": "yễm", "yêmj": "yệm",
+        "yéme": "yếm", "yème": "yềm", "yẻme": "yểm", "yẽme": "yễm", "yẹme": "yệm",
+        "ýen": "yén", "ỳen": "yèn", "ỷen": "yẻn", "ỹen": "yẽn", "ỵen": "yẹn",
+        "yens": "yén", "yenf": "yèn", "yenr": "yẻn", "yenx": "yẽn", "yenj": "yẹn",
+        "yêns": "yến", "yênf": "yền", "yênr": "yển", "yênx": "yễn", "yênj": "yện",
+        "yéne": "yến", "yène": "yền", "yẻne": "yển", "yẽne": "yễn", "yẹne": "yện",
+        "ýet": "yét", "ỵet": "yẹt",
+        "yets": "yét", "yetj": "yẹt",
+        "yêts": "yết", "yêtj": "yệt",
+        "yéte": "yết", "yẹte": "yệt",
+        "ýeu": "yéu", "ỳeu": "yèu", "ỷeu": "yẻu", "ỹeu": "yẽu", "ỵeu": "yẹu",
+        "yeus": "yéu", "yeuf": "yèu", "yeur": "yẻu", "yeux": "yẽu", "yeuj": "yẹu",
+        "yêus": "yếu", "yêuf": "yều", "yêur": "yểu", "yêux": "yễu", "yêuj": "yệu",
+        "yéue": "yếu", "yèue": "yều", "yẻue": "yểu", "yẽue": "yễu", "yẹue": "yệu",
+        "ýeng": "yéng", "ỳeng": "yèng", "ỷeng": "yẻng", "ỹeng": "yẽng", "ỵeng": "yẹng",
+        "yengs": "yéng", "yengf": "yèng", "yengr": "yẻng", "yengx": "yẽng", "yengj": "yẹng",
+        "yêngs": "yếng", "yêngf": "yềng", "yêngr": "yểng", "yêngx": "yễng", "yêngj": "yệng",
+        "yénge": "yếng", "yènge": "yềng", "yẻnge": "yểng", "yẽnge": "yễng", "yẹnge": "yệng",
+        
+        "ýes": "yes", "ỳef": "yef", "ỷer": "yer", "ỹex": "yex", "ỵej": "yej",
+        "yếms": "yêms", "yếme": "yéme", "yêmse": "yemse", "yémes": "yemes",
+        "yềmf": "yêmf", "yềme": "yème", "yêmfe": "yemfe", "yèmef": "yemef",
+        "yểmr": "yêmr", "yểme": "yẻme", "yêmre": "yemre", "yẻmer": "yemer",
+        "yễmx": "yêmx", "yễme": "yẽme", "yêmxe": "yemxe", "yẽmex": "yemex",
+        "yệmj": "yêmj", "yệme": "yẹme", "yêmje": "yemje", "yẹmej": "yemej",
+        "yếns": "yêns", "yếne": "yéne", "yênse": "yense", "yénes": "yenes",
+        "yềnf": "yênf", "yềne": "yène", "yênfe": "yenfe", "yènef": "yenef",
+        "yểnr": "yênr", "yểne": "yẻne", "yênre": "yenre", "yẻner": "yener",
+        "yễnx": "yênx", "yễne": "yẽne", "yênxe": "yenxe", "yẽnex": "yenex",
+        "yệnj": "yênj", "yệne": "yẹne", "yênje": "yenje", "yẹnej": "yenej",
+        "yếts": "yêts", "yếte": "yéte", "yêtse": "yetse", "yétes": "yetes",        
+        "yệtj": "yêtj", "yệte": "yẹte", "yêtje": "yetje", "yẹtej": "yetej",
+        "yếus": "yêus", "yếue": "yéue", "yêuse": "yeuse", "yéues": "yeues",
+        "yềuf": "yêuf", "yềue": "yèue", "yêufe": "yeufe", "yèuef": "yeuef",
+        "yểur": "yêur", "yểue": "yẻue", "yêure": "yeure", "yẻuer": "yeuer",
+        "yễux": "yêux", "yễue": "yẽue", "yêuxe": "yeuxe", "yẽuex": "yeuex",
+        "yệuj": "yêuj", "yệue": "yẹue", "yêuje": "yeuje", "yẹuej": "yeuej",
+        "yếngs": "yêngs", "yếnge": "yénge", "yêngse": "yengse", "yénges": "yenges",
+        "yềngf": "yêngf", "yềnge": "yènge", "yêngfe": "yengfe", "yèngef": "yengef",
+        "yểngr": "yêngr", "yểnge": "yẻnge", "yêngre": "yengre", "yẻnger": "yenger",
+        "yễngx": "yêngx", "yễnge": "yẽnge", "yêngxe": "yengxe", "yẽngex": "yengex",
+        "yệngj": "yêngj", "yệnge": "yẹnge", "yêngje": "yengje", "yẹngej": "yengej"
+      }
+    }
+  ]
+}

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

@@ -9,6 +9,18 @@
     "license": "apache-2.0"
   },
   "currencySets": [
+    {
+      "id": "armenian_dram",
+      "label": "Armenian dram (֏)",
+      "slots": [
+        { "code": 1423, "label": "֏" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
     {
       "id": "azerbaijani_manat",
       "label": "Azerbaijani manat (₼)",

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

@@ -17,6 +17,26 @@
         "direction": "rtl",
         "modifier": "org.florisboard.layouts:arabic"
       },
+      {
+        "id": "western_armenian",
+        "label": "Armenian (Western)",
+        "authors": [ "PJTSearch" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:armenian"
+      },
+      {
+        "id": "eastern_armenian",
+        "label": "Armenian (Eastern)",
+        "authors": [ "PJTSearch" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:armenian"
+      },
+      {
+        "id": "azerbaijani",
+        "label": "Azerbaijani",
+        "authors": [ "nijatismayilzada" ],
+        "direction": "ltr"
+      },
       {
         "id": "azerty",
         "label": "AZERTY",
@@ -72,6 +92,12 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "colemak_dh",
+        "label": "ColemakDH",
+        "authors": [ "blucin" ],
+        "direction": "ltr"
+      },
       {
         "id": "danish",
         "label": "Danish (QWERTY)",
@@ -85,6 +111,13 @@
         "direction": "ltr",
         "modifier": "org.florisboard.layouts:dvorak"
       },
+      {
+        "id": "dvorak_es",
+        "label": "Dvorak (ÑÇ)",
+        "authors": [ "tsiflimagas" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:dvorak"
+      },
       {
         "id": "esperanto",
         "label": "Esperanto",
@@ -109,6 +142,12 @@
         "authors": [ "mahmoudk1000" ],
         "direction": "ltr"
       },
+      {
+        "id": "german2",
+        "label": "German (GBoard)",
+        "authors": [ "M-Koushan" ],
+        "direction": "rtl"
+      },
       {
         "id": "greek",
         "label": "Ελληνικά",
@@ -146,6 +185,12 @@
         "authors": [ "nd500" ],
         "direction": "ltr"
       },
+      {
+        "id": "indonesian",
+        "label": "Indonesian (QWERTY)",
+        "authors": [ "Linerly" ],
+        "direction": "ltr"
+      },
       {
         "id": "ipa",
         "label": "International Phonetic Alphabet",
@@ -223,6 +268,20 @@
         "direction": "rtl",
         "modifier": "org.florisboard.layouts:persian"
       },
+      {
+        "id": "persian2",
+        "label": "Persian2",
+        "authors": [ "M-Koushan" ],
+        "direction": "rtl",
+        "modifier": "org.florisboard.layouts:persian2"
+      },
+      {
+        "id": "persian3",
+        "label": "Persian3",
+        "authors": [ "SaeID-Rz" ],
+        "direction": "rtl",
+        "modifier": "org.florisboard.layouts:persian3"
+      },
       {
         "id": "qwerty",
         "label": "QWERTY",
@@ -346,6 +405,12 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "armenian",
+        "label": "Armenian",
+        "authors": [ "PJTSearch" ],
+        "direction": "ltr"
+      },
       {
         "id": "arabic",
         "label": "Arabic",
@@ -387,6 +452,18 @@
         "label": "Persian",
         "authors": [ "PHELAT" ],
         "direction": "rtl"
+      },
+      {
+        "id": "persian2",
+        "label": "Persian2",
+        "authors": [ "M-Koushan" ],
+        "direction": "rtl"
+      },
+      {
+        "id": "persian3",
+        "label": "Persian3",
+        "authors": [ "SaeID-Rz" ],
+        "direction": "rtl"
       }
     ],
     "extension": [
@@ -540,6 +617,13 @@
       }
     ],
     "symbols": [
+      {
+        "id": "armenian",
+        "label": "Armenian",
+        "authors": [ "PJTSearch" ],
+        "direction": "ltr",
+        "modifier": "org.florisboard.layouts:armenian"
+      },
       {
         "id": "cjk",
         "label": "CJK",
@@ -592,6 +676,12 @@
         "authors": [ "patrickgold" ],
         "direction": "ltr"
       },
+      {
+        "id": "armenian",
+        "label": "Armenian",
+        "authors": [ "PJTSearch" ],
+        "direction": "ltr"
+      },
       {
         "id": "cjk",
         "label": "CJK",

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

@@ -0,0 +1,46 @@
+[
+  [
+    { "$": "auto_text_key", "code":  113, "label": "q" },
+    { "$": "auto_text_key", "code":  252, "label": "ü" },
+    { "$": "auto_text_key", "code":  101, "label": "e" },
+    { "$": "auto_text_key", "code":  114, "label": "r" },
+    { "$": "auto_text_key", "code":  116, "label": "t" },
+    { "$": "auto_text_key", "code":  121, "label": "y" },
+    { "$": "auto_text_key", "code":  117, "label": "u" },
+    { "$": "case_selector",
+      "lower": { "code":  105, "label": "i" },
+      "upper": { "code":  304, "label": "İ" }
+    },
+    { "$": "auto_text_key", "code":  111, "label": "o" },
+    { "$": "auto_text_key", "code":  112, "label": "p" },
+    { "$": "auto_text_key", "code":  246, "label": "ö" },
+    { "$": "auto_text_key", "code":  287, "label": "ğ" }
+  ],
+  [
+    { "$": "auto_text_key", "code":   97, "label": "a" },
+    { "$": "auto_text_key", "code":  115, "label": "s" },
+    { "$": "auto_text_key", "code":  100, "label": "d" },
+    { "$": "auto_text_key", "code":  102, "label": "f" },
+    { "$": "auto_text_key", "code":  103, "label": "g" },
+    { "$": "auto_text_key", "code":  104, "label": "h" },
+    { "$": "auto_text_key", "code":  106, "label": "j" },
+    { "$": "auto_text_key", "code":  107, "label": "k" },
+    { "$": "auto_text_key", "code":  108, "label": "l" },
+    { "$": "case_selector",
+      "lower": { "code":  305, "label": "ı" },
+      "upper": { "code":   73, "label": "I" }
+    },
+    { "$": "auto_text_key", "code":  601, "label": "ə" }
+  ],
+  [
+    { "$": "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":  118, "label": "v" },
+    { "$": "auto_text_key", "code":   98, "label": "b" },
+    { "$": "auto_text_key", "code":  110, "label": "n" },
+    { "$": "auto_text_key", "code":  109, "label": "m" },
+    { "$": "auto_text_key", "code":  231, "label": "ç" },
+    { "$": "auto_text_key", "code":  351, "label": "ş" }
+  ]
+]

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

@@ -0,0 +1,46 @@
+[
+  [
+    { "$": "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":  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":  122, "label": "z" },
+    { "$": "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/dvorak.json

@@ -1,47 +1,47 @@
 [
   [
-    { "$": "variation_selector",
-      "default":  { "$": "case_selector",
-        "lower": { "code":   39, "label": "'", "popup": {
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   34, "label": "\"", "popup": {
+        "relevant": [
+          { "code":   33, "label": "!" },
+          { "code":   39, "label": "'"}
+        ]
+      } },
+      "default": { "$": "variation_selector",
+        "email":   { "code":   64, "label": "@" },
+        "uri":     { "code":   47, "label": "/" },
+        "default": { "code":   39, "label": "'", "popup": {
           "relevant": [
             { "code":   33, "label": "!" },
             { "code":   34, "label": "\"" }
           ]
-        } },
-        "upper": { "code":   34, "label": "\"", "popup": {
-          "relevant": [
-            { "code":   33, "label": "!" },
-            { "code":   39, "label": "'"}
-          ]
         } }
-      },
-      "email":    { "code":   64, "label": "@" },
-      "uri":      { "code":   47, "label": "/" }
+      }
     },
-    { "$": "case_selector",
-      "lower": { "code":   44, "label": ",", "popup": {
-        "relevant": [
-          { "code":   60, "label": "<" },
-          { "code":   63, "label": "?" }
-        ]
-      } },
-      "upper": { "code":   60, "label": "<", "popup": {
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   60, "label": "<", "popup": {
         "relevant": [
           { "code":   44, "label": "," },
           { "code":   63, "label": "?" }
         ]
+      } },
+      "default": { "code":   44, "label": ",", "popup": {
+        "relevant": [
+          { "code":   60, "label": "<" },
+          { "code":   63, "label": "?" }
+        ]
       } }
     },
-    { "$": "case_selector",
-      "lower": { "code":   46, "label": ".", "popup": {
-        "relevant": [
-          { "code":   62, "label": ">" }
-        ]
-      } },
-      "upper": { "code":   62, "label": ">", "popup": {
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   62, "label": ">", "popup": {
         "relevant": [
           { "code":   46, "label": "." }
         ]
+      } },
+      "default": { "code":   46, "label": ".", "popup": {
+        "relevant": [
+          { "code":   62, "label": ">" }
+        ]
       } }
     },
     { "$": "auto_text_key", "code":  112, "label": "p" },

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

@@ -0,0 +1,78 @@
+[
+  [
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   60, "label": "<", "popup": {
+        "relevant": [
+          { "code":   44, "label": "," },
+          { "code":   63, "label": "?" }
+        ]
+      } },
+      "default": { "code":   44, "label": ",", "popup": {
+        "relevant": [
+          { "code":   60, "label": "<" },
+          { "code":   63, "label": "?" }
+        ]
+      } }
+    },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   62, "label": ">", "popup": {
+        "relevant": [
+          { "code":   46, "label": "." }
+        ]
+      } },
+      "default": { "code":   46, "label": ".", "popup": {
+        "relevant": [
+          { "code":   62, "label": ">" }
+        ]
+      } }
+    },
+    { "$": "auto_text_key", "code":  241, "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":  104, "label": "h" },
+    { "$": "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":  114, "label": "r" },
+    { "$": "auto_text_key", "code":  116, "label": "t" },
+    { "$": "auto_text_key", "code":  110, "label": "n" },
+    { "$": "auto_text_key", "code":  115, "label": "s" },
+    { "$": "shift_state_selector",
+      "shiftedManual": { "code":   34, "label": "\"", "popup": {
+        "relevant": [
+          { "code":   33, "label": "!" },
+          { "code":   39, "label": "'"}
+        ]
+      } },
+      "default": { "$": "variation_selector",
+        "email":   { "code":   64, "label": "@" },
+        "uri":     { "code":   47, "label": "/" },
+        "default": { "code":   39, "label": "'", "popup": {
+          "relevant": [
+            { "code":   33, "label": "!" },
+            { "code":   34, "label": "\"" }
+          ]
+        } }
+      }
+    },
+    { "$": "auto_text_key", "code":  231, "label": "ç" }
+  ],
+  [
+    { "$": "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/eastern_armenian.json

@@ -0,0 +1,48 @@
+[
+  [
+    { "$": "auto_text_key", "code": 1393, "label": "ձ" },
+    { "$": "auto_text_key", "code": 1397, "label": "յ" },
+    { "$": "auto_text_key", "code": 1413, "label": "օ" },
+    { "$": "auto_text_key", "code": 1404, "label": "ռ" },
+    { "$": "auto_text_key", "code": 1386, "label": "ժ" },
+    { "$": "auto_text_key", "code": 1401, "label": "չ" },
+    { "$": "auto_text_key", "code": 1403, "label": "ջ" },
+    { "$": "auto_text_key", "code": 1411, "label": "փ" },
+    { "$": "auto_text_key", "code": 1394, "label": "ղ" },
+    { "$": "auto_text_key", "code": 1390, "label": "ծ" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1389, "label": "խ" },
+    { "$": "auto_text_key", "code": 1410, "label": "ւ" },
+    { "$": "auto_text_key", "code": 1383, "label": "է" },
+    { "$": "auto_text_key", "code": 1408, "label": "ր" },
+    { "$": "auto_text_key", "code": 1407, "label": "տ" },
+    { "$": "auto_text_key", "code": 1381, "label": "ե" },
+    { "$": "auto_text_key", "code": 1384, "label": "ը" },
+    { "$": "auto_text_key", "code": 1387, "label": "ի" },
+    { "$": "auto_text_key", "code": 1400, "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": 1412, "label": "ք" },
+    { "$": "auto_text_key", "code": 1392, "label": "հ" },
+    { "$": "auto_text_key", "code": 1395, "label": "ճ" },
+    { "$": "auto_text_key", "code": 1391, "label": "կ" },
+    { "$": "auto_text_key", "code": 1388, "label": "լ" },
+    { "$": "auto_text_key", "code": 1385, "label": "թ" }
+  ],
+  [
+    { "$": "auto_text_key", "code": 1382, "label": "զ" },
+    { "$": "auto_text_key", "code": 1409, "label": "ց" },
+    { "$": "auto_text_key", "code": 1379, "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/german2.json

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

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

@@ -2,44 +2,85 @@
   [
     { "code":   39, "label": "'", "popup": {
       "relevant": [
+        { "code": 1474, "label": "ש\u05c2" },
+        { "code": 1467, "label": "ס\u05bb" },
+        { "code": 1523, "label": "׳" },
+        { "code": 1524, "label": "״" },
         { "code":   34, "label": "\"" },
         { "code":   96, "label": "`" }
       ]
     } },
     { "code":   45, "label": "-", "popup": {
       "relevant": [
+        { "code": 1470, "label": "־" },
+        { "code": 1473, "label": "ש\u05c1" },
         { "code":   95, "label": "_" }
       ]
     } },
-    { "code":  1511, "label": "ק" },
+    { "code":  1511, "label": "ק", "popup": {
+      "relevant": [
+        { "code": 1464, "label": "ס\u05b8" },
+        { "code": 1459, "label": "ס\u05b3" }
+      ]
+    } },
     { "code":  1512, "label": "ר" },
     { "code":  1488, "label": "א" },
     { "code":  1496, "label": "ט" },
-    { "code":  1493, "label": "ו" },
+    { "code":  1493, "label": "ו", "popup": {
+      "relevant": [
+        { "code": 1465, "label": "ס\u05b9" }
+      ]
+    } },
     { "code":  1503, "label": "ן" },
     { "code":  1501, "label": "ם" },
-    { "code":  1508, "label": "פ" }
+    { "code":  1508, "label": "פ", "popup": {
+      "relevant": [
+        { "code": 1463, "label": "ס\u05b7" },
+        { "code": 1458, "label": "ס\u05b2" }
+      ]
+    } }
   ],
   [
-    { "code":  1513, "label": "ש" },
-    { "code":  1491, "label": "ד" },
+    { "code":  1513, "label": "ש", "popup": {
+      "relevant": [
+        { "code": 1456, "label": "ס\u05b0" }
+      ]
+    } },
+    { "code":  1491, "label": "ד", "popup": {
+      "relevant": [
+        { "code": 1468, "label": "ס\u05bc" }
+      ]
+    } },
     { "code":  1490, "label": "ג" },
     { "code":  1499, "label": "כ" },
     { "code":  1506, "label": "ע" },
     { "code":  1497, "label": "י" },
-    { "code":  1495, "label": "ח" },
+    { "code":  1495, "label": "ח", "popup": {
+      "relevant": [
+        { "code": 1460, "label": "ס\u05b4" }
+      ]
+    } },
     { "code":  1500, "label": "ל" },
     { "code":  1498, "label": "ך" },
     { "code":  1507, "label": "ף" }
   ],
   [
     { "code":  1494, "label": "ז" },
-    { "code":  1505, "label": "ס" },
+    { "code":  1505, "label": "ס", "popup": {
+      "relevant": [
+        { "code": 1462, "label": "ס\u05b6" },
+        { "code": 1457, "label": "ס\u05b1" }
+      ]
+    } },
     { "code":  1489, "label": "ב" },
     { "code":  1492, "label": "ה" },
     { "code":  1504, "label": "נ" },
     { "code":  1502, "label": "מ" },
-    { "code":  1510, "label": "צ" },
+    { "code":  1510, "label": "צ", "popup": {
+      "relevant": [
+        { "code": 1461, "label": "ס\u05b5" }
+      ]
+    } },
     { "code":  1514, "label": "ת" },
     { "code":  1509, "label": "ץ" }
   ]

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

@@ -55,9 +55,7 @@
    { "code":  1580, "label": "ج" },
    { "code":  1670, "label": "چ" },
    { "code":  1581, "label": "ح" },
-   { "code":  1593, "label": "ع", "popup": {
-     "main": { "code": 1551, "label": "؏" }
-   } },
+   { "code":  1593, "label": "ع" },
    { "code":  1576, "label": "ب" },
    { "code":  1606, "label": "ن" },
    { "code":  1605, "label": "م" }

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

@@ -48,7 +48,9 @@
 
   ],
   [
-
+    { "code": 1600, "label": "kashida", "popup":
+    { "main": { "code": 8204, "label": "half_space" }
+    } },
     { "code":  1574, "label": "ﺋ", "popup": {
       "main": { "code": 1569, "label": "ء" }
     } },
@@ -58,9 +60,14 @@
     } },
     { "code":  1688, "label": "ژ" },
     { "code":  1605, "label": "م" },
-    { "code":  1567, "label": "؟" },
-    { "code":  1548, "label": "،" },
-    { "code":  46, "label": "." }
-
+    { "code":  1567, "label": "؟", "popup": {
+      "main": { "code": 63, "label": "?" }
+    } },
+    { "code":  1548, "label": "،", "popup": {
+      "main": { "code": 1643, "label": "٫" }
+    } },
+    { "code":  58, "label": ":", "popup": {
+      "main": { "code": 1563, "label": "؛" }
+      } }
   ]
 ]

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

@@ -0,0 +1,36 @@
+[
+  [
+    { "code":  1589, "label": "ص" },
+    { "code":  1602, "label": "ق" },
+    { "code":  1601, "label": "ف" },
+    { "code":  1594, "label": "غ" },
+    { "code":  1593, "label": "ع" },
+    { "code":  1607, "label": "ه" },
+    { "code":  1582, "label": "خ" },
+    { "code":  1581, "label": "ح" },
+    { "code":  1580, "label": "ج" },
+    { "code":  1670, "label": "چ" }
+  ],
+  [
+    { "code":  1588, "label": "ش" },
+    { "code":  1587, "label": "س" },
+    { "code":  1740, "label": "ی" },
+    { "code":  1576, "label": "ب" },
+    { "code":  1604, "label": "ل" },
+    { "code":  1575, "label": "ا" },
+    { "code":  1578, "label": "ت" },
+    { "code":  1606, "label": "ن" },
+    { "code":  1605, "label": "م" },
+    { "code":  1705, "label": "ک" }
+  ],
+  [
+    { "code":  8204, "label": "half_space" },
+    { "code":  1591, "label": "ط" },
+    { "code":  1586, "label": "ز" },
+    { "code":  1585, "label": "ر" },
+    { "code":  1584, "label": "ذ" },
+    { "code":  1583, "label": "د" },
+    { "code":  1608, "label": "و" },
+    { "code":  1711, "label": "گ" }
+  ]
+]

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

@@ -0,0 +1,39 @@
+[
+  [
+    { "code":  1590, "label": "ض" },
+    { "code":  1589, "label": "ص" },
+    { "code":  1579, "label": "ث" },
+    { "code":  1602, "label": "ق" },
+    { "code":  1601, "label": "ف" },
+    { "code":  1594, "label": "غ" },
+    { "code":  1593, "label": "ع" },
+    { "code":  1607, "label": "ه" },
+    { "code":  1582, "label": "خ" },
+    { "code":  1581, "label": "ح" },
+    { "code":  1580, "label": "ج" }
+  ],
+  [
+    { "code":  1588, "label": "ش" },
+    { "code":  1587, "label": "س" },
+    { "code":  1740, "label": "ی" },
+    { "code":  1576, "label": "ب" },
+    { "code":  1604, "label": "ل" },
+    { "code":  1575, "label": "ا" },
+    { "code":  1578, "label": "ت" },
+    { "code":  1606, "label": "ن" },
+    { "code":  1605, "label": "م" },
+    { "code":  1705, "label": "ک" },
+    { "code":  1711, "label": "گ" }
+  ],
+  [
+    { "code":  1592, "label": "ظ" },
+    { "code":  1591, "label": "ط" },
+    { "code":  1586, "label": "ز" },
+    { "code":  1585, "label": "ر" },
+    { "code":  1584, "label": "ذ" },
+    { "code":  1583, "label": "د" },
+    { "code":  1662, "label": "پ" },
+    { "code":  1608, "label": "و" },
+    { "code":  1670, "label": "چ" }
+  ]
+]

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

@@ -4,7 +4,7 @@
     { "code":  1608, "label": "و" },
     { "code":  1593, "label": "ع" },
     { "code":  1585, "label": "ر" },
-    { "code":  1587, "label": "ت" },
+    { "code":  1578, "label": "ت" },
     { "code":  1746, "label": "ے" },
     { "code":  1569, "label": "ء" },
     { "code":  1740, "label": "ی" },
@@ -27,7 +27,7 @@
     { "code":  1588, "label": "ش" },
     { "code":  1670, "label": "چ" },
     { "code":  1591, "label": "ط" },
-    { "code":  1576, "label": "پ" },
+    { "code":  1576, "label": "ب" },
     { "code":  1606, "label": "ن" },
     { "code":  1605, "label": "م" }
   ]

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

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

@@ -0,0 +1,20 @@
+[
+  [
+    { "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" },
+    { "$": "variation_selector",
+      "default":  { "code":   44, "label": ",", "groupId": 1 },
+      "email":    { "code":   64, "label": "@", "groupId": 1 },
+      "uri":      { "code":   47, "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" },
+    { "code": 1417, "label": "։", "groupId": 2 },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

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

@@ -1,8 +1,5 @@
 [
   [
-    { "code": 1600, "label": "kashida", "popup":
-    { "main": { "code": 8204, "label": "half_space" }
-    } },
     { "code":    0, "type": "placeholder" },
     { "code":   -7, "label": "delete", "type": "enter_editing" }
   ],

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

@@ -0,0 +1,19 @@
+[
+  [
+    { "code":    0, "type": "placeholder" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -202, "label": "view_symbols", "type": "system_gui" },
+    { "code": -227, "label": "language_switch", "type": "system_gui" },
+    { "code": -212, "label": "ime_ui_mode_media", "type": "system_gui" },
+    { "$": "variation_selector",
+      "default":  { "code": 1548, "label": "،", "groupId": 1 },
+      "email":    { "code":   64, "label": "@", "groupId": 1 },
+      "uri":      { "code":   47, "label": "/", "groupId": 1 }
+    },
+    { "code":   32, "label": "space" },
+    { "code":   46, "label": ".", "groupId": 2 },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

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

@@ -0,0 +1,19 @@
+[
+  [
+    { "code":    0, "type": "placeholder" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -202, "label": "view_symbols", "type": "system_gui" },
+    { "$": "variation_selector",
+      "default":  { "code": 1548, "label": "،", "groupId": 1 },
+      "email":    { "code":   64, "label": "@", "groupId": 1 },
+      "uri":      { "code":   47, "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" },
+    { "code":   46, "label": ".", "groupId": 2 },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

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

@@ -1,8 +1,14 @@
 [
   [
-    { "code":   40, "label": "(" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(" },
+      "rtl": { "code":   41, "label": "(" }
+    },
     { "code":   47, "label": "/" },
-    { "code":   41, "label": ")" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")" },
+      "rtl": { "code":   40, "label": ")" }
+    },
     { "code":   45, "label": "-" }
   ],
   [

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

@@ -0,0 +1,92 @@
+[
+  [
+    { "code":   64, "label": "@" },
+    { "code":   35, "label": "#", "popup": {
+      "main": { "code": 8470, "label": "№" }
+    } },
+    { "code": -801, "label": "currency_slot_1", "popup": {
+      "main": { "code": -802, "label": "currency_slot_2" },
+      "relevant": [
+        { "code": -806, "label": "currency_slot_6" },
+        { "code": -803, "label": "currency_slot_3" },
+        { "code": -804, "label": "currency_slot_4" },
+        { "code": -805, "label": "currency_slot_5" }
+      ]
+    } },
+    { "code":   37, "label": "%", "popup": {
+      "main": { "code": 8240, "label": "‰" },
+      "relevant": [
+        { "code": 8453, "label": "℅" }
+      ]
+    } },
+    { "code":   38, "label": "&" },
+    { "code":   45, "label": "-", "popup": {
+      "main": { "code":   95, "label": "_" },
+      "relevant": [
+        { "code": 8212, "label": "—" },
+        { "code": 8211, "label": "–" },
+        { "code":  183, "label": "·" }
+      ]
+    } },
+    { "code":   43, "label": "+", "popup": {
+      "main": { "code":  177, "label": "±" }
+    } },
+    { "code":   40, "label": "(", "popup": {
+      "main": { "code":   60, "label": "<" },
+      "relevant": [
+        { "code":   91, "label": "[" },
+        { "code":  123, "label": "{" }
+      ]
+    } },
+    { "code":   41, "label": ")", "popup": {
+      "main": { "code":   62, "label": ">" },
+      "relevant": [
+        { "code":   93, "label": "]" },
+        { "code":  125, "label": "}" }
+      ]
+    } },
+    { "code":   47, "label": "/" }
+  ],
+  [
+    { "code":   42, "label": "*", "popup": {
+      "main": { "code": 8224, "label": "†" },
+      "relevant": [
+        { "code": 9733, "label": "★" },
+        { "code": 8225, "label": "‡" }
+      ]
+    } },
+    { "code":   171, "label": "«", "popup": {
+      "main": { "code": 34, "label": "\"" },
+      "relevant": [
+        { "code": 8221, "label": "”" },
+        { "code": 8222, "label": "„" },
+        { "code": 8220, "label": "“" },
+        { "code": 8249, "label": "‹" }
+      ]
+    } },
+    { "code":   187, "label": "»", "popup": {
+      "main": { "code": 39, "label": "'" },
+      "relevant": [
+        { "code": 8217, "label": "’" },
+        { "code": 8218, "label": "‚" },
+        { "code": 8216, "label": "‘" },
+        { "code": 8250, "label": "›" }
+      ]
+    } },
+    { "code": 1373, "label": "՝", "popup": {
+      "main": { "code":  58, "label": ":" }
+    } },
+    { "code":   46, "label": "." },
+    { "code": 1372, "label": "՜", "popup": {
+      "main": { "code":  33, "label": "!" }
+    } },
+    { "code": 1374, "label": "՞", "popup": {
+      "main": { "code":  63, "label": "?" },
+      "relevant": [
+        { "code":  191, "label": "¿" },
+        { "code": 8253, "label": "‽" }
+      ]
+    } },
+    { "code": 1371, "label": "՛" }
+  ]
+]

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

@@ -32,22 +32,42 @@
     { "code":   43, "label": "+", "popup": {
       "main": { "code":  177, "label": "±" }
     } },
-    { "code":   40, "label": "(", "popup": {
-      "main": { "code":64830, "label": "﴾" },
-      "relevant": [
-        { "code":   91, "label": "[" },
-        { "code":   60, "label": "<" },
-        { "code":  123, "label": "{" }
-      ]
-    } },
-    { "code":   41, "label": ")", "popup": {
-      "main": { "code":64831, "label": "﴿" },
-      "relevant": [
-        { "code":   93, "label": "]" },
-        { "code":   62, "label": ">" },
-        { "code":  125, "label": "}" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(", "popup": {
+        "main": { "code":64830, "label": "﴾" },
+        "relevant": [
+          { "code":   91, "label": "[" },
+          { "code":   60, "label": "<" },
+          { "code":  123, "label": "{" }
+        ]
+      } },
+      "rtl": { "code":   41, "label": "(", "popup": {
+        "main": { "code":64830, "label": "﴾" },
+        "relevant": [
+          { "code":   93, "label": "[" },
+          { "code":   62, "label": "<" },
+          { "code":  125, "label": "{" }
+        ]
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")", "popup": {
+        "main": { "code":64831, "label": "﴿" },
+        "relevant": [
+          { "code":   93, "label": "]" },
+          { "code":   62, "label": ">" },
+          { "code":  125, "label": "}" }
+        ]
+      } },
+      "rtl": { "code":   40, "label": ")", "popup": {
+        "main": { "code":64831, "label": "﴿" },
+        "relevant": [
+          { "code":   91, "label": "]" },
+          { "code":   60, "label": ">" },
+          { "code":  123, "label": "}" }
+        ]
+      } }
+    },
     { "code":   47, "label": "/" }
   ],
   [

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

@@ -2,12 +2,24 @@
   [
     { "code": 8230, "label": "…" },
     { "code":   95, "label": "_" },
-    { "code":   91, "label": "[" },
-    { "code":   93, "label": "]" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   91, "label": "[" },
+      "rtl": { "code":   93, "label": "[" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   93, "label": "]" },
+      "rtl": { "code":   91, "label": "]" }
+    },
     { "code":   94, "label": "^" },
     { "code":   33, "label": "!" },
-    { "code":   60, "label": "<" },
-    { "code":   62, "label": ">" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   60, "label": "<" },
+      "rtl": { "code":   62, "label": "<" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   62, "label": ">" },
+      "rtl": { "code":   60, "label": ">" }
+    },
     { "code":   61, "label": "=" },
     { "code":   38, "label": "&" },
     { "code":  383, "label": "ſ" }
@@ -15,12 +27,24 @@
   [
     { "code":   92, "label": "\\" },
     { "code":   47, "label": "/" },
-    { "code":  123, "label": "{" },
-    { "code":  125, "label": "}" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  123, "label": "{" },
+      "rtl": { "code":  125, "label": "{" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  125, "label": "}" },
+      "rtl": { "code":  123, "label": "}" }
+    },
     { "code":   42, "label": "*" },
     { "code":   63, "label": "?" },
-    { "code":   40, "label": "(" },
-    { "code":   41, "label": ")" },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(" },
+      "rtl": { "code":   41, "label": "(" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")" },
+      "rtl": { "code":   40, "label": ")" }
+    },
     { "code":   45, "label": "-" },
     { "code":   58, "label": ":" },
     { "code":   64, "label": "@" }

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

@@ -32,22 +32,42 @@
     { "code":   43, "label": "+", "popup": {
       "main": { "code":  177, "label": "±" }
     } },
-    { "code":   40, "label": "(", "popup": {
-      "main": { "code":64830, "label": "﴾" },
-      "relevant": [
-        { "code":   91, "label": "[" },
-        { "code":   60, "label": "<" },
-        { "code":  123, "label": "{" }
-      ]
-    } },
-    { "code":   41, "label": ")", "popup": {
-      "main": { "code":64831, "label": "﴿" },
-      "relevant": [
-        { "code":   93, "label": "]" },
-        { "code":   62, "label": ">" },
-        { "code":  125, "label": "}" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(", "popup": {
+        "main": { "code":64830, "label": "﴾" },
+        "relevant": [
+          { "code":   91, "label": "[" },
+          { "code":   60, "label": "<" },
+          { "code":  123, "label": "{" }
+        ]
+      } },
+      "rtl": { "code":   41, "label": "(", "popup": {
+        "main": { "code":64830, "label": "﴾" },
+        "relevant": [
+          { "code":   93, "label": "[" },
+          { "code":   62, "label": "<" },
+          { "code":  125, "label": "{" }
+        ]
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")", "popup": {
+        "main": { "code":64831, "label": "﴿" },
+        "relevant": [
+          { "code":   93, "label": "]" },
+          { "code":   62, "label": ">" },
+          { "code":  125, "label": "}" }
+        ]
+      } },
+      "rtl": { "code":   40, "label": ")", "popup": {
+        "main": { "code":64831, "label": "﴿" },
+        "relevant": [
+          { "code":   91, "label": "]" },
+          { "code":   60, "label": ">" },
+          { "code":  123, "label": "}" }
+        ]
+      } }
+    },
     { "code": 1643, "label": "٫", "popup": {
       "main": { "code": 1644, "label": "٬" },
       "relevant": [

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

@@ -31,20 +31,38 @@
     { "code":   43, "label": "+", "popup": {
       "main": { "code":  177, "label": "±" }
     } },
-    { "code":   40, "label": "(", "popup": {
-      "main": { "code":   60, "label": "<" },
-      "relevant": [
-        { "code":   91, "label": "[" },
-        { "code":  123, "label": "{" }
-      ]
-    } },
-    { "code":   41, "label": ")", "popup": {
-      "main": { "code":   62, "label": ">" },
-      "relevant": [
-        { "code":   93, "label": "]" },
-        { "code":  125, "label": "}" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(", "popup": {
+        "main": { "code":   60, "label": "<" },
+        "relevant": [
+          { "code":   91, "label": "[" },
+          { "code":  123, "label": "{" }
+        ]
+      } },
+      "rtl": { "code":   41, "label": "(", "popup": {
+        "main": { "code":   62, "label": "<" },
+        "relevant": [
+          { "code":   93, "label": "[" },
+          { "code":  125, "label": "{" }
+        ]
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")", "popup": {
+        "main": { "code":   62, "label": ">" },
+        "relevant": [
+          { "code":   93, "label": "]" },
+          { "code":  125, "label": "}" }
+        ]
+      } },
+      "rtl": { "code":   40, "label": ")", "popup": {
+        "main": { "code":   60, "label": ">" },
+        "relevant": [
+          { "code":   91, "label": "]" },
+          { "code":  123, "label": "}" }
+        ]
+      } }
+    },
     { "code":   47, "label": "/" }
   ],
   [

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

@@ -43,20 +43,38 @@
     { "code":   43, "label": "+", "popup": {
       "main": { "code":  177, "label": "±" }
     } },
-    { "code":   40, "label": "(", "popup": {
-      "main": { "code":   60, "label": "<" },
-      "relevant": [
-        { "code":   91, "label": "[" },
-        { "code":  123, "label": "{" }
-      ]
-    } },
-    { "code":   41, "label": ")", "popup": {
-      "main": { "code":   62, "label": ">" },
-      "relevant": [
-        { "code":   93, "label": "]" },
-        { "code":  125, "label": "}" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   40, "label": "(", "popup": {
+        "main": { "code":   60, "label": "<" },
+        "relevant": [
+          { "code":   91, "label": "[" },
+          { "code":  123, "label": "{" }
+        ]
+      } },
+      "rtl": { "code":   41, "label": "(", "popup": {
+        "main": { "code":   62, "label": "<" },
+        "relevant": [
+          { "code":   93, "label": "[" },
+          { "code":  125, "label": "{" }
+        ]
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   41, "label": ")", "popup": {
+        "main": { "code":   62, "label": ">" },
+        "relevant": [
+          { "code":   93, "label": "]" },
+          { "code":  125, "label": "}" }
+        ]
+      } },
+      "rtl": { "code":   40, "label": ")", "popup": {
+        "main": { "code":   60, "label": ">" },
+        "relevant": [
+          { "code":   91, "label": "]" },
+          { "code":  123, "label": "}" }
+        ]
+      } }
+    },
     { "code":   47, "label": "/" }
   ],
   [

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

@@ -56,12 +56,22 @@
         { "code": 8776, "label": "≈" }
       ]
     } },
-    { "code":  123, "label": "{", "popup": {
-      "main": { "code":   40, "label": "(" }
-    } },
-    { "code":  125, "label": "}", "popup": {
-      "main": { "code":   41, "label": ")" }
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  123, "label": "{", "popup": {
+        "main": { "code":   40, "label": "(" }
+      } },
+      "rtl": { "code":  125, "label": "{", "popup": {
+        "main": { "code":   41, "label": "(" }
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  125, "label": "}", "popup": {
+        "main": { "code":   41, "label": ")" }
+      } },
+      "rtl": { "code":  123, "label": "}", "popup": {
+        "main": { "code":   40, "label": ")" }
+      } }
+    },
     { "code":   92, "label": "\\" }
   ],
   [
@@ -70,7 +80,13 @@
     { "code":  174, "label": "®" },
     { "code": 8482, "label": "™" },
     { "code": 10003, "label": "✓" },
-    { "code":   91, "label": "[" },
-    { "code":   93, "label": "]" }
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   91, "label": "[" },
+      "rtl": { "code":   93, "label": "[" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   93, "label": "]" },
+      "rtl": { "code":   91, "label": "]" }
+    }
   ]
 ]

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

@@ -56,12 +56,22 @@
         { "code": 8776, "label": "≈" }
       ]
     } },
-    { "code":  123, "label": "{", "popup": {
-      "main": { "code":   40, "label": "(" }
-    } },
-    { "code":  125, "label": "}", "popup": {
-      "main": { "code":   41, "label": ")" }
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  123, "label": "{", "popup": {
+        "main": { "code":   40, "label": "(" }
+      } },
+      "rtl": { "code":  125, "label": "{", "popup": {
+        "main": { "code":   41, "label": "(" }
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  125, "label": "}", "popup": {
+        "main": { "code":   41, "label": ")" }
+      } },
+      "rtl": { "code":  123, "label": "}", "popup": {
+        "main": { "code":   40, "label": ")" }
+      } }
+    },
     { "code":   92, "label": "\\" }
   ],
   [
@@ -70,7 +80,13 @@
     { "code":  174, "label": "®" },
     { "code": 8482, "label": "™" },
     { "code": 10003, "label": "✓" },
-    { "code":   91, "label": "[" },
-    { "code":   93, "label": "]" }
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   91, "label": "[" },
+      "rtl": { "code":   93, "label": "[" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   93, "label": "]" },
+      "rtl": { "code":   91, "label": "]" }
+    }
   ]
 ]

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

@@ -56,12 +56,22 @@
         { "code": 8776, "label": "≈" }
       ]
     } },
-    { "code":  123, "label": "{", "popup": {
-      "main": { "code":   40, "label": "(" }
-    } },
-    { "code":  125, "label": "}", "popup": {
-      "main": { "code":   41, "label": ")" }
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  123, "label": "{", "popup": {
+        "main": { "code":   40, "label": "(" }
+      } },
+      "rtl": { "code":  125, "label": "{", "popup": {
+        "main": { "code":   41, "label": "(" }
+      } }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":  125, "label": "}", "popup": {
+        "main": { "code":   41, "label": ")" }
+      } },
+      "rtl": { "code":  123, "label": "}", "popup": {
+        "main": { "code":   40, "label": ")" }
+      } }
+    },
     { "code":   92, "label": "\\" }
   ],
   [
@@ -70,7 +80,13 @@
     { "code":  174, "label": "®" },
     { "code": 8482, "label": "™" },
     { "code": 10003, "label": "✓" },
-    { "code":   91, "label": "[" },
-    { "code":   93, "label": "]" }
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   91, "label": "[" },
+      "rtl": { "code":   93, "label": "[" }
+    },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   93, "label": "]" },
+      "rtl": { "code":   91, "label": "]" }
+    }
   ]
 ]

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

@@ -6,24 +6,44 @@
   ],
   [
     { "code": -201, "label": "view_characters", "type": "system_gui" },
-    { "code":   60, "label": "<", "popup": {
-      "relevant": [
-        { "code":  171, "label": "«" },
-        { "code": 8804, "label": "≤" },
-        { "code": 8249, "label": "‹" },
-        { "code":10216, "label": "⟨" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   60, "label": "<", "popup": {
+        "relevant": [
+          { "code":  171, "label": "«" },
+          { "code": 8804, "label": "≤" },
+          { "code": 8249, "label": "‹" },
+          { "code":10216, "label": "⟨" }
+        ]
+      } },
+      "rtl": { "code":   62, "label": "<", "popup": {
+        "relevant": [
+          { "code":  187, "label": "«" },
+          { "code": 8805, "label": "≤" },
+          { "code": 8250, "label": "‹" },
+          { "code":10217, "label": "⟨" }
+        ]
+      } }
+    },
     { "code": -205, "label": "view_numeric_advanced", "type": "system_gui" },
     { "code":   32, "label": "space" },
-    { "code":   62, "label": ">", "popup": {
-      "relevant": [
-        { "code":10217, "label": "⟩" },
-        { "code": 8250, "label": "›" },
-        { "code": 8805, "label": "≥" },
-        { "code":  187, "label": "»" }
-      ]
-    } },
+    { "$": "layout_direction_selector",
+      "ltr": { "code":   62, "label": ">", "popup": {
+        "relevant": [
+          { "code":10217, "label": "⟩" },
+          { "code": 8250, "label": "›" },
+          { "code": 8805, "label": "≥" },
+          { "code":  187, "label": "»" }
+        ]
+      } },
+      "rtl": { "code":   60, "label": ">", "popup": {
+        "relevant": [
+          { "code":10216, "label": "⟩" },
+          { "code": 8249, "label": "›" },
+          { "code": 8804, "label": "≥" },
+          { "code":  171, "label": "»" }
+        ]
+      } }
+    },
     { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
   ]
 ]

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

@@ -0,0 +1,17 @@
+[
+  [
+    { "code": -203, "label": "view_symbols2", "type": "system_gui" },
+    { "code":    0, "type": "placeholder" },
+    { "code":   -7, "label": "delete", "type": "enter_editing" }
+  ],
+  [
+    { "code": -201, "label": "view_characters", "type": "system_gui" },
+    { "code":   44, "label": "," },
+    { "code": -205, "label": "view_numeric_advanced", "type": "system_gui" },
+    { "code":   32, "label": "space" },
+    { "code": 1417, "label": "։", "popup": {
+      "main": { "code": 46, "label": "." }
+    } },
+    { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+  ]
+]

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

@@ -2,9 +2,9 @@
   "$": "ime.extension.keyboard",
   "meta": {
     "id": "org.florisboard.localization",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "title": "Default subtype presets / popup mappings",
-    "description": "Default subptye presets and popup mappings which are always available.",
+    "description": "Default subtype presets and popup mappings which are always available.",
     "maintainers": [ "patrickgold <patrick@patrickgold.dev>" ],
     "license": "apache-2.0"
   },
@@ -13,176 +13,63 @@
     "org.florisboard.currencysets",
     "org.florisboard.layouts"
   ],
-  "popupMappings": [
+  "punctuationRules": [
     {
       "id": "default",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "ar",
-      "authors": [ "HeiWiper" ]
-    },
-    {
-      "id": "bg",
-      "authors": [ "iorvethe" ]
-    },
-    {
-      "id": "ca",
-      "authors": [ "mikelloc" ]
-    },
-    {
-      "id": "ckb",
-      "authors": [ "GoRaN" ]
-    },
-    {
-      "id": "cs",
-      "authors": [ "stefan-misik" ]
-    },
-    {
-      "id": "da",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "de",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "de-DE-neobone",
-      "authors": [ "ostrya" ]
-    },
-    {
-      "id": "el",
-      "authors": [ "tsiflimagas" ]
-    },
-    {
-      "id": "en",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "eo",
-      "authors": [ "jeremiah-miller" ]
-    },
-    {
-      "id": "es",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "fa",
-      "authors": [ "PHELAT" ]
-    },
-    {
-      "id": "fi",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "fo",
-      "authors": [ "BinFlush" ]
-    },
-    {
-      "id": "fr",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "hr",
-      "authors": [ "hedidnothingwrong" ]
-    },
-    {
-      "id": "hu",
-      "authors": [ "zoli111, gabik65" ]
-    },
-    {
-      "id": "is",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "it",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "iw",
-      "authors": [ "Antony" ]
-    },
-    {
-      "id": "ja-JP-jis",
-      "authors": [ "waelwindows" ]
-    },
-    {
-      "id": "ko",
-      "authors": [ "patrickgold", "Hayleia" ]
-    },
-    {
-      "id": "ku",
-      "authors": [ "GoRaN" ]
-    },
-    {
-      "id": "lt",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "lv",
-      "authors": [ "patrickgold", "eandersons" ]
-    },
-    {
-      "id": "nb",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "nn",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "pl",
-      "authors": [ "Mikołaj Biel" ]
-    },
-    {
-      "id": "pt",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "pt-BR",
-      "authors": [ "rickym7" ]
-    },
-    {
-      "id": "ro",
-      "authors": [ "bertin0" ]
-    },
-    {
-      "id": "ru",
-      "authors": [ "williamtheaker", "33kk" ]
-    },
-    {
-      "id": "rue",
-      "authors": [ "svvvst" ]
-    },
-    {
-      "id": "sk",
-      "authors": [ "stefan-misik", "majso" ]
-    },
-    {
-      "id": "sr",
-      "authors": [ "hedidnothingwrong", "GrbavaCigla" ]
-    },
-    {
-      "id": "sv",
-      "authors": [ "patrickgold" ]
-    },
-    {
-      "id": "tr",
-      "authors": [ "kisekinopureya", "patrickgold", "dvrnynr" ]
-    },
-    {
-      "id": "uk",
-      "authors": [ "williamtheaker", "33kk" ]
-    },
-    {
-      "id": "ur-PK",
-      "authors": [ "mubashir-rehman", "mirfatif" ]
-    },
-    {
-      "id": "vi-VN",
-      "authors": [ "patrickgold", "Hayleia" ]
+      "label": "Default",
+      "symbolsPrecedingSpace": ".*[.,;:!?‽&%)\\]}»©®™\\p{L}0-9]",
+      "symbolsFollowingSpace": "[\\p{L}0-9].*"
     }
   ],
+  "popupMappings": [
+    { "id": "default", "authors": [ "patrickgold" ] },
+    { "id": "ar", "authors": [ "HeiWiper" ] },
+    { "id": "bg", "authors": [ "iorvethe" ] },
+    { "id": "ca", "authors": [ "mikelloc" ] },
+    { "id": "ckb", "authors": [ "GoRaN" ] },
+    { "id": "cs", "authors": [ "stefan-misik" ] },
+    { "id": "da", "authors": [ "patrickgold" ] },
+    { "id": "de", "authors": [ "patrickgold" ] },
+    { "id": "de-DE-neobone", "authors": [ "ostrya" ] },
+    { "id": "el", "authors": [ "tsiflimagas" ] },
+    { "id": "en", "authors": [ "patrickgold" ] },
+    { "id": "eo", "authors": [ "jeremiah-miller" ] },
+    { "id": "es", "authors": [ "patrickgold" ] },
+    { "id": "fa", "authors": [ "PHELAT" ] },
+    { "id": "fa2", "authors": [ "M-Koushan" ] },
+    { "id": "fa3", "authors": [ "SaeID-Rz" ] },
+    { "id": "fi", "authors": [ "patrickgold" ] },
+    { "id": "fo", "authors": [ "BinFlush" ] },
+    { "id": "fr", "authors": [ "patrickgold" ] },
+    { "id": "hr", "authors": [ "hedidnothingwrong" ] },
+    { "id": "hu", "authors": [ "zoli111, gabik65" ] },
+    { "id": "hy", "authors": [ "PJTSearch" ] },
+    { "id": "id", "authors": [ "Linerly" ] },
+    { "id": "is", "authors": [ "patrickgold" ] },
+    { "id": "it", "authors": [ "patrickgold" ] },
+    { "id": "iw", "authors": [ "Antony" ] },
+    { "id": "ja-JP-jis", "authors": [ "waelwindows" ] },
+    { "id": "ko", "authors": [ "patrickgold", "Hayleia" ] },
+    { "id": "ku", "authors": [ "GoRaN" ] },
+    { "id": "lt", "authors": [ "patrickgold" ] },
+    { "id": "lv", "authors": [ "patrickgold", "eandersons" ] },
+    { "id": "nb", "authors": [ "patrickgold" ] },
+    { "id": "nn", "authors": [ "patrickgold" ] },
+    { "id": "pl", "authors": [ "Mikołaj Biel" ] },
+    { "id": "pt", "authors": [ "patrickgold" ] },
+    { "id": "pt-BR", "authors": [ "rickym7" ] },
+    { "id": "ro", "authors": [ "bertin0" ] },
+    { "id": "ru", "authors": [ "williamtheaker", "33kk" ] },
+    { "id": "rue", "authors": [ "svvvst" ] },
+    { "id": "sk", "authors": [ "stefan-misik", "majso" ] },
+    { "id": "sr", "authors": [ "hedidnothingwrong", "GrbavaCigla" ] },
+    { "id": "sv", "authors": [ "patrickgold" ] },
+    { "id": "tr", "authors": [ "kisekinopureya", "patrickgold", "dvrnynr" ] },
+    { "id": "uk", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
+    { "id": "uk-cyr-ext", "authors": [ "williamtheaker", "33kk", "honsiorovskyi" ] },
+    { "id": "ur-PK", "authors": [ "mubashir-rehman", "mirfatif" ] },
+    { "id": "vi-VN", "authors": [ "patrickgold", "Hayleia" ] }
+  ],
   "subtypePresets": [
     {
       "languageTag": "en-US",
@@ -393,6 +280,15 @@
         "characters": "org.florisboard.layouts:danish"
       }
     },
+    {
+      "languageTag": "id",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:dollar",
+      "popupMapping": "org.florisboard.localization:id",
+      "preferred": {
+        "characters": "org.florisboard.layouts:qwerty"
+      }
+    },
     {
       "languageTag": "is-IS",
       "composer": "org.florisboard.composers:appender",
@@ -423,6 +319,30 @@
         "numericRow": "org.florisboard.layouts:persian"
       }
     },
+    {
+      "languageTag": "fa-FA",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:rial",
+      "popupMapping": "org.florisboard.localization:fa2",
+      "preferred": {
+        "characters": "org.florisboard.layouts:persian2",
+        "symbols": "org.florisboard.layouts:persian",
+        "symbols2": "org.florisboard.layouts:persian",
+        "numericRow": "org.florisboard.layouts:persian"
+      }
+    },
+    {
+      "languageTag": "fa-FA",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:rial",
+      "popupMapping": "org.florisboard.localization:fa3",
+      "preferred": {
+        "characters": "org.florisboard.layouts:persian3",
+        "symbols": "org.florisboard.layouts:persian",
+        "symbols2": "org.florisboard.layouts:persian",
+        "numericRow": "org.florisboard.layouts:western_arabic"
+      }
+    },
     {
       "languageTag": "ar",
       "composer": "org.florisboard.composers:appender",
@@ -435,6 +355,15 @@
         "numericRow": "org.florisboard.layouts:eastern_arabic"
       }
     },
+    {
+      "languageTag": "az",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:azerbaijani_manat",
+      "popupMapping": "org.florisboard.localization:tr",
+      "preferred": {
+        "characters": "org.florisboard.layouts:azerbaijani"
+      }
+    },
     {
       "languageTag": "hu",
       "composer": "org.florisboard.composers:appender",
@@ -462,6 +391,26 @@
         "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:western_armenian",
+        "symbols": "org.florisboard.layouts:armenian"
+      }
+    },
+    {
+      "languageTag": "hy",
+      "composer": "org.florisboard.composers:appender",
+      "currencySet": "org.florisboard.currencysets:armenian_dram",
+      "popupMapping": "org.florisboard.localization:hy",
+      "preferred": {
+        "characters": "org.florisboard.layouts:eastern_armenian",
+        "symbols": "org.florisboard.layouts:armenian"
+      }
+    },
     {
       "languageTag": "ru",
       "composer": "org.florisboard.composers:appender",
@@ -660,7 +609,7 @@
     },
     {
       "languageTag": "vi-VN",
-      "composer": "org.florisboard.composers:basic-telex",
+      "composer": "org.florisboard.composers:telex",
       "currencySet": "org.florisboard.currencysets:vietnamese_dong",
       "popupMapping": "org.florisboard.localization:vi-VN",
       "preferred": {

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

@@ -90,7 +90,7 @@
   },
   "uri": {
     "~right": {
-      "main": { "code": -255, "label": ".ir"},
+      "main": { "code": -255, "label": ".sa"},
       "relevant": [
         { "code": -255, "label": ".gov" },
         { "code": -255, "label": ".edu" },

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

@@ -18,8 +18,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -91,8 +91,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -11,16 +11,18 @@
       ]
     },
     "ی": {
+      "main": { "code": 1610, "label": "ي" },
       "relevant": [
         { "code": 1746, "label": "ے" },
         { "code": 1741, "label": "ۍ" },
-        { "code": 1744, "label": "ې" },
-        { "code": 1610, "label": "ي" },
-        { "code": 1597, "label": "ؽ" }
+        { "code": 1744, "label": "ې" }
       ]
     },
 
-
+    "ێ": {
+      "main": { "code": 1597, "label": "ؽ" }
+    },
+    
     "ﺋ": {
       "relevant": [
         { "code": 65163, "label": "ﺋ" },
@@ -118,19 +120,23 @@
     "~right": {
       "main": { "code": 1567, "label": "؟" },
       "relevant": [
-        { "code": 64, "label": "@" },
-        { "code": 35, "label": "#" },
+        { "code": 40, "label": "(" },
+        { "code": 41, "label": ")" },
+        { "code":  171, "label": "«" },
+        { "code":  187, "label": "»" },
+        { "code": 60, "label": "<" },
+        { "code": 62, "label": ">" },
+        { "code": 1642, "label": "٪" },
+        { "code":   35, "label": "#" },
         { "code": 42, "label": "*" },
-        { "code": 1563, "label": "؛" },
-        { "code": 59, "label": ";" },
-        { "code": 58, "label": ":" },
-        { "code": 44, "label": "," },
-        { "code": 1549, "label": "؍" },
         { "code": 45, "label": "-" },
         { "code": 95, "label": "_" },
-        { "code": 1600, "label": "▬" },
-        { "code": 33, "label": "!" },
-        { "code": 1548, "label": "،" }
+        { "code": 1563, "label": "؛" },
+        { "code": 58, "label": ":" },
+        { "code": 1549, "label": "؍" },
+        { "code": 1643, "label": "٫" },
+        { "code": 1548, "label": "،" },
+        { "code": 33, "label": "!" }
       ]
     }
   },

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

@@ -88,8 +88,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -106,8 +106,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -85,8 +85,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -52,8 +52,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -80,8 +80,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -63,8 +63,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -88,8 +88,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -8,12 +8,12 @@
       ]
     },
     "ا": {
+      "main": { "code": 1570, "label": "آ"},
       "relevant": [
         { "code": 1649, "label": "ٱ" },
         { "code": 1569, "label": "ء" },
         { "code": 1571, "label": "أ" },
-        { "code": 1573, "label": "إ" },
-        { "code": 1570, "label": "آ" }
+        { "code": 1573, "label": "إ" }
       ]
     },
     "ه": {

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

@@ -0,0 +1,99 @@
+{
+  "all": {
+    "ص": {
+       "relevant": [
+        { "code": 1590, "label": "ض" }
+      ]
+    },
+    "half_space": {
+       "relevant": [
+        { "code": 1622, "label": "ٖ" },
+        { "code": 1648, "label": "ٰ" },
+        { "code": 1619, "label": "ٓ" },
+        { "code": 1615, "label": "ُ" },
+        { "code": 1616, "label": "ِ" },
+        { "code": 1614, "label": "َ" },
+        { "code": 1600, "label": "ـ" },
+        { "code": 1621, "label": "ٕ" },
+        { "code": 1618, "label": "ْ" },
+        { "code": 1617, "label": "ّ" },
+        { "code": 1612, "label": "ٌ" },
+        { "code": 1613, "label": "ٍ" },
+        { "code": 1620, "label": "ٔ" }
+      ]
+    },
+    "ی": {
+      "relevant": [
+        { "code": 1574, "label": "ئ" },
+        { "code": 1610, "label": "ي" },
+        { "code": 1746, "label": "ے" }
+      ]
+    },
+    "ا": {
+      "main": { "code": 1570, "label": "آ"},
+      "relevant": [
+        { "code": 1649, "label": "ٱ" },
+        { "code": 1569, "label": "ء" },
+        { "code": 1571, "label": "أ" },
+        { "code": 1573, "label": "إ" }
+      ]
+    },
+    "ه": {
+      "relevant": [
+        { "code": 1729, "label": "ہ" },
+        { "code": 1728, "label": "ۀ" },
+        { "code": 1726, "label": "ھ" }
+      ]
+    },
+    "ت": {
+      "relevant": [
+        { "code": 1579, "label": "ث" }
+      ]
+    },
+    "ک": {
+      "relevant": [
+        { "code": 1706, "label": "ڪ"}
+      ]
+    },
+    "ط": {
+      "relevant": [
+        { "code": 1592, "label": "ظ" }
+      ]
+    },
+    "ز": {
+      "relevant": [
+        { "code": 1688, "label": "ژ" }
+      ]
+    },
+    "و": {
+      "relevant": [
+        { "code": 1572, "label": "ؤ" }
+      ]
+    },
+    "گ": {
+      "relevant": [
+        { "code": 1662, "label": "پ" }
+      ]
+    },
+    "~right": {
+      "main": { "code": 1567, "label": "؟"},
+      "relevant": [
+        { "code": 1563, "label": "؛" },
+        { "code": 58, "label": ":"},
+        { "code": 33, "label": "!" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".ir"},
+      "relevant": [
+        { "code": -255, "label": ".gov" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".edu" },
+        { "code": -255, "label": ".com" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

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

@@ -0,0 +1,69 @@
+{
+  "all": {
+    "ی": {
+      "main": { "code": 1574, "label": "ئ" },
+      "relevant": [
+        { "code": 1610, "label": "ي" },
+        { "code": 1746, "label": "ے" }
+      ]
+    },
+    "ا": {
+      "main": { "code": 1570, "label": "آ" },
+      "relevant": [
+        { "code": 1649, "label": "ٱ" },
+        { "code": 1569, "label": "ء" },
+        { "code": 1571, "label": "أ" },
+        { "code": 1573, "label": "إ" }
+      ]
+    },
+    "ه": {
+      "relevant": [
+        { "code": 1729, "label": "ہ" },
+        { "code": 1728, "label": "ۀ" },
+        { "code": 1726, "label": "ھ" }
+      ]
+    },
+    "ت": {
+      "relevant": [
+        { "code": 1577, "label": "ة" }
+      ]
+    },
+    "ک": {
+      "relevant": [
+        { "code": 1706, "label": "ڪ"}
+      ]
+    },
+    "ز": {
+      "relevant": [
+        { "code": 1688, "label": "ژ" }
+      ]
+    },
+    "و": {
+      "relevant": [
+        { "code": 1572, "label": "ؤ" }
+      ]
+    },
+    "~right": {
+      "main": { "code": 1611, "label": "ً" },
+      "relevant": [
+        { "code": 1615, "label": "ُ" },
+        { "code": 1616, "label": "ِ" },
+        { "code": 1614, "label": "َ" },
+        { "code": 1617, "label": "ّ" },
+        { "code": 1620, "label": "ٔ" }
+      ]
+    }
+  },
+  "uri": {
+    "~right": {
+      "main": { "code": -255, "label": ".ir"},
+      "relevant": [
+        { "code": -255, "label": ".gov" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".edu" },
+        { "code": -255, "label": ".com" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

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

@@ -91,8 +91,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -111,8 +111,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -94,8 +94,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -34,8 +34,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -22,6 +22,11 @@
         { "$": "auto_text_key", "code":  337, "label": "ő" }
       ]
     },
+    "ö": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  337, "label": "ő" }
+      ]
+    },
     "u": {
       "relevant": [
         { "$": "auto_text_key", "code":  250, "label": "ú" },
@@ -29,6 +34,11 @@
         { "$": "auto_text_key", "code":  369, "label": "ű" }
       ]
     },
+    "ü": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  369, "label": "ű" }
+      ]
+    },    
     "~right": {
       "main": { "code":   44, "label": "," },
       "relevant": [
@@ -42,8 +52,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }
@@ -52,13 +68,13 @@
   },
   "uri": {
     "~right": {
-      "main": { "code": -255, "label": ".com" },
+      "main": { "code": -255, "label": ".hu" },
       "relevant": [
-        { "code": -255, "label": ".gov" },
-        { "code": -255, "label": ".edu" },
-        { "code": -255, "label": ".hu" },
+        { "code": -255, "label": ".com" },
+        { "code": -255, "label": ".net" },
         { "code": -255, "label": ".org" },
-        { "code": -255, "label": ".net" }
+        { "code": -255, "label": ".eu" },
+        { "code": -255, "label": ".gov.hu" }        
       ]
     }
   }

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

@@ -0,0 +1,41 @@
+{
+  "all": {
+    "ե": {
+      "main": { "$": "auto_text_key", "code": 1415, "label": "և" }
+    },
+    "~right": {
+      "main": { "code":   44, "label": "," },
+      "relevant": [
+        { "code":   38, "label": "&" },
+        { "code":   37, "label": "%" },
+        { "code":   43, "label": "+" },
+        { "code":  171, "label": "«" },
+        { "code":  187, "label": "»" },
+        { "code":   45, "label": "-" },
+        { "code": 1373, "label": "՝" },
+        { "code": 1371, "label": "՛" },
+        { "code":   64, "label": "@" },
+        { "code":   46, "label": "." },
+        { "code":   47, "label": "/" },
+        { "code":   40, "label": "(" },
+        { "code":   41, "label": ")" },
+        { "code":   35, "label": "#" },
+        { "code": 1372, "label": "՜" },
+        { "code": 1374, "label": "՞" },
+        { "code": 1415, "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/id.json

@@ -0,0 +1,49 @@
+{
+  "all": {
+    "e": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  234, "label": "ê" },
+        { "$": "auto_text_key", "code":  233, "label": "é" },
+        { "$": "auto_text_key", "code":  232, "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": ".id" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".net" },
+        { "code": -255, "label": ".co.id"},
+        { "code": -255, "label": ".go.id"}
+      ]
+    }
+  }
+}

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

@@ -83,8 +83,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -76,8 +76,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -13,8 +13,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -48,8 +48,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -63,7 +63,7 @@
       ]
     },
     "s": {
-      "main": { "$": "auto_text_key", "code":  219, "label": "ș" },
+      "main": { "$": "auto_text_key", "code":  351, "label": "ş" },
       "relevant": [
         { "$": "auto_text_key", "code":  347, "label": "ś" },
         { "$": "auto_text_key", "code":  349, "label": "ŝ" },
@@ -102,8 +102,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -140,8 +140,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -80,8 +80,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -72,8 +72,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -82,8 +82,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -60,8 +60,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/pt-BR.json

@@ -81,8 +81,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -81,8 +81,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -52,8 +52,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -23,8 +23,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -42,8 +42,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -89,8 +89,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -32,8 +32,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -133,8 +133,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

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

@@ -40,8 +40,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/uk-cyr-ext.json

@@ -0,0 +1,74 @@
+{
+  "all": {
+    "е": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1105, "label": "ё" }
+      ]
+    },
+    "у": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1118, "label": "ў" }
+      ]
+    },
+    "г": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1169, "label": "ґ" }
+      ]
+    },
+    "і": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1111, "label": "ї" },
+        { "$": "auto_text_key", "code":  1099, "label": "ы" }
+      ]
+    },
+    "є": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  8212, "label": "—" },
+        { "$": "auto_text_key", "code":  1101, "label": "э" }
+      ]
+    },
+    "ь": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  700, "label": "ʼ" },
+        { "$": "auto_text_key", "code":  39, "label": "'" },
+        { "$": "auto_text_key", "code":  1098, "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": ".ua" },
+        { "code": -255, "label": ".org" },
+        { "code": -255, "label": ".net" }
+      ]
+    }
+  }
+}

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

@@ -1,10 +1,26 @@
 {
   "all": {
+    "г": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  1169, "label": "ґ" }
+      ]
+    },
     "і": {
       "relevant": [
         { "$": "auto_text_key", "code":  1111, "label": "ї" }
       ]
     },
+    "є": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  8212, "label": "—" }
+      ]
+    },
+    "ь": {
+      "relevant": [
+        { "$": "auto_text_key", "code":  700, "label": "ʼ" },
+        { "$": "auto_text_key", "code":  39, "label": "'" }
+      ]
+    },
     "~right": {
       "main": { "code":   44, "label": "," },
       "relevant": [
@@ -18,8 +34,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }
@@ -31,7 +53,6 @@
       "main": { "code": -255, "label": ".com" },
       "relevant": [
         { "code": -255, "label": ".ua" },
-        { "code": -255, "label": ".edu" },
         { "code": -255, "label": ".org" },
         { "code": -255, "label": ".net" }
       ]

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/ur-PK.json

@@ -183,7 +183,7 @@
   },
   "uri": {
     "~right": {
-      "main": { "code": -255, "label": ".ir"},
+      "main": { "code": -255, "label": ".pk"},
       "relevant": [
         { "code": -255, "label": ".gov" },
         { "code": -255, "label": ".edu" },

app/src/main/assets/ime/keyboard/org.florisboard.localization/popupMappings/vi-VN.json

@@ -40,8 +40,14 @@
         { "code":   64, "label": "@" },
         { "code":   59, "label": ";" },
         { "code":   47, "label": "/" },
-        { "code":   40, "label": "(" },
-        { "code":   41, "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": "?" }

app/src/main/assets/ime/text/symbols-with-space.json

@@ -1,15 +0,0 @@
-[
-  ")",
-  "}",
-  "]",
-  ">",
-
-  "&",
-
-  ".",
-  ",",
-  "?",
-  "!",
-  ";",
-  ":"
-]

app/src/main/assets/ime/theme/floris_black.json

@@ -1,74 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_black",
-  "label": "Floris Black",
-  "authors": [ "serebit" ],
-  "isNightTheme": true,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#388E3C",
-      "colorPrimaryDark": "#306D32",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "false",
-      "semiTransparentColor": "#20FFFFFF",
-      "textColor": "#EEEEEE"
-    },
-    "keyboard": {
-      "background": "#000000"
-    },
-    "key": {
-      "background": "#212121",
-      "backgroundPressed": "#3D3D3D",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "true"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#BDBDBD"
-    },
-    "oneHanded": {
-      "background": "#000000",
-      "foreground": "@window/textColor"
-    },
-    "popup": {
-      "background": "#424242",
-      "backgroundActive": "#707070",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#7800BF",
-      "foreground": "@window/textColor"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "smartbarButton": {
-      "background": "@key/background",
-      "foreground": "@key/foreground"
-    },
-    "extractEditLayout": {
-      "background": "#282828",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#20388E3C"}
-  }
-}

app/src/main/assets/ime/theme/floris_black_borderless.json

@@ -1,77 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_black_borderless",
-  "label": "Floris Black Borderless",
-  "authors": [ "serebit" ],
-  "isNightTheme": true,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#388E3C",
-      "colorPrimaryDark": "#306D32",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "false",
-      "semiTransparentColor": "#20FFFFFF",
-      "textColor": "#EEEEEE"
-    },
-    "keyboard": {
-      "background": "#000000"
-    },
-    "key": {
-      "background": "transparent",
-      "backgroundPressed": "#7F616161",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "false"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "key:space": {
-      "background": "#46616161"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#BDBDBD"
-    },
-    "oneHanded": {
-      "background": "#000000",
-      "foreground": "@window/textColor"
-    },
-    "popup": {
-      "background": "#363636",
-      "backgroundActive": "#5F5F5F",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#7800BF",
-      "foreground": "@window/textColor"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "smartbarButton": {
-      "background": "#212121",
-      "foreground": "@window/textColor"
-    },
-    "extractEditLayout": {
-      "background": "#282828",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#20388E3C"}
-  }
-}

app/src/main/assets/ime/theme/floris_day.json

@@ -1,74 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_day",
-  "label": "Floris Day",
-  "authors": [ "patrickgold" ],
-  "isNightTheme": false,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#4CAF50",
-      "colorPrimaryDark": "#388E3C",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "true",
-      "semiTransparentColor": "#20000000",
-      "textColor": "#000000"
-    },
-    "keyboard": {
-      "background": "#E0E0E0"
-    },
-    "key": {
-      "background": "#FFFFFF",
-      "backgroundPressed": "#F5F5F5",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "true"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "#FFFFFF",
-      "foregroundPressed": "#FFFFFF"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#757575"
-    },
-    "oneHanded": {
-      "background": "#E8F5E9",
-      "foreground": "#424242"
-    },
-    "popup": {
-      "background": "#EEEEEE",
-      "backgroundActive": "#BDBDBD",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#A000FF",
-      "foreground": "#FFFFFF"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#8A8A8A"
-    },
-    "smartbarButton": {
-      "background": "@key/background",
-      "foreground": "@key/foreground"
-    },
-    "extractEditLayout": {
-      "background": "#E8E8E8",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#8A8A8A"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#204CAF50"}
-  }
-}

app/src/main/assets/ime/theme/floris_day_borderless.json

@@ -1,78 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_day_borderless",
-  "label": "Floris Day Borderless",
-  "authors": [ "patrickgold" ],
-  "isNightTheme": false,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#4CAF50",
-      "colorPrimaryDark": "#388E3C",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "true",
-      "semiTransparentColor": "#20000000",
-      "textColor": "#000000"
-    },
-    "keyboard": {
-      "background": "#E0E0E0"
-    },
-    "key": {
-      "background": "transparent",
-      "backgroundPressed": "#7FF5F5F5",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "false"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "#FFFFFF",
-      "foregroundPressed": "#FFFFFF"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "key:space": {
-      "background": "#7FF5F5F5",
-      "backgroundPressed": "#FFF5F5F5"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#757575"
-    },
-    "oneHanded": {
-      "background": "#E8F5E9",
-      "foreground": "#424242"
-    },
-    "popup": {
-      "background": "#EEEEEE",
-      "backgroundActive": "#BDBDBD",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#A000FF",
-      "foreground": "#FFFFFF"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#8A8A8A"
-    },
-    "smartbarButton": {
-      "background": "#FFFFFF",
-      "foreground": "@window/textColor"
-    },
-    "extractEditLayout": {
-      "background": "#E8E8E8",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#8A8A8A"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#204CAF50"}
-  }
-}

app/src/main/assets/ime/theme/floris_night.json

@@ -1,74 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_night",
-  "label": "Floris Night",
-  "authors": [ "patrickgold" ],
-  "isNightTheme": true,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#4CAF50",
-      "colorPrimaryDark": "#388E3C",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "false",
-      "semiTransparentColor": "#20FFFFFF",
-      "textColor": "#FFFFFF"
-    },
-    "keyboard": {
-      "background": "#212121"
-    },
-    "key": {
-      "background": "#424242",
-      "backgroundPressed": "#616161",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "true"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "#FFFFFF",
-      "foregroundPressed": "#FFFFFF"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#BDBDBD"
-    },
-    "oneHanded": {
-      "background": "#1B5E20",
-      "foreground": "#EEEEEE"
-    },
-    "popup": {
-      "background": "#757575",
-      "backgroundActive": "#BDBDBD",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#A000FF",
-      "foreground": "#FFFFFF"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "smartbarButton": {
-      "background": "@key/background",
-      "foreground": "@key/foreground"
-    },
-    "extractEditLayout": {
-      "background": "#282828",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#204CAF50"}
-  }
-}

app/src/main/assets/ime/theme/floris_night_borderless.json

@@ -1,78 +0,0 @@
-{
-  "$type": "dev.patrickgold.florisboard.ime.theme.Theme",
-  "name": "floris_night_borderless",
-  "label": "Floris Night Borderless",
-  "authors": [ "patrickgold" ],
-  "isNightTheme": true,
-  "attributes": {
-    "window": {
-      "colorPrimary": "#4CAF50",
-      "colorPrimaryDark": "#388E3C",
-      "colorAccent": "#FF9800",
-      "navigationBarColor": "@keyboard/background",
-      "navigationBarLight": "false",
-      "semiTransparentColor": "#20FFFFFF",
-      "textColor": "#FFFFFF"
-    },
-    "keyboard": {
-      "background": "#212121"
-    },
-    "key": {
-      "background": "transparent",
-      "backgroundPressed": "#7F616161",
-      "foreground": "@window/textColor",
-      "foregroundPressed": "@window/textColor",
-      "showBorder": "false"
-    },
-    "key:enter": {
-      "background": "@window/colorPrimary",
-      "backgroundPressed": "@window/colorPrimaryDark",
-      "foreground": "#FFFFFF",
-      "foregroundPressed": "#FFFFFF"
-    },
-    "key:shift:capslock": {
-      "foreground": "@window/colorAccent",
-      "foregroundPressed": "@window/colorAccent"
-    },
-    "key:space": {
-      "background": "#2F616161",
-      "backgroundPressed": "#7F616161"
-    },
-    "media": {
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#BDBDBD"
-    },
-    "oneHanded": {
-      "background": "#1B5E20",
-      "foreground": "#EEEEEE"
-    },
-    "popup": {
-      "background": "#757575",
-      "backgroundActive": "#BDBDBD",
-      "foreground": "@window/textColor"
-    },
-    "privateMode": {
-      "background": "#A000FF",
-      "foreground": "#FFFFFF"
-    },
-    "smartbar": {
-      "background": "transparent",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "smartbarButton": {
-      "background": "#424242",
-      "foreground": "@window/textColor"
-    },
-    "extractEditLayout": {
-      "background": "#282828",
-      "foreground": "@window/textColor",
-      "foregroundAlt": "#73FFFFFF"
-    },
-    "extractActionButton": {
-      "background": "@smartbarButton/background",
-      "foreground": "@smartbarButton/foreground"
-    },
-    "glideTrail": {"foreground":  "#204CAF50"}
-  }
-}

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

@@ -17,6 +17,14 @@
       "isBorderless": false,
       "isMaterialYouAware": false
     },
+    {
+      "id": "floris_day_borderless",
+      "label": "Floris Day (Borderless)",
+      "authors": [ "patrickgold" ],
+      "isNight": false,
+      "isBorderless": true,
+      "isMaterialYouAware": false
+    },
     {
       "id": "floris_night",
       "label": "Floris Night",
@@ -24,6 +32,30 @@
       "isNight": true,
       "isBorderless": false,
       "isMaterialYouAware": false
+    },
+    {
+      "id": "floris_night_borderless",
+      "label": "Floris Night (Borderless)",
+      "authors": [ "patrickgold" ],
+      "isNight": true,
+      "isBorderless": true,
+      "isMaterialYouAware": false
+    },
+    {
+      "id": "floris_pure_night",
+      "label": "Floris Pure Night",
+      "authors": [ "serebit" ],
+      "isNight": true,
+      "isBorderless": false,
+      "isMaterialYouAware": false
+    },
+    {
+      "id": "floris_pure_night_borderless",
+      "label": "Floris Pure Night (Borderless)",
+      "authors": [ "serebit" ],
+      "isNight": true,
+      "isBorderless": true,
+      "isMaterialYouAware": false
     }
   ]
 }

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

@@ -24,8 +24,8 @@
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
-    "shadow-elevation": "2dp",
-    "shape": "var(--shape)"
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
   "key:pressed": {
     "background": "var(--surface-variant)",
@@ -39,7 +39,7 @@
     "background": "var(--primary-variant)",
     "foreground": "var(--on-surface)"
   },
-  "key[code={c:shift}][mode={m:capslock}]": {
+  "key[code={c:shift}][shiftstate={sh:caps_lock}]": {
     "foreground": "var(--secondary)"
   },
   "key[code={c:space}]": {
@@ -56,97 +56,43 @@
     "background": "#eeeeee",
     "foreground": "var(--on-surface)",
     "font-size": "22sp",
-    "shadow-elevation": "2dp",
-    "shape": "var(--shape)"
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
   },
   "key-popup:focus": {
     "background": "#bdbdbd",
     "foreground": "var(--on-surface)"
   },
 
-  "clipboard-header": {
-    "background": "transparent",
-    "foreground": "var(--on-surface)",
-    "font-size": "16sp"
-  },
-  "clipboard-item": {
+  "smartbar-primary-actions-toggle": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)",
-    "font-size": "14sp",
-    "shadow-elevation": "2dp",
-    "shape": "var(--shape-variant)"
+    "shape": "circle()",
+    "shadow-elevation": "2dp"
   },
-  "clipboard-item-popup": {
-    "background": "var(--surface-variant)",
-    "foreground": "var(--on-surface)",
-    "font-size": "14sp",
-    "shadow-elevation": "2dp",
-    "shape": "var(--shape-variant)"
-  },
-
-  "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)",
-    "font-size": "22sp",
-    "shadow-elevation": "2dp",
-    "shape": "var(--shape)"
-  },
-  "emoji-tab": {
-    "foreground": "var(--on-background)"
-  },
-  "emoji-tab:focus": {
-    "foreground": "var(--primary)"
-  },
-
-  "glide-trail": {
-    "foreground": "var(--primary)"
-  },
-
-  "one-handed-panel": {
-    "background": "#e8f5e9",
-    "foreground": "#424242"
-  },
-
-  "smartbar-primary-row": {
-    "background": "transparent"
-  },
-  "smartbar-primary-action-row-toggle": {
-    "background": "var(--surface)",
-    "foreground": "var(--on-surface)",
-    "shadow-elevation": "2dp",
-    "shape": "circle()"
-  },
-  "smartbar-primary-secondary-row-toggle": {
+  "smartbar-secondary-actions-toggle": {
     "background": "transparent",
     "foreground": "var(--on-surface-variant)",
     "shape": "circle()"
   },
-
-  "smartbar-secondary-row": {
-    "background": "var(--background)"
-  },
-
-  "smartbar-action-row": {
-    "background": "transparent"
-  },
-  "smartbar-action-button": {
+  "smartbar-quick-action": {
     "background": "transparent",
     "foreground": "var(--on-background)",
     "shape": "circle()"
   },
-
-  "smartbar-candidate-row": {
-    "background": "transparent"
+  "smartbar-key": {
+    "background": "transparent",
+    "foreground": "var(--on-background)",
+    "font-size": "18sp",
+    "shape": "var(--shape)"
+  },
+  "smartbar-key:pressed": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)"
+  },
+  "smartbar-key:disabled": {
+    "background": "transparent",
+    "foreground": "#12121248"
   },
   "smartbar-candidate-word": {
     "background": "transparent",
@@ -172,19 +118,74 @@
     "foreground": "var(--surface)"
   },
 
-  "smartbar-key": {
+  "clipboard-header": {
+    "background": "transparent",
+    "foreground": "var(--on-surface)",
+    "font-size": "16sp"
+  },
+  "clipboard-item": {
+    "background": "var(--surface)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "var(--shape-variant)",
+    "shadow-elevation": "2dp"
+  },
+  "clipboard-item-popup": {
+    "background": "var(--surface-variant)",
+    "foreground": "var(--on-surface)",
+    "font-size": "14sp",
+    "shape": "var(--shape-variant)",
+    "shadow-elevation": "2dp"
+  },
+
+  "emoji-key": {
     "background": "transparent",
     "foreground": "var(--on-background)",
-    "font-size": "18sp",
+    "font-size": "22sp",
     "shape": "var(--shape)"
   },
-  "smartbar-key:pressed": {
+  "emoji-key:pressed": {
     "background": "var(--surface)",
     "foreground": "var(--on-surface)"
   },
-  "smartbar-key:disabled": {
+  "emoji-key-popup": {
+    "background": "#eeeeee",
+    "foreground": "var(--on-surface)",
+    "font-size": "22sp",
+    "shape": "var(--shape)",
+    "shadow-elevation": "2dp"
+  },
+  "emoji-tab": {
+    "foreground": "var(--on-background)"
+  },
+  "emoji-tab:focus": {
+    "foreground": "var(--primary)"
+  },
+
+  "extracted-landscape-input-layout": {
+    "background": "var(--background)"
+  },
+  "extracted-landscape-input-field": {
     "background": "transparent",
-    "foreground": "#12121248"
+    "foreground": "var(--on-background)",
+    "font-size": "16sp",
+    "shape": "rounded-corner(12dp, 12dp, 12dp, 12dp)",
+    "border-color": "var(--secondary)",
+    "border-width": "2dp"
+  },
+  "extracted-landscape-input-action": {
+    "background": "var(--primary)",
+    "foreground": "var(--on-surface)",
+    "shape": "rounded-corner(4dp, 4dp, 4dp, 4dp)"
+  },
+
+  "glide-trail": {
+    "foreground": "var(--primary)"
+  },
+
+  "one-handed-panel": {
+    "background": "#e8f5e9",
+    "foreground": "#424242"
   },
 
   "system-nav-bar": {