Release v0.3.13-beta04

Move new clipboard items with the same content to the beginning

.editorconfig

@@ -9,7 +9,7 @@ insert_final_newline = true
 max_line_length = 120
 trim_trailing_whitespace = true
 
-[{*.har,*.json}]
+[{*.har,*.json,*yml}]
 indent_size = 2
 
 [*.kt]

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [patrickgold]
+custom: ["https://paypal.me/devpatrickgold", "https://explorer.bitcoin.com/btc/address/1GKPJuRTZbVM7L8Kd3wtrqzc259Sjmoh9x"]

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/crash_report.md

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

.github/workflows/android.yml

@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Setup CMake and Ninja
+        uses: lukka/get-cmake@v3.20.1
       - uses: actions/cache@v2
         with:
           path: |
@@ -25,7 +27,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build with Gradle
-        run: ./gradlew clean assemble
+        run: ./gradlew clean assembleDebug
       - uses: actions/upload-artifact@v2
         with:
           name: app-debug.apk

.gitignore

@@ -39,4 +39,10 @@ captures/
 
 # Keystore files
 *.jks
-crowdin.properties
+crowdin.properties
+
+# C++
+.cxx/
+
+# AndroidX Room schema JSONs
+/app/schemas/

CONTRIBUTING.md

@@ -9,7 +9,10 @@ provides some general guidelines for each type of contribution.
 
 Either use the review function within Google Play or email me at
 [florisboard@patrickgold.dev](mailto:florisboard@patrickgold.dev). I
-love to hear from you!
+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
 
@@ -30,23 +33,52 @@ 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 / dictionary for locale
+## Adding a new keyboard layout
 
-You can now officially add layouts to FlorisBoard as described below.
-FlorisBoard's core has stabilized enough that adding new content is
-safe, although there will be some changes in the future.
+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.
 
-Currently you need to modify `app/src/main/assets/ime/config.json` to
-add the filename of the language/layout to the `characterLayouts`
-section and the `defaultSubtypes` section, making sure to include
-the language's 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 crahses caused by duplicate ids.
+### The config file (`app/src/main/assets/ime/config.json`)
 
-Add the keyboard layout at `app/src/main/assets/ime/text/characters/<preferredLayout_name_here>.json`,
-with `code` referring to the characters codepoint and `label` being the
-respective unicode character.
+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 the layout
+
+Since v0.3.10-beta05 it is possible to add custom layouts for all types.
+
+To add a new layout, head to `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.
+
+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`.
+
+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 `assets/ime/text/characters/extended_popups/<languageTag_name_here>.json`.
@@ -56,12 +88,21 @@ you add. The main field is used for determining if a hint or an accent
 should take priority, so please make sure to leave main empty and just
 use relevant for accents which are not-so important.
 
+For popups of non-`characters` layout, simply add the popup directly to
+each key via the `popup` field.
+
+## Adding a new dictionary for a language
+
+Currently the suggestions implementation is highly experimental and will
+get a major if not complete rework, 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 premade [issue template](.github/ISSUE_TEMPLATE/bug_report.md)
+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.
 
@@ -73,3 +114,10 @@ preferred way to capture logs.
 
 Alternatively, you can also use ADB (Android Debug Bridge) to capture
 the error log. This is recommended for experienced users only.
+
+## Donating
+
+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,7 +1,7 @@
 <img align="left" width="80" height="80"
 src="fastlane/metadata/android/en-US/images/icon.png" alt="App icon">
 
-# FlorisBoard [![Crowdin](https://badges.crowdin.net/florisboard/localized.svg)](https://crowdin.florisboard.patrickgold.dev) ![FlorisBoard CI](https://github.com/florisboard/florisboard/workflows/FlorisBoard%20CI/badge.svg?event=push)
+# 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+
 devices. It aims at being modern, user-friendly and customizable while
@@ -45,7 +45,11 @@ _A. IzzySoft's repo for F-Droid_:
 
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height="64" alt="IzzySoft repo badge">](https://apt.izzysoft.de/fdroid/index/apk/dev.patrickgold.florisboard.beta)
 
-_B. Use the APK provided in the release section of this repo_
+_B. Google Play_:
+
+Follow the same steps as for the stable track, the app can then be accessed [here](https://play.google.com/store/apps/details?id=dev.patrickgold.florisboard.beta).
+
+_C. Use the APK provided in the release section of this repo_
 
 ### Giving feedback
 If you want to give feedback to FlorisBoard, there are several ways to
@@ -74,8 +78,8 @@ milestones, please refer to the [Feature roadmap](#feature-roadmap).
 
 ### Layouts
 * [x] Latin character layouts (QWERTY, QWERTZ, AZERTY, Swiss, Spanish, Norwegian, Swedish/Finnish, Icelandic, Danish,
-      Hungarian, Croatian, Polish, Romanian, Colemak, Dvorak, Turkish-Q, Turkish-F, ...)
-* [x] Non-latin character layouts (Arabic, Persian, Greek, Russian (JCUKEN))
+      Hungarian, Croatian, Polish, Romanian, Colemak, Dvorak, Turkish-Q, Turkish-F, and more...)
+* [x] Non-latin character layouts (Arabic, Persian, Kurdish, Greek, Russian (JCUKEN), and more...)
 * [x] Adapt to situation in app (password, url, text, etc. )
 * [x] Special character layout(s)
 * [x] Numeric layout
@@ -93,13 +97,17 @@ milestones, please refer to the [Feature roadmap](#feature-roadmap).
 * [x] Subtype selection (language/layout)
 * [x] Keyboard behaviour preferences
 * [x] Gesture preferences
+* [x] User dictionary manager (system and internal)
 
 ### Other useful features
+* [x] Support for Android 11+ inline autofill API
 * [x] One-handed mode
 * [x] Clipboard/cursor tools
 * [x] Clipboard manager/history
 * [x] Integrated number row / symbols in character layouts
 * [x] Gesture support
+* [x] Full support for the system user dictionary (shared dictionary
+      between all keyboards) and a private, internal user dictionary
 * [x] Full integration in IME service list of Android (xml/method)
       (integration is internal-only, because Android's default subtype
       implementation not really allows for dynamic language/layout
@@ -131,13 +139,14 @@ close as possible.
   - Next-word suggestions by training language models. Data collected here is stored locally and never leaves
     the user's device.
 
-- Module C: Extension packs (base implementation with [#162])
+- Module C: Extension packs (Implemented with [#162], reworked several times and still not stable)
   - Ability to load dictionaries (and later potentially other cool
     features too) only if needed to keep the core APK size small
   - Currently unclear how exactly this will work, but this is definitely
     a must-have feature
+  - A full implementation may come only in v0.5.0
 
-- Module D: Glide typing
+- Module D: Glide typing (Implemented with [#544])
   - Swiping over the characters will automatically convert this to a word
   - Possibly also add improvements based on the Flow keyboard
 
@@ -151,9 +160,11 @@ close as possible.
   - Theme import/export
 
 ### [v0.5.0](https://github.com/florisboard/florisboard/milestone/5)
-There's no exact roadmap yet but it is planned that the media part of
-FlorisBoard (emojis, emoticons, kaomoji) gets a rework. Also as an extension
-(requires v0.4.0/Module C) GIF support is planned.
+There's no exact roadmap yet, but these are the most important points:
+- Full layout customization in runtime
+- Extensive rework and customization of the media input (emojis, emoticons, kaomoji)
+- Better Smartbar customization
+- As an extension GIF support
 
 ### > v0.5.0
 This is completely open as of now and will gather planned features as time
@@ -166,6 +177,7 @@ Backlog (currently not assigned to any milestone):
 [#91]: https://github.com/florisboard/florisboard/pull/91
 [#162]: https://github.com/florisboard/florisboard/pull/162
 [#329]: https://github.com/florisboard/florisboard/pull/329
+[#544]: https://github.com/florisboard/florisboard/pull/544
 
 ## Contributing
 Wanna contribute to FlorisBoard? That's great to hear! There are lots of
@@ -183,8 +195,8 @@ to get more information on this topic.
   by [google](https://github.com/google)
 * [Google Material icons](https://github.com/google/material-design-icons) by
   [google](https://github.com/google)
-* [Moshi JSON library](https://github.com/square/moshi) by
-  [square](https://github.com/square)
+* [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
@@ -194,7 +206,7 @@ to get more information on this topic.
 
 ## Usage notes for included binary dictionary files
 All binary dictionaries included within this project in
-(this)[app/src/main/assets/ime/dict) asset folder are built from various
+(this)[app/src/main/assets/ime/dict] asset folder are built from various
 sources, as stated below.
 
 ### Source 1: [wordfreq library by LuminosoInsight](https://github.com/LuminosoInsight/wordfreq):

app/build.gradle.kts

@@ -1,8 +1,9 @@
 
 plugins {
-    id("com.android.application") version "4.1.2"
-    kotlin("android") version "1.4.30"
-    kotlin("kapt") version "1.4.30"
+    id("com.android.application") version "4.2.1"
+    kotlin("android") version "1.5.0"
+    kotlin("kapt") version "1.5.0"
+    kotlin("plugin.serialization") version "1.5.0"
 }
 
 android {
@@ -16,28 +17,54 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = listOf("-Xallow-result-return-type") // enables use of kotlin.Result
+        freeCompilerArgs = listOf("-Xallow-result-return-type", "-Xopt-in=kotlin.RequiresOptIn")
     }
 
     defaultConfig {
         applicationId = "dev.patrickgold.florisboard"
         minSdkVersion(23)
         targetSdkVersion(30)
-        versionCode(32)
-        versionName("0.3.10")
+        versionCode(47)
+        versionName("0.3.13")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += mapOf(
+                    Pair("room.schemaLocation", "$projectDir/schemas"),
+                    Pair("room.incremental", "true"),
+                    Pair("room.expandProjection", "true")
+                )
+            }
+        }
+
+        externalNativeBuild {
+            cmake {
+                cppFlags("-std=c++17", "-fexceptions", "-frtti")
+                arguments("-DANDROID_STL=c++_static")
+            }
+        }
     }
 
     buildFeatures {
         viewBinding = true
     }
 
+    externalNativeBuild {
+        cmake {
+            path("src/main/cpp/CMakeLists.txt")
+        }
+    }
+
     buildTypes {
         named("debug").configure {
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
 
+            isDebuggable = true
+            isJniDebuggable = true
+
             resValue("mipmap", "floris_app_icon", "@mipmap/ic_app_icon_debug")
             resValue("mipmap", "floris_app_icon_round", "@mipmap/ic_app_icon_debug_round")
             resValue("string", "floris_app_name", "FlorisBoard Debug")
@@ -78,16 +105,16 @@ android {
 dependencies {
     implementation("androidx.activity", "activity-ktx", "1.2.1")
     implementation("androidx.appcompat", "appcompat", "1.2.0")
+    implementation("androidx.autofill", "autofill", "1.1.0")
     implementation("androidx.core", "core-ktx", "1.3.2")
     implementation("androidx.fragment", "fragment-ktx", "1.3.0")
     implementation("androidx.preference", "preference-ktx", "1.1.1")
     implementation("androidx.constraintlayout", "constraintlayout", "2.0.4")
     implementation("androidx.lifecycle", "lifecycle-service", "2.2.0")
-    implementation("com.google.android", "flexbox", "2.0.1") // requires jcenter as of version 2.0.1
-    implementation("com.squareup.moshi", "moshi-kotlin", "1.11.0")
-    implementation("com.squareup.moshi", "moshi-adapters", "1.11.0")
+    implementation("com.google.android", "flexbox", "2.0.1")
     implementation("com.google.android.material", "material", "1.3.0")
     implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-android", "1.4.2")
+    implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.1.0")
     implementation("com.jaredrummler", "colorpicker", "1.1.0")
     implementation("com.jakewharton.timber", "timber", "4.7.1")
     implementation("com.nambimobile.widgets", "expandable-fab", "1.0.2")

app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
-        android:name=".ime.core.FlorisApplication"
+        android:name="dev.patrickgold.florisboard.FlorisApplication"
         android:allowBackup="false"
         android:icon="@mipmap/floris_app_icon"
         android:label="@string/floris_app_name"
@@ -31,16 +31,13 @@
 
         <!-- IME service -->
         <service
-            android:name="dev.patrickgold.florisboard.ime.core.FlorisBoard"
+            android:name="dev.patrickgold.florisboard.FlorisImeService"
             android:label="@string/floris_app_name"
             android:permission="android.permission.BIND_INPUT_METHOD">
-            <meta-data
-                android:name="android.view.im"
-                android:resource="@xml/method"/>
-
             <intent-filter>
                 <action android:name="android.view.InputMethod"/>
             </intent-filter>
+            <meta-data android:name="android.view.im" android:resource="@xml/method"/>
         </service>
 
         <!-- Settings Activity -->
@@ -66,6 +63,13 @@
             </intent-filter>
         </activity-alias>
 
+        <!-- User Dictionary Manager Activity -->
+        <activity
+            android:name="dev.patrickgold.florisboard.settings.UdmActivity"
+            android:icon="@mipmap/floris_app_icon"
+            android:label="@string/settings__title"
+            android:theme="@style/SettingsTheme"/>
+
         <!-- Theme Selector Activity -->
         <activity
             android:name="dev.patrickgold.florisboard.settings.ThemeManagerActivity"
@@ -113,12 +117,11 @@
 
         <provider
             android:name="dev.patrickgold.florisboard.ime.clip.provider.FlorisContentProvider"
-            android:authorities="dev.patrickgold.florisboard.provider.clip"
+            android:authorities="${applicationId}.provider.clip"
             android:grantUriPermissions="true"
             android:exported="false">
         </provider>
 
-
     </application>
 
 </manifest>

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

@@ -1,227 +1,687 @@
 {
   "package": "dev.patrickgold.florisboard",
-  "characterLayouts": {
-    "qwerty": "QWERTY",
-    "qwertz": "QWERTZ",
-    "azerty": "AZERTY",
-    "arabic": "Arabic",
-    "bepo": "BÉPO",
-    "bulgarian_bds": "Bulgarian (BDS)",
-    "bulgarian_phonetic": "Bulgarian (Phonetic)",
-    "canadian_french": "Canadian French (QWERTY)",
-    "colemak": "Colemak",
-    "danish": "Danish (QWERTY)",
-    "dvorak": "Dvorak",
-    "esperanto": "Esperanto",
-    "esperanto_with_hx": "Esperanto with 'ĥ'",
-    "greek": "Ελληνικά",
-    "hebrew": "עברית",
-    "hungarian": "Hungarian (QWERTZ)",
-    "icelandic": "Icelandic (QWERTY)",
-    "kurdish": "کوردی",
-    "norwegian": "Norwegian (QWERTY)",
-    "persian": "Persian",
-    "jcuken_russian": "Russian (JCUKEN)",
-    "serbian_latin": "Serbian (QWERTZ)",
-    "serbian_cyrillic": "Serbian (ЉЊЕРТЗ)",
-    "spanish": "Spanish (QWERTY)",
-    "swedish_finnish": "Swedish/Finnish (QWERTY)",
-    "swiss_german": "Swiss German (QWERTZ)",
-    "swiss_french": "Swiss French (QWERTZ)",
-    "swiss_italian": "Swiss Italian (QWERTZ)",
-    "turkish_q": "Turkish-Q",
-    "turkish_f": "Turkish-F"
-  },
+  "composers": [
+    { "$": "appender" },
+    { "$": "hangul-unicode" }
+  ],
+  "currencySets": [
+    {
+      "name": "azerbaijani_manat",
+      "label": "Azerbaijani manat (₼)",
+      "slots": [
+        { "code": 8380, "label": "₼" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "bitcoin",
+      "label": "Bitcoin (₿)",
+      "slots": [
+        { "code": 8383, "label": "₿" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "dollar",
+      "label": "Dollar ($)",
+      "slots": [
+        { "code":   36, "label": "$" },
+        { "code":  162, "label": "¢" },
+        { "code": 8364, "label": "€" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" },
+        { "code": 8369, "label": "₱" }
+      ]
+    },
+    {
+      "name": "euro",
+      "label": "Euro (€)",
+      "slots": [
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":   36, "label": "$" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" },
+        { "code": 8369, "label": "₱" }
+      ]
+    },
+    {
+      "name": "indian_rupee",
+      "label": "Indian rupee (₹)",
+      "slots": [
+        { "code": 8377, "label": "₹" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "iranian_rial",
+      "label": "Iranian rial (﷼)",
+      "slots": [
+        { "code":65020, "label": "﷼" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "israeli_new_shekel",
+      "label": "Israeli new shekel (₪)",
+      "slots": [
+        { "code": 8362, "label": "₪" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "kazakhstani_tenge",
+      "label": "Kazakhstani tenge (₸)",
+      "slots": [
+        { "code": 8380, "label": "₸" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "lao_kip",
+      "label": "Lao kip (₭)",
+      "slots": [
+        { "code": 8365, "label": "₭" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "mongolian_togrog",
+      "label": "Mongolian tögrög (₮)",
+      "slots": [
+        { "code": 8366, "label": "₮" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "nigerian_naira",
+      "label": "Nigerian naira (₦)",
+      "slots": [
+        { "code": 8358, "label": "₦" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "pakistani_rupee",
+      "label": "Pakistani rupee (₨)",
+      "slots": [
+        { "code": 8360, "label": "₨" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "paraguayan_guarani",
+      "label": "Paraguayan guaraní (₲)",
+      "slots": [
+        { "code": 8370, "label": "₲" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "peso",
+      "label": "Peso (₱)",
+      "slots": [
+        { "code": 8369, "label": "₱" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "pound",
+      "label": "Pound (£)",
+      "slots": [
+        { "code":  163, "label": "£" },
+        { "code":  162, "label": "¢" },
+        { "code": 8364, "label": "€" },
+        { "code":   36, "label": "$" },
+        { "code":  165, "label": "¥" },
+        { "code": 8369, "label": "₱" }
+      ]
+    },
+    {
+      "name": "russian_ruble",
+      "label": "Russian ruble (₽)",
+      "slots": [
+        { "code": 8381, "label": "₽" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "south_korean_won",
+      "label": "South Korean won (₩)",
+      "slots": [
+        { "code": 8361, "label": "₩" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "turkish_lira",
+      "label": "Turkish lira (₺)",
+      "slots": [
+        { "code": 8378, "label": "₺" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "ukrainian_hryvnia",
+      "label": "Ukrainian hryvnia (₴)",
+      "slots": [
+        { "code": 8372, "label": "₴" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code":  165, "label": "¥" }
+      ]
+    },
+    {
+      "name": "yen",
+      "label": "Yen (¥)",
+      "slots": [
+        { "code":  165, "label": "¥" },
+        { "code":   36, "label": "$" },
+        { "code": 8364, "label": "€" },
+        { "code":  162, "label": "¢" },
+        { "code":  163, "label": "£" },
+        { "code": 8369, "label": "₱" }
+      ]
+    }
+  ],
   "defaultSubtypes": [
     {
       "id": 101,
       "languageTag": "en-US",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 102,
       "languageTag": "en-UK",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "pound",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 103,
       "languageTag": "en-CA",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 104,
       "languageTag": "en-AU",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 201,
       "languageTag": "de-DE",
-      "preferredLayout": "qwertz"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwertz"
+      }
     },
     {
       "id": 202,
       "languageTag": "de-AT",
-      "preferredLayout": "qwertz"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwertz"
+      }
     },
     {
       "id": 203,
       "languageTag": "de-CH",
-      "preferredLayout": "swiss_german"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "swiss_german"
+      }
+    },
+    {
+      "id": 204,
+      "languageTag": "de-DE-neobone",
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "neo2",
+        "symbols": "neo2",
+        "numericRow": "neo2"
+      }
     },
     {
       "id": 301,
       "languageTag": "fr-FR",
-      "preferredLayout": "azerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "azerty"
+      }
     },
     {
       "id": 302,
       "languageTag": "fr-CA",
-      "preferredLayout": "canadian_french"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "canadian_french"
+      }
     },
     {
       "id": 303,
       "languageTag": "fr-CH",
-      "preferredLayout": "swiss_french"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "swiss_french"
+      }
     },
     {
       "id": 401,
       "languageTag": "it-IT",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 402,
       "languageTag": "it-CH",
-      "preferredLayout": "swiss_italian"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "swiss_italian"
+      }
     },
     {
       "id": 501,
       "languageTag": "es-ES",
-      "preferredLayout": "spanish"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "spanish"
+      }
     },
     {
       "id": 502,
       "languageTag": "es-US",
-      "preferredLayout": "spanish"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "spanish"
+      }
     },
     {
       "id": 503,
       "languageTag": "es-419",
-      "preferredLayout": "spanish"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "spanish"
+      }
     },
     {
       "id": 601,
       "languageTag": "pt-PT",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 602,
       "languageTag": "pt-BR",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 701,
       "languageTag": "nb-NO",
-      "preferredLayout": "norwegian"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "norwegian"
+      }
     },
     {
       "id": 702,
       "languageTag": "nn-NO",
-      "preferredLayout": "norwegian"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "norwegian"
+      }
     },
     {
       "id": 711,
       "languageTag": "sv-SE",
-      "preferredLayout": "swedish_finnish"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "swedish_finnish"
+      }
     },
     {
       "id": 721,
       "languageTag": "fi-FI",
-      "preferredLayout": "swedish_finnish"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "swedish_finnish"
+      }
     },
     {
       "id": 731,
       "languageTag": "da-DK",
-      "preferredLayout": "danish"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "danish"
+      }
     },
     {
       "id": 741,
       "languageTag": "is-IS",
-      "preferredLayout": "icelandic"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "icelandic"
+      }
+    },
+    {
+      "id": 751,
+      "languageTag": "fo",
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "faroese"
+      }
     },
     {
       "id": 801,
       "languageTag": "fa-FA",
-      "preferredLayout": "persian"
+      "composer": "appender",
+      "currencySet": "iranian_rial",
+      "preferred": {
+        "characters": "persian",
+        "symbols": "persian",
+        "symbols2": "persian",
+        "numericRow": "persian"
+      }
     },
     {
       "id": 901,
       "languageTag": "ar",
-      "preferredLayout": "arabic"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "arabic",
+        "symbols": "eastern",
+        "symbols2": "eastern",
+        "numericRow": "eastern_arabic"
+      }
     },
     {
       "id": 1001,
       "languageTag": "hu",
-      "preferredLayout": "hungarian"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "hungarian"
+      }
     },
     {
       "id": 1101,
       "languageTag": "eo",
-      "preferredLayout": "esperanto"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "esperanto"
+      }
     },
     {
       "id": 1201,
       "languageTag": "hr",
-      "preferredLayout": "qwertz"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwertz"
+      }
     },
     {
       "id": 1301,
       "languageTag": "ru",
-      "preferredLayout": "jcuken_russian"
+      "composer": "appender",
+      "currencySet": "russian_ruble",
+      "preferred": {
+        "characters": "jcuken_russian"
+      }
+    },
+    {
+      "id": 1351,
+      "languageTag": "uk",
+      "composer": "appender",
+      "currencySet": "ukrainian_hryvnia",
+      "preferred": {
+        "characters": "jcuken_ukrainian"
+      }
     },
     {
       "id": 1401,
       "languageTag": "el",
-      "preferredLayout": "greek"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "greek"
+      }
     },
     {
       "id": 1501,
       "languageTag": "ro",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 1601,
       "languageTag": "pl",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 1701,
       "languageTag": "bg-bg",
-      "preferredLayout": "bulgarian_phonetic"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "bulgarian_phonetic"
+      }
     },
     {
       "id": 1801,
       "languageTag": "tr",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "turkish_lira",
+      "preferred": {
+        "characters": "qwerty"
+      }
     },
     {
       "id": 1901,
       "languageTag": "iw-IL",
-      "preferredLayout": "hebrew"
+      "composer": "appender",
+      "currencySet": "israeli_new_shekel",
+      "preferred": {
+        "characters": "hebrew"
+      }
     },
     {
       "id": 2001,
       "languageTag": "ckb",
-      "preferredLayout": "kurdish"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "kurdish",
+        "symbols": "eastern",
+        "symbols2": "eastern",
+        "numericRow": "eastern_arabic"
+      }
     },
     {
       "id": 2101,
       "languageTag": "sr-RS",
-      "preferredLayout": "serbian_cyrillic"
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "serbian_cyrillic"
+      }
     },
     {
       "id": 2201,
       "languageTag": "lv-LV",
-      "preferredLayout": "qwerty"
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwerty"
+      }
+    },
+    {
+      "id": 2301,
+      "languageTag": "ku",
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "kurdish_kurmanci"
+      }
+    },
+    {
+      "id": 2501,
+      "languageTag": "ca",
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "catalan"
+      }
+    },
+    {
+      "id": 2601,
+      "languageTag": "IPA-IPA",
+      "composer": "appender",
+      "currencySet": "dollar",
+      "preferred": {
+        "characters": "ipa",
+        "symbols": "ipa",
+        "symbols2": "ipa"
+      }
+    },
+    {
+      "id": 2701,
+      "languageTag": "sk",
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwertz"
+      }
+    },
+    {
+      "id": 2801,
+      "languageTag": "cs",
+      "composer": "appender",
+      "currencySet": "euro",
+      "preferred": {
+        "characters": "qwertz"
+      }
+    },
+    {
+      "id": 2900,
+      "languageTag": "ko",
+      "composer": "hangul-unicode",
+      "currencySet": "south_korean_won",
+      "preferred": {
+        "characters": "korean"
+      }
     }
   ]
 }

app/src/main/assets/ime/text/characters/arabic.json

@@ -1,6 +1,7 @@
 {
   "type": "characters",
   "name": "arabic",
+  "label": "Arabic",
   "authors": [ "HeiWiper" ],
   "direction": "rtl",
   "modifier": "arabic",
@@ -34,7 +35,7 @@
     [
       { "code":  1584, "label": "ذ" },
       { "code":  1569, "label": "ء" },
-      { "code": 65157, "label": "ﺅ" },
+      { "code":  1572, "label": "ؤ" },
       { "code":  1585, "label": "ر" },
       { "code":  1609, "label": "ى" },
       { "code":  1577, "label": "ة" },

app/src/main/assets/ime/text/characters/azerty.json

@@ -1,40 +1,41 @@
 {
   "type": "characters",
   "name": "azerty",
+  "label": "AZERTY",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":   97, "label": "a" },
-      { "code":  122, "label": "z" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "auto_text_key", "code":   97, "label": "a" },
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "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" },
+      { "$": "auto_text_key", "code":  105, "label": "i" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  112, "label": "p" }
     ],
     [
-      { "code":  113, "label": "q" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  109, "label": "m" }
+      { "$": "auto_text_key", "code":  113, "label": "q" },
+      { "$": "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":  109, "label": "m" }
     ],
     [
-      { "code":  119, "label": "w" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  119, "label": "w" },
+      { "$": "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" },
       { "code":   39, "label": "'", "popup": {
         "relevant": [
           { "code": 8218, "label": "‚" },

app/src/main/assets/ime/text/characters/bepo.json

@@ -1,42 +1,43 @@
 {
     "type": "characters",
     "name": "bepo",
+    "label": "BÉPO",
     "authors": [ "salamandar" ],
     "direction": "ltr",
     "arrangement": [
       [
-        { "code":   98, "label": "b" },
-        { "code":  233, "label": "é" },
-        { "code":  112, "label": "p" },
-        { "code":  111, "label": "o" },
-        { "code":  232, "label": "è" },
-        { "code":  118, "label": "v" },
-        { "code":  100, "label": "d" },
-        { "code":  108, "label": "l" },
-        { "code":  106, "label": "j" },
-        { "code":  122, "label": "z" },
-        { "code":  119, "label": "w" }
+        { "$": "auto_text_key", "code":   98, "label": "b" },
+        { "$": "auto_text_key", "code":  233, "label": "é" },
+        { "$": "auto_text_key", "code":  112, "label": "p" },
+        { "$": "auto_text_key", "code":  111, "label": "o" },
+        { "$": "auto_text_key", "code":  232, "label": "è" },
+        { "$": "auto_text_key", "code":  118, "label": "v" },
+        { "$": "auto_text_key", "code":  100, "label": "d" },
+        { "$": "auto_text_key", "code":  108, "label": "l" },
+        { "$": "auto_text_key", "code":  106, "label": "j" },
+        { "$": "auto_text_key", "code":  122, "label": "z" },
+        { "$": "auto_text_key", "code":  119, "label": "w" }
       ],
       [
-        { "code":   97, "label": "a" },
-        { "code":  117, "label": "u" },
-        { "code":  105, "label": "i" },
-        { "code":  101, "label": "e" },
-        { "code":   99, "label": "c" },
-        { "code":  116, "label": "t" },
-        { "code":  115, "label": "s" },
-        { "code":  114, "label": "r" },
-        { "code":  110, "label": "n" },
-        { "code":  109, "label": "m" },
-        { "code":  231, "label": "ç" }
+        { "$": "auto_text_key", "code":   97, "label": "a" },
+        { "$": "auto_text_key", "code":  117, "label": "u" },
+        { "$": "auto_text_key", "code":  105, "label": "i" },
+        { "$": "auto_text_key", "code":  101, "label": "e" },
+        { "$": "auto_text_key", "code":   99, "label": "c" },
+        { "$": "auto_text_key", "code":  116, "label": "t" },
+        { "$": "auto_text_key", "code":  115, "label": "s" },
+        { "$": "auto_text_key", "code":  114, "label": "r" },
+        { "$": "auto_text_key", "code":  110, "label": "n" },
+        { "$": "auto_text_key", "code":  109, "label": "m" },
+        { "$": "auto_text_key", "code":  231, "label": "ç" }
       ],
       [
-        { "code":  234, "label": "ê" },
-        { "code":  224, "label": "à" },
-        { "code":  121, "label": "y" },
-        { "code":  120, "label": "x" },
-        { "code":  107, "label": "k" },
-        { "code":  113, "label": "q", "popup": {
+        { "$": "auto_text_key", "code":  234, "label": "ê" },
+        { "$": "auto_text_key", "code":  224, "label": "à" },
+        { "$": "auto_text_key", "code":  121, "label": "y" },
+        { "$": "auto_text_key", "code":  120, "label": "x" },
+        { "$": "auto_text_key", "code":  107, "label": "k" },
+        { "$": "auto_text_key", "code":  113, "label": "q", "popup": {
           "relevant": [
             { "code": 8218, "label": "‚" },
             { "code": 8216, "label": "‘" },
@@ -45,9 +46,9 @@
             { "code": 8250, "label": "›" }
           ]
         } },
-        { "code":  103, "label": "g" },
-        { "code":  104, "label": "h" },
-        { "code":  102, "label": "f" }
+        { "$": "auto_text_key", "code":  103, "label": "g" },
+        { "$": "auto_text_key", "code":  104, "label": "h" },
+        { "$": "auto_text_key", "code":  102, "label": "f" }
       ]
     ]
   }

app/src/main/assets/ime/text/characters/bone.json

@@ -0,0 +1,61 @@
+{
+  "type": "characters",
+  "name": "bone",
+  "label": "Bone",
+  "authors": [ "ostrya" ],
+  "direction": "ltr",
+  "modifier": "neo2",
+  "arrangement": [
+    [
+      { "$": "auto_text_key", "code":  106, "label": "j" },
+      { "$": "auto_text_key", "code":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":   97, "label": "a" },
+      { "$": "auto_text_key", "code":  120, "label": "x" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "auto_text_key", "code":  108, "label": "l" },
+      { "$": "auto_text_key", "code":  109, "label": "m" },
+      { "$": "auto_text_key", "code":  119, "label": "w" },
+      { "$": "case_selector",
+        "lower": {
+          "code":  223, "label": "ß", "popup": {
+            "relevant": [
+              { "code":  180, "label": "´" }
+            ]
+          }
+        },
+        "upper": {
+          "code": 7838, "label": "ẞ", "popup": {
+            "relevant": [
+              { "code":  180, "label": "´" }
+            ]
+          }
+        }
+      }
+    ],
+    [
+      { "$": "auto_text_key", "code":   99, "label": "c" },
+      { "$": "auto_text_key", "code":  116, "label": "t" },
+      { "$": "auto_text_key", "code":  105, "label": "i" },
+      { "$": "auto_text_key", "code":  101, "label": "e" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":   98, "label": "b" },
+      { "$": "auto_text_key", "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  114, "label": "r" },
+      { "$": "auto_text_key", "code":  115, "label": "s" },
+      { "$": "auto_text_key", "code":  103, "label": "g" },
+      { "$": "auto_text_key", "code":  113, "label": "q" }
+    ],
+    [
+      { "$": "auto_text_key", "code":  102, "label": "f" },
+      { "$": "auto_text_key", "code":  118, "label": "v" },
+      { "$": "auto_text_key", "code":  252, "label": "ü" },
+      { "$": "auto_text_key", "code":  228, "label": "ä" },
+      { "$": "auto_text_key", "code":  246, "label": "ö" },
+      { "$": "auto_text_key", "code":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":  107, "label": "k" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/bulgarian_bds.json

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

app/src/main/assets/ime/text/characters/bulgarian_phonetic.json

@@ -1,44 +1,45 @@
 {
   "type": "characters",
   "name": "bulgarian_phonetic",
+  "label": "Bulgarian (Phonetic)",
   "authors": [ "iorvethe" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code": 1103, "label": "я" },
-      { "code": 1074, "label": "в" },
-      { "code": 1077, "label": "е" },
-      { "code": 1088, "label": "р" },
-      { "code": 1090, "label": "т" },
-      { "code": 1098, "label": "ъ" },
-      { "code": 1091, "label": "у" },
-      { "code": 1080, "label": "и" },
-      { "code": 1086, "label": "о" },
-      { "code": 1087, "label": "п" },
-      { "code": 1095, "label": "ч" }
+      { "$": "auto_text_key", "code": 1103, "label": "я" },
+      { "$": "auto_text_key", "code": 1074, "label": "в" },
+      { "$": "auto_text_key", "code": 1077, "label": "е" },
+      { "$": "auto_text_key", "code": 1088, "label": "р" },
+      { "$": "auto_text_key", "code": 1090, "label": "т" },
+      { "$": "auto_text_key", "code": 1098, "label": "ъ" },
+      { "$": "auto_text_key", "code": 1091, "label": "у" },
+      { "$": "auto_text_key", "code": 1080, "label": "и" },
+      { "$": "auto_text_key", "code": 1086, "label": "о" },
+      { "$": "auto_text_key", "code": 1087, "label": "п" },
+      { "$": "auto_text_key", "code": 1095, "label": "ч" }
     ],
     [
-      { "code": 1072, "label": "а" },
-      { "code": 1089, "label": "с" },
-      { "code": 1076, "label": "д" },
-      { "code": 1092, "label": "ф" },
-      { "code": 1075, "label": "г" },
-      { "code": 1093, "label": "х" },
-      { "code": 1081, "label": "й" },
-      { "code": 1082, "label": "к" },
-      { "code": 1083, "label": "л" },
-      { "code": 1096, "label": "ш" },
-      { "code": 1097, "label": "щ" }
+      { "$": "auto_text_key", "code": 1072, "label": "а" },
+      { "$": "auto_text_key", "code": 1089, "label": "с" },
+      { "$": "auto_text_key", "code": 1076, "label": "д" },
+      { "$": "auto_text_key", "code": 1092, "label": "ф" },
+      { "$": "auto_text_key", "code": 1075, "label": "г" },
+      { "$": "auto_text_key", "code": 1093, "label": "х" },
+      { "$": "auto_text_key", "code": 1081, "label": "й" },
+      { "$": "auto_text_key", "code": 1082, "label": "к" },
+      { "$": "auto_text_key", "code": 1083, "label": "л" },
+      { "$": "auto_text_key", "code": 1096, "label": "ш" },
+      { "$": "auto_text_key", "code": 1097, "label": "щ" }
     ],
     [
-      { "code": 1079, "label": "з" },
-      { "code": 1100, "label": "ь" },
-      { "code": 1094, "label": "ц" },
-      { "code": 1078, "label": "ж" },
-      { "code": 1073, "label": "б" },
-      { "code": 1085, "label": "н" },
-      { "code": 1084, "label": "м" },
-      { "code": 1102, "label": "ю" }
+      { "$": "auto_text_key", "code": 1079, "label": "з" },
+      { "$": "auto_text_key", "code": 1100, "label": "ь" },
+      { "$": "auto_text_key", "code": 1094, "label": "ц" },
+      { "$": "auto_text_key", "code": 1078, "label": "ж" },
+      { "$": "auto_text_key", "code": 1073, "label": "б" },
+      { "$": "auto_text_key", "code": 1085, "label": "н" },
+      { "$": "auto_text_key", "code": 1084, "label": "м" },
+      { "$": "auto_text_key", "code": 1102, "label": "ю" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/canadian_french.json

@@ -1,43 +1,44 @@
 {
   "type": "characters",
   "name": "canadian_french",
+  "label": "Canadian French (QWERTY)",
   "authors": [ "The-Quantum-Alpha" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  232, "label": "è" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  232, "label": "è" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  233, "label": "é" },
-      { "code":  224, "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":  233, "label": "é" },
+      { "$": "auto_text_key", "code":  224, "label": "à" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/catalan.json

@@ -0,0 +1,42 @@
+{
+  "type": "characters",
+  "name": "catalan",
+  "label": "Catalan (QWERTY)",
+  "authors": [ "mikelloc" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":   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":  231, "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" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/catalan_accents.json

@@ -0,0 +1,44 @@
+{
+  "type": "characters",
+  "name": "catalan_accents",
+  "label": "Catalan (Accents)",
+  "authors": [ "mikelloc" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  768, "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":  231, "label": "ç" },
+      { "$": "auto_text_key", "code":  769, "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" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/colemak.json

@@ -1,45 +1,53 @@
 {
   "type": "characters",
   "name": "colemak",
+  "label": "Colemak",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  102, "label": "f" },
-      { "code":  112, "label": "p" },
-      { "code":  103, "label": "g" },
-      { "code":  106, "label": "j" },
-      { "code":  108, "label": "l" },
-      { "code":  117, "label": "u" },
-      { "code":  121, "label": "y" },
-      { "code":   59, "label": ";", "popup": {
-        "relevant": [
-          { "code":   58, "label": ":" }
-        ]
-      }, "shift": { "code":   58, "label": ":" } }
+      { "$": "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":  103, "label": "g" },
+      { "$": "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": ";" }
+          ]
+        } }
+      }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  114, "label": "r" },
-      { "code":  115, "label": "s" },
-      { "code":  116, "label": "t" },
-      { "code":  100, "label": "d" },
-      { "code":  104, "label": "h" },
-      { "code":  110, "label": "n" },
-      { "code":  101, "label": "e" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" }
+      { "$": "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":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "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" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  107, "label": "k" },
-      { "code":  109, "label": "m" }
+      { "$": "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":  107, "label": "k" },
+      { "$": "auto_text_key", "code":  109, "label": "m" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/danish.json

@@ -1,43 +1,44 @@
 {
   "type": "characters",
   "name": "danish",
+  "label": "Danish (QWERTY)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  229, "label": "å" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  229, "label": "å" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  230, "label": "æ" },
-      { "code":  248, "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":  230, "label": "æ" },
+      { "$": "auto_text_key", "code":  248, "label": "ø" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/dvorak.json

@@ -1,64 +1,84 @@
 {
   "type": "characters",
   "name": "dvorak",
+  "label": "Dvorak",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "modifier": "dvorak",
   "arrangement": [
     [
-      { "code":   64, "label": "@", "groupId": 101, "variation": "email_address" },
-      { "code":   39, "label": "'", "groupId": 101, "variation": "normal", "popup": {
-        "relevant": [
-          { "code":   33, "label": "!" },
-          { "code":   34, "label": "\"" }
-        ]
-      }, "shift": { "code":   34, "label": "\"" } },
-      { "code":   39, "label": "'", "groupId": 101, "variation": "password", "popup": {
-        "relevant": [
-          { "code":   33, "label": "!" },
-          { "code":   34, "label": "\"" }
-        ]
-      }, "shift": { "code":   34, "label": "\"" } },
-      { "code":   47, "label": "/", "groupId": 101, "variation": "uri" },
-      { "code":   44, "label": ",", "popup": {
-        "relevant": [
-          { "code":   60, "label": "<" },
-          { "code":   63, "label": "?" }
-        ]
-      }, "shift": { "code":   60, "label": "<" } },
-      { "code":   46, "label": ".", "popup": {
-        "relevant": [
-          { "code":   62, "label": ">" }
-        ]
-      }, "shift": { "code":   62, "label": ">" } },
-      { "code":  112, "label": "p" },
-      { "code":  121, "label": "y" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":   99, "label": "c" },
-      { "code":  114, "label": "r" },
-      { "code":  108, "label": "l" }
+      { "$": "variation_selector",
+        "default":  { "$": "case_selector",
+          "lower": { "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": {
+          "relevant": [
+            { "code":   44, "label": "," },
+            { "code":   63, "label": "?" }
+          ]
+        } }
+      },
+      { "$": "case_selector",
+        "lower": { "code":   46, "label": ".", "popup": {
+          "relevant": [
+            { "code":   62, "label": ">" }
+          ]
+        } },
+        "upper": { "code":   62, "label": ">", "popup": {
+          "relevant": [
+            { "code":   46, "label": "." }
+          ]
+        } }
+      },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  102, "label": "f" },
+      { "$": "auto_text_key", "code":  103, "label": "g" },
+      { "$": "auto_text_key", "code":   99, "label": "c" },
+      { "$": "auto_text_key", "code":  114, "label": "r" },
+      { "$": "auto_text_key", "code":  108, "label": "l" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  111, "label": "o" },
-      { "code":  101, "label": "e" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  100, "label": "d" },
-      { "code":  104, "label": "h" },
-      { "code":  116, "label": "t" },
-      { "code":  110, "label": "n" },
-      { "code":  115, "label": "s" }
+      { "$": "auto_text_key", "code":   97, "label": "a" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  101, "label": "e" },
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  105, "label": "i" },
+      { "$": "auto_text_key", "code":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "auto_text_key", "code":  116, "label": "t" },
+      { "$": "auto_text_key", "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  115, "label": "s" }
     ],
     [
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  120, "label": "x" },
-      { "code":   98, "label": "b" },
-      { "code":  109, "label": "m" },
-      { "code":  119, "label": "w" },
-      { "code":  118, "label": "v" }
+      { "$": "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/text/characters/esperanto.json

@@ -1,49 +1,50 @@
 {
   "type": "characters",
   "name": "esperanto",
+  "label": "Esperanto",
   "authors": [ "jeremiah-miller", "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  349, "label": "ŝ", "popup": {
-        "main": { "code":  113, "label": "q" }
+      { "$": "auto_text_key", "code":  349, "label": "ŝ", "popup": {
+        "main": { "$": "auto_text_key", "code":  113, "label": "q" }
       } },
-      { "code":  285, "label": "ĝ", "popup": {
-        "main": { "code":  119, "label": "w" }
+      { "$": "auto_text_key", "code":  285, "label": "ĝ", "popup": {
+        "main": { "$": "auto_text_key", "code":  119, "label": "w" }
       } },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  365, "label": "ŭ", "popup": {
-        "main": { "code":  121, "label": "y" }
+      { "$": "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":  365, "label": "ŭ", "popup": {
+        "main": { "$": "auto_text_key", "code":  121, "label": "y" }
       } },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "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" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  309, "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":  309, "label": "ĵ" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  265, "label": "ĉ", "popup": {
-        "main": { "code":  120, "label": "x" }
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":  265, "label": "ĉ", "popup": {
+        "main": { "$": "auto_text_key", "code":  120, "label": "x" }
       } },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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/text/characters/esperanto_with_hx.json

@@ -1,50 +1,51 @@
 {
   "type": "characters",
   "name": "esperanto_with_hx",
+  "label": "Esperanto with 'ĥ'",
   "authors": [ "jeremiah-miller", "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  349, "label": "ŝ", "popup": {
-        "main": { "code":  113, "label": "q" }
+      { "$": "auto_text_key", "code":  349, "label": "ŝ", "popup": {
+        "main": { "$": "auto_text_key", "code":  113, "label": "q" }
       } },
-      { "code":  285, "label": "ĝ", "popup": {
-        "main": { "code":  119, "label": "w" }
+      { "$": "auto_text_key", "code":  285, "label": "ĝ", "popup": {
+        "main": { "$": "auto_text_key", "code":  119, "label": "w" }
       } },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  365, "label": "ŭ", "popup": {
-        "main": { "code":  121, "label": "y" }
+      { "$": "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":  365, "label": "ŭ", "popup": {
+        "main": { "$": "auto_text_key", "code":  121, "label": "y" }
       } },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "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" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  309, "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":  309, "label": "ĵ" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  265, "label": "ĉ", "popup": {
-        "main": { "code":  120, "label": "x" }
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":  265, "label": "ĉ", "popup": {
+        "main": { "$": "auto_text_key", "code":  120, "label": "x" }
       } },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" },
-      { "code":  293, "label": "ĥ" }
+      { "$": "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":  293, "label": "ĥ" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/extended_popups/bg.json

@@ -6,7 +6,7 @@
     "all": {
       "и": {
         "relevant": [
-          { "code": 1117, "label": "ѝ" }
+          { "$": "auto_text_key", "code": 1117, "label": "ѝ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/ca.json

@@ -0,0 +1,115 @@
+{
+  "type": "characters/extended_popups",
+  "name": "ca",
+  "authors": [ "mikelloc" ],
+  "mapping": {
+    "all": {
+      "a": {
+        "main": { "$": "auto_text_key", "code": 224, "label": "à" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  261, "label": "ą" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" }
+        ]
+      },
+      "c": {
+        "main": { "$": "auto_text_key", "code":  231, "label": "ç" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
+        ]
+      },
+      "e": {
+        "main": { "$": "auto_text_key", "code":  233, "label": "é" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
+        ]
+      },
+      "i": {
+        "main": { "$": "auto_text_key", "code":  237, "label": "í" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
+        ]
+      },
+      "l": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  320, "label": "ŀ" },
+          { "$": "auto_text_key", "code":  183, "label": "·" }
+        ]
+      },
+      "o": {
+        "main": { "$": "auto_text_key", "code":  242, "label": "ò" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" }
+        ]
+      },
+      "s": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  223, "label": "ß" }
+        ]
+      },
+      "u": {
+        "main": { "$": "auto_text_key", "code":  250, "label": "ú" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
+        ]
+      },
+      "~right": {
+        "main": { "code":   44, "label": "," },
+        "relevant": [
+          { "code":   38, "label": "&" },
+          { "code":   37, "label": "%" },
+          { "code":   43, "label": "+" },
+          { "code":   34, "label": "\"" },
+          { "code":   45, "label": "-" },
+          { "code":   58, "label": ":" },
+          { "code":   39, "label": "'" },
+          { "code":   64, "label": "@" },
+          { "code":   59, "label": ";" },
+          { "code":   47, "label": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".cat" },
+          { "code": -255, "label": ".es" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/extended_popups/ckb.json

@@ -4,67 +4,78 @@
   "authors": [ "GoRaN" ],
   "mapping": {
     "all": {
-      "ق": {
+      "ﻪ": {
         "relevant": [
-          { "code": 1647, "label": "ٯ" }
-        ]
-      },
-      "ئ": {
-        "relevant": [
-          {"code": 1569, "label": "ء" }
-        ]
-      },
-      "ە": {
-        "relevant": [
-          { "code": 1577, "label": "ة" },
           { "code": 1729, "label": "ـہ" }
         ]
       },
       "ر": {
         "relevant": [
-          { "code": 1685, "label": "ڕ" },
           { "code": 1682, "label": "ڒ" }
         ]
       },
+      "ی": {
+        "relevant": [
+          { "code": 1746, "label": "ے" },
+          { "code": 1741, "label": "ۍ" },
+          { "code": 1744, "label": "ې" },
+          { "code": 1610, "label": "ي" },
+          { "code": 1597, "label": "ؽ" }
+        ]
+      },
+
+
+      "ﺋ": {
+        "relevant": [
+          { "code": 65163, "label": "ﺋ" },
+          { "code": 65139, "label": "ﹳ" }
+        ]
+      },
+      "ح": {
+        "relevant": [
+          { "code": 65010, "label": "ﷲ" },
+          { "code": 65019, "label": "ﷻ" }
+        ]
+      },
+
+      "ع": {
+        "relevant": [
+          { "code": 1551, "label": "؏" }
+        ]
+      },
+
+      "ۆ": {
+        "relevant": [
+          { "code": 1743, "label": "ۏ" },
+          { "code": 1735, "label": "ۇ" },
+          { "code": 1737, "label": "ۉ" },
+          { "code": 1738, "label": "ۊ" },
+          { "code": 1572, "label": "ؤ" },
+          { "code": 1739, "label": "ۋ" }
+        ]
+      },
+
       "ف": {
         "relevant": [
           { "code": 1701, "label": "ڥ" },
           { "code": 1698, "label": "ڢ" },
-          { "code": 1700, "label": "ڤ" },
           { "code": 1697, "label": "ڡ" }
         ]
       },
-      "": {
-        "relevant": [
-          { "code": 65163, "label": "ﺋ" },
-          { "code": 1569, "label": "ء" },
-          { "code": 65139, "label": "ﹳ" }
-        ]
-      },
-      "ع": {
-        "relevant": [
-          { "code": 1551, "label": "؏" },
-          { "code": 1594, "label": "غ" }
-        ]
-      },
+
       "د": {
         "relevant": [
           { "code": 1676, "label": "ڌ" },
           { "code": 64390, "label": "ﮆ" },
-          { "code": 1584, "label": "ذ" },
           { "code": 1774, "label": "ۮ" }
         ]
       },
-      "ه": {
+      "ھ": {
         "relevant": [
           { "code": 1726, "label": "ھ" }
         ]
       },
-      "خ": {
-        "relevant": [
-          { "code": 1567, "label": "؟" }
-        ]
-      },
+
       "س": {
         "relevant": [
           { "code": 1589, "label": "ص" }
@@ -77,9 +88,7 @@
       },
       "ب": {
         "relevant": [
-          { "code": 65010, "label": "ﷲ" },
-          { "code": 65021, "label": "﷽" },
-          { "code": 65019, "label": "ﷻ" }
+          { "code": 65021, "label": "﷽" }
         ]
       },
       "م": {
@@ -92,7 +101,6 @@
         "relevant": [
           { "code": 1718, "label": "ڶ" },
           { "code": 1719, "label": "ڷ" },
-          { "code": 1717, "label": "ڵ" },
           { "code": 1720, "label": "ڸ" }
         ]
       },
@@ -110,42 +118,23 @@
           { "code": 1603, "label": "ك"}
         ]
       },
-      "ی": {
-        "relevant": [
-          { "code": 1746, "label": "ے" },
-          { "code": 1610, "label": "ي" },
-          { "code": 1744, "label": "ې" },
-          { "code": 1741, "label": "ۍ" },
-          { "code": 1742, "label": "ێ" },
-          { "code": 1597, "label": "ؽ" }
-        ]
-      },
-      "ۆ": {
-        "relevant": [
-          { "code": 1743, "label": "ۏ" },
-          { "code": 1735, "label": "ۇ" },
-          { "code": 1737, "label": "ۉ" },
-          { "code": 1738, "label": "ۊ" },
-          { "code": 1572, "label": "ؤ" },
-          { "code": 1739, "label": "ۋ" }
-        ]
-      },
+
       "~right": {
         "main": { "code": 1567, "label": "؟" },
         "relevant": [
-          { "code": 1600, "label": "ــ" },
-          { "code": 33, "label": "!" },
-          { "code": 1548, "label": "،" },
-          { "code": 44, "label": "," },
-          { "code": 1549, "label": "؍" },
-          { "code": 1563, "label": "؛" },
-          { "code": 59, "label": ";" },
-          { "code": 58, "label": ":" },
           { "code": 64, "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": 45, "label": "-" }
+          { "code": 1600, "label": "▬" },
+          { "code": 33, "label": "!" },
+          { "code": 1548, "label": "،" }
         ]
       }
     },

app/src/main/assets/ime/text/characters/extended_popups/cs.json

@@ -0,0 +1,115 @@
+{
+  "type": "characters/extended_popups",
+  "name": "cs",
+  "authors": [ "stefan-misik" ],
+  "mapping": {
+    "all": {
+      "e": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  283, "label": "ě" },
+          { "$": "auto_text_key", "code":  233, "label": "é" }
+        ]
+      },
+      "r": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  345, "label": "ř" },
+          { "$": "auto_text_key", "code":  341, "label": "ŕ" }
+        ]
+      },
+      "t": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  357, "label": "ť" }
+        ]
+      },
+      "y": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  253, "label": "ý" }
+        ]
+      },
+      "u": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  367, "label": "ů" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" }
+        ]
+      },
+      "i": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  237, "label": "í" }
+        ]
+      },
+      "o": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
+        ]
+      },
+      "a": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  225, "label": "á" }
+        ]
+      },
+      "s": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  353, "label": "š" }
+        ]
+      },
+      "d": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  271, "label": "ď" }
+        ]
+      },
+      "l": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  318, "label": "ľ" },
+          { "$": "auto_text_key", "code":  314, "label": "ĺ" }
+        ]
+      },
+      "z": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
+        ]
+      },
+      "c": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  269, "label": "č" }
+        ]
+      },
+      "n": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  328, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".cz" },
+          { "code": -255, "label": ".eu" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/extended_popups/da.json

@@ -6,95 +6,95 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  224, "label": "à" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" },
-          { "code":  257, "label": "ā" },
-          { "code":  229, "label": "å" },
-          { "code":  230, "label": "æ" },
-          { "code":  225, "label": "á" },
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       },
       "d": {
         "relevant": [
-          { "code":  240, "label": "ð" }
+          { "$": "auto_text_key", "code":  240, "label": "ð" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" },
-          { "code":  234, "label": "ê" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" },
-          { "code":  299, "label": "ī" },
-          { "code":  236, "label": "ì" },
-          { "code":  303, "label": "į" },
-          { "code":  238, "label": "î" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "l": {
         "relevant": [
-          { "code":  322, "label": "ł" }
+          { "$": "auto_text_key", "code":  322, "label": "ł" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  248, "label": "ø" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  242, "label": "ò" },
-          { "code":  245, "label": "õ" },
-          { "code":  244, "label": "ô" },
-          { "code":  243, "label": "ó" },
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  223, "label": "ß" },
-          { "code":  347, "label": "ś" },
-          { "code":  353, "label": "š" }
+          { "$": "auto_text_key", "code":  223, "label": "ß" },
+          { "$": "auto_text_key", "code":  347, "label": "ś" },
+          { "$": "auto_text_key", "code":  353, "label": "š" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" },
-          { "code":  252, "label": "ü" },
-          { "code":  249, "label": "ù" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  253, "label": "ý" },
-          { "code":  255, "label": "ÿ" }
+          { "$": "auto_text_key", "code":  253, "label": "ý" },
+          { "$": "auto_text_key", "code":  255, "label": "ÿ" }
         ]
       },
       "æ": {
         "relevant": [
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       },
       "ø": {
         "relevant": [
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/de-DE-neobone.json

@@ -0,0 +1,19 @@
+{
+  "type": "characters/extended_popups",
+  "name": "de-DE-neobone",
+  "authors": [ "ostrya" ],
+  "mapping": {
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".ch" },
+          { "code": -255, "label": ".de" },
+          { "code": -255, "label": ".at" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}
+

app/src/main/assets/ime/text/characters/extended_popups/de.json

@@ -5,72 +5,72 @@
   "mapping": {
     "all": {
       "a": {
-        "main": { "code":  228, "label": "ä" },
+        "main": { "$": "auto_text_key", "code":  228, "label": "ä" },
         "relevant": [
-          { "code":  230, "label": "æ" },
-          { "code":  227, "label": "ã" },
-          { "code":  229, "label": "å" },
-          { "code":  257, "label": "ā" },
-          { "code":  226, "label": "â" },
-          { "code":  224, "label": "à" },
-          { "code":  225, "label": "á" }
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  225, "label": "á" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  234, "label": "ê" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" },
-          { "code":  236, "label": "ì" },
-          { "code":  239, "label": "ï" },
-          { "code":  238, "label": "î" },
-          { "code":  299, "label": "ī" }
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
-        "main": { "code":  246, "label": "ö" },
+        "main": { "$": "auto_text_key", "code":  246, "label": "ö" },
         "relevant": [
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  245, "label": "õ" },
-          { "code":  339, "label": "œ" },
-          { "code":  243, "label": "ó" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" }
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
         ]
       },
       "s": {
-        "main": { "code":  223, "label": "ß" },
+        "main": { "$": "auto_text_key", "code":  223, "label": "ß" },
         "relevant": [
-          { "code":  353, "label": "š" },
-          { "code":  347, "label": "ś" }
+          { "$": "auto_text_key", "code":  353, "label": "š" },
+          { "$": "auto_text_key", "code":  347, "label": "ś" }
         ]
       },
       "u": {
-        "main": { "code":  252, "label": "ü" },
+        "main": { "$": "auto_text_key", "code":  252, "label": "ü" },
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/el.json

@@ -6,41 +6,41 @@
     "all": {
       "α": {
         "relevant": [
-          { "code":  940, "label": "ά" }
+          { "$": "auto_text_key", "code":  940, "label": "ά" }
         ]
       },
       "ε": {
         "relevant": [
-          { "code":  941, "label": "έ" }
+          { "$": "auto_text_key", "code":  941, "label": "έ" }
         ]
       },
       "η": {
         "relevant": [
-          { "code":  942, "label": "ή" }
+          { "$": "auto_text_key", "code":  942, "label": "ή" }
         ]
       },
       "ι": {
+        "main": { "$": "auto_text_key", "code":  943, "label": "ί" },
         "relevant": [
-          { "code":  912, "label": "ΐ" },
-          { "code":  970, "label": "ϊ" },
-          { "code":  943, "label": "ί" }
+          { "$": "auto_text_key", "code":  912, "label": "ΐ" },
+          { "$": "auto_text_key", "code":  970, "label": "ϊ" }
         ]
       },
       "ο": {
         "relevant": [
-          { "code":  972, "label": "ό" }
+          { "$": "auto_text_key", "code":  972, "label": "ό" }
         ]
       },
       "υ": {
+        "main": { "$": "auto_text_key", "code":  973, "label": "ύ" },
         "relevant": [
-          { "code":  944, "label": "ΰ" },
-          { "code":  971, "label": "ϋ" },
-          { "code":  973, "label": "ύ" }
+          { "$": "auto_text_key", "code":  944, "label": "ΰ" },
+          { "$": "auto_text_key", "code":  971, "label": "ϋ" }
         ]
       },
       "ω": {
         "relevant": [
-          { "code":  974, "label": "ώ" }
+          { "$": "auto_text_key", "code":  974, "label": "ώ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/en.json

@@ -6,69 +6,69 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  230, "label": "æ" },
-          { "code":  227, "label": "ã" },
-          { "code":  229, "label": "å" },
-          { "code":  257, "label": "ā" },
-          { "code":  224, "label": "à" },
-          { "code":  225, "label": "á" },
-          { "code":  226, "label": "â" },
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  275, "label": "ē" },
-          { "code":  234, "label": "ê" },
-          { "code":  233, "label": "é" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  236, "label": "ì" },
-          { "code":  239, "label": "ï" },
-          { "code":  237, "label": "í" },
-          { "code":  238, "label": "î" },
-          { "code":  299, "label": "ī" }
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  245, "label": "õ" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  248, "label": "ø" },
-          { "code":  242, "label": "ò" },
-          { "code":  246, "label": "ö" },
-          { "code":  243, "label": "ó" },
-          { "code":  244, "label": "ô" }
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  223, "label": "ß" }
+          { "$": "auto_text_key", "code":  223, "label": "ß" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  250, "label": "ú" },
-          { "code":  363, "label": "ū" },
-          { "code":  252, "label": "ü" },
-          { "code":  251, "label": "û" },
-          { "code":  249, "label": "ù" }
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/eo.json

@@ -6,52 +6,52 @@
     "all": {
       "c": {
         "relevant": [
-          { "code":  265, "label": "ĉ" }
+          { "$": "auto_text_key", "code":  265, "label": "ĉ" }
         ]
       },
       "g": {
         "relevant": [
-          { "code":  285, "label": "ĝ" }
+          { "$": "auto_text_key", "code":  285, "label": "ĝ" }
         ]
       },
       "h": {
         "relevant": [
-          { "code":  293, "label": "ĥ" }
+          { "$": "auto_text_key", "code":  293, "label": "ĥ" }
         ]
       },
       "j": {
         "relevant": [
-          { "code":  309, "label": "ĵ" }
+          { "$": "auto_text_key", "code":  309, "label": "ĵ" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  349, "label": "ŝ" }
+          { "$": "auto_text_key", "code":  349, "label": "ŝ" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  365, "label": "ŭ" }
+          { "$": "auto_text_key", "code":  365, "label": "ŭ" }
         ]
       },
       "q": {
         "relevant": [
-          { "code":  349, "label": "ŝ" }
+          { "$": "auto_text_key", "code":  349, "label": "ŝ" }
         ]
       },
       "w": {
         "relevant": [
-          { "code":  285, "label": "ĝ" }
+          { "$": "auto_text_key", "code":  285, "label": "ĝ" }
         ]
       },
       "x": {
         "relevant": [
-          { "code":  265, "label": "ĉ" }
+          { "$": "auto_text_key", "code":  265, "label": "ĉ" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  365, "label": "ŭ" }
+          { "$": "auto_text_key", "code":  365, "label": "ŭ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/es.json

@@ -5,78 +5,78 @@
   "mapping": {
     "all": {
       "a": {
-        "main": { "code":  225, "label": "á" },
+        "main": { "$": "auto_text_key", "code":  225, "label": "á" },
         "relevant": [
-          { "code":  229, "label": "å" },
-          { "code":  261, "label": "ą" },
-          { "code":  230, "label": "æ" },
-          { "code":  257, "label": "ā" },
-          { "code":  170, "label": "ª" },
-          { "code":  224, "label": "à" },
-          { "code":  228, "label": "ä" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" }
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  261, "label": "ą" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  269, "label": "č" },
-          { "code":  231, "label": "ç" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  231, "label": "ç" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "e": {
-        "main": { "code":  233, "label": "é" },
+        "main": { "$": "auto_text_key", "code":  233, "label": "é" },
         "relevant": [
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  235, "label": "ë" },
-          { "code":  232, "label": "è" },
-          { "code":  234, "label": "ê" }
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
         ]
       },
       "i": {
-        "main": { "code":  237, "label": "í" },
+        "main": { "$": "auto_text_key", "code":  237, "label": "í" },
         "relevant": [
-          { "code":  299, "label": "ī" },
-          { "code":  238, "label": "î" },
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
-        "main": { "code":  243, "label": "ó" },
+        "main": { "$": "auto_text_key", "code":  243, "label": "ó" },
         "relevant": [
-          { "code":  186, "label": "º" },
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  339, "label": "œ" },
-          { "code":  245, "label": "õ" },
-          { "code":  244, "label": "ô" },
-          { "code":  246, "label": "ö" },
-          { "code":  242, "label": "ò" }
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  223, "label": "ß" }
+          { "$": "auto_text_key", "code":  223, "label": "ß" }
         ]
       },
       "u": {
-        "main": { "code":  250, "label": "ú" },
+        "main": { "$": "auto_text_key", "code":  250, "label": "ú" },
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  252, "label": "ü" },
-          { "code":  251, "label": "û" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/fa.json

@@ -4,69 +4,27 @@
   "authors": [ "PHELAT" ],
   "mapping": {
     "all": {
-      "ض": {
-        "relevant": [
-          { "code": 1777, "label": "۱" }
-        ]
-      },
-      "ص": {
-        "relevant": [
-          { "code": 1778, "label": "۲" }
-        ]
-      },
-      "ث": {
-        "relevant": [
-          { "code": 1779, "label": "۳" }
-        ]
-      },
-      "ق": {
-        "relevant": [
-          { "code": 1780, "label": "۴" }
-        ]
-      },
-      "ف": {
-        "relevant": [
-          { "code": 1781, "label": "۵" }
-        ]
-      },
-      "غ": {
-        "relevant": [
-          { "code": 1782, "label": "۶" }
-        ]
-      },
-      "ع": {
-        "relevant": [
-          { "code": 1783, "label": "۷" }
-        ]
-      },
-      "ه": {
-        "relevant": [
-          { "code": 1784, "label": "۸" }
-        ]
-      },
-      "خ": {
-        "relevant": [
-          { "code": 1785, "label": "۹" }
-        ]
-      },
-      "ح": {
-        "relevant": [
-          { "code": 1776, "label": "۰" }
-        ]
-      },
       "ی": {
         "relevant": [
           { "code": 1574, "label": "ئ" },
-          { "code": 1610, "label": "ي" }
+          { "code": 1610, "label": "ي" },
+          { "code": 1746, "label": "ے" }
         ]
       },
       "ا": {
         "relevant": [
-          { "code": 1570, "label": "آ" },
           { "code": 1649, "label": "ٱ" },
           { "code": 1569, "label": "ء" },
           { "code": 1571, "label": "أ" },
-          { "code": 1573, "label": "إ" }
+          { "code": 1573, "label": "إ" },
+          { "code": 1570, "label": "آ" }
+        ]
+      },
+      "ه": {
+        "relevant": [
+          { "code": 1729, "label": "ہ" },
+          { "code": 1728, "label": "ۀ" },
+          { "code": 1726, "label": "ھ" }
         ]
       },
       "ت": {
@@ -76,8 +34,7 @@
       },
       "ک": {
         "relevant": [
-          { "code": 1706, "label": "ڪ"},
-          { "code": 1603, "label": "ك" }
+          { "code": 1706, "label": "ڪ"}
         ]
       },
       "ز": {
@@ -114,9 +71,9 @@
         "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": ".org" },
           { "code": -255, "label": ".net" }
         ]
       }

app/src/main/assets/ime/text/characters/extended_popups/fi.json

@@ -6,80 +6,80 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  228, "label": "ä" },
-          { "code":  225, "label": "á" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" },
-          { "code":  257, "label": "ā" },
-          { "code":  229, "label": "å" },
-          { "code":  230, "label": "æ" },
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" },
-          { "code":  234, "label": "ê" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" },
-          { "code":  299, "label": "ī" },
-          { "code":  236, "label": "ì" },
-          { "code":  303, "label": "į" },
-          { "code":  238, "label": "î" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  246, "label": "ö" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  243, "label": "ó" },
-          { "code":  245, "label": "õ" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  248, "label": "ø" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  353, "label": "š" },
-          { "code":  223, "label": "ß" },
-          { "code":  347, "label": "ś" }
+          { "$": "auto_text_key", "code":  353, "label": "š" },
+          { "$": "auto_text_key", "code":  223, "label": "ß" },
+          { "$": "auto_text_key", "code":  347, "label": "ś" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  252, "label": "ü" },
-          { "code":  363, "label": "ū" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" },
-          { "code":  249, "label": "ù" }
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  382, "label": "ž" },
-          { "code":  380, "label": "ż" },
-          { "code":  378, "label": "ź" }
+          { "$": "auto_text_key", "code":  382, "label": "ž" },
+          { "$": "auto_text_key", "code":  380, "label": "ż" },
+          { "$": "auto_text_key", "code":  378, "label": "ź" }
         ]
       },
       "ä": {
         "relevant": [
-          { "code":  230, "label": "æ" }
+          { "$": "auto_text_key", "code":  230, "label": "æ" }
         ]
       },
       "ö": {
         "relevant": [
-          { "code":  248, "label": "ø" }
+          { "$": "auto_text_key", "code":  248, "label": "ø" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/fo.json

@@ -0,0 +1,138 @@
+{
+  "type": "characters/extended_popups",
+  "name": "fo",
+  "authors": [ "BinFlush" ],
+  "mapping": {
+    "all": {
+      "a": {
+        "main": { "$": "auto_text_key", "code": 225, "label": "á" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
+        ]
+      },
+      "e": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
+        ]
+      },
+      "i": {
+        "main": { "$": "auto_text_key", "code":  237, "label": "í" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
+        ]
+      },
+      "l": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  322, "label": "ł" }
+        ]
+      },
+      "n": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
+        ]
+      },
+      "o": {
+        "main": { "$": "auto_text_key", "code":  243, "label": "ó" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
+        ]
+      },
+      "t": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  254, "label": "þ" }
+        ]
+      },
+      "s": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  223, "label": "ß" },
+          { "$": "auto_text_key", "code":  347, "label": "ś" },
+          { "$": "auto_text_key", "code":  353, "label": "š" }
+        ]
+      },
+      "u": {
+        "main": { "$": "auto_text_key", "code":  250, "label": "ú" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" }
+        ]
+      },
+      "y": {
+        "main": { "$": "auto_text_key", "code":  253, "label": "ý" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  255, "label": "ÿ" }
+        ]
+      },
+      "æ": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
+        ]
+      },
+      "ð": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  254, "label": "þ" }
+        ]
+      },
+      "ø": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  246, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".fo" },
+          { "code": -255, "label": ".dk" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/extended_popups/fr.json

@@ -5,84 +5,84 @@
   "mapping": {
     "all": {
       "a": {
+        "main": { "$": "auto_text_key", "code":  224, "label": "à" },
         "relevant": [
-          { "code":  224, "label": "à" },
-          { "code":  227, "label": "ã" },
-          { "code":  229, "label": "å" },
-          { "code":  257, "label": "ā" },
-          { "code":  170, "label": "ª" },
-          { "code":  226, "label": "â" },
-          { "code":  230, "label": "æ" },
-          { "code":  225, "label": "á" },
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  225, "label": "á" }
         ]
       },
       "c": {
+        "main": { "$": "auto_text_key", "code":  231, "label": "ç" },
         "relevant": [
-          { "code":  231, "label": "ç" },
-          { "code":  269, "label": "č" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "e": {
+        "main": { "$": "auto_text_key", "code":  233, "label": "é" },
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  234, "label": "ê" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "i": {
+        "main": { "$": "auto_text_key", "code":  238, "label": "î" },
         "relevant": [
-          { "code":  238, "label": "î" },
-          { "code":  299, "label": "ī" },
-          { "code":  237, "label": "í" },
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
+        "main": { "$": "auto_text_key", "code":  244, "label": "ô" },
         "relevant": [
-          { "code":  244, "label": "ô" },
-          { "code":  186, "label": "º" },
-          { "code":  333, "label": "ō" },
-          { "code":  245, "label": "õ" },
-          { "code":  248, "label": "ø" },
-          { "code":  243, "label": "ó" },
-          { "code":  242, "label": "ò" },
-          { "code":  246, "label": "ö" },
-          { "code":  339, "label": "œ" }
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  223, "label": "ß" },
-          { "code":  353, "label": "š" },
-          { "code":  347, "label": "ś" }
+          { "$": "auto_text_key", "code":  223, "label": "ß" },
+          { "$": "auto_text_key", "code":  353, "label": "š" },
+          { "$": "auto_text_key", "code":  347, "label": "ś" }
         ]
       },
       "u": {
+        "main": { "$": "auto_text_key", "code":  249, "label": "ù" },
         "relevant": [
-          { "code":  249, "label": "ù" },
-          { "code":  363, "label": "ū" },
-          { "code":  252, "label": "ü" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  255, "label": "ÿ" }
+          { "$": "auto_text_key", "code":  255, "label": "ÿ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/hr.json

@@ -6,23 +6,23 @@
     "all": {
       "c": {
         "relevant": [
-          { "code":  269, "label": "č" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "d": {
         "relevant": [
-          { "code":  273, "label": "đ" }
+          { "$": "auto_text_key", "code":  273, "label": "đ" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  353, "label": "š" }
+          { "$": "auto_text_key", "code":  353, "label": "š" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  382, "label": "ž" }
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/hu.json

@@ -1,46 +1,36 @@
 {
   "type": "characters/extended_popups",
   "name": "hu",
-  "authors": [ "zoli111" ],
+  "authors": [ "zoli111, gabik65" ],
   "mapping": {
     "all": {
       "a": {
         "relevant": [
-          { "code":  225, "label": "á" }
+          { "$": "auto_text_key", "code":  225, "label": "á" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" }
+          { "$": "auto_text_key", "code":  233, "label": "é" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" }
+          { "$": "auto_text_key", "code":  237, "label": "í" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  243, "label": "ó" },
-          { "code":  246, "label": "ö" },
-          { "code":  337, "label": "ő" }
-        ]
-      },
-      "ö": {
-        "relevant": [
-          { "code":  337, "label": "ő" }
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  337, "label": "ő" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  250, "label": "ú" },
-          { "code":  252, "label": "ü" },
-          { "code":  369, "label": "ű" }
-        ]
-      },
-      "ü": {
-        "relevant": [
-          { "code":  369, "label": "ű" }
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  369, "label": "ű" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/is.json

@@ -6,72 +6,72 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  225, "label": "á" },
-          { "code":  224, "label": "à" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" },
-          { "code":  257, "label": "ā" },
-          { "code":  228, "label": "ä" },
-          { "code":  230, "label": "æ" },
-          { "code":  229, "label": "å" }
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  229, "label": "å" }
         ]
       },
       "d": {
         "relevant": [
-          { "code":  240, "label": "ð" }
+          { "$": "auto_text_key", "code":  240, "label": "ð" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" },
-          { "code":  234, "label": "ê" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" },
-          { "code":  299, "label": "ī" },
-          { "code":  236, "label": "ì" },
-          { "code":  303, "label": "į" },
-          { "code":  238, "label": "î" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  243, "label": "ó" },
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  245, "label": "õ" },
-          { "code":  339, "label": "œ" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "t": {
         "relevant": [
-          { "code":  254, "label": "þ" }
+          { "$": "auto_text_key", "code":  254, "label": "þ" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  250, "label": "ú" },
-          { "code":  363, "label": "ū" },
-          { "code":  251, "label": "û" },
-          { "code":  252, "label": "ü" },
-          { "code":  249, "label": "ù" }
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  253, "label": "ý" },
-          { "code":  255, "label": "ÿ" }
+          { "$": "auto_text_key", "code":  253, "label": "ý" },
+          { "$": "auto_text_key", "code":  255, "label": "ÿ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/it.json

@@ -5,65 +5,66 @@
   "mapping": {
     "all": {
       "a": {
-        "main": { "code":  224, "label": "à" },
+        "main": { "$": "auto_text_key", "code":  224, "label": "à" },
         "relevant": [
-          { "code":  227, "label": "ã" },
-          { "code":  229, "label": "å" },
-          { "code":  257, "label": "ā" },
-          { "code":  170, "label": "ª" },
-          { "code":  225, "label": "á" },
-          { "code":  226, "label": "â" },
-          { "code":  228, "label": "ä" },
-          { "code":  230, "label": "æ" }
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" }
         ]
       },
       "e": {
-        "main": { "code":  232, "label": "è" },
+        "main": { "$": "auto_text_key", "code":  232, "label": "è" },
         "relevant": [
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  234, "label": "ê" },
-          { "code":  233, "label": "é" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  601, "label": "ə" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "i": {
-        "main": { "code":  236, "label": "ì" },
+        "main": { "$": "auto_text_key", "code":  236, "label": "ì" },
         "relevant": [
-          { "code":  299, "label": "ī" },
-          { "code":  239, "label": "ï" },
-          { "code":  303, "label": "į" },
-          { "code":  238, "label": "î" },
-          { "code":  237, "label": "í" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  237, "label": "í" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
-        "main": { "code":  242, "label": "ò" },
+        "main": { "$": "auto_text_key", "code":  242, "label": "ò" },
         "relevant": [
-          { "code":  186, "label": "º" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  248, "label": "ø" },
-          { "code":  245, "label": "õ" },
-          { "code":  246, "label": "ö" },
-          { "code":  244, "label": "ô" },
-          { "code":  243, "label": "ó" }
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" }
         ]
       },
       "u": {
-        "main": { "code":  249, "label": "ù" },
+        "main": { "$": "auto_text_key", "code":  249, "label": "ù" },
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" },
-          { "code":  252, "label": "ü" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/ko.json

@@ -0,0 +1,75 @@
+{
+  "type": "characters/extended_popups",
+  "name": "ko",
+  "authors": [ "patrickgold", "Hayleia" ],
+  "mapping": {
+    "all": {
+      "ㅂ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12611, "label": "ㅃ" }
+        ]
+      },
+      "ㅈ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12617, "label": "ㅉ" }
+        ]
+      },
+      "ㄷ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12600, "label": "ㄸ" }
+        ]
+      },
+      "ㄱ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12594, "label": "ㄲ" }
+        ]
+      },
+      "ㅅ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12614, "label": "ㅆ" }
+        ]
+      },
+      "ㅐ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12626, "label": "ㅒ" }
+        ]
+      },
+      "ㅔ": {
+        "relevant": [
+          { "$": "auto_text_key", "code": 12630, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".gov" },
+          { "code": -255, "label": ".edu" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/extended_popups/ku.json

@@ -0,0 +1,130 @@
+{
+  "type": "characters/extended_popups",
+  "name": "ku",
+  "authors": [ "GoRaN" ],
+  "mapping": {
+    "all": {
+      "a": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  224, "label": "à" }
+        ]
+      },
+      "c": {
+        "main": { "$": "auto_text_key", "code":  231, "label": "ç" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  265, "label": "ĉ" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
+        ]
+      },
+      "e": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
+        ]
+      },
+      "r": {
+        "main": { "$": "auto_text_key", "code":  345, "label": "ř" }
+
+      },
+      "g": {
+        "main": { "$": "auto_text_key", "code":  285, "label": "ĝ" }
+      },
+      "h": {
+        "main": { "$": "auto_text_key", "code": 293, "label": "ĥ" }
+      },
+      "j": {
+        "main": { "$": "auto_text_key", "code": 309, "label": "ĵ" }
+      },
+      "n": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  328, "label": "ň" },
+          { "$": "auto_text_key", "code":  241, "label": "ñ" }
+        ]
+      },
+      "o": {
+        "main": { "$": "auto_text_key", "code":  246, "label": "ö" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
+        ]
+      },
+      "s": {
+        "main": { "$": "auto_text_key", "code":  219, "label": "ș" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  347, "label": "ś" },
+          { "$": "auto_text_key", "code":  349, "label": "ŝ" },
+          { "$": "auto_text_key", "code":  353, "label": "š" }
+        ]
+      },
+      "u": {
+        "main": { "$": "auto_text_key", "code":  251, "label": "û" },
+        "relevant": [
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" }
+        ]
+      },
+      "y": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  253, "label": "ý" }
+        ]
+      },
+      "z": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  382, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".krd" },
+        "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/text/characters/extended_popups/lv.json

@@ -6,68 +6,68 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  257, "label": "ā" }
+          { "$": "auto_text_key", "code":  257, "label": "ā" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  269, "label": "č" }
+          { "$": "auto_text_key", "code":  269, "label": "č" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  275, "label": "ē" },
-          { "code":  8364, "label": "€" }
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  8364, "label": "€" }
         ]
       },
       "g": {
         "relevant": [
-          { "code":  291, "label": "ģ" }
+          { "$": "auto_text_key", "code":  291, "label": "ģ" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  299, "label": "ī" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" }
         ]
       },
       "k": {
         "relevant": [
-          { "code":  311, "label": "ķ" }
+          { "$": "auto_text_key", "code":  311, "label": "ķ" }
         ]
       },
       "l": {
         "relevant": [
-          { "code":  316, "label": "ļ" }
+          { "$": "auto_text_key", "code":  316, "label": "ļ" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  326, "label": "ņ" }
+          { "$": "auto_text_key", "code":  326, "label": "ņ" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  333, "label": "ō" }
+          { "$": "auto_text_key", "code":  333, "label": "ō" }
         ]
       },
       "r": {
         "relevant": [
-          { "code":  343, "label": "ŗ" }
+          { "$": "auto_text_key", "code":  343, "label": "ŗ" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  353, "label": "š" }
+          { "$": "auto_text_key", "code":  353, "label": "š" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  363, "label": "ū" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  382, "label": "ž" }
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/nb.json

@@ -6,61 +6,61 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  229, "label": "å" },
-          { "code":  225, "label": "á" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" },
-          { "code":  257, "label": "ā" },
-          { "code":  230, "label": "æ" },
-          { "code":  228, "label": "ä" },
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  234, "label": "ê" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  248, "label": "ø" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  243, "label": "ó" },
-          { "code":  245, "label": "õ" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  252, "label": "ü" },
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" }
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" }
         ]
       },
       "æ": {
         "relevant": [
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       },
       "ø": {
         "relevant": [
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/nn.json

@@ -6,71 +6,71 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  229, "label": "å" },
-          { "code":  225, "label": "á" },
-          { "code":  226, "label": "â" },
-          { "code":  227, "label": "ã" },
-          { "code":  257, "label": "ā" },
-          { "code":  230, "label": "æ" },
-          { "code":  228, "label": "ä" },
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  257, "label": "ā" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  234, "label": "ê" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  236, "label": "ì" }
+          { "$": "auto_text_key", "code":  236, "label": "ì" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  248, "label": "ø" },
-          { "code":  333, "label": "ō" },
-          { "code":  339, "label": "œ" },
-          { "code":  243, "label": "ó" },
-          { "code":  245, "label": "õ" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  252, "label": "ü" },
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  251, "label": "û" },
-          { "code":  250, "label": "ú" }
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" }
         ]
       },
       "y": {
         "relevant": [
-          { "code": 7923, "label": "ỳ" }
+          { "$": "auto_text_key", "code": 7923, "label": "ỳ" }
         ]
       },
       "æ": {
         "relevant": [
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       },
       "ø": {
         "relevant": [
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/pl.json

@@ -6,49 +6,49 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  261, "label": "ą" },
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  261, "label": "ą" },
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  281, "label": "ę" }
+          { "$": "auto_text_key", "code":  281, "label": "ę" }
         ]
       },
       "l": {
         "relevant": [
-          { "code":  322, "label": "ł" }
+          { "$": "auto_text_key", "code":  322, "label": "ł" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  243, "label": "ó" }
+          { "$": "auto_text_key", "code":  243, "label": "ó" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  347, "label": "ś" }
+          { "$": "auto_text_key", "code":  347, "label": "ś" }
         ]
       },
       "x": {
         "relevant": [
-          { "code":  378, "label": "ź" }
+          { "$": "auto_text_key", "code":  378, "label": "ź" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  378, "label": "ź" },
-          { "code":  380, "label": "ż" }
+          { "$": "auto_text_key", "code":  378, "label": "ź" },
+          { "$": "auto_text_key", "code":  380, "label": "ż" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/pt-BR.json

@@ -6,70 +6,70 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  228, "label": "ä" },
-          { "code":  229, "label": "å" },
-          { "code":  230, "label": "æ" },
-          { "code":  170, "label": "ª" },
-          { "code":  225, "label": "á" },
-          { "code":  227, "label": "ã" },
-          { "code":  224, "label": "à" },
-          { "code":  226, "label": "â" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  269, "label": "č" },
-          { "code":  231, "label": "ç" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  231, "label": "ç" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  275, "label": "ē" },
-          { "code":  281, "label": "ę" },
-          { "code":  279, "label": "ė" },
-          { "code":  235, "label": "ë" },
-          { "code":  234, "label": "ê" },
-          { "code":  233, "label": "é" },
-          { "code":  232, "label": "è" }
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  232, "label": "è" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  299, "label": "ī" },
-          { "code":  239, "label": "ï" },
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  238, "label": "î" },
-          { "code":  237, "label": "í" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  237, "label": "í" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  186, "label": "º" },
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  339, "label": "œ" },
-          { "code":  246, "label": "ö" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  245, "label": "õ" },
-          { "code":  243, "label": "ó" }
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  251, "label": "û" },
-          { "code":  252, "label": "ü" },
-          { "code":  250, "label": "ú" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  251, "label": "û" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/pt.json

@@ -6,70 +6,70 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  228, "label": "ä" },
-          { "code":  229, "label": "å" },
-          { "code":  230, "label": "æ" },
-          { "code":  170, "label": "ª" },
-          { "code":  225, "label": "á" },
-          { "code":  227, "label": "ã" },
-          { "code":  224, "label": "à" },
-          { "code":  226, "label": "â" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  170, "label": "ª" },
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" },
-          { "code":  263, "label": "ć" },
-          { "code":  269, "label": "č" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" },
+          { "$": "auto_text_key", "code":  269, "label": "č" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  235, "label": "ë" },
-          { "code":  279, "label": "ė" },
-          { "code":  275, "label": "ē" },
-          { "code":  233, "label": "é" },
-          { "code":  232, "label": "è" },
-          { "code":  234, "label": "ê" },
-          { "code":  281, "label": "ę" }
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  279, "label": "ė" },
+          { "$": "auto_text_key", "code":  275, "label": "ē" },
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  299, "label": "ī" },
-          { "code":  239, "label": "ï" },
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  237, "label": "í" },
-          { "code":  238, "label": "î" }
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  238, "label": "î" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  241, "label": "ñ" },
-          { "code":  324, "label": "ń" }
+          { "$": "auto_text_key", "code":  241, "label": "ñ" },
+          { "$": "auto_text_key", "code":  324, "label": "ń" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  186, "label": "º" },
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  339, "label": "œ" },
-          { "code":  246, "label": "ö" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  243, "label": "ó" },
-          { "code":  245, "label": "õ" }
+          { "$": "auto_text_key", "code":  186, "label": "º" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  250, "label": "ú" },
-          { "code":  252, "label": "ü" },
-          { "code":  251, "label": "û" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/ro.json

@@ -5,19 +5,19 @@
   "mapping": {
     "all": {
       "a": {
-        "main": { "code": 259, "label": "ă" },
+        "main": { "$": "auto_text_key", "code": 259, "label": "ă" },
         "relevant": [
-          { "code":  226, "label": "â" }
+          { "$": "auto_text_key", "code":  226, "label": "â" }
         ]
       },
       "i": {
-        "main": { "code":  238, "label": "î" }
+        "main": { "$": "auto_text_key", "code":  238, "label": "î" }
       },
       "s": {
-        "main": {"code": 537, "label": "ș"}
+        "main": { "$": "auto_text_key", "code": 537, "label": "ș" }
       },
       "t": {
-        "main": {"code": 539, "label": "ț"}
+        "main": { "$": "auto_text_key", "code": 539, "label": "ț" }
       },
       "~right": {
         "main": { "code":   44, "label": "," },

app/src/main/assets/ime/text/characters/extended_popups/ru.json

@@ -1,12 +1,17 @@
 {
   "type": "characters/extended_popups",
   "name": "ru",
-  "authors": [ "williamtheaker" ],
+  "authors": [ "williamtheaker", "33kk" ],
   "mapping": {
     "all": {
       "е": {
         "relevant": [
-          { "code":  1105, "label": "ё" }
+          { "$": "auto_text_key", "code":  1105, "label": "ё" }
+        ]
+      },
+      "ь": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  1098, "label": "ъ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/sk.json

@@ -0,0 +1,116 @@
+{
+  "type": "characters/extended_popups",
+  "name": "sk",
+  "authors": [ "stefan-misik", "majso" ],
+  "mapping": {
+    "all": {
+      "e": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  283, "label": "ě" }
+        ]
+      },
+      "r": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  341, "label": "ŕ" },
+          { "$": "auto_text_key", "code":  345, "label": "ř" }
+        ]
+      },
+      "t": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  357, "label": "ť" }
+        ]
+      },
+      "y": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  253, "label": "ý" }
+        ]
+      },
+      "u": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  367, "label": "ů" }
+        ]
+      },
+      "i": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  237, "label": "í" }
+        ]
+      },
+      "o": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
+        ]
+      },
+      "a": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  225, "label": "á" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
+        ]
+      },
+      "s": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  353, "label": "š" }
+        ]
+      },
+      "d": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  271, "label": "ď" }
+        ]
+      },
+      "l": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  318, "label": "ľ" },
+          { "$": "auto_text_key", "code":  314, "label": "ĺ" }
+        ]
+      },
+      "z": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
+        ]
+      },
+      "c": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  269, "label": "č" }
+        ]
+      },
+      "n": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  328, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "label": ")" },
+          { "code":   35, "label": "#" },
+          { "code":   33, "label": "!" },
+          { "code":   63, "label": "?" }
+        ]
+      }
+    },
+    "uri": {
+      "~right": {
+        "main": { "code": -255, "label": ".com" },
+        "relevant": [
+          { "code": -255, "label": ".sk" },
+          { "code": -255, "label": ".eu" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/extended_popups/sr.json

@@ -6,22 +6,22 @@
     "all": {
       "c": {
         "relevant": [
-          { "code":  269, "label": "č" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "d": {
         "relevant": [
-          { "code":  273, "label": "đ" }
+          { "$": "auto_text_key", "code":  273, "label": "đ" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  353, "label": "š" }
+          { "$": "auto_text_key", "code":  353, "label": "š" }
         ]
       },
       "z": {
-        "main": { "code":  382, "label": "ž" }
+        "main": { "$": "auto_text_key", "code":  382, "label": "ž" }
       },
       "~right": {
         "main": { "code":   44, "label": "," },

app/src/main/assets/ime/text/characters/extended_popups/sv.json

@@ -6,122 +6,122 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  228, "label": "ä" },
-          { "code":  224, "label": "à" },
-          { "code":  226, "label": "â" },
-          { "code":  261, "label": "ą" },
-          { "code":  227, "label": "ã" },
-          { "code":  229, "label": "å" },
-          { "code":  230, "label": "æ" },
-          { "code":  225, "label": "á" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  224, "label": "à" },
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  261, "label": "ą" },
+          { "$": "auto_text_key", "code":  227, "label": "ã" },
+          { "$": "auto_text_key", "code":  229, "label": "å" },
+          { "$": "auto_text_key", "code":  230, "label": "æ" },
+          { "$": "auto_text_key", "code":  225, "label": "á" }
         ]
       },
       "c": {
         "relevant": [
-          { "code":  231, "label": "ç" },
-          { "code":  269, "label": "č" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  231, "label": "ç" },
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "d": {
         "relevant": [
-          { "code":  240, "label": "ð" },
-          { "code":  271, "label": "ď" }
+          { "$": "auto_text_key", "code":  240, "label": "ð" },
+          { "$": "auto_text_key", "code":  271, "label": "ď" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  234, "label": "ê" },
-          { "code":  232, "label": "è" },
-          { "code":  235, "label": "ë" },
-          { "code":  281, "label": "ę" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" },
+          { "$": "auto_text_key", "code":  232, "label": "è" },
+          { "$": "auto_text_key", "code":  235, "label": "ë" },
+          { "$": "auto_text_key", "code":  281, "label": "ę" }
         ]
       },
       "i": {
         "relevant": [
-          { "code":  237, "label": "í" },
-          { "code":  239, "label": "ï" },
-          { "code":  299, "label": "ī" },
-          { "code":  303, "label": "į" },
-          { "code":  238, "label": "î" },
-          { "code":  236, "label": "ì" }
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" }
         ]
       },
       "l": {
         "relevant": [
-          { "code":  322, "label": "ł" }
+          { "$": "auto_text_key", "code":  322, "label": "ł" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  324, "label": "ń" },
-          { "code":  328, "label": "ň" },
-          { "code":  241, "label": "ñ" }
+          { "$": "auto_text_key", "code":  324, "label": "ń" },
+          { "$": "auto_text_key", "code":  328, "label": "ň" },
+          { "$": "auto_text_key", "code":  241, "label": "ñ" }
         ]
       },
       "o": {
         "relevant": [
-          { "code":  246, "label": "ö" },
-          { "code":  333, "label": "ō" },
-          { "code":  245, "label": "õ" },
-          { "code":  242, "label": "ò" },
-          { "code":  244, "label": "ô" },
-          { "code":  243, "label": "ó" },
-          { "code":  339, "label": "œ" },
-          { "code":  248, "label": "ø" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" },
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" }
         ]
       },
       "r": {
         "relevant": [
-          { "code":  345, "label": "ř" }
+          { "$": "auto_text_key", "code":  345, "label": "ř" }
         ]
       },
       "s": {
         "relevant": [
-          { "code":  347, "label": "ś" },
-          { "code":  353, "label": "š" },
-          { "code":  351, "label": "ş" },
-          { "code":  223, "label": "ß" }
+          { "$": "auto_text_key", "code":  347, "label": "ś" },
+          { "$": "auto_text_key", "code":  353, "label": "š" },
+          { "$": "auto_text_key", "code":  351, "label": "ş" },
+          { "$": "auto_text_key", "code":  223, "label": "ß" }
         ]
       },
       "t": {
         "relevant": [
-          { "code":  357, "label": "ť" },
-          { "code":  254, "label": "þ" }
+          { "$": "auto_text_key", "code":  357, "label": "ť" },
+          { "$": "auto_text_key", "code":  254, "label": "þ" }
         ]
       },
       "u": {
         "relevant": [
-          { "code":  252, "label": "ü" },
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  250, "label": "ú" },
-          { "code":  251, "label": "û" }
+          { "$": "auto_text_key", "code":  252, "label": "ü" },
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  253, "label": "ý" },
-          { "code":  255, "label": "ÿ" }
+          { "$": "auto_text_key", "code":  253, "label": "ý" },
+          { "$": "auto_text_key", "code":  255, "label": "ÿ" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  378, "label": "ź" },
-          { "code":  380, "label": "ż" },
-          { "code":  382, "label": "ž" }
+          { "$": "auto_text_key", "code":  378, "label": "ź" },
+          { "$": "auto_text_key", "code":  380, "label": "ż" },
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
         ]
       },
       "ä": {
         "relevant": [
-          { "code":  230, "label": "æ" }
+          { "$": "auto_text_key", "code":  230, "label": "æ" }
         ]
       },
       "ö": {
         "relevant": [
-          { "code":  248, "label": "ø" },
-          { "code":  339, "label": "œ" }
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/tr.json

@@ -6,93 +6,93 @@
     "all": {
       "a": {
         "relevant": [
-          { "code":  226, "label": "â" },
-          { "code":  228, "label": "ä" },
-          { "code":  225, "label": "á" }
+          { "$": "auto_text_key", "code":  226, "label": "â" },
+          { "$": "auto_text_key", "code":  228, "label": "ä" },
+          { "$": "auto_text_key", "code":  225, "label": "á" }
         ]
       },
       "c": {
-        "main": { "code":  231, "label": "ç" },
+        "main": { "$": "auto_text_key", "code":  231, "label": "ç" },
         "relevant": [
-          { "code":  269, "label": "č" },
-          { "code":  263, "label": "ć" }
+          { "$": "auto_text_key", "code":  269, "label": "č" },
+          { "$": "auto_text_key", "code":  263, "label": "ć" }
         ]
       },
       "e": {
         "relevant": [
-          { "code":  233, "label": "é" },
-          { "code":  601, "label": "ə" },
-          { "code":  234, "label": "ê" }
+          { "$": "auto_text_key", "code":  233, "label": "é" },
+          { "$": "auto_text_key", "code":  601, "label": "ə" },
+          { "$": "auto_text_key", "code":  234, "label": "ê" }
         ]
       },
       "g": {
-        "main": { "code":  287, "label": "ğ" }
+        "main": { "$": "auto_text_key", "code":  287, "label": "ğ" }
       },
       "i": {
-        "main": { "code":  305, "label": "ı" },
+        "main": { "$": "auto_text_key", "code":  305, "label": "ı" },
         "relevant": [
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  237, "label": "í" },
-          { "code":  299, "label": "ī" },
-          { "code":  238, "label": "î" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "ı": {
-        "main": { "code":  105, "label": "i" },
+        "main": { "$": "auto_text_key", "code":  105, "label": "i" },
         "relevant": [
-          { "code":  303, "label": "į" },
-          { "code":  236, "label": "ì" },
-          { "code":  237, "label": "í" },
-          { "code":  299, "label": "ī" },
-          { "code":  238, "label": "î" },
-          { "code":  239, "label": "ï" }
+          { "$": "auto_text_key", "code":  303, "label": "į" },
+          { "$": "auto_text_key", "code":  236, "label": "ì" },
+          { "$": "auto_text_key", "code":  237, "label": "í" },
+          { "$": "auto_text_key", "code":  299, "label": "ī" },
+          { "$": "auto_text_key", "code":  238, "label": "î" },
+          { "$": "auto_text_key", "code":  239, "label": "ï" }
         ]
       },
       "n": {
         "relevant": [
-          { "code":  328, "label": "ň" },
-          { "code":  241, "label": "ñ" }
+          { "$": "auto_text_key", "code":  328, "label": "ň" },
+          { "$": "auto_text_key", "code":  241, "label": "ñ" }
         ]
       },
       "o": {
-        "main": { "code":  246, "label": "ö" },
+        "main": { "$": "auto_text_key", "code":  246, "label": "ö" },
         "relevant": [
-          { "code":  333, "label": "ō" },
-          { "code":  248, "label": "ø" },
-          { "code":  243, "label": "ó" },
-          { "code":  245, "label": "õ" },
-          { "code":  242, "label": "ò" },
-          { "code":  339, "label": "œ" },
-          { "code":  244, "label": "ô" }
+          { "$": "auto_text_key", "code":  333, "label": "ō" },
+          { "$": "auto_text_key", "code":  248, "label": "ø" },
+          { "$": "auto_text_key", "code":  243, "label": "ó" },
+          { "$": "auto_text_key", "code":  245, "label": "õ" },
+          { "$": "auto_text_key", "code":  242, "label": "ò" },
+          { "$": "auto_text_key", "code":  339, "label": "œ" },
+          { "$": "auto_text_key", "code":  244, "label": "ô" }
         ]
       },
       "s": {
-        "main": { "code":  351, "label": "ş" },
+        "main": { "$": "auto_text_key", "code":  351, "label": "ş" },
         "relevant": [
-          { "code":  347, "label": "ś" },
-          { "code":  223, "label": "ß" },
-          { "code":  353, "label": "š" }
+          { "$": "auto_text_key", "code":  347, "label": "ś" },
+          { "$": "auto_text_key", "code":  223, "label": "ß" },
+          { "$": "auto_text_key", "code":  353, "label": "š" }
         ]
       },
       "u": {
-        "main": { "code":  252, "label": "ü" },
+        "main": { "$": "auto_text_key", "code":  252, "label": "ü" },
         "relevant": [
-          { "code":  363, "label": "ū" },
-          { "code":  249, "label": "ù" },
-          { "code":  250, "label": "ú" },
-          { "code":  251, "label": "û" }
+          { "$": "auto_text_key", "code":  363, "label": "ū" },
+          { "$": "auto_text_key", "code":  249, "label": "ù" },
+          { "$": "auto_text_key", "code":  250, "label": "ú" },
+          { "$": "auto_text_key", "code":  251, "label": "û" }
         ]
       },
       "y": {
         "relevant": [
-          { "code":  253, "label": "ý" }
+          { "$": "auto_text_key", "code":  253, "label": "ý" }
         ]
       },
       "z": {
         "relevant": [
-          { "code":  382, "label": "ž" }
+          { "$": "auto_text_key", "code":  382, "label": "ž" }
         ]
       },
       "~right": {

app/src/main/assets/ime/text/characters/extended_popups/uk.json

@@ -0,0 +1,45 @@
+{
+  "type": "characters/extended_popups",
+  "name": "uk",
+  "authors": [ "williamtheaker", "33kk" ],
+  "mapping": {
+    "all": {
+      "і": {
+        "relevant": [
+          { "$": "auto_text_key", "code":  1111, "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": "/" },
+          { "code":   40, "label": "(" },
+          { "code":   41, "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": ".edu" },
+          { "code": -255, "label": ".org" },
+          { "code": -255, "label": ".net" }
+        ]
+      }
+    }
+  }
+}

app/src/main/assets/ime/text/characters/faroese.json

@@ -0,0 +1,44 @@
+{
+  "type": "characters",
+  "name": "faroese",
+  "label": "Faroese (QWERTY)",
+  "authors": [ "BinFlush" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  240, "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":  230, "label": "æ" },
+      { "$": "auto_text_key", "code":  248, "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" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/german.json

@@ -0,0 +1,48 @@
+{
+  "type": "characters",
+  "name": "german",
+  "label": "German (QWERTZ)",
+  "authors": [ "mahmoudk1000" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "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" },
+      { "$": "case_selector",
+        "lower": { "code":  223, "label": "ß" },
+        "upper": { "code": 7838, "label": "ẞ" }
+      }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/greek.json

@@ -1,40 +1,41 @@
 {
   "type": "characters",
   "name": "greek",
+  "label": "Ελληνικά",
   "authors": [ "tsiflimagas" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  894, "label": ";" },
-      { "code":  962, "label": "ς" },
-      { "code":  949, "label": "ε" },
-      { "code":  961, "label": "ρ" },
-      { "code":  964, "label": "τ" },
-      { "code":  965, "label": "υ" },
-      { "code":  952, "label": "θ" },
-      { "code":  953, "label": "ι" },
-      { "code":  959, "label": "ο" },
-      { "code":  960, "label": "π" }
+      { "$": "auto_text_key", "code":  894, "label": ";" },
+      { "$": "auto_text_key", "code":  962, "label": "ς" },
+      { "$": "auto_text_key", "code":  949, "label": "ε" },
+      { "$": "auto_text_key", "code":  961, "label": "ρ" },
+      { "$": "auto_text_key", "code":  964, "label": "τ" },
+      { "$": "auto_text_key", "code":  965, "label": "υ" },
+      { "$": "auto_text_key", "code":  952, "label": "θ" },
+      { "$": "auto_text_key", "code":  953, "label": "ι" },
+      { "$": "auto_text_key", "code":  959, "label": "ο" },
+      { "$": "auto_text_key", "code":  960, "label": "π" }
     ],
     [
-      { "code":  945, "label": "α" },
-      { "code":  963, "label": "σ" },
-      { "code":  948, "label": "δ" },
-      { "code":  966, "label": "φ" },
-      { "code":  947, "label": "γ" },
-      { "code":  951, "label": "η" },
-      { "code":  958, "label": "ξ" },
-      { "code":  954, "label": "κ" },
-      { "code":  955, "label": "λ" }
+      { "$": "auto_text_key", "code":  945, "label": "α" },
+      { "$": "auto_text_key", "code":  963, "label": "σ" },
+      { "$": "auto_text_key", "code":  948, "label": "δ" },
+      { "$": "auto_text_key", "code":  966, "label": "φ" },
+      { "$": "auto_text_key", "code":  947, "label": "γ" },
+      { "$": "auto_text_key", "code":  951, "label": "η" },
+      { "$": "auto_text_key", "code":  958, "label": "ξ" },
+      { "$": "auto_text_key", "code":  954, "label": "κ" },
+      { "$": "auto_text_key", "code":  955, "label": "λ" }
     ],
     [
-      { "code":  950, "label": "ζ" },
-      { "code":  967, "label": "χ" },
-      { "code":  968, "label": "ψ" },
-      { "code":  969, "label": "ω" },
-      { "code":  946, "label": "β" },
-      { "code":  957, "label": "ν" },
-      { "code":  956, "label": "μ" }
+      { "$": "auto_text_key", "code":  950, "label": "ζ" },
+      { "$": "auto_text_key", "code":  967, "label": "χ" },
+      { "$": "auto_text_key", "code":  968, "label": "ψ" },
+      { "$": "auto_text_key", "code":  969, "label": "ω" },
+      { "$": "auto_text_key", "code":  946, "label": "β" },
+      { "$": "auto_text_key", "code":  957, "label": "ν" },
+      { "$": "auto_text_key", "code":  956, "label": "μ" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/halmak.json

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

app/src/main/assets/ime/text/characters/hebrew.json

@@ -1,6 +1,7 @@
 {
   "type": "characters",
   "name": "hebrew",
+  "label": "עברית",
   "authors": [ "Antony" ],
   "direction": "rtl",
   "modifier": "hebrew",
@@ -27,27 +28,27 @@
       { "code":  1508, "label": "פ" }
     ],
     [
-      { "code":  1513, "label": "ף" },
-      { "code":  1491, "label": "ך" },
-      { "code":  1490, "label": "ל" },
-      { "code":  1499, "label": "ח" },
-      { "code":  1506, "label": "י" },
-      { "code":  1497, "label": "ע" },
-      { "code":  1495, "label": "כ" },
-      { "code":  1500, "label": "ג" },
-      { "code":  1498, "label": "ד" },
-      { "code":  1507, "label": "ש" }
+      { "code":  1513, "label": "ש" },
+      { "code":  1491, "label": "ד" },
+      { "code":  1490, "label": "ג" },
+      { "code":  1499, "label": "כ" },
+      { "code":  1506, "label": "ע" },
+      { "code":  1497, "label": "י" },
+      { "code":  1495, "label": "ח" },
+      { "code":  1500, "label": "ל" },
+      { "code":  1498, "label": "ך" },
+      { "code":  1507, "label": "ף" }
     ],
     [
-      { "code":  1494, "label": "ץ" },
-      { "code":  1505, "label": "ת" },
-      { "code":  1489, "label": "צ" },
-      { "code":  1492, "label": "מ" },
+      { "code":  1494, "label": "ז" },
+      { "code":  1505, "label": "ס" },
+      { "code":  1489, "label": "ב" },
+      { "code":  1492, "label": "ה" },
       { "code":  1504, "label": "נ" },
-      { "code":  1502, "label": "ה" },
-      { "code":  1510, "label": "ב" },
-      { "code":  1514, "label": "ס" },
-      { "code":  1509, "label": "ז" }
+      { "code":  1502, "label": "מ" },
+      { "code":  1510, "label": "צ" },
+      { "code":  1514, "label": "ת" },
+      { "code":  1509, "label": "ץ" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/hungarian.json

@@ -1,44 +1,45 @@
 {
   "type": "characters",
   "name": "hungarian",
-  "authors": [ "zoli111" ],
+  "label": "Hungarian",
+  "authors": [ "zoli111, gabik65", "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  122, "label": "z" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  246, "label": "ö" }
+      { "$": "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":  246, "label": "ö" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  233, "label": "é" },
-      { "code":  225, "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":  233, "label": "é" },
+      { "$": "auto_text_key", "code":  225, "label": "á" }
     ],
     [
-      { "code":  121, "label": "y" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" },
-      { "code":  252, "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" },
+      { "$": "auto_text_key", "code":  252, "label": "ü" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/icelandic.json

@@ -1,44 +1,45 @@
 {
   "type": "characters",
   "name": "icelandic",
+  "label": "Icelandic (QWERTY)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  240, "label": "ð" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  240, "label": "ð" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  230, "label": "æ" },
-      { "code":  246, "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":  230, "label": "æ" },
+      { "$": "auto_text_key", "code":  246, "label": "ö" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" },
-      { "code":  254, "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":  254, "label": "þ" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/ipa.json

@@ -0,0 +1,283 @@
+{
+  "type": "characters",
+  "name": "ipa",
+  "label": "International Phonetic Alphabet",
+  "authors": [ "Huy-Ngo" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      {
+        "$": "auto_text_key", "code": 113, "label": "q"
+      },
+      {
+        "$": "auto_text_key", "code": 119, "label": "w",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 695, "label": "◌ʷ" },
+            { "$": "auto_text_key", "code": 653, "label": "ʍ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 101, "label": "e",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 600, "label": "ɘ" },
+            { "$": "auto_text_key", "code": 604, "label": "ɜ" },
+            { "$": "auto_text_key", "code": 601, "label": "ə" },
+            { "$": "auto_text_key", "code": 602, "label": "ɚ" },
+            { "$": "auto_text_key", "code": 7498, "label": "◌ᵊ" },
+            { "$": "auto_text_key", "code": 603, "label": "ɛ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 114, "label": "r",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 637, "label": "ɽ" },
+            { "$": "auto_text_key", "code": 633, "label": "ɹ" },
+            { "$": "auto_text_key", "code": 638, "label": "ɾ" },
+            { "$": "auto_text_key", "code": 635, "label": "ɻ" },
+            { "$": "auto_text_key", "code": 641, "label": "ʁ" },
+            { "$": "auto_text_key", "code": 734, "label": "◌˞" },
+            { "$": "auto_text_key", "code": 640, "label": "ʀ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 116, "label": "t",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 648, "label": "ʈ" },
+            { "$": "auto_text_key", "code": 7615, "label": "◌ᶿ" },
+            { "$": "auto_text_key", "code": 952, "label": "θ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 121, "label": "y",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 612, "label": "ɤ" },
+            { "$": "auto_text_key", "code": 655, "label": "ʏ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 117, "label": "u",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 7551, "label": "ᵿ" },
+            { "$": "auto_text_key", "code": 649, "label": "ʉ" },
+            { "$": "auto_text_key", "code": 650, "label": "ʊ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 105, "label": "i",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 7574, "label": "ᵻ" },
+            { "$": "auto_text_key", "code": 616, "label": "ɨ" },
+            { "$": "auto_text_key", "code": 618, "label": "ɪ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 111, "label": "o",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 664, "label": "ʘ" },
+            { "$": "auto_text_key", "code": 248, "label": "ø" },
+            { "$": "auto_text_key", "code": 606, "label": "ɞ" },
+            { "$": "auto_text_key", "code": 339, "label": "œ" },
+            { "$": "auto_text_key", "code": 629, "label": "ɵ" },
+            { "$": "auto_text_key", "code": 630, "label": "ɶ" },
+            { "$": "auto_text_key", "code": 596, "label": "ɔ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 112, "label": "p"
+      }
+    ],
+    [
+      {
+        "$": "auto_text_key", "code": 97, "label": "a",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 230, "label": "æ" },
+            { "$": "auto_text_key", "code": 594, "label": "ɒ" },
+            { "$": "auto_text_key", "code": 592, "label": "ɐ" },
+            { "$": "auto_text_key", "code": 593, "label": "ɑ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 115, "label": "s",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 642, "label": "ʂ" },
+            { "$": "auto_text_key", "code": 597, "label": "ɕ" },
+            { "$": "auto_text_key", "code": 643, "label": "ʃ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 100, "label": "d",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 598, "label": "ɖ" },
+            { "$": "auto_text_key", "code": 599, "label": "ɗ" },
+            { "$": "auto_text_key", "code": 240, "label": "ð" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 102, "label": "f",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 632, "label": "ɸ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 609, "label": "ɡ",
+        "popup": {
+          "main": { "$": "auto_text_key", "code": 103, "label": "g" },
+          "relevant": [
+            { "$": "auto_text_key", "code": 608, "label": "ɠ" },
+            { "$": "auto_text_key", "code": 610, "label": "ɢ" },
+            { "$": "auto_text_key", "code": 667, "label": "ʛ" },
+            { "$": "auto_text_key", "code": 667, "label": "ʛ" },
+            { "$": "auto_text_key", "code": 736, "label": "◌ˠ" },
+            { "$": "auto_text_key", "code": 611, "label": "ɣ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 104, "label": "h",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 614, "label": "ɦ" },
+            { "$": "auto_text_key", "code": 615, "label": "ɧ" },
+            { "$": "auto_text_key", "code": 295, "label": "ħ" },
+            { "$": "auto_text_key", "code": 613, "label": "ɥ" },
+            { "$": "auto_text_key", "code": 688, "label": "◌ʰ" },
+            { "$": "auto_text_key", "code": 668, "label": "ʜ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 106, "label": "j",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 668, "label": "ʝ" },
+            { "$": "auto_text_key", "code": 607, "label": "ɟ" },
+            { "$": "auto_text_key", "code": 690, "label": "◌ʲ" },
+            { "$": "auto_text_key", "code": 664, "label": "ʄ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 107, "label": "k"
+      },
+      {
+        "$": "auto_text_key", "code": 108, "label": "l",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 620, "label": "ɬ" },
+            { "$": "auto_text_key", "code": 634, "label": "ɺ" },
+            { "$": "auto_text_key", "code": 671, "label": "ʟ" },
+            { "$": "auto_text_key", "code": 654, "label": "ʎ" },
+            { "$": "auto_text_key", "code": 737, "label": "◌ˡ" },
+            { "$": "auto_text_key", "code": 622, "label": "ɮ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 660, "label": "ʔ",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 661, "label": "ʕ" },
+            { "$": "auto_text_key", "code": 674, "label": "ʢ" },
+            { "$": "auto_text_key", "code": 740, "label": "◌ˤ" },
+            { "$": "auto_text_key", "code": 673, "label": "ʡ" }
+          ]
+        }
+      }
+    ],
+    [
+      {
+        "$": "auto_text_key", "code": 122, "label": "z",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 656, "label": "ʐ" },
+            { "$": "auto_text_key", "code": 657, "label": "ʑ" },
+            { "$": "auto_text_key", "code": 658, "label": "ʒ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 120, "label": "x",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 739, "label": "◌ˣ" },
+            { "$": "auto_text_key", "code": 967, "label": "χ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 99, "label": "c",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 231, "label": "ç" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 118, "label": "v",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 651, "label": "ʋ" },
+            { "$": "auto_text_key", "code": 652, "label": "ʌ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 98, "label": "b",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 595, "label": "ɓ" },
+            { "$": "auto_text_key", "code": 665, "label": "ʙ" },
+            { "$": "auto_text_key", "code": 946, "label": "β" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 110, "label": "n",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 626, "label": "ɲ" },
+            { "$": "auto_text_key", "code": 627, "label": "ɳ" },
+            { "$": "auto_text_key", "code": 628, "label": "ɴ" },
+            { "$": "auto_text_key", "code": 8319, "label": "◌ⁿ" },
+            { "$": "auto_text_key", "code": 771, "label": "◌̃" },
+            { "$": "auto_text_key", "code": 631, "label": "ŋ" }
+          ]
+        }
+      },
+      {
+        "$": "auto_text_key", "code": 109, "label": "m",
+        "popup": {
+          "relevant": [
+            { "$": "auto_text_key", "code": 625, "label": "ɱ" },
+            { "$": "auto_text_key", "code": 624, "label": "ɰ" },
+            { "$": "auto_text_key", "code": 623, "label": "ɯ" }
+          ]
+        }
+      }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/jcuken_russian.json

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

app/src/main/assets/ime/text/characters/jcuken_ukrainian.json

@@ -0,0 +1,46 @@
+{
+  "type": "characters",
+  "name": "jcuken_ukrainian",
+  "label": "Ukrainian (JCUKEN)",
+  "authors": [ "williamtheaker", "33kk" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "auto_text_key", "code":  1081, "label": "й" },
+      { "$": "auto_text_key", "code":  1094, "label": "ц" },
+      { "$": "auto_text_key", "code":  1091, "label": "у" },
+      { "$": "auto_text_key", "code":  1082, "label": "к" },
+      { "$": "auto_text_key", "code":  1077, "label": "е" },
+      { "$": "auto_text_key", "code":  1085, "label": "н" },
+      { "$": "auto_text_key", "code":  1075, "label": "г" },
+      { "$": "auto_text_key", "code":  1096, "label": "ш" },
+      { "$": "auto_text_key", "code":  1097, "label": "щ" },
+      { "$": "auto_text_key", "code":  1079, "label": "з" },
+      { "$": "auto_text_key", "code":  1093, "label": "х" }
+    ],
+    [
+      { "$": "auto_text_key", "code": 1092 , "label": "ф" },
+      { "$": "auto_text_key", "code": 1110 , "label": "і" },
+      { "$": "auto_text_key", "code": 1074 , "label": "в" },
+      { "$": "auto_text_key", "code": 1072 , "label": "а" },
+      { "$": "auto_text_key", "code": 1087 , "label": "п" },
+      { "$": "auto_text_key", "code": 1088 , "label": "р" },
+      { "$": "auto_text_key", "code": 1086 , "label": "о" },
+      { "$": "auto_text_key", "code": 1083 , "label": "л" },
+      { "$": "auto_text_key", "code": 1076 , "label": "д" },
+      { "$": "auto_text_key", "code": 1078 , "label": "ж" },
+      { "$": "auto_text_key", "code": 1108 , "label": "є" }
+    ],
+    [
+      { "$": "auto_text_key", "code": 1103 , "label": "я" },
+      { "$": "auto_text_key", "code": 1095 , "label": "ч" },
+      { "$": "auto_text_key", "code": 1089 , "label": "с" },
+      { "$": "auto_text_key", "code": 1084 , "label": "м" },
+      { "$": "auto_text_key", "code": 1080 , "label": "и" },
+      { "$": "auto_text_key", "code": 1090 , "label": "т" },
+      { "$": "auto_text_key", "code": 1100 , "label": "ь" },
+      { "$": "auto_text_key", "code": 1073 , "label": "б" },
+      { "$": "auto_text_key", "code": 1102 , "label": "ю" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/korean.json

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

app/src/main/assets/ime/text/characters/kurdish.json

@@ -1,6 +1,7 @@
 {
   "type": "characters",
   "name": "kurdish",
+  "label": "کوردی (قوەرتی نوێ)",
   "authors": [ "GoRaN" ],
   "direction": "rtl",
   "modifier": "kurdish",
@@ -15,29 +16,43 @@
       { "code":  1749, "label": "ﻪ", "popup": {
         "main": { "code": 1577, "label": "ة" }
       } },
-      { "code":  1585, "label": "ر" },
+      { "code":  1585, "label": "ر", "popup": {
+        "main": { "code": 1685, "label": "ڕ" }
+      } },
       { "code":  1578, "label": "ت", "popup": {
         "main": { "code": 1591, "label": "ط" }
       } },
-      { "code":  1740, "label": "ی" },
+      { "code":  1740, "label": "ی", "popup": {
+        "main": { "code": 1742, "label": "ێ" }
+      } },
       { "code":  1574, "label": "ﺋ", "popup": {
         "main": { "code": 1569, "label": "ء" }
       } },
-      { "code":  1593, "label": "ع" },
+      { "code":  1593, "label": "ع", "popup": {
+        "main": { "code": 1594, "label": "غ" }
+      } },
       { "code":  1734, "label": "ۆ" },
       { "code":  1662, "label": "پ", "popup": {
         "main": { "code": 1579, "label": "ث" }
       } }
     ],
     [
-      { "code":  1575, "label": "ا" },
+      {"code": 1575, "label": "ا"},
       { "code":  1587, "label": "س" },
       { "code":  1588, "label": "ش" },
-      { "code":  1583, "label": "د" },
-      { "code":  1601, "label": "ف" },
+      { "code":  1583, "label": "د", "popup": {
+        "main": {"code": 1584, "label": "ذ" }
+      } },
+      { "code":  1601, "label": "ف" , "popup": {
+        "main": {"code": 1700, "label": "ڤ" }
+      } },
       { "code":  1607, "label": "ھ" },
-      { "code":  1688, "label": "ژ" },
-      { "code":  1604, "label": "ل" },
+      { "code":  1688, "label": "ژ", "popup": {
+        "main": { "code": 1600, "label": "▬" }
+      } },
+      { "code":  1604, "label": "ل", "popup": {
+        "main": { "code": 1717, "label": "ڵ" }
+      } },
       { "code":  1705, "label": "ک" },
       { "code":  1711, "label": "گ" }
     ],

app/src/main/assets/ime/text/characters/kurdish_kurmanci.json

@@ -0,0 +1,46 @@
+{
+  "type": "characters",
+  "name": "kurdish_kurmanci",
+  "label": "Kurdî",
+  "authors": [ "GoRaN" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "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":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  305, "label": "ı" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  251, "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":  234, "label": "ê" },
+      { "$": "auto_text_key", "code":  238, "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/text/characters/kurdish_standard.json

@@ -0,0 +1,74 @@
+{
+  "type": "characters",
+  "name": "kurdish_standard",
+  "label": 	"کوردی (ق‌ڤ‌ف‌غ)",
+  "authors": [ "GoRaN" ],
+  "direction": "rtl",
+  "modifier": "kurdish",
+  "arrangement": [
+    [
+      { "code":  1602, "label": "ق", "popup": {
+        "main": { "code": 1647, "label": "ٯ" }
+      } },
+      { "code":  1700, "label": "ڤ" },
+      { "code":  1601, "label": "ف" },
+      { "code":  1594, "label": "غ" },
+      { "code":  1593, "label": "ع"},
+      { "code":  1607, "label": "ھ" },
+      { "code":  1749, "label": "ﻪ", "popup": {
+        "main": { "code": 1577, "label": "ة" }
+      } },
+
+      { "code":  1578, "label": "ت", "popup": {
+        "main": { "code": 1591, "label": "ط" }
+      } },
+      { "code":  1581, "label": "ح" },
+      { "code":  1582, "label": "خ" }
+    ],
+    [
+      { "code":  1588, "label": "ش" },
+      { "code":  1587, "label": "س" },
+      { "code":  1740, "label": "ی" },
+      { "code":  1742, "label": "ێ" },
+      { "code":  1604, "label": "ل" },
+      { "code":  1717, "label": "ڵ" },
+      { "code":  1575, "label": "ا" },
+      { "code":  1606, "label": "ن" },
+      { "code":  1580, "label": "ج" },
+      { "code":  1670, "label": "چ" }
+    ],
+    [
+      { "code":  1576, "label": "ب" },
+      { "code":  1586, "label": "ز", "popup": {
+        "main": {"code": 1592, "label": "ظ" }
+      } },
+      { "code":  1585, "label": "ر" },
+      { "code":  1685, "label": "ڕ" },
+      { "code":  1583, "label": "د", "popup": {
+        "main": {"code": 1584, "label": "ذ" }
+      } },
+      { "code":  -255, "label": "وو" },
+      { "code":  1608, "label": "و" },
+      { "code":  1734, "label": "ۆ" },
+      { "code":  1705, "label": "ک" },
+      { "code":  1711, "label": "گ" }
+
+    ],
+    [
+
+      { "code":  1574, "label": "ﺋ", "popup": {
+        "main": { "code": 1569, "label": "ء" }
+      } },
+
+      { "code":  1662, "label": "پ", "popup": {
+        "main": { "code": 1579, "label": "ث" }
+      } },
+      { "code":  1688, "label": "ژ" },
+      { "code":  1605, "label": "م" },
+      { "code":  1567, "label": "؟" },
+      { "code":  1548, "label": "،" },
+      { "code":  46, "label": "." }
+
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/mod/$default.json

@@ -1,6 +1,7 @@
 {
   "type": "characters/mod",
-  "name": "default",
+  "name": "$default",
+  "label": "Default",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
@@ -11,17 +12,15 @@
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":   64, "label": "@", "groupId": 1, "variation": "email_address" },
-      { "code":   44, "label": ",", "groupId": 1, "variation": "normal" },
-      { "code":   44, "label": ",", "groupId": 1, "variation": "password" },
-      { "code":   47, "label": "/", "groupId": 1, "variation": "uri" },
+      { "$": "variation_selector",
+        "default":  { "code":   44, "label": ",", "groupId": 1 },
+        "email":    { "code":   64, "label": "@", "groupId": 1 },
+        "uri":      { "code":   47, "label": "/", "groupId": 1 }
+      },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "email_address" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "normal" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "uri" },
+      { "code":   46, "label": ".", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/mod/arabic.json

@@ -1,6 +1,7 @@
 {
   "type": "characters/mod",
   "name": "arabic",
+  "label": "Arabic",
   "authors": [ "HeiWiper" ],
   "direction": "rtl",
   "arrangement": [
@@ -10,17 +11,15 @@
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":   64, "label": "@", "groupId": 1, "variation": "email_address" },
-      { "code": 1548, "label": "،", "groupId": 1, "variation": "normal" },
-      { "code": 1548, "label": "،", "groupId": 1, "variation": "password" },
-      { "code":   47, "label": "/", "groupId": 1, "variation": "uri" },
+      { "$": "variation_selector",
+        "default":  { "code": 1548, "label": "،", "groupId": 1 },
+        "email":    { "code":   64, "label": "@", "groupId": 1 },
+        "uri":      { "code":   47, "label": "/", "groupId": 1 }
+      },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "email_address" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "normal" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "uri" },
+      { "code":   46, "label": ".", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/mod/dvorak.json

@@ -1,6 +1,7 @@
 {
   "type": "characters/mod",
   "name": "dvorak",
+  "label": "Dvorak",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
@@ -11,14 +12,11 @@
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":  113, "label": "q", "groupId": 1 },
+      { "$": "auto_text_key", "code":  113, "label": "q", "groupId": 1 },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code":  122, "label": "z", "groupId": 2, "variation": "email_address" },
-      { "code":  122, "label": "z", "groupId": 2, "variation": "normal" },
-      { "code":  122, "label": "z", "groupId": 2, "variation": "password" },
-      { "code":  122, "label": "z", "groupId": 2, "variation": "uri" },
+      { "$": "auto_text_key", "code":  122, "label": "z", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/mod/hebrew.json

@@ -1,6 +1,7 @@
 {
   "type": "characters/mod",
   "name": "hebrew",
+  "label": "עברית",
   "authors": [ "Antony" ],
   "direction": "rtl",
   "arrangement": [
@@ -10,17 +11,15 @@
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":   64, "label": "@", "groupId": 1, "variation": "email_address" },
-      { "code":   44, "label": ",", "groupId": 1, "variation": "normal" },
-      { "code":   44, "label": ",", "groupId": 1, "variation": "password" },
-      { "code":   47, "label": "/", "groupId": 1, "variation": "uri" },
+      { "$": "variation_selector",
+        "default":  { "code":   44, "label": ",", "groupId": 1 },
+        "email":    { "code":   64, "label": "@", "groupId": 1 },
+        "uri":      { "code":   47, "label": "/", "groupId": 1 }
+      },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "email_address" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "normal" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "uri" },
+      { "code":   46, "label": ".", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/mod/kurdish.json

@@ -1,26 +1,29 @@
 {
   "type": "characters/mod",
   "name": "kurdish",
+  "label": "کوردی",
   "authors": [ "GoRaN" ],
   "direction": "rtl",
   "arrangement": [
     [
+      { "code": 1600, "label": "kashida", "popup":
+      { "main": { "code": 8204, "label": "half_space" }
+      } },
       { "code":    0, "type": "placeholder" },
       { "code":   -5, "label": "delete", "type": "enter_editing" }
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":   64, "label": "@", "groupId": 1, "variation": "email_address" },
-      { "code": 1567, "label": "؟", "groupId": 1, "variation": "normal" },
-      { "code": 1548, "label": "،", "groupId": 1, "variation": "password" },
-      { "code":   47, "label": "/", "groupId": 1, "variation": "uri" },
+      { "$": "variation_selector",
+        "default":  { "code": 1548, "label": "،", "groupId": 1 },
+        "password": { "code": 35, "label": "#", "groupId": 1 },
+        "email":    { "code":   64, "label": "@", "groupId": 1 },
+        "uri":      { "code":   47, "label": "/", "groupId": 1 }
+      },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": " " },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "email_address" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "normal" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "uri" },
+      { "code":   46, "label": ".", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/mod/neo2.json

@@ -0,0 +1,53 @@
+{
+  "type": "characters/mod",
+  "name": "neo2",
+  "label": "Neo2",
+  "authors": [ "ostrya" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "code":   -1, "label": "shift", "type": "modifier" },
+      { "code":    0, "type": "placeholder" },
+      { "code":   -5, "label": "delete", "type": "enter_editing" }
+    ],
+    [
+      { "code": -202, "label": "view_symbols", "type": "system_gui" },
+      { "code": -210, "label": "language_switch", "type": "system_gui" },
+      { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
+      { "code":   32, "label": "space" },
+      { "$": "variation_selector",
+        "default":  { "code":   44, "label": ",", "groupId": 1,
+          "popup": {
+            "main": { "code":   34, "label": "\"" },
+            "relevant": [
+              { "code": 8211, "label": "–" }
+            ]
+          } },
+        "email": { "code":   64, "label": "@", "groupId": 1,
+          "popup": {
+            "relevant": [
+              { "code": 44, "label": "," }
+            ]
+          } },
+        "uri": { "code":   47, "label": "/", "groupId": 1,
+          "popup": {
+            "relevant": [
+              { "code": 44, "label": "," }
+            ]
+          } }
+      },
+      { "$": "variation_selector",
+        "default": { "code":   46, "label": ".", "groupId": 2,
+          "popup": {
+            "relevant": [
+              { "code":  183, "label": "·" },
+              { "code":   39, "label": "'" }
+            ]
+          } },
+        "email": { "code":   46, "label": ".", "groupId": 2 },
+        "uri": { "code":   46, "label": ".", "groupId": 2 }
+      },
+      { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/mod/persian.json

@@ -1,6 +1,7 @@
 {
   "type": "characters/mod",
   "name": "persian",
+  "label": "Persian",
   "authors": [ "PHELAT" ],
   "direction": "rtl",
   "arrangement": [
@@ -10,21 +11,17 @@
     ],
     [
       { "code": -202, "label": "view_symbols", "type": "system_gui" },
-      { "code":   64, "label": "@", "groupId": 1, "variation": "email_address" },
-      { "code": 1548, "label": "،", "groupId": 1, "variation": "normal" },
-      { "code": 1548, "label": "،", "groupId": 1, "variation": "password" },
-      { "code":   47, "label": "/", "groupId": 1, "variation": "uri" },
+      { "$": "variation_selector",
+        "default":  { "code": 1548, "label": "،", "groupId": 1 },
+        "email":    { "code":   64, "label": "@", "groupId": 1 },
+        "uri":      { "code":   47, "label": "/", "groupId": 1 }
+      },
       { "code": -210, "label": "language_switch", "type": "system_gui" },
       { "code": -213, "label": "switch_to_media_context", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code": 8204, "label": "half_space", "variation": "normal" },
-      { "code": 8204, "label": "half_space", "variation": "password" },
-      { "code": 1600, "label": "kashida", "variation": "normal" },
-      { "code": 1600, "label": "kashida", "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "email_address" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "normal" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "password" },
-      { "code":   46, "label": ".", "groupId": 2, "variation": "uri" },
+      { "code": 8204, "label": "half_space" },
+      { "code": 1600, "label": "kashida" },
+      { "code":   46, "label": ".", "groupId": 2 },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/assets/ime/text/characters/neo2.json

@@ -0,0 +1,61 @@
+{
+  "type": "characters",
+  "name": "neo2",
+  "label": "Neo2",
+  "authors": [ "ostrya" ],
+  "direction": "ltr",
+  "modifier": "neo2",
+  "arrangement": [
+    [
+      { "$": "auto_text_key", "code":  120, "label": "x" },
+      { "$": "auto_text_key", "code":  118, "label": "v" },
+      { "$": "auto_text_key", "code":  108, "label": "l" },
+      { "$": "auto_text_key", "code":   99, "label": "c" },
+      { "$": "auto_text_key", "code":  119, "label": "w" },
+      { "$": "auto_text_key", "code":  107, "label": "k" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "auto_text_key", "code":  103, "label": "g" },
+      { "$": "auto_text_key", "code":  102, "label": "f" },
+      { "$": "auto_text_key", "code":  113, "label": "q" },
+      { "$": "case_selector",
+        "lower": {
+          "code":  223, "label": "ß", "popup": {
+            "relevant": [
+              { "code":  180, "label": "´" }
+            ]
+          }
+        },
+        "upper": {
+          "code": 7838, "label": "ẞ", "popup": {
+            "relevant": [
+              { "code":  180, "label": "´" }
+            ]
+          }
+        }
+      }
+    ],
+    [
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  105, "label": "i" },
+      { "$": "auto_text_key", "code":   97, "label": "a" },
+      { "$": "auto_text_key", "code":  101, "label": "e" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  115, "label": "s" },
+      { "$": "auto_text_key", "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  114, "label": "r" },
+      { "$": "auto_text_key", "code":  116, "label": "t" },
+      { "$": "auto_text_key", "code":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  121, "label": "y" }
+    ],
+    [
+      { "$": "auto_text_key", "code":  252, "label": "ü" },
+      { "$": "auto_text_key", "code":  246, "label": "ö" },
+      { "$": "auto_text_key", "code":  228, "label": "ä" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":   98, "label": "b" },
+      { "$": "auto_text_key", "code":  109, "label": "m" },
+      { "$": "auto_text_key", "code":  106, "label": "j" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/characters/norwegian.json

@@ -1,43 +1,44 @@
 {
   "type": "characters",
   "name": "norwegian",
+  "label": "Norwegian (QWERTY)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  229, "label": "å" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  229, "label": "å" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  248, "label": "ø" },
-      { "code":  230, "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":  248, "label": "ø" },
+      { "$": "auto_text_key", "code":  230, "label": "æ" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/persian.json

@@ -1,6 +1,7 @@
 {
   "type": "characters",
   "name": "persian",
+  "label": "Persian",
   "authors": [ "PHELAT" ],
   "direction": "rtl",
   "modifier": "persian",

app/src/main/assets/ime/text/characters/qwerty.json

@@ -1,40 +1,41 @@
 {
   "type": "characters",
   "name": "qwerty",
+  "label": "QWERTY",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" }
+      { "$": "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" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/qwertz.json

@@ -1,40 +1,41 @@
 {
   "type": "characters",
   "name": "qwertz",
+  "label": "QWERTZ",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  122, "label": "z" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "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" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" }
+      { "$": "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" }
     ],
     [
-      { "code":  121, "label": "y" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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/text/characters/serbian_cyrillic.json

@@ -1,44 +1,45 @@
 {
   "type": "characters",
   "name": "serbian_cyrillic",
+  "label": "Serbian (ЉЊЕРТЗ)",
   "authors": ["GrbavaCigla"],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code": 1113, "label": "љ" },
-      { "code": 1114, "label": "њ" },
-      { "code": 1077, "label": "е" },
-      { "code": 1088, "label": "р" },
-      { "code": 1090, "label": "т" },
-      { "code": 1079, "label": "з" },
-      { "code": 1091, "label": "у" },
-      { "code": 1080, "label": "и" },
-      { "code": 1086, "label": "о" },
-      { "code": 1087, "label": "п" },
-      { "code": 1096, "label": "ш" }
+      { "$": "auto_text_key", "code": 1113, "label": "љ" },
+      { "$": "auto_text_key", "code": 1114, "label": "њ" },
+      { "$": "auto_text_key", "code": 1077, "label": "е" },
+      { "$": "auto_text_key", "code": 1088, "label": "р" },
+      { "$": "auto_text_key", "code": 1090, "label": "т" },
+      { "$": "auto_text_key", "code": 1079, "label": "з" },
+      { "$": "auto_text_key", "code": 1091, "label": "у" },
+      { "$": "auto_text_key", "code": 1080, "label": "и" },
+      { "$": "auto_text_key", "code": 1086, "label": "о" },
+      { "$": "auto_text_key", "code": 1087, "label": "п" },
+      { "$": "auto_text_key", "code": 1096, "label": "ш" }
     ],
     [
-      { "code": 1072, "label": "а" },
-      { "code": 1089, "label": "с" },
-      { "code": 1076, "label": "д" },
-      { "code": 1092, "label": "ф" },
-      { "code": 1075, "label": "г" },
-      { "code": 1093, "label": "х" },
-      { "code": 1112, "label": "ј" },
-      { "code": 1082, "label": "к" },
-      { "code": 1083, "label": "л" },
-      { "code": 1095, "label": "ч" },
-      { "code": 1115, "label": "ћ" }
+      { "$": "auto_text_key", "code": 1072, "label": "а" },
+      { "$": "auto_text_key", "code": 1089, "label": "с" },
+      { "$": "auto_text_key", "code": 1076, "label": "д" },
+      { "$": "auto_text_key", "code": 1092, "label": "ф" },
+      { "$": "auto_text_key", "code": 1075, "label": "г" },
+      { "$": "auto_text_key", "code": 1093, "label": "х" },
+      { "$": "auto_text_key", "code": 1112, "label": "ј" },
+      { "$": "auto_text_key", "code": 1082, "label": "к" },
+      { "$": "auto_text_key", "code": 1083, "label": "л" },
+      { "$": "auto_text_key", "code": 1095, "label": "ч" },
+      { "$": "auto_text_key", "code": 1115, "label": "ћ" }
     ],
     [
-      { "code": 1119, "label": "џ" },
-      { "code": 1094, "label": "ц" },
-      { "code": 1074, "label": "в" },
-      { "code": 1073, "label": "б" },
-      { "code": 1085, "label": "н" },
-      { "code": 1084, "label": "м" },
-      { "code": 1106, "label": "ђ" },
-      { "code": 1078, "label": "ж" }
+      { "$": "auto_text_key", "code": 1119, "label": "џ" },
+      { "$": "auto_text_key", "code": 1094, "label": "ц" },
+      { "$": "auto_text_key", "code": 1074, "label": "в" },
+      { "$": "auto_text_key", "code": 1073, "label": "б" },
+      { "$": "auto_text_key", "code": 1085, "label": "н" },
+      { "$": "auto_text_key", "code": 1084, "label": "м" },
+      { "$": "auto_text_key", "code": 1106, "label": "ђ" },
+      { "$": "auto_text_key", "code": 1078, "label": "ж" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/serbian_latin.json

@@ -1,45 +1,46 @@
 {
   "type": "characters",
   "name": "serbian_latin",
+  "label": "Serbian (QWERTZ)",
   "authors": ["GrbavaCigla"],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code": 113, "label": "q" },
-      { "code": 119, "label": "w" },
-      { "code": 101, "label": "e" },
-      { "code": 114, "label": "r" },
-      { "code": 116, "label": "t" },
-      { "code": 122, "label": "z" },
-      { "code": 117, "label": "u" },
-      { "code": 105, "label": "i" },
-      { "code": 111, "label": "o" },
-      { "code": 112, "label": "p" },
-      { "code": 353, "label": "š" }
+      { "$": "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": 353, "label": "š" }
     ],
     [
-      { "code":  97, "label": "a" },
-      { "code": 115, "label": "s" },
-      { "code": 100, "label": "d" },
-      { "code": 102, "label": "f" },
-      { "code": 103, "label": "g" },
-      { "code": 104, "label": "h" },
-      { "code": 106, "label": "j" },
-      { "code": 107, "label": "k" },
-      { "code": 108, "label": "l" },
-      { "code": 269, "label": "č" },
-      { "code": 263, "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": 269, "label": "č" },
+      { "$": "auto_text_key", "code": 263, "label": "ć" }
     ],
     [
-      { "code": 121, "label": "y" },
-      { "code": 120, "label": "x" },
-      { "code":  99, "label": "c" },
-      { "code": 118, "label": "v" },
-      { "code":  98, "label": "b" },
-      { "code": 110, "label": "n" },
-      { "code": 109, "label": "m" },
-      { "code": 273, "label": "đ" },
-      { "code": 382, "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" },
+      { "$": "auto_text_key", "code": 273, "label": "đ" },
+      { "$": "auto_text_key", "code": 382, "label": "ž" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/spanish.json

@@ -1,41 +1,42 @@
 {
   "type": "characters",
   "name": "spanish",
+  "label": "Spanish (QWERTY)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  241, "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":  241, "label": "ñ" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/swedish_finnish.json

@@ -1,43 +1,44 @@
 {
   "type": "characters",
   "name": "swedish_finnish",
+  "label": "Swedish/Finnish (QWERTY)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  229, "label": "å" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "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":  229, "label": "å" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  246, "label": "ö" },
-      { "code":  228, "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": "ä" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/swiss_french.json

@@ -1,55 +1,56 @@
 {
   "type": "characters",
   "name": "swiss_french",
+  "label": "Swiss French (QWERTZ)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  122, "label": "z" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  232, "label": "è", "popup": {
+      { "$": "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":  232, "label": "è", "popup": {
         "relevant": [
-          { "code":  252, "label": "ü" }
+          { "$": "auto_text_key", "code":  252, "label": "ü" }
         ]
       } }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  233, "label": "é", "popup": {
+      { "$": "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":  233, "label": "é", "popup": {
         "relevant": [
-          { "code":  246, "label": "ö" }
+          { "$": "auto_text_key", "code":  246, "label": "ö" }
         ]
       } },
-      { "code":  224, "label": "à", "popup": {
+      { "$": "auto_text_key", "code":  224, "label": "à", "popup": {
         "relevant": [
-          { "code":  228, "label": "ä" }
+          { "$": "auto_text_key", "code":  228, "label": "ä" }
         ]
       } }
     ],
     [
-      { "code":  121, "label": "y" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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/text/characters/swiss_german.json

@@ -1,55 +1,56 @@
 {
   "type": "characters",
   "name": "swiss_german",
+  "label": "Swiss German (QWERTZ)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  122, "label": "z" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  252, "label": "ü", "popup": {
+      { "$": "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": "ü", "popup": {
         "relevant": [
-          { "code":  232, "label": "è" }
+          { "$": "auto_text_key", "code":  232, "label": "è" }
         ]
       } }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  246, "label": "ö", "popup": {
+      { "$": "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": "ö", "popup": {
         "relevant": [
-          { "code":  233, "label": "é" }
+          { "$": "auto_text_key", "code":  233, "label": "é" }
         ]
       } },
-      { "code":  228, "label": "ä", "popup": {
+      { "$": "auto_text_key", "code":  228, "label": "ä", "popup": {
         "relevant": [
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       } }
     ],
     [
-      { "code":  121, "label": "y" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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/text/characters/swiss_italian.json

@@ -1,55 +1,56 @@
 {
   "type": "characters",
   "name": "swiss_italian",
+  "label": "Swiss Italian (QWERTZ)",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  122, "label": "z" },
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  252, "label": "ü", "popup": {
+      { "$": "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": "ü", "popup": {
         "relevant": [
-          { "code":  232, "label": "è" }
+          { "$": "auto_text_key", "code":  232, "label": "è" }
         ]
       } }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  246, "label": "ö", "popup": {
+      { "$": "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": "ö", "popup": {
         "relevant": [
-          { "code":  233, "label": "é" }
+          { "$": "auto_text_key", "code":  233, "label": "é" }
         ]
       } },
-      { "code":  228, "label": "ä", "popup": {
+      { "$": "auto_text_key", "code":  228, "label": "ä", "popup": {
         "relevant": [
-          { "code":  224, "label": "à" }
+          { "$": "auto_text_key", "code":  224, "label": "à" }
         ]
       } }
     ],
     [
-      { "code":  121, "label": "y" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" }
+      { "$": "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/text/characters/turkish_f.json

@@ -1,46 +1,47 @@
 {
   "type": "characters",
   "name": "turkish_f",
+  "label": "Turkish-F",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  287, "label": "ğ" },
-      { "code":  305, "label": "ı" },
-      { "code":  111, "label": "o" },
-      { "code":  100, "label": "d" },
-      { "code":  114, "label": "r" },
-      { "code":  110, "label": "n" },
-      { "code":  104, "label": "h" },
-      { "code":  112, "label": "p" },
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" }
+      { "$": "auto_text_key", "code":  102, "label": "f" },
+      { "$": "auto_text_key", "code":  103, "label": "g" },
+      { "$": "auto_text_key", "code":  287, "label": "ğ" },
+      { "$": "auto_text_key", "code":  305, "label": "ı" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  114, "label": "r" },
+      { "$": "auto_text_key", "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  113, "label": "q" },
+      { "$": "auto_text_key", "code":  119, "label": "w" }
     ],
     [
-      { "code":  117, "label": "u" },
-      { "code":  105, "label": "i" },
-      { "code":  101, "label": "e" },
-      { "code":   97, "label": "a" },
-      { "code":  252, "label": "ü" },
-      { "code":  116, "label": "t" },
-      { "code":  107, "label": "k" },
-      { "code":  109, "label": "m" },
-      { "code":  108, "label": "l" },
-      { "code":  121, "label": "y" },
-      { "code":  351, "label": "ş" }
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  105, "label": "i" },
+      { "$": "auto_text_key", "code":  101, "label": "e" },
+      { "$": "auto_text_key", "code":   97, "label": "a" },
+      { "$": "auto_text_key", "code":  252, "label": "ü" },
+      { "$": "auto_text_key", "code":  116, "label": "t" },
+      { "$": "auto_text_key", "code":  107, "label": "k" },
+      { "$": "auto_text_key", "code":  109, "label": "m" },
+      { "$": "auto_text_key", "code":  108, "label": "l" },
+      { "$": "auto_text_key", "code":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  351, "label": "ş" }
     ],
     [
-      { "code":  106, "label": "j" },
-      { "code":  246, "label": "ö" },
-      { "code":  118, "label": "v" },
-      { "code":   99, "label": "c" },
-      { "code":  231, "label": "ç" },
-      { "code":  122, "label": "z" },
-      { "code":  115, "label": "s" },
-      { "code":   98, "label": "b" },
-      { "code":  120, "label": "x" }
+      { "$": "auto_text_key", "code":  106, "label": "j" },
+      { "$": "auto_text_key", "code":  246, "label": "ö" },
+      { "$": "auto_text_key", "code":  118, "label": "v" },
+      { "$": "auto_text_key", "code":   99, "label": "c" },
+      { "$": "auto_text_key", "code":  231, "label": "ç" },
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":  115, "label": "s" },
+      { "$": "auto_text_key", "code":   98, "label": "b" },
+      { "$": "auto_text_key", "code":  120, "label": "x" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/turkish_q.json

@@ -1,46 +1,47 @@
 {
   "type": "characters",
   "name": "turkish_q",
+  "label": "Turkish-Q",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [
     [
-      { "code":  113, "label": "q" },
-      { "code":  119, "label": "w" },
-      { "code":  101, "label": "e" },
-      { "code":  114, "label": "r" },
-      { "code":  116, "label": "t" },
-      { "code":  121, "label": "y" },
-      { "code":  117, "label": "u" },
-      { "code":  305, "label": "ı" },
-      { "code":  111, "label": "o" },
-      { "code":  112, "label": "p" },
-      { "code":  287, "label": "ğ" },
-      { "code":  252, "label": "ü" }
+      { "$": "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":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  305, "label": "ı" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "auto_text_key", "code":  287, "label": "ğ" },
+      { "$": "auto_text_key", "code":  252, "label": "ü" }
     ],
     [
-      { "code":   97, "label": "a" },
-      { "code":  115, "label": "s" },
-      { "code":  100, "label": "d" },
-      { "code":  102, "label": "f" },
-      { "code":  103, "label": "g" },
-      { "code":  104, "label": "h" },
-      { "code":  106, "label": "j" },
-      { "code":  107, "label": "k" },
-      { "code":  108, "label": "l" },
-      { "code":  351, "label": "ş" },
-      { "code":  105, "label": "i" }
+      { "$": "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":  351, "label": "ş" },
+      { "$": "auto_text_key", "code":  105, "label": "i" }
     ],
     [
-      { "code":  122, "label": "z" },
-      { "code":  120, "label": "x" },
-      { "code":   99, "label": "c" },
-      { "code":  118, "label": "v" },
-      { "code":   98, "label": "b" },
-      { "code":  110, "label": "n" },
-      { "code":  109, "label": "m" },
-      { "code":  246, "label": "ö" },
-      { "code":  231, "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":  246, "label": "ö" },
+      { "$": "auto_text_key", "code":  231, "label": "ç" }
     ]
   ]
 }

app/src/main/assets/ime/text/characters/workman.json

@@ -0,0 +1,53 @@
+{
+  "type": "characters",
+  "name": "workman",
+  "label": "Workman",
+  "authors": [ "icyphox" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "$": "auto_text_key", "code":  113, "label": "q" },
+      { "$": "auto_text_key", "code":  100, "label": "d" },
+      { "$": "auto_text_key", "code":  114, "label": "r" },
+      { "$": "auto_text_key", "code":  119, "label": "w" },
+      { "$": "auto_text_key", "code":   98, "label": "b" },
+      { "$": "auto_text_key", "code":  106, "label": "j" },
+      { "$": "auto_text_key", "code":  102, "label": "f" },
+      { "$": "auto_text_key", "code":  117, "label": "u" },
+      { "$": "auto_text_key", "code":  112, "label": "p" },
+      { "$": "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":  115, "label": "s" },
+      { "$": "auto_text_key", "code":  104, "label": "h" },
+      { "$": "auto_text_key", "code":  116, "label": "t" },
+      { "$": "auto_text_key", "code":  103, "label": "g" },
+      { "$": "auto_text_key", "code":  121, "label": "y" },
+      { "$": "auto_text_key", "code":  110, "label": "n" },
+      { "$": "auto_text_key", "code":  101, "label": "e" },
+      { "$": "auto_text_key", "code":  111, "label": "o" },
+      { "$": "auto_text_key", "code":  105, "label": "i" }
+    ],
+    [
+      { "$": "auto_text_key", "code":  122, "label": "z" },
+      { "$": "auto_text_key", "code":  120, "label": "x" },
+      { "$": "auto_text_key", "code":  109, "label": "m" },
+      { "$": "auto_text_key", "code":   99, "label": "c" },
+      { "$": "auto_text_key", "code":  118, "label": "v" },
+      { "$": "auto_text_key", "code":  107, "label": "k" },
+      { "$": "auto_text_key", "code":  108, "label": "l" }
+    ]
+  ]
+}

app/src/main/assets/ime/text/extension/clipboard_cursor_row.json

@@ -1,6 +1,7 @@
 {
   "type": "extension",
   "name": "clipboard_cursor_row",
+  "label": "Clipboard Cursor Row",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [

app/src/main/assets/ime/text/numeric/advanced/western_arabic.json

@@ -1,6 +1,7 @@
 {
   "type": "numeric_advanced",
-  "name": "default",
+  "name": "western_arabic",
+  "label": "Western Arabic",
   "authors": [ "patrickgold" ],
   "direction": "ltr",
   "arrangement": [

app/src/main/assets/ime/text/numeric/row/bengali.json

@@ -0,0 +1,91 @@
+{
+  "type": "numeric_row",
+  "name": "bengali",
+  "label": "Bengali",
+  "authors": [ "yashpalgoyal1304" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "code": 2535, "label": "১", "type": "numeric", "popup": {
+        "main": { "code":   49, "label": "1" },
+        "relevant": [
+          { "code": 8537, "label": "⅙" },
+          { "code": 8528, "label": "⅐" },
+          { "code": 8539, "label": "⅛" },
+          { "code": 8529, "label": "⅑" },
+          { "code": 8530, "label": "⅒" },
+          { "code":  185, "label": "¹" },
+          { "code":  189, "label": "½" },
+          { "code": 8531, "label": "⅓" },
+          { "code":  188, "label": "¼" },
+          { "code": 8533, "label": "⅕" }
+        ]
+      } },
+      { "code": 2536, "label": "২", "type": "numeric", "popup": {
+        "main": { "code":   50, "label": "2" },
+        "relevant": [
+          { "code": 8532, "label": "⅔" },
+          { "code":  178, "label": "²" },
+          { "code": 8534, "label": "⅖" }
+        ]
+      } },
+      { "code": 2537, "label": "৩", "type": "numeric", "popup": {
+        "main": { "code":   51, "label": "3" },
+        "relevant": [
+          { "code": 8535, "label": "⅗" },
+          { "code":  190, "label": "¾" },
+          { "code":  179, "label": "³" },
+          { "code": 8540, "label": "⅜" }
+        ]
+      } },
+      { "code": 2538, "label": "৪", "type": "numeric", "popup": {
+        "main": { "code":   52, "label": "4" },
+        "relevant": [
+          { "code": 8536, "label": "⅘" },
+          { "code": 8308, "label": "⁴" }
+        ]
+      } },
+      { "code": 2539, "label": "৫", "type": "numeric", "popup": {
+        "main": { "code":   53, "label": "5" },
+        "relevant": [
+          { "code": 8538, "label": "⅚" },
+          { "code": 8309, "label": "⁵" },
+          { "code": 8541, "label": "⅝" }
+        ]
+      } },
+      { "code": 2540, "label": "৬", "type": "numeric", "popup": {
+        "main": { "code":   54, "label": "6" },
+        "relevant": [
+          { "code": 8310, "label": "⁶" }
+        ]
+      } },
+      { "code": 2541, "label": "৭", "type": "numeric", "popup": {
+        "main": { "code":   55, "label": "7" },
+        "relevant": [
+          { "code": 8542, "label": "⅞" },
+          { "code": 8311, "label": "⁷" }
+        ]
+      } },
+      { "code": 2542, "label": "৮", "type": "numeric", "popup": {
+        "main": { "code":   56, "label": "8" },
+        "relevant": [
+          { "code": 8312, "label": "⁸" }
+        ]
+      } },
+      { "code": 2543, "label": "৯", "type": "numeric", "popup": {
+        "main": { "code":   57, "label": "9" },
+        "relevant": [
+          { "code": 8313, "label": "⁹" }
+        ]
+      } },
+      { "code": 2534, "label": "০", "type": "numeric", "popup": {
+        "main": { "code":   48, "label": "0" },
+        "relevant": [
+          { "code": 8319, "label": "ⁿ" },
+          { "code": 8709, "label": "∅" },
+          { "code": 8304, "label": "⁰" }
+        ]
+      } }
+    ]
+  ]
+}

app/src/main/assets/ime/text/numeric/row/devanagari.json

@@ -0,0 +1,91 @@
+{
+  "type": "numeric_row",
+  "name": "devanagari",
+  "label": "Devanagari",
+  "authors": [ "yashpalgoyal1304" ],
+  "direction": "ltr",
+  "arrangement": [
+    [
+      { "code": 2407, "label": "१", "type": "numeric", "popup": {
+        "main": { "code":   49, "label": "1" },
+        "relevant": [
+          { "code": 8537, "label": "⅙" },
+          { "code": 8528, "label": "⅐" },
+          { "code": 8539, "label": "⅛" },
+          { "code": 8529, "label": "⅑" },
+          { "code": 8530, "label": "⅒" },
+          { "code":  185, "label": "¹" },
+          { "code":  189, "label": "½" },
+          { "code": 8531, "label": "⅓" },
+          { "code":  188, "label": "¼" },
+          { "code": 8533, "label": "⅕" }
+        ]
+      } },
+      { "code": 2408, "label": "२", "type": "numeric", "popup": {
+        "main": { "code":   50, "label": "2" },
+        "relevant": [
+          { "code": 8532, "label": "⅔" },
+          { "code":  178, "label": "²" },
+          { "code": 8534, "label": "⅖" }
+        ]
+      } },
+      { "code": 2409, "label": "३", "type": "numeric", "popup": {
+        "main": { "code":   51, "label": "3" },
+        "relevant": [
+          { "code": 8535, "label": "⅗" },
+          { "code":  190, "label": "¾" },
+          { "code":  179, "label": "³" },
+          { "code": 8540, "label": "⅜" }
+        ]
+      } },
+      { "code": 2410, "label": "४", "type": "numeric", "popup": {
+        "main": { "code":   52, "label": "4" },
+        "relevant": [
+          { "code": 8536, "label": "⅘" },
+          { "code": 8308, "label": "⁴" }
+        ]
+      } },
+      { "code": 2411, "label": "५", "type": "numeric", "popup": {
+        "main": { "code":   53, "label": "5" },
+        "relevant": [
+          { "code": 8538, "label": "⅚" },
+          { "code": 8309, "label": "⁵" },
+          { "code": 8541, "label": "⅝" }
+        ]
+      } },
+      { "code": 2412, "label": "६", "type": "numeric", "popup": {
+        "main": { "code":   54, "label": "6" },
+        "relevant": [
+          { "code": 8310, "label": "⁶" }
+        ]
+      } },
+      { "code": 2413, "label": "७", "type": "numeric", "popup": {
+        "main": { "code":   55, "label": "7" },
+        "relevant": [
+          { "code": 8542, "label": "⅞" },
+          { "code": 8311, "label": "⁷" }
+        ]
+      } },
+      { "code": 2414, "label": "८", "type": "numeric", "popup": {
+        "main": { "code":   56, "label": "8" },
+        "relevant": [
+          { "code": 8312, "label": "⁸" }
+        ]
+      } },
+      { "code": 2415, "label": "९", "type": "numeric", "popup": {
+        "main": { "code":   57, "label": "9" },
+        "relevant": [
+          { "code": 8313, "label": "⁹" }
+        ]
+      } },
+      { "code": 2406, "label": "०", "type": "numeric", "popup": {
+        "main": { "code":   48, "label": "0" },
+        "relevant": [
+          { "code": 8319, "label": "ⁿ" },
+          { "code": 8709, "label": "∅" },
+          { "code": 8304, "label": "⁰" }
+        ]
+      } }
+    ]
+  ]
+}