diff --git a/.gitignore b/.gitignore
index 1b5e163b47..64bb3d1da2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ crashreporting.properties
 keystore.properties
 key.jks
 java/res/raw/mozc.data
-.cxx
\ No newline at end of file
+.cxx
+java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index d9a71aca8b..ef9b2cefb4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "java/res-large"]
 	path = java/res-large
 	url = https://gitlab.futo.org/keyboard/keyboard-large-resources.git
+[submodule "java/assets/futo-swipe"]
+	path = java/assets/futo-swipe
+	url = https://huggingface.co/futo-org/futo-swipe
diff --git a/build.gradle b/build.gradle
index 7c2dd8e0ac..ff935b94b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -366,6 +366,12 @@ android {
         mlModelBinding true
         buildConfig true
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 dependencies {
@@ -375,7 +381,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.4'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4'
     implementation 'androidx.activity:activity-compose:1.9.1'
-    implementation platform('androidx.compose:compose-bom:2024.06.00')
+    implementation platform('androidx.compose:compose-bom:2025.06.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -383,7 +389,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-compose:2.7.7'
+    implementation 'androidx.navigation:navigation-compose:2.10.0-alpha02'
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
@@ -396,7 +402,7 @@ dependencies {
     unstableImplementation 'ch.acra:acra-mail:5.11.1'
     unstableImplementation 'ch.acra:acra-dialog:5.11.1'
 
-    implementation 'sh.calvin.reorderable:reorderable:2.2.0'
+    implementation 'sh.calvin.reorderable:reorderable:3.0.0'
 
     //implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1'
@@ -420,6 +426,8 @@ dependencies {
     implementation files('libs/rime-release.aar')
     // End for RIME
 
+    implementation files('libs/futo-swipe-release.aar')
+
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
diff --git a/common/src/org/futo/inputmethod/latin/common/InputPointers.java b/common/src/org/futo/inputmethod/latin/common/InputPointers.java
index a66e020d99..57d62651e0 100644
--- a/common/src/org/futo/inputmethod/latin/common/InputPointers.java
+++ b/common/src/org/futo/inputmethod/latin/common/InputPointers.java
@@ -16,19 +16,41 @@
 
 package org.futo.inputmethod.latin.common;
 
+import android.util.Log;
+
 import org.futo.inputmethod.annotations.UsedForTesting;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import javax.annotation.Nonnull;
 
+import kotlin.Pair;
+
 // TODO: This class is not thread-safe.
 public final class InputPointers {
+    public static final class GestureSegment {
+        public final int pointerId;
+        public final ResizableIntArray x = new ResizableIntArray(0);
+        public final ResizableIntArray y = new ResizableIntArray(0);
+        public final ResizableIntArray t = new ResizableIntArray(0);
+
+        public GestureSegment(int pointerId) {
+            this.pointerId = pointerId;
+        }
+    }
     private static final boolean DEBUG_TIME = false;
+    private static final boolean DEBUG_TRACE = false;
+    private static final String TAG = "InputPointers";
 
     private final int mDefaultCapacity;
     private final ResizableIntArray mXCoordinates;
     private final ResizableIntArray mYCoordinates;
     private final ResizableIntArray mPointerIds;
     private final ResizableIntArray mTimes;
+    private final ArrayList<GestureSegment> mGestureSegments = new ArrayList<>();
+    private final HashMap<Integer, GestureSegment> mActivePointerSegments = new HashMap<>();
 
     public InputPointers(final int defaultCapacity) {
         mDefaultCapacity = defaultCapacity;
@@ -73,17 +95,27 @@ public void addPointer(final int x, final int y, final int pointerId, final int
     }
 
     public void set(@Nonnull final InputPointers ip) {
+        if(DEBUG_TRACE) Log.d(TAG, "set " + System.identityHashCode(this) + " ip=" + System.identityHashCode(ip));
         mXCoordinates.set(ip.mXCoordinates);
         mYCoordinates.set(ip.mYCoordinates);
         mPointerIds.set(ip.mPointerIds);
         mTimes.set(ip.mTimes);
+
+        mGestureSegments.clear();
+        mGestureSegments.addAll(ip.getGestureSegments());
+        mActivePointerSegments.clear();
     }
 
     public void copy(@Nonnull final InputPointers ip) {
+        if(DEBUG_TRACE) Log.d(TAG, "copy " + System.identityHashCode(this) + " ip=" + System.identityHashCode(ip));
         mXCoordinates.copy(ip.mXCoordinates);
         mYCoordinates.copy(ip.mYCoordinates);
         mPointerIds.copy(ip.mPointerIds);
         mTimes.copy(ip.mTimes);
+
+        mGestureSegments.clear();
+        mGestureSegments.addAll(ip.getGestureSegments());
+        mActivePointerSegments.clear();
     }
 
     /**
@@ -99,6 +131,12 @@ public void copy(@Nonnull final InputPointers ip) {
     public void append(final int pointerId, @Nonnull final ResizableIntArray times,
             @Nonnull final ResizableIntArray xCoordinates,
             @Nonnull final ResizableIntArray yCoordinates, final int startPos, final int length) {
+        if(DEBUG_TRACE) {
+            Log.d(TAG, "add " + pointerId + " " + length + " " + System.identityHashCode(this) + " " + Thread.currentThread().getId());
+            Log.d(TAG, "  x:" + xCoordinates.get(startPos) + "->" + xCoordinates.get(startPos + length - 1));
+            Log.d(TAG, "  y:" + yCoordinates.get(startPos) + "->" + yCoordinates.get(startPos + length - 1));
+            Log.d(TAG, "  t:" + times.get(startPos) + "->" + times.get(startPos + length - 1));
+        }
         if (length == 0) {
             return;
         }
@@ -106,6 +144,27 @@ public void append(final int pointerId, @Nonnull final ResizableIntArray times,
         mYCoordinates.append(yCoordinates, startPos, length);
         mPointerIds.fill(pointerId, mPointerIds.getLength(), length);
         mTimes.append(times, startPos, length);
+
+        GestureSegment seg = mActivePointerSegments.get(pointerId);
+        if(seg == null) {
+            Log.e(TAG, "Attempting to append points to pointerId " + pointerId + " which was not pressed down!!");
+            return;
+        }
+        seg.x.append(xCoordinates, startPos, length);
+        seg.y.append(yCoordinates, startPos, length);
+        seg.t.append(times, startPos, length);
+    }
+
+    public void onPointerDown(final int pointerId) {
+        if(DEBUG_TRACE) Log.d(TAG, "down " + pointerId + " " + System.identityHashCode(this));
+        GestureSegment seg = new GestureSegment(pointerId);
+        mActivePointerSegments.put(pointerId, seg);
+        mGestureSegments.add(seg);
+
+    }
+    public void onPointerUp(final int pointerId) {
+        if(DEBUG_TRACE) Log.d(TAG, "up " + pointerId + " " + System.identityHashCode(this));
+        //mActivePointerSegments.remove(pointerId);
     }
 
     /**
@@ -118,9 +177,18 @@ public void shift(final int elementCount) {
         mYCoordinates.shift(elementCount);
         mPointerIds.shift(elementCount);
         mTimes.shift(elementCount);
+
+        for(int i=0; i<elementCount; i++) mGestureSegments.remove(0);
     }
 
     public void reset() {
+        if(DEBUG_TRACE) Log.d(TAG, "reset full" + Thread.currentThread().getId());
+        resetNonBatch();
+        resetForBatch();
+    }
+
+    public void resetNonBatch() {
+        if(DEBUG_TRACE) Log.d(TAG, "(reset nonbatch)" + Thread.currentThread().getId());
         final int defaultCapacity = mDefaultCapacity;
         mXCoordinates.reset(defaultCapacity);
         mYCoordinates.reset(defaultCapacity);
@@ -128,6 +196,17 @@ public void reset() {
         mTimes.reset(defaultCapacity);
     }
 
+    public void resetForBatch() {
+        if(DEBUG_TRACE) Log.d(TAG, "(reset forbatch)" + Thread.currentThread().getId());
+        mGestureSegments.clear();
+        mActivePointerSegments.clear();
+    }
+
+    public void upAllPointers() {
+        if(DEBUG_TRACE) Log.d(TAG, "up all pointers " + Thread.currentThread().getId());
+        mActivePointerSegments.clear();
+    }
+
     public int getPointerSize() {
         return mXCoordinates.getLength();
     }
@@ -147,6 +226,9 @@ public int[] getPointerIds() {
         return mPointerIds.getPrimitiveArray();
     }
 
+    @Nonnull
+    public List<GestureSegment> getGestureSegments() { return mGestureSegments; }
+
     /**
      * Gets the time each point was registered, in milliseconds, relative to the first event in the
      * sequence.
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 4e35aa3b63..f6fc23d292 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -27,6 +27,12 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
 
+    <!-- For clipboard manager reading screenshots -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"
+        android:minSdkVersion="33" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove"/>
 
     <application android:label="@string/english_ime_name"
@@ -35,6 +41,7 @@
          android:supportsRtl="true"
          android:allowBackup="true"
          android:largeHeap="true"
+         android:enableOnBackInvokedCallback="true"
          android:name=".CrashLoggingApplication">
 
         <!-- Services -->
@@ -182,13 +189,20 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
+            tools:node="remove"
+            tools:ignore="MissingClass" />
 
         <provider
             android:authorities="${applicationId}.font"
             android:name=".content.KbContentProvider"
             android:exported="false"
             android:grantUriPermissions="true" />
+
+        <provider
+            android:authorities="${applicationId}.clipboard"
+            android:name=".uix.actions.clipboard.ClipboardProvider"
+            android:exported="false"
+            android:grantUriPermissions="true" />
     </application>
 
     <!-- To query enabled input methods for voice IME detection -->
diff --git a/java/assets/fonts/NotoColorEmoji_api24.ttf b/java/assets/fonts/NotoColorEmoji_api24.ttf
new file mode 100644
index 0000000000..f8ac129609
Binary files /dev/null and b/java/assets/fonts/NotoColorEmoji_api24.ttf differ
diff --git a/java/assets/futo-swipe b/java/assets/futo-swipe
new file mode 160000
index 0000000000..a504628aa1
--- /dev/null
+++ b/java/assets/futo-swipe
@@ -0,0 +1 @@
+Subproject commit a504628aa184913a1bc23296933e76db113712d3
diff --git a/java/assets/layouts b/java/assets/layouts
index 18717a7c84..e382094f56 160000
--- a/java/assets/layouts
+++ b/java/assets/layouts
@@ -1 +1 @@
-Subproject commit 18717a7c8451da6240df2d6fcb087d9c7b3eab90
+Subproject commit e382094f5635c4bfade2aed55fb60ede3ec3bb82
diff --git a/java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/ar-sw600dp.xml
similarity index 100%
rename from java/res/values-ar-sw600dp/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/ar-sw600dp.xml
diff --git a/java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/ar.xml
similarity index 100%
rename from java/res/values-ar/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/ar.xml
diff --git a/java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/default-sw600dp.xml
similarity index 100%
rename from java/res/values-sw600dp/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/default-sw600dp.xml
diff --git a/java/res/values/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/default.xml
similarity index 100%
rename from java/res/values/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/default.xml
diff --git a/java/res/values-el/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/el.xml
similarity index 100%
rename from java/res/values-el/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/el.xml
diff --git a/java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/fa-sw600dp.xml
similarity index 100%
rename from java/res/values-fa-sw600dp/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/fa-sw600dp.xml
diff --git a/java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/fa.xml
similarity index 100%
rename from java/res/values-fa/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/fa.xml
diff --git a/java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/fr-rCA.xml
similarity index 100%
rename from java/res/values-fr-rCA/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/fr-rCA.xml
diff --git a/java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/fr.xml
similarity index 100%
rename from java/res/values-fr/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/fr.xml
diff --git a/java/res/values-hi/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/hi.xml
similarity index 100%
rename from java/res/values-hi/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/hi.xml
diff --git a/java/res/values-hy/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/hy.xml
similarity index 100%
rename from java/res/values-hy/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/hy.xml
diff --git a/java/res/values-iw-sw600dp/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/iw-sw600dp.xml
similarity index 100%
rename from java/res/values-iw-sw600dp/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/iw-sw600dp.xml
diff --git a/java/res/values-iw/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/iw.xml
similarity index 100%
rename from java/res/values-iw/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/iw.xml
diff --git a/java/res/values-km/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/km.xml
similarity index 100%
rename from java/res/values-km/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/km.xml
diff --git a/java/res/values-lo/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/lo.xml
similarity index 100%
rename from java/res/values-lo/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/lo.xml
diff --git a/java/res/values-th/donottranslate-config-spacing-and-punctuations.xml b/java/assets/spacing-and-punctuations/th.xml
similarity index 100%
rename from java/res/values-th/donottranslate-config-spacing-and-punctuations.xml
rename to java/assets/spacing-and-punctuations/th.xml
diff --git a/java/res-large b/java/res-large
index 17f3030148..d87d9dbdf3 160000
--- a/java/res-large
+++ b/java/res-large
@@ -1 +1 @@
-Subproject commit 17f303014869d7a8ea1bef72489bae2141cdbdf8
+Subproject commit d87d9dbdf3966bbe18413be375dab2f6c7bbdfdd
diff --git a/java/res/drawable/ripple_emoji_view.xml b/java/res/drawable/ripple_emoji_view.xml
index f42fea4aa6..4fcd196066 100644
--- a/java/res/drawable/ripple_emoji_view.xml
+++ b/java/res/drawable/ripple_emoji_view.xml
@@ -15,7 +15,7 @@
   -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorAccent">
+    android:color="@android:color/white">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <corners android:radius="12dp" />
diff --git a/java/res/drawable/swipemodel_indicator.xml b/java/res/drawable/swipemodel_indicator.xml
new file mode 100644
index 0000000000..22d90419dd
--- /dev/null
+++ b/java/res/drawable/swipemodel_indicator.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="6.01dp"
+    android:viewportWidth="14"
+    android:viewportHeight="6.01">
+  <path
+      android:pathData="M1.647,3.725C1.647,3.725 1.647,3.215 3.42,1.648C5.922,-0.565 7.944,5.31 11.093,3.445C12.353,2.698 12.353,1.913 12.353,1.913"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1.647,4.267C1.647,4.267 1.647,3.756 3.42,2.189C5.922,-0.024 7.944,5.852 11.093,3.986C12.353,3.24 12.353,2.454 12.353,2.454"
+      android:strokeAlpha="0.66"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1.647,4.777C1.647,4.777 1.647,4.267 3.42,2.699C5.922,0.487 7.944,6.362 11.093,4.496C12.353,3.75 12.353,2.964 12.353,2.964"
+      android:strokeAlpha="0.33"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/java/res/layout/emoji_category.xml b/java/res/layout/emoji_category.xml
index 9c3203ffb9..e998741b6b 100644
--- a/java/res/layout/emoji_category.xml
+++ b/java/res/layout/emoji_category.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="#00000000"
-    android:paddingTop="24dp"
-    android:paddingBottom="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:textSize="22sp"/>
\ No newline at end of file
+    android:paddingTop="16dp"
+    android:paddingBottom="4dp"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:textSize="16sp"
+    android:fontFamily="sans-serif-medium"/>
\ No newline at end of file
diff --git a/java/res/raw/gemoji.jsongz b/java/res/raw/gemoji.jsongz
index b1a5826cf8..42d112d031 100644
Binary files a/java/res/raw/gemoji.jsongz and b/java/res/raw/gemoji.jsongz differ
diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
deleted file mode 100644
index 59f17d713a..0000000000
--- a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for large-tablet/portrait. -->
-    <dimen name="setup_title_text_size">72sp</dimen>
-    <dimen name="setup_welcome_description_text_size">38sp</dimen>
-    <dimen name="setup_step_bullet_text_size">24sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">24sp</dimen>
-    <dimen name="setup_step_instruction_text_size">18sp</dimen>
-    <dimen name="setup_step_action_text_size">20sp</dimen>
-    <dimen name="setup_vertical_padding">96dp</dimen>
-    <dimen name="setup_horizontal_padding">144dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">24dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
deleted file mode 100644
index ae6754cb51..0000000000
--- a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for large-phone/landscape. -->
-    <dimen name="setup_title_text_size">40sp</dimen>
-    <dimen name="setup_welcome_description_text_size">22sp</dimen>
-    <dimen name="setup_step_bullet_text_size">22sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">20sp</dimen>
-    <dimen name="setup_step_instruction_text_size">16sp</dimen>
-    <dimen name="setup_step_action_text_size">18sp</dimen>
-    <dimen name="setup_vertical_padding">16dp</dimen>
-    <dimen name="setup_horizontal_padding">16dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">10dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
deleted file mode 100644
index ed25ae0a6e..0000000000
--- a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for small-tablet/landscape. -->
-    <dimen name="setup_title_text_size">60sp</dimen>
-    <dimen name="setup_welcome_description_text_size">32sp</dimen>
-    <dimen name="setup_step_bullet_text_size">24sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">24sp</dimen>
-    <dimen name="setup_step_instruction_text_size">18sp</dimen>
-    <dimen name="setup_step_action_text_size">20sp</dimen>
-    <dimen name="setup_vertical_padding">32dp</dimen>
-    <dimen name="setup_horizontal_padding">96dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">50</integer>
-    <integer name="setup_body_weight_in_screen">50</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">80</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
-</resources>
diff --git a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
deleted file mode 100644
index 2494060065..0000000000
--- a/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for large-phone/portrait. -->
-    <dimen name="setup_title_text_size">48sp</dimen>
-    <dimen name="setup_welcome_description_text_size">26sp</dimen>
-    <dimen name="setup_step_bullet_text_size">22sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">20sp</dimen>
-    <dimen name="setup_step_instruction_text_size">16sp</dimen>
-    <dimen name="setup_step_action_text_size">18sp</dimen>
-    <dimen name="setup_vertical_padding">8dp</dimen>
-    <dimen name="setup_horizontal_padding">16dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">6dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">12dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
deleted file mode 100644
index f748983180..0000000000
--- a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for large-tablet/landscape. -->
-    <dimen name="setup_title_text_size">72sp</dimen>
-    <dimen name="setup_welcome_description_text_size">38sp</dimen>
-    <dimen name="setup_step_bullet_text_size">24sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">24sp</dimen>
-    <dimen name="setup_step_instruction_text_size">18sp</dimen>
-    <dimen name="setup_step_action_text_size">20sp</dimen>
-    <dimen name="setup_vertical_padding">96dp</dimen>
-    <dimen name="setup_horizontal_padding">160dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">50</integer>
-    <integer name="setup_body_weight_in_screen">50</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">80</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">20</integer>
-</resources>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
deleted file mode 100644
index 9104cad63a..0000000000
--- a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for small-tablet/portrait. -->
-    <dimen name="setup_title_text_size">72sp</dimen>
-    <dimen name="setup_welcome_description_text_size">36sp</dimen>
-    <dimen name="setup_step_bullet_text_size">24sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
-    <dimen name="setup_step_title_text_size">24sp</dimen>
-    <dimen name="setup_step_instruction_text_size">18sp</dimen>
-    <dimen name="setup_step_action_text_size">20sp</dimen>
-    <dimen name="setup_vertical_padding">32dp</dimen>
-    <dimen name="setup_horizontal_padding">64dp</dimen>
-    <dimen name="setup_step_action_height">48dp</dimen>
-    <dimen name="setup_step_horizontal_padding">24dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
-    <dimen name="setup_step_vertical_padding">16dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">24dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">24dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
deleted file mode 100644
index ddff86760d..0000000000
--- a/java/res/values-land/setup-dimens-small-phone-land.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for small-phone/landscape. -->
-    <dimen name="setup_title_text_size">32sp</dimen>
-    <dimen name="setup_welcome_description_text_size">18sp</dimen>
-    <dimen name="setup_step_bullet_text_size">18sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">18dp</dimen>
-    <dimen name="setup_step_title_text_size">18sp</dimen>
-    <dimen name="setup_step_instruction_text_size">14sp</dimen>
-    <dimen name="setup_step_action_text_size">16sp</dimen>
-    <dimen name="setup_vertical_padding">16dp</dimen>
-    <dimen name="setup_horizontal_padding">12dp</dimen>
-    <dimen name="setup_step_action_height">42dp</dimen>
-    <dimen name="setup_step_horizontal_padding">20dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">10dp</dimen>
-    <dimen name="setup_step_vertical_padding">12dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">12dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">12dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">0dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
deleted file mode 100644
index 10ee49db82..0000000000
--- a/java/res/values-port/setup-dimens-small-phone-port.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Setup wizard dimensions for small-phone/portrait. -->
-    <dimen name="setup_title_text_size">40sp</dimen>
-    <dimen name="setup_welcome_description_text_size">20sp</dimen>
-    <dimen name="setup_step_bullet_text_size">18sp</dimen>
-    <dimen name="setup_step_triangle_indicator_height">18dp</dimen>
-    <dimen name="setup_step_title_text_size">18sp</dimen>
-    <dimen name="setup_step_instruction_text_size">14sp</dimen>
-    <dimen name="setup_step_action_text_size">16sp</dimen>
-    <dimen name="setup_vertical_padding">2dp</dimen>
-    <dimen name="setup_horizontal_padding">12dp</dimen>
-    <dimen name="setup_step_action_height">42dp</dimen>
-    <dimen name="setup_step_horizontal_padding">20dp</dimen>
-    <dimen name="setup_step_horizontal_padding_half">10dp</dimen>
-    <dimen name="setup_step_vertical_padding">12dp</dimen>
-    <dimen name="setup_step_horizontal_line_height">2dp</dimen>
-    <integer name="setup_title_weight_in_screen">40</integer>
-    <integer name="setup_body_weight_in_screen">60</integer>
-    <dimen name="setup_title_end_margin">16dp</dimen>
-    <dimen name="setup_welcome_description_top_margin">4dp</dimen>
-    <dimen name="setup_welcome_video_top_padding">12dp</dimen>
-    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>
-    <integer name="setup_welcome_video_weight_in_screen">70</integer>
-    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>
-</resources>
diff --git a/java/res/values-v17/setup-styles.xml b/java/res/values-v17/setup-styles.xml
deleted file mode 100644
index 8a9d664778..0000000000
--- a/java/res/values-v17/setup-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="setupTitleStyle" parent="setupTitleStyleCommon">
-        <item name="android:layout_alignParentStart">true</item>
-    </style>
-    <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon">
-        <item name="android:paddingStart">12dp</item>
-        <item name="android:paddingEnd">24dp</item>
-    </style>
-</resources>
diff --git a/java/res/values/setup-styles-common.xml b/java/res/values/setup-styles-common.xml
deleted file mode 100644
index 686decfba5..0000000000
--- a/java/res/values/setup-styles-common.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="setupTitleStyleCommon">
-        <item name="android:textColor">@color/setup_text_dark</item>
-        <item name="android:textSize">@dimen/setup_title_text_size</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-    <style name="setupWelcomeDescritpionStyle" parent="setupTitleStyle">
-        <item name="android:textSize">@dimen/setup_welcome_description_text_size</item>
-    </style>
-    <style name="setupStepIndicatorStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/setup_step_triangle_indicator_height</item>
-    </style>
-    <style name="setupStepBulletStyle">
-        <item name="android:textColor">@color/setup_text_dark</item>
-        <item name="android:textSize">@dimen/setup_step_bullet_text_size</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_weight">1.0</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-    <style name="setupStepBaseStyle">
-        <item name="android:textColor">@color/setup_text_dark</item>
-        <item name="android:background">@color/setup_step_background</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item>
-        <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item>
-    </style>
-    <style name="setupStepTitleStyle" parent="setupStepBaseStyle">
-        <item name="android:textSize">@dimen/setup_step_title_text_size</item>
-    </style>
-    <style name="setupStepInstructionStyle" parent="setupStepBaseStyle">
-        <item name="android:textSize">@dimen/setup_step_instruction_text_size</item>
-    </style>
-    <style name="setupStepStartIndicatorStyle">
-        <!-- The triangle indicator here is placed sideways. -->
-        <item name="android:layout_width">@dimen/setup_step_triangle_indicator_height</item>
-        <item name="android:layout_height">@dimen/setup_step_action_height</item>
-    </style>
-    <style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle">
-        <item name="android:textColor">@color/setup_step_action_color</item>
-        <item name="android:background">@drawable/setup_step_action_background</item>
-        <item name="android:layout_height">@dimen/setup_step_action_height</item>
-        <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding_half</item>
-        <item name="android:textSize">@dimen/setup_step_action_text_size</item>
-        <item name="android:drawablePadding">@dimen/setup_step_horizontal_padding_half</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-    </style>
-    <style name="setupStepStartActionLabelStyleCommon" parent="setupStepActionLabelStyleCommon">
-        <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item>
-        <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item>
-    </style>
-</resources>
diff --git a/java/res/values/setup-styles.xml b/java/res/values/setup-styles.xml
deleted file mode 100644
index 2d54f2a88b..0000000000
--- a/java/res/values/setup-styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
-    <style name="setupTitleStyle" parent="setupTitleStyleCommon" />
-    <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon" />
-</resources>
diff --git a/java/res/values/setup-wizard.xml b/java/res/values/setup-wizard.xml
deleted file mode 100644
index 90c3ecac93..0000000000
--- a/java/res/values/setup-wizard.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources>
-</resources>
diff --git a/java/res/values/strings-uix.xml b/java/res/values/strings-uix.xml
index 4eb10d373e..669d156a77 100644
--- a/java/res/values/strings-uix.xml
+++ b/java/res/values/strings-uix.xml
@@ -57,6 +57,7 @@
     <string name="action_clipboard_manager_pin_item">Pin item</string>
     <string name="action_clipboard_manager_remove_item">Remove item</string>
     <string name="action_clipboard_manager_remove_item_confirm_dialog">Confirm remove:\n\"%s\"</string>
+    <string name="action_clipboard_manager_remove_item_confirm_dialog_image">Confirm remove image</string>
     <!-- Must be fairly short -->
     <string name="action_clipboard_manager_cancel_action_button">Cancel</string>
     <string name="action_clipboard_manager_disable_text">There are no items to clear. Disable clipboard history?</string>
@@ -69,6 +70,9 @@
     <!-- Must be fairly short -->
     <string name="action_clipboard_manager_clear_unpinned_items_button">Clear</string>
     <string name="action_clipboard_manager_clear_clipboard">Clear clipboard</string>
+    <string name="action_clipboard_manager_search">Search clipboard&#8230;</string>
+    <string name="action_clipboard_manager_enter_your_search">Enter a search term…</string>
+    <string name="action_clipboard_manager_no_clips_found">No results found</string>
     <string name="action_clipboard_manager_error_device_locked_title">Device Locked</string>
     <string name="action_clipboard_manager_error_device_locked_text">Please unlock your device to access clipboard history</string>
     <string name="action_clipboard_manager_error_general_title">Clipboard Error</string>
@@ -86,12 +90,17 @@
     <!-- This message is shown when we're typing in a text field does not support image insertion ("app" refers to the external app that is providing the text field) -->
     <string name="action_clipboard_manager_error_app_image_insertion_unsupported">App does not support image insertion</string>
     <string name="action_clipboard_manager_settings_title">Clipboard Manager Settings</string>
+    <string name="action_clipboard_manager_settings_save_images">Save copied images</string>
+    <string name="action_clipboard_manager_settings_save_screenshots">Save recent screenshots</string>
+    <string name="action_clipboard_manager_settings_save_screenshots_subtitle">You\'ll need to grant permission to access your screenshots</string>
     <string name="action_clipboard_manager_settings_hours_to_keep_clips">Hours to keep unpinned clips</string>
     <string name="action_clipboard_manager_settings_maximum_clips">Number of unpinned clips to keep</string>
     <string name="action_clipboard_manager_settings_save_sensitive_clips">Save sensitive clips</string>
     <string name="action_clipboard_manager_settings_save_sensitive_clips_subtitle">If enabled, it will save items from password managers, incognito windows, etc</string>
     <string name="action_clipboard_manager_settings_list_layout">Use vertical list layout instead of grid</string>
     <string name="action_clipboard_manager_settings_show_pinned_above_others">Keep pinned clips on top</string>
+    <string name="action_clipboard_manager_settings_skip_delete_confirmation">Skip confirmation when deleting unpinned clips</string>
+
     <string name="action_clipboard_manager_settings_show_quick_clips">Show recently copied text in suggestion bar</string>
 
     <!-- For keyboard modes action -->
@@ -416,13 +425,21 @@
     <string name="morekey_settings_show_hints_tags">additional characters, alt keys, symbols, popup keys</string>
     <string name="morekey_settings_duration">Long Press Duration</string>
     <string name="morekey_settings_duration_subtitle">How long a key needs to be pressed to be considered a long-press</string>
-    <string name="morekey_settings_backspace_behavior">Backspace Behavior when holding or swiping</string>
-    <string name="morekey_settings_backspace_behavior_delete_chars">Delete characters</string>
-    <string name="morekey_settings_backspace_behavior_delete_words">Delete entire words</string>
-    <string name="morekey_settings_space_behavior">Spacebar Behavior</string>
-    <string name="morekey_settings_space_behavior_swipe_cursor">Swiping moves cursor, long-pressing switches language</string>
-    <string name="morekey_settings_space_behavior_swipe_lang">Swiping changes language, long-pressing moves cursor</string>
-    <string name="morekey_settings_space_behavior_only_cursor">Swiping and long-pressing only moves cursor</string>
+
+    <string name="morekey_settings_backspace_title">Backspace</string>
+    <string name="morekey_settings_backspace_hold_delete_words">Hold to delete words</string>
+    <string name="morekey_settings_backspace_swipe_to_delete">Swipe to delete</string>
+    <string name="morekey_settings_backspace_swipe_to_delete_off">Off</string>
+    <string name="morekey_settings_backspace_swipe_to_delete_characters">Characters</string>
+    <string name="morekey_settings_backspace_swipe_to_delete_words">Words</string>
+    <string name="morekey_settings_spacebar_title">Spacebar</string>
+    <string name="morekey_settings_spacebar_swipe_shortcut">Swipe</string>
+    <string name="morekey_settings_spacebar_swipe_shortcut_off">Off</string>
+    <string name="morekey_settings_spacebar_swipe_shortcut_cursor">Move cursor</string>
+    <string name="morekey_settings_spacebar_swipe_shortcut_language">Switch language</string>
+    <string name="morekey_settings_spacebar_hold_shortcut">Hold</string>
+    <string name="morekey_settings_spacebar_hold_shortcut_cursor">Move cursor</string>
+    <string name="morekey_settings_spacebar_hold_shortcut_language">Switch language</string>
 
     <!-- Types of morekeys that can be configured, and examples of them -->
     <string name="morekey_settings_kind_numbers">Numbers</string>
@@ -439,9 +456,6 @@
 
     <!-- typing settings -->
     <string name="typing_settings_title">Typing preferences</string>
-    <!-- When translating, rename it to gesture typing if it makes more sense for that language -->
-    <string name="typing_settings_swipe">Swipe Typing (alpha)</string>
-    <string name="typing_settings_swipe_subtitle">Allow swiping from key to key to write words.</string>
     <string name="typing_settings_suggest_emojis">Emoji Suggestions</string>
     <string name="typing_settings_suggest_emojis_subtitle">Suggest emojis while you\'re typing</string>
     <string name="typing_settings_vibration_strength">Vibration</string>
@@ -486,6 +500,8 @@
     <!-- Languages like Arabic can have their own digit symbols, this forces use of Western numerals -->
     <string name="keyboard_settings_number_row_dont_use_script_digits">Always use Western numerals</string>
 
+    <string name="keyboard_settings_hide_when_hardware_keyboard_is_connected">Hide when USB keyboard is detected</string>
+
     <!-- misc titles -->
     <string name="settings_keyboard_typing_title">Keyboard &amp; Typing</string>
 
@@ -516,6 +532,31 @@
 
     <string name="dev_settings_title">Developer Settings</string>
 
+    <!-- Swipe typing settings menu -->
+    <!-- When translating, rename it to something like "gesture typing" if it makes more sense for that language -->
+    <string name="swipe_settings_title">Swipe Typing</string>
+    <string name="swipe_settings_enable_swipe_typing">Enable swipe typing</string>
+    <string name="swipe_settings_enable_swipe_typing_subtitle">Allow swiping from key to key to write words.</string>
+
+    <string name="swipe_settings_suggest_mode">Suggestion bar mode</string>
+    <string name="swipe_settings_suggest_mode_tags">show 3 suggestions, used word, accepted word, main word, display 3 alternative, swipe typing, swish input, swype, center middle centre other words</string>
+    <string name="swipe_settings_suggest_mode_top4_title">3 alternatives</string>
+    <string name="swipe_settings_suggest_mode_top3_title">2 alternatives</string>
+    <string name="swipe_settings_suggest_mode_used_word">Main</string>
+    <string name="swipe_settings_suggest_mode_alternative_word_1">Alt1</string>
+    <string name="swipe_settings_suggest_mode_alternative_word_2">Alt2</string>
+    <string name="swipe_settings_suggest_mode_alternative_word_3">Alt3</string>
+
+    <string name="swipe_settings_miscellaneous_title">Other</string>
+
+    <string name="swipe_settings_configure_shortcuts">Shortcuts</string>
+    <string name="swipe_settings_configure_shortcuts_subtitle">Configure spacebar and delete key gestures in long-press settings</string>
+
+    <string name="swipe_settings_show_unsupported">Show unsupported settings…</string>
+    <string name="swipe_settings_use_old_swipe">Use legacy swipe algorithm</string>
+    <string name="swipe_settings_use_old_swipe_subtitle_short">The legacy algorithm is very inaccurate and not recommended.</string>
+    <string name="swipe_settings_use_old_swipe_subtitle">The legacy algorithm is very inaccurate and not recommended. If you have to use this, please tell us why at keyboard@futo.org. This option will be removed in the future.</string>
+
     <!-- Voice input settings menu -->
     <string name="voice_input_settings_title">Voice Input</string>
     <string name="voice_input_settings_builtin_disabled_notice">Built-in voice input is disabled!</string>
@@ -537,6 +578,8 @@
     <string name="voice_input_settings_long_form_subtitle">If disabled, voice input will auto-stop after 30 seconds.</string>
     <string name="voice_input_settings_autostop_vad">Auto-stop on silence</string>
     <string name="voice_input_settings_autostop_vad_subtitle">Automatically stop when silence is detected. You may need to manually stop regardless if there\'s too much background noise.</string>
+    <string name="voice_input_settings_animate_bubble">Animations</string>
+    <string name="voice_input_settings_animate_bubble_subtitle">Display a bubble that reacts to speech</string>
     <string name="voice_input_settings_change_models">Models</string>
     <string name="voice_input_settings_change_models_subtitle">To change the models, visit Languages &amp; Models menu</string>
 
diff --git a/java/src/org/futo/inputmethod/engine/IMEInterface.kt b/java/src/org/futo/inputmethod/engine/IMEInterface.kt
index 4d8258d947..b52598e041 100644
--- a/java/src/org/futo/inputmethod/engine/IMEInterface.kt
+++ b/java/src/org/futo/inputmethod/engine/IMEInterface.kt
@@ -1,11 +1,21 @@
 package org.futo.inputmethod.engine
 
+import androidx.compose.runtime.MutableState
 import org.futo.inputmethod.annotations.UsedForTesting
 import org.futo.inputmethod.event.Event
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.common.InputPointers
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2
 
+data class StateHint(
+    /** Makes KeyboardState instantly unshift when any key with code > 0 is pressed on the alphabet layout */
+    @JvmField val unshiftOnPressed: Boolean = false,
+
+    /** Makes PointerTracker use looser matching rules for keyboard layout changes, to be used in combination with the above */
+    @JvmField val useLooseMatching: Boolean = false,
+)
+val DefaultStateHint = StateHint()
+
 interface IMEInterface {
     // Basic lifecycle
     fun onCreate()
@@ -25,6 +35,12 @@ interface IMEInterface {
 
     fun isGestureHandlingAvailable(): Boolean
 
+    /** Optionally return a state to indicate the IME is loading and no input can be processed */
+    fun getLoadingState(): MutableState<Boolean>? = null
+
+    /** Optional hint for how the keyboard state should behave */
+    fun getStateHint(imeHint: String?) = DefaultStateHint
+
     // Input
     fun onEvent(event: Event)
 
@@ -76,6 +92,9 @@ interface IMEInterface {
     /** Refresh as a result of blacklist update */
     fun requestSuggestionRefresh()
 
+    /** Used to determine whether the delete key should continue sending haptic feedback when held */
+    fun hasMoreTextToDelete(): Boolean = true
+
     /**
      * Hints the keyboard switcher whether to auto-shift (capitalize) the layout or not.
      * For immediate changes, call imeHelper.keyboardSwitcher.requestUpdatingShiftState(mode)
diff --git a/java/src/org/futo/inputmethod/engine/IMEManager.kt b/java/src/org/futo/inputmethod/engine/IMEManager.kt
index 314dbfc3cd..681b350008 100644
--- a/java/src/org/futo/inputmethod/engine/IMEManager.kt
+++ b/java/src/org/futo/inputmethod/engine/IMEManager.kt
@@ -1,5 +1,9 @@
 package org.futo.inputmethod.engine
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringSetPreferencesKey
 import androidx.lifecycle.lifecycleScope
@@ -53,7 +57,9 @@ class IMEManager(
     private val helper = IMEHelper(service)
     private val settings = Settings.getInstance()
     private val imes: MutableMap<IMEKind, IMEInterface> = mutableMapOf()
-    private var activeIme: IMEInterface? = null
+    private var activeIme by mutableStateOf<IMEInterface?>(null)
+
+    @Composable fun isImeLoading(): Boolean = activeIme?.getLoadingState()?.value == true
 
     private fun getActiveIMEKind(settingsValues: SettingsValues): IMEKind =
         when(settingsValues.mLocale.language) {
diff --git a/java/src/org/futo/inputmethod/engine/IMESettingsHelper.kt b/java/src/org/futo/inputmethod/engine/IMESettingsHelper.kt
index 653a0e1527..afc41cb231 100644
--- a/java/src/org/futo/inputmethod/engine/IMESettingsHelper.kt
+++ b/java/src/org/futo/inputmethod/engine/IMESettingsHelper.kt
@@ -2,13 +2,13 @@ package org.futo.inputmethod.engine
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import org.futo.inputmethod.engine.general.ChineseIMESettings
 import org.futo.inputmethod.engine.general.JapaneseIMESettings
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.Subtypes
 import org.futo.inputmethod.latin.SubtypesSetting
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
 import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
+import org.futo.inputmethod.latin.uix.settings.pages.langspecific.zh.ChineseIMESettings
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
 import org.futo.inputmethod.latin.uix.settings.userSettingNavigationItem
 
diff --git a/java/src/org/futo/inputmethod/engine/general/ActionInputTransactionIME.kt b/java/src/org/futo/inputmethod/engine/general/ActionInputTransactionIME.kt
index 8ebe7c81bc..5906d48f95 100644
--- a/java/src/org/futo/inputmethod/engine/general/ActionInputTransactionIME.kt
+++ b/java/src/org/futo/inputmethod/engine/general/ActionInputTransactionIME.kt
@@ -1,5 +1,6 @@
 package org.futo.inputmethod.engine.general
 
+import android.view.inputmethod.EditorInfo
 import org.futo.inputmethod.engine.IMEHelper
 import org.futo.inputmethod.engine.IMEInterface
 import org.futo.inputmethod.event.Event
@@ -15,7 +16,13 @@ import org.futo.inputmethod.latin.uix.utils.TextContext
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2
 
 class ActionInputTransactionIME(val helper: IMEHelper) : IMEInterface, ActionInputTransaction {
-    val ic = if(helper.context.getSetting(VoiceInputAlternativeIC) && SupportsNonComposing) {
+    val useComposingMode = run {
+        val inputType = helper.getCurrentEditorInfo()?.inputType ?: 0
+        val inputClass = inputType and EditorInfo.TYPE_MASK_CLASS
+        inputClass == EditorInfo.TYPE_CLASS_TEXT
+    }
+
+    val ic = if(helper.context.getSetting(VoiceInputAlternativeIC) && SupportsNonComposing && useComposingMode) {
         InputConnectionInternalComposingWrapper(
             helper.context.getSetting(VoiceInputAlternativeICComposing),
             true,
@@ -72,7 +79,7 @@ class ActionInputTransactionIME(val helper: IMEHelper) : IMEInterface, ActionInp
     private var isFinished = false
     private var partialText = ""
     override fun updatePartial(text: String) {
-        if (isFinished) return
+        if (isFinished || !useComposingMode) return
         helper.requestCursorUpdate()
         partialText = text
         ic?.setComposingText(
diff --git a/java/src/org/futo/inputmethod/engine/general/ChineseIME.kt b/java/src/org/futo/inputmethod/engine/general/ChineseIME.kt
index 24d80c6956..a9ac417ec5 100644
--- a/java/src/org/futo/inputmethod/engine/general/ChineseIME.kt
+++ b/java/src/org/futo/inputmethod/engine/general/ChineseIME.kt
@@ -1,18 +1,13 @@
 package org.futo.inputmethod.engine.general
 
-import android.content.Context
 import android.os.SystemClock
 import android.util.Log
 import android.view.KeyCharacterMap
 import android.view.KeyEvent
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.compose.runtime.mutableStateOf
 import icu.astronot233.rime.DeployStage
 import icu.astronot233.rime.Rime
 import icu.astronot233.rime.RimeMessage
-import icu.astronot233.rime.RimeSchema
 import icu.astronot233.rime.SyncStage
 import icu.astronot233.rime.X11Keys.XK_BackSpace
 import icu.astronot233.rime.X11Keys.XK_Linefeed
@@ -28,10 +23,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.futo.inputmethod.engine.ExpandableSuggestionBarConfiguration
+import org.futo.inputmethod.engine.GlobalIMEMessage
 import org.futo.inputmethod.engine.IMEHelper
 import org.futo.inputmethod.engine.IMEInterface
+import org.futo.inputmethod.engine.IMEMessage
 import org.futo.inputmethod.event.Event
-import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.Subtypes.switchToNextLanguage
 import org.futo.inputmethod.latin.SuggestedWords
 import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo
@@ -40,175 +36,16 @@ import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.common.InputPointers
 import org.futo.inputmethod.latin.settings.Settings
 import org.futo.inputmethod.latin.suggestions.SuggestionStripViewAccessor
-import org.futo.inputmethod.latin.uix.FileKind
 import org.futo.inputmethod.latin.uix.FloatingPreEdit
 import org.futo.inputmethod.latin.uix.PreEditListener
-import org.futo.inputmethod.latin.uix.SettingsKey
-import org.futo.inputmethod.latin.uix.actions.throwIfDebug
-import org.futo.inputmethod.latin.uix.getSetting
-import org.futo.inputmethod.latin.uix.namePreferenceKeyFor
-import org.futo.inputmethod.latin.uix.preferenceKeyFor
-import org.futo.inputmethod.latin.uix.setSetting
-import org.futo.inputmethod.latin.uix.settings.CollapsibleSection
-import org.futo.inputmethod.latin.uix.settings.DropDownPickerSettingItem
-import org.futo.inputmethod.latin.uix.settings.SettingToggleRaw
-import org.futo.inputmethod.latin.uix.settings.UserSetting
-import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
-import org.futo.inputmethod.latin.uix.settings.useDataStore
-import org.futo.inputmethod.latin.utils.ZipFileHelper
-import org.futo.inputmethod.latin.utils.toEnumOrNull
+import org.futo.inputmethod.latin.uix.settings.pages.langspecific.zh.RimeSettings
 import org.futo.inputmethod.v2keyboard.KeyboardLayoutSetV2
-import java.io.File
-import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
 
-object ChineseIMESettings {
-    enum class ChineseSimplificationMode(val stringResource: Int) {
-        // These must not be renamed, or the existing setting value for users will break
-        ByLanguage(R.string.chinese_setting_simplification_simplify_by_language_country),
-        Simplified(R.string.chinese_setting_simplification_force_simplified),
-        Traditional(R.string.chinese_setting_simplification_force_traditional);
-    }
-
-    enum class PinyinScheme(
-        val displayNameZH: String,
-        val displayNameEN: String,
-        val rimeId: String
-    ) {
-        // These must not be renamed, or the existing setting value for users will break
-        FullPinyin("全拼", "Full Pinyin", "luna_pinyin"),
-        Natural("自然碼雙拼", "Double Pinyin", "double_pinyin"),
-        ABC("智能ABC雙拼", "Double Pinyin - ABC", "double_pinyin_abc"),
-        FlyPY("小鶴雙拼", "Double Pinyin - flyPY", "double_pinyin_flypy"),
-        MS("微軟雙拼", "Double Pinyin - MS", "double_pinyin_mspy"),
-        PYJJ("拼音加加雙拼", "Double Pinyin - PYJJ", "double_pinyin_pyjj"),
-        ST("四通雙拼", "Double Pinyin - ST", "double_pinyin_st");
-    }
-
-    internal fun initialPatch(pattern: String, substitution: String, twoWay: Boolean)
-            = buildList {
-        add("derive/^${pattern}/${substitution}/")
-        if(twoWay) add("derive/^${substitution}/${pattern}/")
-    }
-
-    internal fun finalPatch(pattern: String, substitution: String, twoWay: Boolean)
-            = buildList {
-        add("derive/${pattern}$/${substitution}/")
-        if(twoWay) add("derive/${substitution}$/${pattern}/")
-    }
 
-    enum class FuzzyPinyinModes(val schemePatch: List<String>, val displayName: String) {
-        // These must not be renamed, or the existing setting value for users will break
-        Z_ZH(initialPatch("z", "zh", true), "z = zh"),
-        C_CH(initialPatch("c", "ch", true), "c = ch"),
-        S_SH(initialPatch("s", "sh", true), "s = sh"),
-        L_N(initialPatch("l", "n", true), "l = n"),
-        F_H(initialPatch("f", "h", true), "f = h"),
-        R_L(initialPatch("r", "l", false), "r = l"),
-        K_G(initialPatch("k", "g", false), "k = g"),
-
-        AN_ANG(finalPatch("an", "ang", true), "an = ang"),
-        EN_ENG(finalPatch("en", "eng", true), "en = eng"),
-        IN_ING(finalPatch("in", "ing", true), "in = ing"),
-        IAN_IANG(finalPatch("ian", "iang", true), "ian = iang"),
-        UAN_UANG(finalPatch("uan", "uang", true), "uan = uang");
-
-        companion object {
-            @JvmStatic
-            fun fromCommaString(str: String) =
-                str.split(',').mapNotNull { it.toEnumOrNull<FuzzyPinyinModes>() }.toSet()
-
-            @JvmStatic
-            fun toCommaString(value: Set<FuzzyPinyinModes>) =
-                value.joinToString(",") { it.name }
-        }
-    }
-
-    val SimplificationSetting = SettingsKey(
-        stringPreferencesKey("ChineseIME_simplification"),
-        ChineseSimplificationMode.ByLanguage.name
-    )
-
-    val PinyinSchemeSetting = SettingsKey(
-        stringPreferencesKey("ChineseIME_pinyin_scheme"),
-        PinyinScheme.FullPinyin.name
-    )
-
-    val FuzzyPinyinSetting = SettingsKey(
-        stringPreferencesKey("ChineseIME_fuzzy_pinyin"),
-        ""
-    )
-
-    var schemaList: List<RimeSchema> = emptyList()
-    val menu = UserSettingsMenu(
-        title = R.string.chinese_settings_title,
-        searchTags = R.string.chinese_setting_search_tags,
-        navPath = "ime/zh", registerNavPath = true,
-        settings = listOf(
-            UserSetting(R.string.chinese_setting_simplification) {
-                val context = LocalContext.current
-                val (setting, setSetting) = useDataStore(SimplificationSetting)
-                DropDownPickerSettingItem<ChineseSimplificationMode>(
-                    stringResource(R.string.chinese_setting_simplification),
-                    ChineseSimplificationMode.entries,
-                    setting.toEnumOrNull<ChineseSimplificationMode>() ?: ChineseSimplificationMode.ByLanguage,
-                    { setSetting(it.name) },
-                    { context.getString(it.stringResource) }
-                )
-            },
-
-            UserSetting(R.string.chinese_setting_pinyin_scheme) {
-                val context = LocalContext.current
-                val (setting, setSetting) = useDataStore(PinyinSchemeSetting)
-
-                val availableEntries = remember {
-                    val sharedDir = ChineseIME.getShared(context)
-                    val files = (sharedDir.listFiles() ?: emptyArray()).map { it.name.split('.').first() }.toSet()
-                    PinyinScheme.entries.filter {
-                        files.contains(it.rimeId) || it == PinyinScheme.FullPinyin
-                    }
-                }
-                DropDownPickerSettingItem<PinyinScheme>(
-                    stringResource(R.string.chinese_setting_pinyin_scheme),
-                    availableEntries,
-                    setting.toEnumOrNull<PinyinScheme>() ?: PinyinScheme.FullPinyin,
-                    { setSetting(it.name) },
-                    { when(context.resources.configuration.locale.language) {
-                        "zh" -> it.displayNameZH
-                        else -> it.displayNameEN
-                    } }
-                )
-            },
-
-            UserSetting(R.string.chinese_setting_fuzzy_pinyin) {
-                val (setting, setSetting) = useDataStore(FuzzyPinyinSetting)
-                val set = remember(setting) { FuzzyPinyinModes.fromCommaString(setting) }
-
-                CollapsibleSection(stringResource(R.string.chinese_setting_fuzzy_pinyin)) {
-                    FuzzyPinyinModes.entries.forEach { mode ->
-                        SettingToggleRaw(mode.displayName, set.contains(mode), { enabled ->
-                            val newSet = if (enabled) {
-                                set + setOf(mode)
-                            } else {
-                                set - setOf(mode)
-                            }
-
-                            setSetting(FuzzyPinyinModes.toCommaString(newSet))
-                        })
-                    }
-                }
-
-            },
-
-        )
-    )
-}
-
-class InputKeeper() {
+private class InputKeeper {
     var text = ""
-        private set
-
     fun clear() {
         text = ""
     }
@@ -230,17 +67,20 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
     private val TAG = "ChineseIME (rime)"
 
     private val rime: Rime
+    init {
+        RimeSettings.RimeDir = helper.context.getExternalFilesDir("Rime")!!
+        rime = Rime(RimeSettings.SharedDataDir.toString(), RimeSettings.UserDataDir.toString(), helper.context.packageName)
+    }
+
     private val connect get() = helper.getCurrentInputConnection()
     private val coroScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
     private val expandableUiCfg = ExpandableSuggestionBarConfiguration(true, false)
     private val maxBufferLength = 0x100000
     private var layoutHint: String? = null
     private val rawInput = InputKeeper()
+    private val rimeLoading = mutableStateOf(false)
 
-    private val currentTransformation get() = when(layoutHint) {
-        "stroke" -> StrokeTransformation
-        else -> emptyMap()
-    }
+    override fun getLoadingState() = rimeLoading
 
     private enum class EditingState(val active: Boolean) {
         NotEditing(false),
@@ -249,86 +89,6 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
     }
     private var editingState = EditingState.NotEditing
 
-    companion object {
-        @JvmStatic
-        private val StrokeTransformation = mapOf(
-            'h' to '⼀',
-            's' to '⼁',
-            'p' to '⼃',
-            'n' to '⼂',
-            'z' to '⼄',
-        )
-
-        @JvmStatic
-        fun getRimeDir(context: Context) = context.getExternalFilesDir("rime")
-                ?: throw IllegalStateException("Failed to access ExternalFilesDir!")
-
-        @JvmStatic
-        fun getShared(context: Context) = File(getRimeDir(context), "shared")
-
-        @JvmStatic
-        fun getUser(context: Context) = File(getRimeDir(context), "user")
-
-        val PreviouslyExtractedDictionaryName = SettingsKey(
-            stringPreferencesKey("ChineseDictionaryExtractedValue"),
-            ""
-        )
-        var localPrevExtractedDictionaryName: String? = null
-
-        fun resetSharedFromResources(context: Context, scope: CoroutineScope): Boolean {
-            val pref = FileKind.Dictionary.preferenceKeyFor("zh")
-            val namePref = FileKind.Dictionary.namePreferenceKeyFor("zh")
-            val filePath = context.getSetting(pref, "")
-            val file = File(context.applicationContext.getExternalFilesDir(null), filePath)
-
-            val name = context.getSetting(namePref, "?")
-
-
-
-            if((localPrevExtractedDictionaryName ?: context.getSetting(PreviouslyExtractedDictionaryName)) == name) {
-                return false
-            }
-
-            try {
-                val shared = getShared(context)
-                shared.walkBottomUp()
-                    .fold(true) { res, it -> (it == shared || it.delete() || !it.exists()) && res }
-
-                // We are intentionally checking this only after deleting the shared directory
-                // This is because if the user deletes the dictionary file, we want to apply
-                // the deletion (TODO: It doesn't apply)
-                if(filePath.isEmpty()) return true
-                if(!file.exists()) return true
-
-                ZipFileHelper.extract(file, shared)
-
-                return true
-            } finally {
-                localPrevExtractedDictionaryName = name
-                scope.launch(Dispatchers.IO) {
-                    context.setSetting(PreviouslyExtractedDictionaryName.key, name)
-                }
-            }
-        }
-    }
-
-    init {
-        val shared = getShared(helper.context)
-        val user = getUser(helper.context)
-
-        if(!shared.exists() || !user.exists()) {
-            shared.mkdirs()
-            user.mkdirs()
-        }
-
-        rime = Rime(shared.path, user.path, helper.context.packageName)
-    }
-
-    fun requestTakeOver(who: Any): Pair<Rime?, CoroutineScope?> {
-        Log.d(TAG, "$who tries to take over")
-        return Pair(rime, coroScope)
-    }
-
     private fun handlePassByMessage(x11Code: Int, mask: Int) {
         when (x11Code) {
             XK_BackSpace -> sendDownUpKeyEvent(KeyEvent.KEYCODE_DEL, 0)
@@ -352,20 +112,13 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
         is RimeMessage.Deploy -> when (msg.value) {
             DeployStage.Unknown -> Log.e(TAG, "Deploy: Failed")
             DeployStage.Startup -> Log.i(TAG, "Deploy: Startup")
-            DeployStage.Success -> {
-                Log.i(TAG, "Deploy: Success")
-                coroScope.launch {
-                    ChineseIMESettings.schemaList = rime.getSchemata().also {
-                        Log.d(TAG, "Schemas: ${it.joinToString { it.toString() }} ")
-                    }
-                }
-            }
+            DeployStage.Success -> Log.i(TAG, "Deploy: Success")
             else -> {}
         }
         is RimeMessage.Sync -> when (msg.value) {
             SyncStage.Unknown -> Log.e(TAG, "Sync: Failed")
-//            SyncStage.Startup ->
-//            SyncStage.Success ->
+            SyncStage.Startup -> Log.i(TAG, "Sync: Startup")
+            SyncStage.Success -> Log.i(TAG, "Sync: Success")
             else -> {}
         }
         is RimeMessage.Commit -> {
@@ -385,7 +138,7 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
         if(ped.isEmpty() && notEditing) { rawInput.clear() }
 
         helper.updateUiInputState(ped.isEmpty() && notEditing)
-        helper.setPreedit(FloatingPreEdit.build(ped, this, currentTransformation, rawInput.text))
+        helper.setPreedit(FloatingPreEdit.build(ped, this, emptyMap(), rawInput.text))
     }.launchIn(coroScope)
 
     override fun onStartEdit() {
@@ -502,133 +255,31 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
         subscribeToRimeMessage()
         subscribeToRimePreedit()
         subscribeToRimeCandidates()
-        blacklist.init()
-    }
-    override fun onDestroy() {
-        helper.lifecycleScope.cancel()
-        coroScope.cancel()
-        rime.shutdown()
-    }
-
-    override fun onStartInput() {
-        if(resetSharedFromResources(helper.context, helper.lifecycleScope)) {
-            prevConfiguration = null
-            coroScope.launch { rime.deploy() }
-        }
-        updateConfig()
-    }
-
-    private fun isSimplifiedChinese(locale: Locale): Boolean {
-        if (locale.language != "zh") return false
-        val setting = helper.context.getSetting(ChineseIMESettings.SimplificationSetting).toEnumOrNull<ChineseIMESettings.ChineseSimplificationMode>()
-        return when(setting) {
-            ChineseIMESettings.ChineseSimplificationMode.Simplified -> true
-            ChineseIMESettings.ChineseSimplificationMode.Traditional -> false
-            else -> {
-                locale.script.takeIf { it.isNotEmpty() }?.let {
-                    return it.equals("Hans", ignoreCase = true)
-                }
 
-                return when (locale.country.uppercase()) {
-                    "TW", "HK", "MO" -> false
-                    else -> true
-                }
-            }
-        }
-    }
-
-
-
-    private data class Configuration(
-        val schema: String,
-        val simplification: Boolean,
-        val autocorrect: Boolean,
-        val fuzzyMode: Set<ChineseIMESettings.FuzzyPinyinModes>
-    )
-    private var prevConfiguration: Configuration? = null
-
-    private fun writeCustomizationFile(cfg: Configuration) {
-        val schema = cfg.schema
-        val file = File(getUser(helper.context), "${schema}.custom.yaml")
-        val content = buildString {
-            appendLine("patch:")
-
-            appendLine("    translator/enable_correction: ${cfg.autocorrect}")
-
-            appendLine("    switches/+:")
-            appendLine("        - name: futo_zh_simp")
-            appendLine("          reset: ${if(cfg.simplification) 1 else 0}")
-            appendLine("          states: [ 漢字, 汉字 ]")
-            appendLine("    simplifier/option_name: futo_zh_simp")
-
-            // Fuzzy pinyin only added to pinyin layouts
-            if(schema.startsWith("luna_pinyin")) {
-                appendLine("    speller/algebra:")
-                cfg.fuzzyMode.forEach {
-                    it.schemePatch.forEach {
-                        appendLine("        - $it")
+        helper.lifecycleScope.launch {
+            GlobalIMEMessage.collect { message ->
+                when(message) {
+                    IMEMessage.ReloadResources -> coroScope.launch {
+                        rime.shutdown()
+                        rime.startup(false)
                     }
+                    else -> {}
                 }
             }
         }
 
-        file.writeText(content)
+        blacklist.init()
     }
-
-    private fun updateConfig() {
-        coroScope.launch {
-            if(editingState.active) return@launch
-
-            val settings = Settings.getInstance().current
-            val locale = settings.mLocale
-
-            val simplified = isSimplifiedChinese(locale)
-
-            val pinyinScheme = helper.context.getSetting(ChineseIMESettings.PinyinSchemeSetting).toEnumOrNull<ChineseIMESettings.PinyinScheme>()
-                ?: ChineseIMESettings.PinyinScheme.FullPinyin
-            val schema = when(layoutHint) {
-                "qwerty" -> {
-                    when {
-                        pinyinScheme == ChineseIMESettings.PinyinScheme.FullPinyin -> when {
-                            simplified -> "luna_pinyin_simp"
-                            else -> "luna_pinyin"
-                        }
-
-                        else -> pinyinScheme.rimeId
-                    }
-                }
-                "stroke" -> {
-                    "stroke"
-                }
-                null -> { return@launch }
-                else -> {
-                    throwIfDebug(IllegalStateException("Invalid layout hint '${layoutHint}'"))
-                    "luna_pinyin"
-                }
-            }
-
-            val fuzzy = ChineseIMESettings.FuzzyPinyinModes.fromCommaString(
-                helper.context.getSetting(ChineseIMESettings.FuzzyPinyinSetting)
-            )
-
-            val autocorrect = settings.mAutoCorrectionEnabledPerUserSettings
-                    || settings.isSuggestionsEnabledPerUserSettings
-
-            val config = Configuration(schema, simplified, autocorrect, fuzzy)
-            if(config != prevConfiguration) {
-                writeCustomizationFile(config)
-                rime.selectSchema(config.schema)
-                rime.deploy()
-                rime.setOption("simplification", simplified)
-                rime.setOption("traditional", !simplified)
-                prevConfiguration = config
-            }
-        }
+    override fun onDestroy() {
+        helper.lifecycleScope.cancel()
+        coroScope.cancel()
+        rime.shutdown()
     }
 
+    override fun onStartInput() {}
+
     override fun onLayoutUpdated(layout: KeyboardLayoutSetV2) {
         layoutHint = layout.mainLayout.imeHint
-        if(helper.isImeActive(this)) updateConfig()
     }
 
     override fun onFinishInput() {
@@ -640,9 +291,7 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
         }
     }
 
-    override fun onFinishSlidingInput() {
-        // TODO("Unsupported yet")
-    }
+    override fun onFinishSlidingInput() {}
 
     private fun interruptInput(text: CharSequence? = null) {
         coroScope.launch {
@@ -741,16 +390,6 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
 
             Event.EVENT_TYPE_DOWN_UP_KEYEVENT -> {
                 interruptInput()
-                if (event.mX == KeyEvent.META_CTRL_ON) when (event.mKeyCode) {
-                    KeyEvent.KEYCODE_F1 -> {
-
-                    }
-                    KeyEvent.KEYCODE_F2 -> {
-                        Log.d(TAG, "Redeploying...")
-                        coroScope.launch { rime.deploy() }
-                        return
-                    }
-                }
                 sendDownUpKeyEvent(event.mKeyCode, event.mX)
             }
 
@@ -871,9 +510,7 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
     override fun onCustomRequest(requestCode: Int): Boolean = false
     override fun onMovingCursorLockEvent(canMoveCursor: Boolean) {}
 
-    override fun clearUserHistoryDictionaries() {
-        // TODO("Unsupported yet")
-    }
+    override fun clearUserHistoryDictionaries() {}
 
     override fun onStartBatchInput() {}
     override fun onUpdateBatchInput(batchPointers: InputPointers?) {}
@@ -889,5 +526,5 @@ class ChineseIME(val helper: IMEHelper) : IMEInterface, SuggestionStripViewAcces
 // Non-behavior methods }}
 
     val debugInfo: String
-        get() = "configuration=${prevConfiguration}\nlayoutHint=${layoutHint}\nlocale=${Settings.getInstance().current.mLocale}\nisSimplified=${isSimplifiedChinese(Settings.getInstance().current.mLocale)}\nrawInput=${rawInput.text}"
+        get() = "layoutHint=${layoutHint}\nlocale=${Settings.getInstance().current.mLocale}\nrawInput=${rawInput.text}"
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/engine/general/GeneralIME.kt b/java/src/org/futo/inputmethod/engine/general/GeneralIME.kt
index dafadd82ce..0882bb57c0 100644
--- a/java/src/org/futo/inputmethod/engine/general/GeneralIME.kt
+++ b/java/src/org/futo/inputmethod/engine/general/GeneralIME.kt
@@ -1,6 +1,9 @@
 package org.futo.inputmethod.engine.general
 
+import android.os.Build
+import android.os.Looper
 import android.util.Log
+import android.view.HapticFeedbackConstants
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -26,6 +29,7 @@ import org.futo.inputmethod.event.InputTransaction
 import org.futo.inputmethod.keyboard.KeyboardSwitcher
 import org.futo.inputmethod.latin.BuildConfig
 import org.futo.inputmethod.latin.DictionaryFacilitator
+import org.futo.inputmethod.latin.DictionaryFacilitatorImpl
 import org.futo.inputmethod.latin.DictionaryFacilitatorProvider
 import org.futo.inputmethod.latin.NgramContext
 import org.futo.inputmethod.latin.RichInputMethodManager
@@ -33,6 +37,7 @@ import org.futo.inputmethod.latin.Subtypes.switchToNextLanguage
 import org.futo.inputmethod.latin.SuggestedWords
 import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo
 import org.futo.inputmethod.latin.SuggestionBlacklist
+import org.futo.inputmethod.latin.SwipeDecoderDictionary
 import org.futo.inputmethod.latin.WordComposer
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.common.InputPointers
@@ -90,6 +95,11 @@ class GeneralIME(val helper: IMEHelper) : IMEInterface, WordLearner, SuggestionS
             override fun onUpdateMainDictionaryAvailability(isMainDictionaryAvailable: Boolean) {
                 helper.updateGestureAvailability(isGestureHandlingAvailable())
                 updateSuggestions(SuggestedWords.INPUT_STYLE_TYPING)
+
+                dictionaryFacilitator.updateSwipeLayoutAndDictsIfNeeded(
+                    Settings.getInstance().current,
+                    helper.keyboardSwitcher.keyboard
+                )
             }
         }
 
@@ -402,18 +412,29 @@ class GeneralIME(val helper: IMEHelper) : IMEInterface, WordLearner, SuggestionS
 
         showSuggestionStrip(words)
         when(inputStyle) {
-            SuggestedWords.INPUT_STYLE_TAIL_BATCH ->
-                inputLogic.onUpdateTailBatchInputCompleted(
-                    settings.current,
-                    words,
-                    helper.keyboardSwitcher
-                )
+            SuggestedWords.INPUT_STYLE_TAIL_BATCH -> {
+                val updateBatch = {
+                    inputLogic.onUpdateTailBatchInputCompleted(
+                        settings.current,
+                        words,
+                        helper.keyboardSwitcher
+                    )
+                    helper.keyboardSwitcher.mainKeyboardView?.performHapticFeedback(
+                        HapticFeedbackConstants.VIRTUAL_KEY_RELEASE
+                    )
+                }
+                if(Looper.myLooper() != Looper.getMainLooper()) {
+                    helper.lifecycleScope.launch(Dispatchers.Main) { updateBatch() }
+                } else {
+                    updateBatch()
+                }
+            }
         }
     }
 
     var updateSuggestionJob: Job? = null
     var lmUpdateJob: Job? = null
-    private fun updateSuggestionsDictionaryInternal(inputStyle: Int, sequenceNumber: Int) {
+    private suspend fun updateSuggestionsDictionaryInternal(inputStyle: Int, sequenceNumber: Int) {
         // This method returns null for us if LM is disabled
         val predictionInputValues = languageModelFacilitator.makePredictionInputValues(inputStyle)
 
@@ -450,7 +471,6 @@ class GeneralIME(val helper: IMEHelper) : IMEInterface, WordLearner, SuggestionS
             ) { suggestedWords -> dictResult = suggestedWords }
         }
 
-        @Suppress("KotlinConstantConditions")
         when {
             !lmResult.isNullOrEmpty() && dictResult != null && predictionInputValues != null -> {
                 val processed = languageModelFacilitator.processAndMergeSuggestions(
@@ -719,6 +739,11 @@ class GeneralIME(val helper: IMEHelper) : IMEInterface, WordLearner, SuggestionS
 
     override fun onLayoutUpdated(layout: KeyboardLayoutSetV2) {
         inputLogic.mWordComposer.setCombiners(layout.mainLayout.combiners)
+
+        dictionaryFacilitator.updateSwipeLayoutAndDictsIfNeeded(
+            Settings.getInstance().current,
+            helper.keyboardSwitcher.keyboard
+        )
     }
 
     override fun setNeutralSuggestionStrip() {
@@ -756,6 +781,19 @@ class GeneralIME(val helper: IMEHelper) : IMEInterface, WordLearner, SuggestionS
         inputLogic.recycle()
     }
 
+    fun cursorStepped(steps: Int, overWords: Boolean) {
+        if(!settings.current.mVibrateOn) return
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            helper.keyboardSwitcher.mainKeyboardView?.performHapticFeedback(
+                if(overWords) HapticFeedbackConstants.KEYBOARD_TAP else HapticFeedbackConstants.TEXT_HANDLE_MOVE)
+        };
+    }
+
+    override fun hasMoreTextToDelete(): Boolean =
+        inputLogic.mConnection.codePointBeforeCursor != Constants.NOT_A_CODE
+                || inputLogic.mWordComposer.isComposingWord
+
     companion object {
         @OptIn(ExperimentalCoroutinesApi::class)
         val dictionaryScope = Dispatchers.Default.limitedParallelism(1)
diff --git a/java/src/org/futo/inputmethod/engine/general/JapaneseIME.kt b/java/src/org/futo/inputmethod/engine/general/JapaneseIME.kt
index f36d0b3568..726d8daba5 100644
--- a/java/src/org/futo/inputmethod/engine/general/JapaneseIME.kt
+++ b/java/src/org/futo/inputmethod/engine/general/JapaneseIME.kt
@@ -26,6 +26,7 @@ import org.futo.inputmethod.engine.GlobalIMEMessage
 import org.futo.inputmethod.engine.IMEHelper
 import org.futo.inputmethod.engine.IMEInterface
 import org.futo.inputmethod.engine.IMEMessage
+import org.futo.inputmethod.engine.StateHint
 import org.futo.inputmethod.event.Event
 import org.futo.inputmethod.keyboard.KeyboardId
 import org.futo.inputmethod.keyboard.internal.KeyboardLayoutKind
@@ -79,6 +80,7 @@ import org.mozc.android.inputmethod.japanese.protobuf.ProtoConfig
 import org.mozc.android.inputmethod.japanese.protobuf.ProtoUserDictionaryStorage
 import java.io.File
 import java.util.Locale
+import java.util.concurrent.atomic.AtomicBoolean
 
 object JapaneseIMESettings {
     val FlickOnly = SettingsKey(
@@ -604,6 +606,8 @@ class JapaneseIME(val helper: IMEHelper) : IMEInterface {
         return false
     }
 
+    override fun getStateHint(imeHint: String?): StateHint = if(imeHint == "12key") StateHint(true, true) else StateHint()
+
     private fun createKeyEvent(
         original: KeyEvent,
         eventTime: Long,
@@ -847,7 +851,7 @@ class JapaneseIME(val helper: IMEHelper) : IMEInterface {
 
     // We use the "shift" alphabet state to show the language switch key
     override fun getCurrentAutoCapsState() = when {
-        !hasPreedit && layoutHint == "12key" -> TextUtils.CAP_MODE_CHARACTERS
+        !hasPreedit && layoutHint == "12key" && !evalPending.get() -> TextUtils.CAP_MODE_CHARACTERS
         else -> Constants.TextUtils.CAP_MODE_OFF
     }
 
@@ -984,11 +988,13 @@ class JapaneseIME(val helper: IMEHelper) : IMEInterface {
         }
     }
 
+    private val evalPending = AtomicBoolean(false)
     private val evaluationCallback = object : SessionExecutor.EvaluationCallback {
         override fun onCompleted(
             command: Optional<ProtoCommands.Command>,
             triggeringKeyEvent: Optional<KeyEventInterface>
         ) {
+            evalPending.set(false)
             if(!command.isPresent) return
 
             renderInputConnection(command.get(), triggeringKeyEvent.orNull())
@@ -1119,6 +1125,7 @@ class JapaneseIME(val helper: IMEHelper) : IMEInterface {
                 val touchEvents = emptyList<ProtoCommands.Input.TouchEvent>()
 
                 if(mozcEvent != null) {
+                    evalPending.set(true)
                     executor.sendKey(
                         mozcEvent,
                         triggeringKeyEvent,
diff --git a/java/src/org/futo/inputmethod/event/combiners/KoashurCombiner.kt b/java/src/org/futo/inputmethod/event/combiners/KoashurCombiner.kt
new file mode 100644
index 0000000000..f5669a775d
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/KoashurCombiner.kt
@@ -0,0 +1,148 @@
+// KoashurKhat Latin Script Combiner for FUTO Keyboard
+// Handles Latin script with custom dead key combinations
+
+package org.futo.inputmethod.event.combiners
+
+import android.text.TextUtils
+import org.futo.inputmethod.event.Combiner
+import org.futo.inputmethod.event.Event
+import org.futo.inputmethod.latin.common.Constants
+
+/**
+ * Combiner for KoashurKhat Latin script.
+ * Handles combination of dead keys with base letters to produce: ṭ, ḍ, è, ë, ē, ě, ó, ö, ÿ
+ */
+class KoashurCombiner: Combiner {
+    // General implementation:
+    // A StringBuilder called `buffer` stores uncombined Latin letters and dead keys from keypresses.
+    // On every keypress these are processed to create combined diacritical characters
+    // using the processCombinations() function, and passed to the system using getCombiningStateFeedback()
+
+    companion object Data {
+        // Dead key characters used in KoashurKhat
+        private const val DEAD_ACUTE = '\u00B4'  // ´ (maps to ' key position)
+        private const val DEAD_CARON = '\u030C'  // ̌ (maps to ˇ key position)
+
+        // Valid base letters that can combine with dead keys
+        private val baseLetters = setOf(
+            't', 'T', 'd', 'D', 'e', 'E', 'o', 'O', 'y', 'Y', 'r', 'R', 'w', 'W'
+        )
+
+        // Dead key combination mappings (letter + dead key)
+        private val deadKeyCombinations = mapOf(
+            // ACUTE dead key combinations (letter + \u00B4)
+            Pair('t', DEAD_ACUTE) to 'ṭ',  // U+1E6D
+            Pair('T', DEAD_ACUTE) to 'Ṭ',  // U+1E6C
+            Pair('e', DEAD_ACUTE) to 'è',  // U+00E8
+            Pair('E', DEAD_ACUTE) to 'È',  // U+00C8
+            Pair('o', DEAD_ACUTE) to 'ó',  // U+00F3
+            Pair('O', DEAD_ACUTE) to 'Ó',  // U+00D3
+
+            // CARON dead key combinations (letter + \u030C)
+            Pair('d', DEAD_CARON) to 'ḍ',  // U+1E0D
+            Pair('D', DEAD_CARON) to 'Ḍ',  // U+1E0C
+            Pair('e', DEAD_CARON) to 'ě',  // U+00EB
+            Pair('E', DEAD_CARON) to 'Ě',  // U+00CB
+            Pair('o', DEAD_CARON) to 'ö',  // U+00F6
+            Pair('O', DEAD_CARON) to 'Ö',  // U+00D6
+            Pair('y', DEAD_CARON) to 'ÿ',  // U+00FF
+            Pair('Y', DEAD_CARON) to 'Ÿ',  // U+0178
+            Pair('r', DEAD_CARON) to 'ē',  // U+0113 (using r for ē)
+            Pair('R', DEAD_CARON) to 'Ē',  // U+0112 (using R for Ē)
+            Pair('w', DEAD_CARON) to 'ë',  // U+011B (using w for ě)
+            Pair('W', DEAD_CARON) to 'Ë'   // U+011A (using W for Ě)
+        )
+
+        private val deadKeys = setOf(DEAD_ACUTE, DEAD_CARON)
+    }
+
+    private fun isKoashurKhatLetter(char: Char): Boolean {
+        return char.code in 0x0041..0x007A ||  // A-Z, a-z
+                char.code in 0x00C0..0x024F ||  // Latin Extended-A/B
+                deadKeys.contains(char)
+    }
+
+    private fun isDeadKey(char: Char): Boolean {
+        return deadKeys.contains(char)
+    }
+
+    private fun isBaseLetter(char: Char): Boolean {
+        return baseLetters.contains(char)
+    }
+
+    private val buffer = StringBuilder() // This buffer holds uncombined KoashurKhat letters and dead keys
+
+    private fun processCombinations(): CharSequence {
+        val combined = StringBuilder()
+
+        var i = 0
+        while (i < buffer.length) {
+            val char = buffer[i]
+
+            // Check if current character is a base letter and next is a dead key
+            if (isBaseLetter(char) && i + 1 < buffer.length) {
+                val nextChar = buffer[i + 1]
+
+                if (isDeadKey(nextChar)) {
+                    val combination = Pair(char, nextChar)
+
+                    if (deadKeyCombinations.containsKey(combination)) {
+                        // Valid combination found (letter + dead key)
+                        combined.append(deadKeyCombinations[combination]!!)
+                        i += 2 // Skip both characters
+                        continue
+                    }
+                }
+            }
+
+            // Check if current character is a dead key with no preceding base letter
+            if (isDeadKey(char)) {
+                // For dead keys that don't combine, we can show them or hide them
+                // For now, we'll show them but they should be invisible in practice
+                combined.append(char)
+                i++
+                continue
+            }
+
+            // Regular character or base letter without following dead key
+            combined.append(char)
+            i++
+        }
+
+        return combined
+    }
+
+    override fun processEvent(previousEvents: ArrayList<Event>?, event: Event?): Event {
+        if (event == null) return Event.createNotHandledEvent()
+        val keypress = event.mCodePoint.toChar()
+
+        if (!isKoashurKhatLetter(keypress)) {
+            if (!TextUtils.isEmpty(buffer)) {
+                if (event.mKeyCode == Constants.CODE_DELETE) {
+                    return if (buffer.length == 1) {
+                        reset()
+                        Event.createHardwareKeypressEvent(0x20, Constants.CODE_SPACE,
+                            event, event.isKeyRepeat)
+                        // This space event helps with proper deletion behavior
+                    }
+                    else {
+                        buffer.setLength(buffer.length - 1)
+                        Event.createConsumedEvent(event)
+                    }
+                }
+            }
+            return event
+        }
+
+        buffer.append(keypress)
+        return Event.createConsumedEvent(event)
+    }
+
+    override fun getCombiningStateFeedback(): CharSequence {
+        return processCombinations()
+    }
+
+    override fun reset() {
+        buffer.setLength(0)
+    }
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/Common.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/Common.kt
new file mode 100644
index 0000000000..95510764d4
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/Common.kt
@@ -0,0 +1,98 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+/** Code common to both Telex and VNI */
+object Common {
+    /** get_tone_mark_placement() function from vi-rs/src/editing.rs
+     * Get nth character to place tone mark
+     *
+     * # Rules:
+     * 1. If a vowel contains ơ or ê, tone mark goes there
+     * 2. If a vowel contains `oa`, `oe`, `oo`, `oy`, tone mark should be on the
+     *    second character
+     *
+     * If the accent style is [`AccentStyle::Old`], then:
+     * - 3. For vowel length 3 or vowel length 2 with a final consonant, put it on the second vowel character
+     * - 4. Else, put it on the first vowel character
+     *
+     * Otherwise:
+     * - 3. If a vowel has 2 characters, put the tone mark on the first one
+     * - 4. Otherwise, put the tone mark on the second vowel character
+     */
+    fun getToneMarkPosition(
+        outputWithoutTone: CharSequence,
+        firstVowelIndex: Int,
+        vowelCount: Int
+    ): Int {
+        val specialVowelPairs = setOf("oa", "oe", "oo", "uy", "uo", "ie")
+
+        // If there's only one vowel, then it's guaranteed that the tone mark will go there
+        if (vowelCount == 1) return firstVowelIndex
+
+        for (i in firstVowelIndex ..< firstVowelIndex + vowelCount) {
+            when (outputWithoutTone[i]) {
+                'ơ', 'Ơ' -> return i
+                'ê', 'Ê' -> return i
+                'â', 'Â' -> return i
+            }
+        }
+
+        val vowel = outputWithoutTone.slice(firstVowelIndex ..< firstVowelIndex + vowelCount)
+
+        // If there is only one vowel with a diacritic (circumflex, breve, horn, etc.), it should
+        // get the tone mark
+        val vowelsWithDiacritics = vowel.withIndex().filter { it.value !in VOWELS }
+        if (vowelsWithDiacritics.size == 1) {
+            return firstVowelIndex + vowelsWithDiacritics[0].index
+        }
+
+        // Special vowels require the tone mark to be placed on the second character
+        if (specialVowelPairs.any { vowel.contains(it, ignoreCase = true) })
+            return firstVowelIndex + 1
+
+        // If a syllable end with 2 character vowel, put it on the first character
+        if (firstVowelIndex + vowelCount == outputWithoutTone.length && vowelCount == 2)
+            return firstVowelIndex
+
+        // Else, put tone mark on second vowel
+        return firstVowelIndex + 1
+    }
+
+
+    val CONSONANTS = setOf(
+        'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'q', 'r', 's', 't', 'v', 'w', 'x', 'z')
+
+    val VOWELS = setOf('a', 'e', 'i', 'o', 'u', 'y', 'A', 'E', 'I', 'O', 'U', 'Y')
+
+    /** A map of characters without accent to character with circumflex accent */
+    public val CIRCUMFLEX_MAP = mapOf(
+        'a' to 'â',
+        'e' to 'ê',
+        'o' to 'ô',
+        // uppercase
+        'A' to 'Â',
+        'E' to 'Ê',
+        'O' to 'Ô',
+    )
+
+    /** A map of characters without accent to character with dyet (D WITH STROKE) accent */
+    public val STROKE_MAP = mapOf(
+        'd' to 'đ',
+        'D' to 'Đ',
+    )
+
+    /** A map of characters without accent to character with horn accent */
+    public val HORN_MAP = mapOf(
+        'u' to 'ư',
+        'o' to 'ơ',
+        // uppercase
+        'U' to 'Ư',
+        'O' to 'Ơ',
+    )
+
+    /** A map of characters without accent to character with breve accent */
+    public val BREVE_MAP = mapOf(
+        'a' to 'ă',
+        // uppercase
+        'A' to 'Ă',
+    )
+}
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/Telex.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/Telex.kt
new file mode 100644
index 0000000000..f76c49c802
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/Telex.kt
@@ -0,0 +1,256 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+object Telex {
+    val TONES = mapOf(
+        'f' to ToneMark.GRAVE,
+        'j' to ToneMark.DOT,
+        'r' to ToneMark.HOOK,
+        's' to ToneMark.ACUTE,
+        'x' to ToneMark.TILDE
+    )
+
+    /** These are the modifiers that should only be active if they come after the first vowel letter.
+     * For example, `sao` should not output any tone marks, but `aso` should output `áo`.
+     */
+    val AFTER_VOWEL_MODIFIERS = setOf('f', 'j', 'r', 's', 'w', 'x')
+
+    /** Convert a string that represents a Vietnamese syllable written in the Telex convention ([input])
+     * to a syllable written in Vietnamese orthography.
+     * Example: input = "vietej", output = "việt"
+     */
+    public fun telexToVietnamese(input: String): String {
+
+        // STAGE 1: calculate modifierIndices, firstVowelIndex, startedFinal and lowercaseVowel
+        // Example:
+        //   Input: "vietej"
+        //   Output:
+        //     modifierIndices: { 'e': [2, 4], 'j': [5], the rest are empty lists }
+        //     firstVowelIndex: 1
+        //     startedFinal: true
+        //     lowercaseVowel: "ie"
+        val lowercaseInput = input.lowercase()
+        var startedVowel = false
+        var startedFinal = false
+        var firstVowelIndex = -1
+
+        val lowercaseVowel = StringBuilder()
+
+        /** Map of 'modifier' characters that can add a diacritic or tone mark,
+         * to lists of indices of occurrences of these characters
+         */
+        val modifierIndices: Map<Char, MutableList<Int>> = mapOf(
+            'a' to mutableListOf(),
+            'd' to mutableListOf(),
+            'e' to mutableListOf(),
+            'f' to mutableListOf(),
+            'j' to mutableListOf(),
+            'o' to mutableListOf(),
+            'r' to mutableListOf(),
+            's' to mutableListOf(),
+            'w' to mutableListOf(),
+            'x' to mutableListOf(),
+        )
+
+        for ((index, ch) in lowercaseInput.withIndex()) {
+
+            if (!startedVowel) {
+                if (Common.VOWELS.contains(ch)) {
+                    // TODO: this code needs to be refined further
+                    // if a syllable has a weird initial (like 'cl' in 'clown') that we are sure does not belong to Vietnamese,
+                    // then stop the conversion process and just output the input as it is
+                    // if (!(index in 0..3)) return input
+                    // if (index in 2..3)
+                    //     if (!INITIALS.contains(lowercaseInput.slice(0..<index)))
+                    //         return input
+
+                    firstVowelIndex = index
+                    startedVowel = true
+                }
+            }
+
+            if (startedVowel && !startedFinal && !AFTER_VOWEL_MODIFIERS.contains(ch)) {
+                if (Common.CONSONANTS.contains(ch)) {
+                    startedFinal = true
+                } else {
+                    lowercaseVowel.append(ch)
+                }
+            }
+
+            if (AFTER_VOWEL_MODIFIERS.contains(ch)) {
+                if (startedVowel) modifierIndices[ch]!!.add(index)
+            } else if (modifierIndices.containsKey(ch)) {
+                modifierIndices[ch]!!.add(index)
+            }
+        }
+
+
+        // STAGE 1.5: apply a correction to firstVowelIndex
+        // If the input contains more than one 'd' before the vowel starts
+        // (example: "ddi" > "đi", "dddi" > "ddi"), one of the characters will be deleted
+        // and therefore the firstVowelIndex needs to be corrected to account for this
+        if (modifierIndices['d']!!.size > 1 && modifierIndices['d']!!.last() < firstVowelIndex)
+            firstVowelIndex--
+
+        // apply correction to lowercaseVowel:
+        // "gi" (unless there is no other vowel letter) and "qu" should be considered consonants
+        if (lowercaseVowel.length > 1 && (lowercaseInput.slice(0..<2) == "gi" || lowercaseInput.slice(0..<2) == "qu"))
+            lowercaseVowel.deleteAt(0)
+
+
+        // STAGE 2: use modifierIndices to apply diacritics (except tone marks) to the syllable
+        // Example:
+        //   Input: "vietej" with its modifierIndices and firstVowelIndex as detailed in Stage 1
+        //   Output:
+        //     outputWithoutTone: "viêt"
+        //     tone: ToneMark.DOT
+        //     vowelCount: 2
+        val output = StringBuilder()
+        var tone: ToneMark? = null
+        var doNotOutputNextChar = false // this handles the "uwow" edge case
+        var vowelCount = 0
+        var wHasBeenUsed = false
+
+        for ((index, ch) in input.withIndex()) {
+            if (doNotOutputNextChar) {
+                doNotOutputNextChar = false
+                continue
+            }
+
+            val lowercaseCh = lowercaseInput[index]
+
+            when (lowercaseCh) {
+                'a', 'd', 'e', 'o' -> {
+                    // handle letters that can be doubled
+
+                    val thisModifierIndices = modifierIndices[lowercaseCh]!!
+
+                    // if there is a string such as `ddi` (output: `đi`) or `dddi` (output: ddi),
+                    // the last `d` (or any modifier that can be doubled) needs to be omitted from the output
+                    if (thisModifierIndices.size >= 2 && index == thisModifierIndices.last()) continue
+
+                    // if there is a string such as `ddi` (output: `đi`),
+                    // a diacritic needs to be applied to the first `d`
+                    if (thisModifierIndices.size == 2 && index == thisModifierIndices[0]) {
+                        if (lowercaseCh == 'd') {
+                            output.append(Common.STROKE_MAP[ch])
+                        } else if (lowercaseCh == 'o' && lowercaseVowel.contentEquals("oeo")) {
+                            // handle "oeo" edge case (should output "oeo", not "ôe"):
+                            // remove the second 'o''s index from modifierIndices so that it will be outputted
+                            modifierIndices['o']!!.removeAt(modifierIndices['o']!!.lastIndex)
+                            output.append(ch)
+                        } else {
+                            output.append(Common.CIRCUMFLEX_MAP[ch])
+                            vowelCount++
+                        }
+
+                        continue // after outputting the character with diacritic,
+                        // suppress outputting the original character
+                    }
+
+                    val wIndices = modifierIndices['w']!!
+
+                    if (wIndices.size == 1 && lowercaseCh == 'a' && !wHasBeenUsed) {
+                        output.append(Common.BREVE_MAP[ch])
+                        wHasBeenUsed = true
+                        vowelCount++
+                        continue
+                    }
+
+                    if (wIndices.size == 1 && lowercaseCh == 'o'
+                        && !lowercaseVowel.contentEquals("oa")
+                        // ↑ add edge case for "oaw" (should output "oă", not "ơă" or "ơa")
+                        && !(firstVowelIndex != 0 && lowercaseVowel.contentEquals("ou"))
+                    // ↑ add edge case: any initial consonant + vowel "ou" with modifier 'w' + no final
+                    // should output "oư" and not "ơư"
+                    ) {
+                        output.append(Common.HORN_MAP[ch])
+                        wHasBeenUsed = true
+                        vowelCount++
+                        continue
+                    }
+                }
+
+                // handling tones
+                'f', 'j', 'r', 's', 'x' -> {
+                    val thisModifierIndices = modifierIndices[lowercaseCh]!!
+
+                    if (thisModifierIndices.size == 1)
+                        tone = TONES[lowercaseCh]!!
+
+                    if (thisModifierIndices.size >= 1 && index == thisModifierIndices.last()) continue
+                }
+
+                'u' -> {
+                    // edge case for `uwow` > `ươ`:
+                    // the first instance of
+                    if (lowercaseInput.length >= index + 4) {
+                        if (lowercaseInput.slice(index..<index+4) == "uwow" && modifierIndices['w']!!.size == 2) {
+                            modifierIndices['w']!!.removeAt(0)
+                            doNotOutputNextChar = true
+                        }
+                    }
+
+                    // Check if "uo" with modifier 'w' should output "uơ" instead of "ươ"
+                    // This only applies when:
+                    // * There is an initial consonant, i.e. the syllable does not start with a vowel
+                    // * The vowel is only "uo", nothing else
+                    // * There is no final consonant
+                    // For example: "huow" -> "huơ" (uowIsNotUwow=true), but "uow" -> "ươ" (uowIsNotUwow=false)
+                    var uowIsNotUwow = false
+                    if ((firstVowelIndex > 0) && !startedFinal && !doNotOutputNextChar
+                        && modifierIndices['w']!!.size == 1 && lowercaseVowel.contentEquals("uo")) {
+                        uowIsNotUwow = true
+                    }
+
+                    if (modifierIndices['w']!!.size == 1 && !wHasBeenUsed && !(lowercaseInput[0] == 'q' && index == 1) && !uowIsNotUwow) {
+                        output.append(Common.HORN_MAP[ch])
+                        vowelCount++
+                        wHasBeenUsed = true
+                        continue
+                    }
+                }
+
+                'w' -> {
+                    if (modifierIndices['w']!!.size >= 1 && index == modifierIndices['w']!!.last() &&
+                        lowercaseVowel.any { it == 'a' || it == 'o' || it == 'u'}) continue
+                }
+            }
+
+            output.append(ch) // default behavior: just output the character from input as it is
+            if (Common.VOWELS.contains(lowercaseCh)) vowelCount++
+        }
+
+        // STAGE 3: apply a tone mark (if any)
+        if (tone == null) return output.toString()
+
+        // edge case: "gija" should output "gịa"
+        if (lowercaseInput == "gija") {
+            output[1] = tone.map[output[1]] ?: output[1]
+            return output.toString()
+        }
+
+        // apply corrections to vowelCount and firstVowelIndex:
+        // 'gi' (if there is another vowel after it) and 'qu' should be considered as consonants
+        // There is no Vietnamese word which consists of the initial 'qu' without another vowel letter,
+        // but for the sake of better error/edge case handling the correction will only be applied
+        // if there is another vowel letter.
+        if (vowelCount > 1 && (lowercaseInput.slice(0..<2) == "gi" || lowercaseInput.slice(0..<2) == "qu")) {
+            vowelCount--
+            firstVowelIndex++
+        }
+
+        // if there has been some error applying the correction, just output without the tone mark
+        if (vowelCount <= 0 || firstVowelIndex < 0 || firstVowelIndex + vowelCount - 1 >= output.length)
+            return output.toString()
+
+        // add tone mark
+        val toneMarkPosition = Common.getToneMarkPosition(output, firstVowelIndex, vowelCount)
+        // avoid index out of bounds error
+        if (toneMarkPosition !in 0..<output.length)
+            return output.toString()
+        output[toneMarkPosition] = tone.map[output[toneMarkPosition]] ?:
+                output[toneMarkPosition]
+
+        return output.toString()
+    }
+}
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/ToneMark.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/ToneMark.kt
new file mode 100644
index 0000000000..2e572b4ada
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/ToneMark.kt
@@ -0,0 +1,148 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+/** Vietnamese tone marks.
+ *
+ * Represents the five tone marks used in Vietnamese writing system.
+ */
+enum class ToneMark(val map: Map<Char, Char>) {
+    /** Dấu sắc (acute accent) - rising tone */
+    ACUTE(mapOf(
+        'a' to 'á',
+        'â' to 'ấ',
+        'ă' to 'ắ',
+        'e' to 'é',
+        'ê' to 'ế',
+        'i' to 'í',
+        'o' to 'ó',
+        'ô' to 'ố',
+        'ơ' to 'ớ',
+        'u' to 'ú',
+        'ư' to 'ứ',
+        'y' to 'ý',
+        // uppercase
+        'A' to 'Á',
+        'Â' to 'Ấ',
+        'Ă' to 'Ắ',
+        'E' to 'É',
+        'Ê' to 'Ế',
+        'I' to 'Í',
+        'O' to 'Ó',
+        'Ô' to 'Ố',
+        'Ơ' to 'Ớ',
+        'U' to 'Ú',
+        'Ư' to 'Ứ',
+        'Y' to 'Ý',
+    )),
+    /** Dấu huyền (grave accent) - falling tone */
+    GRAVE(mapOf(
+        'a' to 'à',
+        'â' to 'ầ',
+        'ă' to 'ằ',
+        'e' to 'è',
+        'ê' to 'ề',
+        'i' to 'ì',
+        'o' to 'ò',
+        'ô' to 'ồ',
+        'ơ' to 'ờ',
+        'u' to 'ù',
+        'ư' to 'ừ',
+        'y' to 'ỳ',
+        // uppercase
+        'A' to 'À',
+        'Â' to 'Ầ',
+        'Ă' to 'Ằ',
+        'E' to 'È',
+        'Ê' to 'Ề',
+        'I' to 'Ì',
+        'O' to 'Ò',
+        'Ô' to 'Ồ',
+        'Ơ' to 'Ờ',
+        'U' to 'Ù',
+        'Ư' to 'Ừ',
+        'Y' to 'Ỳ',
+    )),
+    /** Dấu hỏi (hook above) - dipping tone */
+    HOOK(mapOf(
+        'a' to 'ả',
+        'â' to 'ẩ',
+        'ă' to 'ẳ',
+        'e' to 'ẻ',
+        'ê' to 'ể',
+        'i' to 'ỉ',
+        'o' to 'ỏ',
+        'ô' to 'ổ',
+        'ơ' to 'ở',
+        'u' to 'ủ',
+        'ư' to 'ử',
+        'y' to 'ỷ',
+        // uppercase
+        'A' to 'Ả',
+        'Ă' to 'Ẳ',
+        'Â' to 'Ẩ',
+        'E' to 'Ẻ',
+        'Ê' to 'Ể',
+        'O' to 'Ỏ',
+        'Ô' to 'Ổ',
+        'Ơ' to 'Ở',
+        'I' to 'Ỉ',
+        'U' to 'Ủ',
+        'Ư' to 'Ử',
+        'Y' to 'Ỷ',
+    )),
+    /** Dấu ngã (tilde) - creaky rising tone */
+    TILDE(mapOf(
+        'a' to 'ã',
+        'ă' to 'ẵ',
+        'â' to 'ẫ',
+        'e' to 'ẽ',
+        'ê' to 'ễ',
+        'o' to 'õ',
+        'ô' to 'ỗ',
+        'ơ' to 'ỡ',
+        'i' to 'ĩ',
+        'u' to 'ũ',
+        'ư' to 'ữ',
+        'y' to 'ỹ',
+        // uppercase
+        'A' to 'Ã',
+        'Ă' to 'Ẵ',
+        'Â' to 'Ẫ',
+        'E' to 'Ẽ',
+        'Ê' to 'Ễ',
+        'O' to 'Õ',
+        'Ô' to 'Ỗ',
+        'Ơ' to 'Ỡ',
+        'I' to 'Ĩ',
+        'U' to 'Ũ',
+        'Ư' to 'Ữ',
+        'Y' to 'Ỹ',
+    )),
+    /** Dấu nặng (dot below) - creaky falling tone */
+    DOT(mapOf(
+        'a' to 'ạ',
+        'ă' to 'ặ',
+        'â' to 'ậ',
+        'e' to 'ẹ',
+        'ê' to 'ệ',
+        'o' to 'ọ',
+        'ô' to 'ộ',
+        'ơ' to 'ợ',
+        'i' to 'ị',
+        'u' to 'ụ',
+        'ư' to 'ự',
+        'y' to 'ỵ',
+        // uppercase
+        'A' to 'Ạ',
+        'Ă' to 'Ặ',
+        'Â' to 'Ậ',
+        'E' to 'Ẹ',
+        'Ê' to 'Ệ',
+        'O' to 'Ọ',
+        'Ô' to 'Ộ',
+        'Ơ' to 'Ợ',
+        'I' to 'Ị',
+        'U' to 'Ụ',
+        'Ư' to 'Ự',
+        'Y' to 'Ỵ',
+    )),
+}
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNI.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNI.kt
new file mode 100644
index 0000000000..aee629ea53
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNI.kt
@@ -0,0 +1,140 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+object VNI {
+    val TONES = mapOf(
+        '1' to ToneMark.ACUTE,
+        '2' to ToneMark.GRAVE,
+        '3' to ToneMark.HOOK,
+        '4' to ToneMark.TILDE,
+        '5' to ToneMark.DOT
+    )
+
+    fun VNIToVietnamese(input: String): String {
+        val lowercaseInput = input.lowercase()
+
+        val modifierExists = MutableList(10) { false }
+
+        val lowercaseInitial = StringBuilder()
+        val lowercaseVowel = StringBuilder()
+
+        var hasLetters = false
+
+        var startedVowel = false
+        var startedFinal = false
+
+        var tone: ToneMark? = null
+
+        // STAGE 1: build modifierIndices and lowercaseVowel
+        for ((index, ch) in lowercaseInput.withIndex()) {
+            //if (ch.isAsciiDigit()) modifierIndices[ch.digitToInt()].add(index)
+            if (ch.isLetter()) hasLetters = true
+
+            // update firstModifierIndex
+            if (ch.isDigit() && !modifierExists[ch.digitToInt()])
+                modifierExists[ch.digitToInt()] = true
+
+            if (!startedVowel && Common.CONSONANTS.contains(ch)) lowercaseInitial.append(ch)
+
+            if (!startedFinal && Common.VOWELS.contains(ch)) {
+                if (!startedVowel) startedVowel = true
+                lowercaseVowel.append(ch)
+            }
+
+            if (startedVowel && Common.CONSONANTS.contains(ch))
+                startedFinal = true
+
+            when (ch) {
+                '1', '2', '3', '4', '5' -> tone = TONES[ch]!!
+            }
+        }
+
+        // apply correction to lowercaseInitial and lowercaseVowel
+        var giQuCorrectionApplied = false
+        if (lowercaseVowel.length > 1 && (lowercaseInitial.contentEquals("q") && lowercaseVowel[0] == 'u' ||
+                    lowercaseInitial.contentEquals("g") && lowercaseVowel[0] == 'i'
+                    )) {
+            giQuCorrectionApplied = true
+            lowercaseInitial.append(lowercaseVowel[0])
+            lowercaseVowel.deleteAt(0)
+        }
+
+        if (!hasLetters) return input
+
+        // STAGE 2: remove numbers and add diacritics
+        val output = StringBuilder()
+
+        /** Tracks if an 'u' has been converted to 'ư'.
+         * This variable is checked to ensure that only the first 'u' is converted to 'ư' when there are multiple 'u's.
+         * For example, "uou7" should output "ươu", not "ươư"; "uu7" should output "ưu", not "ưư".*/
+        var uHornOutputted = false
+
+        for ((index, ch) in lowercaseInput.withIndex()) {
+            when (ch) {
+                // handle numbers
+                '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' -> continue
+
+                // handle modifiable characters
+                'a' -> {
+                    if (modifierExists[8]) {
+                        output.append(Common.BREVE_MAP[input[index]])
+                        continue
+                    }
+
+                    if (modifierExists[6]) {
+                        output.append(Common.CIRCUMFLEX_MAP[input[index]])
+                        continue
+                    }
+                }
+                'd' -> if (modifierExists[9]) {
+                    output.append(Common.STROKE_MAP[input[index]])
+                    continue
+                }
+                'e', 'o' -> {
+                    if (modifierExists[6]) {
+                        output.append(Common.CIRCUMFLEX_MAP[input[index]])
+                        continue
+                    }
+
+                    if (ch == 'o' && modifierExists[7] &&
+                        !(output.length != 0 && lowercaseVowel.contentEquals("ou") && !startedFinal)) {
+                        output.append(Common.HORN_MAP[input[index]])
+                        continue
+                    }
+                }
+
+                'u' -> if (modifierExists[7] &&
+                    !uHornOutputted &&
+                    !(output.getOrNull(0)?.lowercaseChar() == 'q' && output.length == 1) &&
+                    !(output.length != 0 && lowercaseVowel.contentEquals("uo") && !startedFinal)) {
+                    output.append(Common.HORN_MAP[input[index]])
+                    uHornOutputted = true
+                    continue
+                }
+            }
+
+            //default behavior: output the char in input
+            output.append(input[index])
+        }
+
+        // STAGE 3: add tone mark
+        if (tone == null) return output.toString()
+
+        //edge case for gi5a > gịa
+        if (lowercaseInput == "gi5a") {
+            output[1] = tone.map[output[1]] ?: output[1]
+            return output.toString()
+        }
+
+        // handle errors
+        if (lowercaseVowel.isEmpty() || lowercaseInitial.length + lowercaseVowel.length - 1 >= output.length)
+            return output.toString()
+
+        val toneMarkPosition = Common.getToneMarkPosition(output, lowercaseInitial.length, lowercaseVowel.length)
+        // avoid index out of bounds error
+        if (toneMarkPosition !in 0..<output.length)
+            return output.toString()
+        output[toneMarkPosition] = tone.map[output[toneMarkPosition]] ?: output[toneMarkPosition]
+
+        return output.toString()
+    }
+}
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNICombiner.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNICombiner.kt
new file mode 100644
index 0000000000..d0d594268d
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VNICombiner.kt
@@ -0,0 +1,62 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+import android.text.TextUtils
+import org.futo.inputmethod.event.Combiner
+import org.futo.inputmethod.event.Event
+import org.futo.inputmethod.latin.common.Constants
+import java.util.ArrayList
+
+class VNICombiner: Combiner {
+    private val buffer = StringBuilder() // holds a single Vietnamese word/syllable
+
+    override fun processEvent(
+        previousEvents: ArrayList<Event?>?,
+        event: Event?
+    ): Event {
+        if (event == null) return Event.createNotHandledEvent()
+        if (event.eventType != Event.EVENT_TYPE_INPUT_KEYPRESS) return event
+
+        val keypress = event.mCodePoint.toChar()
+
+        // The normal ASCII digits are left untouched by the combiner and always result in digits
+        // being committed to the output. On the other hand, fullwidth digits are intercepted by
+        // this combiner, converted into ASCII digits, and sent to the VNI converter.
+        // This lets the user explicitly enter numbers that will not get converted into diacritics.
+        // For example, if ASCII '1' (U+0031 DIGIT ONE) is given to this combiner, it will always
+        // output an ASCII '1' (U+0031).
+        // But if a fullwidth '１' (U+FF11 FULLWIDTH DIGIT ONE) is given to this combiner, it will be
+        // converted to an ASCII '1' (U+0031) and given to the VNI converter, where it might result
+        // in an acute accent being placed over a letter.
+        // So, the input sequence [V][i][e][t][U+FF15][U+FF16] will result in the output "Việt"
+        if (keypress.code in 0xFF10..0xFF19) {
+            buffer.append((keypress.code - 0xFEE0).toChar())
+            return Event.createConsumedEvent(event)
+        }
+
+        if (!(keypress in 'A'..'Z' || keypress in 'a'..'z')) {
+            if (!TextUtils.isEmpty(buffer)) {
+                if (event.mKeyCode == Constants.CODE_DELETE) {
+                    buffer.setLength(buffer.length - 1)
+                    return Event.createConsumedEvent(event)
+                }
+            }
+
+            if(!event.isFunctionalKeyEvent) return Event.createResetEvent(event)
+            return event
+        }
+
+        buffer.append(keypress)
+        return Event.createConsumedEvent(event)
+    }
+
+    override fun getCombiningStateFeedback(): CharSequence? =
+        try{
+            VNI.VNIToVietnamese(buffer.toString())
+        } catch(e: Exception) {
+            buffer
+        }
+
+    override fun reset() {
+        buffer.clear()
+    }
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/event/combiners/vietnamese/VietTelexCombiner.kt b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VietTelexCombiner.kt
new file mode 100644
index 0000000000..7d9fb66aed
--- /dev/null
+++ b/java/src/org/futo/inputmethod/event/combiners/vietnamese/VietTelexCombiner.kt
@@ -0,0 +1,47 @@
+package org.futo.inputmethod.event.combiners.vietnamese
+
+import android.text.TextUtils
+import org.futo.inputmethod.event.Combiner
+import org.futo.inputmethod.event.Event
+import org.futo.inputmethod.latin.common.Constants
+import java.util.ArrayList
+
+class VietTelexCombiner: Combiner {
+    private val buffer = StringBuilder() // holds a single Vietnamese word/syllable
+
+    override fun processEvent(
+        previousEvents: ArrayList<Event?>?,
+        event: Event?
+    ): Event {
+        if (event == null) return Event.createNotHandledEvent()
+        if (event.eventType != Event.EVENT_TYPE_INPUT_KEYPRESS) return event
+
+        val keypress = event.mCodePoint.toChar()
+
+        if (!(keypress in 'A'..'Z' || keypress in 'a'..'z')) {
+            if (!TextUtils.isEmpty(buffer)) {
+                if (event.mKeyCode == Constants.CODE_DELETE) {
+                    buffer.setLength(buffer.length - 1)
+                    return Event.createConsumedEvent(event)
+                }
+            }
+
+            if(!event.isFunctionalKeyEvent) return Event.createResetEvent(event)
+            return event
+        }
+
+        buffer.append(keypress)
+        return Event.createConsumedEvent(event)
+    }
+
+    override fun getCombiningStateFeedback(): CharSequence? =
+        try {
+            Telex.telexToVietnamese(buffer.toString())
+        } catch (e: Exception) {
+            buffer
+        }
+
+    override fun reset() {
+        buffer.clear()
+    }
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/org/futo/inputmethod/keyboard/KeyboardSwitcher.java
index 60dc0d8699..50e321e931 100644
--- a/java/src/org/futo/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/org/futo/inputmethod/keyboard/KeyboardSwitcher.java
@@ -26,6 +26,9 @@
 
 import androidx.annotation.NonNull;
 
+import org.futo.inputmethod.engine.IMEInterface;
+import org.futo.inputmethod.engine.IMEManager;
+import org.futo.inputmethod.engine.StateHint;
 import org.futo.inputmethod.event.Event;
 import org.futo.inputmethod.keyboard.internal.KeyboardLayoutElement;
 import org.futo.inputmethod.keyboard.internal.KeyboardState;
@@ -38,6 +41,7 @@
 import org.futo.inputmethod.latin.RichInputMethodManager;
 import org.futo.inputmethod.latin.RichInputMethodSubtype;
 import org.futo.inputmethod.latin.Subtypes;
+import org.futo.inputmethod.latin.SwipeDecoderDictionary;
 import org.futo.inputmethod.latin.WordComposer;
 import org.futo.inputmethod.latin.common.Constants;
 import org.futo.inputmethod.latin.settings.LongPressKeySettings;
@@ -70,6 +74,7 @@ public final class KeyboardSwitcher implements SwitchActions {
     public KeyboardState mState;
 
     private KeyboardLayoutSetV2 mKeyboardLayoutSet;
+    private StateHint mStateHint;
     // TODO: The following {@link KeyboardTextsSet} should be in {@link KeyboardLayoutSet}.
     private final KeyboardTextsSet mKeyboardTextsSet = new KeyboardTextsSet();
 
@@ -170,8 +175,14 @@ public void loadKeyboard(final EditorInfo editorInfo, final SettingsValues setti
                     params
             );
 
-            mState.onLoadKeyboard(editorInfo, transformAutoCapsState(currentAutoCapsState),
-                    layoutSetName);
+            mStateHint = getStateHint(settingsValues);
+            mState.onLoadKeyboard(
+                    editorInfo,
+                    transformAutoCapsState(currentAutoCapsState),
+                    layoutSetName,
+                    mStateHint
+            );
+
             mLatinIMELegacy.setLayout(mKeyboardLayoutSet);
             mKeyboardTextsSet.setLocale(mRichImm.getCurrentSubtypeLocale(), mThemeContext);
         } catch (Exception e) {
@@ -179,6 +190,13 @@ public void loadKeyboard(final EditorInfo editorInfo, final SettingsValues setti
         }
     }
 
+    private StateHint getStateHint(SettingsValues settingsValues) {
+        IMEManager imeManager = mLatinIMELegacy.getLatinIME().getImeManager();
+        IMEInterface activeIME = imeManager.getActiveIME(settingsValues);
+        String imeHint = mKeyboardLayoutSet.getMainLayout().getImeHint();
+        return activeIME.getStateHint(imeHint);
+    }
+
     private int transformAutoCapsState(int state) {
         if(mKeyboardLayoutSet == null) return state;
         final org.futo.inputmethod.v2keyboard.Keyboard keyboard = mKeyboardLayoutSet.getMainLayout();
@@ -213,6 +231,8 @@ private void setKeyboard(
         final Keyboard oldKeyboard = keyboardView.getKeyboard();
         final Keyboard newKeyboard = mKeyboardLayoutSet.getKeyboard(element);
         keyboardView.setKeyboard(newKeyboard);
+        SwipeDecoderDictionary.updateKeyboard(newKeyboard);
+        keyboardView.updateStateHint(mStateHint);
         keyboardView.setKeyPreviewPopupEnabled(
                 currentSettingsValues.mKeyPreviewPopupOn,
                 currentSettingsValues.mKeyPreviewPopupDismissDelay);
diff --git a/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java b/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
index e98f66885f..83096b8b2f 100644
--- a/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
@@ -38,6 +38,7 @@
 import org.futo.inputmethod.accessibility.AccessibilityUtils;
 import org.futo.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
 import org.futo.inputmethod.annotations.ExternallyReferenced;
+import org.futo.inputmethod.engine.StateHint;
 import org.futo.inputmethod.keyboard.internal.DrawingPreviewPlacerView;
 import org.futo.inputmethod.keyboard.internal.DrawingProxy;
 import org.futo.inputmethod.keyboard.internal.GestureFloatingTextDrawingPreview;
@@ -50,6 +51,7 @@
 import org.futo.inputmethod.keyboard.internal.NonDistinctMultitouchHelper;
 import org.futo.inputmethod.keyboard.internal.SlidingKeyInputDrawingPreview;
 import org.futo.inputmethod.keyboard.internal.TimerHandler;
+import org.futo.inputmethod.latin.AudioAndHapticFeedbackManager;
 import org.futo.inputmethod.latin.uix.DynamicThemeProvider;
 import org.futo.inputmethod.latin.R;
 import org.futo.inputmethod.latin.SuggestedWords;
@@ -645,6 +647,9 @@ public boolean isInDraggingFinger() {
 
     @Override
     public void onShowMoreKeysPanel(final MoreKeysPanel panel) {
+        AudioAndHapticFeedbackManager.getInstance().performHapticFeedback(
+                this, true);
+
         locatePreviewPlacerView();
         // Dismiss another {@link MoreKeysPanel} that may be being showed.
         onDismissMoreKeysPanel();
@@ -893,6 +898,11 @@ private void drawLanguageOnSpacebar(final Key key, final Canvas canvas, final Pa
         }
         paint.setColor(color);
         paint.setAlpha(mLanguageOnSpacebarAnimAlpha);
+
+        final float ratio = Math.min(1.0f, (width * 0.90f) /
+                TypefaceUtils.getStringWidth(language, paint));
+
+        paint.setTextScaleX(ratio);
         canvas.drawText(language, width / 2, baseline - descent, paint);
         paint.clearShadowLayer();
         paint.setTextScaleX(1.0f);
@@ -903,4 +913,8 @@ public void deallocateMemory() {
         super.deallocateMemory();
         mDrawingPreviewPlacerView.deallocateMemory();
     }
+
+    public void updateStateHint(StateHint stateHint) {
+        PointerTracker.setStateHint(stateHint);
+    }
 }
diff --git a/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
index dc117c4ae5..8ec3a938ed 100644
--- a/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
+++ b/java/src/org/futo/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -26,6 +26,7 @@
 import org.futo.inputmethod.latin.R;
 import org.futo.inputmethod.latin.common.StringUtils;
 import org.futo.inputmethod.latin.uix.DynamicThemeProvider;
+import org.futo.inputmethod.latin.uix.actions.BugViewerKt;
 import org.futo.inputmethod.latin.utils.TypefaceUtils;
 
 import java.util.List;
@@ -84,8 +85,8 @@ public void setParameters(final int numKeys, final int numColumn, final int keyW
                 final int dividerWidth) {
             mIsMoreKeysFixedOrder = isMoreKeysFixedOrder;
             if (parentKeyboardWidth / keyWidth < Math.min(numKeys, numColumn)) {
-                throw new IllegalArgumentException("Keyboard is too small to hold more keys: "
-                        + parentKeyboardWidth + " " + keyWidth + " " + numKeys + " " + numColumn);
+                BugViewerKt.throwIfDebug(new IllegalArgumentException("Keyboard is too small to hold more keys: "
+                        + parentKeyboardWidth + " " + keyWidth + " " + numKeys + " " + numColumn));
             }
             mDefaultKeyWidth = keyWidth;
             mDefaultRowHeight = rowHeight;
diff --git a/java/src/org/futo/inputmethod/keyboard/PointerTracker.java b/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
index e09c182dc5..b51cf1807c 100644
--- a/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/org/futo/inputmethod/keyboard/PointerTracker.java
@@ -22,6 +22,8 @@
 import android.util.Log;
 import android.view.MotionEvent;
 
+import org.futo.inputmethod.engine.IMEInterfaceKt;
+import org.futo.inputmethod.engine.StateHint;
 import org.futo.inputmethod.keyboard.internal.BatchInputArbiter;
 import org.futo.inputmethod.keyboard.internal.BatchInputArbiter.BatchInputArbiterListener;
 import org.futo.inputmethod.keyboard.internal.BogusMoveEventDetector;
@@ -85,6 +87,11 @@ public PointerTrackerParams(final TypedArray mainKeyboardViewAttr) {
     }
 
     private static GestureEnabler sGestureEnabler = new GestureEnabler();
+    private static StateHint sStateHint = IMEInterfaceKt.getDefaultStateHint();
+
+    public static void setStateHint(StateHint stateHint) {
+        PointerTracker.sStateHint = stateHint;
+    }
 
     // Parameters for pointer handling.
     private static PointerTrackerParams sParams;
@@ -668,6 +675,7 @@ private void onDownEvent(final int x, final int y, final long eventTime,
         }
         sPointerTrackerQueue.add(this);
         onDownEventInternal(x, y, eventTime);
+
         if (!sGestureEnabler.shouldHandleGesture()) {
             return;
         }
@@ -728,10 +736,15 @@ private void onDownEventInternal(final int x, final int y, final long eventTime)
                 Key prevKey = key;
                 key = getKeyOn(x, y);
 
-                if(key != null && !key.isModifier() || !areTwoKeysCompatibleFollowingLayoutChange(prevKey, key))
-                    key = null;
-                else
-                    key = onDownKey(x, y, eventTime);
+                if(key != null) {
+                    boolean matchesStrictRule = key.isModifier() && areTwoKeysCompatibleFollowingLayoutChange(prevKey, key);
+                    boolean matchesLooseRule = PointerTracker.sStateHint.useLooseMatching && key.equals(prevKey);
+                    if(matchesStrictRule || matchesLooseRule) {
+                        key = onDownKey(x, y, eventTime);
+                    } else {
+                        key = null;
+                    }
+                }
             }
 
             if(key == null) return;
@@ -954,31 +967,37 @@ private void onMoveEventInternal(final int x, final int y, final long eventTime)
 
         final SettingsValues settingsValues = Settings.getInstance().getCurrent();
 
-        if (mIsSlidingCursor && oldKey != null && oldKey.getCode() == Constants.CODE_SPACE) {
-            int pointerStep = sPointerStep;
-            if(settingsValues.mSpacebarMode == Settings.SPACEBAR_MODE_SWIPE_LANGUAGE && !mSpacebarLongPressed) {
-                pointerStep = sPointerHugeStep;
-            }
+        if (!sInGesture && mIsSlidingCursor && oldKey != null && oldKey.getCode() == Constants.CODE_SPACE) {
+            boolean allowedBySettings = (mSpacebarLongPressed && settingsValues.mSpacebarHoldMode == Settings.SPACEBAR_MODE_CURSOR)
+                        || (!mSpacebarLongPressed && settingsValues.mSpacebarSwipeMode != Settings.SPACEBAR_MODE_OFF);
 
-            int steps = (x - mStartX) / pointerStep;
-            final int swipeIgnoreTime = settingsValues.mKeyLongpressTimeout / MULTIPLIER_FOR_LONG_PRESS_TIMEOUT_IN_SLIDING_INPUT;
-            if (steps != 0 && mStartTime + swipeIgnoreTime < System.currentTimeMillis()) {
-                mCursorMoved = true;
-                mStartX += steps * pointerStep;
+            if(allowedBySettings) {
+                int pointerStep = sPointerStep;
+                if (settingsValues.mSpacebarSwipeMode == Settings.SPACEBAR_MODE_LANGUAGE && !mSpacebarLongPressed) {
+                    pointerStep = sPointerHugeStep;
+                }
 
-                if(settingsValues.mSpacebarMode == Settings.SPACEBAR_MODE_SWIPE_LANGUAGE && !mSpacebarLongPressed) {
-                    sListener.onSwipeLanguage(steps);
-                } else {
-                    sListener.onMovePointer(steps);
+                int steps = (x - mStartX) / pointerStep;
+                final int swipeIgnoreTime = settingsValues.mKeyLongpressTimeout / MULTIPLIER_FOR_LONG_PRESS_TIMEOUT_IN_SLIDING_INPUT;
+                if (steps != 0 && mStartTime + swipeIgnoreTime < System.currentTimeMillis()) {
+                    mCursorMoved = true;
+                    mStartX += steps * pointerStep;
+
+                    if (settingsValues.mSpacebarSwipeMode == Settings.SPACEBAR_MODE_LANGUAGE && !mSpacebarLongPressed) {
+                        sListener.onSwipeLanguage(steps);
+                    } else {
+                        sListener.onMovePointer(steps);
+                    }
                 }
-            }
 
-            mLastX = x;
-            mLastY = y;
-            return;
+                mLastX = x;
+                mLastY = y;
+                return;
+            }
         }
 
-        if (mIsSlidingCursor && oldKey != null && oldKey.getCode() == Constants.CODE_DELETE) {
+        if (!sInGesture && mIsSlidingCursor && oldKey != null && oldKey.getCode() == Constants.CODE_DELETE
+                && settingsValues.mBackspaceMode != Settings.BACKSPACE_MODE_OFF) {
             int pointerStep = sPointerStep;
             if(settingsValues.mBackspaceMode == Settings.BACKSPACE_MODE_WORDS) {
                 pointerStep = sPointerBigStep;
@@ -1081,6 +1100,21 @@ public void onPhantomUpEvent(final long eventTime) {
     }
 
     private void onUpEventInternal(final int x, final int y, final long eventTime) {
+        // Update the key if the layout has changed
+        if(mKeyboardLayoutHasBeenChanged
+                && mCurrentKey != null
+                && !mIsFlickingKey
+                && !mIsInSlidingKeyInput
+                && !mIsInDraggingFinger) {
+            final Key newKey = getKeyOn(x, y);
+            if(newKey != null) {
+                final Key oldKey = mCurrentKey;
+                mCurrentKey = newKey;
+                dragFingerFromOldKeyToNewKey(newKey, x, y, eventTime, oldKey, x, y);
+            }
+            mKeyboardLayoutHasBeenChanged = false;
+        }
+
         mStartedOnFastLongPress = false;
         sTimerProxy.cancelKeyTimersOf(this);
         final boolean isInDraggingFinger = mIsInDraggingFinger;
@@ -1121,6 +1155,7 @@ private void onUpEventInternal(final int x, final int y, final long eventTime) {
         }
 
         if (sInGesture) {
+            mBatchInputArbiter.onPointerUp();
             if (currentKey != null) {
                 callListenerOnRelease(currentKey, currentKey.getCode(), true /* withSliding */);
             }
@@ -1184,14 +1219,14 @@ public void onLongPressed() {
         }
         final int code = key.getCode();
         if (code == Constants.CODE_SPACE || code == Constants.CODE_LANGUAGE_SWITCH) {
-            int spacebarMode = Settings.getInstance().getCurrent().mSpacebarMode;
-            if(spacebarMode == Settings.SPACEBAR_MODE_SWIPE_LANGUAGE) {
+            int spacebarMode = Settings.getInstance().getCurrent().mSpacebarHoldMode;
+            if(spacebarMode == Settings.SPACEBAR_MODE_CURSOR) {
                 mSpacebarLongPressed = true;
                 mStartX = mLastX;
                 mStartY = mLastY;
                 sListener.onMovingCursorLockEvent(true);
                 return;
-            }else if(spacebarMode == Settings.SPACEBAR_MODE_SWIPE_CURSOR_ONLY) {
+            }else if(spacebarMode == Settings.SPACEBAR_MODE_OFF) {
                 return;
             }
 
@@ -1369,7 +1404,7 @@ private void startKeyRepeatTimer(final int code, final int repeatCount) {
 
         // Slow down the repeat key if we are deleting whole words
         if(code == Constants.CODE_DELETE
-                && settingsValues.mBackspaceMode == Settings.BACKSPACE_MODE_WORDS
+                && settingsValues.mBackspaceModeHold == Settings.BACKSPACE_MODE_WORDS
                 && repeatCount > 1) {
             delay = (int)((float)delay * (7.0f * (1.0f / ((float)(repeatCount - 1))) + 1.0f));
         }
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/BatchInputArbiter.java b/java/src/org/futo/inputmethod/keyboard/internal/BatchInputArbiter.java
index 86cabb4f19..c5a8a1b7ef 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/BatchInputArbiter.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/BatchInputArbiter.java
@@ -35,17 +35,19 @@ public void onUpdateBatchInput(
     }
 
     // The starting time of the first stroke of a gesture input.
-    private static long sGestureFirstDownTime;
+    private static long sGestureFirstDownTime = -1;
     // The {@link InputPointers} that includes all events of a gesture input.
     private static final InputPointers sAggregatedPointers = new InputPointers(
             Constants.DEFAULT_GESTURE_POINTS_CAPACITY);
     private static int sLastRecognitionPointSize = 0; // synchronized using sAggregatedPointers
-    private static long sLastRecognitionTime = 0; // synchronized using sAggregatedPointers
+    private static long sLastRecognitionTime = -1; // synchronized using sAggregatedPointers
 
     private final GestureStrokeRecognitionPoints mRecognitionPoints;
+    private final int mPointerId;
 
     public BatchInputArbiter(final int pointerId, final GestureStrokeRecognitionParams params) {
         mRecognitionPoints = new GestureStrokeRecognitionPoints(pointerId, params);
+        mPointerId = pointerId;
     }
 
     public void setKeyboardGeometry(final int keyWidth, final int keyboardHeight) {
@@ -71,11 +73,16 @@ public int getElapsedTimeSinceFirstDown(final long eventTime) {
      */
     public void addDownEventPoint(final int x, final int y, final long downEventTime,
             final long lastLetterTypingTime, final int activePointerCount) {
-        if (activePointerCount == 1) {
-            sGestureFirstDownTime = downEventTime;
+        synchronized(sAggregatedPointers) {
+            if (sGestureFirstDownTime == -1) {
+                sGestureFirstDownTime = downEventTime;
+                sAggregatedPointers.resetForBatch();
+            }
         }
         final int elapsedTimeSinceFirstDown = getElapsedTimeSinceFirstDown(downEventTime);
         final int elapsedTimeSinceLastTyping = (int)(downEventTime - lastLetterTypingTime);
+
+        sAggregatedPointers.onPointerDown(mPointerId);
         mRecognitionPoints.addDownEventPoint(
                 x, y, elapsedTimeSinceFirstDown, elapsedTimeSinceLastTyping);
     }
@@ -92,6 +99,10 @@ public void addDownEventPoint(final int x, final int y, final long downEventTime
      */
     public boolean addMoveEventPoint(final int x, final int y, final long moveEventTime,
             final boolean isMajorEvent, final BatchInputArbiterListener listener) {
+        synchronized(sAggregatedPointers) {
+            if (sGestureFirstDownTime == -1) return false;
+        }
+
         final int beforeLength = mRecognitionPoints.getLength();
         final boolean onValidArea = mRecognitionPoints.addEventPoint(
                 x, y, getElapsedTimeSinceFirstDown(moveEventTime), isMajorEvent);
@@ -112,7 +123,7 @@ public boolean mayStartBatchInput(final BatchInputArbiterListener listener) {
             return false;
         }
         synchronized (sAggregatedPointers) {
-            sAggregatedPointers.reset();
+            sAggregatedPointers.resetNonBatch();
             sLastRecognitionPointSize = 0;
             sLastRecognitionTime = 0;
             listener.onStartBatchInput();
@@ -129,6 +140,12 @@ public boolean mayStartBatchInput(final BatchInputArbiterListener listener) {
      */
     public void updateBatchInputByTimer(final long syntheticMoveEventTime,
             final BatchInputArbiterListener listener) {
+        synchronized(sAggregatedPointers) {
+            if(sLastRecognitionTime == -1) {
+                // Not in gesture input. We need to start it before we can permit update by timer.
+                return;
+            }
+        }
         mRecognitionPoints.duplicateLastPointWith(
                 getElapsedTimeSinceFirstDown(syntheticMoveEventTime));
         updateBatchInput(syntheticMoveEventTime, listener);
@@ -173,9 +190,19 @@ public boolean mayEndBatchInput(final long upEventTime, final int activePointerC
             mRecognitionPoints.appendAllBatchPoints(sAggregatedPointers);
             if (activePointerCount == 1) {
                 listener.onEndBatchInput(sAggregatedPointers, upEventTime);
+                sAggregatedPointers.upAllPointers();
+                sLastRecognitionTime = -1;
+                sGestureFirstDownTime = -1;
                 return true;
             }
         }
         return false;
     }
+
+    /**
+     * Marks the pointer as having been released from the touchscreen
+     */
+    public void onPointerUp() {
+        sAggregatedPointers.onPointerUp(mPointerId);
+    }
 }
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java b/java/src/org/futo/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
index 1b6a11501a..eeb35074de 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
+++ b/java/src/org/futo/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
@@ -278,7 +278,7 @@ public boolean addEventPoint(final int x, final int y, final int time,
             updateMajorEvent(x, y, time);
         } else {
             final int distance = detectFastMove(x, y, time);
-            if (distance > mGestureSamplingMinimumDistance) {
+            if (distance > 0) { // TODO: Previously mGestureSamplingMinimumDistance. Remove it entirely?
                 appendPoint(x, y, time);
             }
         }
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardState.kt b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardState.kt
index b5ecc14a5a..5b9bebebbc 100644
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardState.kt
+++ b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardState.kt
@@ -4,6 +4,8 @@ import android.util.Log
 import android.view.ViewConfiguration
 import android.view.inputmethod.EditorInfo
 import androidx.annotation.VisibleForTesting
+import org.futo.inputmethod.engine.DefaultStateHint
+import org.futo.inputmethod.engine.StateHint
 import org.futo.inputmethod.event.Event
 import org.futo.inputmethod.keyboard.Key
 import org.futo.inputmethod.keyboard.Keyboard
@@ -175,9 +177,6 @@ class KeyboardState(private val switchActions: SwitchActions) {
         fun shouldReleaseAllPointers(keyboard: Keyboard?, key: Key?): Boolean = when {
             keyboard == null || key == null -> false
             key.isModifier -> true
-            Constants.isLetterCode(key.code)
-                    && !keyboard.mId.mElement.page.locked
-                    && !keyboard.mShiftKeys.any { it.pressed } -> true
             else -> false
         }
     }
@@ -198,6 +197,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
 
     private var prefersNumberLayout = false
     private var currentLayoutSet = ""
+    private var currentStateHint = DefaultStateHint
     private var preferredAlphabetKind: Pair<String, Int> = "" to 0
 
     private val debugState: String
@@ -271,11 +271,12 @@ class KeyboardState(private val switchActions: SwitchActions) {
         switchActions.requestUpdatingShiftState(autoCapsFlags)
     }
 
-    fun onLoadKeyboard(editorInfo: EditorInfo?, autoCapsFlags: Int, layoutSetName: String?) {
+    fun onLoadKeyboard(editorInfo: EditorInfo?, autoCapsFlags: Int, layoutSetName: String?, stateHint: StateHint?) {
         // Reset alphabet shift state.
         alphabetShiftState.isShiftLocked = false
 
         if(layoutSetName != null) currentLayoutSet = layoutSetName
+        if(stateHint != null) currentStateHint = stateHint
 
         shiftKeyState.onRelease()
         symbolKeyState.onRelease()
@@ -385,6 +386,10 @@ class KeyboardState(private val switchActions: SwitchActions) {
             onCancelShiftTimer()
         }
 
+        if(currentStateHint.unshiftOnPressed && isAlphabet && code > 0) {
+            setAlphabetLayout(0)
+        }
+
         when (code) {
             Constants.CODE_SHIFT -> {
                 shiftKeyState.onPress()
@@ -473,7 +478,7 @@ class KeyboardState(private val switchActions: SwitchActions) {
         when(getKeyboardMode(editorInfo ?: EditorInfo())) {
             KeyboardId.MODE_NUMBER, KeyboardId.MODE_PHONE,
             KeyboardId.MODE_DATE, KeyboardId.MODE_TIME,
-            KeyboardId.MODE_DATETIME -> onLoadKeyboard(editorInfo, autoCapsFlags, currentLayoutSet)
+            KeyboardId.MODE_DATETIME -> onLoadKeyboard(editorInfo, autoCapsFlags, currentLayoutSet, currentStateHint)
 
             else -> setAlphabetLayout(autoCapsFlags)
         }
diff --git a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
deleted file mode 100644
index 490af8bfed..0000000000
--- a/java/src/org/futo/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ /dev/null
@@ -1,6465 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.futo.inputmethod.keyboard.internal;
-
-import android.util.Log;
-
-import java.util.HashMap;
-import java.util.Locale;
-
-/**
- * !!!!! DO NOT EDIT THIS FILE !!!!!
- *
- * This file is generated by tools/make-keyboard-text-py.
- * To update some texts, please update the *.json files located at
- *   tools/make-keyboard-text-py/locales
- * and then cd into the make-keyboard-text-py directory and run src/generate.py
- */
-public final class KeyboardTextsTable {
-    // Name to index map.
-    private static final HashMap<String, Integer> sNameToIndexesMap = new HashMap<>();
-    // Locale to texts table map.
-    private static final HashMap<String, String[]> sLocaleToTextsTableMap = new HashMap<>();
-    // TODO: Remove this variable after debugging.
-    // Texts table to locale maps.
-    private static final HashMap<String[], String> sTextsTableToLocaleMap = new HashMap<>();
-
-    public static String getText(final String name, final String[] textsTable, final boolean allowFallbackToDefault) {
-        if(textsTable == TEXTS_DEFAULT && !allowFallbackToDefault) return null;
-
-        final Integer indexObj = sNameToIndexesMap.get(name);
-        if (indexObj == null) {
-            if(name.startsWith("actions_") || name.startsWith("qwertysyms_")
-                || name.startsWith("morekeys_code_u") || name.startsWith("morekeys_misc_code_u")) {
-                return "";
-            } else if(name.startsWith("morekeys")) {
-                Log.w("KeyboardTextsTable", "Unknown morekeys text name=" + name + " locale="
-                        + sTextsTableToLocaleMap.get(textsTable));
-                return "";
-            }
-            throw new RuntimeException("Unknown text name=" + name + " locale="
-                    + sTextsTableToLocaleMap.get(textsTable));
-        }
-        final int index = indexObj;
-        final String text = (index < textsTable.length) ? textsTable[index] : null;
-        if (text != null) {
-            return text;
-        }
-        // Validity check.
-        if (index >= 0 && index < TEXTS_DEFAULT.length) {
-            if (allowFallbackToDefault) {
-                return TEXTS_DEFAULT[index];
-            } else {
-                return null;
-            }
-        }
-        // Throw exception for debugging purpose.
-        throw new RuntimeException("Illegal index=" + index + " for name=" + name
-                + " locale=" + sTextsTableToLocaleMap.get(textsTable));
-    }
-
-    public static String[] getTextsTable(final Locale locale) {
-        final String localeKey = locale.toString();
-        if (sLocaleToTextsTableMap.containsKey(localeKey)) {
-            return sLocaleToTextsTableMap.get(localeKey);
-        }
-        final String languageKey = locale.getLanguage();
-        if (sLocaleToTextsTableMap.containsKey(languageKey)) {
-            return sLocaleToTextsTableMap.get(languageKey);
-        }
-        return TEXTS_DEFAULT;
-    }
-
-    private static final String[] NAMES = {
-    //  /* index:histogram */ "name",
-        "locale",
-        "keylabel_to_alpha",
-        "morekeys_a",
-        "morekeys_o",
-        "morekeys_e",
-        "morekeys_u",
-        "morekeys_i",
-        "double_quotes",
-        "keyspec_currency",
-        "morekeys_c",
-        "single_quotes",
-        "morekeys_s",
-        "morekeys_misc_a",
-        "morekeys_misc_o",
-        "morekeys_misc_u",
-        "morekeys_z",
-        "morekeys_n",
-        "morekeys_misc_e",
-        "morekeys_misc_i",
-        "morekeys_misc_c",
-        "morekeys_misc_s",
-        "keyspec_symbols_1",
-        "keyspec_symbols_2",
-        "keyspec_symbols_3",
-        "keyspec_symbols_4",
-        "keyspec_symbols_5",
-        "keyspec_symbols_6",
-        "keyspec_symbols_7",
-        "keyspec_symbols_8",
-        "keyspec_symbols_9",
-        "keyspec_symbols_0",
-        "additional_morekeys_symbols_1",
-        "additional_morekeys_symbols_2",
-        "additional_morekeys_symbols_3",
-        "additional_morekeys_symbols_4",
-        "additional_morekeys_symbols_5",
-        "additional_morekeys_symbols_6",
-        "additional_morekeys_symbols_7",
-        "additional_morekeys_symbols_8",
-        "additional_morekeys_symbols_9",
-        "additional_morekeys_symbols_0",
-        "morekeys_y",
-        "single_angle_quotes",
-        "double_angle_quotes",
-        "keylabel_to_symbol",
-        "morekeys_d",
-        "morekeys_tablet_period",
-        "morekeys_g",
-        "morekeys_misc_z",
-        "morekeys_period",
-        "morekeys_star",
-        "keyspec_tablet_comma",
-        "morekeys_cyrillic_ie",
-        "keyspec_period",
-        "keyspec_comma",
-        "keyspec_left_parenthesis",
-        "keyspec_right_parenthesis",
-        "keyspec_left_square_bracket",
-        "keyspec_right_square_bracket",
-        "keyspec_left_curly_bracket",
-        "keyspec_right_curly_bracket",
-        "keyspec_less_than",
-        "keyspec_greater_than",
-        "keyspec_less_than_equal",
-        "keyspec_greater_than_equal",
-        "keyspec_left_double_angle_quote",
-        "keyspec_right_double_angle_quote",
-        "keyspec_left_single_angle_quote",
-        "keyspec_right_single_angle_quote",
-        "keyspec_east_slavic_row1_9",
-        "keyspec_east_slavic_row2_2",
-        "keyspec_east_slavic_row2_11",
-        "keyspec_east_slavic_row3_5",
-        "morekeys_l",
-        "morekeys_t",
-        "morekeys_misc_n",
-        "morekeys_nordic_row2_10",
-        "keyspec_nordic_row1_11",
-        "keyspec_nordic_row2_10",
-        "keyspec_nordic_row2_11",
-        "keyspec_tablet_period",
-        "morekeys_question",
-        "morekeys_tablet_comma",
-        "keyhintlabel_period",
-        "morekeys_cyrillic_soft_sign",
-        "morekeys_punctuation",
-        "morekeys_nordic_row2_11",
-        "morekeys_symbols_semicolon",
-        "morekeys_symbols_percent",
-        "morekeys_bullet",
-        "morekeys_left_parenthesis",
-        "morekeys_right_parenthesis",
-        "morekeys_arabic_diacritics",
-        "keyspec_symbols_question",
-        "keyspec_symbols_semicolon",
-        "keyspec_symbols_percent",
-        "keyhintlabel_tablet_period",
-        "keyhintlabel_tablet_comma",
-        "keyspec_spanish_row2_10",
-        "morekeys_r",
-        "morekeys_misc_y",
-        "morekeys_swiss_row1_11",
-        "morekeys_swiss_row2_10",
-        "morekeys_swiss_row2_11",
-        "keyspec_swiss_row1_11",
-        "keyspec_swiss_row2_10",
-        "keyspec_swiss_row2_11",
-        "label_go_key",
-        "label_send_key",
-        "label_next_key",
-        "label_done_key",
-        "label_search_key",
-        "label_previous_key",
-        "label_pause_key",
-        "label_wait_key",
-        "morekeys_tablet_punctuation",
-        "morekeys_h",
-        "morekeys_j",
-        "morekeys_misc_g",
-        "morekeys_plus",
-        "morekeys_cyrillic_u",
-        "morekeys_cyrillic_en",
-        "morekeys_cyrillic_ghe",
-        "morekeys_east_slavic_row2_2",
-        "morekeys_cyrillic_o",
-        "morekeys_k",
-        "morekeys_misc_l",
-        "morekeys_misc_r",
-        "morekeys_cyrillic_i",
-        "keyspec_south_slavic_row1_6",
-        "keyspec_south_slavic_row2_11",
-        "keyspec_south_slavic_row3_1",
-        "keyspec_south_slavic_row3_8",
-        "morekeys_misc_h",
-        "keyspec_q",
-        "keyspec_w",
-        "keyspec_y",
-        "keyspec_x",
-        "morekeys_cyrillic_ka",
-        "morekeys_cyrillic_a",
-        "morekeys_east_slavic_row2_11",
-        "morekeys_currency_dollar",
-        "morekeys_misc_t",
-        "morekeys_misc_code_u044c",
-        "morekeys_w",
-        "qwertysyms_x",
-        "qwertysyms_c",
-        "morekeys_exclamation",
-        "morekeys_v",
-        "morekeys_less_than",
-        "morekeys_greater_than",
-        "morekeys_b",
-        "morekeys_f",
-        "morekeys_m",
-        "morekeys_p",
-        "morekeys_q",
-        "morekeys_x",
-        "morekeys_misc_b",
-        "morekeys_misc_d",
-        "morekeys_misc_f",
-        "morekeys_misc_j",
-        "morekeys_misc_k",
-        "morekeys_misc_m",
-        "morekeys_misc_p",
-        "morekeys_misc_q",
-        "morekeys_misc_v",
-        "morekeys_misc_w",
-        "morekeys_misc_x",
-        "morekeys_currency_generic",
-        "morekeys_symbols_1",
-        "morekeys_symbols_2",
-        "morekeys_symbols_3",
-        "morekeys_symbols_4",
-        "morekeys_symbols_5",
-        "morekeys_symbols_6",
-        "morekeys_symbols_7",
-        "morekeys_symbols_8",
-        "morekeys_symbols_9",
-        "morekeys_symbols_0",
-        "morekeys_bottomrow_comma",
-        "morekeys_am_pm",
-        "morekeys_popular_domain",
-        "morekeys_single_quote",
-        "morekeys_double_quote",
-        "morekeys_tablet_double_quote",
-        "keyspec_settings",
-        "keyspec_shortcut",
-        "keyspec_action_next",
-        "keyspec_action_previous",
-        "keyspec_popular_domain",
-        "keyspec_emoji_action_key",
-        "keyspec_emoji_action_key_shift_enter",
-        "keyspec_emoji_action_key_navigation",
-        "keylabel_to_more_symbol",
-        "keylabel_tablet_to_more_symbol",
-        "keylabel_to_phone_numeric",
-        "keylabel_to_phone_symbols",
-        "keylabel_time_am",
-        "keylabel_time_pm",
-        "qwertysyms_1",
-        "qwertysyms_2",
-        "qwertysyms_3",
-        "qwertysyms_4",
-        "qwertysyms_5",
-        "qwertysyms_6",
-        "qwertysyms_7",
-        "qwertysyms_8",
-        "qwertysyms_9",
-        "qwertysyms_0",
-        "qwertysyms_q",
-        "qwertysyms_w",
-        "qwertysyms_e",
-        "qwertysyms_r",
-        "qwertysyms_t",
-        "qwertysyms_y",
-        "qwertysyms_u",
-        "qwertysyms_i",
-        "qwertysyms_o",
-        "qwertysyms_p",
-        "qwertysyms_a",
-        "qwertysyms_s",
-        "qwertysyms_d",
-        "qwertysyms_f",
-        "qwertysyms_g",
-        "qwertysyms_h",
-        "qwertysyms_j",
-        "qwertysyms_k",
-        "qwertysyms_l",
-        "qwertysyms_z",
-        "qwertysyms_v",
-        "qwertysyms_b",
-        "qwertysyms_n",
-        "qwertysyms_m",
-        "qwertysyms_r2_e1",
-        "actions_1",
-        "actions_2",
-        "actions_3",
-        "actions_4",
-        "actions_5",
-        "actions_6",
-        "actions_7",
-        "actions_8",
-        "actions_9",
-        "actions_0",
-        "actions_q",
-        "actions_w",
-        "actions_e",
-        "actions_r",
-        "actions_t",
-        "actions_y",
-        "actions_u",
-        "actions_i",
-        "actions_o",
-        "actions_p",
-        "actions_a",
-        "actions_s",
-        "actions_d",
-        "actions_f",
-        "actions_g",
-        "actions_h",
-        "actions_j",
-        "actions_k",
-        "actions_l",
-        "actions_z",
-        "actions_x",
-        "actions_c",
-        "actions_v",
-        "actions_b",
-        "actions_n",
-        "actions_m",
-        "keyspecs_left_parenthesis_more_keys",
-        "keyspecs_right_parenthesis_more_keys",
-        "single_laqm_raqm",
-        "single_raqm_laqm",
-        "double_laqm_raqm",
-        "double_raqm_laqm",
-        "single_lqm_rqm",
-        "single_9qm_lqm",
-        "single_9qm_rqm",
-        "single_rqm_9qm",
-        "double_lqm_rqm",
-        "double_9qm_lqm",
-        "double_9qm_rqm",
-        "double_rqm_9qm",
-        "number_1",
-        "number_2",
-        "number_3",
-        "number_4",
-        "number_5",
-        "number_6",
-        "number_7",
-        "number_8",
-        "number_9",
-        "number_0"
-    };
-
-    private static final String EMPTY = "";
-
-    private static final String[] TEXTS_ar = {
-        "ar",
-        "\u0623\u200c\u0628\u200c\u062c",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0661",
-        "\u0662",
-        "\u0663",
-        "\u0664",
-        "\u0665",
-        "\u0666",
-        "\u0667",
-        "\u0668",
-        "\u0669",
-        "\u0660",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0,\u066b,\u066c",
-        null,
-        null,
-        null,
-        "\u0663\u0662\u0661\u061f",
-        null,
-        "!text/morekeys_arabic_diacritics",
-        null,
-        null,
-        "!text/morekeys_arabic_diacritics",
-        "\u2605,\u066d",
-        "\u060c",
-        null,
-        null,
-        "\u060c",
-        "(|)",
-        ")|(",
-        "[|]",
-        "]|[",
-        "{|}",
-        "}|{",
-        "<|>",
-        ">|<",
-        "\u2264|\u2265",
-        "\u2265|\u2264",
-        "\u00ab|\u00bb",
-        "\u00bb|\u00ab",
-        "\u2039|\u203a",
-        "\u203a|\u2039",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "?,\u00bf",
-        "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,\\\",\\'",
-        "\u0651",
-        null,
-        null,
-        null,
-        ";",
-        "\\%,\u2030",
-        "\u266a",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "!fixedColumnOrder!8, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u0651\u25cc|\u0651, \u064b\u25cc|\u064b,!text/keyspec_symbols_question,!, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f,\u0640, \u0655\u25cc|\u0655, \u064e\u25cc|\u064e",
-        "\u061f",
-        "\u061b",
-        "\u066a",
-        "\u0651",
-        "\u061f"
-    };
-
-    private static final String[] TEXTS_az = {
-        "az",
-        null,
-        "\u00e2,\u00e4,\u00e1",
-        "\u00f6,\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d",
-        "\u0259,\u00e9",
-        "\u00fc,\u00fb,\u00f9,\u00fa,\u016b",
-        "\u0131,\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b",
-        null,
-        null,
-        "\u00e7,\u0107,\u010d",
-        null,
-        "\u015f,\u00df,\u015b,\u0161",
-        null,
-        null,
-        null,
-        "\u017e",
-        "\u0148,\u00f1",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011f"
-    };
-
-    private static final String[] TEXTS_be = {
-        "be",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0451",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u045e",
-        "\u044b",
-        "\u044d",
-        "\u0456",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u044a"
-    };
-
-    private static final String[] TEXTS_bg = {
-        "bg",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm"
-    };
-
-    private static final String[] TEXTS_bn_BD = {
-        "bn_BD",
-        "\u0995\u0996\u0997",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u09f3",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u09e7",
-        "\u09e8",
-        "\u09e9",
-        "\u09ea",
-        "\u09eb",
-        "\u09ec",
-        "\u09ed",
-        "\u09ee",
-        "\u09ef",
-        "\u09e6",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0"
-    };
-
-    private static final String[] TEXTS_bn_IN = {
-        "bn_IN",
-        "\u0995\u0996\u0997",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9"
-    };
-
-    private static final String[] TEXTS_ca = {
-        "ca",
-        null,
-        "\u00e0",
-        "\u00f2,\u00f3",
-        "\u00e8,\u00e9",
-        "\u00fa,\u00fc",
-        "\u00ed,\u00ef",
-        null,
-        null,
-        "\u00e7",
-        null,
-        null,
-        "\u00e1,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
-        "\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
-        "\u00f9,\u00fb,\u016b",
-        null,
-        null,
-        "\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        "\u00ec,\u00ee,\u012f,\u012b",
-        "\u0107,\u010d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "l\u00b7l",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!autoColumnOrder!9,\\\\,?,!,\u00b7,#,),(,/,;,',@,:,-,\\\",+,\\%,&",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e7",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!autoColumnOrder!8,\\\\,',\u00b7,#,),(,/,;,@,:,-,\\\",+,\\%,&"
-    };
-
-    private static final String[] TEXTS_ckb = {
-        "ckb",
-        "\u0623\u200c\u0628\u200c\u062c",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0661",
-        "\u0662",
-        "\u0663",
-        "\u0664",
-        "\u0665",
-        "\u0666",
-        "\u0667",
-        "\u0668",
-        "\u0669",
-        "\u0660",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0,\u066b,\u066c",
-        null,
-        null,
-        null,
-        "\u0663\u0662\u0661\u061f",
-        null,
-        "\u061f",
-        null,
-        null,
-        "\u061f",
-        "\u2605,\u066d",
-        "\u060c",
-        null,
-        ".",
-        "\u060c",
-        "(|)",
-        ")|(",
-        "[|]",
-        "]|[",
-        "{|}",
-        "}|{",
-        "<|>",
-        ">|<",
-        "\u2264|\u2265",
-        "\u2265|\u2264",
-        "\u00ab|\u00bb",
-        "\u00bb|\u00ab",
-        "\u2039|\u203a",
-        "\u203a|\u2039",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "?,\u00bf",
-        "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,\\\",\\'",
-        "\u0651",
-        null,
-        null,
-        null,
-        ";",
-        "\\%,\u2030",
-        "\u266a",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "!fixedColumnOrder!7, \u0655\u25cc|\u0655, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u064b\u25cc|\u064b, \u0651\u25cc|\u0651, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f, \u064e\u25cc|\u064e,\u0640|\u0640",
-        "\u061f",
-        "\u061b",
-        "\u066a",
-        "\u0651",
-        "\u061f"
-    };
-
-    private static final String[] TEXTS_cs = {
-        "cs",
-        null,
-        "\u00e1",
-        "\u00f3",
-        "\u00e9,\u011b",
-        "\u00fa,\u016f",
-        "\u00ed",
-        "!text/double_9qm_lqm",
-        null,
-        "\u010d",
-        "!text/single_9qm_lqm",
-        "\u0161",
-        "\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        "\u00fb,\u00fc,\u00f9,\u016b",
-        "\u017e",
-        "\u0148",
-        "\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        "\u00ee,\u00ef,\u00ec,\u012f,\u012b",
-        "\u00e7,\u0107",
-        "\u00df,\u015b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd",
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        "\u010f",
-        null,
-        null,
-        "\u017a,\u017c",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0165",
-        "\u00f1,\u0144",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0159",
-        "\u00ff"
-    };
-
-    private static final String[] TEXTS_da = {
-        "da",
-        null,
-        "\u00e5,\u00e6",
-        "\u00f8",
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        "\u00e1,\u00e4,\u00e0,\u00e2,\u00e3,\u0101",
-        "\u00f6,\u00f3,\u00f4,\u00f2,\u00f5,\u0153,\u014d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e4",
-        "\u00e5",
-        "\u00e6",
-        "\u00f8",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f6"
-    };
-
-    private static final String[] TEXTS_de = {
-        "de",
-        null,
-        "\u00e4",
-        "\u00f6",
-        null,
-        "\u00fc",
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        "\u00df",
-        "%,\u00e2,\u00e0,\u00e1,\u00e6,\u00e3,\u00e5,\u0101",
-        "%,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u00f8,\u014d",
-        "%,\u00fb,\u00f9,\u00fa,\u016b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u015b,\u0161",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e8",
-        "\u00e9",
-        "\u00e0",
-        "\u00fc",
-        "\u00f6",
-        "\u00e4"
-    };
-
-    private static final String[] TEXTS_el = {
-        "el",
-        "\u0391\u0392\u0393"
-    };
-
-    private static final String[] TEXTS_en = {
-        "en"
-    };
-
-    private static final String[] TEXTS_eo = {
-        "eo",
-        null,
-        null,
-        null,
-        null,
-        "\u016d",
-        null,
-        null,
-        null,
-        "\u0109",
-        null,
-        "\u015d",
-        null,
-        null,
-        "\u00fa,\u016f,\u00fb,\u00fc,\u00f9,\u016b,\u0169,\u0171,\u0173,\u00b5",
-        null,
-        null,
-        null,
-        null,
-        "\u0107,\u010d,\u00e7,\u010b",
-        "\u00df,\u0161,\u015b,\u0219,\u015f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0135",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0125",
-        "\u0135",
-        "\u011f,\u0121,\u0123",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0127",
-        "\u015d",
-        "\u011d",
-        "\u016d",
-        "\u0109"
-    };
-
-    private static final String[] TEXTS_es = {
-        "es",
-        null,
-        "\u00e1",
-        "\u00f3",
-        "\u00e9",
-        "\u00fa,\u00fc",
-        "\u00ed",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
-        "\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
-        "\u00f9,\u00fb,\u016b",
-        null,
-        "\u00f1",
-        "\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        "\u00ef,\u00ec,\u00ee,\u012f,\u012b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0144",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!autoColumnOrder!9,\\\\,?,!,#,),(,/,;,\u00a1,',@,:,-,\\\",+,\\%,&,\u00bf"
-    };
-
-    private static final String[] TEXTS_et = {
-        "et",
-        null,
-        "\u00e4",
-        "\u00f6,\u00f5",
-        null,
-        "\u00fc",
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        "\u0161",
-        "\u0101,\u00e0,\u00e1,\u00e2,\u00e3,\u00e5,\u00e6,\u0105",
-        "\u00f2,\u00f3,\u00f4,\u0153,\u0151,\u00f8",
-        "\u016b,\u0173,\u00f9,\u00fa,\u00fb,\u016f,\u0171",
-        "\u017e",
-        null,
-        null,
-        null,
-        null,
-        "\u00df,\u015b,\u015f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u017c,\u017a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f5",
-        "\u00fc",
-        "\u00f6",
-        "\u00e4"
-    };
-
-    private static final String[] TEXTS_eu = {
-        "eu",
-        null,
-        "\u00e1,\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
-        "\u00f3,\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
-        "\u00e9,\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        "\u00fa,\u00fc,\u00f9,\u00fb,\u016b",
-        "\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b",
-        null,
-        null,
-        "\u00e7,\u0107,\u010d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f1,\u0144"
-    };
-
-    private static final String[] TEXTS_fi = {
-        "fi",
-        null,
-        "\u00e4,\u00e5",
-        "\u00f6",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0161",
-        "\u00e6,\u00e0,\u00e1,\u00e2,\u00e3,\u0101",
-        "\u00f8,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d",
-        null,
-        "\u017e",
-        null,
-        null,
-        null,
-        null,
-        "\u00df,\u015b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u017a,\u017c",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f8",
-        "\u00e5",
-        "\u00f6",
-        "\u00e4",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e6"
-    };
-
-    private static final String[] TEXTS_fr = {
-        "fr",
-        null,
-        "\u00e0,\u00e2,%,\u00e6",
-        "\u00f4,\u0153",
-        "\u00e9,\u00e8,\u00ea,\u00eb",
-        "\u00f9,\u00fb,%,\u00fc",
-        "\u00ee,%,\u00ef",
-        null,
-        null,
-        "\u00e7",
-        null,
-        null,
-        "\u00e1,\u00e4,\u00e3,\u00e5,\u0101,\u00aa",
-        "%,\u00f6,\u00f2,\u00f3,\u00f5,\u00f8,\u014d,\u00ba",
-        "\u00fa,\u016b",
-        null,
-        null,
-        "%,\u0119,\u0117,\u0113",
-        "\u00ec,\u00ed,\u012f,\u012b",
-        "%,\u0107,\u010d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "%,\u00ff",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fc",
-        "\u00f6",
-        "\u00e4",
-        "\u00e8",
-        "\u00e9",
-        "\u00e0"
-    };
-
-    private static final String[] TEXTS_gl = {
-        "gl",
-        null,
-        "\u00e1,\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
-        "\u00f3,\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
-        "\u00e9,\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        "\u00fa,\u00fc,\u00f9,\u00fb,\u016b",
-        "\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b",
-        null,
-        null,
-        "\u00e7,\u0107,\u010d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f1,\u0144"
-    };
-
-    private static final String[] TEXTS_hi = {
-        "hi",
-        "\u0915\u0916\u0917",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0967",
-        "\u0968",
-        "\u0969",
-        "\u096a",
-        "\u096b",
-        "\u096c",
-        "\u096d",
-        "\u096e",
-        "\u096f",
-        "\u0966",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        null,
-        null,
-        null,
-        "?\u0967\u0968\u0969",
-        null,
-        "!autoColumnOrder!8,.,\\,,?,!,\u0965,#,),(,',/,@,:,;,-,\",+",
-        null,
-        null,
-        "!autoColumnOrder!8,\\,,.,?,!,\u0965,#,),(,/,',@,:,;,-,\",+",
-        null,
-        null,
-        null,
-        "\u0964",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0964"
-    };
-
-    private static final String[] TEXTS_hi_ZZ = {
-        "hi_ZZ",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "Go",
-        "Send",
-        "Next",
-        "Done",
-        "Search",
-        "Prev",
-        "Pause",
-        "Wait"
-    };
-
-    private static final String[] TEXTS_hr = {
-        "hr",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_rqm",
-        null,
-        "\u010d,\u0107",
-        "!text/single_9qm_rqm",
-        "\u0161",
-        null,
-        null,
-        null,
-        "\u017e",
-        null,
-        null,
-        null,
-        "\u00e7",
-        "\u015b,\u00df",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        "\u0111",
-        null,
-        null,
-        "\u017a,\u017c"
-    };
-
-    private static final String[] TEXTS_hu = {
-        "hu",
-        null,
-        "\u00e1",
-        "\u00f3,\u00f6,\u0151",
-        "\u00e9",
-        "\u00fa,\u00fc,\u0171",
-        "\u00ed",
-        "!text/double_9qm_rqm",
-        null,
-        null,
-        "!text/single_9qm_rqm",
-        null,
-        "\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        "\u00fb,\u00f9,\u016b",
-        null,
-        null,
-        "\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        "\u00ee,\u00ef,\u00ec,\u012f,\u012b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm"
-    };
-
-    private static final String[] TEXTS_is = {
-        "is",
-        null,
-        "\u00e1,\u00e4,\u00e6",
-        "\u00f3,\u00f6",
-        "\u00e9",
-        "\u00fa",
-        "\u00ed",
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        "\u00e5,\u00e0,\u00e2,\u00e3,\u0101",
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        "\u00fc,\u00fb,\u00f9,\u016b",
-        null,
-        null,
-        "\u00eb,\u00e8,\u00ea,\u0119,\u0117,\u0113",
-        "\u00ef,\u00ee,\u00ec,\u012f,\u012b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd",
-        null,
-        null,
-        null,
-        "\u00f0",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fe",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00ff"
-    };
-
-    private static final String[] TEXTS_iw = {
-        "iw",
-        "\u05d0\u05d1\u05d2",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_rqm_9qm",
-        "\u20aa",
-        null,
-        "!text/single_rqm_9qm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u2605",
-        null,
-        null,
-        null,
-        null,
-        "(|)",
-        ")|(",
-        "[|]",
-        "]|[",
-        "{|}",
-        "}|{",
-        "<|>",
-        ">|<",
-        "\u2264|\u2265",
-        "\u2265|\u2264",
-        "\u00ab|\u00bb",
-        "\u00bb|\u00ab",
-        "\u2039|\u203a",
-        "\u203a|\u2039",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00b1,\ufb29"
-    };
-
-    private static final String[] TEXTS_ka = {
-        "ka",
-        "\u10d0\u10d1\u10d2",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm"
-    };
-
-    private static final String[] TEXTS_kk = {
-        "kk",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0451",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0449",
-        "\u044b",
-        "\u044d",
-        "\u0438",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u044a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u04af,\u04b1",
-        "\u04a3",
-        "\u0493",
-        "\u0456",
-        "\u04e9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u049b",
-        "\u04d9",
-        "\u04bb"
-    };
-
-    private static final String[] TEXTS_km = {
-        "km",
-        "\u1780\u1781\u1782",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u17db,\u00a2,\u00a3,\u20ac,\u00a5,\u20b1"
-    };
-
-    private static final String[] TEXTS_kn = {
-        "kn",
-        "\u0c85\u0c86\u0c87",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0ce7",
-        "\u0ce8",
-        "\u0ce9",
-        "\u0cea",
-        "\u0ceb",
-        "\u0cec",
-        "\u0ced",
-        "\u0cee",
-        "\u0cef",
-        "\u0ce6",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        null,
-        null,
-        null,
-        "?\u0ce7\u0ce8\u0ce9"
-    };
-
-    private static final String[] TEXTS_ky = {
-        "ky",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0451",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0449",
-        "\u044b",
-        "\u044d",
-        "\u0438",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u044a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u04af",
-        "\u04a3",
-        null,
-        null,
-        "\u04e9"
-    };
-
-    private static final String[] TEXTS_lo = {
-        "lo",
-        "\u0e81\u0e82\u0e84",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20ad"
-    };
-
-    private static final String[] TEXTS_lt = {
-        "lt",
-        null,
-        "\u0105",
-        null,
-        "\u0117,\u0119",
-        "\u016b,\u0173",
-        "\u012f",
-        "\u201d,\u201e,\u201c",
-        null,
-        "\u010d",
-        "\u2019,\u201a,\u2018",
-        "\u0161",
-        null,
-        null,
-        null,
-        "\u017e"
-    };
-
-    private static final String[] TEXTS_lv = {
-        "lv",
-        null,
-        "\u0101",
-        null,
-        "\u0113",
-        "\u016b",
-        "\u012b",
-        "!text/double_9qm_lqm",
-        null,
-        "\u010d",
-        "!text/single_9qm_lqm",
-        "\u0161",
-        "\u00e0,\u00e1,\u00e2,\u00e3,\u00e4,\u00e5,\u00e6,\u0105",
-        "\u014d,\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u0153,\u0151,\u00f8",
-        "\u0173,\u00f9,\u00fa,\u00fb,\u00fc,\u016f,\u0171",
-        "\u017e",
-        "\u0146",
-        "\u0117,\u00e8,\u00e9,\u00ea,\u00eb,\u0119,\u011b",
-        "\u012f,\u00ec,\u00ed,\u00ee,\u00ef,\u0131",
-        "\u00e7,\u0107",
-        "\u00df,\u015b,\u015f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0123",
-        "\u017c,\u017a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u013c",
-        null,
-        "\u00f1,\u0144",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0137",
-        "\u0142,\u013a,\u013e",
-        "\u0157,\u0159,\u0155"
-    };
-
-    private static final String[] TEXTS_mk = {
-        "mk",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0450",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u045d",
-        "\u0455",
-        "\u045c",
-        "\u0437",
-        "\u0453"
-    };
-
-    private static final String[] TEXTS_ml = {
-        "ml",
-        "\u0d05",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9"
-    };
-
-    private static final String[] TEXTS_mn = {
-        "mn",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20ae"
-    };
-
-    private static final String[] TEXTS_mr = {
-        "mr",
-        "\u0915\u0916\u0917",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0967",
-        "\u0968",
-        "\u0969",
-        "\u096a",
-        "\u096b",
-        "\u096c",
-        "\u096d",
-        "\u096e",
-        "\u096f",
-        "\u0966",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        null,
-        null,
-        null,
-        "?\u0967\u0968\u0969"
-    };
-
-    private static final String[] TEXTS_my = {
-        "my",
-        "\u1000\u1001\u1002",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u104a",
-        null,
-        "\u104b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u104b",
-        null,
-        "\\",
-        "\u104a",
-        null,
-        "!autoColumnOrder!9,\u104a,.,?,!,#,),(,/,;,...,',@,:,-,\\\",+,\\%,&",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!autoColumnOrder!8,.,',#,),(,/,;,@,...,:,-,\\\",+,\\%,&"
-    };
-
-    private static final String[] TEXTS_nb = {
-        "nb",
-        null,
-        "\u00e5,\u00e6,\u00e4,\u00e0,\u00e1,\u00e2,\u00e3,\u0101",
-        "\u00f8,\u00f6,\u00f4,\u00f2,\u00f3,\u00f5,\u0153,\u014d",
-        "\u00e9,\u00e8,\u00ea,\u00eb,\u0119,\u0117,\u0113",
-        "\u00fc,\u00fb,\u00f9,\u00fa,\u016b",
-        null,
-        "!text/double_9qm_rqm",
-        null,
-        null,
-        "!text/single_9qm_rqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f6",
-        "\u00e5",
-        "\u00f8",
-        "\u00e6",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e4"
-    };
-
-    private static final String[] TEXTS_ne = {
-        "ne",
-        "\u0915\u0916\u0917",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0930\u0941.",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0967",
-        "\u0968",
-        "\u0969",
-        "\u096a",
-        "\u096b",
-        "\u096c",
-        "\u096d",
-        "\u096e",
-        "\u096f",
-        "\u0966",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        null,
-        null,
-        null,
-        "?\u0967\u0968\u0969",
-        null,
-        "!autoColumnOrder!8,.,\\,,?,!,\u0965,#,),(,',/,@,:,;,-,\",+",
-        null,
-        null,
-        "!autoColumnOrder!8,\\,,.,?,!,\u0965,#,),(,/,',@,:,;,-,\",+",
-        null,
-        null,
-        null,
-        "\u0964",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0964"
-    };
-
-    private static final String[] TEXTS_new = {
-        "new",
-        "\ud805\udc0e\ud805\udc0f\ud805\udc10",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\ud805\udc2c\ud805\udc38",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\ud805\udc51",
-        "\ud805\udc52",
-        "\ud805\udc53",
-        "\ud805\udc54",
-        "\ud805\udc55",
-        "\ud805\udc56",
-        "\ud805\udc57",
-        "\ud805\udc58",
-        "\ud805\udc59",
-        "\ud805\udc50",
-        "1,\ud805\udc4a",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        null,
-        null,
-        null,
-        "?\ud805\udc51\ud805\udc52\ud805\udc53",
-        null,
-        "!autoColumnOrder!8,.,\\,,?,!,\ud805\udc4d,\ud805\udc5a,\ud805\udc4c,#,),(,',/,@,:,;,-,\",+",
-        null,
-        null,
-        "!autoColumnOrder!8,\\,,.,?,!,\ud805\udc4d,\ud805\udc5a,\ud805\udc4c,#,),(,/,',@,:,;,-,\",+",
-        null,
-        "\ud805\udc4d",
-        null,
-        "\ud805\udc4b",
-        "\ud805\udc4d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\ud805\udc4b"
-    };
-
-    private static final String[] TEXTS_nl = {
-        "nl",
-        null,
-        "\u00e1,\u00e4,\u00e2,\u00e0",
-        "\u00f3,\u00f6",
-        "\u00e9,\u00eb,\u00ea,\u00e8",
-        "\u00fa,\u00fc",
-        "\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b,\u0133",
-        "!text/double_9qm_rqm",
-        null,
-        null,
-        "!text/single_9qm_rqm",
-        null,
-        "\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        "\u00fb,\u00f9,\u016b",
-        null,
-        null,
-        "\u0119,\u0117,\u0113"
-    };
-
-    private static final String[] TEXTS_pl = {
-        "pl",
-        null,
-        "\u0105",
-        "\u00f3",
-        "\u0119",
-        null,
-        null,
-        "!text/double_9qm_rqm",
-        null,
-        "\u0107",
-        "!text/single_9qm_rqm",
-        "\u015b",
-        "\u00e1,\u00e0,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f6,\u00f4,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        null,
-        "\u017c,\u017a",
-        "\u0144",
-        "\u00e8,\u00e9,\u00ea,\u00eb,\u0117,\u0113",
-        null,
-        "\u00e7,\u010d",
-        "\u00df,\u0161",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u017e",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0142",
-        null,
-        "\u00f1"
-    };
-
-    private static final String[] TEXTS_pt = {
-        "pt",
-        null,
-        "\u00e1,\u00e3,\u00e0,\u00e2",
-        "\u00f3,\u00f5,\u00f4",
-        "\u00e9,\u00ea",
-        "\u00fa,\u00fc",
-        "\u00ed",
-        null,
-        null,
-        "\u00e7",
-        null,
-        null,
-        "\u00e4,\u00e5,\u00e6,\u00aa",
-        "\u00f2,\u00f6,\u0153,\u00f8,\u014d,\u00ba",
-        "\u00f9,\u00fb,\u016b",
-        null,
-        null,
-        "\u00e8,\u0119,\u0117,\u0113,\u00eb",
-        "\u00ee,\u00ec,\u00ef,\u012f,\u012b",
-        "\u010d,\u0107",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e7"
-    };
-
-    private static final String[] TEXTS_rm = {
-        "rm",
-        null,
-        null,
-        "\u00f2,\u00f3,\u00f6,\u00f4,\u00f5,\u0153,\u00f8"
-    };
-
-    private static final String[] TEXTS_ro = {
-        "ro",
-        null,
-        "\u0103,\u00e2",
-        null,
-        null,
-        null,
-        "\u00ee",
-        "!text/double_9qm_rqm",
-        null,
-        null,
-        "!text/single_9qm_rqm",
-        "\u0219",
-        "\u00e3,\u00e0,\u00e1,\u00e4,\u00e6,\u00e5,\u0101",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00ef,\u00ec,\u00ed,\u012f,\u012b",
-        null,
-        "\u00df,\u015b,\u0161",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u021b"
-    };
-
-    private static final String[] TEXTS_si = {
-        "si",
-        "\u0d85,\u0d86",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0dbb\u0dd4"
-    };
-
-    private static final String[] TEXTS_sk = {
-        "sk",
-        null,
-        "\u00e1,\u00e4",
-        "\u00f4,\u00f3",
-        "\u00e9",
-        "\u00fa",
-        "\u00ed",
-        "!text/double_9qm_lqm",
-        null,
-        "\u010d",
-        "!text/single_9qm_lqm",
-        "\u0161",
-        "\u0101,\u00e0,\u00e2,\u00e3,\u00e5,\u00e6,\u0105",
-        "\u00f6,\u00f2,\u00f5,\u0153,\u0151,\u00f8",
-        "\u016f,\u00fc,\u016b,\u0173,\u00f9,\u00fb,\u0171",
-        "\u017e",
-        "\u0148",
-        "\u011b,\u0113,\u0117,\u00e8,\u00ea,\u00eb,\u0119",
-        "\u012b,\u012f,\u00ec,\u00ee,\u00ef,\u0131",
-        "\u00e7,\u0107",
-        "\u00df,\u015b,\u015f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd",
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        "\u010f",
-        null,
-        null,
-        "\u017c,\u017a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u013e,\u013a",
-        "\u0165",
-        "\u0146,\u00f1,\u0144",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0155",
-        "\u00ff",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u013c,\u0142",
-        "\u0159,\u0157",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0163"
-    };
-
-    private static final String[] TEXTS_sl = {
-        "sl",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        "\u010d",
-        "!text/single_9qm_lqm",
-        "\u0161",
-        null,
-        null,
-        null,
-        "\u017e",
-        null,
-        null,
-        null,
-        "\u0107",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm"
-    };
-
-    private static final String[] TEXTS_sr = {
-        "sr",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0450",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u045d",
-        "\u0437",
-        "\u045b",
-        "\u0455",
-        "\u0452"
-    };
-
-    private static final String[] TEXTS_sr___Latn = {
-        "sr__#Latn",
-        null,
-        null,
-        null,
-        "\u00e8",
-        null,
-        "\u00ec",
-        null,
-        null,
-        "\u010d,\u0107,%",
-        null,
-        "\u0161,%",
-        null,
-        null,
-        null,
-        "\u017e,%",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0111,%",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "Idi",
-        "\u0160alji",
-        "Sled",
-        "Gotov",
-        "Tra\u017ei",
-        "Preth",
-        "Pauza",
-        "\u010cekaj"
-    };
-
-    private static final String[] TEXTS_sr_ZZ = {
-        "sr_ZZ",
-        null,
-        null,
-        null,
-        "\u00e8",
-        null,
-        "\u00ec",
-        null,
-        null,
-        "\u010d,\u0107,%",
-        null,
-        "\u0161,%",
-        null,
-        null,
-        null,
-        "\u017e,%",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0111,%",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "Idi",
-        "\u0160alji",
-        "Sled",
-        "Gotov",
-        "Tra\u017ei",
-        "Preth",
-        "Pauza",
-        "\u010cekaj"
-    };
-
-    private static final String[] TEXTS_sv = {
-        "sv",
-        null,
-        "\u00e4,\u00e5",
-        "\u00f6",
-        "\u00e9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e6,\u00e1,\u00e0,\u00e2,\u0105,\u00e3",
-        "\u00f8,\u0153,\u00f3,\u00f2,\u00f4,\u00f5,\u014d",
-        null,
-        null,
-        null,
-        "\u00e8,\u00ea,\u00eb,\u0119",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/single_raqm_laqm",
-        "!text/double_raqm_laqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f8,\u0153",
-        "\u00e5",
-        "\u00f6",
-        "\u00e4",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e6"
-    };
-
-    private static final String[] TEXTS_sw = {
-        "sw",
-        null,
-        "\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f4,\u00f6,\u00f2,\u00f3,\u0153,\u00f8,\u014d,\u00f5",
-        "\u00e8,\u00e9,\u00ea,\u00eb,\u0113",
-        "\u00fb,\u00fc,\u00f9,\u00fa,\u016b",
-        "\u00ee,\u00ef,\u00ed,\u012b,\u00ec",
-        null,
-        null,
-        "\u00e7",
-        null,
-        "\u00df",
-        null,
-        null,
-        null,
-        null,
-        "\u00f1",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "g\\'"
-    };
-
-    private static final String[] TEXTS_ta_IN = {
-        "ta_IN",
-        "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0bf9"
-    };
-
-    private static final String[] TEXTS_ta_LK = {
-        "ta_LK",
-        "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0dbb\u0dd4"
-    };
-
-    private static final String[] TEXTS_ta_SG = {
-        "ta_SG",
-        "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"
-    };
-
-    private static final String[] TEXTS_te = {
-        "te",
-        "\u0c05\u0c06\u0c07",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20b9"
-    };
-
-    private static final String[] TEXTS_th = {
-        "th",
-        "\u0e01\u0e02\u0e04",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0e3f"
-    };
-
-    private static final String[] TEXTS_tl = {
-        "tl",
-        null,
-        "\u00e1,\u00e0,\u00e4,\u00e2,\u00e3,\u00e5,\u0105,\u00e6,\u0101,\u00aa",
-        "\u00f3,\u00f2,\u00f6,\u00f4,\u00f5,\u00f8,\u0153,\u014d,\u00ba",
-        "\u00e9,\u00e8,\u00eb,\u00ea,\u0119,\u0117,\u0113",
-        "\u00fa,\u00fc,\u00f9,\u00fb,\u016b",
-        "\u00ed,\u00ef,\u00ec,\u00ee,\u012f,\u012b",
-        null,
-        null,
-        "\u00e7,\u0107,\u010d",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00f1,\u0144"
-    };
-
-    private static final String[] TEXTS_tr = {
-        "tr",
-        null,
-        null,
-        "\u00f6",
-        null,
-        "\u00fc",
-        "\u0131",
-        null,
-        null,
-        "\u00e7",
-        null,
-        "\u015f",
-        null,
-        "\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d",
-        "\u00fb,\u00f9,\u00fa,\u016b",
-        null,
-        null,
-        null,
-        "\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b",
-        "\u0107,\u010d",
-        "\u00df,\u015b,\u0161",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011f"
-    };
-
-    private static final String[] TEXTS_uk = {
-        "uk",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        "\u20b4",
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0449",
-        "\u0456",
-        "\u0454",
-        "\u0438",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0491",
-        "\u0457",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u044a,\u044b"
-    };
-
-    private static final String[] TEXTS_uz = {
-        "uz",
-        null,
-        "\u00e2,\u00e4,\u00e1",
-        "\u00f6,\u00f4,\u0153,\u00f2,\u00f3,\u00f5,\u00f8,\u014d",
-        "\u0259,\u00e9",
-        "\u00fc,\u00fb,\u00f9,\u00fa,\u016b",
-        "\u0131,\u00ee,\u00ef,\u00ec,\u00ed,\u012f,\u012b",
-        null,
-        null,
-        "\u00e7,\u0107,\u010d",
-        null,
-        "\u015f,\u00df,\u015b,\u0161",
-        null,
-        null,
-        null,
-        "\u017e",
-        "\u0148,\u00f1",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u011f"
-    };
-
-    private static final String[] TEXTS_vi = {
-        "vi",
-        null,
-        "\u00e0,\u00e1,\u1ea3,\u00e3,\u1ea1,\u0103,\u1eb1,\u1eaf,\u1eb3,\u1eb5,\u1eb7,\u00e2,\u1ea7,\u1ea5,\u1ea9,\u1eab,\u1ead",
-        "\u00f2,\u00f3,\u1ecf,\u00f5,\u1ecd,\u00f4,\u1ed3,\u1ed1,\u1ed5,\u1ed7,\u1ed9,\u01a1,\u1edd,\u1edb,\u1edf,\u1ee1,\u1ee3",
-        "\u00e8,\u00e9,\u1ebb,\u1ebd,\u1eb9,\u00ea,\u1ec1,\u1ebf,\u1ec3,\u1ec5,\u1ec7",
-        "\u00f9,\u00fa,\u1ee7,\u0169,\u1ee5,\u01b0,\u1eeb,\u1ee9,\u1eed,\u1eef,\u1ef1",
-        "\u00ec,\u00ed,\u1ec9,\u0129,\u1ecb",
-        null,
-        "\u20ab",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u1ef3,\u00fd,\u1ef7,\u1ef9,\u1ef5",
-        null,
-        null,
-        null,
-        "\u0111"
-    };
-
-    private static final String[] TEXTS_zu = {
-        "zu",
-        null,
-        "\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f3,\u00f4,\u00f6,\u00f2,\u0153,\u00f8,\u014d,\u00f5",
-        "\u00e9,\u00e8,\u00ea,\u00eb,\u0113",
-        "\u00fa,\u00fb,\u00fc,\u00f9,\u016b",
-        "\u00ed,\u00ee,\u00ef,\u012b,\u00ec",
-        null,
-        null,
-        "\u00e7",
-        null,
-        "\u00df",
-        null,
-        null,
-        null,
-        null,
-        "\u00f1"
-    };
-
-    private static final String[] TEXTS_zz = {
-        "zz",
-        null,
-        "\u00e0,\u00e1,\u00e2,\u00e3,\u00e4,\u00e5,\u00e6,\u0101,\u0103,\u0105,\u00aa",
-        "\u00f2,\u00f3,\u00f4,\u00f5,\u00f6,\u00f8,\u014d,\u014f,\u0151,\u0153,\u00ba",
-        "\u00e8,\u00e9,\u00ea,\u00eb,\u0113,\u0115,\u0117,\u0119,\u011b",
-        "\u00f9,\u00fa,\u00fb,\u00fc,\u0169,\u016b,\u016d,\u016f,\u0171,\u0173",
-        "\u00ec,\u00ed,\u00ee,\u00ef,\u0129,\u012b,\u012d,\u012f,\u0131,\u0133",
-        null,
-        null,
-        "\u00e7,\u0107,\u0109,\u010b,\u010d",
-        null,
-        "\u00df,\u015b,\u015d,\u015f,\u0161,\u017f",
-        null,
-        null,
-        null,
-        "\u017a,\u017c,\u017e",
-        "\u00f1,\u0144,\u0146,\u0148,\u0149,\u014b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd,\u0177,\u00ff,\u0133",
-        null,
-        null,
-        null,
-        "\u010f,\u0111,\u00f0",
-        null,
-        "\u011d,\u011f,\u0121,\u0123",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u013a,\u013c,\u013e,\u0140,\u0142",
-        "\u00fe,\u0163,\u0165,\u0167",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0155,\u0157,\u0159",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0125",
-        "\u0135",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0137,\u0138",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0175"
-    };
-
-    private static final String[] TEXTS_it = {
-        "it",
-        null,
-        "\u00e0",
-        "\u00f2",
-        "\u00e8,\u00e9",
-        "\u00f9",
-        "\u00ec",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101,\u00aa",
-        "\u00f3,\u00f4,\u00f6,\u00f5,\u0153,\u00f8,\u014d,\u00ba",
-        "\u00fa,\u00fb,\u00fc,\u016b",
-        null,
-        null,
-        "\u00ea,\u00eb,\u0119,\u0117,\u0113,\u0259",
-        "\u00ed,\u00ee,\u00ef,\u012f,\u012b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e8",
-        "\u00e9",
-        "\u00e0",
-        "\u00fc",
-        "\u00f6",
-        "\u00e4"
-    };
-
-    private static final String[] TEXTS_ja = {
-        "ja",
-        "\u2190",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00a5"
-    };
-
-    private static final String[] TEXTS_ko = {
-        "ko",
-        "\uac00\ub098\ub2e4",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u20a9",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u203b"
-    };
-
-    private static final String[] TEXTS_ru = {
-        "ru",
-        "\u0410\u0411\u0412",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_9qm_lqm",
-        null,
-        null,
-        "!text/single_9qm_lqm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0451",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0449",
-        "\u044b",
-        "\u044d",
-        "\u0438",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u044a",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\",\u00bb,\u00ab",
-        "',\u203a,\u2039"
-    };
-
-    private static final String[] TEXTS_af = {
-        "af",
-        null,
-        "\u00e1",
-        "\u00f3,\u00f4",
-        "\u00e9,\u00e8,\u00ea,\u00eb",
-        "\u00fa,\u00fb",
-        "\u00ed,\u00ec,\u00ef,\u00ee",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00e2,\u00e4,\u00e0,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f6,\u00f2,\u00f5,\u0153,\u00f8,\u014d",
-        "\u00fc,\u00f9,\u016b",
-        null,
-        null,
-        "\u0119,\u0117,\u0113",
-        "\u012f,\u012b,\u0133",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00fd"
-    };
-
-    private static final String[] TEXTS_bod = {
-        "bod",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0f21",
-        "\u0f22",
-        "\u0f23",
-        "\u0f24",
-        "\u0f25",
-        "\u0f26",
-        "\u0f27",
-        "\u0f28",
-        "\u0f29",
-        "\u0f20",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0"
-    };
-
-    private static final String[] TEXTS_hy = {
-        "hy",
-        "\u0531\u0532\u0533",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u058f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/morekeys_punctuation",
-        null,
-        null,
-        null,
-        null,
-        ",",
-        null,
-        "\u0589",
-        ",",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u0589",
-        "\u055e,\u00bf",
-        null,
-        null,
-        null,
-        "!autoColumnOrder!8,\\,,\u055e,\u055c,.,\u055a,\u0559,?,!,\u055d,\u055b,\u058a,\u00bb,\u00ab,\u055f,;,:",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u055c,\u00a1"
-    };
-
-    private static final String[] TEXTS_DEFAULT = {
-        "DEFAULT",
-        "ABC",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!text/double_lqm_rqm",
-        "$",
-        EMPTY,
-        "!text/single_lqm_rqm",
-        EMPTY,
-        "\u00e0,\u00e1,\u00e2,\u00e4,\u00e6,\u00e3,\u00e5,\u0101",
-        "\u00f3,\u00f4,\u00f6,\u00f2,\u0153,\u00f8,\u014d,\u00f5",
-        "\u00fa,\u00fb,\u00fc,\u00f9,\u016b",
-        EMPTY,
-        EMPTY,
-        "\u00e9,\u00e8,\u00ea,\u00eb,\u0113",
-        "\u00ed,\u00ee,\u00ef,\u012b,\u00ec",
-        "\u00e7",
-        "\u00df",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!text/single_laqm_raqm",
-        "!text/double_laqm_raqm",
-        "?123",
-        EMPTY,
-        "!text/morekeys_tablet_punctuation",
-        EMPTY,
-        EMPTY,
-        "!text/morekeys_punctuation",
-        "\u2020,\u2021,\u2605",
-        ",",
-        EMPTY,
-        ".",
-        ",",
-        "(",
-        ")",
-        "[",
-        "]",
-        "{",
-        "}",
-        "<",
-        ">",
-        "\u2264",
-        "\u2265",
-        "\u00ab",
-        "\u00bb",
-        "\u2039",
-        "\u203a",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "\u00f1",
-        "\u00f8",
-        "\u00e5",
-        "\u00f6",
-        "\u00e4",
-        ".",
-        "\u00bf",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
-        "\u00e6",
-        EMPTY,
-        "\u2030",
-        "\u266a,\u2665,\u2660,\u2666,\u2663",
-        "!autoColumnOrder!3,!text/keyspecs_left_parenthesis_more_keys",
-        "!autoColumnOrder!3,!text/keyspecs_right_parenthesis_more_keys",
-        EMPTY,
-        "?",
-        ";",
-        "%",
-        EMPTY,
-        EMPTY,
-        "\u00f1",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!string/label_go_key",
-        "!string/label_send_key",
-        "!string/label_next_key",
-        "!string/label_done_key",
-        "!string/label_search_key",
-        "!string/label_previous_key",
-        "!string/label_pause_key",
-        "!string/label_wait_key",
-        "!autoColumnOrder!8,\\,,?,!,#,!text/keyspec_right_parenthesis,!text/keyspec_left_parenthesis,/,;,',@,:,-,\",+,\\%,&",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "\u00b1",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "q",
-        "w",
-        "y",
-        "x",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "\u00a2,\u00a3,\u20ac,\u00a5,\u20b1",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "\"",
-        "'",
-        "\u00a1,\u203d",
-        EMPTY,
-        "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_left_double_angle_quote",
-        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_right_double_angle_quote",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "$,\u00a2,\u00a3,\u20ac,\u00a5,\u20b1",
-        "\u00b9,\u2081,\u00bd,\u2153,\u00bc,\u215b",
-        "\u00b2,\u2082,\u2154",
-        "\u00b3,\u2083,\u00be,\u215c",
-        "\u2074,\u2084",
-        "\u2075,\u2085,\u215d",
-        "\u2076,\u2086",
-        "\u2077,\u2087,\u215e",
-        "\u2078,\u2088",
-        "\u2079,\u2089",
-        "\u2070,\u2080,\u207f,\u2205",
-        "!icon/action_settings|!code/action_settings",
-        "!fixedColumnOrder!2,!hasLabels!,!text/keylabel_time_am,!text/keylabel_time_pm",
-        "!hasLabels!,.net,.org,.gov,.edu",
-        "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
-        "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
-        "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
-        "!icon/settings_key|!code/key_settings",
-        "!icon/shortcut_key|!code/key_shortcut",
-        "!hasLabels!,!text/label_next_key|!code/key_action_next",
-        "!hasLabels!,!text/label_previous_key|!code/key_action_previous",
-        ".com",
-        "!fixedColumnOrder!4,!needsDividers!,!hasLabels!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
-        "!fixedColumnOrder!4,!needsDividers!,!hasLabels!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/enter_key|!code/key_shift_enter,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
-        "!fixedColumnOrder!4,!needsDividers!,!hasLabels!,!icon/action_switch_language|!code/action_switch_language,!icon/action_text_edit|!code/action_text_edit,!icon/action_clipboard_history|!code/action_clipboard_history,!icon/action_emoji|!code/action_emoji,!icon/previous_key|!code/key_action_previous,!icon/next_key|!code/key_action_next,!icon/action_undo|!code/action_undo,!icon/action_redo|!code/action_redo",
-        "= \\\\ <",
-        "~ [ <",
-        "123",
-        "\uff0a\uff03",
-        "AM",
-        "PM",
-        "!",
-        "@",
-        "#",
-        "$",
-        "%",
-        "^",
-        "&",
-        "*",
-        "!text/keyspec_left_parenthesis",
-        "!text/keyspec_right_parenthesis",
-        "_",
-        "\\\\",
-        "|",
-        "=",
-        "!text/keyspec_left_square_bracket",
-        "!text/keyspec_right_square_bracket",
-        "!text/keyspec_less_than",
-        "!text/keyspec_greater_than",
-        "!text/keyspec_left_curly_bracket",
-        "!text/keyspec_right_curly_bracket",
-        "@",
-        "#",
-        "!text/keyspec_currency,$",
-        "\\%",
-        "&,|",
-        "-,\u2013,\u2014,_",
-        "+,=",
-        "!text/keyspec_left_parenthesis,!text/keyspec_left_square_bracket,!text/keyspec_left_curly_bracket,!text/keyspec_less_than",
-        "!text/keyspec_right_parenthesis,!text/keyspec_right_square_bracket,!text/keyspec_right_curly_bracket,!text/keyspec_greater_than",
-        "*",
-        ":",
-        "!text/keyspec_symbols_semicolon",
-        "!",
-        "!text/keyspec_symbols_question,/",
-        "/",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!icon/action_redo|!code/action_redo",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!icon/action_select_all|!code/action_select_all",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!icon/action_undo|!code/action_undo",
-        "!icon/action_cut|!code/action_cut",
-        "!icon/action_copy|!code/action_copy",
-        "!icon/action_paste|!code/action_paste",
-        EMPTY,
-        EMPTY,
-        EMPTY,
-        "!text/keyspec_less_than,!text/keyspec_left_curly_bracket,!text/keyspec_left_square_bracket",
-        "!text/keyspec_greater_than,!text/keyspec_right_curly_bracket,!text/keyspec_right_square_bracket",
-        "!text/keyspec_left_single_angle_quote,!text/keyspec_right_single_angle_quote",
-        "!text/keyspec_right_single_angle_quote,!text/keyspec_left_single_angle_quote",
-        "!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
-        "!text/keyspec_right_double_angle_quote,!text/keyspec_left_double_angle_quote",
-        "\u201a,\u2018,\u2019",
-        "\u2019,\u201a,\u2018",
-        "\u2018,\u201a,\u2019",
-        "\u2018,\u2019,\u201a",
-        "\u201e,\u201c,\u201d",
-        "\u201d,\u201e,\u201c",
-        "\u201c,\u201e,\u201d",
-        "\u201c,\u201d,\u201e",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0"
-    };
-
-    private static final String[] TEXTS_fa = {
-        "fa",
-        "\u0627\u200c\u0628\u200c\u067e",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\ufdfc",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u06f1",
-        "\u06f2",
-        "\u06f3",
-        "\u06f4",
-        "\u06f5",
-        "\u06f6",
-        "\u06f7",
-        "\u06f8",
-        "\u06f9",
-        "\u06f0",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "7",
-        "8",
-        "9",
-        "0,\u066b,\u066c",
-        null,
-        null,
-        null,
-        "\u06f3\u06f2\u06f1\u061f",
-        null,
-        "!text/morekeys_arabic_diacritics",
-        null,
-        null,
-        "!text/morekeys_arabic_diacritics",
-        "\u2605,\u066d",
-        "\u060c",
-        null,
-        null,
-        "\u060c",
-        "(|)",
-        ")|(",
-        "[|]",
-        "]|[",
-        "{|}",
-        "}|{",
-        "<|>",
-        ">|<",
-        "\u2264|\u2265",
-        "\u2265|\u2264",
-        "\u00ab|\u00bb",
-        "\u00bb|\u00ab",
-        "\u2039|\u203a",
-        "\u203a|\u2039",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u061f",
-        "!fixedColumnOrder!4,:,!,\u061f,\u061b,-,!text/keyspec_left_double_angle_quote,!text/keyspec_right_double_angle_quote",
-        "\u064b",
-        null,
-        null,
-        null,
-        ";",
-        "\\%,\u2030",
-        "\u266a",
-        "!fixedColumnOrder!4,\ufd3e|\ufd3f,!text/keyspecs_left_parenthesis_more_keys",
-        "!fixedColumnOrder!4,\ufd3f|\ufd3e,!text/keyspecs_right_parenthesis_more_keys",
-        "!fixedColumnOrder!8, \u0654\u25cc|\u0654, \u0652\u25cc|\u0652, \u064d\u25cc|\u064d, \u064c\u25cc|\u064c, \u0651\u25cc|\u0651, \u064b\u25cc|\u064b,!text/keyspec_symbols_question,!, \u0656\u25cc|\u0656, \u0670\u25cc|\u0670, \u0653\u25cc|\u0653, \u0650\u25cc|\u0650, \u064f\u25cc|\u064f,\u0640, \u0655\u25cc|\u0655, \u064e\u25cc|\u064e",
-        "\u061f",
-        "\u061b",
-        "\u066a",
-        "\u064b",
-        "\u061f",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than",
-        "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than"
-    };
-
-    private static final String[] TEXTS_he = {
-        "he",
-        "\u05d0\u05d1\u05d2",
-        null,
-        null,
-        null,
-        null,
-        null,
-        "!text/double_rqm_9qm",
-        "\u20aa",
-        null,
-        "!text/single_rqm_9qm",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u2605",
-        null,
-        null,
-        null,
-        null,
-        "(|)",
-        ")|(",
-        "[|]",
-        "]|[",
-        "{|}",
-        "}|{",
-        "<|>",
-        ">|<",
-        "\u2264|\u2265",
-        "\u2265|\u2264",
-        "\u00ab|\u00bb",
-        "\u00bb|\u00ab",
-        "\u2039|\u203a",
-        "\u203a|\u2039",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u00b1,\ufb29"
-    };
-
-    private static final String[] TEXTS_zh = {
-        "zh",
-        null,
-        "\u0101,\u00e1,\u01ce,\u00e0",
-        "\u014d,\u00f3,\u01d2,\u00f2",
-        "\u0113,\u00e9,\u011b,\u00e8,\u00ea",
-        "\u016b,\u00fa,\u01d4,\u00f9",
-        "\u012b,\u00ed,\u01d0,\u00ec",
-        null,
-        null,
-        "\u0109",
-        null,
-        "\u015d",
-        null,
-        null,
-        null,
-        "\u1e91",
-        "\u014b",
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        "\u01d6,\u01d8,\u01da,\u01dc,\u00fc"
-    };
-
-
-    private static final Object[] LOCALES_AND_TEXTS = {
-    // "locale", TEXT_ARRAY,  /* numberOfNonNullText/lengthOf_TEXT_ARRAY localeName */
-        "ar", TEXTS_ar,
-        "az", TEXTS_az,
-        "be", TEXTS_be,
-        "bg", TEXTS_bg,
-        "bn_BD", TEXTS_bn_BD,
-        "bn_IN", TEXTS_bn_IN,
-        "ca", TEXTS_ca,
-        "ckb", TEXTS_ckb,
-        "cs", TEXTS_cs,
-        "da", TEXTS_da,
-        "de", TEXTS_de,
-        "el", TEXTS_el,
-        "en", TEXTS_en,
-        "eo", TEXTS_eo,
-        "es", TEXTS_es,
-        "et", TEXTS_et,
-        "eu", TEXTS_eu,
-        "fi", TEXTS_fi,
-        "fr", TEXTS_fr,
-        "gl", TEXTS_gl,
-        "hi", TEXTS_hi,
-        "hi_ZZ", TEXTS_hi_ZZ,
-        "hr", TEXTS_hr,
-        "hu", TEXTS_hu,
-        "is", TEXTS_is,
-        "iw", TEXTS_iw,
-        "ka", TEXTS_ka,
-        "kk", TEXTS_kk,
-        "km", TEXTS_km,
-        "kn", TEXTS_kn,
-        "ky", TEXTS_ky,
-        "lo", TEXTS_lo,
-        "lt", TEXTS_lt,
-        "lv", TEXTS_lv,
-        "mk", TEXTS_mk,
-        "ml", TEXTS_ml,
-        "mn", TEXTS_mn,
-        "mr", TEXTS_mr,
-        "my", TEXTS_my,
-        "nb", TEXTS_nb,
-        "ne", TEXTS_ne,
-        "new", TEXTS_new,
-        "nl", TEXTS_nl,
-        "pl", TEXTS_pl,
-        "pt", TEXTS_pt,
-        "rm", TEXTS_rm,
-        "ro", TEXTS_ro,
-        "si", TEXTS_si,
-        "sk", TEXTS_sk,
-        "sl", TEXTS_sl,
-        "sr", TEXTS_sr,
-        "sr__#Latn", TEXTS_sr___Latn,
-        "sr_ZZ", TEXTS_sr_ZZ,
-        "sv", TEXTS_sv,
-        "sw", TEXTS_sw,
-        "ta_IN", TEXTS_ta_IN,
-        "ta_LK", TEXTS_ta_LK,
-        "ta_SG", TEXTS_ta_SG,
-        "te", TEXTS_te,
-        "th", TEXTS_th,
-        "tl", TEXTS_tl,
-        "tr", TEXTS_tr,
-        "uk", TEXTS_uk,
-        "uz", TEXTS_uz,
-        "vi", TEXTS_vi,
-        "zu", TEXTS_zu,
-        "zz", TEXTS_zz,
-        "it", TEXTS_it,
-        "ja", TEXTS_ja,
-        "ko", TEXTS_ko,
-        "ru", TEXTS_ru,
-        "af", TEXTS_af,
-        "bod", TEXTS_bod,
-        "hy", TEXTS_hy,
-        "DEFAULT", TEXTS_DEFAULT,
-        "fa", TEXTS_fa,
-        "he", TEXTS_he,
-        "zh", TEXTS_zh
-    };
-
-    static {
-        for (int index = 0; index < NAMES.length; index++) {
-            sNameToIndexesMap.put(NAMES[index], index);
-        }
-
-        for (int i = 0; i < LOCALES_AND_TEXTS.length; i += 2) {
-            final String locale = (String)LOCALES_AND_TEXTS[i];
-            final String[] textsTable = (String[])LOCALES_AND_TEXTS[i + 1];
-            sLocaleToTextsTableMap.put(locale, textsTable);
-            sTextsTableToLocaleMap.put(textsTable, locale);
-        }
-    }
-}
diff --git a/java/src/org/futo/inputmethod/latin/BinaryDictionary.java b/java/src/org/futo/inputmethod/latin/BinaryDictionary.java
index bbc8fbab34..6042aca294 100644
--- a/java/src/org/futo/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/org/futo/inputmethod/latin/BinaryDictionary.java
@@ -53,6 +53,10 @@
 public final class BinaryDictionary extends Dictionary {
     private static final String TAG = BinaryDictionary.class.getSimpleName();
 
+    // To prevent free-during-use by external libraries referencing the dictionary handle
+    // (swipe integration)
+    public static Object sTrieUsageLock = new Object();
+
     // The cutoff returned by native for auto-commit confidence.
     // Must be equal to CONFIDENCE_TO_AUTO_COMMIT in native/jni/src/defines.h
     private static final int CONFIDENCE_TO_AUTO_COMMIT = 1000000;
@@ -218,6 +222,7 @@ private static native int updateEntriesForInputEventsNative(long dict,
     private static native boolean isCorruptedNative(long dict);
     private static native boolean migrateNative(long dict, String dictFilePath,
             long newFormatVersion);
+    private static native long getITrieHandleNative(long dict, String letters);
 
     // TODO: Move native dict into session
     private void loadDictionary(final String path, final long startOffset,
@@ -652,6 +657,14 @@ public boolean migrateTo(final int newFormatVersion) {
         }
     }
 
+    public long getITrie(final String letters) {
+        if (!isValidDictionary()) {
+            return 0;
+        }
+
+        return getITrieHandleNative(mNativeDict, letters);
+    }
+
     @UsedForTesting
     public String getPropertyForGettingStats(final String query) {
         if (!isValidDictionary()) {
@@ -681,9 +694,12 @@ public void close() {
     }
 
     private synchronized void closeInternalLocked() {
-        if (mNativeDict != 0) {
-            closeNative(mNativeDict);
-            mNativeDict = 0;
+        synchronized (sTrieUsageLock) {
+            if (mNativeDict != 0) {
+                DictionaryFacilitatorImpl.onAnyBinaryDictionaryClosed();
+                closeNative(mNativeDict);
+                mNativeDict = 0;
+            }
         }
     }
 
diff --git a/java/src/org/futo/inputmethod/latin/Dictionary.java b/java/src/org/futo/inputmethod/latin/Dictionary.java
index 26ad6e47e5..da45b19289 100644
--- a/java/src/org/futo/inputmethod/latin/Dictionary.java
+++ b/java/src/org/futo/inputmethod/latin/Dictionary.java
@@ -64,6 +64,7 @@ public abstract class Dictionary {
     // User history dictionary internal to LatinIME.
     public static final String TYPE_USER_HISTORY = "history";
     public static final String TYPE_EMOJI = "emoji";
+    public static final String TYPE_EMAIL = "email";
 
     public final String mDictType;
     // The locale for this dictionary. May be null if unknown (phony dictionary for example).
diff --git a/java/src/org/futo/inputmethod/latin/DictionaryCollection.java b/java/src/org/futo/inputmethod/latin/DictionaryCollection.java
index a672b97680..7d8e956b3f 100644
--- a/java/src/org/futo/inputmethod/latin/DictionaryCollection.java
+++ b/java/src/org/futo/inputmethod/latin/DictionaryCollection.java
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -152,4 +153,8 @@ public void removeDictionary(final Dictionary dict) {
             Log.w(TAG, "This collection does not contain this dictionary: " + dict);
         }
     }
+
+    public List<Dictionary> getDictionaries() {
+        return mDictionaries;
+    }
 }
diff --git a/java/src/org/futo/inputmethod/latin/DictionaryFacilitator.java b/java/src/org/futo/inputmethod/latin/DictionaryFacilitator.java
index 618301724a..aa49975e3a 100644
--- a/java/src/org/futo/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/org/futo/inputmethod/latin/DictionaryFacilitator.java
@@ -22,6 +22,7 @@
 import org.futo.inputmethod.annotations.UsedForTesting;
 import org.futo.inputmethod.keyboard.Keyboard;
 import org.futo.inputmethod.latin.common.ComposedData;
+import org.futo.inputmethod.latin.settings.SettingsValues;
 import org.futo.inputmethod.latin.settings.SettingsValuesForSuggestion;
 import org.futo.inputmethod.latin.utils.SuggestionResults;
 
@@ -105,6 +106,8 @@ interface DictionaryInitializationListener {
      */
     void onFinishInput(Context context);
 
+    void onEmailTyped(String email);
+
     boolean isActive();
 
     Locale getPrimaryLocale();
@@ -180,6 +183,8 @@ void unlearnFromUserHistory(final String word,
 
     void flushUserHistoryDictionaries();
 
+    void updateSwipeLayoutAndDictsIfNeeded(SettingsValues values, Keyboard keyboard);
+
     String dump(final Context context);
 
     void dumpDictionaryForDebug(final String dictName);
diff --git a/java/src/org/futo/inputmethod/latin/DictionaryFacilitatorImpl.java b/java/src/org/futo/inputmethod/latin/DictionaryFacilitatorImpl.java
index ff0256a5ff..4ad83dcfdd 100644
--- a/java/src/org/futo/inputmethod/latin/DictionaryFacilitatorImpl.java
+++ b/java/src/org/futo/inputmethod/latin/DictionaryFacilitatorImpl.java
@@ -26,6 +26,8 @@
 
 import org.futo.inputmethod.annotations.UsedForTesting;
 import org.futo.inputmethod.keyboard.Keyboard;
+import org.futo.inputmethod.keyboard.KeyboardId;
+import org.futo.inputmethod.keyboard.KeyboardLayout;
 import org.futo.inputmethod.latin.NgramContext.WordInfo;
 import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 import org.futo.inputmethod.latin.common.ComposedData;
@@ -33,6 +35,8 @@
 import org.futo.inputmethod.latin.common.StringUtils;
 import org.futo.inputmethod.latin.permissions.PermissionsUtil;
 import org.futo.inputmethod.latin.personalization.UserHistoryDictionary;
+import org.futo.inputmethod.latin.settings.Settings;
+import org.futo.inputmethod.latin.settings.SettingsValues;
 import org.futo.inputmethod.latin.settings.SettingsValuesForSuggestion;
 import org.futo.inputmethod.latin.utils.ExecutorUtils;
 import org.futo.inputmethod.latin.utils.SuggestionResults;
@@ -70,6 +74,8 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     // dictionary.
     private static final int CAPITALIZED_FORM_MAX_PROBABILITY_FOR_INSERT = 140;
 
+    @androidx.annotation.Nullable
+    private EmailDictionary mEmailDictionary = null;
     private List<DictionaryGroup> mDictionaryGroups = new ArrayList<>();
     private volatile CountDownLatch mLatchForWaitingLoadingMainDictionaries = new CountDownLatch(0);
     // To synchronize assigning mDictionaryGroup to ensure closing dictionaries.
@@ -79,6 +85,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
             DICT_TYPE_TO_CLASS = new HashMap<>();
 
     static {
+        DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_EMAIL, EmailDictionary.class);
         DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER_HISTORY, UserHistoryDictionary.class);
         DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER, UserBinaryDictionary.class);
     }
@@ -87,9 +94,18 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     private static final Class<?>[] DICT_FACTORY_METHOD_ARG_TYPES =
             new Class[] { Context.class, Locale.class, File.class, String.class, String.class };
 
+
+    public static SwipeDecoderDictionary swipeDecoderDictionary = null;
+
     private LruCache<String, Boolean> mValidSpellingWordReadCache;
     private LruCache<String, Boolean> mValidSpellingWordWriteCache;
 
+    private static boolean sTriesAreInvalid = false;
+    public static void onAnyBinaryDictionaryClosed() {
+        sTriesAreInvalid = true;
+        swipeDecoderDictionary.invalidateTries();
+    }
+
     @Override
     public void setValidSpellingWordReadCache(final LruCache<String, Boolean> cache) {
         mValidSpellingWordReadCache = cache;
@@ -138,7 +154,7 @@ private static class DictionaryGroup {
         // TODO: Run evaluation to determine a reasonable value for these constants. The current
         // values are ad-hoc and chosen without any particular care or methodology.
         public static final float WEIGHT_FOR_MOST_PROBABLE_LANGUAGE = 1.0f;
-        public static final float WEIGHT_FOR_GESTURING_IN_NOT_MOST_PROBABLE_LANGUAGE = 0.0f;
+        public static final float WEIGHT_FOR_GESTURING_IN_NOT_MOST_PROBABLE_LANGUAGE = 0.3f;
         public static final float WEIGHT_FOR_TYPING_IN_NOT_MOST_PROBABLE_LANGUAGE = 0.8f;
 
         /**
@@ -250,8 +266,26 @@ public DictionaryFacilitatorImpl() {
     public void onStartInput() {
     }
 
+
     @Override
     public void onFinishInput(Context context) {
+
+    }
+
+    @Override
+    public void onEmailTyped(String email) {
+        SettingsValues settings = Settings.getInstance().getCurrent();
+        if(!settings.isPersonalizationEnabled() || settings.mInputAttributes.mNoLearning) return;
+
+        if(email != null) {
+            if(email.contains("@") && email.contains(".") && mEmailDictionary != null) {
+                String domain = email.split("@")[1];
+                if(domain.contains(".")) {
+                    mEmailDictionary.addEntryNow(NgramContext.BEGINNING_OF_SENTENCE, 32, email);
+                    mEmailDictionary.addEntryNow(NgramContext.EMAIL_DOMAIN, 32, domain);
+                }
+            }
+        }
     }
 
     @Override
@@ -326,6 +360,12 @@ public void resetDictionaries(
             @Nullable final String account,
             final String dictNamePrefix,
             @Nullable final DictionaryInitializationListener listener) {
+
+        mPrevKeyboard = null;
+        if(DictionaryFacilitatorImpl.swipeDecoderDictionary == null) {
+            DictionaryFacilitatorImpl.swipeDecoderDictionary = new SwipeDecoderDictionary(context, Locale.ENGLISH);
+        }
+
         final HashMap<Locale, ArrayList<String>> existingDictionariesToCleanup = new HashMap<>();
         // TODO: Make subDictTypesToUse configurable by resource or a static final list.
         final HashSet<String> subDictTypesToUse = new HashSet<>();
@@ -341,6 +381,14 @@ public void resetDictionaries(
             subDictTypesToUse.add(Dictionary.TYPE_USER_HISTORY);
         }
 
+        if(usePersonalizedDicts && (forceReloadAllDictionaries || mEmailDictionary == null)) {
+            if(mEmailDictionary != null) mEmailDictionary.close();
+            mEmailDictionary = new EmailDictionary(context);
+        }else if(!usePersonalizedDicts && mEmailDictionary != null) {
+            mEmailDictionary.close();
+            mEmailDictionary = null;
+        }
+
         // Gather all dictionaries. We'll remove them from the list to clean up later.
         for(DictionaryGroup group : mDictionaryGroups) {
             final ArrayList<String> dictTypeForLocale = new ArrayList<>();
@@ -355,6 +403,7 @@ public void resetDictionaries(
             }
         }
 
+        mTrieCorrespondingGroups = null;
         ArrayList<DictionaryGroup> newDictionaryGroups = new ArrayList<>();
         for(Locale newLocale : newLocales) {
             final DictionaryGroup dictionaryGroupForLocale =
@@ -636,7 +685,7 @@ public void addToUserHistory(final String suggestion, final boolean wasAutoCapit
         DictionaryGroup mostConfidentDictionary = findDictionaryGroupWithLocale(mDictionaryGroups,
                 getMostConfidentLocale());
         if(mostConfidentDictionary == null) return;
-        if(mostConfidentDictionary.mConfidence == 0) return;
+        if(mostConfidentDictionary.mConfidence == 0 && mDictionaryGroups.size() > 1) return;
         for (int i = 0; i < words.length; i++) {
             final String currentWord = words[i];
             final boolean wasCurrentWordAutoCapitalized = i == 0 && wasAutoCapitalized;
@@ -723,6 +772,9 @@ private void addWordToUserHistory(final DictionaryGroup dictionaryGroup,
     }
 
     private void removeWord(final String dictName, final String word) {
+        if(mEmailDictionary != null) {
+            mEmailDictionary.removeUnigramEntryDynamically(word);
+        }
         for(DictionaryGroup dictionaryGroup : mDictionaryGroups) {
             final ExpandableBinaryDictionary dictionary = dictionaryGroup.getSubDict(dictName);
             if (dictionary != null) {
@@ -785,6 +837,7 @@ private void updateDictionaryGroupWeights() {
             NgramContext ngramContext, @Nonnull final Keyboard keyboard,
             SettingsValuesForSuggestion settingsValuesForSuggestion, int sessionId,
             int inputStyle) {
+
         long proximityInfoHandle = keyboard.getProximityInfo().getNativeProximityInfo();
         final SuggestionResults suggestionResults = new SuggestionResults(
                 SuggestedWords.MAX_SUGGESTIONS, ngramContext.isBeginningOfSentenceContext(),
@@ -794,6 +847,50 @@ private void updateDictionaryGroupWeights() {
 
         updateDictionaryGroupWeights();
 
+        if(keyboard.mId.mMode == KeyboardId.MODE_EMAIL && mEmailDictionary != null) {
+            boolean isTypingDomain = ngramContext.fullContext.contains("@");
+            NgramContext ngramContextForEmail = isTypingDomain ? NgramContext.EMAIL_DOMAIN : NgramContext.BEGINNING_OF_SENTENCE;
+
+            final ArrayList<SuggestedWordInfo> dictionarySuggestions =
+                    mEmailDictionary.getSuggestions(composedData, ngramContextForEmail, proximityInfoHandle, settingsValuesForSuggestion, sessionId, 1.5f, weightOfLangModelVsSpatialModel);
+
+            if(dictionarySuggestions != null && !dictionarySuggestions.isEmpty()) {
+                ArrayList<SuggestedWordInfo> filteredSuggestions = new ArrayList<>();
+                for(int i=0; i<dictionarySuggestions.size(); i++) {
+                    boolean isSuggestionDomain = !dictionarySuggestions.get(i).mWord.contains("@");
+                    if(isSuggestionDomain == isTypingDomain) filteredSuggestions.add(dictionarySuggestions.get(i));
+                }
+
+                suggestionResults.addAll(filteredSuggestions);
+                if (null != suggestionResults.mRawSuggestions) {
+                    suggestionResults.mRawSuggestions.addAll(filteredSuggestions);
+                }
+                return suggestionResults;
+            } else {
+                Log.d(TAG, "was null or empty: " + dictionarySuggestions);
+            }
+        }
+
+        if(DictionaryFacilitatorImpl.swipeDecoderDictionary != null) {
+            SwipeDecoderDictionary.updateKeyboard(keyboard);
+            updateSwipeLayoutAndDictsIfNeeded(Settings.getInstance().getCurrent(), keyboard);
+
+            if(SwipeDecoderDictionary.canBeUsed()) {
+                final ArrayList<SuggestedWordInfo> dictionarySuggestions =
+                        DictionaryFacilitatorImpl.swipeDecoderDictionary.getSuggestions(composedData, ngramContext,
+                            inputStyle == SuggestedWords.INPUT_STYLE_TAIL_BATCH, getTrieWeights());
+
+                if (dictionarySuggestions != null) {
+                    suggestionResults.addAll(dictionarySuggestions);
+                    if (null != suggestionResults.mRawSuggestions) {
+                        suggestionResults.mRawSuggestions.addAll(dictionarySuggestions);
+                    }
+
+                    return suggestionResults;
+                }
+            }
+        }
+
         for(DictionaryGroup dictionaryGroup : mDictionaryGroups) {
             for (final String dictType : ALL_DICTIONARY_TYPES) {
                 final Dictionary dictionary = dictionaryGroup.getDict(dictType);
@@ -887,6 +984,12 @@ private boolean clearSubDictionary(final String dictName) {
 
     @Override
     public boolean clearUserHistoryDictionary(final Context context) {
+        if(mEmailDictionary != null) {
+            mEmailDictionary.clear();
+            mEmailDictionary.loadInitialContentsLocked();
+            mEmailDictionary.asyncFlushBinaryDictionary();
+        }
+
         return clearSubDictionary(Dictionary.TYPE_USER_HISTORY);
     }
 
@@ -924,6 +1027,95 @@ public void flushUserHistoryDictionaries() {
             if(dictionary == null) continue;
             dictionary.asyncFlushBinaryDictionary();
         }
+
+        if(mEmailDictionary != null) {
+            mEmailDictionary.asyncFlushBinaryDictionary();
+        }
+    }
+
+    private void addDictionaryTries(List<Dictionary> dictList, String letters, ArrayList<Long> tries) {
+        for(Dictionary dict : dictList) {
+            long handle = 0;
+            if(dict instanceof BinaryDictionary) {
+                handle = ((BinaryDictionary) dict).getITrie(letters);
+            } else if(dict instanceof ReadOnlyBinaryDictionary) {
+                handle = ((ReadOnlyBinaryDictionary) dict).getITrie(letters);
+            }else if(dict instanceof ExpandableBinaryDictionary) {
+                handle = ((ExpandableBinaryDictionary) dict).getITrie(letters);
+            }else if(dict instanceof DictionaryCollection) {
+                addDictionaryTries(((DictionaryCollection) dict).getDictionaries(), letters, tries);
+            }
+
+            if(handle == 0) continue;
+            tries.add(handle);
+        }
+    }
+
+
+    private Keyboard mPrevKeyboard = null;
+    private ArrayList<DictionaryGroup> mTrieCorrespondingGroups;
+
+    private float[] getTrieWeights() {
+        if(mTrieCorrespondingGroups == null) return new float[0];
+
+        int size = mTrieCorrespondingGroups.size();
+        float[] result = new float[size];
+
+        for(int i=0; i<size; i++) {
+            result[i] = mTrieCorrespondingGroups.get(i).mWeightForGesturingInLocale;
+        }
+
+        return result;
+    }
+
+    @Override
+    public void updateSwipeLayoutAndDictsIfNeeded(SettingsValues values, Keyboard keyboard) {
+        if(swipeDecoderDictionary == null) return;
+
+        // TODO: This could be more optimized by avoiding unnecessary recreations when
+        //  isMultiLine is changed, or something else trivial has changed. Maybe also cache the
+        //  resulting LayoutInfos
+        boolean needsToRecreate = keyboard != mPrevKeyboard;
+        if(sTriesAreInvalid) {
+            needsToRecreate = true;
+        }
+
+        if(!needsToRecreate) return;
+
+        if(!hasAtLeastOneInitializedMainDictionary()) return;
+        if(keyboard == null) return;
+        KeyboardLayout layout = keyboard.getKeyboardLayout();
+        if(layout == null) return;
+
+        mPrevKeyboard = keyboard;
+
+        final LayoutInfoForModel info = LayoutInfoForModel.buildLayoutInfo(swipeDecoderDictionary.getContext(), keyboard, values);
+        // Log.d("DictionaryFacilitatorImpl", "Keyboard updated... New info: " + info);
+
+        if(info != null) {
+            // Make sure to update tries
+            ArrayList<Long> trieArray = new ArrayList<>();
+
+            mTrieCorrespondingGroups = new ArrayList<>();
+
+            for(DictionaryGroup group : mDictionaryGroups) {
+                int prevLength = trieArray.size();
+                ArrayList<Dictionary> dicts = new ArrayList<Dictionary>();
+                dicts.add(group.getDict(Dictionary.TYPE_MAIN));
+                dicts.add(group.getDict(Dictionary.TYPE_USER));
+                dicts.add(group.getDict(Dictionary.TYPE_USER_HISTORY));
+
+                addDictionaryTries(dicts, info.getLetters(), trieArray);
+                int newLength = trieArray.size();
+
+                for(int i=0; i<(newLength - prevLength); i++) {
+                    mTrieCorrespondingGroups.add(group);
+                }
+            }
+
+            swipeDecoderDictionary.updateKeyboard(new SwipeDecoderDictionary.PendingLayoutInfo(info, trieArray));
+            sTriesAreInvalid = trieArray.isEmpty();
+        }
     }
 
     @Override
diff --git a/java/src/org/futo/inputmethod/latin/EmailDictionary.kt b/java/src/org/futo/inputmethod/latin/EmailDictionary.kt
new file mode 100644
index 0000000000..fba6b724b7
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/EmailDictionary.kt
@@ -0,0 +1,29 @@
+package org.futo.inputmethod.latin
+
+import android.content.Context
+import java.util.Locale
+
+class EmailDictionary(context: Context) :
+    ExpandableBinaryDictionary(context, "email", Locale.ENGLISH, TYPE_EMAIL, null)
+{
+    private val emailDomains = listOf(
+        "gmail.com",  "yahoo.com",  "outlook.com", "hotmail.com",
+        "icloud.com",
+        "proton.me", "protonmail.com", "pm.me", "protonmail.ch",
+        "fastmail.com",
+        "tuta.com", "tutamail.com", "tuta.io", "tutanota.com", "tutanota.de",
+    )
+    override fun loadInitialContentsLocked() {
+        emailDomains.reversed().forEachIndexed { i, it ->
+            addEntry(NgramContext.EMAIL_DOMAIN, i, it, 1)
+        }
+    }
+
+    fun addEntry(ngramContext: NgramContext, frequency: Int, entry: String, timestamp: Int = (System.currentTimeMillis() / 1000).toInt()) {
+        if(ngramContext != NgramContext.EMAIL_DOMAIN) addUnigramEntry(entry, frequency, null, 0, false, false, timestamp)
+        addNgramEntry(ngramContext, entry, frequency, timestamp)
+        updateEntriesForWord(ngramContext, entry, true, frequency, timestamp)
+    }
+
+    fun addEntryNow(ngramContext: NgramContext, frequency: Int, entry: String) = addEntry(ngramContext, frequency, entry)
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/org/futo/inputmethod/latin/ExpandableBinaryDictionary.java
index e1acf4f282..70ef509bc0 100644
--- a/java/src/org/futo/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/org/futo/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -185,6 +185,14 @@ BinaryDictionary getBinaryDictionary() {
         return mBinaryDictionary;
     }
 
+    public long getITrie(final String letters) {
+        if (mBinaryDictionary == null || !mBinaryDictionary.isValidDictionary()) {
+            return 0;
+        }
+
+        return mBinaryDictionary.getITrie(letters);
+    }
+
     void closeBinaryDictionary() {
         if (mBinaryDictionary != null) {
             mBinaryDictionary.close();
diff --git a/java/src/org/futo/inputmethod/latin/InputAttributes.java b/java/src/org/futo/inputmethod/latin/InputAttributes.java
index 198ca7b13f..83bd4d41e7 100644
--- a/java/src/org/futo/inputmethod/latin/InputAttributes.java
+++ b/java/src/org/futo/inputmethod/latin/InputAttributes.java
@@ -63,6 +63,7 @@ public final class InputAttributes {
      * {@link org.futo.inputmethod.latin.settings.SettingsValues#mGestureFloatingPreviewTextEnabled}
      */
     final public boolean mDisableGestureFloatingPreviewText;
+    final public boolean mSendKeyEventsMode;
     final public boolean mIsGeneralTextInput;
     final public boolean mIsWebField;
     final public boolean mNoLearning;
@@ -108,11 +109,13 @@ public InputAttributes(final EditorInfo editorInfo, final boolean isFullscreenMo
             mIsGeneralTextInput = false;
             mNoLearning = false;
             mIsEmailField = false;
+            mSendKeyEventsMode = true;
             mIsWebField = false;
             mLocaleOverride = null;
             mLayoutOverride = null;
             return;
         }
+        mSendKeyEventsMode = false;
         // inputClass == InputType.TYPE_CLASS_TEXT
         final int variation = inputType & InputType.TYPE_MASK_VARIATION;
         final boolean flagNoSuggestions =
@@ -385,6 +388,9 @@ private static int getCodeFieldType(final EditorInfo editorInfo) {
         if(editorInfo.packageName.startsWith("com.termux") && editorInfo.inputType == 0)
             return CODE_FIELD_NO_COMPOSITION;
 
+        if(editorInfo.packageName.startsWith("sh.haven.app") && editorInfo.inputType == 0)
+            return CODE_FIELD_NO_COMPOSITION;
+
         if(editorInfo.packageName.startsWith("com.android.virtualization.terminal") && noSuggestions)
             return CODE_FIELD_NO_COMPOSITION;
 
diff --git a/java/src/org/futo/inputmethod/latin/InputConnectionInternalComposingWrapper.kt b/java/src/org/futo/inputmethod/latin/InputConnectionInternalComposingWrapper.kt
index de290a4129..3df6614a82 100644
--- a/java/src/org/futo/inputmethod/latin/InputConnectionInternalComposingWrapper.kt
+++ b/java/src/org/futo/inputmethod/latin/InputConnectionInternalComposingWrapper.kt
@@ -261,7 +261,7 @@ class InputConnectionInternalComposingWrapper(
                 val lengthAccordingToHistory = (composingText.length)
                 val lengthToFetch = maxOf(lengthAccordingToHistory, lengthAccordingToCursor)
                 var pastText = super.getTextBeforeCursor(lengthToFetch, 1)
-                if(pastText != null) {
+                if(pastText != null && (pastText.isNotEmpty() || lengthToFetch == 0)) {
                     // There are multiple cases we need to account for:
                     // 1. The framework is filtering out specific characters (e.g. spaces), in which case we must trust cursor position instead of composingText which contains spaces
                     // 2. The framework has shifted our cursor where the word is located, in which case we cannot trust cursor position and have to rely on composingText
diff --git a/java/src/org/futo/inputmethod/latin/LatinIME.kt b/java/src/org/futo/inputmethod/latin/LatinIME.kt
index 54cfe4cf74..cff052ee23 100644
--- a/java/src/org/futo/inputmethod/latin/LatinIME.kt
+++ b/java/src/org/futo/inputmethod/latin/LatinIME.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
@@ -71,6 +72,7 @@ import org.futo.inputmethod.latin.uix.KeyBordersSetting
 import org.futo.inputmethod.latin.uix.KeyHintsSetting
 import org.futo.inputmethod.latin.uix.KeyboardColorScheme
 import org.futo.inputmethod.latin.uix.SUGGESTION_BLACKLIST
+import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.THEME_KEY
 import org.futo.inputmethod.latin.uix.UixManager
 import org.futo.inputmethod.latin.uix.actions.CanThrowIfDebug
@@ -112,6 +114,11 @@ val UseTransparentNavbar =
     // https://github.com/futo-org/android-keyboard/issues/772
     !Build.MANUFACTURER.lowercase().contains("motorola")
 
+val HideKeyboardWhenHardKeyboardConnected = SettingsKey(
+    booleanPreferencesKey("hideKeyboardWhenHardKeyboardConnected"),
+    false
+)
+
 private class UnlockedBroadcastReceiver(val onDeviceUnlocked: () -> Unit) : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent?.action == Intent.ACTION_USER_UNLOCKED) {
@@ -228,7 +235,8 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
             latinIMELegacy.mKeyboardSwitcher.mState.onLoadKeyboard(
                 currentInputEditorInfo ?: return,
                 latinIMELegacy.currentAutoCapsState,
-                latinIMELegacy.mKeyboardSwitcher.keyboard?.mId?.mKeyboardLayoutSetName
+                latinIMELegacy.mKeyboardSwitcher.keyboard?.mId?.mKeyboardLayoutSetName,
+                null
             )
         }
 
@@ -369,6 +377,8 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
     override fun onCreate() {
         super.onCreate()
 
+        UserBinaryDictionary.resetUserDictionariesRequiringRecreation()
+
         CanThrowIfDebug = isDirectBootUnlocked
 
         JniUtils.loadNativeLibrary()
@@ -516,9 +526,9 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
 
         uixManager.setContent()
 
-        composeView.setOnApplyWindowInsetsListener { v, insets ->
+        window.window?.decorView?.setOnApplyWindowInsetsListener { v, insets ->
             onSizeUpdated()
-            insets
+            v.onApplyWindowInsets(insets)
         }
 
         return composeView
@@ -600,6 +610,7 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
         latinIMELegacy.onStartInputView(info, restarting)
         lifecycleScope.launch { uixManager.showUpdateNoticeIfNeeded() }
         updateColorsIfDynamicChanged()
+        uixManager.updateEmojiTranslationsIfNeeded()
     }
 
     override fun onFinishInputView(finishingInput: Boolean) {
@@ -742,7 +753,9 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
     }
 
     override fun onEvaluateInputViewShown(): Boolean {
-        return latinIMELegacy.onEvaluateInputViewShown() || super.onEvaluateInputViewShown()
+        return latinIMELegacy.onEvaluateInputViewShown()
+                || super.onEvaluateInputViewShown()
+                || !getSetting(HideKeyboardWhenHardKeyboardConnected)
     }
 
     override fun onEvaluateFullscreenMode(): Boolean {
@@ -887,6 +900,7 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
         Log.i("LatinIME", "Device has been unlocked, reloading settings")
 
         // Every place that called getDefaultSharedPreferences now needs to be refreshed or call it again
+        UserBinaryDictionary.resetUserDictionariesRequiringRecreation()
 
         // Mainly Settings singleton needs to be refreshed
         Settings.init(applicationContext)
diff --git a/java/src/org/futo/inputmethod/latin/LatinIMELegacy.java b/java/src/org/futo/inputmethod/latin/LatinIMELegacy.java
index f1c3308a2b..c64d065790 100644
--- a/java/src/org/futo/inputmethod/latin/LatinIMELegacy.java
+++ b/java/src/org/futo/inputmethod/latin/LatinIMELegacy.java
@@ -836,6 +836,10 @@ private void hapticAndAudioFeedback(final int code, final int repeatCount) {
     public void onPressKey(final int primaryCode, final int repeatCount,
             final boolean isSinglePointer) {
         mKeyboardSwitcher.onPressKey(primaryCode, isSinglePointer, getCurrentAutoCapsState());
+
+        if(primaryCode == Constants.CODE_DELETE && repeatCount > 1) {
+            if(!getActiveIME().hasMoreTextToDelete()) return;
+        }
         hapticAndAudioFeedback(primaryCode, repeatCount);
     }
 
diff --git a/java/src/org/futo/inputmethod/latin/NgramContext.java b/java/src/org/futo/inputmethod/latin/NgramContext.java
index bdd15522e5..389ef0dcd0 100644
--- a/java/src/org/futo/inputmethod/latin/NgramContext.java
+++ b/java/src/org/futo/inputmethod/latin/NgramContext.java
@@ -38,6 +38,9 @@ public class NgramContext {
     @Nonnull
     public static final NgramContext BEGINNING_OF_SENTENCE =
             new NgramContext(WordInfo.BEGINNING_OF_SENTENCE_WORD_INFO);
+    @Nonnull
+    public static final NgramContext EMAIL_DOMAIN =
+            new NgramContext(WordInfo.EMAIL_DOMAIN_WORD_INFO);
 
     public static final String BEGINNING_OF_SENTENCE_TAG = "<S>";
 
@@ -57,6 +60,8 @@ public static class WordInfo {
         public static final WordInfo EMPTY_WORD_INFO = new WordInfo(null);
         @Nonnull
         public static final WordInfo BEGINNING_OF_SENTENCE_WORD_INFO = new WordInfo();
+        @Nonnull
+        public static final WordInfo EMAIL_DOMAIN_WORD_INFO = new WordInfo("@");
 
         // This is an empty char sequence when mIsBeginningOfSentence is true.
         public final CharSequence mWord;
diff --git a/java/src/org/futo/inputmethod/latin/ReadOnlyBinaryDictionary.java b/java/src/org/futo/inputmethod/latin/ReadOnlyBinaryDictionary.java
index b339b89542..0b869b7bcc 100644
--- a/java/src/org/futo/inputmethod/latin/ReadOnlyBinaryDictionary.java
+++ b/java/src/org/futo/inputmethod/latin/ReadOnlyBinaryDictionary.java
@@ -136,4 +136,12 @@ public void close() {
             mLock.writeLock().unlock();
         }
     }
+
+    public long getITrie(final String letters) {
+        if (mBinaryDictionary == null || !mBinaryDictionary.isValidDictionary()) {
+            return 0;
+        }
+
+        return mBinaryDictionary.getITrie(letters);
+    }
 }
diff --git a/java/src/org/futo/inputmethod/latin/RichInputConnection.java b/java/src/org/futo/inputmethod/latin/RichInputConnection.java
index 2ce831f80c..e4f1428405 100644
--- a/java/src/org/futo/inputmethod/latin/RichInputConnection.java
+++ b/java/src/org/futo/inputmethod/latin/RichInputConnection.java
@@ -39,6 +39,7 @@
 import org.futo.inputmethod.latin.inputlogic.InputLogic;
 import org.futo.inputmethod.latin.inputlogic.PrivateCommandPerformer;
 import org.futo.inputmethod.latin.settings.Settings;
+import org.futo.inputmethod.latin.settings.SettingsValues;
 import org.futo.inputmethod.latin.settings.SpacingAndPunctuations;
 import org.futo.inputmethod.latin.utils.CapsModeUtils;
 import org.futo.inputmethod.latin.utils.DebugLogUtils;
@@ -774,10 +775,11 @@ public NgramContext getNgramContextFromNthPreviousWord(
     }
 
     private static boolean isPartOfCompositionForScript(final int codePoint,
-            final SpacingAndPunctuations spacingAndPunctuations, final int scriptId) {
+            final SettingsValues settingsValues, final int scriptId) {
         // We always consider word connectors part of compositions.
+        final SpacingAndPunctuations spacingAndPunctuations = settingsValues.mSpacingAndPunctuations;
         return spacingAndPunctuations.isWordConnector(codePoint)
-                || Settings.getInstance().getCurrent().isWordCodePoint(codePoint) // TODO: This wasn't originally here, why not?
+                || settingsValues.isWordCodePoint(codePoint) // TODO: This wasn't originally here, why not?
                 // Otherwise, it's part of composition if it's part of script and not a separator.
                 || (!spacingAndPunctuations.isWordSeparator(codePoint)
                         && ScriptUtils.isLetterPartOfScript(codePoint, scriptId));
@@ -786,11 +788,11 @@ private static boolean isPartOfCompositionForScript(final int codePoint,
     /**
      * Returns the text surrounding the cursor.
      *
-     * @param spacingAndPunctuations the rules for spacing and punctuation
+     * @param settingsValues for the rules for spacing and punctuation
      * @param scriptId the script we consider to be writing words, as one of ScriptUtils.SCRIPT_*
      * @return a range containing the text surrounding the cursor
      */
-    public TextRange getWordRangeAtCursor(final SpacingAndPunctuations spacingAndPunctuations,
+    public TextRange getWordRangeAtCursor(final SettingsValues settingsValues,
             final int scriptId, final boolean checkAfter) {
         updateConnection();
         if (!isConnected()) {
@@ -823,7 +825,7 @@ public TextRange getWordRangeAtCursor(final SpacingAndPunctuations spacingAndPun
         int startIndexInBefore = before.length();
         while (startIndexInBefore > 0) {
             final int codePoint = Character.codePointBefore(before, startIndexInBefore);
-            if (!isPartOfCompositionForScript(codePoint, spacingAndPunctuations, scriptId)) {
+            if (!isPartOfCompositionForScript(codePoint, settingsValues, scriptId)) {
                 break;
             }
             --startIndexInBefore;
@@ -836,7 +838,7 @@ public TextRange getWordRangeAtCursor(final SpacingAndPunctuations spacingAndPun
         int endIndexInAfter = -1;
         while (++endIndexInAfter < after.length()) {
             final int codePoint = Character.codePointAt(after, endIndexInAfter);
-            if (!isPartOfCompositionForScript(codePoint, spacingAndPunctuations, scriptId)) {
+            if (!isPartOfCompositionForScript(codePoint, settingsValues, scriptId)) {
                 break;
             }
             if (Character.isSupplementaryCodePoint(codePoint)) {
@@ -933,13 +935,13 @@ public boolean revertDoubleSpacePeriod(final SpacingAndPunctuations spacingAndPu
         // Here we test whether we indeed have a period and a space before us. This should not
         // be needed, but it's there just in case something went wrong.
         final CharSequence textBeforeCursor = getTextBeforeCursor(2, 0);
-        if (!TextUtils.equals(spacingAndPunctuations.mSentenceSeparatorAndSpace,
+        if (!TextUtils.equals(spacingAndPunctuations.sentenceSeparatorAndSpace,
                 textBeforeCursor)) {
             // Theoretically we should not be coming here if there isn't ". " before the
             // cursor, but the application may be changing the text while we are typing, so
             // anything goes. We should not crash.
             Log.d(TAG, "Tried to revert double-space combo but we didn't find \""
-                    + spacingAndPunctuations.mSentenceSeparatorAndSpace
+                    + spacingAndPunctuations.sentenceSeparatorAndSpace
                     + "\" just before the cursor.");
             return false;
         }
@@ -1393,4 +1395,9 @@ public void send() {
     public boolean useAutoCorrectIndicator() {
         return !(mIC instanceof InputConnectionInternalComposingWrapper);
     }
+
+    public boolean isCursorTouchingNumber() {
+        final int codeBefore = getCodePointBeforeCursor();
+        return codeBefore >= '0' && codeBefore <= '9';
+    }
 }
diff --git a/java/src/org/futo/inputmethod/latin/Subtypes.kt b/java/src/org/futo/inputmethod/latin/Subtypes.kt
index e502a3deaf..0c6f764ef4 100644
--- a/java/src/org/futo/inputmethod/latin/Subtypes.kt
+++ b/java/src/org/futo/inputmethod/latin/Subtypes.kt
@@ -54,9 +54,11 @@ import org.futo.inputmethod.v2keyboard.LayoutManager
 import java.util.Locale
 import kotlin.math.sign
 
-public fun localeFromString(s: String): Locale =
+fun localeFromString(s: String): Locale =
     Locale.forLanguageTag(s.replace("__#", "-").replace("_", "-"))
 
+fun String.toLocale() = localeFromString(this)
+
 fun Locale.stripExtensionsIfNeeded(): Locale {
     val newLocale = if(Build.VERSION.SDK_INT >= 26) {
         this.stripExtensions().stripExtensions() // TODO: Sometimes this requires two calls??
diff --git a/java/src/org/futo/inputmethod/latin/Suggest.java b/java/src/org/futo/inputmethod/latin/Suggest.java
index 09346d92ff..b59b0eb1f9 100644
--- a/java/src/org/futo/inputmethod/latin/Suggest.java
+++ b/java/src/org/futo/inputmethod/latin/Suggest.java
@@ -227,6 +227,8 @@ public static SuggestedWords obtainNonBatchedInputSuggestedWords(
                 //|| wordComposer.isOrdinal(locale)
                 // If it starts with a digit, do not autocorrect
                 || wordComposer.startsWithDigit()
+                // If it's attached to a non word, do not autocorrect
+                || wordComposer.isAttachedToNonWord()
                 // If the word is mostly caps, we never auto-correct because this is almost
                 // certainly intentional (and careful input)
                 || wordComposer.isMostlyCaps()
@@ -487,6 +489,7 @@ private static boolean isAllowedByAutoCorrectionWithSpaceFilter(final SuggestedW
                 wordInfo.mAutoCommitFirstWordConfidence);
 
         result.mOriginatesFromTransformerLM = wordInfo.mOriginatesFromTransformerLM;
+        result.mOriginatesFromSwipeModel    = wordInfo.mOriginatesFromSwipeModel;
 
         return result;
     }
diff --git a/java/src/org/futo/inputmethod/latin/SuggestedWords.java b/java/src/org/futo/inputmethod/latin/SuggestedWords.java
index 0fa4a765f0..7dd711c505 100644
--- a/java/src/org/futo/inputmethod/latin/SuggestedWords.java
+++ b/java/src/org/futo/inputmethod/latin/SuggestedWords.java
@@ -309,6 +309,7 @@ public static class SuggestedWordInfo {
         private String mDebugString = "";
 
         public boolean mOriginatesFromTransformerLM = false;
+        public boolean mOriginatesFromSwipeModel = false;
 
         /**
          * Create a new suggested word info.
diff --git a/java/src/org/futo/inputmethod/latin/SwipeDecoderDictionary.kt b/java/src/org/futo/inputmethod/latin/SwipeDecoderDictionary.kt
new file mode 100644
index 0000000000..a13e8a40d9
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/SwipeDecoderDictionary.kt
@@ -0,0 +1,531 @@
+package org.futo.inputmethod.latin
+
+import android.content.Context
+import android.util.Log
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import org.futo.inputmethod.keyboard.Key
+import org.futo.inputmethod.keyboard.Keyboard
+import org.futo.inputmethod.keyboard.internal.isAlphabet
+import org.futo.inputmethod.latin.common.ComposedData
+import org.futo.inputmethod.latin.common.InputPointers
+import org.futo.inputmethod.latin.settings.Settings
+import org.futo.inputmethod.latin.settings.SettingsValues
+import org.futo.inputmethod.latin.settings.SettingsValuesForSuggestion
+import org.futo.inputmethod.latin.uix.SettingsKey
+import org.futo.inputmethod.latin.uix.getSetting
+import org.futo.ml.inference.SwipeDecoder
+import java.io.File
+import java.util.Locale
+import kotlin.math.abs
+import kotlin.math.sqrt
+
+private const val ENCODER_ASSET = "futo-swipe/honorable_sturgeon/model_fp32.pte"
+private const val ENGLISH_LM_ASSET = "futo-swipe/hungry_jellyfish/context_lm.pte"
+private const val ENGLISH_LM_VOCAB_ASSET = "futo-swipe/hungry_jellyfish/vocab.txt"
+private const val ENGLISH_DECODER_ASSET = "futo-swipe/magic_macaw/model_fp32.pte"
+private const val SCORING_ASSET = "futo-swipe/scoring.json"
+
+@Serializable
+data class Input(
+    val x: Float,
+    val y: Float,
+    val t: Float
+)
+
+@Serializable
+data class Inputs(val data: List<Input>)
+
+internal fun getKeyXY(key: Key, keyboard: Keyboard): Pair<Float, Float> {
+    var xMid = key.drawX + key.drawWidth/2.0f
+    var yMid = key.y + key.verticalGap/2.0f + key.height/2.0f
+
+    xMid /= keyboard.mBaseWidth
+    yMid *= (1.0f / (keyboard.mBaseHeight - keyboard.mPadding.bottom)) * (4.0f / 3.0f)
+
+    return xMid to yMid
+}
+
+internal fun getKeyYBottom(key: Key, keyboard: Keyboard): Float =
+    (key.y + key.verticalGap + key.height) *
+            ((1.0f / (keyboard.mBaseHeight - keyboard.mPadding.bottom)) * (4.0f / 3.0f))
+
+
+data class LayoutInfoForModel(
+    val letters: String,
+    val xs: List<Float>,
+    val ys: List<Float>,
+    val decoder: String,
+    val lm: String,
+    val sx: Float, val sy: Float,
+    val ox: Float, val oy: Float,
+) {
+    companion object {
+        val DEFAULT = LayoutInfoForModel(
+            letters = "",
+            xs = emptyList(),
+            ys = emptyList(),
+            decoder = "",
+            lm = "",
+            sx = 1.0f, sy = 1.0f,
+            ox = 0.0f, oy = 0.0f
+        )
+
+        @JvmStatic
+        fun buildLayoutInfo(context: Context, keyboard: Keyboard, settingsValues: SettingsValues): LayoutInfoForModel? =
+            (context.getSetting(SwipeSpecialDecoderSetting).let {
+                if(it) SpecialDecoder.matchLayout(keyboard, settingsValues)
+                else null
+            } ?: run {
+                val keys = keyboard.sortedKeys
+                    .filter { settingsValues.isWordCodePoint(it.code) && !Character.isDigit(it.code) }
+                    .sortedBy { it.code }
+                    .distinctBy { it.code } // The engine currently can't handle letters existing multiple times. Sorry custom layouts!
+                val letters = keys.joinToString(separator="") { Character.toString(Character.toLowerCase(it.code)) }
+
+                // Guard against non-alphabet keyboards
+                if(!keyboard.mId.mElement.kind.isAlphabet || letters.length < 6) return@run null
+
+                val positions = keys.map { getKeyXY(it, keyboard) }
+
+                val yScale = 1.0f / (keys.maxOf { getKeyYBottom(it, keyboard) }.coerceAtLeast(1.0f))
+
+                val xs = positions.map { it.first }
+                val ys = positions.map { it.second * yScale }
+
+                return@run LayoutInfoForModel(
+                    letters = letters,
+                    xs = xs, ys = ys,
+                    sx = 1.0f, sy = yScale,
+                    ox = 0.0f, oy = 0.0f,
+                    decoder = "",
+                    lm = SpecialContextLM.match(settingsValues),
+                )
+            }).let {
+                if(!context.getSetting(SwipeLanguageModelSetting)) {
+                    it?.copy(lm="")
+                } else {
+                    it
+                }
+            }
+    }
+}
+
+private class SpecialContextLM private constructor(
+    val language: String,
+    val asset: String
+) {
+    companion object {
+        private val contextLMs = listOf(
+            SpecialContextLM("en", ENGLISH_LM_ASSET)
+        )
+
+        fun match(settingsValues: SettingsValues): String {
+            if(settingsValues.mMultilingualLocales.isNotEmpty()) return ""
+
+            return contextLMs.firstOrNull { it.language == settingsValues.mLocale.language }?.asset ?: ""
+        }
+    }
+}
+
+private class SpecialDecoder private constructor(
+    val asset: String,
+
+    val language: String,
+    val layoutLetters: String,
+
+    // These are normalized such that the lowest value is always 0, and highest value is always 1
+    val layoutXs: List<Float>,
+    val layoutYs: List<Float>,
+
+    val xOffset: Float,
+    val xScale: Float,
+    val yOffset: Float,
+    val yScale: Float
+) {
+    val maxXDeviation = xScale * 0.1
+    val maxYDeviation = yScale * 0.1
+
+    companion object {
+        private val specialDecoders = listOf(
+            SpecialDecoder(
+                asset = ENGLISH_DECODER_ASSET,
+                language = "en",
+                layoutLetters = "abcdefghijklmnopqrstuvwxyz",
+                layoutXs = listOf(0.055555555555555566f, 0.611111111111111f, 0.38888888888888895f, 0.2777777777777778f, 0.22222222222222227f, 0.38888888888888895f, 0.5000000000000001f, 0.611111111111111f, 0.7777777777777778f, 0.7222222222222222f, 0.8333333333333334f, 0.9444444444444445f, 0.8333333333333334f, 0.7222222222222222f, 0.888888888888889f, 1.0f, 0.0f, 0.33333333333333337f, 0.1666666666666667f, 0.44444444444444453f, 0.6666666666666667f, 0.5000000000000001f, 0.11111111111111112f, 0.2777777777777778f, 0.5555555555555556f, 0.1666666666666667f),
+                layoutYs = listOf(0.5f, 1.0f, 1.0f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f),
+                xOffset = 0.05f,
+                xScale = 0.8999999999999999f,
+                yOffset = 0.1667f,
+                yScale = 0.6666000000000001f,
+            )
+        )
+
+        internal fun matchLayout(keyboard: Keyboard, settingsValues: SettingsValues): LayoutInfoForModel? {
+            if(settingsValues.mMultilingualLocales.isNotEmpty()) return null
+
+            val keys = keyboard.sortedKeys.associate { Character.toLowerCase(it.code) to it }
+
+            return specialDecoders.firstNotNullOfOrNull { decoder ->
+                if(keyboard.mId.mLocale.language != decoder.language) return@firstNotNullOfOrNull null
+
+                // In case the layout has multiple repeated instances of the same letter, let's forget
+                // about using a special decoder, since this should never occur in a regular layout.
+                if(decoder.layoutLetters.any { letter -> keyboard.sortedKeys.count { key ->
+                        Character.toLowerCase(key.code) == letter.code
+                } > 1}) return@firstNotNullOfOrNull null
+
+                // Make sure the letters are a perfect match!
+                val expectedLayoutLetters = decoder.layoutLetters.map { it.code }.toSortedSet()
+                val ourLayoutLetters = keys.keys.filter { !Character.isDigit(it) && settingsValues.isWordCodePoint(it) }.toSortedSet()
+                if(expectedLayoutLetters != ourLayoutLetters) return@firstNotNullOfOrNull null
+
+                val relevantKeysN = decoder.layoutLetters.map { keys[it.code] }
+                if(relevantKeysN.any { it == null }) return@firstNotNullOfOrNull null
+                val relevantKeys = relevantKeysN.filterNotNull()
+                val positionsNotNormalized = relevantKeys.map { getKeyXY(it, keyboard) }
+
+                val minX = positionsNotNormalized.minOf { it.first }
+                val minY = positionsNotNormalized.minOf { it.second }
+
+                val maxX = positionsNotNormalized.maxOf { it.first }
+                val maxY = positionsNotNormalized.maxOf { it.second }
+
+                val offsetX = minX
+                val offsetY = minY
+                val scaleX = maxX - offsetX
+                val scaleY = maxY - offsetY
+
+                if(scaleX == 0.0f || scaleY == 0.0f) return@firstNotNullOfOrNull null
+
+                val normX = positionsNotNormalized.map { (it.first - offsetX) / scaleX }
+                val normY = positionsNotNormalized.map { (it.second - offsetY) / scaleY }
+
+                val matches = decoder.layoutXs.zip(normX).all { (a, b) -> abs(b - a) < decoder.maxXDeviation }
+                           && decoder.layoutYs.zip(normY).all { (a, b) -> abs(b - a) < decoder.maxYDeviation }
+
+                if(!matches) return@firstNotNullOfOrNull null
+
+                val dsx = decoder.xScale / scaleX
+                val dsy = decoder.yScale / scaleY
+                val dox = decoder.xOffset - offsetX * dsx
+                val doy = decoder.yOffset - offsetY * dsy
+                LayoutInfoForModel(
+                    decoder = decoder.asset,
+                    letters = decoder.layoutLetters,
+                    xs = decoder.layoutXs.map { it * decoder.xScale + decoder.xOffset },
+                    ys = decoder.layoutYs.map { it * decoder.yScale + decoder.yOffset },
+                    sx = dsx, sy = dsy, ox = dox, oy = doy,
+                    lm = SpecialContextLM.match(settingsValues),
+                )
+            }
+        }
+    }
+}
+
+val LegacySwipeSetting = SettingsKey(booleanPreferencesKey("swipe_mode_legacy"), false)
+val DisplayTop4Setting = SettingsKey(booleanPreferencesKey("swipe_use_top4_suggestions"), true)
+
+val SwipeSpecialDecoderSetting = SettingsKey(booleanPreferencesKey("__experimental_swipe_special_decoder"), true)
+val SwipeLanguageModelSetting = SettingsKey(booleanPreferencesKey("__experimental_swipe_language_model"), true)
+
+class SwipeDecoderDictionary(val context: Context, val locale: Locale) : Dictionary("swipe", locale) {
+    companion object {
+        const val SWIPE_MODEL = ENCODER_ASSET
+
+        var debugLogUntil: Long = 0L
+
+        private var prevKeyboard: Keyboard? = null
+        var appliedLayoutInfo: LayoutInfoForModel = LayoutInfoForModel.DEFAULT
+            private set
+
+        // for debug info
+        val appliedScoring = mutableStateOf(SwipeDecoder.Scoring(0.0f, 0.0f, 0.0f, 0.0f))
+        var appliedTries: LongArray? = null
+        var appliedTrieWeights by mutableStateOf<FloatArray>(FloatArray(0))
+
+        fun metadataFor(pteAsset: String): String
+            = pteAsset.substringBeforeLast('/') + "/metadata.json"
+
+        fun vocabFor(pteAsset: String): String {
+            if(pteAsset.isEmpty()) return ""
+            return pteAsset.substringBeforeLast('/') + "/vocab.txt"
+        }
+
+        @Serializable private data class ModelMetadata(val codename: String)
+        private val CodenameParseJson = Json { ignoreUnknownKeys = true }
+        fun parseMetadataToGetCodename(content: String): String =
+            CodenameParseJson.decodeFromString<ModelMetadata>(content).codename
+
+        private val createdFiles = mutableSetOf<String>()
+        fun getFilePath(context: Context, assetName: String): String {
+            if(assetName.isEmpty()) return ""
+
+            val assets = context.assets
+            val tmpDir = context.codeCacheDir
+            val modelFile = File(tmpDir, assetName)
+
+            if (modelFile.exists()) {
+                if(assetName in createdFiles) return modelFile.absolutePath
+
+                modelFile.delete()
+            }
+            modelFile.parentFile?.mkdirs()
+            assets.open(assetName).use { inputStream ->
+                modelFile.outputStream().use { outputStream ->
+                    inputStream.copyTo(outputStream)
+                }
+            }
+
+            createdFiles.add(assetName)
+
+            if(assetName.endsWith(".pte")) {
+                // Ensure metadata is also present
+                getFilePath(context, metadataFor(assetName))
+            }
+
+            return modelFile.absolutePath
+        }
+
+
+        @JvmStatic
+        fun updateKeyboard(keyboard: Keyboard) {
+            prevKeyboard = keyboard
+        }
+
+        @JvmStatic
+        fun canBeUsed(): Boolean {
+            val settings = Settings.getInstance().current
+            if(!settings.mGestureInputEnabled) {
+                Log.d("SwipeDecoderDictionary", "Inactive because gesture input is disabled.")
+                return false
+            }
+
+            return true
+        }
+    }
+
+    var decoder: SwipeDecoder? = null
+
+    object BeamValues {
+        const val shortBeam = 32
+        const val midBeam = 64
+        const val highBeam = 300
+        const val highestBeam = 300
+    }
+
+    private fun getOrInitDecoder(): SwipeDecoder = decoder ?: run {
+        val swipeModelPath = getFilePath(context, SWIPE_MODEL)
+
+        val decoder = SwipeDecoder(
+            encoderPath = swipeModelPath,
+            beamWidth = BeamValues.highestBeam,
+            useExpansion = false, // ITrie contains expanded entries already
+        )
+
+        this.decoder = decoder
+        applyPendingLayoutInfo()
+
+        return decoder
+    }
+
+    override fun getNextValidCodePoints(composedData: ComposedData?): ArrayList<Int> {
+        return arrayListOf()
+    }
+
+    private fun getPredictions(
+        composedData: ComposedData,
+        ngramContext: NgramContext?
+    ): ArrayList<SuggestedWords.SuggestedWordInfo>? {
+        if(true) return null
+
+        val decoder = getOrInitDecoder()
+        val wordsContext = ngramContext?.fullContext?.split(' ')?.takeLast(10) ?: emptyList()
+        decoder.setContext(wordsContext)
+
+        val results = decoder.predictNext()
+
+        //Log.d("SwipeDecoderDictionary", "getPredictions results=${results}")
+        val list = ArrayList<SuggestedWords.SuggestedWordInfo>(results.size)
+        results.forEach {
+            list.add(SuggestedWords.SuggestedWordInfo(
+                it.word, "", (it.score * 1000.0f + 10000.0f).toInt(), SuggestedWords.SuggestedWordInfo.KIND_CORRECTION, this, 0, 0
+            ).apply {
+                mOriginatesFromSwipeModel = true
+            })
+        }
+
+        return list
+    }
+
+    override fun getSuggestions(
+        composedData: ComposedData?,
+        ngramContext: NgramContext?,
+        proximityInfoHandle: Long,
+        settingsValuesForSuggestion: SettingsValuesForSuggestion?,
+        sessionId: Int,
+        weightForLocale: Float,
+        inOutWeightOfLangModelVsSpatialModel: FloatArray?
+    ): ArrayList<SuggestedWords.SuggestedWordInfo?>? {
+        throw UnsupportedOperationException("Use the non-dictionary method instead")
+    }
+
+    val whitespaceRegex = Regex("\\W+")
+    fun getSuggestions(
+        composedData: ComposedData,
+        ngramContext: NgramContext?,
+        useHighBeam: Boolean,
+        trieWeights: FloatArray
+    ): ArrayList<SuggestedWords.SuggestedWordInfo>? {
+        if(context.getSetting(LegacySwipeSetting) == true) return null
+
+        if(!composedData.mIsBatchMode && composedData.mInputPointers.pointerSize == 0 && composedData.mTypedWord.isEmpty()) {
+            return getPredictions(
+                composedData,
+                ngramContext
+            )
+        }
+
+        if(!composedData.mIsBatchMode) return null
+
+        val pointers = composedData.mInputPointers
+        val segments = pointers.gestureSegments.toList().filter { it.x.length > 0 }
+
+        val count = segments.size
+        //Log.d("BatchInputSwipeDecoderDictionary", "total count is $count out of ${pointers.gestureSegments.size}")
+        if(count == 0) return null
+
+        val keyboardWidth = prevKeyboard?.mOccupiedWidth ?: run {
+            Log.e("SwipeDecoderDictionary", "Could not determine keyboard width!")
+            context.resources.displayMetrics.widthPixels
+        }
+
+        val keyboardHeight = prevKeyboard?.mOccupiedHeight ?: run {
+            Log.e("SwipeDecoderDictionary", "Could not determine keyboard height! Cannot continue.")
+            return null
+        }
+
+        val earliestTime = segments[0].t.get(0).toFloat()
+        val transformSegment = { seg: InputPointers.GestureSegment -> SwipeDecoder.SwipeSeg(
+            x = seg.x.primitiveArray.take(seg.x.length).map {
+                it.toFloat() / keyboardWidth * appliedLayoutInfo.sx + appliedLayoutInfo.ox
+            }.toFloatArray(),
+            y = seg.y.primitiveArray.take(seg.y.length).map {
+                minOf(1.0f, (it.toFloat() / keyboardHeight) * (4.0f / 3.0f) * appliedLayoutInfo.sy + appliedLayoutInfo.oy )
+            }.toFloatArray(),
+            t = seg.t.primitiveArray.take(seg.t.length).map { it - earliestTime }.toFloatArray()
+        ) }
+
+        val left = mutableListOf<SwipeDecoder.SwipeSeg>()
+        val right = mutableListOf<SwipeDecoder.SwipeSeg>()
+
+        if(count == 1) {
+            left.add(transformSegment(segments.first()))
+        } else {
+            left.addAll(segments.filter { it.pointerId == 0 }.map { transformSegment(it) })
+            right.addAll(segments.filter { it.pointerId == 1 }.map { transformSegment(it) })
+        }
+
+        val wordsContext = ngramContext?.fullContext
+            ?.lineSequence()
+            ?.lastOrNull()
+            ?.splitToSequence(whitespaceRegex)
+            ?.filter { it.isNotEmpty() }
+            ?.toList()
+            ?.takeLast(10)
+            ?: emptyList()
+
+        val decoder = getOrInitDecoder()
+        decoder.setContext(wordsContext)
+        appliedTrieWeights = trieWeights
+
+        val isMultiSwipe = (left.size + right.size) > 1
+        val beamWidth = when {
+            isMultiSwipe && !useHighBeam -> BeamValues.midBeam
+            !useHighBeam -> BeamValues.shortBeam
+            else -> BeamValues.highBeam
+        }
+
+        val topK = if(useHighBeam) 4 else 1
+
+        val results = synchronized(BinaryDictionary.sTrieUsageLock) {
+            if(appliedTries?.isEmpty() != false) {
+                Log.e("SwipeDecoderDictionary", "Applied tries are blank! $appliedTries")
+                return null
+            }
+            decoder.recognize(
+                 left.toTypedArray(), right.toTypedArray(),
+                 topK = topK,
+                 beamWidth = beamWidth,
+                 trieWeights = trieWeights
+            )
+        }
+
+        // basically update it at end of swiping
+        if(useHighBeam) appliedScoring.value = decoder.scoring
+
+        if(BuildConfig.DEBUG || System.currentTimeMillis() < debugLogUntil) {
+            Log.d("SwipeDecoderDictionary", "Timing: ${decoder.lastTiming()}")
+            Log.d("SwipeDecoderDictionary", "Left = $left")
+            Log.d("SwipeDecoderDictionary", "Right = $right")
+
+            Log.d("SwipeDecoderDictionary", "Context = $wordsContext")
+            Log.d("SwipeDecoderDictionary", "curr scale is  ${appliedLayoutInfo.sx} ${appliedLayoutInfo.sy}")
+            Log.d("SwipeDecoderDictionary", "curr offset is ${appliedLayoutInfo.ox} ${appliedLayoutInfo.oy}")
+            Log.d("SwipeDecoderDictionary", "outputs = ${results.joinToString { "Word(\"${it.word}\", score=${it.score}, lm=${it.lmScore}, ctc=${it.ctcScore})" }}")
+        }
+
+        val list = ArrayList<SuggestedWords.SuggestedWordInfo>(results.size)
+        results.forEach {
+            list.add(SuggestedWords.SuggestedWordInfo(
+                it.word, "", (it.score * 1000.0f + 10000.0f).toInt(), SuggestedWords.SuggestedWordInfo.KIND_CORRECTION, this, 0, 0
+            ).apply {
+                mOriginatesFromSwipeModel = true
+            })
+        }
+
+        return list
+    }
+
+    data class PendingLayoutInfo(val layout: LayoutInfoForModel, val tries: List<Long>)
+    private var pendingLayoutInfo: PendingLayoutInfo? = null
+    private fun applyPendingLayoutInfo() {
+        decoder?.let { d ->
+            pendingLayoutInfo?.let { pend ->
+                //Log.d("SwipeDecoderDictionary", "Applying layout info: $pend")
+                d.setMode(
+                    letters=pend.layout.letters,
+                    cx=pend.layout.xs.toFloatArray(),
+                    cy=pend.layout.ys.toFloatArray(),
+                    tries=pend.tries.toLongArray(),
+                    decoderPath=getFilePath(context, pend.layout.decoder),
+                    lmModelPath=getFilePath(context, pend.layout.lm),
+                    lmVocabPath=getFilePath(context, vocabFor(pend.layout.lm))
+                )
+                appliedScoring.value = d.scoring
+                appliedLayoutInfo = pend.layout
+                appliedTries = pend.tries.toLongArray()
+            }
+            pendingLayoutInfo = null
+        }
+    }
+
+    fun updateKeyboard(pendingLayoutInfo: PendingLayoutInfo) {
+        this.pendingLayoutInfo = pendingLayoutInfo
+        applyPendingLayoutInfo()
+    }
+
+    override fun isInDictionary(word: String?): Boolean {
+        return false
+    }
+
+    fun invalidateTries() {
+        if(appliedTries?.isEmpty() != false) return
+        decoder?.setMode(tries = emptyList<Long>().toLongArray())
+        appliedTries = null
+    }
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/UserBinaryDictionary.java b/java/src/org/futo/inputmethod/latin/UserBinaryDictionary.java
index 8da8cd12be..6803e8ae89 100644
--- a/java/src/org/futo/inputmethod/latin/UserBinaryDictionary.java
+++ b/java/src/org/futo/inputmethod/latin/UserBinaryDictionary.java
@@ -32,6 +32,7 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Locale;
 
 import javax.annotation.Nullable;
@@ -61,6 +62,20 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
             Words.FREQUENCY,
     };
 
+    private static HashSet<Locale> localesNotNeededToRecreate = new HashSet<>();
+
+    private static boolean userDictionaryNeedsRecreation(Locale locale) {
+        if(localesNotNeededToRecreate.contains(locale)) {
+            return false;
+        }
+        localesNotNeededToRecreate.add(locale);
+        return true;
+    }
+
+    public static void resetUserDictionariesRequiringRecreation() {
+        localesNotNeededToRecreate.clear();
+    }
+
     private static final String NAME = "userunigram";
 
     private ContentObserver mObserver;
@@ -82,6 +97,7 @@ protected UserBinaryDictionary(final Context context, final Locale locale,
         mAlsoUseMoreRestrictiveLocales = alsoUseMoreRestrictiveLocales;
         ContentResolver cres = context.getContentResolver();
 
+        if(UserBinaryDictionary.userDictionaryNeedsRecreation(locale)) setNeedsToRecreate();
         mObserver = new ContentObserver(null) {
             @Override
             public void onChange(final boolean self) {
diff --git a/java/src/org/futo/inputmethod/latin/WordComposer.java b/java/src/org/futo/inputmethod/latin/WordComposer.java
index 32a2b141a5..19aa6b078e 100644
--- a/java/src/org/futo/inputmethod/latin/WordComposer.java
+++ b/java/src/org/futo/inputmethod/latin/WordComposer.java
@@ -63,6 +63,7 @@ public final class WordComposer {
     private SuggestedWordInfo mAutoCorrection;
     private boolean mIsResumed;
     private boolean mIsBatchMode;
+    private boolean mIsAttachedToNonWord;
     // A memory of the last rejected batch mode suggestion, if any. This goes like this: the user
     // gestures a word, is displeased with the results and hits backspace, then gestures again.
     // At the very least we should avoid re-suggesting the same thing, and to do that we memorize
@@ -96,6 +97,7 @@ public WordComposer() {
         mIsBatchMode = false;
         mCursorPositionWithinWord = 0;
         mRejectedBatchModeSuggestion = null;
+        mIsAttachedToNonWord = false;
         refreshTypedWordCache();
     }
 
@@ -134,6 +136,7 @@ public void reset(final boolean alsoResetRejectedBatchSuggestion) {
         mIsResumed = false;
         mIsBatchMode = false;
         mCursorPositionWithinWord = 0;
+        mIsAttachedToNonWord = false;
 
         if(alsoResetRejectedBatchSuggestion) mRejectedBatchModeSuggestion = null;
         refreshTypedWordCache();
@@ -235,6 +238,14 @@ public boolean isCursorFrontOrMiddleOfComposingWord() {
         return mCursorPositionWithinWord != mCodePointSize;
     }
 
+    public boolean isAttachedToNonWord() {
+        return mIsAttachedToNonWord;
+    }
+
+    public void markAttachedToNonWord() {
+        mIsAttachedToNonWord = true;
+    }
+
     /**
      * When the cursor is moved by the user, we need to update its position.
      * If it falls inside the currently composing word, we don't reset the composition, and
diff --git a/java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java b/java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java
index d432e260e8..2a3d112f1f 100644
--- a/java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/org/futo/inputmethod/latin/inputlogic/InputLogic.java
@@ -16,12 +16,9 @@
 
 package org.futo.inputmethod.latin.inputlogic;
 
-import android.graphics.Color;
 import android.os.SystemClock;
 import android.text.SpannableString;
-import android.text.Spanned;
 import android.text.TextUtils;
-import android.text.style.BackgroundColorSpan;
 import android.text.style.SuggestionSpan;
 import android.util.Log;
 import android.view.KeyCharacterMap;
@@ -37,6 +34,7 @@
 import org.futo.inputmethod.event.InputTransaction;
 import org.futo.inputmethod.keyboard.Keyboard;
 import org.futo.inputmethod.keyboard.KeyboardSwitcher;
+import org.futo.inputmethod.latin.BinaryDictionary;
 import org.futo.inputmethod.latin.DictionaryFacilitator;
 import org.futo.inputmethod.latin.LastComposedWord;
 import org.futo.inputmethod.latin.NgramContext;
@@ -62,11 +60,14 @@
 import org.futo.inputmethod.latin.utils.TextRange;
 
 import java.text.BreakIterator;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nonnull;
 
@@ -103,6 +104,8 @@ public final class InputLogic {
     private long mLastKeyTime;
     public final TreeSet<Long> mCurrentlyPressedHardwareKeys = new TreeSet<>();
 
+    final ArrayDeque<Event> mLastEvents = new ArrayDeque<>();
+
     // Keeps track of most recently inserted text (multi-character key) for reverting
     private String mEnteredText;
 
@@ -165,6 +168,7 @@ public void startInput(final String combiningSpec, final SettingsValues settings
         mRecapitalizeStatus.disable(); // Do not perform recapitalize until the cursor is moved once
         mCurrentlyPressedHardwareKeys.clear();
         mSuggestedWords = SuggestedWords.getEmptyInstance();
+        mLastEvents.clear();
 
         final EditorInfo ei = getCurrentInputEditorInfo();
         if(ei != null && !mConnection.resetCachesUponCursorMoveAndReturnSuccess(
@@ -231,6 +235,11 @@ public void onOrientationChange(final SettingsValues settingsValues) {
      * Clean up the input logic after input is finished.
      */
     public void finishInput() {
+        rememberCommittedEmail();
+        resetInput();
+    }
+
+    private void resetInput() {
         if (mWordComposer.isComposingWord()) {
             mConnection.finishComposingText();
             StatsUtils.onWordCommitUserTyped(
@@ -543,6 +552,15 @@ public InputTransaction onCodeInput(final SettingsValues settingsValues,
             final int currentKeyboardScriptId) {
         mWordBeingCorrectedByCursor = null;
 
+        if(settingsValues.needsToLookupSuggestions()) {
+            if (mLastEvents.size() >= 8) mLastEvents.removeFirst();
+            if(event.mKeyCode == Constants.CODE_DELETE) {
+                mLastEvents.pollLast();
+            } else {
+                mLastEvents.addLast(event);
+            }
+        }
+
         if(mWordComposer.isComposingWord() && mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
             // TODO: Double check this isn't causing any new regressions. I believe this is also redundant
             //  with a lot of subsequent similar checks scattered in various handleXyz functions
@@ -872,7 +890,8 @@ private void handleFunctionalEvent(final Event event, final InputTransaction inp
                 // Handled in KeyboardState
                 break;
             default:
-                throw new RuntimeException("Unknown key code : " + event.mKeyCode);
+                BugViewerKt.throwIfDebug(new RuntimeException("Unknown key code : " + event.mKeyCode));
+                return;
         }
     }
 
@@ -952,6 +971,13 @@ private void handleNonSpecialCharacterEvent(final Event event,
             return;
         }
 
+        if(codePoint == Constants.CODE_ENTER
+                && inputTransaction.mSettingsValues.mInputAttributes.mSendKeyEventsMode
+        ) {
+            sendDownUpKeyEvent(KeyEvent.KEYCODE_ENTER, 0);
+            return;
+        }
+
         if (inputTransaction.mSettingsValues.isWordSeparator(codePoint)
                 || Character.getType(codePoint) == Character.OTHER_SYMBOL) {
             handleSeparatorEvent(event, inputTransaction);
@@ -1022,7 +1048,7 @@ private void handleNonSeparatorEvent(final Event event, final SettingsValues set
         // keyboard UI slow and non-responsive.
         // TODO: Cache the text after the cursor so we don't need to go to the InputConnection
         // each time. We are already doing this for getTextBeforeCursor().
-                //&& (!settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                //&& (!settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
                 //        || !mConnection.isCursorTouchingWord(settingsValues.mSpacingAndPunctuations,
                 //                InputLogic.COMPOSITION_TEXT_AFTER && !mConnection.hasSlowInputConnection() /* checkTextAfter */)))
         ){
@@ -1036,6 +1062,10 @@ private void handleNonSeparatorEvent(final Event event, final SettingsValues set
             // it entirely and resume suggestions on the previous word, we'd like to still
             // have touch coordinates for it.
             resetComposingState(false /* alsoResetLastComposedWord */);
+            // If we are touching a number, mark it as attached to a non-word
+            if(mConnection.isCursorTouchingNumber()) {
+                mWordComposer.markAttachedToNonWord();
+            }
         }
         if (isComposingWord) {
             mWordComposer.applyProcessedEvent(event);
@@ -1080,7 +1110,7 @@ private void handleSeparatorEvent(final Event event, final InputTransaction inpu
         final boolean wasComposingWord = mWordComposer.isComposingWord();
         // We avoid sending spaces in languages without spaces if we were composing.
         final boolean shouldAvoidSendingCode = Constants.CODE_SPACE == codePoint
-                && !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                && !settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
                 && wasComposingWord;
         if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
             // If we are in the middle of a recorrection, we need to commit the recorrection
@@ -1229,6 +1259,42 @@ private void handleSeparatorEvent(final Event event, final InputTransaction inpu
             codeShouldBeFollowedBySpace = codeShouldBeFollowedBySpace && !fieldEmptyBeforeText;
 
             if(autoInsertSpaces && codeShouldBeFollowedBySpace) {
+                // Workaround for i.e., e.g., which are common enough in English to warrant a specific
+                // exception in the automatic spacing logic
+                if(codePoint == Constants.CODE_PERIOD && canInsertAutoSpace(settingsValues)
+                        && settingsValues.mLocale.getLanguage() == "en" && mLastEvents.size() >= 4) {
+
+                    final Iterator<Event> it = mLastEvents.descendingIterator();
+                    int c3 = it.next().mCodePoint;
+                    int c2 = it.next().mCodePoint;
+                    int c1 = it.next().mCodePoint;
+                    int c0 = it.next().mCodePoint;
+
+                    if(settingsValues.mAutoCap) {
+                        c0 = Character.toLowerCase(c0);
+                        c2 = Character.toLowerCase(c2);
+                    }
+
+                    String regex = null;
+                    String replacement = null;
+
+                    if (c0 == 'e' && c1 == '.' && c2 == 'g' && c3 == '.') {
+                        regex = "\\W[Ee]\\. [Gg]\\.";
+                        replacement = "e.g.";
+                    } else if (c0 == 'i' && c1 == '.' && c2 == 'e' && c3 == '.') {
+                        regex = "\\W[Ii]\\. [Ee]\\.";
+                        replacement = "i.e.";
+                    }
+
+                    if (regex != null) {
+                        final CharSequence textBeforeCursor = mConnection.getTextBeforeCursor(6, 0);
+                        if (textBeforeCursor != null && Pattern.matches(regex, textBeforeCursor.toString())) {
+                            mConnection.deleteTextBeforeCursor(5);
+                            mConnection.commitText(replacement, 1);
+                        }
+                    }
+                }
+
                 insertOrSetPhantomSpace(settingsValues);
 
                 if(inputTransaction.didAutoCorrect()) {
@@ -1274,7 +1340,7 @@ private void handleBackspaceEvent(final Event event, final InputTransaction inpu
         }
 
         final boolean deleteWholeWords = event.isKeyRepeat()
-                && inputTransaction.mSettingsValues.mBackspaceMode == Settings.BACKSPACE_MODE_WORDS;
+                && inputTransaction.mSettingsValues.mBackspaceModeHold == Settings.BACKSPACE_MODE_WORDS;
 
         if (mWordComposer.isComposingWord() && !mConnection.hasSelection()) {
             if (mWordComposer.isBatchMode()) {
@@ -1318,7 +1384,7 @@ private void handleBackspaceEvent(final Event event, final InputTransaction inpu
                 // (non-revert) backspace handling.
                 if (inputTransaction.mSettingsValues.isSuggestionsEnabledPerUserSettings()
                         && inputTransaction.mSettingsValues.mSpacingAndPunctuations
-                                .mCurrentLanguageHasSpaces
+                                .currentLanguageHasSpaces
                         && !mConnection.isCursorFollowedByWordCharacter(
                                 inputTransaction.mSettingsValues.mSpacingAndPunctuations)) {
                     final int spaceState = mSpaceState; // Need to preserve space state, which restart resets
@@ -1496,7 +1562,7 @@ private void handleBackspaceEvent(final Event event, final InputTransaction inpu
                 mSuggestionStripViewAccessor.setNeutralSuggestionStrip();
             } else if (inputTransaction.mSettingsValues.isSuggestionsEnabledPerUserSettings()
                     && inputTransaction.mSettingsValues.mSpacingAndPunctuations
-                            .mCurrentLanguageHasSpaces
+                            .currentLanguageHasSpaces
                     && (
                             !mConnection.isCursorFollowedByWordCharacter(inputTransaction.mSettingsValues.mSpacingAndPunctuations)
                                     || nowHasWordCharacter
@@ -1511,9 +1577,9 @@ private void handleBackspaceEvent(final Event event, final InputTransaction inpu
     String getWordAtCursor(final SettingsValues settingsValues, final int currentKeyboardScriptId) {
         if (!mConnection.hasSelection()
                 && settingsValues.isSuggestionsEnabledPerUserSettings()
-                && settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) {
+                && settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces) {
             final TextRange range = mConnection.getWordRangeAtCursor(
-                    settingsValues.mSpacingAndPunctuations,
+                    settingsValues,
                     currentKeyboardScriptId, true);
             if (range != null) {
                 return range.mWord.toString();
@@ -1763,7 +1829,7 @@ private boolean tryPerformDoubleSpacePeriod(final Event event,
             cancelDoubleSpacePeriodCountdown();
             mConnection.deleteTextBeforeCursor(1);
             final String textToInsert = inputTransaction.mSettingsValues.mSpacingAndPunctuations
-                    .mSentenceSeparatorAndSpace;
+                    .sentenceSeparatorAndSpace;
             mConnection.commitText(textToInsert, 1);
             inputTransaction.requireShiftUpdate(InputTransaction.SHIFT_UPDATE_NOW);
             inputTransaction.setRequiresUpdateSuggestions();
@@ -1822,7 +1888,7 @@ private void performRecapitalization(final SettingsValues settingsValues) {
             if (TextUtils.isEmpty(selectedText)) return; // Race condition with the input connection
             mRecapitalizeStatus.start(selectionStart, selectionEnd, selectedText.toString(),
                     settingsValues.mLocale,
-                    settingsValues.mSpacingAndPunctuations.mSortedWordSeparators);
+                    settingsValues.mSpacingAndPunctuations.sortedWordSeparators);
             // We trim leading and trailing whitespace.
             mRecapitalizeStatus.trim();
         }
@@ -1880,7 +1946,7 @@ public boolean resetComposingWord(
         if (settingsValues.isBrokenByRecorrection()
                 // Recorrection is not supported in languages without spaces because we don't know
                 // how to segment them yet.
-                || !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                || !settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
                 // If we are currently in a batch input, we must not resume suggestions, or the result
                 // of the batch input will replace the new composition. This may happen in the corner case
                 // that the app moves the cursor on its own accord during a batch input.
@@ -1920,7 +1986,7 @@ public boolean resetComposingWord(
         final int currentKeyboardScriptId = mImeHelper.getCurrentKeyboardScriptId();
 
         final TextRange range = mConnection.getWordRangeAtCursor(
-                settingsValues.mSpacingAndPunctuations, currentKeyboardScriptId, useAfter);
+                settingsValues, currentKeyboardScriptId, useAfter);
 
         if (null == range) {
             return false; // Happens if we don't have an input connection at all
@@ -1985,7 +2051,7 @@ public void restartSuggestionsOnWordTouchedByCursor(final SettingsValues setting
         if (settingsValues.isBrokenByRecorrection()
         // Recorrection is not supported in languages without spaces because we don't know
         // how to segment them yet.
-                || !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                || !settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
         // If no suggestions are requested, don't try restarting suggestions.
                 || !settingsValues.needsToLookupSuggestions()
         // If we are currently in a batch input, we must not resume suggestions, or the result
@@ -2095,7 +2161,7 @@ private void revertCommit(final InputTransaction inputTransaction,
             );
         }
 
-        if (inputTransaction.mSettingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) {
+        if (inputTransaction.mSettingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces) {
             mConnection.commitText(textToCommit, 1);
             if (usePhantomSpace) {
                 if(settingsValues.mAltSpacesMode != Settings.SPACES_MODE_NONE) mSpaceState = SpaceState.PHANTOM;
@@ -2195,7 +2261,7 @@ private EditorInfo getCurrentInputEditorInfo() {
      */
     public NgramContext getNgramContextFromNthPreviousWordForSuggestion(
             final SpacingAndPunctuations spacingAndPunctuations, final int nthPreviousWord) {
-        if (spacingAndPunctuations.mCurrentLanguageHasSpaces) {
+        if (spacingAndPunctuations.currentLanguageHasSpaces) {
             // If we are typing in a language with spaces we can just look up the previous
             // word information from textview.
             return mConnection.getNgramContextFromNthPreviousWord(
@@ -2225,10 +2291,25 @@ private static boolean isResumableWord(final SettingsValues settings, final Stri
                 && Constants.CODE_DASH != firstCodePoint;
     }
 
+    private void rememberCommittedEmail() {
+        if(!Settings.getInstance().getCurrent().mInputAttributes.mIsEmailField) return;
+        CharSequence cs = mConnection.getTextBeforeCursor(BinaryDictionary.DICTIONARY_MAX_WORD_LENGTH, 0);
+        if(cs == null) return;
+        if(cs.length() >= BinaryDictionary.DICTIONARY_MAX_WORD_LENGTH) return;
+
+        String text = cs.toString();
+        if(text.indexOf(' ') != -1) return;
+
+        if(text.indexOf('@') == -1 || text.indexOf('.') == -1) return;
+
+        mDictionaryFacilitator.onEmailTyped(text);
+    }
+
     /**
      * @param actionId the action to perform
      */
     private void performEditorAction(final int actionId) {
+        rememberCommittedEmail();
         mConnection.performEditorAction(actionId);
     }
 
@@ -2373,6 +2454,10 @@ private void sendKeyCodePoint(final SettingsValues settingsValues, final int cod
         // We try sending keyEvent first and fallback to commitText. This might cause double numeric
         // inputs in InputConnections that return false but commit text anyway
         if (codePoint >= '0' && codePoint <= '9') {
+            // Send any pending changes, otherwise the order of input will be reversed. Notably,
+            // the automatic space would be sent after the number, rather than before, as in:
+            // https://github.com/futo-org/android-keyboard/issues/1795
+            mConnection.send();
             if(sendDownUpKeyEvent(codePoint - '0' + KeyEvent.KEYCODE_0, 0)) {
                 return;
             }
@@ -2400,7 +2485,7 @@ private void sendKeyCodePoint(final SettingsValues settingsValues, final int cod
      */
     private void insertAutomaticSpaceIfOptionsAndTextAllow(final SettingsValues settingsValues) {
         if (settingsValues.shouldInsertSpacesAutomatically()
-                && settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                && settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
                 && !mConnection.textBeforeCursorLooksLikeURL()) {
             sendKeyCodePoint(settingsValues, Constants.CODE_SPACE);
         }
@@ -2409,7 +2494,7 @@ private void insertAutomaticSpaceIfOptionsAndTextAllow(final SettingsValues sett
     private boolean canInsertAutoSpace(final SettingsValues settingsValues) {
         return (settingsValues.mAltSpacesMode >= Settings.SPACES_MODE_SUGGESTIONS)
                 && settingsValues.shouldInsertSpacesAutomatically()
-                && settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
+                && settingsValues.mSpacingAndPunctuations.currentLanguageHasSpaces
                 && !settingsValues.mInputAttributes.mIsUriField
                 && !mConnection.textBeforeCursorLooksLikeURL();
     }
@@ -2444,6 +2529,7 @@ public void onUpdateTailBatchInputCompleted(final SettingsValues settingsValues,
             return;
         }
         mConnection.beginBatchEdit();
+        mConnection.finishComposingText();
         if (SpaceState.PHANTOM == mSpaceState) {
             if(!mConnection.spacePrecedesComposingText())
                 insertAutomaticSpaceIfOptionsAndTextAllow(settingsValues);
@@ -2709,8 +2795,9 @@ private void cursorStep(int steps, boolean stepOverWords, boolean select) {
         }
 
         int cursor = isRightSidePointer ? mConnection.getExpectedSelectionStart() : mConnection.getExpectedSelectionEnd();
-        int start = mConnection.getExpectedSelectionStart();
-        int end = mConnection.getExpectedSelectionEnd();
+        final int initialStart = mConnection.getExpectedSelectionStart();
+        final int initialEnd = mConnection.getExpectedSelectionEnd();
+        int start = initialStart, end = initialEnd;
         if(isRightSidePointer) {
             start += steps;
             cursor += steps;
@@ -2727,6 +2814,10 @@ private void cursorStep(int steps, boolean stepOverWords, boolean select) {
         start = Math.max(0, start);
         end = Math.max(0, end);
 
+        if(start != initialStart || end != initialEnd) {
+            mIme.cursorStepped(steps, stepOverWords);
+        }
+
         mConnection.setSelection(start, end);
     }
 
@@ -2739,7 +2830,7 @@ public void disableRecapitalization() {
 
 
     private void cursorLeftInternal(int steps, boolean stepOverWords, boolean select) {
-        finishInput();
+        resetInput();
 
         if(!mConnection.hasSelection()) isRightSidePointer = true;
 
@@ -2747,7 +2838,7 @@ private void cursorLeftInternal(int steps, boolean stepOverWords, boolean select
     }
 
     private void cursorRightInternal(int steps, boolean stepOverWords, boolean select) {
-        finishInput();
+        resetInput();
 
         if(!mConnection.hasSelection()) isRightSidePointer = false;
 
diff --git a/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt b/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
index 3df8204a5c..4013e67239 100644
--- a/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
+++ b/java/src/org/futo/inputmethod/latin/settings/LongPressKeySettings.kt
@@ -1,6 +1,7 @@
 package org.futo.inputmethod.latin.settings
 
 import android.content.Context
+import android.content.res.Resources
 import androidx.datastore.preferences.core.stringPreferencesKey
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.uix.KeyHintsSetting
@@ -15,22 +16,22 @@ enum class LongPressKey {
     MiscLetters
 }
 
-fun LongPressKey.name(context: Context): String {
+fun LongPressKey.name(resources: Resources): String {
     return when(this) {
-        LongPressKey.Numbers -> context.getString(R.string.morekey_settings_kind_numbers)
-        LongPressKey.LanguageKeys -> context.getString(R.string.morekey_settings_kind_language_keys)
-        LongPressKey.Symbols -> context.getString(R.string.morekey_settings_kind_symbols)
-        LongPressKey.QuickActions -> context.getString(R.string.morekey_settings_kind_actions)
-        LongPressKey.MiscLetters -> context.getString(R.string.morekey_settings_kind_misc_common)
+        LongPressKey.Numbers -> resources.getString(R.string.morekey_settings_kind_numbers)
+        LongPressKey.LanguageKeys -> resources.getString(R.string.morekey_settings_kind_language_keys)
+        LongPressKey.Symbols -> resources.getString(R.string.morekey_settings_kind_symbols)
+        LongPressKey.QuickActions -> resources.getString(R.string.morekey_settings_kind_actions)
+        LongPressKey.MiscLetters -> resources.getString(R.string.morekey_settings_kind_misc_common)
     }
 }
-fun LongPressKey.description(context: Context): String {
+fun LongPressKey.description(resources: Resources): String {
     return when(this) {
-        LongPressKey.Numbers -> context.getString(R.string.morekey_settings_kind_numbers_example)
-        LongPressKey.LanguageKeys -> context.getString(R.string.morekey_settings_kind_language_keys_example)
-        LongPressKey.Symbols -> context.getString(R.string.morekey_settings_kind_symbols_example)
-        LongPressKey.QuickActions -> context.getString(R.string.morekey_settings_kind_actions_example)
-        LongPressKey.MiscLetters -> context.getString(R.string.morekey_settings_kind_misc_common_example)
+        LongPressKey.Numbers -> resources.getString(R.string.morekey_settings_kind_numbers_example)
+        LongPressKey.LanguageKeys -> resources.getString(R.string.morekey_settings_kind_language_keys_example)
+        LongPressKey.Symbols -> resources.getString(R.string.morekey_settings_kind_symbols_example)
+        LongPressKey.QuickActions -> resources.getString(R.string.morekey_settings_kind_actions_example)
+        LongPressKey.MiscLetters -> resources.getString(R.string.morekey_settings_kind_misc_common_example)
     }
 }
 
diff --git a/java/src/org/futo/inputmethod/latin/settings/Settings.java b/java/src/org/futo/inputmethod/latin/settings/Settings.java
index 61ac200881..6d72d86b5c 100644
--- a/java/src/org/futo/inputmethod/latin/settings/Settings.java
+++ b/java/src/org/futo/inputmethod/latin/settings/Settings.java
@@ -122,14 +122,22 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_BACKSPACE_UNDO_AUTOCORRECT =
             "pref_backspace_undo_autocorrect";
 
-    public static final String PREF_SPACEBAR_MODE = "pref_spacebar_mode";
-    public static final int SPACEBAR_MODE_SWIPE_CURSOR = 0; // Long-Press switches language, swipe moves cursor
-    public static final int SPACEBAR_MODE_SWIPE_LANGUAGE = 1; // Swipe switches language, long-press+drag moves cursor
-    public static final int SPACEBAR_MODE_SWIPE_CURSOR_ONLY = 2; // Swipe and long-press+drag moves cursor
-
+    public static final String PREF_SPACEBAR_MODE_LEGACY = "pref_spacebar_mode";
+    public static final int SPACEBAR_MODE_SWIPE_CURSOR_LEGACY = 0; // Long-Press switches language, swipe moves cursor
+    public static final int SPACEBAR_MODE_SWIPE_LANGUAGE_LEGACY = 1; // Swipe switches language, long-press+drag moves cursor
+    public static final int SPACEBAR_MODE_SWIPE_CURSOR_ONLY_LEGACY = 2; // Swipe and long-press+drag moves cursor
+
+    public static final String PREF_SPACEBAR_HOLD_MODE = "pref_spacebar_hold_mode";
+    public static final String PREF_SPACEBAR_SWIPE_MODE = "pref_spacebar_swipe_mode";
+    public static final int SPACEBAR_MODE_OFF = 0;
+    public static final int SPACEBAR_MODE_CURSOR = 1;
+    public static final int SPACEBAR_MODE_LANGUAGE = 2;
+
+    public static final String PREF_BACKSPACE_MODE_HOLD = "pref_backspace_mode_hold";
     public static final String PREF_BACKSPACE_MODE = "pref_backspace_mode";
     public static final int BACKSPACE_MODE_CHARACTERS = 0; // Long-press backspace and swipe backspace removes just characters
     public static final int BACKSPACE_MODE_WORDS = 1; // Long-press backspace and swipe backspace removes entire words
+    public static final int BACKSPACE_MODE_OFF = 2;
 
     public static final String PREF_ALT_SPACES_MODE = "pref_alt_spaces";
     public static final int SPACES_MODE_NONE = -1; // No phantom spaces, no antiphantom
diff --git a/java/src/org/futo/inputmethod/latin/settings/SettingsValues.java b/java/src/org/futo/inputmethod/latin/settings/SettingsValues.java
index 8c25837adb..2676f9b1a9 100644
--- a/java/src/org/futo/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/org/futo/inputmethod/latin/settings/SettingsValues.java
@@ -29,6 +29,7 @@
 import org.futo.inputmethod.compat.AppWorkaroundsUtils;
 import org.futo.inputmethod.latin.InputAttributes;
 import org.futo.inputmethod.latin.R;
+import org.futo.inputmethod.latin.Subtypes;
 import org.futo.inputmethod.latin.uix.actions.ActionRegistry;
 import org.futo.inputmethod.latin.uix.actions.RegistryKt;
 import org.futo.inputmethod.latin.utils.AsyncResultHolder;
@@ -37,6 +38,7 @@
 import org.futo.inputmethod.latin.utils.TargetPackageInfoGetterTask;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 import javax.annotation.Nonnull;
@@ -102,11 +104,15 @@ public class SettingsValues {
 
     public final boolean mBackspaceDeletesInsertedText;
     public final boolean mBackspaceUndoesAutocorrect;
-    public final int mSpacebarMode;
+    public final int mSpacebarSwipeMode;
+    public final int mSpacebarHoldMode;
     public final int mBackspaceMode;
+    public final int mBackspaceModeHold;
     public final int mNumberRowMode;
     public final int mAltSpacesMode;
 
+    public final List<Locale> mMultilingualLocales;
+
     // From the input box
     @Nonnull
     public final InputAttributes mInputAttributes;
@@ -146,7 +152,7 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
         }
         mIsRTL = TextUtils.getLayoutDirectionFromLocale(mLocale) == View.LAYOUT_DIRECTION_RTL;
         // Get the resources
-        mSpacingAndPunctuations = new SpacingAndPunctuations(res);
+        mSpacingAndPunctuations = SpacingAndPunctuations.create(context, res.getConfiguration().locale);
 
         // Store the input attributes
         mInputAttributes = inputAttributes;
@@ -195,12 +201,18 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
         mBackspaceDeletesInsertedText = prefs.getBoolean(Settings.PREF_BACKSPACE_DELETE_INSERTED_TEXT, true);
         mBackspaceUndoesAutocorrect = prefs.getBoolean(Settings.PREF_BACKSPACE_UNDO_AUTOCORRECT, true);
 
-        mSpacebarMode = prefs.getInt(Settings.PREF_SPACEBAR_MODE, Settings.SPACEBAR_MODE_SWIPE_CURSOR);
+        int legacySpacebarMode = prefs.getInt(Settings.PREF_SPACEBAR_MODE_LEGACY, Settings.SPACEBAR_MODE_SWIPE_CURSOR_LEGACY);
+        mSpacebarSwipeMode = prefs.getInt(Settings.PREF_SPACEBAR_SWIPE_MODE,
+                legacySpacebarMode == Settings.SPACEBAR_MODE_SWIPE_LANGUAGE_LEGACY ? Settings.SPACEBAR_MODE_LANGUAGE : Settings.SPACEBAR_MODE_CURSOR);
+        mSpacebarHoldMode = prefs.getInt(Settings.PREF_SPACEBAR_HOLD_MODE,
+                legacySpacebarMode == Settings.SPACEBAR_MODE_SWIPE_CURSOR_LEGACY ? Settings.SPACEBAR_MODE_LANGUAGE : Settings.SPACEBAR_MODE_CURSOR);
+
         mBackspaceMode = prefs.getInt(Settings.PREF_BACKSPACE_MODE, Settings.BACKSPACE_MODE_CHARACTERS);
+        mBackspaceModeHold = prefs.getInt(Settings.PREF_BACKSPACE_MODE_HOLD, mBackspaceMode);
         mNumberRowMode = mIsNumberRowEnabledByUser ?
                 prefs.getInt(Settings.PREF_NUMBER_ROW_MODE, Settings.NUMBER_ROW_MODE_DEFAULT)
                 : Settings.NUMBER_ROW_MODE_DEFAULT;
-        mAltSpacesMode = prefs.getInt(Settings.PREF_ALT_SPACES_MODE, Settings.DEFAULT_ALT_SPACES_MODE);
+        mAltSpacesMode = inputAttributes.mIsEmailField ? Settings.SPACES_MODE_NONE : prefs.getInt(Settings.PREF_ALT_SPACES_MODE, Settings.DEFAULT_ALT_SPACES_MODE);
 
         mShouldShowLxxSuggestionUi = Settings.SHOULD_SHOW_LXX_SUGGESTION_UI
                 && prefs.getBoolean(DebugSettings.PREF_SHOULD_SHOW_LXX_SUGGESTION_UI, true);
@@ -254,6 +266,9 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
         mKeyPreviewDismissEndYScale = Settings.readKeyPreviewAnimationScale(
                 prefs, DebugSettings.PREF_KEY_PREVIEW_DISMISS_END_Y_SCALE,
                 defaultKeyPreviewDismissEndScale);
+
+        mMultilingualLocales = Subtypes.INSTANCE.getMultilingualBucket(context, mLocale);
+
         mDisplayOrientation = res.getConfiguration().orientation;
         mAppWorkarounds = new AsyncResultHolder<>("AppWorkarounds");
         final PackageInfo packageInfo = TargetPackageInfoGetterTask.getCachedPackageInfo(
@@ -288,14 +303,27 @@ public boolean isPersonalizationEnabled() {
     }
 
     public boolean isWordSeparator(final int code) {
+        if(mInputAttributes.mIsEmailField) {
+            if(code == '.') return false;
+            if(code == '@') return true;
+        }
         return mSpacingAndPunctuations.isWordSeparator(code);
     }
 
     public boolean isWordConnector(final int code) {
+        if(mInputAttributes.mIsEmailField) {
+            if(code == '.') return true;
+            if(code == '@') return false;
+        }
         return mSpacingAndPunctuations.isWordConnector(code);
     }
 
     public boolean isWordCodePoint(final int code) {
+        if(mInputAttributes.mIsEmailField) {
+            if(code == '.') return true;
+            if(code == '@') return false;
+        }
+
         if(ScriptUtils2.isLetterDefinitelyIncompatibleForLocale(code, mLocale)) return false;
 
         int type = Character.getType(code);
@@ -546,8 +574,6 @@ public String dump() {
         sb.append("" + mBackspaceDeletesInsertedText);
         sb.append("\n   mBackspaceUndoesAutocorrect = ");
         sb.append("" + mBackspaceUndoesAutocorrect);
-        sb.append("\n   mSpacebarMode = ");
-        sb.append("" + mSpacebarMode);
         sb.append("\n   mBackspaceMode = ");
         sb.append("" + mBackspaceMode);
         sb.append("\n   mNumberRowMode = ");
diff --git a/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.java b/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.java
deleted file mode 100644
index af4050cf16..0000000000
--- a/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.futo.inputmethod.latin.settings;
-
-import android.content.res.Resources;
-
-import org.futo.inputmethod.annotations.UsedForTesting;
-import org.futo.inputmethod.keyboard.internal.MoreKeySpec;
-import org.futo.inputmethod.latin.PunctuationSuggestions;
-import org.futo.inputmethod.latin.R;
-import org.futo.inputmethod.latin.common.Constants;
-import org.futo.inputmethod.latin.common.StringUtils;
-
-import java.util.Arrays;
-import java.util.Locale;
-
-public final class SpacingAndPunctuations {
-    private final int[] mSortedSymbolsPrecededBySpace;
-    private final int[] mSortedSymbolsOptionallyPrecededBySpace;
-    private final int[] mSortedSymbolsFollowedBySpace;
-    private final int[] mSortedSymbolsFollowedBySpaceIffPrecededBySpace;
-    private final int[] mSortedSymbolsClusteringTogether;
-    private final int[] mSortedWordConnectors;
-    public final int[] mSortedWordSeparators;
-    public final PunctuationSuggestions mSuggestPuncList;
-    private final int mSentenceSeparator;
-    private final int mAbbreviationMarker;
-    private final int[] mSortedSentenceTerminators;
-    public final String mSentenceSeparatorAndSpace;
-    public final boolean mCurrentLanguageHasSpaces;
-    public final boolean mUsesAmericanTypography;
-    public final boolean mUsesGermanRules;
-
-    public SpacingAndPunctuations(final Resources res) {
-        // To be able to binary search the code point. See {@link #isUsuallyPrecededBySpace(int)}.
-        mSortedSymbolsPrecededBySpace = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_preceded_by_space));
-        // To be able to binary search the code point. See {@link #isUsuallyFollowedBySpace(int)}.
-        mSortedSymbolsFollowedBySpace = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_followed_by_space));
-        mSortedSymbolsOptionallyPrecededBySpace = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_optionally_preceded_by_space));
-        mSortedSymbolsFollowedBySpaceIffPrecededBySpace = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_followed_by_space_iff_preceded_by_space));
-        mSortedSymbolsClusteringTogether = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_clustering_together));
-        // To be able to binary search the code point. See {@link #isWordConnector(int)}.
-        mSortedWordConnectors = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_word_connectors));
-        mSortedWordSeparators = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_word_separators));
-        mSortedSentenceTerminators = StringUtils.toSortedCodePointArray(
-                res.getString(R.string.symbols_sentence_terminators));
-        mSentenceSeparator = res.getInteger(R.integer.sentence_separator);
-        mAbbreviationMarker = res.getInteger(R.integer.abbreviation_marker);
-        mSentenceSeparatorAndSpace = new String(new int[] {
-                mSentenceSeparator, Constants.CODE_SPACE }, 0, 2);
-        mCurrentLanguageHasSpaces = res.getBoolean(R.bool.current_language_has_spaces);
-        final Locale locale = res.getConfiguration().locale;
-        // Heuristic: we use American Typography rules because it's the most common rules for all
-        // English variants. German rules (not "German typography") also have small gotchas.
-        mUsesAmericanTypography = Locale.ENGLISH.getLanguage().equals(locale.getLanguage());
-        mUsesGermanRules = Locale.GERMAN.getLanguage().equals(locale.getLanguage());
-        final String[] suggestPuncsSpec = MoreKeySpec.splitKeySpecs(
-                res.getString(R.string.suggested_punctuations));
-        mSuggestPuncList = PunctuationSuggestions.newPunctuationSuggestions(suggestPuncsSpec);
-    }
-
-    @UsedForTesting
-    public SpacingAndPunctuations(final SpacingAndPunctuations model,
-            final int[] overrideSortedWordSeparators) {
-        mSortedSymbolsPrecededBySpace = model.mSortedSymbolsPrecededBySpace;
-        mSortedSymbolsFollowedBySpace = model.mSortedSymbolsFollowedBySpace;
-        mSortedSymbolsOptionallyPrecededBySpace = model.mSortedSymbolsOptionallyPrecededBySpace;
-        mSortedSymbolsFollowedBySpaceIffPrecededBySpace = model.mSortedSymbolsFollowedBySpaceIffPrecededBySpace;
-        mSortedSymbolsClusteringTogether = model.mSortedSymbolsClusteringTogether;
-        mSortedWordConnectors = model.mSortedWordConnectors;
-        mSortedWordSeparators = overrideSortedWordSeparators;
-        mSortedSentenceTerminators = model.mSortedSentenceTerminators;
-        mSuggestPuncList = model.mSuggestPuncList;
-        mSentenceSeparator = model.mSentenceSeparator;
-        mAbbreviationMarker = model.mAbbreviationMarker;
-        mSentenceSeparatorAndSpace = model.mSentenceSeparatorAndSpace;
-        mCurrentLanguageHasSpaces = model.mCurrentLanguageHasSpaces;
-        mUsesAmericanTypography = model.mUsesAmericanTypography;
-        mUsesGermanRules = model.mUsesGermanRules;
-    }
-
-    public boolean isWordSeparator(final int code) {
-        return Arrays.binarySearch(mSortedWordSeparators, code) >= 0;
-    }
-
-    public boolean isWordConnector(final int code) {
-        return Arrays.binarySearch(mSortedWordConnectors, code) >= 0;
-    }
-
-    public boolean isWordCodePoint(final int code) {
-        return Character.isLetter(code) || isWordConnector(code);
-    }
-
-    public boolean isUsuallyPrecededBySpace(final int code) {
-        return Arrays.binarySearch(mSortedSymbolsPrecededBySpace, code) >= 0;
-    }
-
-    public boolean isOptionallyPrecededBySpace(final int code) {
-        return Arrays.binarySearch(mSortedSymbolsOptionallyPrecededBySpace, code) >= 0;
-    }
-
-    public boolean isUsuallyFollowedBySpace(final int code) {
-        return Arrays.binarySearch(mSortedSymbolsFollowedBySpace, code) >= 0;
-    }
-
-    public boolean isUsuallyFollowedBySpaceIffPrecededBySpace(final int code) {
-        return Arrays.binarySearch(mSortedSymbolsFollowedBySpaceIffPrecededBySpace, code) >= 0;
-    }
-
-    public boolean isClusteringSymbol(final int code) {
-        return Arrays.binarySearch(mSortedSymbolsClusteringTogether, code) >= 0;
-    }
-
-    public boolean isSentenceTerminator(final int code) {
-        return Arrays.binarySearch(mSortedSentenceTerminators, code) >= 0;
-    }
-
-    public boolean isAbbreviationMarker(final int code) {
-        return code == mAbbreviationMarker;
-    }
-
-    public boolean isSentenceSeparator(final int code) {
-        return code == mSentenceSeparator;
-    }
-
-    public String dump() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("mSortedSymbolsPrecededBySpace = ");
-        sb.append("" + Arrays.toString(mSortedSymbolsPrecededBySpace));
-        sb.append("\n   mSortedSymbolsFollowedBySpace = ");
-        sb.append("" + Arrays.toString(mSortedSymbolsFollowedBySpace));
-        sb.append("\n   mSortedWordConnectors = ");
-        sb.append("" + Arrays.toString(mSortedWordConnectors));
-        sb.append("\n   mSortedWordSeparators = ");
-        sb.append("" + Arrays.toString(mSortedWordSeparators));
-        sb.append("\n   mSuggestPuncList = ");
-        sb.append("" + mSuggestPuncList);
-        sb.append("\n   mSentenceSeparator = ");
-        sb.append("" + mSentenceSeparator);
-        sb.append("\n   mSentenceSeparatorAndSpace = ");
-        sb.append("" + mSentenceSeparatorAndSpace);
-        sb.append("\n   mCurrentLanguageHasSpaces = ");
-        sb.append("" + mCurrentLanguageHasSpaces);
-        sb.append("\n   mUsesAmericanTypography = ");
-        sb.append("" + mUsesAmericanTypography);
-        sb.append("\n   mUsesGermanRules = ");
-        sb.append("" + mUsesGermanRules);
-        return sb.toString();
-    }
-}
diff --git a/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.kt b/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.kt
new file mode 100644
index 0000000000..ad077424c7
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuations.kt
@@ -0,0 +1,302 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.futo.inputmethod.latin.settings
+
+import android.content.Context
+import android.util.Xml
+import androidx.collection.LruCache
+import org.futo.inputmethod.annotations.UsedForTesting
+import org.futo.inputmethod.keyboard.internal.MoreKeySpec
+import org.futo.inputmethod.latin.PunctuationSuggestions
+import org.futo.inputmethod.latin.common.StringUtils
+import org.xmlpull.v1.XmlPullParser
+import java.io.IOException
+import java.io.InputStream
+import java.util.Arrays
+import java.util.Locale
+
+
+internal fun String?.toSortedCodePointArray() = this?.let { StringUtils.toSortedCodePointArray(it) } ?: intArrayOf()
+
+internal data class ParsedData(
+    val strings: Map<String, String>,
+    val ints: Map<String, Int>,
+    val bools: Map<String, Boolean>
+) {
+    operator fun plus(other: ParsedData): ParsedData =
+        ParsedData(
+            // The 2nd element in Map.plus has precedence over the first
+            // but in our case, we want (fr-rCA) + (fr) + (default) to be meaningful
+            strings = other.strings + strings,
+            ints = other.ints + ints,
+            bools = other.bools + bools
+        )
+
+    companion object {
+        private const val ASSET_PATH = "spacing-and-punctuations"
+
+        private val cache = LruCache<String, ParsedData>(10)
+
+        fun load(context: Context, locale: Locale, isSw600dp: Boolean): ParsedData {
+            val candidates = buildCandidateList(locale, isSw600dp)
+
+            val topLevelCandidate = candidates[0]
+
+            return cache[topLevelCandidate] ?: run {
+                val parsed = candidates.mapNotNull { candidate ->
+                    try {
+                        val path = "$ASSET_PATH/$candidate.xml"
+                        context.assets.open(path).use { stream ->
+                            parseXml(stream)
+                        }
+                    } catch (e: IOException) {
+                        null
+                    }
+                }
+
+                if(parsed.isEmpty()) throw IllegalStateException("No spacing and punctuation found at all.")
+
+                val combined = parsed.reduce { a, b -> a + b }
+
+                cache.put(topLevelCandidate, combined)
+
+                combined
+            }
+        }
+
+        private fun parseXml(stream: InputStream): ParsedData {
+            val parser = Xml.newPullParser()
+            parser.setInput(stream, "UTF-8")
+
+            val strings = mutableMapOf<String, String>()
+            val ints = mutableMapOf<String, Int>()
+            val bools = mutableMapOf<String, Boolean>()
+
+            var eventType = parser.eventType
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+                if (eventType == XmlPullParser.START_TAG) {
+                    val name = parser.getAttributeValue(null, "name")
+                    when (parser.name) {
+                        "string" -> {
+                            parser.next()
+                            if (parser.eventType == XmlPullParser.TEXT) {
+                                strings[name] = parser.text
+                            } else if (parser.eventType == XmlPullParser.END_TAG) {
+                                strings[name] = ""
+                            }
+                        }
+                        "integer" -> {
+                            parser.next()
+                            if (parser.eventType == XmlPullParser.TEXT) {
+                                ints[name] = parser.text.toIntOrNull() ?: 0
+                            }
+                        }
+                        "bool" -> {
+                            parser.next()
+                            if (parser.eventType == XmlPullParser.TEXT) {
+                                bools[name] = parser.text.toBoolean()
+                            }
+                        }
+                    }
+                }
+                eventType = parser.next()
+            }
+
+            return ParsedData(strings, ints, bools)
+        }
+
+        fun buildCandidateList(locale: Locale, isSw600dp: Boolean): List<String> {
+            val candidates = mutableListOf<String>()
+            val language = locale.language
+            val region = locale.country.takeIf { it.isNotEmpty() }
+
+            // Full tag with region (e.g., "fr-rCA")
+            val fullTag = if (region != null) "${language}-r${region}" else language
+
+            // 1. With sw600dp qualifier (most specific)
+            if (isSw600dp) {
+                candidates.add("$fullTag-sw600dp")
+                if (region != null) {
+                    candidates.add("${language}-sw600dp")
+                }
+            }
+
+            // 2. Without sw600dp
+            candidates.add(fullTag)
+            if (region != null) {
+                candidates.add(language)
+            }
+
+            // 3. Fallbacks
+            if (isSw600dp) {
+                candidates.add("default-sw600dp")
+            }
+            candidates.add("default")
+
+            return candidates.distinct()
+        }
+    }
+}
+
+
+class SpacingAndPunctuations(
+    @JvmField
+    val sortedWordSeparators: IntArray,
+    @JvmField
+    val suggestPuncList: PunctuationSuggestions,
+    @JvmField
+    val sentenceSeparatorAndSpace: String,
+    @JvmField
+    val currentLanguageHasSpaces: Boolean,
+    @JvmField
+    val usesAmericanTypography: Boolean,
+    @JvmField
+    val usesGermanRules: Boolean,
+    private val sortedSymbolsPrecededBySpace: IntArray,
+    private val sortedSymbolsOptionallyPrecededBySpace: IntArray,
+    private val sortedSymbolsFollowedBySpace: IntArray,
+    private val sortedSymbolsFollowedBySpaceIffPrecededBySpace: IntArray,
+    private val sortedSymbolsClusteringTogether: IntArray,
+    private val sortedWordConnectors: IntArray,
+    private val sortedSentenceTerminators: IntArray,
+    private val sentenceSeparator: Int,
+    private val abbreviationMarker: Int
+) {
+    companion object {
+        @JvmStatic
+        fun create(context: Context, locale: Locale = context.resources.configuration.locale): SpacingAndPunctuations {
+            val isSw600dp = context.resources.configuration.smallestScreenWidthDp >= 600
+            val config = ParsedData.load(context, locale, isSw600dp)
+            return fromConfig(locale, config)
+        }
+
+        @JvmStatic
+        @UsedForTesting
+        fun createForTesting(
+            model: SpacingAndPunctuations,
+            overrideSortedWordSeparators: IntArray
+        ): SpacingAndPunctuations {
+            return SpacingAndPunctuations(
+                sortedWordSeparators = overrideSortedWordSeparators,
+                suggestPuncList = model.suggestPuncList,
+                sentenceSeparatorAndSpace = model.sentenceSeparatorAndSpace,
+                currentLanguageHasSpaces = model.currentLanguageHasSpaces,
+                usesAmericanTypography = model.usesAmericanTypography,
+                usesGermanRules = model.usesGermanRules,
+                sortedSymbolsPrecededBySpace = model.sortedSymbolsPrecededBySpace,
+                sortedSymbolsOptionallyPrecededBySpace = model.sortedSymbolsOptionallyPrecededBySpace,
+                sortedSymbolsFollowedBySpace = model.sortedSymbolsFollowedBySpace,
+                sortedSymbolsFollowedBySpaceIffPrecededBySpace = model.sortedSymbolsFollowedBySpaceIffPrecededBySpace,
+                sortedSymbolsClusteringTogether = model.sortedSymbolsClusteringTogether,
+                sortedWordConnectors = model.sortedWordConnectors,
+                sortedSentenceTerminators = model.sortedSentenceTerminators,
+                sentenceSeparator = model.sentenceSeparator,
+                abbreviationMarker = model.abbreviationMarker
+            )
+        }
+
+        internal fun fromConfig(locale: Locale, config: ParsedData): SpacingAndPunctuations {
+            val sentenceSep = config.ints["sentence_separator"]!! // '.' default
+            val abbrevMarker = config.ints["abbreviation_marker"]!!
+
+            return SpacingAndPunctuations(
+                sortedSymbolsPrecededBySpace = config.strings["symbols_preceded_by_space"].toSortedCodePointArray(),
+                sortedSymbolsFollowedBySpace = config.strings["symbols_followed_by_space"].toSortedCodePointArray(),
+                sortedSymbolsOptionallyPrecededBySpace = config.strings["symbols_optionally_preceded_by_space"].toSortedCodePointArray(),
+                sortedSymbolsFollowedBySpaceIffPrecededBySpace = config.strings["symbols_followed_by_space_iff_preceded_by_space"].toSortedCodePointArray(),
+                sortedSymbolsClusteringTogether = config.strings["symbols_clustering_together"].toSortedCodePointArray(),
+                sortedWordConnectors = config.strings["symbols_word_connectors"].toSortedCodePointArray(),
+                sortedWordSeparators = config.strings["symbols_word_separators"].toSortedCodePointArray(),
+                sortedSentenceTerminators = config.strings["symbols_sentence_terminators"].toSortedCodePointArray(),
+                sentenceSeparator = sentenceSep,
+                abbreviationMarker = abbrevMarker,
+                sentenceSeparatorAndSpace = String(intArrayOf(sentenceSep, ' '.code), 0, 2),
+                currentLanguageHasSpaces = config.bools["current_language_has_spaces"]!!,
+
+                // Heuristic: we use American Typography rules because it's the most common rules for all
+                // English variants. German rules (not "German typography") also have small gotchas.
+                usesAmericanTypography = locale.language == Locale.ENGLISH.language,
+                usesGermanRules = locale.language == Locale.GERMAN.language,
+
+                // Unused.
+                suggestPuncList = PunctuationSuggestions.newPunctuationSuggestions(
+                    MoreKeySpec.splitKeySpecs(config.strings["suggested_punctuations"]!!)
+                )
+            )
+        }
+    }
+
+
+    fun isWordSeparator(code: Int): Boolean {
+        return Arrays.binarySearch(sortedWordSeparators, code) >= 0
+    }
+
+    fun isWordConnector(code: Int): Boolean {
+        return Arrays.binarySearch(sortedWordConnectors, code) >= 0
+    }
+
+    fun isWordCodePoint(code: Int): Boolean {
+        return Character.isLetter(code) || isWordConnector(code)
+    }
+
+    fun isUsuallyPrecededBySpace(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSymbolsPrecededBySpace, code) >= 0
+    }
+
+    fun isOptionallyPrecededBySpace(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSymbolsOptionallyPrecededBySpace, code) >= 0
+    }
+
+    fun isUsuallyFollowedBySpace(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSymbolsFollowedBySpace, code) >= 0
+    }
+
+    fun isUsuallyFollowedBySpaceIffPrecededBySpace(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSymbolsFollowedBySpaceIffPrecededBySpace, code) >= 0
+    }
+
+    fun isClusteringSymbol(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSymbolsClusteringTogether, code) >= 0
+    }
+
+    fun isSentenceTerminator(code: Int): Boolean {
+        return Arrays.binarySearch(sortedSentenceTerminators, code) >= 0
+    }
+
+    fun isAbbreviationMarker(code: Int): Boolean {
+        return code == abbreviationMarker
+    }
+
+    fun isSentenceSeparator(code: Int): Boolean {
+        return code == sentenceSeparator
+    }
+
+    fun dump(): String = buildString {
+        append("   sortedSymbolsPrecededBySpace = ${sortedSymbolsPrecededBySpace.contentToString()}\n")
+        append("   sortedSymbolsFollowedBySpace = ${sortedSymbolsFollowedBySpace.contentToString()}\n")
+        append("   sortedSymbolsOptionallyPrecededBySpace = ${sortedSymbolsOptionallyPrecededBySpace.contentToString()}\n")
+        append("   sortedSymbolsFollowedBySpaceIffPrecededBySpace = ${sortedSymbolsFollowedBySpaceIffPrecededBySpace.contentToString()}\n")
+        append("   sortedSymbolsClusteringTogether = ${sortedSymbolsClusteringTogether.contentToString()}\n")
+        append("   sortedWordConnectors = ${sortedWordConnectors.contentToString()}\n")
+        append("   sortedWordSeparators = ${sortedWordSeparators.contentToString()}\n")
+        append("   suggestPuncList = $suggestPuncList\n")
+        append("   sentenceSeparator = $sentenceSeparator\n")
+        append("   sentenceSeparatorAndSpace = $sentenceSeparatorAndSpace\n")
+        append("   currentLanguageHasSpaces = $currentLanguageHasSpaces\n")
+        append("   usesAmericanTypography = $usesAmericanTypography\n")
+        append("   usesGermanRules = $usesGermanRules")
+    }
+}
diff --git a/java/src/org/futo/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java b/java/src/org/futo/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
index e4d3e2d6ed..3b84fba3b7 100644
--- a/java/src/org/futo/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
+++ b/java/src/org/futo/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
@@ -17,6 +17,7 @@
 package org.futo.inputmethod.latin.spellcheck;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.res.Resources;
 import android.os.Binder;
 import android.os.Build;
@@ -36,12 +37,12 @@
 public final class AndroidSpellCheckerSession extends AndroidWordLevelSpellCheckerSession {
     private static final String TAG = AndroidSpellCheckerSession.class.getSimpleName();
     private static final boolean DBG = false;
-    private final Resources mResources;
+    private final Context mContext;
     private SentenceLevelAdapter mSentenceLevelAdapter;
 
     public AndroidSpellCheckerSession(AndroidSpellCheckerService service) {
         super(service);
-        mResources = service.getResources();
+        mContext = service;
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@@ -164,7 +165,7 @@ private SentenceSuggestionsInfo[] splitAndSuggest(TextInfo[] textInfos, int sugg
             if (sentenceLevelAdapter == null) {
                 final String localeStr = getLocale();
                 if (!TextUtils.isEmpty(localeStr)) {
-                    sentenceLevelAdapter = new SentenceLevelAdapter(mResources,
+                    sentenceLevelAdapter = new SentenceLevelAdapter(mContext,
                             new Locale(localeStr));
                     mSentenceLevelAdapter = sentenceLevelAdapter;
                 }
diff --git a/java/src/org/futo/inputmethod/latin/spellcheck/SentenceLevelAdapter.java b/java/src/org/futo/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
index 70c34b50c7..d6ea4bb0f4 100644
--- a/java/src/org/futo/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
+++ b/java/src/org/futo/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
@@ -17,6 +17,8 @@
 package org.futo.inputmethod.latin.spellcheck;
 
 import android.annotation.TargetApi;
+import android.app.Application;
+import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
 import android.view.textservice.SentenceSuggestionsInfo;
@@ -77,15 +79,10 @@ public SentenceTextInfoParams(TextInfo ti, ArrayList<SentenceWordItem> items) {
 
     private static class WordIterator {
         private final SpacingAndPunctuations mSpacingAndPunctuations;
-        public WordIterator(final Resources res, final Locale locale) {
-            final RunInLocale<SpacingAndPunctuations> job =
-                    new RunInLocale<SpacingAndPunctuations>() {
-                @Override
-                protected SpacingAndPunctuations job(final Resources r) {
-                    return new SpacingAndPunctuations(r);
-                }
-            };
-            mSpacingAndPunctuations = job.runInLocale(res, locale);
+        public WordIterator(final Context context, final Locale locale) {
+            mSpacingAndPunctuations = SpacingAndPunctuations.create(
+                    context, locale
+            );
         }
 
         public int getEndOfWord(final CharSequence sequence, final int fromIndex) {
@@ -131,8 +128,8 @@ public int getBeginningOfNextWord(final CharSequence sequence, final int fromInd
     }
 
     private final WordIterator mWordIterator;
-    public SentenceLevelAdapter(final Resources res, final Locale locale) {
-        mWordIterator = new WordIterator(res, locale);
+    public SentenceLevelAdapter(final Context context, final Locale locale) {
+        mWordIterator = new WordIterator(context, locale);
     }
 
     public SentenceTextInfoParams getSplitWords(TextInfo originalTextInfo) {
diff --git a/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt b/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
index 901224fa5f..8ae519b348 100644
--- a/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
@@ -3,6 +3,7 @@ package org.futo.inputmethod.latin.uix
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
+import android.util.Log
 import android.view.View
 import androidx.annotation.RequiresApi
 import androidx.compose.animation.core.animateFloatAsState
@@ -38,11 +39,13 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -108,6 +111,7 @@ import androidx.core.net.toUri
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
 import org.futo.inputmethod.engine.ExpandableSuggestionBarConfiguration
+import org.futo.inputmethod.latin.DisplayTop4Setting
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.SuggestedWords
 import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo
@@ -122,9 +126,12 @@ import org.futo.inputmethod.latin.uix.actions.PinnedActions
 import org.futo.inputmethod.latin.uix.actions.toActionList
 import org.futo.inputmethod.latin.uix.settings.useDataStore
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
+import org.futo.inputmethod.latin.uix.theme.LocalCompatEmojiFamily
+import org.futo.inputmethod.latin.uix.theme.LocalCompatEmojiTypeface
 import org.futo.inputmethod.latin.uix.theme.ThemeOption
 import org.futo.inputmethod.latin.uix.theme.Typography
 import org.futo.inputmethod.latin.uix.theme.UixThemeWrapper
+import org.futo.inputmethod.latin.uix.theme.emojiNeedsCompat
 import org.futo.inputmethod.latin.uix.theme.presets.DefaultDarkScheme
 import org.futo.inputmethod.latin.uix.theme.presets.DynamicDarkTheme
 import org.futo.inputmethod.latin.uix.theme.presets.DynamicLightTheme
@@ -272,11 +279,13 @@ fun AutoFitText(
 }
 
 @Composable
-fun TextStyle.withCustomFont(): TextStyle {
+fun TextStyle.withCustomFont(orDefault: FontFamily? = null): TextStyle {
     val typeface = LocalKeyboardScheme.current.extended.advancedThemeOptions.font
     if(typeface != null) {
         val family = FontFamily(typeface)
         return this.copy(fontFamily = family)
+    } else if (orDefault != null) {
+        return this.copy(fontFamily = orDefault)
     } else {
         return this
     }
@@ -284,41 +293,56 @@ fun TextStyle.withCustomFont(): TextStyle {
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean, onClick: () -> Unit, onLongClick: () -> Unit) {
+fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean, onClick: () -> Unit, onLongClick: () -> Unit, forcePrimary: Boolean, isEmoji: Boolean) {
     val wordInfo = words.getInfoOrNull(idx)
     val isVerbatim = wordInfo?.kind == KIND_TYPED
     val word = wordInfo?.mWord
 
-    val isAutocorrect = isPrimary && words.mWillAutoCorrect
+    val isAutocorrect = forcePrimary || (isPrimary && words.mWillAutoCorrect)
 
     val color = when(isAutocorrect) {
         true -> LocalKeyboardScheme.current.onSurface
         else -> LocalKeyboardScheme.current.onSurfaceVariant
     }
 
-    val topSuggestionIcon = painterResource(id = R.drawable.transformer_suggestion)
-    val textButtonModifier = when (wordInfo?.mOriginatesFromTransformerLM) {
-        true -> Modifier.drawBehind {
-            with(topSuggestionIcon) {
-                val iconSize = topSuggestionIcon.intrinsicSize
+    val iconToUse = when {
+        wordInfo?.mOriginatesFromTransformerLM == true -> painterResource(id = R.drawable.transformer_suggestion)
+        wordInfo?.mOriginatesFromSwipeModel    == true -> painterResource(id = R.drawable.swipemodel_indicator)
+        else -> null
+    }
+    val textButtonModifier = if(iconToUse != null) {
+        Modifier.drawBehind {
+            with(iconToUse) {
+                val iconSize = iconToUse.intrinsicSize
                 translate(
                     left = (size.width - iconSize.width) / 2.0f,
-                    top = size.height - iconSize.height * 2.0f
+                    top = size.height - iconSize.height * (if(wordInfo?.mOriginatesFromSwipeModel == true) 1.3f else 2.0f)
                 ) {
                     draw(
-                        topSuggestionIcon.intrinsicSize,
+                        iconToUse.intrinsicSize,
                         colorFilter = ColorFilter.tint(color = color)
                     )
                 }
             }
         }
-        else -> Modifier
+    } else {
+        Modifier
+    }
+
+    val compatTypeface = LocalCompatEmojiTypeface.current
+    val compatFamily = LocalCompatEmojiFamily.current
+    val potentiallyCompatEmojiFont = remember(word, isEmoji) {
+        if(word != null && isEmoji && emojiNeedsCompat(word, compatTypeface)) {
+            compatFamily
+        } else {
+            null
+        }
     }
 
     val textStyle = when(isAutocorrect) {
         true -> suggestionStylePrimary
         false -> suggestionStyleAlternative
-    }.copy(color = color).withCustomFont()
+    }.copy(color = color).withCustomFont(potentiallyCompatEmojiFont)
 
     Box(
         modifier = textButtonModifier
@@ -377,6 +401,9 @@ data class SuggestionLayout(
     /** Set to true if this is a gesture update, and we should only show one suggestion */
     val isGestureBatch: Boolean,
 
+    /** The primary tail batch element, if present it should be highlighted */
+    val swipePrimaryElement: SuggestedWordInfo?,
+
     val presentableSuggestions: List<SuggestedWordInfo>
 )
 
@@ -386,8 +413,9 @@ fun SuggestedWords.getInfoOrNull(idx: Int): SuggestedWordInfo? = try {
     null
 }
 
-fun makeSuggestionLayout(words: SuggestedWords, blacklist: SuggestionBlacklist?): SuggestionLayout {
+fun makeSuggestionLayout(words: SuggestedWords, blacklist: SuggestionBlacklist?, swipeTailRemovePrimarySuggestion: Boolean): SuggestionLayout {
     val isGestureBatch = words.mInputStyle == SuggestedWords.INPUT_STYLE_UPDATE_BATCH
+    val isSwipeTail = words.mInputStyle == SuggestedWords.INPUT_STYLE_TAIL_BATCH
 
     val typedWord = words.getInfoOrNull(SuggestedWords.INDEX_OF_TYPED_WORD)?.let {
         if(it.kind == KIND_TYPED) { it } else { null }
@@ -414,6 +442,15 @@ fun makeSuggestionLayout(words: SuggestedWords, blacklist: SuggestionBlacklist?)
             // Do not include the verbatim word when autocorrecting to avoid such duplicate word situation:
             // [ hid | **his** | "hid" ]
             && (isGestureBatch || autocorrectMatch == null || typedWord == null || it.mWord != typedWord.mWord)
+    }.toMutableList()
+
+    var swipePrimaryElement: SuggestedWordInfo? = null
+    if(isSwipeTail && sortedMatches.size > 1) {
+        if(swipeTailRemovePrimarySuggestion) {
+            sortedMatches.removeAt(0)
+        } else {
+            swipePrimaryElement = sortedMatches[0]
+        }
     }
 
     val areSuggestionsClueless = (autocorrectMatch ?: sortedMatches.getOrNull(0))?.let {
@@ -434,15 +471,17 @@ fun makeSuggestionLayout(words: SuggestedWords, blacklist: SuggestionBlacklist?)
         verbatimWord = typedWord,
         areSuggestionsClueless = areSuggestionsClueless,
         isGestureBatch = isGestureBatch,
-        presentableSuggestions = presentableSuggestions
+        presentableSuggestions = presentableSuggestions,
+        swipePrimaryElement = swipePrimaryElement
     )
 }
 
 @Composable
 fun RowScope.SuggestionItems(words: SuggestedWords, onClick: (i: Int) -> Unit, onLongClick: (i: Int) -> Unit) {
     val layout = makeSuggestionLayout(
-        words,
-        null
+        words = words,
+        blacklist = null,
+        swipeTailRemovePrimarySuggestion = useDataStoreValue(DisplayTop4Setting)
     )
 
     val suggestionItem = @Composable { suggestion: SuggestedWordInfo? ->
@@ -452,8 +491,10 @@ fun RowScope.SuggestionItems(words: SuggestedWords, onClick: (i: Int) -> Unit, o
                 words,
                 idx,
                 isPrimary = idx == SuggestedWords.INDEX_OF_AUTO_CORRECTION,
+                forcePrimary = suggestion == layout.swipePrimaryElement,
                 onClick = { onClick(idx) },
-                onLongClick = { onLongClick(idx) }
+                onLongClick = { onLongClick(idx) },
+                isEmoji = suggestion in layout.emojiMatches
             )
         } else {
             Spacer(Modifier.weight(1.0f))
@@ -782,7 +823,8 @@ fun ActionBar(
     keyboardManagerForAction: KeyboardManagerForAction? = null,
     quickClipState: QuickClipState? = null,
     onQuickClipDismiss: () -> Unit = {},
-    needToUseExpandableSuggestionUi: Boolean = false
+    needToUseExpandableSuggestionUi: Boolean = false,
+    loading: Boolean = false,
 ) {
     val view = LocalView.current
     val context = LocalContext.current
@@ -846,7 +888,14 @@ fun ActionBar(
                     if (importantNotice != null) {
                         ImportantNoticeView(importantNotice)
                     } else {
-                        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+                        if(loading) {
+                            Spacer(Modifier.weight(1.0f))
+                            CircularProgressIndicator(
+                                modifier = Modifier.size(32.dp).align(CenterVertically),
+                                color = MaterialTheme.colorScheme.primary
+                            )
+                            Spacer(Modifier.weight(1.0f))
+                        } else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                             && inlineSuggestions.isNotEmpty()
                         ) {
                             InlineSuggestions(inlineSuggestions)
@@ -1557,10 +1606,10 @@ fun PreviewActionBarWithSuggestions(colorScheme: ThemeOption = DefaultDarkScheme
             words = exampleSuggestedWords,
             suggestionStripListener = ExampleListener(),
             onActionActivated = { },
+            onActionAltActivated = { },
             inlineSuggestions = listOf(),
             isActionsExpanded = false,
             toggleActionsExpanded = { },
-            onActionAltActivated = { }
         )
     }
 }
@@ -1607,10 +1656,10 @@ fun PreviewActionBarWithQuickClip(colorScheme: ThemeOption = DefaultDarkScheme)
             words = exampleSuggestedWords,
             suggestionStripListener = ExampleListener(),
             onActionActivated = { },
+            onActionAltActivated = { },
             inlineSuggestions = listOf(),
             isActionsExpanded = false,
             toggleActionsExpanded = { },
-            onActionAltActivated = { },
             quickClipState = QuickClipState(
                 texts = listOf(
                     QuickClipItem(QuickClipKind.EmailAddress, "keyboard@futo.org", 0),
@@ -1621,7 +1670,7 @@ fun PreviewActionBarWithQuickClip(colorScheme: ThemeOption = DefaultDarkScheme)
                 validUntil = Long.MAX_VALUE,
                 imageMimeTypes = listOf(),
                 isSensitive = true
-            )
+            ),
         )
     }
 }
@@ -1634,10 +1683,10 @@ fun PreviewActionBarWithNotice(colorScheme: ThemeOption = DefaultDarkScheme) {
             words = exampleSuggestedWords,
             suggestionStripListener = ExampleListener(),
             onActionActivated = { },
+            onActionAltActivated = { },
             inlineSuggestions = listOf(),
             isActionsExpanded = true,
             toggleActionsExpanded = { },
-            onActionAltActivated = { },
             importantNotice = object : ImportantNotice {
                 @Composable
                 override fun getText(): String {
@@ -1646,7 +1695,7 @@ fun PreviewActionBarWithNotice(colorScheme: ThemeOption = DefaultDarkScheme) {
 
                 override fun onDismiss(context: Context, auto: Boolean) { }
                 override fun onOpen(context: Context) { }
-            }
+            },
         )
     }
 }
@@ -1659,10 +1708,27 @@ fun PreviewActionBarWithEmptySuggestions(colorScheme: ThemeOption = DefaultDarkS
             words = exampleSuggestedWordsEmpty,
             suggestionStripListener = ExampleListener(),
             onActionActivated = { },
+            onActionAltActivated = { },
             inlineSuggestions = listOf(),
             isActionsExpanded = true,
             toggleActionsExpanded = { },
-            onActionAltActivated = { }
+        )
+    }
+}
+
+@Composable
+@Preview
+fun PreviewActionBarLoading(colorScheme: ThemeOption = DefaultDarkScheme) {
+    UixThemeWrapper(colorScheme.obtainColors(LocalContext.current)) {
+        ActionBar(
+            words = exampleSuggestedWordsEmpty,
+            suggestionStripListener = ExampleListener(),
+            onActionActivated = { },
+            onActionAltActivated = { },
+            inlineSuggestions = listOf(),
+            isActionsExpanded = true,
+            toggleActionsExpanded = { },
+            loading = true
         )
     }
 }
@@ -1675,10 +1741,10 @@ fun PreviewExpandedActionBar(colorScheme: ThemeOption = DefaultDarkScheme) {
             words = exampleSuggestedWordsEmpty,
             suggestionStripListener = ExampleListener(),
             onActionActivated = { },
+            onActionAltActivated = { },
             inlineSuggestions = listOf(),
             isActionsExpanded = true,
             toggleActionsExpanded = { },
-            onActionAltActivated = { }
         )
     }
 }
@@ -1711,6 +1777,14 @@ fun PreviewActionBarWithEmptySuggestionsDynamicLight() {
     PreviewActionBarWithEmptySuggestions(DynamicLightTheme)
 }
 
+@RequiresApi(Build.VERSION_CODES.S)
+@Composable
+@Preview
+fun PreviewActionBarLoadingDynamicLight() {
+    PreviewActionBarLoading(DynamicLightTheme)
+}
+
+
 @RequiresApi(Build.VERSION_CODES.S)
 @Composable
 @Preview
@@ -1732,6 +1806,13 @@ fun PreviewActionBarWithEmptySuggestionsDynamicDark() {
     PreviewActionBarWithEmptySuggestions(DynamicDarkTheme)
 }
 
+@RequiresApi(Build.VERSION_CODES.S)
+@Composable
+@Preview
+fun PreviewActionBarLoadingDynamicDark() {
+    PreviewActionBarLoading(DynamicDarkTheme)
+}
+
 @RequiresApi(Build.VERSION_CODES.S)
 @Composable
 @Preview
diff --git a/java/src/org/futo/inputmethod/latin/uix/ActionTextEdit.kt b/java/src/org/futo/inputmethod/latin/uix/ActionTextEdit.kt
index 0b03334acf..5537713e18 100644
--- a/java/src/org/futo/inputmethod/latin/uix/ActionTextEdit.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/ActionTextEdit.kt
@@ -28,6 +28,7 @@ import android.view.inputmethod.TextBoundsInfoResult
 import android.view.inputmethod.TextSnapshot
 import androidx.annotation.RequiresApi
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -38,6 +39,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -54,6 +56,10 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.util.concurrent.Executor
 import java.util.function.Consumer
 import java.util.function.IntConsumer
@@ -228,13 +234,15 @@ private fun GenericEditTextCompose(
 
             setHeight(height.toInt())
 
-            val editorInfo = EditorInfo().apply {
-                this.inputType = inputType
-                this.packageName = context.packageName
-            }
-            onCreateInputConnection(editorInfo)
+            if(onOverride != null) {
+                val editorInfo = EditorInfo().apply {
+                    this.inputType = inputType
+                    this.packageName = context.packageName
+                }
+                onCreateInputConnection(editorInfo)
 
-            onOverride?.invoke(inputConnection!!, editorInfo)
+                onOverride.invoke(inputConnection!!, editorInfo)
+            }
 
             // Remove underline and padding
             background = null
@@ -281,10 +289,14 @@ private fun GenericEditTextCompose(
     }
 
     val token = LocalView.current.windowToken
+    val scope = LocalLifecycleOwner.current
     DisposableEffect(autofocus, token) {
         val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         if(autofocus) {
-            imm.showSoftInput(editText, 0)
+            scope.lifecycleScope.launch(Dispatchers.Main) {
+                editText.requestFocus()
+                imm.showSoftInput(editText, 0)
+            }
         }
 
         onDispose {
@@ -304,8 +316,9 @@ fun ActionTextEditor(
     afterOverride: (() -> Unit)? = null,
     afterUnOverride: ((Boolean) -> Unit)? = null,
     onEnter: (() -> Unit)? = null,
-    autofocus: Boolean = false,
+    autofocus: Boolean = true,
     inputFilters: Array<InputFilter>? = null,
+    placeholder: String? = null
 ) {
     val manager = if(!LocalInspectionMode.current) LocalManager.current else null
     GenericEditTextCompose(
@@ -314,7 +327,7 @@ fun ActionTextEditor(
         textSize = textSize,
         typeface = typeface,
         autocorrect = autocorrect,
-        placeholder = null,
+        placeholder = placeholder,
         modifier = modifier,
         autofocus = autofocus,
         onEnter = onEnter,
@@ -326,7 +339,7 @@ fun ActionTextEditor(
             val result = manager!!.unsetInputConnection()
             afterUnOverride?.invoke(result)
         },
-        inputFilters = inputFilters
+        inputFilters = inputFilters,
     )
 }
 
@@ -340,10 +353,11 @@ fun SettingsTextEdit(
     autocorrect: Boolean = true,
     autofocus: Boolean = false,
     forceQwerty: Boolean = false,
+    error: Boolean = false,
 ) {
     Surface(
-        color = MaterialTheme.colorScheme.surfaceContainerHighest,
-        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
+        color = if(error) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.surfaceContainerHighest,
+        border = BorderStroke(1.dp, if(error) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.outline),
         shape = RoundedCornerShape(8.dp),
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -367,4 +381,23 @@ fun SettingsTextEdit(
             )
         }
     }
+}
+
+@Composable
+fun ActionHeaderSearch(searchText: MutableState<String>, modifier: Modifier = Modifier, placeholder: String? = null) {
+    Surface(
+        color = LocalKeyboardScheme.current.keyboardContainer,
+        contentColor = LocalKeyboardScheme.current.onKeyboardContainer,
+        shape = RoundedCornerShape(24.dp),
+        modifier = modifier
+            .minimumInteractiveComponentSize()
+            .padding(2.dp)
+    ) {
+        Box(
+            modifier = Modifier.padding(8.dp),
+            contentAlignment = Alignment.CenterStart
+        ) {
+            ActionTextEditor(text = searchText, placeholder = placeholder)
+        }
+    }
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt b/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt
index 36b0824049..052a4249d3 100644
--- a/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt
@@ -1,6 +1,7 @@
 package org.futo.inputmethod.latin.uix
 
 import android.content.Context
+import android.content.res.Resources
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -26,6 +27,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -165,10 +167,11 @@ fun SettingsImportScreen(
 @Composable
 fun ImportScreen(fileKind: FileKindAndInfo, onApply: (FileKindAndInfo, InputMethodSubtype) -> Unit, onCancel: () -> Unit) {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val importing = remember { mutableStateOf(false) }
     val importingLanguage = remember { mutableStateOf("") }
     ScrollableList {
-        ScreenTitleWithIcon(title = stringResource(R.string.resource_importer_import_title, fileKind.kind.kindTitle(context)), painter = painterResource(id = fileKind.kind.icon()))
+        ScreenTitleWithIcon(title = stringResource(R.string.resource_importer_import_title, fileKind.kind.kindTitle(resources)), painter = painterResource(id = fileKind.kind.icon()))
 
         if(fileKind.kind == FileKind.Invalid) {
             if(fileKind.invalidKindHint == InvalidFileHint.ImportedWordListInsteadOfDict) {
@@ -255,13 +258,13 @@ enum class FileKind {
     }
 }
 
-fun FileKind.kindTitle(context: Context): String {
-    return when(this) {
-        FileKind.VoiceInput -> context.getString(R.string.file_kind_voice_input_model)
-        FileKind.Transformer -> context.getString(R.string.file_kind_transformer_model)
-        FileKind.Dictionary -> context.getString(R.string.file_kind_dictionary)
-        FileKind.Invalid -> context.getString(R.string.file_kind_invalid_file)
-    }
+fun FileKind.kindTitle(resources: Resources): String {
+    return resources.getString(when(this) {
+        FileKind.VoiceInput -> R.string.file_kind_voice_input_model
+        FileKind.Transformer -> R.string.file_kind_transformer_model
+        FileKind.Dictionary -> R.string.file_kind_dictionary
+        FileKind.Invalid -> R.string.file_kind_invalid_file
+    })
 }
 
 fun FileKind.icon(): Int {
diff --git a/java/src/org/futo/inputmethod/latin/uix/QuickClip.kt b/java/src/org/futo/inputmethod/latin/uix/QuickClip.kt
index aeb88e8e23..3745541861 100644
--- a/java/src/org/futo/inputmethod/latin/uix/QuickClip.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/QuickClip.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
@@ -41,7 +42,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.futo.inputmethod.accessibility.AccessibilityUtils
 import org.futo.inputmethod.latin.R
-import org.futo.inputmethod.latin.uix.actions.ClipboardQuickClipsEnabled
+import org.futo.inputmethod.latin.common.Constants
+import org.futo.inputmethod.latin.uix.actions.clipboard.ClipboardQuickClipsEnabled
 import org.futo.inputmethod.latin.uix.theme.Typography
 
 enum class QuickClipKind {
@@ -93,9 +95,16 @@ data class QuickClipState(
     val image: Uri?,
     val imageMimeTypes: List<String>,
     val validUntil: Long,
-    val isSensitive: Boolean
+    val isSensitive: Boolean,
+    val createdAt: Long = System.currentTimeMillis()
 )
 
+fun QuickClipState?.filterIfDismissed(): QuickClipState? = when {
+    this == null -> null
+    this.createdAt < QuickClip.timeOfDismissal -> null
+    else -> this
+}
+
 @Composable
 private fun QuickClipPill(icon: Painter, contentDescription: String, text: String?, uri: Uri?, onActivate: () -> Unit) {
     Box(Modifier.fillMaxHeight().clickable {
@@ -146,6 +155,7 @@ fun RowScope.QuickClipView(state: QuickClipState, dismiss: () -> Unit) {
         }
     } else state.isSensitive
 
+    val view = LocalView.current
     LazyRow(Modifier.weight(1.0f)) {
         state.image?.let { uri ->
             item {
@@ -155,6 +165,7 @@ fun RowScope.QuickClipView(state: QuickClipState, dismiss: () -> Unit) {
                     text = null,
                     uri = uri
                 ) {
+                    manager!!.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
                     manager!!.typeUri(uri, state.imageMimeTypes)
                     QuickClip.markQuickClipDismissed()
                     dismiss()
@@ -197,6 +208,7 @@ fun RowScope.QuickClipView(state: QuickClipState, dismiss: () -> Unit) {
                     },
                     uri = null
                 ) {
+                    manager!!.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
                     manager!!.typeText(it.text)
                     QuickClip.markQuickClipDismissed()
                     dismiss()
@@ -207,7 +219,7 @@ fun RowScope.QuickClipView(state: QuickClipState, dismiss: () -> Unit) {
 }
 
 object QuickClip {
-    private var timeOfDismissal = 0L
+    internal var timeOfDismissal = 0L
 
     // This shall be called when a quick clip is either used or it was dismissed.
     // It can be dismissed by typing something
diff --git a/java/src/org/futo/inputmethod/latin/uix/SettingsExporter.kt b/java/src/org/futo/inputmethod/latin/uix/SettingsExporter.kt
index 28ea8aba83..86ecb7278f 100644
--- a/java/src/org/futo/inputmethod/latin/uix/SettingsExporter.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/SettingsExporter.kt
@@ -39,12 +39,14 @@ import org.futo.inputmethod.engine.general.mozcUserProfileDir
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.utils.readAllBytesCompat
 import org.futo.inputmethod.latin.uix.PreferenceUtils.getDefaultSharedPreferences
-import org.futo.inputmethod.latin.uix.actions.ClipboardFileName
-import org.futo.inputmethod.latin.uix.actions.ClipboardHistoryManager.Companion.onClipboardImportedFlow
-import org.futo.inputmethod.latin.uix.actions.clipboardFile
+import org.futo.inputmethod.latin.uix.actions.clipboard.ClipboardFileName
+import org.futo.inputmethod.latin.uix.actions.clipboard.ClipboardHistoryManager.Companion.onClipboardImportedFlow
+import org.futo.inputmethod.latin.uix.actions.clipboard.clipboardDir
+import org.futo.inputmethod.latin.uix.actions.clipboard.clipboardFile
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
 import org.futo.inputmethod.latin.uix.settings.SettingsActivity
+import org.futo.inputmethod.latin.uix.settings.pages.langspecific.zh.RimeSettings
 import org.futo.inputmethod.latin.uix.settings.pages.modelmanager.findSettingsActivity
 import org.futo.inputmethod.latin.uix.theme.ZipThemes
 import org.futo.inputmethod.latin.xlm.ModelPaths
@@ -235,7 +237,7 @@ object SettingsExporter {
         }
 
         // Collect resources
-        context.getExternalFilesDir(null)?.listFiles()?.forEach { resourceFile ->
+        context.getExternalFilesDir(null)?.listFiles()?.filter { it.isFile }?.forEach { resourceFile ->
             // if includeHeavyResources, then only include this if its not a .dict
             if (resourceFile.extension == "dict" || includeHeavyResources) {
                 zipOut.putNextEntry(ZipEntry("ext/${resourceFile.name}"))
@@ -268,6 +270,15 @@ object SettingsExporter {
             }
         }
 
+        // Collect clipboard files
+        context.clipboardDir.listFiles()?.forEach { clipboardFile ->
+            assert(!clipboardFile.isDirectory)
+            val entry = ZipEntry("clipboard/${clipboardFile.name}")
+            zipOut.putNextEntry(entry)
+            clipboardFile.inputStream().use { it.copyTo(zipOut) }
+            zipOut.closeEntry()
+        }
+
         // Collect mozc (Japanese user typing history, etc)
         mozcUserProfileDir(context).listFiles()?.forEach { subfile ->
             assert(!subfile.isDirectory)
@@ -277,6 +288,17 @@ object SettingsExporter {
             zipOut.closeEntry()
         }
 
+        // Collect RIME (Chinese user typing history, etc)
+        val rimeDir = RimeSettings.RimeDir
+        rimeDir.walk().filter { it.isFile }.forEach { subfile ->
+            val rel = subfile.toRelativeString(rimeDir)
+
+            val entry = ZipEntry("rime/$rel")
+            zipOut.putNextEntry(entry)
+            subfile.inputStream().use { it.copyTo(zipOut) }
+            zipOut.closeEntry()
+        }
+
         // Collect themes
         ZipThemes.customThemesDir(context).listFiles()?.forEach { themeFile ->
             zipOut.putNextEntry(ZipEntry("themes/${themeFile.name}"))
@@ -321,6 +343,8 @@ object SettingsExporter {
                 }
             }
 
+            context.clipboardDir.deleteRecursively()
+            RimeSettings.RimeDir.deleteRecursively()
             mozcUserProfileDir(context).deleteRecursively()
 
             // delete all themes
@@ -382,8 +406,20 @@ object SettingsExporter {
                     }
                 }
 
+                entry.name.startsWith("clipboard/") -> {
+                    val relDir = entry.name.splitSlash()
+                    assert(!relDir.contains('/'))
+
+                    val clipboardDir = context.clipboardDir
+                    clipboardDir.mkdirs()
+                    File(clipboardDir, relDir).outputStream().use {
+                        zipIn.copyTo(it)
+                    }
+                }
+
+
                 entry.name.startsWith("mozc/") -> {
-                    val relDir = entry.name.split('/', limit=2).last()
+                    val relDir = entry.name.splitSlash()
 
                     assert(!relDir.contains('/'))
 
@@ -394,6 +430,18 @@ object SettingsExporter {
                     }
                 }
 
+                entry.name.startsWith("rime/") -> {
+                    val relDir = entry.name.splitSlash()
+                    val rimeDir = RimeSettings.RimeDir
+
+                    val targetFile = File(rimeDir, relDir)
+                    targetFile.parentFile!!.mkdirs()
+
+                    targetFile.outputStream().use {
+                        zipIn.copyTo(it)
+                    }
+                }
+
                 entry.name.startsWith("themes/") -> {
                     themesDir.mkdirs()
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/TextEditPopupActivity.java b/java/src/org/futo/inputmethod/latin/uix/TextEditPopupActivity.java
index b1e694c1a0..8ca4655fde 100644
--- a/java/src/org/futo/inputmethod/latin/uix/TextEditPopupActivity.java
+++ b/java/src/org/futo/inputmethod/latin/uix/TextEditPopupActivity.java
@@ -4,6 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.InputType;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
@@ -38,7 +39,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         editText.setHintTextColor(adjustAlpha(fgColor, 0.7f));
         editText.setHighlightColor(adjustAlpha(primaryColor, 0.7f));
         editText.setMinLines(1);
-        editText.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+        editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
 
         if (Build.VERSION_CODES.Q <= Build.VERSION.SDK_INT) {
             Drawable d;
diff --git a/java/src/org/futo/inputmethod/latin/uix/UixManager.kt b/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
index 49a493a35c..6191a1e09c 100644
--- a/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/UixManager.kt
@@ -144,6 +144,7 @@ import org.futo.inputmethod.updates.isManualUpdateTimeExpired
 import org.futo.inputmethod.updates.openManualUpdateCheck
 import org.futo.inputmethod.updates.retrieveSavedLastUpdateCheckResult
 import org.futo.inputmethod.v2keyboard.ComputedKeyboardSize
+import org.futo.inputmethod.v2keyboard.getPrimaryLayoutOverride
 import org.futo.inputmethod.v2keyboard.FloatingKeyboardSize
 import org.futo.inputmethod.v2keyboard.KeyboardSizingCalculator
 import org.futo.inputmethod.v2keyboard.OneHandedDirection
@@ -603,6 +604,11 @@ class UixManager(private val latinIME: LatinIME) {
 
     private var mainKeyboardHidden = mutableStateOf(false)
 
+    fun getCurrentLayoutName(): String =
+        getPrimaryLayoutOverride(latinIME.currentInputEditorInfo)
+            ?: latinIME.latinIMELegacy.mKeyboardSwitcher.keyboard?.mId?.mKeyboardLayoutSetName
+            ?: "qwerty"
+
     private var numSuggestionsSinceNotice = 0
     private var currentNotice: MutableState<ImportantNotice?> = mutableStateOf(null)
 
@@ -726,10 +732,12 @@ class UixManager(private val latinIME: LatinIME) {
                     isActionsExpanded = isActionsExpanded.value,
                     toggleActionsExpanded = { toggleActionsExpanded() },
                     quickClipState = run {
-                        if(!inlineStuffHiddenByTyping.value) quickClipState.value else null
+                        if(!inlineStuffHiddenByTyping.value) quickClipState.value.filterIfDismissed()
+                            else null
                     },
                     onQuickClipDismiss = { quickClipState.value = null },
-                    needToUseExpandableSuggestionUi = needToUseExpandableSuggestionUi
+                    needToUseExpandableSuggestionUi = needToUseExpandableSuggestionUi,
+                    loading = latinIME.imeManager.isImeLoading()
                 )
             }
         }
@@ -1637,6 +1645,16 @@ class UixManager(private val latinIME: LatinIME) {
         inlineStuffHiddenByTyping.value = textBlank == false
     }
 
+    fun updateEmojiTranslationsIfNeeded() {
+        if(latinIME.getSetting(SHOW_EMOJI_SUGGESTIONS)
+            && Settings.getInstance().current.needsToLookupSuggestions()
+        ) {
+            prevLocale?.let {
+                PersistentEmojiState.loadTranslationsForLanguage(latinIME, it)
+            }
+        }
+    }
+
     private var prevLocale: Locale? = null
     fun updateLocale(locale: Locale): Configuration? {
         var result: Configuration? = null
@@ -1651,7 +1669,7 @@ class UixManager(private val latinIME: LatinIME) {
             setContent()
         }
 
-        PersistentEmojiState.loadTranslationsForLanguage(latinIME, locale)
+        updateEmojiTranslationsIfNeeded()
         checkIfDictInstalled()
         return result
     }
diff --git a/java/src/org/futo/inputmethod/latin/uix/VoiceInputSettingKeys.kt b/java/src/org/futo/inputmethod/latin/uix/VoiceInputSettingKeys.kt
index 8eb4d8e18e..ef230eecbc 100644
--- a/java/src/org/futo/inputmethod/latin/uix/VoiceInputSettingKeys.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/VoiceInputSettingKeys.kt
@@ -67,4 +67,9 @@ val LANGUAGE_TOGGLES = SettingsKey(
 val USE_PERSONAL_DICT = SettingsKey(
     key = booleanPreferencesKey("use_personal_dict_voice_input"),
     default = true
+)
+
+val ANIMATE_BUBBLE = SettingsKey(
+    key = booleanPreferencesKey("animate_bubble"),
+    default = true
 )
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/ClipboardHistoryAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/ClipboardHistoryAction.kt
deleted file mode 100644
index 48b1add48f..0000000000
--- a/java/src/org/futo/inputmethod/latin/uix/actions/ClipboardHistoryAction.kt
+++ /dev/null
@@ -1,926 +0,0 @@
-package org.futo.inputmethod.latin.uix.actions
-
-import android.content.ClipDescription
-import android.content.ClipboardManager
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
-import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.intPreferencesKey
-import androidx.lifecycle.LifecycleCoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.Json
-import org.futo.inputmethod.latin.R
-import org.futo.inputmethod.latin.common.Constants
-import org.futo.inputmethod.latin.uix.Action
-import org.futo.inputmethod.latin.uix.ActionWindow
-import org.futo.inputmethod.latin.uix.DialogRequestItem
-import org.futo.inputmethod.latin.uix.PersistentActionState
-import org.futo.inputmethod.latin.uix.PersistentStateInitialization
-import org.futo.inputmethod.latin.uix.SettingsKey
-import org.futo.inputmethod.latin.uix.settings.UserSetting
-import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
-import org.futo.inputmethod.latin.uix.getSetting
-import org.futo.inputmethod.latin.uix.getSettingBlocking
-import org.futo.inputmethod.latin.uix.getUnlockedSetting
-import org.futo.inputmethod.latin.uix.isDirectBootUnlocked
-import org.futo.inputmethod.latin.uix.settings.ScrollableList
-import org.futo.inputmethod.latin.uix.settings.SettingSlider
-import org.futo.inputmethod.latin.uix.settings.SettingToggleDataStore
-import org.futo.inputmethod.latin.uix.settings.pages.ParagraphText
-import org.futo.inputmethod.latin.uix.settings.pages.PaymentSurface
-import org.futo.inputmethod.latin.uix.settings.pages.PaymentSurfaceHeading
-import org.futo.inputmethod.latin.uix.settings.useDataStore
-import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
-import org.futo.inputmethod.latin.uix.settings.userSettingToggleDataStore
-import org.futo.inputmethod.latin.uix.theme.Typography
-import java.io.File
-import kotlin.math.roundToInt
-
-val ClipboardHistoryEnabled = SettingsKey(
-    booleanPreferencesKey("enableClipboardHistory"),
-    false
-)
-
-val ClipboardHistoryItemsToKeep = SettingsKey(
-    intPreferencesKey("clipboard_history_items_to_keep"),
-    25
-)
-
-val ClipboardHistoryTimeToKeep = SettingsKey(
-    intPreferencesKey("clipboard_history_time_to_keep"),
-    3 * 24
-)
-
-val ClipboardHistorySaveSensitive = SettingsKey(
-    booleanPreferencesKey("clipboard_history_save_sensitive"),
-    false
-)
-
-val ClipboardShowPinnedOnTop = SettingsKey(
-    booleanPreferencesKey("clipboard_history_show_pinned_on_top"),
-    false
-)
-
-val ClipboardSingleColumn = SettingsKey(
-    booleanPreferencesKey("clipboard_history_single_column"),
-    false
-)
-
-val ClipboardQuickClipsEnabled = SettingsKey(
-    booleanPreferencesKey("clipboard_quick_clips_enabled"),
-    true
-)
-
-
-object UriSerializer : KSerializer<Uri> {
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
-
-    override fun serialize(encoder: Encoder, value: Uri) {
-        encoder.encodeString(value.toString())
-    }
-
-    override fun deserialize(decoder: Decoder): Uri {
-        return Uri.parse(decoder.decodeString())
-    }
-}
-
-@Serializable
-data class ClipboardEntry(
-    val timestamp: Long,
-    val pinned: Boolean,
-
-    val text: String?,
-
-    @Serializable(with = UriSerializer::class)
-    val uri: Uri?,
-    val mimeTypes: List<String>
-)
-
-private fun sanitizeClipboardText(text: String, maxLength: Int = 64): String {
-    var result = text.replace("\n", " ")
-    if(result.length > maxLength) {
-        result = result.substring(0, maxLength) + "..."
-    }
-    return result
-}
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun ClipboardEntryView(modifier: Modifier, clipboardEntry: ClipboardEntry, onPaste: (ClipboardEntry) -> Unit, onRemove: (ClipboardEntry) -> Unit, onPin: (ClipboardEntry) -> Unit) {
-    val color = if(clipboardEntry.pinned) {
-        MaterialTheme.colorScheme.primaryContainer
-    } else {
-        MaterialTheme.colorScheme.surfaceContainer
-    }
-    Surface(
-        color = color,
-        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
-        modifier = modifier
-            .padding(2.dp)
-            .combinedClickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
-                enabled = true,
-                onClick = { onPaste(clipboardEntry) },
-                onLongClick = { onPin(clipboardEntry) }
-            ),
-        shape = RoundedCornerShape(8.dp),
-    ) {
-        Column {
-            Row(modifier = Modifier.padding(0.dp)) {
-                IconButton(onClick = {
-                    onPin(clipboardEntry)
-                }, modifier = Modifier.size(32.dp)) {
-                    Icon(
-                        painterResource(id = R.drawable.push_pin),
-                        contentDescription = if(clipboardEntry.pinned) {
-                            stringResource(R.string.action_clipboard_manager_unpin_item)
-                        } else {
-                            stringResource(R.string.action_clipboard_manager_pin_item)
-                        },
-                        tint = if(clipboardEntry.pinned) {
-                            contentColorFor(color)
-                        } else {
-                            contentColorFor(color).copy(alpha = 0.5f)
-                        },
-                        modifier = Modifier.size(16.dp).rotate(
-                            if(clipboardEntry.pinned) { 0f } else { 45f }
-                        )
-                    )
-                }
-
-                Spacer(modifier = Modifier.weight(1.0f))
-
-                IconButton(onClick = {
-                    onRemove(clipboardEntry)
-                }, modifier = Modifier.size(32.dp)) {
-                    Icon(
-                        painterResource(id = R.drawable.close),
-                        contentDescription = stringResource(R.string.action_clipboard_manager_remove_item),
-                        tint = contentColorFor(color),
-                        modifier = Modifier.size(16.dp)
-                    )
-                }
-            }
-
-            val text = (clipboardEntry.text ?: "").let { sanitizeClipboardText(it) }
-
-            Text(text, modifier = Modifier.padding(8.dp, 2.dp), style = Typography.SmallMl)
-
-            Spacer(modifier = Modifier.height(8.dp))
-        }
-    }
-}
-
-
-
-@Preview(showBackground = true)
-@Composable
-fun ClipboardEntryViewPreview() {
-    val sampleText = listOf("This is an entry", "Copying text a lot", "hunter2", "https://www.example.com/forum/viewpost/1234573193.html?parameter=1234")
-    LazyVerticalStaggeredGrid(
-        modifier = Modifier.fillMaxWidth(),
-        columns = StaggeredGridCells.Adaptive(160.dp),
-        verticalItemSpacing = 4.dp,
-        horizontalArrangement = Arrangement.spacedBy(4.dp),
-    ) {
-        items(sampleText.size) {
-            ClipboardEntryView(modifier = Modifier, clipboardEntry = ClipboardEntry(0L, it % 2 == 0, sampleText[it], null, listOf()), onPin = {}, onPaste = {}, onRemove = {})
-        }
-    }
-}
-
-val DefaultClipboardEntry = ClipboardEntry(
-    timestamp = 0L,
-    pinned = true,
-    text = "Clipboard entries will appear here",
-    uri = null,
-    mimeTypes = listOf()
-)
-
-const val ClipboardFileName = "clipboard.json"
-val Context.clipboardFile get() = File(filesDir, ClipboardFileName)
-
-@OptIn(ExperimentalCoroutinesApi::class)
-private val ClipboardIOContext = Dispatchers.IO.limitedParallelism(1)
-
-class ClipboardHistoryManager(val context: Context, val coroutineScope: LifecycleCoroutineScope) : PersistentActionState {
-    var clipboardIOFailureReason = ""
-    val clipboardIOFailure = mutableStateOf(false)
-
-    companion object {
-        val onClipboardImportedFlow = MutableSharedFlow<File>()
-    }
-
-    private val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-
-    val clipboardHistory = mutableStateListOf<ClipboardEntry>()
-
-    // Primary file
-    val clipboardFile = context.clipboardFile
-
-    // Backup in case primary gets corrupted somehow
-    val clipboardFileBak = File(context.filesDir, "$ClipboardFileName.bak")
-
-    // Temporary file used during saving, after writing we delete previous backup, move primary to backup, move swap to primary
-    val clipboardFileSwap = File(context.filesDir, "$ClipboardFileName.swap")
-
-    var clipboardLoaded = false
-
-    override suspend fun onDeviceUnlocked() {
-        loadClipboard()
-    }
-
-    private val primaryClipChangedListener = object : ClipboardManager.OnPrimaryClipChangedListener {
-            override fun onPrimaryClipChanged() {
-                if (!context.getSettingBlocking(ClipboardHistoryEnabled)) return
-
-                val clip = try {
-                    clipboardManager.primaryClip
-                } catch(_: Exception) {
-                    null
-                }
-
-                // Ignore massive entries
-                val textChrSeq = clip?.getItemAt(0)?.coerceToText(context)
-                if(textChrSeq != null && textChrSeq.length > 500_000) {
-                    return
-                }
-
-                val text = textChrSeq?.toString()
-                val uri = clip?.getItemAt(0)?.uri
-
-                val timestamp = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    clip?.description?.timestamp
-                } else {
-                    null
-                } ?: System.currentTimeMillis()
-
-                val mimeTypes = List(clip?.description?.mimeTypeCount ?: 0) {
-                    clip?.description?.getMimeType(it)
-                }.filterNotNull()
-
-                val canSaveSensitive = context.getSetting(ClipboardHistorySaveSensitive)
-                val isSensitive = clip?.description?.extras?.getBoolean(
-                    ClipDescription.EXTRA_IS_SENSITIVE, false
-                ) == true
-
-                // TODO: Support images and other non-text media
-                val passesUriCheck = when {
-                    uri == null -> true
-                    text != null && mimeTypes.contains("text/plain") -> true
-                    else -> false
-                }
-                if (text != null && passesUriCheck && (!isSensitive || canSaveSensitive)) {
-                    val isAlreadyPinned = clipboardHistory.firstOrNull {
-                        ((it.text != null && it.text == text) || (it.uri != null && it.uri == uri)) && it.pinned
-                    }?.pinned ?: false
-
-                    clipboardHistory.removeAll {
-                        (it.text != null && it.text == text) || (it.uri != null && it.uri == uri)
-                    }
-
-                    val newEntry = ClipboardEntry(
-                        timestamp = timestamp,
-                        pinned = isAlreadyPinned,
-                        text = text,
-                        uri = null,
-                        mimeTypes = mimeTypes
-                    )
-                    clipboardHistory.add(newEntry)
-
-                    saveClipboard()
-                }
-            }
-        }
-
-    init {
-        coroutineScope.launch {
-            loadClipboard()
-
-            withContext(Dispatchers.Main) {
-                clipboardManager.addPrimaryClipChangedListener(primaryClipChangedListener)
-            }
-
-            onClipboardImportedFlow.collectLatest {
-                coroutineScope.ensureActive()
-                onClipboardImported(it)
-            }
-        }
-    }
-
-    private suspend fun onClipboardImported(file: File) {
-        val data = decodeFile(file).map {
-            // Restore all saved items
-            it.copy(timestamp = System.currentTimeMillis())
-        }
-
-        withContext(Dispatchers.Main) {
-            clipboardHistory.clear()
-            clipboardHistory.addAll(data)
-            clipboardLoaded = true
-        }
-
-        saveClipboard()
-    }
-
-    suspend fun pruneOldItems() = withContext(Dispatchers.Main) {
-        val numHoursToKeep = context.getSetting(ClipboardHistoryTimeToKeep)
-        val numItemsToKeep = context.getSetting(ClipboardHistoryItemsToKeep)
-        val minimumTimestamp = System.currentTimeMillis() - (numHoursToKeep * 60L * 60L * 1000L)
-        clipboardHistory.removeAll {
-            (!it.pinned) && (it.timestamp < minimumTimestamp)
-        }
-
-        // Remove duplicates of entries, if any appeared
-        // Duplicates will have same timestamp, same text, etc
-        val set = clipboardHistory.toSet()
-        if(set.size < clipboardHistory.size) {
-            clipboardHistory.clear()
-            clipboardHistory.addAll(set)
-        }
-
-        val maxItems = numItemsToKeep
-        val numUnpinnedItems = clipboardHistory.filter { !it.pinned }.size
-
-        val numItemsToRemove = numUnpinnedItems - maxItems
-        if(numItemsToRemove > 0) {
-            for(i in 0 until numItemsToRemove) {
-                val idx = clipboardHistory.indexOfFirst { !it.pinned }
-                if(idx == -1) break
-                clipboardHistory.removeAt(idx)
-            }
-        }
-    }
-
-    var saveClipboardLoadJob: Job? = null
-    internal fun saveClipboard(exiting: Boolean = false): Job? {
-        if(!context.isDirectBootUnlocked) return null
-        if(!clipboardLoaded) {
-            if(saveClipboardLoadJob?.isActive == true) return null
-
-            val currentEntries = clipboardHistory.toList()
-            saveClipboardLoadJob = coroutineScope.launch {
-                loadClipboard()
-
-                if(clipboardLoaded) {
-                    clipboardHistory.addAll(currentEntries)
-                    saveClipboard(exiting)
-                } else {
-                    clipboardIOFailure.value = true
-                }
-            }
-
-            return saveClipboardLoadJob
-        }
-
-        return coroutineScope.launch(context = ClipboardIOContext) {
-            try {
-                if(!exiting) pruneOldItems()
-
-                val list = clipboardHistory.toList()
-                val json = Json.encodeToString(list)
-
-                clipboardFileSwap.writeText(json)
-
-                // Validate it can be read
-                val decodedData = decodeFile(clipboardFileSwap)
-                if (decodedData != list) {
-                    throw Exception("Saved file data does not match expected data. Decoded: $decodedData, expected: $list")
-                }
-
-                // Move current to bak
-                if (clipboardFile.exists()) {
-                    if (!clipboardFile.renameTo(clipboardFileBak)) {
-                        throw Exception("Failed to move clipboard file backup")
-                    }
-                }
-
-                // Move swap to current
-                if (!clipboardFileSwap.renameTo(clipboardFile)) {
-                    throw Exception("Failed to swap new clipboard file")
-                }
-
-                // Finally validate it can be read
-                if (decodeFile(clipboardFile) != list) {
-                    throw Exception("Saved file data does not match expected data")
-                }
-
-                clipboardIOFailure.value = false
-            } catch (e: Exception) {
-                clipboardIOFailure.value = true
-                clipboardIOFailureReason = e.toString()
-                reportError("saveClipboard", e)
-            }
-        }
-    }
-
-    fun deleteClipboard() {
-        listOf(clipboardFile, clipboardFileSwap, clipboardFileBak).forEach {
-            if(it.exists()) it.delete()
-        }
-    }
-
-    private fun decodeFile(file: File): List<ClipboardEntry> {
-        val inputString = file.readText()
-        val data = Json.decodeFromString<List<ClipboardEntry>>(inputString)
-
-        return data
-    }
-
-    private fun reportError(during: String, e: Exception) {
-        BugViewerState.pushBug(BugInfo("ClipboardHistoryManager", """
-Clipboard IO error during $during
-
-Cause: ${e.message}
-
-Stack trace: ${e.stackTrace.map { it.toString() }}
-
---- main data start --- snip ---
-${if(clipboardFile.exists()) { clipboardFile.readText() } else { "File does not exist" }}
---- main data end --- snip ---
-
-
---- bak data start --- snip ---
-${if(clipboardFileBak.exists()) { clipboardFileBak.readText() } else { "File does not exist" }}
---- bak data end --- snip ---
-
---- swap data start --- snip ---
-${if(clipboardFileSwap.exists()) { clipboardFileSwap.readText() } else { "File does not exist" }}
---- swap data end --- snip ---
-"""))
-    }
-
-    private suspend fun loadClipboard() = withContext(ClipboardIOContext) {
-        if(!context.isDirectBootUnlocked) {
-            clipboardIOFailureReason = "Direct Boot not unlocked"
-            clipboardIOFailure.value = true
-            return@withContext
-        }
-
-        val clipboardSetting = context.getUnlockedSetting(ClipboardHistoryEnabled)
-        if(clipboardSetting == null) {
-            clipboardIOFailureReason = "Settings not unlocked"
-            clipboardIOFailure.value = true
-            return@withContext
-        }
-
-        try {
-            if(clipboardSetting == false) {
-                deleteClipboard()
-            } else if (clipboardFile.exists()) {
-                val data = try {
-                    decodeFile(clipboardFile)
-                } catch(e: Exception) {
-                    reportError("loadClipboard main, trying bak", e)
-                    if(clipboardFileBak.exists()) {
-                        decodeFile(clipboardFileBak)
-                    } else {
-                        throw e
-                    }
-                }
-
-                clipboardHistory.clear()
-                clipboardHistory.addAll(data)
-                pruneOldItems()
-            } else {
-                clipboardHistory.add(DefaultClipboardEntry)
-            }
-
-            clipboardLoaded = true
-            clipboardIOFailureReason = ""
-            clipboardIOFailure.value = false
-        } catch (e: Exception) {
-            e.printStackTrace()
-            clipboardIOFailureReason = "Exception: ${e.message}"
-            clipboardIOFailure.value = true
-
-            reportError("loadClipboard", e)
-        }
-    }
-
-    fun onPaste(item: ClipboardEntry) {
-        val itemPos = clipboardHistory.indexOf(item).coerceAtLeast(0)
-        clipboardHistory.removeAll { it == item }
-        clipboardHistory.add(itemPos, item.copy(timestamp = System.currentTimeMillis()))
-
-        saveClipboard()
-    }
-
-    fun onTogglePin(item: ClipboardEntry) {
-        var itemPos = clipboardHistory.indexOf(item).coerceAtLeast(0)
-        clipboardHistory.removeAll { it == item }
-
-        if(context.getSetting(ClipboardShowPinnedOnTop)) {
-            // With this setting, unpinning can cause the position to dramatically change, so it's
-            // better to just always reinsert into the final position which is more expected.
-            // (the final position is visually the first due to reverse iteration)
-            itemPos = clipboardHistory.size
-        }
-
-        clipboardHistory.add(itemPos, item.copy(
-                pinned = !item.pinned,
-
-                // Updating timestamp is necessary to prevent the following situation:
-                // 1. Item is past its expiration time but not removed because it's pinned
-                // 2. User unpins it (possibly by accident!)
-                // 3. Item immediately gets deleted because it's past its expiration time
-                timestamp = System.currentTimeMillis(),
-            ))
-
-        saveClipboard()
-    }
-
-    fun onRemove(item: ClipboardEntry) {
-        // Clear the clipboard if the item being removed is the current one
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // TODO: URI
-            try {
-                if ((item.text != null) && item.text == clipboardManager.primaryClip?.getItemAt(0)
-                        ?.coerceToText(context)?.toString()
-                ) {
-                    clipboardManager.clearPrimaryClip()
-                }
-            } catch(e: Exception) {
-                e.printStackTrace()
-            }
-        }
-        clipboardHistory.removeAll { it == item }
-        saveClipboard()
-    }
-
-    override suspend fun cleanUp() {
-        saveClipboard()?.join()
-    }
-
-    override fun close() {
-        clipboardManager.removePrimaryClipChangedListener(primaryClipChangedListener)
-    }
-
-}
-
-fun String.toFNV1aHash(): Long {
-    val fnvPrime: Long = 1099511628211L
-    var hash: Long = -3750763034362895579L
-
-    for (byte in this.toByteArray()) {
-        hash = hash xor byte.toLong()
-        hash *= fnvPrime
-    }
-
-    return hash
-}
-
-@OptIn(ExperimentalFoundationApi::class)
-val ClipboardHistoryAction = Action(
-    icon = R.drawable.clipboard_manager,
-    name = R.string.action_clipboard_manager_title,
-    simplePressImpl = null,
-    canShowKeyboard = true,
-    persistentState = { manager ->
-        ClipboardHistoryManager(manager.getContext(), manager.getLifecycleScope())
-    },
-    altPressImpl = PasteAction.simplePressImpl,
-    persistentStateInitialization = PersistentStateInitialization.OnKeyboardLoad,
-    windowImpl = { manager, persistent ->
-        val unlocked = !manager.isDeviceLocked()
-        val clipboardHistoryManager = persistent as ClipboardHistoryManager
-
-        manager.getLifecycleScope().launch { clipboardHistoryManager.pruneOldItems() }
-        object : ActionWindow() {
-            @Composable
-            override fun windowName(): String {
-                return stringResource(R.string.action_clipboard_manager_title)
-            }
-
-            @Composable
-            override fun WindowTitleBar(rowScope: RowScope) {
-                super.WindowTitleBar(rowScope)
-
-                val context = LocalContext.current
-
-                val clipboardHistory = useDataStore(ClipboardHistoryEnabled, blocking = true)
-                if(!clipboardHistory.value) return
-
-                if(unlocked && !clipboardHistoryManager.clipboardIOFailure.value) {
-                    IconButton(onClick = {
-                        val numUnpinnedItems =
-                            clipboardHistoryManager.clipboardHistory.count { !it.pinned }
-                        if (clipboardHistoryManager.clipboardHistory.isEmpty()) {
-                            manager.requestDialog(
-                                context.getString(R.string.action_clipboard_manager_disable_text),
-                                listOf(
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_disable_button)) {
-                                        clipboardHistory.setValue(false)
-                                    },
-                                ),
-                                {}
-                            )
-                        } else if (numUnpinnedItems == 0) {
-                            manager.requestDialog(
-                                context.getString(R.string.action_clipboard_manager_unpin_all_items_text),
-                                listOf(
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_unpin_all_items_button)) {
-                                        clipboardHistoryManager.clipboardHistory.toList().forEach {
-                                            if (it.pinned) {
-                                                clipboardHistoryManager.onTogglePin(it)
-                                            }
-                                        }
-                                    },
-                                ),
-                                {}
-                            )
-                        } else {
-                            manager.requestDialog(
-                                context.getString(R.string.action_clipboard_manager_clear_unpinned_items_text),
-                                listOf(
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
-                                    DialogRequestItem(context.getString(R.string.action_clipboard_manager_clear_unpinned_items_button)) {
-                                        clipboardHistoryManager.clipboardHistory.toList().forEach {
-                                            if (!it.pinned) {
-                                                clipboardHistoryManager.onRemove(it)
-                                            }
-                                        }
-                                    },
-                                ),
-                                {}
-                            )
-                        }
-                    }) {
-                        Icon(
-                            painterResource(id = R.drawable.close),
-                            contentDescription = stringResource(R.string.action_clipboard_manager_clear_clipboard)
-                        )
-                    }
-                }
-            }
-
-            @Composable
-            override fun WindowContents(keyboardShown: Boolean) {
-                val view = LocalView.current
-                val context = LocalContext.current
-                val clipboardHistory = useDataStore(ClipboardHistoryEnabled, blocking = true)
-                if(!unlocked) {
-                    ScrollableList {
-                        PaymentSurface(isPrimary = true) {
-                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_device_locked_title))
-
-                            ParagraphText(stringResource(R.string.action_clipboard_manager_error_device_locked_text))
-                        }
-                    }
-                } else if(clipboardHistoryManager.clipboardIOFailure.value) {
-                    ScrollableList {
-                        PaymentSurface(isPrimary = true) {
-                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_general_title))
-                            ParagraphText(
-                                stringResource(
-                                    R.string.action_clipboard_manager_error_general_text,
-                                    clipboardHistoryManager.clipboardIOFailureReason
-                                ))
-                            Button(onClick = {
-                                manager.activateAction(BugViewerAction)
-                            }, modifier = Modifier.fillMaxWidth()) {
-                                Text(stringResource(R.string.action_clipboard_manager_inspect_error_via_bugs_action))
-                            }
-                            Button(onClick = {
-                                clipboardHistoryManager.saveClipboard()
-                            }, modifier = Modifier.fillMaxWidth()) {
-                                Text(stringResource(R.string.action_clipboard_manager_retry_saving_loading))
-                            }
-                            Button(onClick = {
-                                    manager.requestDialog(
-                                        context.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_text),
-                                        listOf(
-                                            DialogRequestItem(context.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
-                                            DialogRequestItem(context.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_button)) {
-                                                clipboardHistoryManager.clipboardIOFailure.value = false
-                                                clipboardHistory.setValue(false)
-                                                clipboardHistoryManager.deleteClipboard()
-                                            },
-                                        ),
-                                        {}
-                                    )
-
-                                }, modifier = Modifier
-                                    .fillMaxWidth()
-                            ) {
-                                Text(context.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_button))
-                            }
-                        }
-                    }
-                } else if(!clipboardHistory.value) {
-                    ScrollableList {
-                        PaymentSurface(isPrimary = true) {
-                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_clipboard_history_disabled_title))
-                            ParagraphText(stringResource(R.string.action_clipboard_manager_error_clipboard_history_disabled_text_v2,
-                                    context.getSetting(ClipboardHistoryItemsToKeep),
-                                    (context.getSetting(ClipboardHistoryTimeToKeep) / 24.0f).roundToInt()
-                                )
-                            )
-                            Button(onClick = {
-                                    clipboardHistory.setValue(true)
-                                }, modifier = Modifier
-                                    .fillMaxWidth()
-                            ) {
-                                Text(stringResource(R.string.action_clipboard_manager_enable_clipboard_history_button))
-                            }
-                        }
-                    }
-                } else {
-                    val sortedList = when {
-                        useDataStoreValue(ClipboardShowPinnedOnTop) -> clipboardHistoryManager.clipboardHistory
-                            .sortedBy { it.pinned }
-
-                        else -> clipboardHistoryManager.clipboardHistory
-                    }
-
-                    val useSingleColumn = useDataStoreValue(ClipboardSingleColumn)
-                    val columns = if(useSingleColumn) {
-                        StaggeredGridCells.Fixed(1)
-                    } else {
-                        StaggeredGridCells.Adaptive(140.dp)
-                    }
-
-                    LazyVerticalStaggeredGrid(
-                        modifier = Modifier.fillMaxWidth(),
-                        columns = columns,
-                        verticalItemSpacing = 4.dp,
-                        horizontalArrangement = Arrangement.spacedBy(4.dp),
-                    ) {
-                        items(sortedList.size, key = { r_i ->
-                            val i = sortedList.size - r_i - 1
-                            val entry = sortedList[i]
-
-                            entry.text?.let {
-                                if(it.length > 512) {
-                                    // Compose really doesn't like extremely long keys, so
-                                    // to avoid crashing we just provide a hash
-                                    it.toFNV1aHash()
-                                } else {
-                                    it
-                                }
-                            } ?: i
-                            i
-                        }) { r_i ->
-                            val i = sortedList.size - r_i - 1
-                            val entry = sortedList[i]
-                            ClipboardEntryView(
-                                modifier = Modifier.animateItemPlacement(),
-                                clipboardEntry = entry, onPaste = {
-                                    if (it.uri != null) {
-                                        manager.typeUri(it.uri, it.mimeTypes)
-                                    } else if (it.text != null) {
-                                        manager.typeText(it.text)
-                                    }
-                                    clipboardHistoryManager.onPaste(it)
-                                    manager.performHapticAndAudioFeedback(Constants.CODE_OUTPUT_TEXT, view)
-                                }, onRemove = {
-                                    manager.requestDialog(
-                                        context.getString(R.string.action_clipboard_manager_remove_item_confirm_dialog, run {
-                                            sanitizeClipboardText(it.text ?: "", 24)
-                                        }),
-                                        listOf(
-                                            DialogRequestItem(
-                                                context.getString(R.string.action_clipboard_manager_cancel_action_button)
-                                            ) { },
-                                            DialogRequestItem(
-                                                context.getString(R.string.action_clipboard_manager_remove_item)
-                                            ) {
-                                                clipboardHistoryManager.onRemove(it)
-                                                manager.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
-                                            }
-                                        )
-                                    ) { }
-                                }, onPin = {
-                                    clipboardHistoryManager.onTogglePin(it)
-                                    manager.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
-                                })
-                        }
-                    }
-                }
-            }
-        }
-    },
-
-    settingsMenu = UserSettingsMenu(
-        title = R.string.action_clipboard_manager_settings_title,
-        navPath = "actions/clipboard_history",
-        registerNavPath = true,
-        settings = listOf(
-            userSettingToggleDataStore(
-                title = R.string.action_clipboard_manager_settings_show_quick_clips,
-                setting = ClipboardQuickClipsEnabled
-            ),
-
-            userSettingToggleDataStore(
-                title = R.string.typing_settings_enable_clipboard_history,
-                setting = ClipboardHistoryEnabled
-            ).copy(searchTags = R.string.typing_settings_enable_clipboard_history_tags),
-
-            UserSetting(
-                name = R.string.action_clipboard_manager_settings_maximum_clips,
-                component = {
-                    SettingSlider(
-                        stringResource(R.string.action_clipboard_manager_settings_maximum_clips),
-                        ClipboardHistoryItemsToKeep,
-                        range = 0.0f..100.0f,
-                        hardRange = 0.0f..Float.POSITIVE_INFINITY,
-                        transform = { it.toInt() },
-                    )
-                },
-                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
-            ),
-
-            UserSetting(
-                name = R.string.action_clipboard_manager_settings_hours_to_keep_clips,
-                component = {
-                    SettingSlider(
-                        stringResource(R.string.action_clipboard_manager_settings_hours_to_keep_clips),
-                        ClipboardHistoryTimeToKeep,
-                        range = 1.0f..336.0f,
-                        hardRange = 0.0f..Float.POSITIVE_INFINITY,
-                        transform = { it.toInt() },
-                    )
-                },
-                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
-            ),
-
-            UserSetting(
-                name = R.string.action_clipboard_manager_settings_save_sensitive_clips,
-                subtitle = R.string.action_clipboard_manager_settings_save_sensitive_clips_subtitle,
-                component = {
-                    SettingToggleDataStore(
-                        title = stringResource(R.string.action_clipboard_manager_settings_save_sensitive_clips),
-                        subtitle = stringResource(R.string.action_clipboard_manager_settings_save_sensitive_clips_subtitle),
-                        setting = ClipboardHistorySaveSensitive
-                    )
-                },
-                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
-            ),
-
-            userSettingToggleDataStore(
-                title = R.string.action_clipboard_manager_settings_show_pinned_above_others,
-                setting = ClipboardShowPinnedOnTop
-            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
-
-            userSettingToggleDataStore(
-                title = R.string.action_clipboard_manager_settings_list_layout,
-                setting = ClipboardSingleColumn
-            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
-        )
-    )
-)
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/EmojiAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/EmojiAction.kt
index 3526a44ed9..dd887e831a 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/EmojiAction.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/EmojiAction.kt
@@ -1,6 +1,7 @@
 package org.futo.inputmethod.latin.uix.actions
 
 import android.content.Context
+import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,8 +9,13 @@ import android.view.accessibility.AccessibilityEvent
 import android.widget.TextView
 import androidx.annotation.UiThread
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -54,8 +60,10 @@ import androidx.compose.ui.input.pointer.PointerEventPass
 import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -92,7 +100,7 @@ import kotlinx.serialization.json.jsonPrimitive
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.uix.Action
-import org.futo.inputmethod.latin.uix.ActionTextEditor
+import org.futo.inputmethod.latin.uix.ActionHeaderSearch
 import org.futo.inputmethod.latin.uix.ActionWindow
 import org.futo.inputmethod.latin.uix.AutoFitText
 import org.futo.inputmethod.latin.uix.DialogRequestItem
@@ -103,7 +111,11 @@ import org.futo.inputmethod.latin.uix.LocalKeyboardScheme
 import org.futo.inputmethod.latin.uix.PersistentActionState
 import org.futo.inputmethod.latin.uix.actions.emoji.EmojiItem
 import org.futo.inputmethod.latin.uix.actions.emoji.EmojiView
+import org.futo.inputmethod.latin.uix.theme.LocalCompatEmojiFamily
+import org.futo.inputmethod.latin.uix.theme.LocalCompatEmojiTypeface
 import org.futo.inputmethod.latin.uix.theme.Typography
+import org.futo.inputmethod.latin.uix.theme.emojiNeedsCompat
+import org.futo.inputmethod.latin.uix.theme.emojiShouldShow
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
@@ -112,7 +124,13 @@ import java.util.zip.GZIPInputStream
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
-import kotlin.streams.toList
+
+private val CompatEmojiVersions = setOf("9.0", "10.0", "12.0", "12.1", "13.0", "13.1", "14.0", "15.0", "15.1", "16.0", "17.0")
+val Context.compatEmojiTypeface: Typeface? get() = try {
+    Typeface.createFromAsset(assets, "fonts/NotoColorEmoji_api24.ttf")
+} catch(e: Exception) {
+    null
+}
 
 private fun levenshteinDistance(lhs: CharSequence, rhs: CharSequence): Int {
     val lhsLen = lhs.length
@@ -212,14 +230,18 @@ class EmojiGridAdapter(
     private val onSelectSkinTone: (PopupInfo) -> Unit,
     private val emojiCellWidth: Int,
     private val contentColor: Color,
+    private val rippleColor: Color,
+    private val emojiTypeface: Typeface?,
     var wideCellWidth: Float
 ) : ListAdapter<EmojiViewItem, RecyclerView.ViewHolder>(EmojiViewItemDiffCallback) {
 
     class EmojiViewHolder(
         context: Context,
+        rippleColor: Int,
+        emojiTypeface: Typeface?,
         width: Int,
         height: Int
-    ) : RecyclerView.ViewHolder(EmojiView(context)) {
+    ) : RecyclerView.ViewHolder(EmojiView(context, rippleColor, emojiTypeface)) {
         private val emojiView: EmojiView = (itemView as EmojiView).apply {
             layoutParams = ViewGroup.LayoutParams(width, height)
             isClickable = true
@@ -269,7 +291,7 @@ class EmojiGridAdapter(
     @UiThread
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
-            VIEW_EMOJI -> EmojiViewHolder(parent.context, width = emojiCellWidth, height = emojiCellWidth)
+            VIEW_EMOJI -> EmojiViewHolder(parent.context, width = emojiCellWidth, height = emojiCellWidth, rippleColor = rippleColor.toArgb(), emojiTypeface = emojiTypeface)
             VIEW_CATEGORY -> CategoryViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.emoji_category, parent, false))
             else -> throw RuntimeException("Unknown viewType $viewType")
         }
@@ -347,16 +369,20 @@ fun Emojis(
     val color = LocalKeyboardScheme.current.onKeyboardContainer
 
     var wideEmojiWidth by remember { mutableIntStateOf(100) }
+    val emojiTypeface = LocalCompatEmojiTypeface.current
+    val rippleColor = LocalKeyboardScheme.current.keyboardContainerPressed
     val emojiAdapter = remember {
         EmojiGridAdapter(
-            onClick,
+            onClick = onClick,
             onSelectSkinTone = {
                 activePopup = it
                 popupIsActive = true
             },
-            emojiWidth,
-            color,
-            wideEmojiWidth / 100.0f
+            emojiCellWidth = emojiWidth,
+            contentColor = color,
+            wideCellWidth = wideEmojiWidth / 100.0f,
+            emojiTypeface = emojiTypeface,
+            rippleColor = rippleColor
         )
     }
 
@@ -368,6 +394,11 @@ fun Emojis(
     var viewHeight by remember { mutableIntStateOf(0) }
     var popupSize by remember { mutableStateOf(IntSize(0, 0)) }
 
+    val blockerAlpha: Float by animateFloatAsState(
+        targetValue = if (popupIsActive) 1.0f else 0.0f
+    )
+
+
     Box(modifier = modifier) {
         AndroidView(
             factory = { context ->
@@ -460,8 +491,13 @@ fun Emojis(
                         }
                     }
                 }
+                .padding(8.dp, 0.dp)
         )
 
+        Box(Modifier.matchParentSize().background(
+            MaterialTheme.colorScheme.background.copy(alpha = blockerAlpha * 0.5f)
+        ))
+
         val posX = (activePopup?.x ?: 0) - popupSize.width / 2
         val posY = (activePopup?.y ?: 0) - popupSize.height
 
@@ -479,17 +515,31 @@ fun Emojis(
             }
             .absoluteOffset {
                 IntOffset(x, y)
-            }) {
+            },
+            enter = fadeIn(),
+            exit = fadeOut()
+        ) {
             activePopup?.let { popupInfo ->
+                val compatFamily = LocalCompatEmojiFamily.current
+                val familyToUse = remember(compatFamily, popupInfo.emoji.emoji) {
+                    if(emojiNeedsCompat(popupInfo.emoji.emoji, emojiTypeface)) {
+                        compatFamily
+                    } else {
+                        null
+                    }
+                }
                 Box {
                     Surface(
-                        color = MaterialTheme.colorScheme.primaryContainer,
+                        color = LocalKeyboardScheme.current.keyboardPress,
                         shape = RoundedCornerShape(8.dp)
                     ) {
-                        Row {
+                        Row(Modifier.padding(4.dp), horizontalArrangement = Arrangement.spacedBy(2.dp)) {
                             generateSkinToneVariants(popupInfo.emoji.emoji, emojiMap).map { emoji ->
-                                IconButton(
-                                    onClick = {
+
+                                Box(Modifier
+                                    .width(40.dp)
+                                    .height(40.dp)
+                                    .clickable {
                                         onClick(
                                             EmojiItem(
                                                 emoji = emoji,
@@ -499,13 +549,13 @@ fun Emojis(
                                             )
                                         )
                                         popupIsActive = false
-                                    }, modifier = Modifier
-                                        .width(42.dp)
-                                        .height(42.dp)
-                                ) {
-                                    Box {
-                                        Text(emoji, modifier = Modifier.align(Alignment.Center))
                                     }
+                                ) {
+                                    Text(emoji, modifier = Modifier.align(Alignment.Center),
+                                        fontFamily = familyToUse,
+                                        fontSize = with(LocalDensity.current) {
+                                            32.dp.toSp()
+                                        })
                                 }
                             }
                         }
@@ -590,11 +640,11 @@ private fun EmojiCategoriesContainer(
         }
     }
 
-    val context = LocalContext.current
+    val resources = LocalResources.current
 
     LazyRow(state = listState, modifier = modifier.padding(8.dp, 0.dp)) {
         items(categories) {
-            val localizedTitle = localizedCategoryNameMap[it.title]?.let { context.getString(it) } ?: it.title
+            val localizedTitle = localizedCategoryNameMap[it.title]?.let { resources.getString(it) } ?: it.title
             IconButton(
                 onClick = { goToCategory(it) }, modifier = if (it == activeCategoryItem) {
                     Modifier.background(
@@ -604,7 +654,7 @@ private fun EmojiCategoriesContainer(
                 } else {
                     Modifier
                 }.clearAndSetSemantics {
-                    contentDescription = context.getString(R.string.action_emoji_jump_to_category, localizedTitle)
+                    contentDescription = resources.getString(R.string.action_emoji_jump_to_category, localizedTitle)
                     toggleableState = ToggleableState(it == activeCategoryItem)
                 }
             ) {
@@ -637,14 +687,14 @@ private fun EmojiCategoriesContainer(
 
 @Composable
 private fun BackspaceKey(onBackspace: (Boolean) -> Unit) {
-    val context = LocalContext.current
+    val resources = LocalResources.current
     Box(modifier = Modifier
         .minimumInteractiveComponentSize()
         .repeatablyClickableAction(onTrigger = onBackspace)
         .size(48.dp)
         .clearAndSetSemantics {
             this.role = Role.Button
-            this.text = AnnotatedString(context.getString(R.string.spoken_description_delete))
+            this.text = AnnotatedString(resources.getString(R.string.spoken_description_delete))
         },
         contentAlignment = Alignment.Center
     ) {
@@ -726,10 +776,16 @@ fun EmojiGrid(
     val jumpCategory: MutableState<CategoryItem?> = remember { mutableStateOf(null) }
 
 
-    var emojiList = listOf(CategoryItem("Recent")) + recentEmojis.map { EmojiItemItem(it) } + categorizedEmojis
+    var emojiList = buildList<EmojiViewItem> {
+        if(recentEmojis.isNotEmpty()) {
+            add(CategoryItem("Recent"))
+            addAll(recentEmojis.map { EmojiItemItem(it) })
+        }
+        addAll(categorizedEmojis)
+    }
 
     if(isSearching) {
-        val locale = context.resources.configuration.locale
+        val locale = LocalConfiguration.current.locale
         val context = LocalContext.current
         LaunchedEffect(locale.language) {
             PersistentEmojiState.loadTranslationsForLanguage(context, locale)
@@ -879,6 +935,8 @@ class PersistentEmojiState : PersistentActionState {
             val supplementalEmoteText = context.resources.openRawResource(R.raw.supplemental_emotes)
                 .bufferedReader().readText()
 
+            val compatTypeface = context.compatEmojiTypeface
+
             withContext(Dispatchers.Default) {
                 val emojiData = Json.parseToJsonElement(text).jsonArray.toList()
                 val supplementalEmoteData = Json.parseToJsonElement(supplementalEmoteText).jsonArray
@@ -890,16 +948,20 @@ class PersistentEmojiState : PersistentActionState {
 
                 emojis.value = (emojiData + supplementalEmoteData).mapNotNull {
                     val emoji = it.jsonObject["emoji"]!!.jsonPrimitive.content
+                    val version = it.jsonObject["unicode_version"]!!.jsonPrimitive.content
+                    val description = it.jsonObject["description"]!!.jsonPrimitive.content
                     val category = it.jsonObject["category"]!!.jsonPrimitive.content
-                    val supported =
-                        emoji.codePoints().toList().all { c -> Character.getName(c) != null }
-                                || category == "ASCII"
 
                     val tags = it.jsonObject["tags"]?.jsonArray?.map { it.jsonPrimitive.content }
                         ?.toList() ?: listOf()
                     val aliases = it.jsonObject["aliases"]?.jsonArray?.map { it.jsonPrimitive.content }
                         ?.toList() ?: listOf()
 
+                    val supported = when {
+                        category == "ASCII" -> true
+                        else -> emojiShouldShow(emoji, compatTypeface)
+                    }
+
                     if(!supported) {
                         null
                     } else {
@@ -924,7 +986,7 @@ class PersistentEmojiState : PersistentActionState {
 
                         EmojiItem(
                             emoji = emoji,
-                            description = it.jsonObject["description"]!!.jsonPrimitive.content,
+                            description = description,
                             category = category,
                             skinTones = it.jsonObject["skin_tones"]?.jsonPrimitive?.booleanOrNull == true,
                             //tags = it.jsonObject["tags"]?.jsonArray?.map { it.jsonPrimitive.content }
@@ -1010,25 +1072,10 @@ val EmojiAction = Action(
 
             @Composable
             override fun WindowTitleBar(rowScope: RowScope) {
-                val context = LocalContext.current
+                val resources = LocalResources.current
                 if(searching.value) {
                     with(rowScope) {
-                        Surface(
-                            color = LocalKeyboardScheme.current.keyboardContainer,
-                            contentColor = LocalKeyboardScheme.current.onKeyboardContainer,
-                            shape = RoundedCornerShape(24.dp),
-                            modifier = Modifier
-                                .minimumInteractiveComponentSize()
-                                .padding(2.dp)
-                                .weight(1.0f)
-                        ) {
-                            Box(
-                                modifier = Modifier.padding(8.dp),
-                                contentAlignment = Alignment.CenterStart
-                            ) {
-                                ActionTextEditor(text = searchText)
-                            }
-                        }
+                        ActionHeaderSearch(searchText, Modifier.weight(1.0f))
                     }
                 } else {
                     super.WindowTitleBar(rowScope)
@@ -1055,10 +1102,10 @@ val EmojiAction = Action(
 
                     IconButton(onClick = {
                         manager.requestDialog(
-                            context.getString(R.string.action_emoji_clear_recent_emojis_question),
+                            resources.getString(R.string.action_emoji_clear_recent_emojis_question),
                             listOf(
-                                DialogRequestItem(context.getString(R.string.action_emoji_clear_recent_emojis_cancel)) {},
-                                DialogRequestItem(context.getString(R.string.action_emoji_clear_recent_emojis_clear)) {
+                                DialogRequestItem(resources.getString(R.string.action_emoji_clear_recent_emojis_cancel)) {},
+                                DialogRequestItem(resources.getString(R.string.action_emoji_clear_recent_emojis_clear)) {
                                     runBlocking {
                                         manager.getContext().resetRecentEmojis()
                                     }
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/KeyboardSizingActions.kt b/java/src/org/futo/inputmethod/latin/uix/actions/KeyboardSizingActions.kt
index 5375ea9d95..4396080b8b 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/KeyboardSizingActions.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/KeyboardSizingActions.kt
@@ -133,13 +133,15 @@ val KeyboardModeAction = Action(
                             currMode == KeyboardMode.OneHanded
                         )
 
-                        KeyboardMode(
-                            R.drawable.keyboard_split,
-                            R.drawable.keyboard_split_fill_check,
-                            stringResource(R.string.action_keyboard_modes_split),
-                            sizeCalculator, KeyboardMode.Split,
-                            currMode == KeyboardMode.Split
-                        )
+                        if(sizeCalculator.doesCurrentLayoutSupportSplit()) {
+                            KeyboardMode(
+                                R.drawable.keyboard_split,
+                                R.drawable.keyboard_split_fill_check,
+                                stringResource(R.string.action_keyboard_modes_split),
+                                sizeCalculator, KeyboardMode.Split,
+                                currMode == KeyboardMode.Split
+                            )
+                        }
 
                         KeyboardMode(
                             R.drawable.keyboard_float,
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/MemDebugAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/MemDebugAction.kt
index b9fedf63da..e7075a4519 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/MemDebugAction.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/MemDebugAction.kt
@@ -31,15 +31,19 @@ import org.futo.inputmethod.engine.general.ChineseIME
 import org.futo.inputmethod.engine.general.GeneralIME
 import org.futo.inputmethod.engine.general.JapaneseIME
 import org.futo.inputmethod.latin.LatinIME
+import org.futo.inputmethod.latin.LegacySwipeSetting
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.SwipeDecoderDictionary
 import org.futo.inputmethod.latin.settings.Settings
 import org.futo.inputmethod.latin.uix.Action
 import org.futo.inputmethod.latin.uix.ActionWindow
 import org.futo.inputmethod.latin.uix.LocalFoldingState
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
+import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
 import org.futo.inputmethod.latin.uix.theme.Typography
 import org.futo.inputmethod.v2keyboard.KeyVisualStyle
 import org.futo.inputmethod.v2keyboard.KeyboardSizeStateProvider
+import java.io.File
 
 val DebugLabel = Typography.Small.copy(fontFamily = FontFamily.Monospace)
 val DebugTitle = Typography.Body.Medium.copy(fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold)
@@ -212,6 +216,8 @@ private data class SKeyboard(
 
     val screenWidth: Int,
     val screenHeight: Int,
+    val mostCommonKeyWidth: Int,
+    val mostCommonKeyHeight: Int,
 )
 internal fun serializeKeyboard(ime: LatinIME): String {
     val keyboard = ime.latinIMELegacy.mKeyboardSwitcher.keyboard!!
@@ -245,6 +251,8 @@ internal fun serializeKeyboard(ime: LatinIME): String {
         keys = list,
         screenWidth = ime.resources.displayMetrics.widthPixels,
         screenHeight = ime.resources.displayMetrics.heightPixels,
+        mostCommonKeyWidth = keyboard.mMostCommonKeyWidth,
+        mostCommonKeyHeight = keyboard.mMostCommonKeyHeight,
     )
     return Json.encodeToString(SKeyboard.serializer(), kb)
 }
@@ -257,6 +265,12 @@ val MemoryDebugAction = Action(
     windowImpl = { manager, _ ->
         val latinIme = manager.getLatinIMEForDebug()
         object : ActionWindow() {
+            override val onlyShowAboveKeyboard: Boolean
+                get() = true
+
+            override val positionIsUserManagable: Boolean
+                get() = true
+
             @Composable
             override fun windowName(): String {
                 return stringResource(R.string.action_debug_title)
@@ -277,7 +291,46 @@ val MemoryDebugAction = Action(
 
                 val foldingState = LocalFoldingState.current
 
+                val codenameFor: (String) -> String = { pteAsset ->
+                    if(pteAsset.isBlank()) {
+                        ""
+                    } else {
+                        val metadataAsset = SwipeDecoderDictionary.metadataFor(pteAsset)
+                        val file = File(
+                            SwipeDecoderDictionary.getFilePath(
+                                manager.getContext(),
+                                metadataAsset
+                            )
+                        )
+                        val content = file.readText()
+
+                        SwipeDecoderDictionary.parseMetadataToGetCodename(content)
+                    }
+                }
                 ScrollableList {
+                    Text("Swipe Info", style = DebugTitle)
+                    SwipeDecoderDictionary.appliedLayoutInfo.let { layout ->
+                        if(useDataStoreValue(LegacySwipeSetting) == true) {
+                            Text("using legacy mode...", style = DebugLabel)
+                        } else {
+                            val scoring = SwipeDecoderDictionary.appliedScoring.value
+                            Text("universal model = ${SwipeDecoderDictionary.SWIPE_MODEL} (${remember(SwipeDecoderDictionary.SWIPE_MODEL) { codenameFor(SwipeDecoderDictionary.SWIPE_MODEL)} })", style = DebugLabel)
+                            Text("special decoder = ${SwipeDecoderDictionary.appliedLayoutInfo.decoder.ifBlank { "<none>" }} (${remember(SwipeDecoderDictionary.appliedLayoutInfo.decoder) { codenameFor(SwipeDecoderDictionary.appliedLayoutInfo.decoder)} })", style = DebugLabel)
+                            Text("context lm      = ${SwipeDecoderDictionary.appliedLayoutInfo.lm.ifBlank { "<none>" }} (${remember(SwipeDecoderDictionary.appliedLayoutInfo.lm) { codenameFor(SwipeDecoderDictionary.appliedLayoutInfo.lm)} })", style = DebugLabel)
+                            Text("scoring         γ=${scoring.gamma} λ=${scoring.lambda} β=${scoring.beta} α=${scoring.alpha}", style = DebugLabel)
+                            Text("", style = DebugLabel)
+                            Text("layout letters  = ${layout.letters}", style = DebugLabel)
+                            Text("layout scale    = ${layout.sx}, ${layout.sy}", style = DebugLabel)
+                            Text("layout offset   = ${layout.ox}, ${layout.oy}", style = DebugLabel)
+                            Text("", style = DebugLabel)
+                            Text("dictionary count   = ${SwipeDecoderDictionary.appliedTries?.size}", style = DebugLabel)
+                            Text("dictionary weights = ${SwipeDecoderDictionary.appliedTrieWeights.joinToString(", ")}", style = DebugLabel)
+                        }
+
+                    }
+
+                    Spacer(modifier = Modifier.height(8.dp))
+
                     Text("Editor Info", style = DebugTitle)
                     latinIme.currentInputEditorInfo?.let { info ->
                         Text("packageName       = ${info.packageName}",       style = DebugLabel)
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/MoreActions.kt b/java/src/org/futo/inputmethod/latin/uix/actions/MoreActions.kt
index 28596daa99..0623c1338a 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/MoreActions.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/MoreActions.kt
@@ -37,6 +37,7 @@ import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -162,6 +163,7 @@ fun MoreActionsView() {
 @Composable
 fun ActionsEditor(header: @Composable () -> Unit) {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val view = LocalView.current
 
     val initialList: List<ActionEditorItem> = if(!LocalInspectionMode.current) {
@@ -235,7 +237,7 @@ fun ActionsEditor(header: @Composable () -> Unit) {
                                     WarningTip(stringResource(R.string.action_editor_warning_too_many_pinned))
                                 }
                             }
-                            Text(it.category.name(context), modifier = Modifier.padding(top = 24.dp), style = Typography.Heading.MediumMl, color = LocalContentColor.current.copy(alpha = 0.6f))
+                            Text(it.category.name(resources), modifier = Modifier.padding(top = 24.dp), style = Typography.Heading.MediumMl, color = LocalContentColor.current.copy(alpha = 0.6f))
 
                             if(actionMap[it.category]?.isEmpty() == true && it.category != ActionCategory.entries.last()) {
                                 TextButton(onClick = {
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/Registry.kt b/java/src/org/futo/inputmethod/latin/uix/actions/Registry.kt
index dabb450cd3..4fb2736fe0 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/Registry.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/Registry.kt
@@ -1,6 +1,7 @@
 package org.futo.inputmethod.latin.uix.actions
 
 import android.content.Context
+import android.content.res.Resources
 import androidx.collection.mutableIntSetOf
 import androidx.core.content.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
@@ -9,10 +10,10 @@ import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.settings.Settings
 import org.futo.inputmethod.latin.uix.Action
-import org.futo.inputmethod.latin.uix.LangSpecAction
 import org.futo.inputmethod.latin.uix.PreferenceUtils
 import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.USE_SYSTEM_VOICE_INPUT
+import org.futo.inputmethod.latin.uix.actions.clipboard.ClipboardHistoryAction
 import org.futo.inputmethod.latin.uix.actions.fonttyper.FontTyperAction
 import org.futo.inputmethod.latin.uix.getSetting
 import org.futo.inputmethod.latin.uix.setSettingBlocking
@@ -112,8 +113,8 @@ enum class ActionCategory {
     Disabled
 }
 
-fun ActionCategory.name(context: Context): String {
-    return context.getString(when(this) {
+fun ActionCategory.name(resources: Resources): String {
+    return resources.getString(when(this) {
         ActionCategory.ActionKey -> R.string.action_kind_action_key
         ActionCategory.PinnedKey -> R.string.action_kind_pinned_key
         ActionCategory.Favorites -> R.string.action_kind_favorites
@@ -262,8 +263,8 @@ fun String.toActionList(): List<Action> = split(",").mapNotNull { AllActionsMap[
 
 val DefaultActionSettings = mapOf(
     ActionCategory.ActionKey to listOf(EmojiAction),
-    ActionCategory.PinnedKey to listOf(VoiceInputAction),
-    ActionCategory.Favorites to listOf(SwitchLanguageAction, UndoAction, RedoAction, TextEditAction, ClipboardHistoryAction, ThemeAction, KeyboardModeAction),
+    ActionCategory.PinnedKey to listOf(if(IsDebug) MemoryDebugAction else VoiceInputAction),
+    ActionCategory.Favorites to listOfNotNull(if(IsDebug) VoiceInputAction else null, SwitchLanguageAction, UndoAction, RedoAction, TextEditAction, ClipboardHistoryAction, ThemeAction, KeyboardModeAction),
     ActionCategory.More to listOf(), // Remaining actions get populated automatically by ensureWellFormed
     ActionCategory.Disabled to listOf(MemoryDebugAction, SystemVoiceInputAction, BugViewerAction)
 )
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/TextEditAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/TextEditAction.kt
index 17354fd341..5937e9c32e 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/TextEditAction.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/TextEditAction.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -23,6 +24,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
@@ -32,7 +34,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.uix.Action
@@ -94,22 +99,41 @@ fun TogglableKey(
 @Composable
 fun Modifier.repeatablyClickableAction(repeatable: Boolean = true, onTrigger: (Boolean) -> Unit): Modifier {
     val interactionSource = remember { MutableInteractionSource() }
-    val isPressed by interactionSource.collectIsPressedAsState()
-
-    LaunchedEffect(isPressed) {
-        if(isPressed) {
-            onTrigger(false)
-            if(repeatable) {
-                delay(670L)
-                while (isPressed) {
-                    onTrigger(true)
-                    delay(50L)
+    val currentOnTrigger by rememberUpdatedState(onTrigger)
+
+    LaunchedEffect(interactionSource, repeatable) {
+        var repeatJob: Job? = null
+
+        interactionSource.interactions.collect { interaction ->
+            when (interaction) {
+                is PressInteraction.Press -> {
+                    currentOnTrigger(false)
+
+                    if (repeatable) {
+                        repeatJob?.cancel()
+                        repeatJob = launch {
+                            delay(670L)
+                            while (isActive) {
+                                currentOnTrigger(true)
+                                delay(50L)
+                            }
+                        }
+                    }
+                }
+                is PressInteraction.Release,
+                is PressInteraction.Cancel -> {
+                    repeatJob?.cancel()
+                    repeatJob = null
                 }
             }
         }
     }
 
-    return this.clickable(interactionSource, indication = LocalIndication.current, onClick = { })
+    return this.clickable(
+        interactionSource = interactionSource,
+        indication = LocalIndication.current,
+        onClick = { }
+    )
 }
 
 @Composable
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/ThemeAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/ThemeAction.kt
index 7eb7e8551d..2a12dd738f 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/ThemeAction.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/ThemeAction.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.widget.Toast
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.uix.Action
@@ -29,7 +30,7 @@ val ThemeAction = Action(
             @Composable
             override fun WindowContents(keyboardShown: Boolean) {
                 val context = LocalContext.current
-
+                val resources = LocalResources.current
                 val openSettingsLambda = {
                     if(context.isDirectBootUnlocked && !manager.isDeviceLocked()) {
                         val intent = Intent()
@@ -42,7 +43,7 @@ val ThemeAction = Action(
                     } else {
                         val toast = Toast.makeText(
                             context,
-                            context.getString(R.string.action_clipboard_manager_error_device_locked_title),
+                            resources.getString(R.string.action_clipboard_manager_error_device_locked_title),
                             Toast.LENGTH_SHORT
                         )
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt
index 4bfbbca400..560e4dad18 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt
@@ -25,6 +25,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.yield
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.ANIMATE_BUBBLE
 import org.futo.inputmethod.latin.uix.AUDIO_FOCUS
 import org.futo.inputmethod.latin.uix.Action
 import org.futo.inputmethod.latin.uix.ActionWindow
@@ -127,6 +128,7 @@ private class VoiceInputActionWindow(
         val canExpandSpace = context.getSetting(CAN_EXPAND_SPACE)
         val useVAD = context.getSetting(USE_VAD_AUTOSTOP)
         val usePersonalDict = context.getSetting(USE_PERSONAL_DICT)
+        val animateBubble = context.getSetting(ANIMATE_BUBBLE)
 
         val primaryModel = model
         val languageSpecificModels = mutableMapOf<Language, ModelLoader>()
@@ -142,6 +144,7 @@ private class VoiceInputActionWindow(
         return RecognizerViewSettings(
             shouldShowInlinePartialResult = false,
             shouldShowVerboseFeedback = verboseFeedback,
+            shouldAnimateBubble = animateBubble,
             modelRunConfiguration = MultiModelRunConfiguration(
                 primaryModel = primaryModel,
                 languageSpecificModels = languageSpecificModels
@@ -163,7 +166,7 @@ private class VoiceInputActionWindow(
     private var recognizerView: MutableState<RecognizerView?> = mutableStateOf(null)
     private var modelException: MutableState<ModelDoesNotExistException?> = mutableStateOf(null)
 
-    private val initJob = manager.getLifecycleScope().launch {
+    private val initJob = manager.getLifecycleScope().launch(Dispatchers.Default) {
         yield()
         val settings = loadSettings()
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardHistoryAction.kt b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardHistoryAction.kt
new file mode 100644
index 0000000000..1f443b6363
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardHistoryAction.kt
@@ -0,0 +1,1434 @@
+package org.futo.inputmethod.latin.uix.actions.clipboard
+
+import android.content.ClipDescription
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.os.Build
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.collection.LruCache
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeightIn
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.contentColorFor
+import androidx.compose.material3.ripple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import androidx.core.util.AtomicFile
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.lifecycle.LifecycleCoroutineScope
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.Json
+import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.common.Constants
+import org.futo.inputmethod.latin.uix.Action
+import org.futo.inputmethod.latin.uix.ActionHeaderSearch
+import org.futo.inputmethod.latin.uix.ActionWindow
+import org.futo.inputmethod.latin.uix.DialogRequestItem
+import org.futo.inputmethod.latin.uix.PersistentActionState
+import org.futo.inputmethod.latin.uix.PersistentStateInitialization
+import org.futo.inputmethod.latin.uix.QuickClip
+import org.futo.inputmethod.latin.uix.SettingsKey
+import org.futo.inputmethod.latin.uix.actions.BugInfo
+import org.futo.inputmethod.latin.uix.actions.BugViewerAction
+import org.futo.inputmethod.latin.uix.actions.BugViewerState
+import org.futo.inputmethod.latin.uix.actions.PasteAction
+import org.futo.inputmethod.latin.uix.actions.fonttyper.SuperheroRenderer
+import org.futo.inputmethod.latin.uix.actions.throwIfDebug
+import org.futo.inputmethod.latin.uix.getSetting
+import org.futo.inputmethod.latin.uix.getSettingBlocking
+import org.futo.inputmethod.latin.uix.getUnlockedSetting
+import org.futo.inputmethod.latin.uix.isDirectBootUnlocked
+import org.futo.inputmethod.latin.uix.setSetting
+import org.futo.inputmethod.latin.uix.settings.ScrollableList
+import org.futo.inputmethod.latin.uix.settings.SettingSlider
+import org.futo.inputmethod.latin.uix.settings.SettingToggleDataStore
+import org.futo.inputmethod.latin.uix.settings.SettingToggleRaw
+import org.futo.inputmethod.latin.uix.settings.UserSetting
+import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
+import org.futo.inputmethod.latin.uix.settings.pages.ParagraphText
+import org.futo.inputmethod.latin.uix.settings.pages.PaymentSurface
+import org.futo.inputmethod.latin.uix.settings.pages.PaymentSurfaceHeading
+import org.futo.inputmethod.latin.uix.settings.useDataStore
+import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
+import org.futo.inputmethod.latin.uix.settings.userSettingToggleDataStore
+import org.futo.inputmethod.latin.uix.theme.Typography
+import java.io.File
+import java.security.MessageDigest
+import kotlin.math.roundToInt
+
+val ClipboardHistoryEnabled = SettingsKey(
+    booleanPreferencesKey("enableClipboardHistory"),
+    false
+)
+
+val ClipboardHistoryItemsToKeep = SettingsKey(
+    intPreferencesKey("clipboard_history_items_to_keep"),
+    25
+)
+
+val ClipboardHistoryTimeToKeep = SettingsKey(
+    intPreferencesKey("clipboard_history_time_to_keep"),
+    3 * 24
+)
+
+val ClipboardHistoryUnpinnedFileMbToKeep = SettingsKey(
+    intPreferencesKey("clipboard_history_unpinned_file_mb_to_keep"),
+    40
+)
+
+val ClipboardHistorySaveSensitive = SettingsKey(
+    booleanPreferencesKey("clipboard_history_save_sensitive"),
+    false
+)
+
+val ClipboardShowPinnedOnTop = SettingsKey(
+    booleanPreferencesKey("clipboard_history_show_pinned_on_top"),
+    false
+)
+
+val ClipboardSingleColumn = SettingsKey(
+    booleanPreferencesKey("clipboard_history_single_column"),
+    false
+)
+
+val ClipboardQuickClipsEnabled = SettingsKey(
+    booleanPreferencesKey("clipboard_quick_clips_enabled"),
+    true
+)
+
+val ClipboardSkipDeleteConfirmation = SettingsKey(
+    booleanPreferencesKey("clipboard_skip_delete_confirmation"),
+    false
+)
+
+val ClipboardSaveImages = SettingsKey(
+    booleanPreferencesKey("clipboard_save_images"),
+    true
+)
+
+val ClipboardSaveScreenshots = SettingsKey(
+    booleanPreferencesKey("clipboard_save_screenshots"),
+    false
+)
+
+val ClipboardLastBackup = SettingsKey(
+    longPreferencesKey("clipboard_last_backup"),
+    0
+)
+
+
+object UriSerializer : KSerializer<Uri> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: Uri) {
+        encoder.encodeString(value.toString())
+    }
+
+    override fun deserialize(decoder: Decoder): Uri {
+        return Uri.parse(decoder.decodeString())
+    }
+}
+
+@Serializable
+data class ClipboardEntry(
+    val timestamp: Long,
+    val pinned: Boolean,
+
+    val text: String?,
+
+    @Serializable(with = UriSerializer::class)
+    val uri: Uri?,
+    val mimeTypes: List<String>,
+
+    val backingFile: String? = null,
+    val sizeMb: Float? = null,
+)
+
+fun ClipboardEntry.getFile(context: Context): File? =
+    backingFile?.let { File(context.clipboardDir, it) }
+
+fun ClipboardEntry.fileSizeMb(context: Context): Float? =
+    sizeMb ?: getFile(context)?.let {
+        if(it.isFile) {
+            it.length() / (1024f * 1024f)
+        } else {
+            null
+        }
+    }
+
+internal fun sanitizeClipboardText(text: String, maxLength: Int = 64): String {
+    var result = text.replace("\n", " ")
+    if(result.length > maxLength) {
+        result = result.substring(0, maxLength) + "..."
+    }
+    return result
+}
+
+object ClipboardThumbCache {
+    private val cache = LruCache<String, ImageBitmap>(20)
+
+    fun getOrPut(path: String, lambda: () -> ImageBitmap?): ImageBitmap?
+        = cache[path] ?: lambda()?.also { cache.put(path, it) }
+
+    fun clear() {
+        cache.evictAll()
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ClipboardEntryView(modifier: Modifier, clipboardEntry: ClipboardEntry, onPaste: (ClipboardEntry) -> Unit, onRemove: (ClipboardEntry) -> Unit, onPin: (ClipboardEntry) -> Unit, bitmapOverride: ImageBitmap? = null) {
+    val context = LocalContext.current
+
+    val bitmap = remember(clipboardEntry) {
+        if(clipboardEntry.text == null && clipboardEntry.backingFile != null) {
+            val thumbnail = ClipboardUtil.thumbnailFor(File(context.clipboardDir, clipboardEntry.backingFile))
+            if (thumbnail.exists() || bitmapOverride != null) {
+                bitmapOverride ?: ClipboardThumbCache.getOrPut(thumbnail.name) {
+                    BitmapFactory.decodeFile(thumbnail.absolutePath)?.asImageBitmap()
+                }
+            } else {
+                null
+            }
+        } else {
+            null
+        }
+    }
+
+    val shape = RoundedCornerShape(8.dp)
+
+    val color = if(clipboardEntry.pinned) {
+        MaterialTheme.colorScheme.primaryContainer
+    } else {
+        MaterialTheme.colorScheme.surfaceContainer
+    }
+
+    val mainModifier = modifier
+        .padding(2.dp)
+        .combinedClickable(
+            interactionSource = remember { MutableInteractionSource() },
+            indication = ripple(),
+            enabled = true,
+            onClick = { onPaste(clipboardEntry) },
+            onLongClick = { onPin(clipboardEntry) }
+        ).let {
+            if(bitmap != null) {
+                val maxHeight = 120.dp
+                it
+                    .requiredHeightIn(max = maxHeight)
+                    .aspectRatio(bitmap.width.toFloat() / bitmap.height.toFloat())
+                    .requiredHeightIn(max = maxHeight)
+                    .clip(RoundedCornerShape(8.dp))
+                    .drawBehind {
+                        val canvasWidth = size.width
+                        val canvasHeight = size.height
+                        val bitmapWidth = bitmap.width.toFloat()
+                        val bitmapHeight = bitmap.height.toFloat()
+
+                        val scale = maxOf(
+                            canvasWidth / bitmapWidth,
+                            canvasHeight / bitmapHeight
+                        )
+
+                        val scaledWidth = bitmapWidth * scale
+                        val scaledHeight = bitmapHeight * scale
+
+                        val offsetX = (canvasWidth - scaledWidth) / 2
+                        val offsetY = (canvasHeight - scaledHeight) / 2
+
+                        drawImage(
+                            bitmap,
+                            srcOffset = IntOffset.Zero,
+                            srcSize = IntSize(bitmap.width, bitmap.height),
+                            dstOffset = IntOffset(offsetX.toInt(), offsetY.toInt()),
+                            dstSize = IntSize(scaledWidth.toInt(), scaledHeight.toInt())
+                        )
+
+                        val height = 32.dp.toPx()
+                        val brush = Brush.linearGradient(
+                            0.0f to color,
+                            1.0f to Color.Transparent,
+                            start = Offset.Zero,
+                            end = Offset(0.0f, height * 2.0f)
+                        )
+
+                        drawRect(brush)
+                    }
+            } else {
+                it
+            }
+        }
+
+    Surface(
+        color = if(bitmap != null) Color.Transparent else color,
+        border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant),
+        modifier = mainModifier,
+        shape = shape,
+    ) {
+        Column {
+            Row(modifier = Modifier.padding(0.dp)) {
+                IconButton(onClick = {
+                    onPin(clipboardEntry)
+                }, modifier = Modifier.size(32.dp)) {
+                    Icon(
+                        painterResource(id = R.drawable.push_pin),
+                        contentDescription = if(clipboardEntry.pinned) {
+                            stringResource(R.string.action_clipboard_manager_unpin_item)
+                        } else {
+                            stringResource(R.string.action_clipboard_manager_pin_item)
+                        },
+                        tint = if(clipboardEntry.pinned) {
+                            contentColorFor(color)
+                        } else {
+                            contentColorFor(color).copy(alpha = 0.5f)
+                        },
+                        modifier = Modifier.size(16.dp).rotate(
+                            if(clipboardEntry.pinned) { 0f } else { 45f }
+                        )
+                    )
+                }
+
+                Spacer(modifier = Modifier.weight(1.0f))
+
+                IconButton(onClick = {
+                    onRemove(clipboardEntry)
+                }, modifier = Modifier.size(32.dp)) {
+                    Icon(
+                        painterResource(id = R.drawable.close),
+                        contentDescription = stringResource(R.string.action_clipboard_manager_remove_item),
+                        tint = contentColorFor(color),
+                        modifier = Modifier.size(16.dp)
+                    )
+                }
+            }
+
+            if(clipboardEntry.text != null) {
+                val text = remember(clipboardEntry.text) { sanitizeClipboardText(clipboardEntry.text) }
+                Text(text, modifier = Modifier.padding(8.dp, 2.dp), style = Typography.SmallMl)
+            }
+
+            Spacer(modifier = Modifier.height(8.dp))
+        }
+    }
+}
+
+
+
+
+@Preview(showBackground = true)
+@Composable
+fun ClipboardEntryViewPreview() {
+    val sampleText = listOf("This is an entry", "Copying text a lot", "hunter2", "https://www.example.com/forum/viewpost/1234573193.html?parameter=1234")
+    LazyVerticalStaggeredGrid(
+        modifier = Modifier.fillMaxWidth(),
+        columns = StaggeredGridCells.Adaptive(160.dp),
+        verticalItemSpacing = 4.dp,
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        item {
+            ClipboardEntryView(
+                modifier = Modifier,
+                clipboardEntry = ClipboardEntry(0L, false, null, null, listOf("image/png"), "[test]", 0.0f),
+                onPin = {}, onPaste = {}, onRemove = {},
+                bitmapOverride = ClipboardUtil.generateCheckerboardBitmap()
+            )
+        }
+        items(sampleText.size) {
+            ClipboardEntryView(modifier = Modifier, clipboardEntry = ClipboardEntry(0L, it % 2 == 0, sampleText[it], null, listOf()), onPin = {}, onPaste = {}, onRemove = {})
+        }
+
+        item {
+            ClipboardEntryView(
+                modifier = Modifier,
+                clipboardEntry = ClipboardEntry(0L, false, null, null, listOf("image/png"), "[test]", 0.0f),
+                onPin = {}, onPaste = {}, onRemove = {},
+                bitmapOverride = ClipboardUtil.generateTestPatternBitmap()
+            )
+        }
+
+        item {
+            ClipboardEntryView(
+                modifier = Modifier,
+                clipboardEntry = ClipboardEntry(0L, false, null, null, listOf("image/png"), "[test]", 0.0f),
+                onPin = {}, onPaste = {}, onRemove = {},
+                bitmapOverride = SuperheroRenderer.render(LocalContext.current, "my clipboard image")?.asImageBitmap()
+            )
+        }
+
+        items(sampleText.size / 2) {
+            ClipboardEntryView(modifier = Modifier, clipboardEntry = ClipboardEntry(0L, it % 2 == 0, sampleText[it], null, listOf()), onPin = {}, onPaste = {}, onRemove = {})
+        }
+
+        item {
+            ClipboardEntryView(
+                modifier = Modifier,
+                clipboardEntry = ClipboardEntry(0L, false, null, null, listOf("image/png"), "[test]", 0.0f),
+                onPin = {}, onPaste = {}, onRemove = {},
+                bitmapOverride = SuperheroRenderer.render(LocalContext.current, "hey")?.asImageBitmap()
+            )
+        }
+
+        items(sampleText.size / 2) {
+            ClipboardEntryView(modifier = Modifier, clipboardEntry = ClipboardEntry(0L, it % 2 == 0, sampleText[it], null, listOf()), onPin = {}, onPaste = {}, onRemove = {})
+        }
+    }
+}
+
+val DefaultClipboardEntry = ClipboardEntry(
+    timestamp = 0L,
+    pinned = true,
+    text = "Clipboard entries will appear here",
+    uri = null,
+    mimeTypes = listOf()
+)
+
+const val ClipboardFileName = "clipboard.json"
+val Context.clipboardFile get() = File(filesDir, ClipboardFileName)
+val Context.clipboardDir get() = File(filesDir, "clipboardfiles")
+
+@OptIn(ExperimentalCoroutinesApi::class)
+private val ClipboardIOContext = Dispatchers.IO.limitedParallelism(1)
+
+class ClipboardHistoryManager(val context: Context, val coroutineScope: LifecycleCoroutineScope) : PersistentActionState {
+    var clipboardIOFailureReason = ""
+    val clipboardIOFailure = mutableStateOf(false)
+
+    companion object {
+        val onClipboardImportedFlow = MutableSharedFlow<File>()
+    }
+
+    private val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+
+    val clipboardHistory = mutableStateListOf<ClipboardEntry>()
+
+    // Primary file
+    val clipboardFile = context.clipboardFile
+    val atomicClipboardFile = AtomicFile(clipboardFile)
+
+    // Backup in case primary gets corrupted somehow
+    val clipboardFileBak = File(context.filesDir, "$ClipboardFileName.backup")
+    val clipboardFileBakLegacy = File(context.filesDir, "$ClipboardFileName.bak")
+
+    // Temporary file used during saving, after writing we delete previous backup, move primary to backup, move swap to primary
+    val clipboardFileSwap = File(context.filesDir, "$ClipboardFileName.swap")
+
+    var clipboardLoaded = false
+
+    private val screenshotHelper = ScreenshotHelper(context, coroutineScope, object : ScreenshotListener {
+        override fun onScreenshotAdded(mime: String, uri: Uri) {
+            onImageAdded(listOf(mime), uri, keepUri = true)
+        }
+
+        override fun onScreenshotChange(
+            uri: Uri,
+            checkTrashed: suspend () -> Boolean
+        ) {
+            val item = clipboardHistory.find { it.uri == uri }
+            if(item != null) {
+                coroutineScope.launch {
+                    if(checkTrashed()) {
+                        withContext(Dispatchers.Main) { onRemove(item) }
+                    }
+                }
+            }
+        }
+    })
+
+    override suspend fun onDeviceUnlocked() {
+        loadClipboard()
+    }
+
+    internal fun onImageAdded(mimeTypes: List<String>, uri: Uri, timestamp: Long = System.currentTimeMillis(), keepUri: Boolean = false) {
+        // We may get exceptions here from opening uri, invalid image, etc
+        // so let's just ignore them
+        try {
+            val targetMime = mimeTypes.firstOrNull { it == "image/png" }
+                ?: mimeTypes.firstOrNull { it == "image/jpeg" || it == "image/jpg" }
+                ?: mimeTypes.firstOrNull { it == "image/webp" }
+                ?: return
+
+            val resolver = context.contentResolver
+            val stream = resolver.openInputStream(uri) ?: return
+            val md = MessageDigest.getInstance("MD5")
+            val buffer = ByteArray(8 * 1024)
+            var totalBytes = 0L
+            var bytesRead: Int
+
+            val tempFile = File(context.cacheDir, "temp_img")
+            tempFile.outputStream().use { out ->
+                while (stream.read(buffer).also { bytesRead = it } != -1) {
+                    totalBytes += bytesRead
+                    if (totalBytes > 10 * 1024 * 1024) {
+                        tempFile.delete()
+                        return
+                    }
+                    md.update(buffer, 0, bytesRead)
+                    out.write(buffer, 0, bytesRead)
+                }
+            }
+            stream.close()
+
+            val md5Hex = md.digest().joinToString("") { "%02x".format(it) }
+            val extension = when (targetMime) {
+                "image/png" -> "png"
+                "image/jpeg", "image/jpg" -> "jpg"
+                "image/webp" -> "webp"
+                else -> "img"
+            }
+
+            context.clipboardDir.mkdirs()
+            val finalFile = File(context.clipboardDir, "$md5Hex.$extension")
+            if (!finalFile.exists()) {
+                tempFile.renameTo(finalFile)
+                ClipboardUtil.generateThumbnail(finalFile)
+            } else {
+                tempFile.delete()
+            }
+
+            val isAlreadyPinned = clipboardHistory.firstOrNull {
+                it.backingFile == finalFile.name && it.pinned
+            }?.pinned == true
+
+            clipboardHistory.removeAll { it.backingFile == finalFile.name }
+
+            val newEntry = ClipboardEntry(
+                timestamp = timestamp,
+                pinned = isAlreadyPinned,
+                text = null,
+                uri = if(keepUri) uri else null,
+                backingFile = finalFile.name,
+                sizeMb = totalBytes / (1024f * 1024f),
+                mimeTypes = listOf(targetMime)
+            )
+            clipboardHistory.add(newEntry)
+        }catch(e: Exception) {
+            throwIfDebug(e)
+        } finally {
+            saveClipboard()
+        }
+    }
+
+    private val primaryClipChangedListener = object : ClipboardManager.OnPrimaryClipChangedListener {
+            override fun onPrimaryClipChanged() {
+                if (!context.getSettingBlocking(ClipboardHistoryEnabled)) return
+
+                val clip = try {
+                    clipboardManager.primaryClip
+                } catch(_: Exception) {
+                    null
+                }
+
+                val uri = clip?.getItemAt(0)?.uri
+                val mimeTypes = List(clip?.description?.mimeTypeCount ?: 0) {
+                    clip?.description?.getMimeType(it)
+                }.filterNotNull()
+
+                // Text is only possible if no URI is specified, or a text mimetype is specified
+                var textChrSeq = if(uri == null || mimeTypes.any { it.startsWith("text/") }){
+                    clip?.getItemAt(0)?.coerceToText(context)
+                } else null
+
+                // Ignore massive entries
+                if(textChrSeq != null && textChrSeq.length > 500_000) {
+                    textChrSeq = null
+                }
+
+                val text = textChrSeq?.toString()
+
+                // Nothing to save here
+                if(text == null && uri == null) return
+
+                val timestamp = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    clip?.description?.timestamp
+                } else {
+                    null
+                } ?: System.currentTimeMillis()
+
+
+                val canSaveSensitive = context.getSetting(ClipboardHistorySaveSensitive)
+                val canSaveImages = context.getSetting(ClipboardSaveImages)
+                val isSensitive = clip?.description?.extras?.getBoolean(
+                    ClipDescription.EXTRA_IS_SENSITIVE, false
+                ) == true
+
+                if(isSensitive && !canSaveSensitive) return
+
+                if(text != null) {
+                    val isAlreadyPinned = clipboardHistory.firstOrNull {
+                        (it.text != null && it.text == text) && it.pinned
+                    }?.pinned == true
+
+                    clipboardHistory.removeAll { it.text != null && it.text == text }
+
+                    val newEntry = ClipboardEntry(
+                        timestamp = timestamp,
+                        pinned = isAlreadyPinned,
+                        text = text,
+                        uri = null,
+                        mimeTypes = mimeTypes
+                    )
+                    clipboardHistory.add(newEntry)
+
+                    saveClipboard()
+                }else if (uri != null && canSaveImages) {
+                    onImageAdded(mimeTypes, uri, timestamp)
+                }
+            }
+        }
+
+    init {
+        coroutineScope.launch {
+            loadClipboard()
+
+            withContext(Dispatchers.Main) {
+                clipboardManager.addPrimaryClipChangedListener(primaryClipChangedListener)
+            }
+
+            onClipboardImportedFlow.collectLatest {
+                coroutineScope.ensureActive()
+                onClipboardImported(it)
+            }
+        }
+    }
+
+    private suspend fun onClipboardImported(file: File) {
+        migrateLegacyClipboardBak()
+        val data = decodeFile(file).map {
+            // Restore all saved items
+            it.copy(timestamp = System.currentTimeMillis())
+        }
+
+        withContext(Dispatchers.Main) {
+            clipboardHistory.clear()
+            clipboardHistory.addAll(data)
+            clipboardLoaded = true
+        }
+
+        saveClipboard()
+    }
+
+    suspend fun pruneOldItems() = withContext(Dispatchers.Main) {
+        val numHoursToKeep = context.getSetting(ClipboardHistoryTimeToKeep)
+        val numItemsToKeep = context.getSetting(ClipboardHistoryItemsToKeep)
+        val megabytesToKeep = context.getSetting(ClipboardHistoryUnpinnedFileMbToKeep)
+        val minimumTimestamp = System.currentTimeMillis() - (numHoursToKeep * 60L * 60L * 1000L)
+        clipboardHistory.removeAll {
+            (!it.pinned) && (it.timestamp < minimumTimestamp)
+        }
+
+        // Remove duplicates of entries, if any appeared
+        // Duplicates will have same timestamp, same text, etc
+        val set = clipboardHistory.toSet()
+        if(set.size < clipboardHistory.size) {
+            clipboardHistory.clear()
+            clipboardHistory.addAll(set)
+        }
+
+        val maxItems = numItemsToKeep
+        val numUnpinnedItems = clipboardHistory.filter { !it.pinned }.size
+
+        val numItemsToRemove = numUnpinnedItems - maxItems
+        if(numItemsToRemove > 0) {
+            for(i in 0 until numItemsToRemove) {
+                val idx = clipboardHistory.indexOfFirst { !it.pinned }
+                if(idx == -1) break
+                clipboardHistory.removeAt(idx)
+            }
+        }
+
+        // Remove entries with nonexistent files
+        clipboardHistory.removeAll {
+            it.backingFile != null && it.getFile(context).let { it == null || !it.isFile }
+        }
+
+        // Limit size
+        val removalCandidates = clipboardHistory.filter { it.backingFile != null && !it.pinned }
+            .sortedBy { -it.timestamp }
+        val removalItems = mutableListOf<ClipboardEntry>()
+
+        var quotaUsed = 0.0f
+        for(candidate in removalCandidates) {
+            val size = candidate.fileSizeMb(context)
+            if(size != null) {
+                quotaUsed += size
+                if(quotaUsed > megabytesToKeep) removalItems.add(candidate)
+            } else {
+                removalItems.add(candidate)
+            }
+        }
+
+        removalItems.forEach { clipboardHistory.remove(it) }
+
+        // Remove unreferenced files
+        val stillReferenced = clipboardHistory
+            .mapNotNull { it.backingFile }
+            .flatMap { listOf(it, ClipboardUtil.thumbnailForName(it)) }
+            .toHashSet()
+
+        context.clipboardDir.listFiles()?.forEach {
+            if(!stillReferenced.contains(it.name)) {
+                it.delete()
+            }
+        }
+    }
+
+    private fun migrateLegacyClipboardBak() {
+        // AtomicFile interprets a (filename + ".bak") file entirely differently, we
+        // need to make sure it's gone before any AtomicFile operations.
+        if(clipboardFileBakLegacy.exists()) { clipboardFileBakLegacy.renameTo(clipboardFileBak) }
+    }
+
+    var saveClipboardLoadJob: Job? = null
+    var lastClipboardWritten: List<ClipboardEntry>? = null
+    internal fun saveClipboard(): Job? {
+        if(!context.isDirectBootUnlocked) return null
+        if(!clipboardLoaded) {
+            if(saveClipboardLoadJob?.isActive == true) return null
+
+            val currentEntries = clipboardHistory.toList()
+            saveClipboardLoadJob = coroutineScope.launch {
+                loadClipboard()
+
+                if(clipboardLoaded) {
+                    clipboardHistory.addAll(currentEntries)
+                    saveClipboard()
+                } else {
+                    clipboardIOFailure.value = true
+                }
+            }
+
+            return saveClipboardLoadJob
+        }
+
+        return coroutineScope.launch(context = ClipboardIOContext) {
+            try {
+                val list = withContext(Dispatchers.Main) { clipboardHistory.toList() }
+                val json = Json.encodeToString(list).toByteArray()
+
+                if(list == lastClipboardWritten) return@launch
+
+                // Once every day only
+                val shouldBackup = (System.currentTimeMillis() - context.getSetting(ClipboardLastBackup)) > 1000L * 60L * 60L * 24L * 1L
+                var backupSucceeded = false
+
+
+                withContext(NonCancellable) {
+                    synchronized(atomicClipboardFile) {
+                        migrateLegacyClipboardBak()
+
+                        // Produce a backup
+                        if (clipboardFile.exists() && shouldBackup) {
+                            val existingData = atomicClipboardFile.readFully()
+
+                            val isValid = try {
+                                decodeData(existingData).isNotEmpty()
+                            } catch (_: Exception) {
+                                false
+                            }
+                            if (isValid) {
+                                val atomicBackup = AtomicFile(clipboardFileBak)
+
+                                val stream = atomicBackup.startWrite()
+                                try {
+                                    stream.write(existingData)
+                                    stream.flush()
+                                    atomicBackup.finishWrite(stream)
+                                    backupSucceeded = true
+                                } catch (e: Exception) {
+                                    atomicBackup.failWrite(stream)
+                                }
+                            }
+                        }
+
+                        val stream = atomicClipboardFile.startWrite()
+                        try {
+                            stream.write(json)
+                            stream.flush()
+                            atomicClipboardFile.finishWrite(stream)
+                            lastClipboardWritten = list
+                        } catch (e: Exception) {
+                            atomicClipboardFile.failWrite(stream)
+                            throw e
+                        }
+                    }
+                }
+
+                if(backupSucceeded) {
+                    context.setSetting(ClipboardLastBackup, System.currentTimeMillis())
+                }
+
+                // Finally validate it can be read
+                if (decodeFile(clipboardFile) != list) {
+                    throw Exception("Saved file data does not match expected data")
+                }
+
+                clipboardIOFailure.value = false
+            } catch (e: Exception) {
+                if(e is CancellationException) return@launch
+
+                clipboardIOFailure.value = true
+                clipboardIOFailureReason = e.toString()
+                reportError("saveClipboard", e)
+            }
+        }
+    }
+
+    fun deleteClipboard() {
+        listOf(clipboardFile, clipboardFileSwap, clipboardFileBak).forEach {
+            if(it.exists()) it.delete()
+        }
+    }
+
+    private fun decodeData(data: ByteArray): List<ClipboardEntry> =
+        Json.decodeFromString<List<ClipboardEntry>>(data.decodeToString())
+
+    private fun decodeFile(file: File): List<ClipboardEntry> =
+        decodeData(AtomicFile(file).readFully())
+
+    private fun reportError(during: String, e: Exception) {
+        BugViewerState.pushBug(BugInfo("ClipboardHistoryManager", """
+Clipboard IO error during $during
+
+Cause: ${e.message}
+
+Stack trace: ${e.stackTrace.map { it.toString() }}
+
+--- main data start --- snip ---
+${if(clipboardFile.exists()) { clipboardFile.readText() } else { "File does not exist" }}
+--- main data end --- snip ---
+
+
+--- bak data start --- snip ---
+${if(clipboardFileBak.exists()) { clipboardFileBak.readText() } else { "File does not exist" }}
+--- bak data end --- snip ---
+
+--- swap data start --- snip ---
+${if(clipboardFileSwap.exists()) { clipboardFileSwap.readText() } else { "File does not exist" }}
+--- swap data end --- snip ---
+"""))
+    }
+
+    private suspend fun loadClipboard() = withContext(ClipboardIOContext) {
+        if(!context.isDirectBootUnlocked) {
+            clipboardIOFailureReason = "Direct Boot not unlocked"
+            clipboardIOFailure.value = true
+            return@withContext
+        }
+
+        val clipboardSetting = context.getUnlockedSetting(ClipboardHistoryEnabled)
+        if(clipboardSetting == null) {
+            clipboardIOFailureReason = "Settings not unlocked"
+            clipboardIOFailure.value = true
+            return@withContext
+        }
+
+        try {
+            if(clipboardSetting == false) {
+                deleteClipboard()
+            } else if (clipboardFile.exists()) {
+                migrateLegacyClipboardBak()
+                val data = synchronized(atomicClipboardFile) {
+                    try {
+                        decodeFile(clipboardFile)
+                    } catch(e: Exception) {
+                        reportError("loadClipboard main, trying bak", e)
+                        if(clipboardFileBak.exists()) {
+                            decodeFile(clipboardFileBak)
+                        } else {
+                            throw e
+                        }
+                    }
+                }
+
+                clipboardHistory.clear()
+                clipboardHistory.addAll(data)
+                pruneOldItems()
+            } else {
+                clipboardHistory.add(DefaultClipboardEntry)
+            }
+
+            clipboardLoaded = true
+            clipboardIOFailureReason = ""
+            clipboardIOFailure.value = false
+        } catch (e: Exception) {
+            e.printStackTrace()
+            clipboardIOFailureReason = "Exception: ${e.message}"
+            clipboardIOFailure.value = true
+
+            reportError("loadClipboard", e)
+        }
+    }
+
+    fun onPaste(item: ClipboardEntry) {
+        val itemPos = clipboardHistory.indexOf(item).coerceAtLeast(0)
+        clipboardHistory.removeAll { it == item }
+        clipboardHistory.add(itemPos, item.copy(timestamp = System.currentTimeMillis()))
+
+        saveClipboard()
+    }
+
+    fun onTogglePin(item: ClipboardEntry) {
+        var itemPos = clipboardHistory.indexOf(item).coerceAtLeast(0)
+        clipboardHistory.removeAll { it == item }
+
+        if(context.getSetting(ClipboardShowPinnedOnTop)) {
+            // With this setting, unpinning can cause the position to dramatically change, so it's
+            // better to just always reinsert into the final position which is more expected.
+            // (the final position is visually the first due to reverse iteration)
+            itemPos = clipboardHistory.size
+        }
+
+        clipboardHistory.add(itemPos, item.copy(
+                pinned = !item.pinned,
+
+                // Updating timestamp is necessary to prevent the following situation:
+                // 1. Item is past its expiration time but not removed because it's pinned
+                // 2. User unpins it (possibly by accident!)
+                // 3. Item immediately gets deleted because it's past its expiration time
+                timestamp = System.currentTimeMillis(),
+            ))
+
+        saveClipboard()
+    }
+
+    fun onRemove(item: ClipboardEntry) {
+        // Clear the clipboard if the item being removed is the current one
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            // TODO: URI
+            try {
+                if ((item.text != null) && item.text == clipboardManager.primaryClip?.getItemAt(0)
+                        ?.coerceToText(context)?.toString()
+                ) {
+                    clipboardManager.clearPrimaryClip()
+                    QuickClip.markQuickClipDismissed()
+                }
+            } catch(e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        clipboardHistory.removeAll { it == item }
+        saveClipboard()
+    }
+
+    override suspend fun cleanUp() {
+        saveClipboard()?.join()
+    }
+
+    override fun close() {
+        clipboardManager.removePrimaryClipChangedListener(primaryClipChangedListener)
+        screenshotHelper.onDestroy()
+    }
+
+}
+
+fun String.toFNV1aHash(): Long {
+    val fnvPrime: Long = 1099511628211L
+    var hash: Long = -3750763034362895579L
+
+    for (byte in this.toByteArray()) {
+        hash = hash xor byte.toLong()
+        hash *= fnvPrime
+    }
+
+    return hash
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+val ClipboardHistoryAction = Action(
+    icon = R.drawable.clipboard_manager,
+    name = R.string.action_clipboard_manager_title,
+    simplePressImpl = null,
+    canShowKeyboard = true,
+    persistentState = { manager ->
+        ClipboardHistoryManager(manager.getContext(), manager.getLifecycleScope())
+    },
+    altPressImpl = PasteAction.simplePressImpl,
+    persistentStateInitialization = PersistentStateInitialization.OnKeyboardLoad,
+    windowImpl = { manager, persistent ->
+        val searching = mutableStateOf(false)
+        val searchText = mutableStateOf("")
+        val unlocked = !manager.isDeviceLocked()
+        val clipboardHistoryManager = persistent as ClipboardHistoryManager
+
+        manager.getLifecycleScope().launch { clipboardHistoryManager.pruneOldItems() }
+        object : ActionWindow() {
+            @Composable
+            override fun windowName(): String {
+                return stringResource(R.string.action_clipboard_manager_title)
+            }
+
+            @Composable
+            override fun WindowTitleBar(rowScope: RowScope) = with(rowScope) {
+                if(searching.value) {
+                    ActionHeaderSearch(searchText, Modifier.weight(1.0f),
+                        placeholder = stringResource(R.string.action_clipboard_manager_enter_your_search))
+                    return
+                }
+
+                Text(windowName(), modifier = Modifier.align(Alignment.CenterVertically))
+                Spacer(modifier = Modifier.weight(1.0f))
+
+                val resources = LocalResources.current
+
+                val clipboardHistory = useDataStore(ClipboardHistoryEnabled, blocking = true)
+                if(!clipboardHistory.value) return
+
+                if(unlocked
+                    && !clipboardHistoryManager.clipboardIOFailure.value
+                ) {
+                    IconButton(onClick = {
+                        searching.value = true
+                    }) {
+                        Icon(
+                            Icons.Default.Search,
+                            contentDescription = stringResource(R.string.action_clipboard_manager_search)
+                        )
+                    }
+                    IconButton(onClick = {
+                        val numUnpinnedItems =
+                            clipboardHistoryManager.clipboardHistory.count { !it.pinned }
+                        if (clipboardHistoryManager.clipboardHistory.isEmpty()) {
+                            manager.requestDialog(
+                                resources.getString(R.string.action_clipboard_manager_disable_text),
+                                listOf(
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_disable_button)) {
+                                        clipboardHistory.setValue(false)
+                                    },
+                                ),
+                                {}
+                            )
+                        } else if (numUnpinnedItems == 0) {
+                            manager.requestDialog(
+                                resources.getString(R.string.action_clipboard_manager_unpin_all_items_text),
+                                listOf(
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_unpin_all_items_button)) {
+                                        clipboardHistoryManager.clipboardHistory.toList().forEach {
+                                            if (it.pinned) {
+                                                clipboardHistoryManager.onTogglePin(it)
+                                            }
+                                        }
+                                    },
+                                ),
+                                {}
+                            )
+                        } else {
+                            manager.requestDialog(
+                                resources.getString(R.string.action_clipboard_manager_clear_unpinned_items_text),
+                                listOf(
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
+                                    DialogRequestItem(resources.getString(R.string.action_clipboard_manager_clear_unpinned_items_button)) {
+                                        clipboardHistoryManager.clipboardHistory.toList().forEach {
+                                            if (!it.pinned) {
+                                                clipboardHistoryManager.onRemove(it)
+                                            }
+                                        }
+                                    },
+                                ),
+                                {}
+                            )
+                        }
+                    }) {
+                        Icon(
+                            painterResource(id = R.drawable.close),
+                            contentDescription = stringResource(R.string.action_clipboard_manager_clear_clipboard)
+                        )
+                    }
+                }
+            }
+
+            @Composable
+            override fun WindowContents(keyboardShown: Boolean) {
+                val view = LocalView.current
+                val context = LocalContext.current
+                val resources = LocalResources.current
+                val clipboardHistory = useDataStore(ClipboardHistoryEnabled, blocking = true)
+                if(!unlocked) {
+                    ScrollableList {
+                        PaymentSurface(isPrimary = true) {
+                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_device_locked_title))
+
+                            ParagraphText(stringResource(R.string.action_clipboard_manager_error_device_locked_text))
+                        }
+                    }
+                } else if(clipboardHistoryManager.clipboardIOFailure.value) {
+                    ScrollableList {
+                        PaymentSurface(isPrimary = true) {
+                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_general_title))
+                            ParagraphText(
+                                stringResource(
+                                    R.string.action_clipboard_manager_error_general_text,
+                                    clipboardHistoryManager.clipboardIOFailureReason
+                                ))
+                            Button(onClick = {
+                                manager.activateAction(BugViewerAction)
+                            }, modifier = Modifier.fillMaxWidth()) {
+                                Text(stringResource(R.string.action_clipboard_manager_inspect_error_via_bugs_action))
+                            }
+                            Button(onClick = {
+                                clipboardHistoryManager.saveClipboard()
+                            }, modifier = Modifier.fillMaxWidth()) {
+                                Text(stringResource(R.string.action_clipboard_manager_retry_saving_loading))
+                            }
+                            Button(onClick = {
+                                    manager.requestDialog(
+                                        resources.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_text),
+                                        listOf(
+                                            DialogRequestItem(resources.getString(R.string.action_clipboard_manager_cancel_action_button)) {},
+                                            DialogRequestItem(resources.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_button)) {
+                                                clipboardHistoryManager.clipboardIOFailure.value = false
+                                                clipboardHistory.setValue(false)
+                                                clipboardHistoryManager.deleteClipboard()
+                                            },
+                                        ),
+                                        {}
+                                    )
+
+                                }, modifier = Modifier
+                                    .fillMaxWidth()
+                            ) {
+                                Text(resources.getString(R.string.action_clipboard_manager_delete_corrupted_clipboard_button))
+                            }
+                        }
+                    }
+                } else if(!clipboardHistory.value) {
+                    ScrollableList {
+                        PaymentSurface(isPrimary = true) {
+                            PaymentSurfaceHeading(title = stringResource(R.string.action_clipboard_manager_error_clipboard_history_disabled_title))
+                            ParagraphText(stringResource(R.string.action_clipboard_manager_error_clipboard_history_disabled_text_v2,
+                                    context.getSetting(ClipboardHistoryItemsToKeep),
+                                    (context.getSetting(ClipboardHistoryTimeToKeep) / 24.0f).roundToInt()
+                                )
+                            )
+                            Button(onClick = {
+                                    clipboardHistory.setValue(true)
+                                }, modifier = Modifier
+                                    .fillMaxWidth()
+                            ) {
+                                Text(stringResource(R.string.action_clipboard_manager_enable_clipboard_history_button))
+                            }
+                        }
+                    }
+                } else {
+                    
+                    Column(modifier = Modifier.fillMaxWidth()) {
+                        val searchQuery = searchText.value
+                        if(searching.value && searchQuery.isBlank()) {
+                            return
+                        }
+
+                        val showPinnedOnTop = useDataStoreValue(ClipboardShowPinnedOnTop)
+                        val clipboardList = run {
+                            val filtered = clipboardHistoryManager.clipboardHistory.filter {
+                                !searching.value
+                                        || it.text?.contains(searchQuery, ignoreCase = true) == true
+                                        || it.mimeTypes.any { mime ->
+                                    mime.contains(
+                                        searchQuery,
+                                        ignoreCase = true
+                                    )
+                                }
+                            }
+
+                            val sorted = when {
+                                showPinnedOnTop -> filtered.sortedBy { it.pinned }
+                                else -> filtered
+                            }
+
+                            sorted
+                        }
+
+                        if(clipboardList.isEmpty() && searching.value && searchQuery.isNotEmpty() && clipboardHistoryManager.clipboardHistory.isNotEmpty()) {
+                            Text(
+                                stringResource(R.string.action_clipboard_manager_no_clips_found),
+                                style = Typography.Body.Medium.copy(fontStyle = FontStyle.Italic),
+                                color = MaterialTheme.colorScheme.outline,
+                                textAlign = TextAlign.Center,
+                                modifier = Modifier
+                                    .padding(16.dp)
+                                    .fillMaxWidth()
+                            )
+                            return
+                        }
+
+                        val useSingleColumn = useDataStoreValue(ClipboardSingleColumn)
+                        val columns = if(useSingleColumn) {
+                            StaggeredGridCells.Fixed(1)
+                        } else {
+                            StaggeredGridCells.Adaptive(140.dp)
+                        }
+
+                        LazyVerticalStaggeredGrid(
+                            modifier = Modifier.fillMaxWidth(),
+                            columns = columns,
+                            verticalItemSpacing = 4.dp,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
+                        ) {
+                            items(clipboardList.size, key = { r_i ->
+                                val i = clipboardList.size - r_i - 1
+                                val entry = clipboardList[i]
+
+                                entry.text?.let {
+                                    if(it.length > 512) {
+                                        // Compose really doesn't like extremely long keys, so
+                                        // to avoid crashing we just provide a hash
+                                        it.toFNV1aHash()
+                                    } else {
+                                        it
+                                    }
+                                } ?: entry.backingFile ?: i
+                                i
+                            }) { r_i ->
+                                val i = clipboardList.size - r_i - 1
+                                val entry = clipboardList[i]
+                                ClipboardEntryView(
+                                    modifier = Modifier.animateItem(),
+                                    clipboardEntry = entry, onPaste = {
+                                        if(it.text != null) {
+                                            manager.typeText(it.text)
+                                        } else if(it.backingFile != null && it.mimeTypes.isNotEmpty()) {
+                                            val request = ClipboardProviderState.addRequest(
+                                                ClipboardPasteRequest(
+                                                    file = File(context.clipboardDir, it.backingFile),
+                                                    mimeType = it.mimeTypes.first(),
+                                                    expiration = System.currentTimeMillis() + 5L * 60L * 1000L
+                                                )
+                                            )
+
+                                            val uri = "content://${CLIPBOARD_AUTHORITY}/clip/$request".toUri()
+                                            manager.typeUri(uri, it.mimeTypes, true)
+                                        }
+
+                                        clipboardHistoryManager.onPaste(it)
+                                        manager.performHapticAndAudioFeedback(Constants.CODE_OUTPUT_TEXT, view)
+                                    }, onRemove = {
+                                        if(context.getSetting(ClipboardSkipDeleteConfirmation) && !it.pinned) {
+                                            clipboardHistoryManager.onRemove(it)
+                                            manager.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
+                                        } else {
+                                            manager.requestDialog(
+                                                if(it.backingFile != null && it.text == null) {
+                                                    resources.getString(R.string.action_clipboard_manager_remove_item_confirm_dialog_image)
+                                                } else {
+                                                    resources.getString(
+                                                        R.string.action_clipboard_manager_remove_item_confirm_dialog,
+                                                        sanitizeClipboardText(it.text ?: "", 24)
+                                                    )
+                                                },
+                                                listOf(
+                                                    DialogRequestItem(
+                                                        resources.getString(R.string.action_clipboard_manager_cancel_action_button)
+                                                    ) { },
+                                                    DialogRequestItem(
+                                                        resources.getString(R.string.action_clipboard_manager_remove_item)
+                                                    ) {
+                                                        clipboardHistoryManager.onRemove(it)
+                                                        manager.performHapticAndAudioFeedback(
+                                                            Constants.CODE_TAB,
+                                                            view
+                                                        )
+                                                    }
+                                                )
+                                            ) { }
+                                        }
+                                    }, onPin = {
+                                        clipboardHistoryManager.onTogglePin(it)
+                                        manager.performHapticAndAudioFeedback(Constants.CODE_TAB, view)
+                                    })
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    settingsMenu = UserSettingsMenu(
+        title = R.string.action_clipboard_manager_settings_title,
+        navPath = "actions/clipboard_history",
+        registerNavPath = true,
+        settings = listOf(
+            userSettingToggleDataStore(
+                title = R.string.action_clipboard_manager_settings_show_quick_clips,
+                setting = ClipboardQuickClipsEnabled
+            ),
+
+            userSettingToggleDataStore(
+                title = R.string.typing_settings_enable_clipboard_history,
+                setting = ClipboardHistoryEnabled
+            ).copy(searchTags = R.string.typing_settings_enable_clipboard_history_tags),
+
+            userSettingToggleDataStore(
+                title = R.string.action_clipboard_manager_settings_save_images,
+                setting = ClipboardSaveImages
+            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
+
+            UserSetting(
+                name = R.string.action_clipboard_manager_settings_save_screenshots,
+                component = {
+                    val context = LocalContext.current
+                    val (enabled, setEnabled) = useDataStore(ClipboardSaveScreenshots)
+
+                    val permission = ScreenshotHelper.permission
+
+                    val launcher = rememberLauncherForActivityResult(
+                        ActivityResultContracts.RequestPermission()
+                    ) { isGranted: Boolean ->
+                        if (isGranted) {
+                            setEnabled(true)
+                        } else {
+                            setEnabled(false)
+                        }
+                    }
+
+                    SettingToggleRaw(
+                        title = stringResource(R.string.action_clipboard_manager_settings_save_screenshots),
+                        subtitle = if(enabled) null else stringResource(R.string.action_clipboard_manager_settings_save_screenshots_subtitle),
+                        enabled = enabled,
+                        setValue = {
+                            if(!it) setEnabled(false) else {
+                                if (ContextCompat.checkSelfPermission(
+                                        context,
+                                        permission
+                                    ) == PackageManager.PERMISSION_GRANTED
+                                ) {
+                                    setEnabled(true)
+                                } else {
+                                    launcher.launch(permission)
+                                }
+                            }
+                        }
+                    )
+                },
+                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
+            ),
+            UserSetting(
+                name = R.string.action_clipboard_manager_settings_maximum_clips,
+                component = {
+                    SettingSlider(
+                        stringResource(R.string.action_clipboard_manager_settings_maximum_clips),
+                        ClipboardHistoryItemsToKeep,
+                        range = 0.0f..100.0f,
+                        hardRange = 0.0f..Float.POSITIVE_INFINITY,
+                        transform = { it.toInt() },
+                    )
+                },
+                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
+            ),
+
+            UserSetting(
+                name = R.string.action_clipboard_manager_settings_hours_to_keep_clips,
+                component = {
+                    SettingSlider(
+                        stringResource(R.string.action_clipboard_manager_settings_hours_to_keep_clips),
+                        ClipboardHistoryTimeToKeep,
+                        range = 1.0f..336.0f,
+                        hardRange = 0.0f..Float.POSITIVE_INFINITY,
+                        transform = { it.toInt() },
+                    )
+                },
+                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
+            ),
+
+            UserSetting(
+                name = R.string.action_clipboard_manager_settings_save_sensitive_clips,
+                subtitle = R.string.action_clipboard_manager_settings_save_sensitive_clips_subtitle,
+                component = {
+                    SettingToggleDataStore(
+                        title = stringResource(R.string.action_clipboard_manager_settings_save_sensitive_clips),
+                        subtitle = stringResource(R.string.action_clipboard_manager_settings_save_sensitive_clips_subtitle),
+                        setting = ClipboardHistorySaveSensitive
+                    )
+                },
+                visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }
+            ),
+
+            userSettingToggleDataStore(
+                title = R.string.action_clipboard_manager_settings_show_pinned_above_others,
+                setting = ClipboardShowPinnedOnTop
+            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
+
+            userSettingToggleDataStore(
+                title = R.string.action_clipboard_manager_settings_list_layout,
+                setting = ClipboardSingleColumn
+            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
+
+            userSettingToggleDataStore(
+                title = R.string.action_clipboard_manager_settings_skip_delete_confirmation,
+                setting = ClipboardSkipDeleteConfirmation
+            ).copy(visibilityCheck = { useDataStoreValue(ClipboardHistoryEnabled) }),
+        )
+    )
+)
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardProvider.kt b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardProvider.kt
new file mode 100644
index 0000000000..77fb9334d8
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardProvider.kt
@@ -0,0 +1,105 @@
+package org.futo.inputmethod.latin.uix.actions.clipboard
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Context
+import android.content.UriMatcher
+import android.database.Cursor
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import org.futo.inputmethod.latin.BuildConfig
+import java.io.File
+import java.util.UUID
+
+
+val CLIPBOARD_AUTHORITY = BuildConfig.APPLICATION_ID + ".clipboard"
+private val CODE_CLIP = 1
+
+private val URI_MATCHER = UriMatcher(UriMatcher.NO_MATCH).apply {
+    addURI(CLIPBOARD_AUTHORITY, "clip/*", CODE_CLIP)
+}
+
+
+data class ClipboardPasteRequest(
+    val file: File,
+    val mimeType: String,
+    val expiration: Long
+)
+
+object ClipboardProviderState {
+    val requests: HashMap<UUID, ClipboardPasteRequest> = HashMap()
+
+    fun addRequest(request: ClipboardPasteRequest): UUID {
+        val uuid = UUID.randomUUID()
+        requests.put(uuid, request)
+        return uuid
+    }
+
+    fun fulfillRequest(context: Context, uuid: UUID): ParcelFileDescriptor? {
+        val request = requests[uuid] ?: throw IllegalArgumentException("Invalid request")
+        if(System.currentTimeMillis() > request.expiration) throw IllegalArgumentException("Invalid request")
+
+        val file = request.file
+
+
+        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY)
+    }
+
+    fun getMimeType(context: Context, uuid: UUID): String {
+        val request = requests[uuid] ?: throw IllegalArgumentException("Invalid request")
+
+        return request.mimeType
+    }
+}
+
+
+class ClipboardProvider: ContentProvider() {
+    override fun onCreate(): Boolean {
+        return true
+    }
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String?>?,
+        selection: String?,
+        selectionArgs: Array<out String?>?,
+        sortOrder: String?
+    ): Cursor? {
+        return null
+    }
+
+    private fun getUUID(uri: Uri): UUID {
+        if (URI_MATCHER.match(uri) != CODE_CLIP) {
+            throw IllegalArgumentException("Unsupported URI: $uri")
+        }
+
+        val id = uri.lastPathSegment ?: throw IllegalArgumentException("Invalid URI")
+
+        return UUID.fromString(id)
+    }
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor?
+            = ClipboardProviderState.fulfillRequest(context!!, getUUID(uri))
+
+    override fun getType(uri: Uri): String
+            = ClipboardProviderState.getMimeType(context!!, getUUID(uri))
+
+
+    override fun insert(
+        uri: Uri,
+        values: ContentValues?
+    ): Uri? = throw UnsupportedOperationException("Provider is read-only")
+
+    override fun delete(
+        uri: Uri,
+        selection: String?,
+        selectionArgs: Array<out String?>?
+    ): Int = throw UnsupportedOperationException("Provider is read-only")
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String?>?
+    ): Int = throw UnsupportedOperationException("Provider is read-only")
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardUtil.kt b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardUtil.kt
new file mode 100644
index 0000000000..bf44f82837
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ClipboardUtil.kt
@@ -0,0 +1,186 @@
+package org.futo.inputmethod.latin.uix.actions.clipboard
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.LinearGradient
+import android.graphics.Paint
+import android.graphics.Shader
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import java.io.File
+import java.io.FileOutputStream
+import androidx.core.graphics.scale
+import androidx.core.graphics.createBitmap
+import kotlin.math.min
+
+object ClipboardUtil {
+    fun thumbnailForName(name: String): String
+            = "$name.thumb.jpg"
+
+    fun thumbnailFor(imageFile: File): File
+            = File(imageFile.parent, thumbnailForName(imageFile.name))
+
+    fun generateThumbnail(imageFile: File): File? {
+        val thumbFile = thumbnailFor(imageFile)
+        if (thumbFile.exists()) return thumbFile
+
+        var bitmap: Bitmap? = null
+        var croppedBitmap: Bitmap? = null
+        try {
+            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+            BitmapFactory.decodeFile(imageFile.absolutePath, options)
+
+            val (w, h) = options.outWidth to options.outHeight
+            if (w <= 0 || h <= 0) return null
+
+            val cropSize = min(w, h)
+            val cropX = (w - cropSize) / 2
+            val cropY = (h - cropSize) / 2
+
+            val maxSide = 384
+            var sample = 1
+            while (cropSize / sample > maxSide) sample *= 2
+
+            options.inJustDecodeBounds = false
+            options.inSampleSize = sample
+
+            bitmap = BitmapFactory.decodeFile(imageFile.absolutePath, options) ?: return null
+
+            val scaledCropX = cropX / sample
+            val scaledCropY = cropY / sample
+            val scaledCropSize = cropSize / sample
+
+            croppedBitmap = if (scaledCropSize == bitmap.width && scaledCropSize == bitmap.height) {
+                // Already square, no crop needed
+                bitmap
+            } else {
+                Bitmap.createBitmap(
+                    bitmap,
+                    scaledCropX.coerceIn(0, bitmap.width - scaledCropSize),
+                    scaledCropY.coerceIn(0, bitmap.height - scaledCropSize),
+                    scaledCropSize.coerceAtMost(bitmap.width),
+                    scaledCropSize.coerceAtMost(bitmap.height)
+                )
+            }
+
+            val finalBmp = if (croppedBitmap.width != maxSide || croppedBitmap.height != maxSide) {
+                croppedBitmap.scale(maxSide, maxSide)
+            } else {
+                croppedBitmap
+            }
+
+            FileOutputStream(thumbFile).use { out ->
+                finalBmp.compress(Bitmap.CompressFormat.JPEG, 85, out)
+            }
+
+            return thumbFile
+        } catch (e: Exception) {
+            thumbFile.delete()
+            return null
+        } finally {
+            if (croppedBitmap !== bitmap) {
+                croppedBitmap?.recycle()
+            }
+            bitmap?.recycle()
+        }
+    }
+
+    fun generateCheckerboardBitmap(
+        width: Int = 256,
+        height: Int = 256,
+        squares: Int = 8
+    ): ImageBitmap {
+        val bitmap = createBitmap(width, height)
+        val canvas = Canvas(bitmap)
+        val squareSize = width / squares
+
+        val lightPaint = Paint().apply { color = android.graphics.Color.LTGRAY }
+        val darkPaint = Paint().apply { color = android.graphics.Color.DKGRAY }
+
+        for (row in 0 until squares) {
+            for (col in 0 until squares) {
+                val paint = if ((row + col) % 2 == 0) lightPaint else darkPaint
+                canvas.drawRect(
+                    col * squareSize.toFloat(),
+                    row * squareSize.toFloat(),
+                    (col + 1) * squareSize.toFloat(),
+                    (row + 1) * squareSize.toFloat(),
+                    paint
+                )
+            }
+        }
+
+        return bitmap.asImageBitmap()
+    }
+
+    fun generateTestPatternBitmap(
+        width: Int = 256,
+        height: Int = 256,
+        gridSize: Int = 64,
+        gradientStart: Int = android.graphics.Color.MAGENTA,
+        gradientEnd: Int = android.graphics.Color.CYAN,
+        gridColor: Int = android.graphics.Color.WHITE
+    ): ImageBitmap {
+        val bitmap = createBitmap(width, height)
+        val canvas = Canvas(bitmap)
+
+        // 1. Gradient background
+        val bgPaint = Paint().apply {
+            shader = LinearGradient(
+                0f, 0f, width.toFloat(), height.toFloat(),
+                gradientStart, gradientEnd,
+                Shader.TileMode.CLAMP
+            )
+            isAntiAlias = true
+        }
+        canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), bgPaint)
+
+        // 2. Grid lines
+        val gridPaint = Paint().apply {
+            color = gridColor
+            alpha = 120 // Semi-transparent
+            strokeWidth = 2f
+            isAntiAlias = true
+        }
+
+        // Vertical lines
+        for (x in 0..width step gridSize) {
+            canvas.drawLine(x.toFloat(), 0f, x.toFloat(), height.toFloat(), gridPaint)
+        }
+
+        // Horizontal lines
+        for (y in 0..height step gridSize) {
+            canvas.drawLine(0f, y.toFloat(), width.toFloat(), y.toFloat(), gridPaint)
+        }
+
+        // 3. Test pattern markers
+        // Center crosshair
+        val markerPaint = Paint().apply {
+            color = android.graphics.Color.YELLOW
+            strokeWidth = 4f
+            alpha = 200
+        }
+        val cx = width / 2f
+        val cy = height / 2f
+        canvas.drawLine(cx - 40, cy, cx + 40, cy, markerPaint)
+        canvas.drawLine(cx, cy - 40, cx, cy + 40, markerPaint)
+
+        // Corner markers
+        val cornerSize = 40f
+        canvas.drawLine(0f, 0f, cornerSize, 0f, markerPaint)
+        canvas.drawLine(0f, 0f, 0f, cornerSize, markerPaint)
+        canvas.drawLine(width.toFloat(), 0f, width - cornerSize, 0f, markerPaint)
+        canvas.drawLine(width.toFloat(), 0f, width.toFloat(), cornerSize, markerPaint)
+
+        // Border
+        val borderPaint = Paint().apply {
+            color = android.graphics.Color.BLACK
+            strokeWidth = 8f
+            style = Paint.Style.STROKE
+        }
+        canvas.drawRect(4f, 4f, width - 4f, height - 4f, borderPaint)
+
+        return bitmap.asImageBitmap()
+    }
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ScreenshotHelper.kt b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ScreenshotHelper.kt
new file mode 100644
index 0000000000..884adab1a5
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/clipboard/ScreenshotHelper.kt
@@ -0,0 +1,206 @@
+package org.futo.inputmethod.latin.uix.actions.clipboard
+
+import android.Manifest
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.content.Context
+import android.content.pm.PackageManager
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.provider.MediaStore
+import android.util.Log
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.LifecycleCoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.futo.inputmethod.latin.uix.actions.throwIfDebug
+import org.futo.inputmethod.latin.uix.getSetting
+import org.futo.inputmethod.latin.uix.getSettingFlow
+
+interface ScreenshotListener {
+    fun onScreenshotAdded(mime: String, uri: Uri)
+    fun onScreenshotChange(uri: Uri, checkTrashed: suspend () -> Boolean)
+}
+
+class ScreenshotHelper(
+    val context: Context,
+    val lifecycleScope: LifecycleCoroutineScope,
+    val listener: ScreenshotListener
+) {
+    companion object {
+        private val TAG = "ScreenshotHelper"
+
+        val permission =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                Manifest.permission.READ_MEDIA_IMAGES
+            else Manifest.permission.READ_EXTERNAL_STORAGE
+    }
+
+    // Returns true if we can confirm that the given URI exists and is not trashed
+    internal fun safeQueryExists(uri: Uri): Boolean {
+        return try {
+            contentResolver.query(
+                uri,
+                arrayOf(MediaStore.MediaColumns._ID, MediaStore.MediaColumns.IS_TRASHED),
+                null, null, null
+            )?.use { cursor ->
+                cursor.count > 0 && cursor.moveToFirst() && run {
+                    val idx = cursor.getColumnIndex(MediaStore.MediaColumns.IS_TRASHED)
+                    (idx == -1) || (cursor.getInt(idx) == 0)
+                }
+            } == true
+        } catch (e: Exception) {
+            // Assume IllegalStateException / SecurityException means it's gone
+            false
+        }
+    }
+
+    private val contentResolver = context.contentResolver
+    private var lastSeenId: Long = -1L
+    private var observer: ContentObserver? = null
+    private fun registerObserver() {
+        lifecycleScope.launch { handleNewScreenshot(dry = true) }
+        val observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
+            override fun onChange(selfChange: Boolean, uri: Uri?) {
+                super.onChange(selfChange, uri)
+
+                if(uri != null) {
+                    listener.onScreenshotChange(uri) { withContext(Dispatchers.IO) {
+                        !safeQueryExists(uri)
+                    } }
+                }
+
+
+                lifecycleScope.launch {
+                    delay(16L)
+                    handleNewScreenshot()
+                }
+            }
+        }
+        this.observer = observer
+
+        try {
+            contentResolver.registerContentObserver(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                true,
+                observer
+            )
+            Log.d(TAG, "ContentObserver registered")
+        }catch(e: Exception) {
+            throwIfDebug(e)
+        }
+    }
+
+    private fun unregisterObserver() {
+        observer?.let {
+            try {
+                contentResolver.unregisterContentObserver(it)
+            }catch(e: Exception) {
+                throwIfDebug(e)
+            }
+        }
+        observer = null
+    }
+
+    private fun hasPermission() = ContextCompat.checkSelfPermission(context, permission) ==
+            PackageManager.PERMISSION_GRANTED
+
+    private var settingsObservingJob = lifecycleScope.launch {
+        context.getSettingFlow(ClipboardSaveScreenshots).collect {
+            if(it && observer == null && hasPermission()) {
+                registerObserver()
+            }else if(!it && observer != null) {
+                unregisterObserver()
+            }
+        }
+    }
+
+
+    fun onDestroy() {
+        unregisterObserver()
+        settingsObservingJob.cancel()
+    }
+
+    internal suspend fun handleNewScreenshot(dry: Boolean = false) = withContext(Dispatchers.IO) {
+        if(!context.getSetting(ClipboardSaveScreenshots)) return@withContext null
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return@withContext null
+
+        val projection = arrayOf(
+            MediaStore.Images.Media._ID,
+            MediaStore.Images.Media.MIME_TYPE,
+            MediaStore.Images.Media.RELATIVE_PATH
+        )
+
+        val selection = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            "${MediaStore.Images.Media.RELATIVE_PATH} LIKE '%/Screenshots/%' " +
+                    "AND ${MediaStore.Images.Media._ID} > ?"
+        } else {
+            "${MediaStore.Images.Media.DISPLAY_NAME} LIKE '%screenshot%' " +
+                    "AND ${MediaStore.Images.Media._ID} > ?"
+        }
+
+        try {
+            val uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+
+            val queryArgs = Bundle().apply {
+                putString(ContentResolver.QUERY_ARG_SQL_SELECTION, selection)
+                putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(lastSeenId.toString()))
+
+                if(dry) {
+                    putString(ContentResolver.QUERY_ARG_SQL_SORT_ORDER, "${MediaStore.Images.Media.DATE_ADDED} DESC")
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
+                    }
+                } else {
+                    putString(
+                        ContentResolver.QUERY_ARG_SQL_SORT_ORDER,
+                        "${MediaStore.Images.Media.DATE_ADDED} ASC"
+                    )
+                }
+            }
+
+            contentResolver.query(
+                uri,
+                projection,
+                queryArgs,
+                null
+            )?.use { cursor ->
+                if (!cursor.moveToFirst()) return@withContext null
+
+                while(true) {
+                    val idIdx = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID)
+                    val mimeIdx = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.MIME_TYPE)
+                    val id = cursor.getLong(idIdx)
+
+                    if(id <= lastSeenId) {
+                        return@withContext null
+                    }
+
+                    val mime = cursor.getString(mimeIdx)
+                    val uri = ContentUris.withAppendedId(
+                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id
+                    )
+
+                    if(!dry) {
+                        listener.onScreenshotAdded(mime, uri)
+                    }
+
+                    lastSeenId = id
+
+                    if(!cursor.moveToNext()) break
+                }
+            }
+        }catch(e: Exception) {
+            throwIfDebug(e)
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/emoji/EmojiView.kt b/java/src/org/futo/inputmethod/latin/uix/actions/emoji/EmojiView.kt
index 817d335e0b..93d562a0c6 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/emoji/EmojiView.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/emoji/EmojiView.kt
@@ -24,6 +24,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.RectF
+import android.graphics.Typeface
 import android.os.Build
 import android.text.Layout
 import android.text.Spanned
@@ -37,25 +38,30 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.createBitmap
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.theme.emojiNeedsCompat
 
 
 class EmojiView @JvmOverloads constructor(
     context: Context,
+    rippleColor: Int,
+    val emojiTypeface: Typeface?,
     attrs: AttributeSet? = null,
 ) :
     View(context, attrs) {
 
     companion object {
-        private const val EMOJI_DRAW_TEXT_SIZE_DP = 42
+        private const val EMOJI_DRAW_TEXT_SIZE_DP = 48
     }
 
     init {
         background = AppCompatResources.getDrawable(context, R.drawable.ripple_emoji_view)
+        background.setTint(rippleColor)
         importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_YES
     }
 
     internal var willDrawVariantIndicator: Boolean = true
     private var textScale: Float = 1.0f
+    private var isAbleToScaleHorizontally = false
 
     private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply {
         textSize = TypedValue.applyDimension(
@@ -63,6 +69,8 @@ class EmojiView @JvmOverloads constructor(
             EMOJI_DRAW_TEXT_SIZE_DP.toFloat(),
             context.resources.displayMetrics
         )
+
+        emojiTypeface?.let { setTypeface(it) }
     }
 
     fun setTextColor(color: Int) {
@@ -70,6 +78,7 @@ class EmojiView @JvmOverloads constructor(
     }
 
     fun setTextSizeMultiplier(v: Float) {
+        isAbleToScaleHorizontally = v < 1.0f
         textPaint.textSize = TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP,
             EMOJI_DRAW_TEXT_SIZE_DP.toFloat() * v,
@@ -89,6 +98,7 @@ class EmojiView @JvmOverloads constructor(
         )
     }
 
+    private val bitmapPaint = Paint(Paint.FILTER_BITMAP_FLAG or Paint.ANTI_ALIAS_FLAG)
     override fun draw(canvas: Canvas) {
         super.draw(canvas)
         canvas.run {
@@ -106,7 +116,7 @@ class EmojiView @JvmOverloads constructor(
             val left = (width  - scaledW) / 2f
             val top  = (height - scaledH) / 2f
 
-            drawBitmap(offscreenCanvasBitmap, null, RectF(left, top, left + scaledW, top + scaledH), null)
+            drawBitmap(offscreenCanvasBitmap, null, RectF(left, top, left + scaledW, top + scaledH), bitmapPaint)
         }
     }
 
@@ -137,9 +147,24 @@ class EmojiView @JvmOverloads constructor(
             if (emoji is Spanned) {
                 createStaticLayout(emoji, width).draw(this)
             } else {
+                textPaint.typeface = if(emojiNeedsCompat(emoji.toString(), emojiTypeface)) {
+                    emojiTypeface
+                } else {
+                    null
+                }
+
                 var textWidth = textPaint.measureText(emoji, 0, emoji.length)
+                val fm = textPaint.fontMetrics
+                var textHeight = fm.descent - fm.ascent
+
                 if(textWidth > width) {
-                    scale(width / textWidth, 1.0f)
+                    val scaleNeeded = width / textWidth
+                    if(isAbleToScaleHorizontally || scaleNeeded < 0.4f) {
+                        scale(scaleNeeded, 1.0f)
+                    } else {
+                        scale(scaleNeeded, scaleNeeded)
+                        textHeight *= scaleNeeded
+                    }
                     textScale = width / textWidth
                     textWidth = width.toFloat()
                 } else {
@@ -147,8 +172,6 @@ class EmojiView @JvmOverloads constructor(
                     textScale = 1.0f
                 }
 
-                val fm = textPaint.fontMetrics
-                val textHeight = fm.descent - fm.ascent
                 val textCenterY = height / 2f
                 val baselineY = textCenterY - textHeight / 2f - fm.ascent
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Candy.kt b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Candy.kt
index 54d0c12c48..bcc43fea6b 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Candy.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Candy.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.graphics.createBitmap
 import org.futo.inputmethod.latin.R
@@ -84,9 +85,10 @@ object CandyRenderer: WordImageRenderer() {
 @Composable
 private fun PreviewRenderer() {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val renderer = CandyRenderer
     val image = remember {
-        renderer.render(context, context.getString(renderer.name))!!.asImageBitmap()
+        renderer.render(context, resources.getString(renderer.name))!!.asImageBitmap()
     }
     Image(image, contentDescription = null)
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Horizon.kt b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Horizon.kt
index f166fdb16a..92a416246e 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Horizon.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Horizon.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.withScale
@@ -90,9 +91,10 @@ object HorizonRenderer: WordImageRenderer() {
 @Composable
 private fun PreviewRenderer() {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val renderer = HorizonRenderer
     val image = remember {
-        renderer.render(context, context.getString(renderer.name))!!.asImageBitmap()
+        renderer.render(context, resources.getString(renderer.name))!!.asImageBitmap()
     }
     Image(image, contentDescription = null)
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Rainbow.kt b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Rainbow.kt
index 07806df88e..2806868938 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Rainbow.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Rainbow.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.withScale
@@ -90,9 +91,10 @@ object RainbowRenderer: WordImageRenderer() {
 @Composable
 private fun PreviewRenderer() {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val renderer = RainbowRenderer
     val image = remember {
-        renderer.render(context, context.getString(renderer.name))!!.asImageBitmap()
+        renderer.render(context, resources.getString(renderer.name))!!.asImageBitmap()
     }
     Image(image, contentDescription = null)
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Scratch.kt b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Scratch.kt
index 83d12dd535..0c6867d747 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Scratch.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Scratch.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.graphics.createBitmap
 import org.futo.inputmethod.latin.R
@@ -61,9 +62,10 @@ object ScratchRenderer: WordImageRenderer() {
 @Composable
 private fun PreviewRenderer() {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val renderer = ScratchRenderer
     val image = remember {
-        renderer.render(context, context.getString(renderer.name))!!.asImageBitmap()
+        renderer.render(context, resources.getString(renderer.name))!!.asImageBitmap()
     }
     Image(image, contentDescription = null)
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Superhero.kt b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Superhero.kt
index 3b6b0c5ec1..5c8fe2f92b 100644
--- a/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Superhero.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/actions/fonttyper/Superhero.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.core.graphics.createBitmap
 import org.futo.inputmethod.latin.R
@@ -101,9 +102,10 @@ object SuperheroRenderer : WordImageRenderer() {
 @Composable
 private fun PreviewRenderer() {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val renderer = SuperheroRenderer
     val image = remember {
-        renderer.render(context, context.getString(renderer.name))!!.asImageBitmap()
+        renderer.render(context, resources.getString(renderer.name))!!.asImageBitmap()
     }
     Image(image, contentDescription = null)
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/Components.kt b/java/src/org/futo/inputmethod/latin/uix/settings/Components.kt
index 9dcfa8509e..3a7681c89f 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/Components.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/Components.kt
@@ -76,6 +76,7 @@ import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.clearAndSetSemantics
@@ -203,11 +204,11 @@ fun SpacedColumn(gap: Dp, modifier: Modifier = Modifier, horizontalAlignment: Al
 @Composable
 fun SettingItem(
     title: String,
+    modifier: Modifier = Modifier,
     subtitle: String? = null,
     onClick: (() -> Unit)? = null,
     icon: (@Composable () -> Unit)? = null,
     disabled: Boolean = false,
-    modifier: Modifier = Modifier,
     subcontent: (@Composable () -> Unit)? = null,
     compact: Boolean = false,
     onSubmenuNavigate: (() -> Unit)? = null,
@@ -445,19 +446,21 @@ fun<T> SettingRadio(
     options: List<T>,
     optionNames: List<String>,
     setting: DataStoreItem<T>,
+    modifier: Modifier = Modifier,
     hints: List<@Composable () -> Unit>? = null,
+    subcontent: List<@Composable () -> Unit>? = null,
 ) {
     ScreenTitle(title, showBack = false)
     Column {
         options.zip(optionNames).forEachIndexed { i, it ->
             SettingItem(title = it.second, onClick = { setting.setValue(it.first) }, icon = {
                 RadioButton(selected = setting.value == it.first, onClick = null)
-            }, modifier = Modifier.clearAndSetSemantics {
+            }, modifier = modifier.clearAndSetSemantics {
                 this.text = AnnotatedString(it.second)
                 this.role = Role.RadioButton
                 this.selected = setting.value == it.first
-            }) {
-                hints?.getOrNull(i)?.let { it() }
+            }, subcontent = subcontent?.getOrNull(i)) {
+                hints?.getOrNull(i)?.invoke()
             }
         }
     }
@@ -808,7 +811,7 @@ fun<T> DropDownPicker(
 
 @Composable
 fun CollapsibleSection(title: String, modifier: Modifier = Modifier, section: @Composable ColumnScope.() -> Unit) {
-    val context = LocalContext.current
+    val resources = LocalResources.current
     var expanded by remember { mutableStateOf(false) }
 
     Column {
@@ -816,7 +819,7 @@ fun CollapsibleSection(title: String, modifier: Modifier = Modifier, section: @C
             Modifier.fillMaxWidth().heightIn(min = 44.dp).clickable {
                 expanded = !expanded
             }.padding(16.dp).semantics {
-                stateDescription = context.getString(
+                stateDescription = resources.getString(
                     if(expanded)
                         R.string.setting_section_expanded
                     else
@@ -856,7 +859,7 @@ fun<T> DropDownPicker(
     scrollableOptions: Boolean = false,
     modifier: Modifier = Modifier
 ) {
-    val context = LocalContext.current
+    val resources = LocalResources.current
     var expanded by remember { mutableStateOf(false) }
 
     SpacedColumn(4.dp, modifier = modifier.semantics {
@@ -872,7 +875,7 @@ fun<T> DropDownPicker(
             ).heightIn(min = 44.dp).clip(DropDownShape).clickable {
                 expanded = !expanded
             }.padding(16.dp).semantics {
-                stateDescription = context.getString(
+                stateDescription = resources.getString(
                     if(expanded)
                         R.string.setting_section_expanded
                     else
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/SettingsNavigator.kt b/java/src/org/futo/inputmethod/latin/uix/settings/SettingsNavigator.kt
index d0394742f0..c95b2a9425 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/SettingsNavigator.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/SettingsNavigator.kt
@@ -4,15 +4,17 @@ import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.dialog
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.toRoute
+import kotlinx.serialization.Serializable
 import org.futo.inputmethod.engine.IMESettingsMenu
 import org.futo.inputmethod.engine.SettingsByLanguage
-import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.toLocale
 import org.futo.inputmethod.latin.uix.ErrorDialog
 import org.futo.inputmethod.latin.uix.InfoDialog
 import org.futo.inputmethod.latin.uix.LocalNavController
@@ -26,7 +28,6 @@ import org.futo.inputmethod.latin.uix.settings.pages.BlacklistScreen
 import org.futo.inputmethod.latin.uix.settings.pages.BlacklistScreenLite
 import org.futo.inputmethod.latin.uix.settings.pages.CreditsScreen
 import org.futo.inputmethod.latin.uix.settings.pages.CreditsScreenLite
-import org.futo.inputmethod.latin.uix.settings.pages.themes.CustomThemeScreen
 import org.futo.inputmethod.latin.uix.settings.pages.DevEditTextVariationsScreen
 import org.futo.inputmethod.latin.uix.settings.pages.DevKeyboardScreen
 import org.futo.inputmethod.latin.uix.settings.pages.DevLayoutEdit
@@ -53,7 +54,7 @@ import org.futo.inputmethod.latin.uix.settings.pages.ResizeScreen
 import org.futo.inputmethod.latin.uix.settings.pages.SearchScreen
 import org.futo.inputmethod.latin.uix.settings.pages.SelectLanguageScreen
 import org.futo.inputmethod.latin.uix.settings.pages.SelectLayoutsScreen
-import org.futo.inputmethod.latin.uix.settings.pages.themes.ThemeScreen
+import org.futo.inputmethod.latin.uix.settings.pages.SwipeMenu
 import org.futo.inputmethod.latin.uix.settings.pages.TypingSettingsMenu
 import org.futo.inputmethod.latin.uix.settings.pages.VoiceInputMenu
 import org.futo.inputmethod.latin.uix.settings.pages.addModelManagerNavigation
@@ -62,19 +63,34 @@ import org.futo.inputmethod.latin.uix.settings.pages.pdict.ConfirmDeleteExtraDic
 import org.futo.inputmethod.latin.uix.settings.pages.pdict.PersonalDictionaryLanguageList
 import org.futo.inputmethod.latin.uix.settings.pages.pdict.PersonalDictionaryLanguageListForLocale
 import org.futo.inputmethod.latin.uix.settings.pages.pdict.WordPopupDialogF
+import org.futo.inputmethod.latin.uix.settings.pages.themes.CustomThemeScreen
 import org.futo.inputmethod.latin.uix.settings.pages.themes.DeleteCustomThemeDialog
-import org.futo.inputmethod.latin.uix.urlDecode
-import org.futo.inputmethod.latin.uix.urlEncode
+import org.futo.inputmethod.latin.uix.settings.pages.themes.ThemeScreen
 
 // Utility function for quick error messages
 fun NavHostController.navigateToError(title: String, body: String) {
-    this.navigate("error/${title.urlEncode()}/${body.urlEncode()}")
+    this.navigate(Route.Error(title, body))
 }
 
 fun NavHostController.navigateToInfo(title: String, body: String) {
-    this.navigate("info/${title.urlEncode()}/${body.urlEncode()}")
+    this.navigate(Route.Info(title, body))
+}
+
+
+object Route {
+    @Serializable data class Error(val title: String, val body: String)
+    @Serializable data class Info(val title: String, val body: String)
+    @Serializable data class AddLayout(val lang: String)
+    @Serializable data class PersonalDictList(val lang: String?)
+    @Serializable data class PersonalDictWord(val lang: String?, val word: String?)
+    @Serializable data class PersonalDictDelete(val dict: String)
+    @Serializable data class DevLayoutEdit(val i: Int)
+    @Serializable data class CustomTheme(val uri: String)
+    @Serializable data class DeleteTheme(val name: String)
+    @Serializable data class ThirdPartyInfo(val idx: Int)
 }
 
+
 val SettingsMenus = listOf(
     HomeScreenLite,
     LanguageSettingsLite,
@@ -83,6 +99,7 @@ val SettingsMenus = listOf(
     TypingSettingsMenu,
     ResizeMenuLite,
     LongPressMenu,
+    SwipeMenu,
     PredictiveTextMenu,
     BlacklistScreenLite,
     VoiceInputMenu,
@@ -93,10 +110,21 @@ val SettingsMenus = listOf(
     IMESettingsMenu
 ) + AllActions.mapNotNull { it.settingsMenu } + SettingsByLanguage.values
 
+
+// Improves the semantics so that we don't have to deal with NavBackStackEntry when we don't need it
+@JvmInline
+value class NavGraphBuilderWrapper(val parent: NavGraphBuilder)
+internal inline fun <reified T : Any> NavGraphBuilderWrapper.dialog(noinline content: @Composable (T) -> Unit) =
+    parent.dialog<T> { content(it.toRoute()) }
+internal inline fun <reified T : Any> NavGraphBuilderWrapper.composable(noinline content: @Composable (T) -> Unit) =
+    parent.composable<T> { content(it.toRoute()) }
+
+
 @Composable
 fun SettingsNavigator(
     navController: NavHostController = rememberNavController()
 ) {
+    val nav = navController
     CompositionLocalProvider(LocalNavController provides navController) {
         NavHost(
             navController = navController,
@@ -106,35 +134,33 @@ fun SettingsNavigator(
             popEnterTransition = { EnterTransition.None },
             popExitTransition = { ExitTransition.None }
         ) {
+            with(NavGraphBuilderWrapper(this)) {
+                composable<Route.AddLayout> { SelectLayoutsScreen(nav, it.lang.toLocale()) }
+
+                parent.composable<Route.PersonalDictList> {
+                    val route = it.toRoute<Route.PersonalDictList>()
+                    PersonalDictionaryLanguageListForLocale(nav, it, route.lang?.toLocale())
+                }
+                dialog<Route.PersonalDictWord> { WordPopupDialogF(it.word, it.lang?.toLocale()) }
+                dialog<Route.PersonalDictDelete> { ConfirmDeleteExtraDictFileDialog(it.dict) }
+
+                composable<Route.DevLayoutEdit> { DevLayoutEdit(nav, it.i) }
+
+                composable<Route.CustomTheme> { CustomThemeScreen(it.uri, nav) }
+                dialog<Route.DeleteTheme> { DeleteCustomThemeDialog(it.name, nav) }
+
+                composable<Route.ThirdPartyInfo> { ProjectInfoView(it.idx, nav) }
+
+                dialog<Route.Error> { ErrorDialog(it.title, it.body, nav) }
+                dialog<Route.Info> { InfoDialog(it.title, it.body, nav) }
+            }
             composable("home") { HomeScreen(navController) }
             composable("search") { SearchScreen(navController) }
             composable("languages") { LanguagesScreen(navController) }
             composable("addLanguage") { SelectLanguageScreen(navController) }
-            composable("addLayout/{lang}") {
-                SelectLayoutsScreen(
-                    navController,
-                    it.arguments?.getString("lang")?.urlDecode() ?: ""
-                )
-            }
             composable("pdict") {
                 PersonalDictionaryLanguageList()
             }
-            composable("pdict/{lang}") {
-                PersonalDictionaryLanguageListForLocale(
-                    navController,
-                    it,
-                    it.arguments?.getString("lang")?.urlDecode() ?: "all"
-                )
-            }
-            dialog("pdictword/{lang}/{word}") {
-                WordPopupDialogF(
-                    locale = it.arguments?.getString("lang")?.urlDecode(),
-                    selectedWord = it.arguments?.getString("word")?.urlDecode(),
-                )
-            }
-            dialog("pdictdelete/{dict}") {
-                ConfirmDeleteExtraDictFileDialog(it.arguments?.getString("dict")?.urlDecode()!!)
-            }
             composable("advancedparams") { AdvancedParametersScreen(navController) }
             composable("actionEdit") { ActionEditorScreen(navController) }
             SettingsMenus.forEach { menu ->
@@ -143,8 +169,6 @@ fun SettingsNavigator(
             composable("keyboardAndTyping") { KeyboardAndTypingScreen(navController) }
             composable("resize") { ResizeScreen(navController) }
             composable("themes") { ThemeScreen(navController) }
-            composable("customTheme/{uri}") { CustomThemeScreen(it.arguments?.getString("uri") ?: "", navController) }
-
             composable("developer") { DeveloperScreen(navController) }
             composable("devtextedit") { DevEditTextVariationsScreen(navController) }
             composable("devbuggytextedit") { BuggyTextEditVariations(navController) }
@@ -152,42 +176,11 @@ fun SettingsNavigator(
             composable("devlayouteditor") { DevLayoutEditor(navController) }
             composable("devtheme") { DevThemeImportScreen(navController) }
             composable("devkeyboard") { DevKeyboardScreen(navController) }
-            composable("devlayoutedit/{i}") {
-                DevLayoutEdit(
-                    navController,
-                    it.arguments!!.getString("i")!!.toInt()
-                )
-            }
             composable("blacklist") { BlacklistScreen(navController) }
             composable("payment") { PaymentScreen(navController) { navController.navigateUp() } }
             composable("paid") { PaymentThankYouScreen { navController.navigateUp() } }
             composable("credits") { CreditsScreen(navController) }
             composable("exportingcfg") { ExportingMenu(navController) }
-            dialog("deleteTheme/{name}") {
-                DeleteCustomThemeDialog(it.arguments?.getString("name")?.urlDecode() ?: "", navController)
-            }
-            composable("credits/thirdparty/{idx}") {
-                ProjectInfoView(
-                    it.arguments?.getString("idx")?.toIntOrNull() ?: 0,
-                    navController
-                )
-            }
-            dialog("error/{title}/{body}") {
-                ErrorDialog(
-                    it.arguments?.getString("title")?.urlDecode()
-                        ?: stringResource(R.string.settings_unknown_error_title),
-                    it.arguments?.getString("body")?.urlDecode()
-                        ?: stringResource(R.string.settings_unknown_error_subtitle),
-                    navController
-                )
-            }
-            dialog("info/{title}/{body}") {
-                InfoDialog(
-                    it.arguments?.getString("title")?.urlDecode() ?: "",
-                    it.arguments?.getString("body")?.urlDecode() ?: "",
-                    navController
-                )
-            }
             dialog("update") {
                 UpdateDialog(navController = navController)
             }
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
index a805c75aaa..79b218f8ff 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
@@ -1,37 +1,28 @@
 package org.futo.inputmethod.latin.uix.settings.pages
 
+import android.util.Log
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.PlatformImeOptions
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -39,16 +30,15 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.Subtypes
-import org.futo.inputmethod.latin.localeFromString
 import org.futo.inputmethod.latin.uix.KeyboardLayoutPreview
 import org.futo.inputmethod.latin.uix.SettingsTextEdit
 import org.futo.inputmethod.latin.uix.actions.searchMultiple
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
 import org.futo.inputmethod.latin.uix.theme.Typography
-import org.futo.inputmethod.latin.uix.urlEncode
 import org.futo.inputmethod.v2keyboard.LayoutManager
 import java.text.Normalizer
 import java.util.Locale
@@ -64,10 +54,11 @@ fun normalize(str: String): String {
 @Composable
 fun SelectLanguageScreen(navController: NavHostController = rememberNavController()) {
     val context = LocalContext.current
+    val resources = LocalResources.current
 
     val layoutMapping = remember { LayoutManager.getLayoutMapping(context) }
 
-    val systemLocale = remember { context.resources.configuration.locales[0] }
+    val systemLocale = remember { resources.configuration.locales[0] }
     val textFieldValue = remember { mutableStateOf("") }
 
     val locales = remember {
@@ -89,11 +80,8 @@ fun SelectLanguageScreen(navController: NavHostController = rememberNavControlle
     }
 
     LazyColumn {
-        item {
+        item(key=0) {
             ScreenTitle(stringResource(R.string.language_settings_select_language), showBack = true, navController)
-        }
-
-        item {
             Box(Modifier.padding(8.dp)) {
                 SettingsTextEdit(textFieldValue, icon = {
                     Icon(
@@ -110,7 +98,7 @@ fun SelectLanguageScreen(navController: NavHostController = rememberNavControlle
                 subtitle = Subtypes.getLocaleDisplayName(it, it),
                 style = NavigationItemStyle.MiscNoArrow,
                 navigate = {
-                    navController.navigate("addLayout/" + it.toLanguageTag().urlEncode())
+                    navController.navigate(Route.AddLayout(it.toLanguageTag()))
                 }
             )
         }
@@ -153,15 +141,11 @@ fun LayoutPreview(name: String, locale: Locale, onClick: () -> Unit) {
 
 @Preview
 @Composable
-fun SelectLayoutsScreen(navController: NavHostController = rememberNavController(), language: String = "en_US") {
+fun SelectLayoutsScreen(navController: NavHostController = rememberNavController(), locale: Locale = Locale.ENGLISH) {
     val context = LocalContext.current
 
-    val locale = remember { localeFromString(language) }
-
     val layoutMapping = remember { LayoutManager.getLayoutMapping(context) }
 
-    val systemLocale = remember { context.resources.configuration.locales[0] }
-
     val relevantLayouts = remember {
         layoutMapping.entries.filter {
             (it.key.language == locale.language) && (it.key.script == locale.script)
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AdvancedParameters.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AdvancedParameters.kt
index 56cc2aeff5..a69d3fc033 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AdvancedParameters.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AdvancedParameters.kt
@@ -2,6 +2,7 @@ package org.futo.inputmethod.latin.uix.settings.pages
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavHostController
@@ -17,7 +18,7 @@ import org.futo.inputmethod.latin.xlm.BinaryDictTransformerWeightSetting
 @Preview
 @Composable
 fun AdvancedParametersScreen(navController: NavHostController = rememberNavController()) {
-    val context = LocalContext.current
+    val resources = LocalResources.current
     ScrollableList {
         ScreenTitle(stringResource(R.string.prediction_settings_transformer_advanced_params), showBack = true, navController)
 
@@ -40,10 +41,10 @@ fun AdvancedParametersScreen(navController: NavHostController = rememberNavContr
             indicator = {
                 when {
                     it == Float.POSITIVE_INFINITY -> {
-                        context.getString(R.string.prediction_settings_transformer_advanced_params_transformer_lm_strength_always_transformer)
+                        resources.getString(R.string.prediction_settings_transformer_advanced_params_transformer_lm_strength_always_transformer)
                     }
                     it == Float.NEGATIVE_INFINITY -> {
-                        context.getString(R.string.prediction_settings_transformer_advanced_params_transformer_lm_strength_always_binarydictionary)
+                        resources.getString(R.string.prediction_settings_transformer_advanced_params_transformer_lm_strength_always_binarydictionary)
                     }
                     (it > 0.1f) -> {
                         "a = ${String.format("%.1f", it)}"
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Credits.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Credits.kt
index c19e9c42a8..06b9ef06b6 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Credits.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Credits.kt
@@ -34,6 +34,7 @@ import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.uix.settings.BottomSpacer
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
 import org.futo.inputmethod.latin.uix.settings.SpacedColumn
@@ -180,7 +181,7 @@ fun CreditCategorySection(
                     Column(
                         Modifier.fillMaxWidth()
                             .clickable {
-                                navController!!.navigate("credits/thirdparty/" + it)
+                                navController!!.navigate(Route.ThirdPartyInfo(it))
                             }
                     ) {
                         Text(
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevLayoutEditor.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevLayoutEditor.kt
index af762c4dca..76ebfe7597 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevLayoutEditor.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevLayoutEditor.kt
@@ -40,6 +40,7 @@ import org.futo.inputmethod.latin.uix.getSettingBlocking
 import org.futo.inputmethod.latin.uix.setSettingBlocking
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
 import org.futo.inputmethod.updates.openURI
@@ -143,12 +144,16 @@ private fun handleIndentation(newValue: TextFieldValue, oldValue: TextFieldValue
 
 @OptIn(ExperimentalEncodingApi::class)
 @Composable
-fun LayoutEditor(layout: CustomLayout, onSave: (CustomLayout) -> Unit, onDelete: () -> Unit) {
+fun LayoutEditor(layout: CustomLayout, onSave: (CustomLayout) -> Unit, onDelete: () -> Unit, onModified: (Boolean) -> Unit) {
     var language by remember { mutableStateOf(TextFieldValue(layout.language)) }
     var layoutYaml by remember { mutableStateOf(TextFieldValue(layout.layoutYaml)) }
 
     var testText by remember { mutableStateOf(TextFieldValue("")) }
 
+    LaunchedEffect(layoutYaml, language) {
+        onModified(layoutYaml.text != layout.layoutYaml || language.text != layout.language)
+    }
+
     val textFieldModifier = Modifier
         .fillMaxWidth()
         .padding(top = 4.dp, bottom = 12.dp)
@@ -160,7 +165,7 @@ fun LayoutEditor(layout: CustomLayout, onSave: (CustomLayout) -> Unit, onDelete:
 
     val options = KeyboardOptions.Default.copy(
         keyboardType = KeyboardType.Password,
-        autoCorrect = false
+        autoCorrectEnabled = false
     )
 
     val cursorBrush = SolidColor(LocalKeyboardScheme.current.onSurfaceVariant)
@@ -230,8 +235,19 @@ fun LayoutEditor(layout: CustomLayout, onSave: (CustomLayout) -> Unit, onDelete:
 
             Spacer(Modifier.width(16.dp))
 
+            val context = LocalContext.current
+            val doubleTapDeleteTime = remember { mutableLongStateOf(0L) }
             Button(onClick = {
-                onDelete()
+                if(System.currentTimeMillis() < (doubleTapDeleteTime.longValue + 5000L)) {
+                    onDelete()
+                } else {
+                    doubleTapDeleteTime.longValue = System.currentTimeMillis()
+                    Toast.makeText(
+                        context,
+                        "Tap delete again to confirm",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
             }, colors = ButtonDefaults.buttonColors(
                 containerColor = MaterialTheme.colorScheme.errorContainer,
                 contentColor = MaterialTheme.colorScheme.onErrorContainer
@@ -261,9 +277,10 @@ fun DevLayoutEdit(navController: NavHostController = rememberNavController(), i:
         getCustomLayouts(context)[i]
     }
 
+    var isModified by remember { mutableStateOf(false) }
     var backTime by remember { mutableStateOf(0L) }
     BackHandler {
-        if(System.currentTimeMillis() < (backTime + 5000L)) {
+        if(!isModified || System.currentTimeMillis() < (backTime + 5000L)) {
             navController.navigateUp()
         } else {
             backTime = System.currentTimeMillis()
@@ -288,7 +305,7 @@ fun DevLayoutEdit(navController: NavHostController = rememberNavController(), i:
             newList.removeAt(i)
             updateCustomLayoutsAndSyncSubtypes(context, newList)
             navController.navigateUp()
-        })
+        }, onModified = { isModified = it })
     }
 }
 
@@ -307,7 +324,7 @@ fun DevLayoutEditor(navController: NavHostController = rememberNavController())
                 style = NavigationItemStyle.MiscNoArrow,
                 subtitle = "Custom Layout $i",
                 navigate = {
-                    navController.navigate("devlayoutedit/$i")
+                    navController.navigate(Route.DevLayoutEdit(i))
                 }
             )
         }
@@ -317,7 +334,7 @@ fun DevLayoutEditor(navController: NavHostController = rememberNavController())
             style = NavigationItemStyle.MiscNoArrow,
             navigate = {
                 updateCustomLayoutsAndSyncSubtypes(context, customLayouts + listOf(defaultCustomLayout))
-                navController.navigate("devlayoutedit/${customLayouts.size}")
+                navController.navigate(Route.DevLayoutEdit(customLayouts.size))
             },
             icon = painterResource(R.drawable.plus_circle)
         )
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
index 23d4e62b45..207ebf3dbc 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
@@ -28,6 +27,9 @@ import org.futo.inputmethod.engine.general.UseExpandableSuggestionsForGeneralIME
 import org.futo.inputmethod.latin.BuildConfig
 import org.futo.inputmethod.latin.CrashLoggingApplication
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.SwipeDecoderDictionary
+import org.futo.inputmethod.latin.SwipeLanguageModelSetting
+import org.futo.inputmethod.latin.SwipeSpecialDecoderSetting
 import org.futo.inputmethod.latin.TextInputAlternativeIC
 import org.futo.inputmethod.latin.TextInputAlternativeICComposing
 import org.futo.inputmethod.latin.TextInputBufferedIC
@@ -42,17 +44,17 @@ import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.UixManagerInstanceForDebug
 import org.futo.inputmethod.latin.uix.actions.BugViewerAction
 import org.futo.inputmethod.latin.uix.actions.BugViewerState
-import org.futo.inputmethod.latin.uix.actions.clipboardFile
+import org.futo.inputmethod.latin.uix.actions.clipboard.clipboardFile
 import org.futo.inputmethod.latin.uix.getPreferencesDataStoreFile
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
-import org.futo.inputmethod.latin.uix.settings.SettingTextField
 import org.futo.inputmethod.latin.uix.settings.SettingToggleDataStore
 import org.futo.inputmethod.latin.uix.settings.SettingToggleRaw
 import org.futo.inputmethod.latin.uix.settings.useDataStore
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
+import org.futo.inputmethod.latin.xlm.AllowTransformerOnNonQWERTYLayouts
 import org.futo.inputmethod.updates.DISABLE_UPDATE_REMINDER
 import org.futo.inputmethod.updates.dismissedMigrateUpdateNotice
 import kotlin.system.exitProcess
@@ -160,6 +162,11 @@ fun DeveloperScreen(navController: NavHostController = rememberNavController())
             navigate = { navController.navigate("devtheme") }
         )
 
+        SettingToggleDataStore(
+            title = "Allow transformer models on non QWERTY layouts",
+            setting = AllowTransformerOnNonQWERTYLayouts
+        )
+
 
         ScreenTitle("Text input debug")
         SettingToggleDataStore(
@@ -195,6 +202,26 @@ fun DeveloperScreen(navController: NavHostController = rememberNavController())
             disabled = useDataStoreValue(VoiceInputAlternativeIC) == false
         )
 
+        ScreenTitle("Swipe debug")
+        SettingToggleDataStore(
+            title = "Special decoder",
+            subtitle = "default = yes",
+            setting = SwipeSpecialDecoderSetting
+        )
+        SettingToggleDataStore(
+            title = "Language model",
+            subtitle = "default = yes",
+            setting = SwipeLanguageModelSetting
+        )
+        NavigationItem(
+            title = "Activate swipe debug logging for 5 minutes",
+            subtitle = "Swipes and text will be logged to logcat",
+            style = NavigationItemStyle.MiscNoArrow,
+            navigate = {
+                SwipeDecoderDictionary.debugLogUntil = System.currentTimeMillis() + 5L * 60L * 1000L
+            }
+        )
+
         ScreenTitle(title = "Payment stuff")
 
         SettingToggleDataStore(title = "Is paid", setting = IS_ALREADY_PAID)
@@ -244,49 +271,51 @@ fun DeveloperScreen(navController: NavHostController = rememberNavController())
             UseExpandableSuggestionsForGeneralIME,
         )
 
-        NavigationItem(
-            title = "Crash the app",
-            style = NavigationItemStyle.MiscNoArrow,
-            navigate = {
-                scope.lifecycleScope.launch {
-                    withContext(Dispatchers.Default) {
-                        delay(300L)
-                        throw RuntimeException("User requested app to crash :3")
-                    }
-                }
-            },
-            icon = painterResource(id = R.drawable.close)
-        )
-
-        if(BuildConfig.DEBUG) {
+        if(!BuildConfig.IS_PLAYSTORE_BUILD) {
             NavigationItem(
-                title = "Corrupt the settings, the clipboard, and exit the app",
+                title = "Crash the app",
                 style = NavigationItemStyle.MiscNoArrow,
                 navigate = {
                     scope.lifecycleScope.launch {
                         withContext(Dispatchers.Default) {
                             delay(300L)
+                            throw RuntimeException("User requested app to crash :3")
+                        }
+                    }
+                },
+                icon = painterResource(id = R.drawable.close)
+            )
 
-                            context.getPreferencesDataStoreFile().outputStream().use {
-                                it.write(0)
-                            }
-                            context.clipboardFile.outputStream().use {
-                                it.write(0)
+            if(BuildConfig.DEBUG) {
+                NavigationItem(
+                    title = "Corrupt the settings, the clipboard, and exit the app",
+                    style = NavigationItemStyle.MiscNoArrow,
+                    navigate = {
+                        scope.lifecycleScope.launch {
+                            withContext(Dispatchers.Default) {
+                                delay(300L)
+
+                                context.getPreferencesDataStoreFile().outputStream().use {
+                                    it.write(0)
+                                }
+                                context.clipboardFile.outputStream().use {
+                                    it.write(0)
+                                }
+
+                                exitProcess(1)
                             }
-
-                            exitProcess(1)
                         }
                     }
-                }
-            )
-        }
+                )
+            }
 
-        NavigationItem(
-            title = "Inline Keyboard",
-            subtitle = "This can break everything, force stop or crash the app to fix",
-            style = NavigationItemStyle.Misc,
-            navigate = { navController.navigate("devkeyboard") }
-        )
+            NavigationItem(
+                title = "Inline Keyboard",
+                subtitle = "This can break everything, force stop or crash the app to fix",
+                style = NavigationItemStyle.Misc,
+                navigate = { navController.navigate("devkeyboard") }
+            )
 
+        }
     }
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Home.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Home.kt
index 7fce4c3e4d..043e352e15 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Home.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Home.kt
@@ -69,6 +69,13 @@ val HomeScreenLite = UserSettingsMenu(
             icon = R.drawable.keyboard
         ),
 
+        userSettingNavigationItem(
+            title = SwipeMenu.title,
+            style = NavigationItemStyle.HomePrimary,
+            navigateTo = SwipeMenu.navPath,
+            icon = R.drawable.swipe_icon
+        ),
+
         userSettingNavigationItem(
             title = R.string.prediction_settings_title,
             style = NavigationItemStyle.HomeTertiary,
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Languages.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Languages.kt
index e8f1b87836..a8cbe2068d 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Languages.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Languages.kt
@@ -41,6 +41,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -59,6 +60,7 @@ import org.futo.inputmethod.latin.uix.icon
 import org.futo.inputmethod.latin.uix.kindTitle
 import org.futo.inputmethod.latin.uix.namePreferenceKeyFor
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.Tip
 import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
@@ -115,7 +117,7 @@ fun LanguageConfigurable(
                 Spacer(modifier = Modifier.width(8.dp))
 
                 Text(
-                    kind.kindTitle(LocalContext.current),
+                    kind.kindTitle(LocalResources.current),
                     modifier = Modifier.align(Alignment.CenterVertically),
                     style = Typography.Small,
                     color = MaterialTheme.colorScheme.onSecondaryContainer.copy(alpha = 0.8f)
@@ -383,7 +385,7 @@ fun ConfirmResourceActionDialog(
             Icon(painterResource(id = resourceKind.icon()), contentDescription = null)
         },
         title = {
-            Text(text = "${locale.displayLanguage} - ${resourceKind.kindTitle(LocalContext.current)}")
+            Text(text = "${locale.displayLanguage} - ${resourceKind.kindTitle(LocalResources.current)}")
         },
         text = {
             if (isCurrentlySet) {
@@ -564,6 +566,7 @@ val LanguageSettingsLite = UserSettingsMenu(
 @Composable
 fun LanguagesScreen(navController: NavHostController = rememberNavController()) {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val deleteDialogInfo: MutableState<DeleteInfo?> = remember { mutableStateOf(null) }
     val languageDeleteInfo: MutableState<Locale?> = remember { mutableStateOf(null) }
 
@@ -667,11 +670,11 @@ fun LanguagesScreen(navController: NavHostController = rememberNavController())
                         FileKind.Dictionary.namePreferenceKeyFor(it),
                         "Dictionary"
                     )
-                } + " " + context.getString(
+                } + " " + resources.getString(
                     R.string.language_settings_resource_imported_indicator
                 )
              } ?: if (Dictionaries.getDictionaryIfExists(context, locale, Dictionaries.DictionaryKind.Any) != null) {
-                context.getString(R.string.language_settings_resource_builtin_dictionary_name)
+                resources.getString(R.string.language_settings_resource_builtin_dictionary_name)
             } else {
                 null
             }
@@ -679,7 +682,7 @@ fun LanguagesScreen(navController: NavHostController = rememberNavController())
             val transformerName =
                 runBlocking { ModelPaths.getModelOptions(context) }.get(locale.language)?.let {
                     it.loadDetails()?.let {
-                        it.name + if (it.isUnsupported()) (" " + context.getString(R.string.language_settings_resource_unsupported_indicator)) else ""
+                        it.name + if (it.isUnsupported()) (" " + resources.getString(R.string.language_settings_resource_unsupported_indicator)) else ""
                     }
                 }
 
@@ -712,7 +715,7 @@ fun LanguagesScreen(navController: NavHostController = rememberNavController())
                     if(layoutSetName.startsWith("custom")) {
                         val i = layoutSetName.substring("custom".length).toIntOrNull()
                         if(i != null) {
-                            navController.navigate("devlayoutedit/$i")
+                            navController.navigate(Route.DevLayoutEdit(i))
                         }
                     } else {
                         Subtypes.removeLanguage(context, subtype)
@@ -726,7 +729,7 @@ fun LanguagesScreen(navController: NavHostController = rememberNavController())
                     }
                 },
                 onLayoutAdditionRequested = {
-                    navController.navigate("addLayout/${locale.toString().urlEncode()}")
+                    navController.navigate(Route.AddLayout(locale.toLanguageTag()))
                 },
                 onToggleMultilingualBucket = { to ->
                     val newSet = multilingualBucket.value.toMutableSet()
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Payment.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Payment.kt
index 2b80d97b24..1c49682be7 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Payment.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Payment.kt
@@ -46,6 +46,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
@@ -451,6 +452,9 @@ fun PaymentScreen(
 
     val reminderTimeIsUp = (currentTime >= pushReminderTime.value) && ((numDaysInstalled.intValue >= TRIAL_PERIOD_DAYS) || forceShowNotice.value)
 
+    val context = LocalContext.current
+    val resources = LocalResources.current
+
     ScrollableList {
         ScreenTitle(stringResource(R.string.payment_screen_short_title), showBack = true, navController = navController)
 
@@ -462,8 +466,6 @@ fun PaymentScreen(
 
         Spacer(Modifier.height(8.dp))
 
-        val context = LocalContext.current
-
         SpacedColumn(32.dp) {
             PaymentSurface(isPrimary = true) {
                 TextColumn {
@@ -560,12 +562,12 @@ fun PaymentScreen(
 
                     ActionsColumn {
                         val context = LocalContext.current
-                        val remindOptions = remember(context) {
+                        val remindOptions = remember(resources) {
                             listOf(
-                                7 to context.getString(R.string.payment_screen_set_reminder_setter_7_days),
-                                30 to context.getString(R.string.payment_screen_set_reminder_setter_1_month),
-                                182 to context.getString(R.string.payment_screen_set_reminder_setter_6_months),
-                                36500 to context.getString(R.string.payment_screen_set_reminder_setter_next_century),
+                                7 to resources.getString(R.string.payment_screen_set_reminder_setter_7_days),
+                                30 to resources.getString(R.string.payment_screen_set_reminder_setter_1_month),
+                                182 to resources.getString(R.string.payment_screen_set_reminder_setter_6_months),
+                                36500 to resources.getString(R.string.payment_screen_set_reminder_setter_next_century),
                             )
                         }
                         val selection = remember(remindOptions) { mutableStateOf(remindOptions.first()) }
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Search.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Search.kt
index ee6b8622df..e86e2902b4 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Search.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Search.kt
@@ -25,7 +25,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextAlign
@@ -40,6 +40,8 @@ import org.futo.inputmethod.latin.uix.settings.BottomSpacer
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
 import org.futo.inputmethod.latin.uix.settings.SettingsMenus
+import org.futo.inputmethod.latin.uix.settings.UserSetting
+import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
 import org.futo.inputmethod.latin.uix.settings.userSettingDecorationOnly
 import org.futo.inputmethod.latin.uix.theme.Typography
 
@@ -59,12 +61,8 @@ private fun normalizeString(s: String): String {
     } ?: s).lowercase()
 }
 
-@OptIn(ExperimentalFoundationApi::class)
-@Preview(showBackground = true)
-@Composable
-fun SearchScreen(navController: NavHostController = rememberNavController()) {
-    val context = LocalContext.current
-    val textFieldValue = remember { mutableStateOf("") }
+@Composable private fun searchResults(query: String): List<Pair<UserSettingsMenu, List<UserSetting>>> {
+    val resources = LocalResources.current
 
     val searchTagsByMenu = remember {
         SettingsMenus
@@ -72,17 +70,16 @@ fun SearchScreen(navController: NavHostController = rememberNavController()) {
             .filter { it.name != 0 }
             .associate {
                 it to run {
-                    normalizeString(context.getString(it.name)) + "\n" +
-                            (it.searchTagList?.joinToString("\n") { normalizeString(context.getString(it)) }
-                                ?: it.searchTags?.let { normalizeString(context.getString(it)) }
+                    normalizeString(resources.getString(it.name)) + "\n" +
+                            (it.searchTagList?.joinToString("\n") { normalizeString(resources.getString(it)) }
+                                ?: it.searchTags?.let { normalizeString(resources.getString(it)) }
                                 ?: "") + "\n" +
-                            (it.subtitle?.let { normalizeString(context.getString(it)) } ?: "")
+                            (it.subtitle?.let { normalizeString(resources.getString(it)) } ?: "")
                 }
             }
     }
 
-    val query = normalizeString(textFieldValue.value)
-    val results = remember(query) {
+    return remember(query) {
         SettingsMenus.map { menu ->
             menu to menu.settings
                 .filter { it.name != 0 && it.appearsInSearch }
@@ -118,6 +115,16 @@ fun SearchScreen(navController: NavHostController = rememberNavController()) {
     }.filter {
         it.second.isNotEmpty()
     }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Preview(showBackground = true)
+@Composable
+fun SearchScreen(navController: NavHostController = rememberNavController()) {
+    val textFieldValue = remember { mutableStateOf("") }
+
+    val query = normalizeString(textFieldValue.value)
+    val results = searchResults(query)
 
     LazyColumn {
         item {
@@ -131,7 +138,6 @@ fun SearchScreen(navController: NavHostController = rememberNavController()) {
             }
         }
 
-
         if(query.isBlank()) {
             item {
                 Text(
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Swipe.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Swipe.kt
new file mode 100644
index 0000000000..9b9e12aaf3
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Swipe.kt
@@ -0,0 +1,158 @@
+package org.futo.inputmethod.latin.uix.settings.pages
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.Center
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import org.futo.inputmethod.latin.DisplayTop4Setting
+import org.futo.inputmethod.latin.LegacySwipeSetting
+import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.settings.Settings
+import org.futo.inputmethod.latin.uix.AutoFitText
+import org.futo.inputmethod.latin.uix.LocalKeyboardScheme
+import org.futo.inputmethod.latin.uix.SuggestionSeparator
+import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.ScreenTitle
+import org.futo.inputmethod.latin.uix.settings.SettingRadio
+import org.futo.inputmethod.latin.uix.settings.SettingToggleDataStore
+import org.futo.inputmethod.latin.uix.settings.UserSetting
+import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
+import org.futo.inputmethod.latin.uix.settings.useDataStore
+import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
+import org.futo.inputmethod.latin.uix.settings.userSettingDecorationOnly
+import org.futo.inputmethod.latin.uix.settings.userSettingNavigationItem
+import org.futo.inputmethod.latin.uix.settings.userSettingToggleSharedPrefs
+import org.futo.inputmethod.latin.uix.suggestionStyleAlternative
+import org.futo.inputmethod.latin.uix.suggestionStylePrimary
+
+
+@Composable
+private fun RowScope.PreviewSuggestionItem(word: String, isAutocorrect: Boolean) {
+    val color = when(isAutocorrect) {
+        true -> LocalKeyboardScheme.current.onSurface
+        else -> LocalKeyboardScheme.current.onSurfaceVariant
+    }
+
+    val textStyle = when(isAutocorrect) {
+        true -> suggestionStylePrimary
+        false -> suggestionStyleAlternative
+    }.copy(color = color)
+
+    Box(
+        modifier = Modifier
+            .weight(1.0f)
+            .fillMaxHeight()
+    ) {
+        CompositionLocalProvider(LocalContentColor provides color) {
+            val modifier = Modifier
+                .align(Center)
+                .padding(2.dp)
+            AutoFitText(word, style = textStyle, modifier = modifier)
+        }
+    }
+}
+
+@Composable
+private fun PreviewSuggestions(word1: String, word2: String, word3: String, isAlt: Boolean) {
+    Row(Modifier.fillMaxWidth().background(
+        LocalKeyboardScheme.current.keyboardSurfaceDim, RoundedCornerShape(4.dp)
+    ).border(
+        Dp.Hairline, LocalKeyboardScheme.current.outline.copy(alpha=0.3f), RoundedCornerShape(4.dp)
+    ).padding(4.dp))  {
+        PreviewSuggestionItem(word1, false)
+        SuggestionSeparator()
+        PreviewSuggestionItem(word2, !isAlt)
+        SuggestionSeparator()
+        PreviewSuggestionItem(word3, false)
+    }
+}
+
+val SwipeMenu = UserSettingsMenu(
+    title = R.string.swipe_settings_title,
+    navPath = "swipe", registerNavPath = true,
+    settings = listOf(
+        userSettingToggleSharedPrefs(
+            title = R.string.swipe_settings_enable_swipe_typing,
+            subtitle = R.string.swipe_settings_enable_swipe_typing_subtitle,
+            key = Settings.PREF_GESTURE_INPUT,
+            default = {true},
+        ),
+
+        UserSetting(
+            name = R.string.swipe_settings_suggest_mode,
+            searchTags = R.string.swipe_settings_suggest_mode_tags
+        ) {
+            val alt1 = stringResource(R.string.swipe_settings_suggest_mode_alternative_word_1)
+            val alt2 = stringResource(R.string.swipe_settings_suggest_mode_alternative_word_2)
+            val alt3 = stringResource(R.string.swipe_settings_suggest_mode_alternative_word_3)
+            val main = stringResource(R.string.swipe_settings_suggest_mode_used_word)
+
+            val setting = useDataStore(DisplayTop4Setting)
+
+            SettingRadio(
+                title = stringResource(R.string.swipe_settings_suggest_mode),
+                options = listOf(true, false),
+                optionNames = listOf(
+                    stringResource(R.string.swipe_settings_suggest_mode_top4_title),
+                    stringResource(R.string.swipe_settings_suggest_mode_top3_title),
+                ),
+                setting = setting,
+                subcontent = listOf(
+                    { PreviewSuggestions(alt2, alt1, alt3, true) },
+                    { PreviewSuggestions(alt1, main, alt2, false) },
+                )
+            )
+        },
+
+        userSettingDecorationOnly {
+            ScreenTitle(stringResource(R.string.swipe_settings_miscellaneous_title))
+        },
+
+        userSettingNavigationItem(
+            title = R.string.swipe_settings_configure_shortcuts,
+            subtitle = R.string.swipe_settings_configure_shortcuts_subtitle,
+            navigateTo = LongPressMenu.navPath,
+            style = NavigationItemStyle.Misc
+        ).copy(appearsInSearch=false),
+
+        userSettingDecorationOnly {
+            val useLegacy = useDataStoreValue(LegacySwipeSetting)
+            val showUseLegacy = remember { mutableStateOf(useLegacy) }
+
+            Spacer(Modifier.height(8.dp))
+            if(!showUseLegacy.value) {
+                TextButton(onClick = {
+                    showUseLegacy.value = true
+                }) {
+                    Text(stringResource(R.string.swipe_settings_show_unsupported))
+                }
+            } else {
+                SettingToggleDataStore(
+                    title = stringResource(R.string.swipe_settings_use_old_swipe),
+                    subtitle = stringResource(
+                        if(useLegacy) R.string.swipe_settings_use_old_swipe_subtitle else R.string.swipe_settings_use_old_swipe_subtitle_short),
+                    setting = LegacySwipeSetting
+                )
+            }
+        },
+    )
+)
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Typing.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Typing.kt
index de8fea13c6..0218653c24 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Typing.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Typing.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.platform.LocalTextInputService
 import androidx.compose.ui.res.booleanResource
 import androidx.compose.ui.res.painterResource
@@ -83,6 +84,7 @@ import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.delay
 import org.futo.inputmethod.accessibility.AccessibilityUtils
 import org.futo.inputmethod.engine.IMESettingsMenu
+import org.futo.inputmethod.latin.HideKeyboardWhenHardKeyboardConnected
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.settings.LongPressKey
 import org.futo.inputmethod.latin.settings.LongPressKeyLayoutSetting
@@ -113,6 +115,7 @@ import org.futo.inputmethod.latin.uix.settings.SettingItem
 import org.futo.inputmethod.latin.uix.settings.SettingRadio
 import org.futo.inputmethod.latin.uix.settings.SettingSlider
 import org.futo.inputmethod.latin.uix.settings.SettingSliderSharedPrefsInt
+import org.futo.inputmethod.latin.uix.settings.SettingToggleRaw
 import org.futo.inputmethod.latin.uix.settings.SyncDataStoreToPreferencesFloat
 import org.futo.inputmethod.latin.uix.settings.SyncDataStoreToPreferencesInt
 import org.futo.inputmethod.latin.uix.settings.Tip
@@ -240,17 +243,18 @@ fun ResizeScreen(navController: NavHostController = rememberNavController()) {
 @Composable
 private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPressKey, Int) -> Unit, disable: (LongPressKey) -> Unit, dragIcon: @Composable () -> Unit, limits: IntRange) {
     val context = LocalContext.current
+    val resources = LocalResources.current
     val talkBackOn = remember {
         AccessibilityUtils.init(context)
         AccessibilityUtils.getInstance().isAccessibilityEnabled
     }
 
-    val customActions = remember(idx, limits, item) {
+    val customActions = remember(idx, limits, item, resources) {
         buildList {
             if (idx > limits.first) {
                 add(
                     CustomAccessibilityAction(
-                        context.getString(R.string.morekey_settings_move_kind_up)
+                        resources.getString(R.string.morekey_settings_move_kind_up)
                     ) {
                         moveItem(item, -1)
                         true
@@ -259,7 +263,7 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
 
                 add(
                     CustomAccessibilityAction(
-                        context.getString(R.string.morekey_settings_move_kind_up_to_top)
+                        resources.getString(R.string.morekey_settings_move_kind_up_to_top)
                     ) {
                         moveItem(item, -100)
                         true
@@ -269,7 +273,7 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
             if (idx < limits.last) {
                 add(
                     CustomAccessibilityAction(
-                        context.getString(R.string.morekey_settings_move_kind_down)
+                        resources.getString(R.string.morekey_settings_move_kind_down)
                     ) {
                         moveItem(item, 1)
                         true
@@ -277,7 +281,7 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
                 )
                 add(
                     CustomAccessibilityAction(
-                        context.getString(R.string.morekey_settings_move_kind_down_to_bottom)
+                        resources.getString(R.string.morekey_settings_move_kind_down_to_bottom)
                     ) {
                         moveItem(item, 100)
                         true
@@ -286,7 +290,7 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
             }
             add(
                 CustomAccessibilityAction(
-                    context.getString(R.string.morekey_settings_disable)
+                    resources.getString(R.string.morekey_settings_disable)
                 ) {
                     disable(item)
                     true
@@ -296,8 +300,8 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
     }
 
     val semantics = Modifier.clearAndSetSemantics {
-        contentDescription = item.name(context)
-        stateDescription = context.getString(
+        contentDescription = item.name(resources)
+        stateDescription = resources.getString(
             R.string.morekey_settings_kind_position,
             (idx + 1).toString(),
             (limits.last + 1).toString()
@@ -324,8 +328,8 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
     val shouldClampUpper = (idx + 1) > limits.last
 
     SettingItem(
-        title = "${idx+1}. " + item.name(context),
-        subtitle = item.description(context),
+        title = "${idx+1}. " + item.name(resources),
+        subtitle = item.description(resources),
         icon = {
             if(talkBackOn) {
                 Column {
@@ -410,6 +414,7 @@ private fun DraggableSettingItem(idx: Int, item: LongPressKey, moveItem: (LongPr
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun LongPressKeyLayoutEditor(context: Context, setting: DataStoreItem<String>) {
+    val resources = LocalResources.current
     Row(Modifier.padding(16.dp)) {
         Text(stringResource(R.string.morekey_settings_layout), style = Typography.Heading.Medium, modifier = Modifier
             .align(CenterVertically)
@@ -474,7 +479,7 @@ private fun LongPressKeyLayoutEditor(context: Context, setting: DataStoreItem<St
                 rowCount = items.size,
                 columnCount = 1
             )
-            contentDescription = context.getString(R.string.morekey_settings_active)
+            contentDescription = resources.getString(R.string.morekey_settings_active)
         }) {
             items.forEachIndexed { i, v ->
                 key(v.ordinal) {
@@ -503,16 +508,16 @@ private fun LongPressKeyLayoutEditor(context: Context, setting: DataStoreItem<St
                 rowCount = inactiveEntries.size,
                 columnCount = 1
             )
-            contentDescription = context.getString(R.string.morekey_settings_inactive)
+            contentDescription = resources.getString(R.string.morekey_settings_inactive)
         }) {
             inactiveEntries.forEach {
                 SettingItem(
-                    title = it.name(context),
-                    subtitle = it.description(context),
+                    title = it.name(resources),
+                    subtitle = it.description(resources),
                     modifier = Modifier.clearAndSetSemantics {
-                        contentDescription = it.name(context)
+                        contentDescription = it.name(resources)
 
-                        onClick(label = context.getString(R.string.morekey_settings_reactivate)) {
+                        onClick(label = resources.getString(R.string.morekey_settings_reactivate)) {
                             enable(it)
                             true
                         }
@@ -540,6 +545,97 @@ val LongPressMenu = UserSettingsMenu(
             setting = KeyHintsSetting
         ).copy(searchTags = R.string.morekey_settings_show_hints_tags),
 
+        userSettingDecorationOnly {
+            ScreenTitle(stringResource(R.string.morekey_settings_backspace_title))
+        },
+
+        UserSetting(name = R.string.morekey_settings_backspace_hold_delete_words) {
+            val oldSetting = useSharedPrefsInt(
+                key = Settings.PREF_BACKSPACE_MODE,
+                default = Settings.BACKSPACE_MODE_CHARACTERS
+            )
+
+            val setting = useSharedPrefsInt(
+                key = Settings.PREF_BACKSPACE_MODE_HOLD,
+                default = oldSetting.value
+            )
+
+            SettingToggleRaw(
+                title = stringResource(R.string.morekey_settings_backspace_hold_delete_words),
+                enabled = setting.value == Settings.BACKSPACE_MODE_WORDS,
+                setValue = { to ->
+                    setting.setValue(if(to) Settings.BACKSPACE_MODE_WORDS else Settings.BACKSPACE_MODE_CHARACTERS)
+                }
+            )
+        },
+
+        UserSetting(name = R.string.morekey_settings_backspace_swipe_to_delete) {
+            val setting = useSharedPrefsInt(
+                key = Settings.PREF_BACKSPACE_MODE,
+                default = Settings.BACKSPACE_MODE_CHARACTERS
+            )
+
+            val deleteModes = mapOf(
+                Settings.BACKSPACE_MODE_OFF to stringResource(R.string.morekey_settings_backspace_swipe_to_delete_off),
+                Settings.BACKSPACE_MODE_CHARACTERS to stringResource(R.string.morekey_settings_backspace_swipe_to_delete_characters),
+                Settings.BACKSPACE_MODE_WORDS to stringResource(R.string.morekey_settings_backspace_swipe_to_delete_words),
+            )
+
+            DropDownPickerSettingItem(
+                label = stringResource(R.string.morekey_settings_backspace_swipe_to_delete),
+                options = deleteModes.keys.toList(),
+                selection = setting.value,
+                onSet = { setting.setValue(it) },
+                getDisplayName = { deleteModes[it] ?: "?" },
+            )
+        },
+
+
+        userSettingDecorationOnly {
+            ScreenTitle(stringResource(R.string.morekey_settings_spacebar_title))
+        },
+
+        UserSetting(name = R.string.morekey_settings_spacebar_swipe_shortcut) {
+            val setting = useSharedPrefsInt(
+                key = Settings.PREF_SPACEBAR_SWIPE_MODE,
+                default = remember { Settings.getInstance().current.mSpacebarSwipeMode }
+            )
+
+            val modes = mapOf(
+                Settings.SPACEBAR_MODE_OFF to stringResource(R.string.morekey_settings_spacebar_swipe_shortcut_off),
+                Settings.SPACEBAR_MODE_CURSOR to stringResource(R.string.morekey_settings_spacebar_swipe_shortcut_cursor),
+                Settings.SPACEBAR_MODE_LANGUAGE to stringResource(R.string.morekey_settings_spacebar_swipe_shortcut_language),
+            )
+
+            DropDownPickerSettingItem(
+                label = stringResource(R.string.morekey_settings_spacebar_swipe_shortcut),
+                options = modes.keys.toList(),
+                selection = setting.value,
+                onSet = { setting.setValue(it) },
+                getDisplayName = { modes[it] ?: "?" },
+            )
+        },
+
+        UserSetting(name = R.string.morekey_settings_spacebar_hold_shortcut) {
+            val setting = useSharedPrefsInt(
+                key = Settings.PREF_SPACEBAR_HOLD_MODE,
+                default = remember { Settings.getInstance().current.mSpacebarHoldMode }
+            )
+
+            val modes = mapOf(
+                Settings.SPACEBAR_MODE_CURSOR to stringResource(R.string.morekey_settings_spacebar_hold_shortcut_cursor),
+                Settings.SPACEBAR_MODE_LANGUAGE to stringResource(R.string.morekey_settings_spacebar_hold_shortcut_language),
+            )
+
+            DropDownPickerSettingItem(
+                label = stringResource(R.string.morekey_settings_spacebar_hold_shortcut),
+                options = modes.keys.toList(),
+                selection = setting.value,
+                onSet = { setting.setValue(it) },
+                getDisplayName = { modes[it] ?: "?" },
+            )
+        },
+
         // TODO: Might not work well for showing up in search
         UserSetting(name = R.string.morekey_settings_layout) {
             val context = LocalContext.current
@@ -554,7 +650,7 @@ val LongPressMenu = UserSettingsMenu(
             name = R.string.morekey_settings_duration,
             subtitle = R.string.morekey_settings_duration_subtitle,
         ) {
-            val context = LocalContext.current
+            val resources = LocalResources.current
             SettingSliderSharedPrefsInt(
                 title = stringResource(R.string.morekey_settings_duration),
                 subtitle = stringResource(R.string.morekey_settings_duration_subtitle),
@@ -563,55 +659,10 @@ val LongPressMenu = UserSettingsMenu(
                 range = 100.0f..700.0f,
                 hardRange = 25.0f..1200.0f,
                 transform = { it.roundToInt() },
-                indicator = { context.getString(R.string.abbreviation_unit_milliseconds, "$it") },
+                indicator = { resources.getString(R.string.abbreviation_unit_milliseconds, "$it") },
                 steps = 23
             )
         },
-        UserSetting(
-            name = R.string.morekey_settings_backspace_behavior
-        ) {
-            SettingRadio(
-                title = stringResource(R.string.morekey_settings_backspace_behavior),
-                options = listOf(
-                    Settings.BACKSPACE_MODE_CHARACTERS,
-                    Settings.BACKSPACE_MODE_WORDS
-                ),
-                optionNames = listOf(
-                    stringResource(R.string.morekey_settings_backspace_behavior_delete_chars),
-                    stringResource(R.string.morekey_settings_backspace_behavior_delete_words)
-                ),
-                setting = useSharedPrefsInt(
-                    key = Settings.PREF_BACKSPACE_MODE,
-                    default = Settings.BACKSPACE_MODE_CHARACTERS
-                )
-            )
-        },
-        UserSetting(
-            name = R.string.morekey_settings_space_behavior,
-            searchTagList = listOf(
-                R.string.morekey_settings_space_behavior_swipe_cursor,
-                R.string.morekey_settings_space_behavior_swipe_lang,
-                R.string.morekey_settings_space_behavior_only_cursor
-            )
-        ) {
-            SettingRadio(
-                title = stringResource(R.string.morekey_settings_space_behavior),
-                options = listOf(
-                    Settings.SPACEBAR_MODE_SWIPE_CURSOR,
-                    Settings.SPACEBAR_MODE_SWIPE_LANGUAGE,
-                    Settings.SPACEBAR_MODE_SWIPE_CURSOR_ONLY
-                ),
-                optionNames = listOf(
-                    stringResource(R.string.morekey_settings_space_behavior_swipe_cursor),
-                    stringResource(R.string.morekey_settings_space_behavior_swipe_lang),
-                    stringResource(R.string.morekey_settings_space_behavior_only_cursor)
-                ),
-                setting = useSharedPrefsInt(
-                    key = Settings.PREF_SPACEBAR_MODE,
-                    default = Settings.SPACEBAR_MODE_SWIPE_CURSOR
-                )
-            )
-        }
     )
 )
 
@@ -794,6 +845,10 @@ val KeyboardSettingsMenu = UserSettingsMenu(
             key = Settings.PREF_ENABLE_ALT_PERIOD_KEY,
             default = {false},
         ),
+        userSettingToggleDataStore(
+            title = R.string.keyboard_settings_hide_when_hardware_keyboard_is_connected,
+            setting = HideKeyboardWhenHardKeyboardConnected
+        )
     )
 )
 
@@ -807,16 +862,6 @@ val TypingSettingsMenu = UserSettingsMenu(
                 AutoSpacesSetting()
             }
         ),
-        userSettingToggleSharedPrefs(
-            title = R.string.typing_settings_swipe,
-            subtitle = R.string.typing_settings_swipe_subtitle,
-            key = Settings.PREF_GESTURE_INPUT,
-            default = {true},
-            icon = {
-                Icon(painterResource(id = R.drawable.swipe_icon), contentDescription = null,
-                    tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.75f))
-            }
-        ),
         userSettingToggleDataStore(
             title = R.string.typing_settings_suggest_emojis,
             subtitle = R.string.typing_settings_suggest_emojis_subtitle,
@@ -874,6 +919,7 @@ val TypingSettingsMenu = UserSettingsMenu(
             },
             component = {
                 val context = LocalContext.current
+                val resources = LocalResources.current
                 SyncDataStoreToPreferencesInt(vibrationDurationSetting, PREF_VIBRATION_DURATION_SETTINGS)
 
                 SettingSlider(
@@ -884,9 +930,9 @@ val TypingSettingsMenu = UserSettingsMenu(
                     transform = { it.roundToInt() },
                     indicator = {
                         if(it == -1) {
-                            context.getString(R.string.typing_settings_vibration_strength_default)
+                            resources.getString(R.string.typing_settings_vibration_strength_default)
                         } else {
-                            context.getString(R.string.abbreviation_unit_milliseconds, "$it")
+                            resources.getString(R.string.abbreviation_unit_milliseconds, "$it")
                         }
                     }
                 )
@@ -907,6 +953,7 @@ val TypingSettingsMenu = UserSettingsMenu(
             },
             component = {
                 val context = LocalContext.current
+                val resources = LocalResources.current
                 SyncDataStoreToPreferencesFloat(keySoundVolumeSetting, PREF_KEYPRESS_SOUND_VOLUME)
 
                 val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
@@ -922,7 +969,7 @@ val TypingSettingsMenu = UserSettingsMenu(
                     }
                     val volume = value.floatValue.let {
                         if(it == -1.0f) {
-                            Settings.readDefaultKeypressSoundVolume(context.resources)
+                            Settings.readDefaultKeypressSoundVolume(resources)
                         } else {
                             it
                         }
@@ -960,7 +1007,7 @@ val TypingSettingsMenu = UserSettingsMenu(
                     },
                     indicator = {
                         if(it <= 0.0f) {
-                            context.getString(R.string.typing_settings_keypress_sound_volume_default)
+                            resources.getString(R.string.typing_settings_keypress_sound_volume_default)
                         } else {
                             "${(it * 100.0f).roundToInt()}%"
                         }
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/VoiceInput.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/VoiceInput.kt
index 3d132d0e51..2fff8bdb4b 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/VoiceInput.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/VoiceInput.kt
@@ -3,6 +3,7 @@ package org.futo.inputmethod.latin.uix.settings.pages
 import android.content.Intent
 import androidx.compose.runtime.Composable
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.ANIMATE_BUBBLE
 import org.futo.inputmethod.latin.uix.AUDIO_FOCUS
 import org.futo.inputmethod.latin.uix.CAN_EXPAND_SPACE
 import org.futo.inputmethod.latin.uix.DISALLOW_SYMBOLS
@@ -82,6 +83,12 @@ val VoiceInputMenu = UserSettingsMenu(
             setting = USE_VAD_AUTOSTOP
         ).copy(visibilityCheck = visibilityCheckNotSystemVoiceInput),
 
+        userSettingToggleDataStore(
+            title = R.string.voice_input_settings_animate_bubble,
+            subtitle = R.string.voice_input_settings_animate_bubble_subtitle,
+            setting = ANIMATE_BUBBLE
+        ).copy(visibilityCheck = visibilityCheckNotSystemVoiceInput),
+
         userSettingNavigationItem(
             title = R.string.voice_input_settings_change_models,
             subtitle = R.string.voice_input_settings_change_models_subtitle,
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/Contributors.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/Contributors.kt
index d44e8be949..57e167c931 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/Contributors.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/Contributors.kt
@@ -7,9 +7,10 @@ val languageContribs: List<String> = listOf(
     "Alphex (fr)",
     "Andreas (sv-SE)",
     "Claudio (it)",
+    "Daniel (cs)",
     "DanielSong (zh-CN)",
+    "Daniil (ru)",
     "Edoardo Andrei Morosanu (it)",
-    "Fjuro (cs)",
     "Franz (de)",
     "Igor (uk)",
     "J.Carver (fr)",
@@ -20,25 +21,33 @@ val languageContribs: List<String> = listOf(
     "Leonel (es)",
     "LucasMZ (pt-BR)",
     "MP (es-ES)",
+    "MinhSangGD (vi)",
     "Nai (kk)",
     "Natan (pt-BR)",
     "Nero (es)",
     "NotRCthere (zh-CN)",
     "Nydalik (fr)",
+    "Philipp (de)",
     "Phoenix_R49 (fr)",
     "RubberhoseCrypto (ro)",
     "Rune (da)",
     "Shunnoo (pt, pt-PT)",
+    "Sondre (nn-NO)",
     "Stefan (sr-Latn)",
     "TheBlunius (pl)",
     "Tony Neal (vi)",
     "TurtleBear (ja)",
+    "TyZ.Err.233 (zh-CN)",
+    "Vojtěch (cs)",
     "WertZuz (de)",
     "Witek (pl)",
-    "abb128 (lt, ru)",
+    "abb128 (lt, ru, zh-CN)",
     "abcerenbicki (tr)",
+    "andre.orenday (es)",
     "anonutz (de)",
+    "ar (ar)",
     "brian.viale (fr)",
+    "cefef21315 (cs)",
     "dagfen15+github (es-MX)",
     "dp229 (ru)",
     "e12 (ru)",
@@ -56,41 +65,44 @@ val languageContribs: List<String> = listOf(
     "zvonimir (hr)",
     "川音리오@KawaneRio (ja)"
 )
-
 @Suppress("HardCodedStringLiteral")
 val layoutContribs: List<String> = listOf(
+    "AstroNot233",
     "BRBWaffles",
-    "BoFFire",
     "DanielBreiner",
     "DeepNestedSpider",
+    "Felipeshaolin",
     "IliyanKostov9",
     "Imold",
     "Midnight1938",
     "NicolasLagaillardie",
     "PlagaMedicum",
     "RHJihan",
+    "RenoirTan",
     "SanmayJoshi",
     "Shunnuo",
     "Zvonimir-FUTO",
     "abb128",
     "abdelhaqueidali",
     "chrisnordborg",
+    "ghost",
     "hipi66",
     "lomtjjz",
     "pjrobertson",
     "sapradhan",
     "slycordinator",
-    "tenextractor",
-    "AstroNot233"
+    "tenextractor"
 )
-
 @Suppress("HardCodedStringLiteral")
 val codeContribs: List<String> = listOf(
     "Adolar0042",
+    "AstroNot233",
     "Bl4ckspell7",
+    "FarhanSyedain",
+    "Sbax",
     "arbitrary-dev",
     "barmiro",
-    "bl4ze1g",
+    "bl4zee1g",
     "drendog",
     "nyxtutt",
     "ornstrange",
@@ -99,7 +111,7 @@ val codeContribs: List<String> = listOf(
     "roguesensei",
     "s-h-a-d-o-w",
     "sapradhan",
+    "tedgravlin",
     "tenextractor",
-    "venkatesh2090",
-    "AstroNot233"
-)
+    "venkatesh2090"
+)
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/License.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/License.kt
index 83d19216fb..9d22ae278a 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/License.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/License.kt
@@ -10,7 +10,8 @@ enum class License {
     NAIST_2003,
     CC_BY_SA_4_0,
     GPL_V2,
-    Proprietary
+    Proprietary,
+    PublicDomain
 }
 
 @Suppress("HardCodedStringLiteral")
@@ -1143,4 +1144,10 @@ Public License instead of this License.
 """
 
     License.Proprietary -> "All rights reserved. Used with authorization"
-}
\ No newline at end of file
+
+    License.PublicDomain -> """This work has been released into the public domain by the copyright holder. This applies worldwide.
+
+In jurisdictions where this is not legally possible, the copyright holder grants anyone the right to use this work for any purpose, without any conditions, unless such conditions are required by law.
+
+No copyright is claimed. This work may be freely reproduced, distributed, transmitted, modified, built upon, or otherwise used by anyone for any lawful purpose."""
+}
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/ThirdPartyList.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/ThirdPartyList.kt
index 09fa1131c6..f69ba152f3 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/ThirdPartyList.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/ThirdPartyList.kt
@@ -182,5 +182,12 @@ SKK Development Team <skk@ring.gr.jp>""",
         "https://rime.im/",
         "Copyright (c) 2014, RIME Developers",
         License.BSD3
+    ),
+    TP(
+        "ClearFlow Layout",
+        "ClearFlow Layout (xjunbi)",
+        "https://clearflowkeyboard.github.io/",
+        "Copyright (c) 2024-2026 Xiaojun Bi (xjunbi)",
+        License.PublicDomain
     )
-)
\ No newline at end of file
+)
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/ChineseIMESettings.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/ChineseIMESettings.kt
new file mode 100644
index 0000000000..fc452e814a
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/ChineseIMESettings.kt
@@ -0,0 +1,13 @@
+package org.futo.inputmethod.latin.uix.settings.pages.langspecific.zh
+
+import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.settings.UserSettingsMenu
+
+object ChineseIMESettings {
+    val menu = UserSettingsMenu(
+        title = R.string.chinese_settings_title,
+        searchTags = R.string.chinese_setting_search_tags,
+        navPath = "ime/zh", registerNavPath = true,
+        settings = RimeSettings.settings + PinyinSettings.settings
+    )
+}
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/RimeSettings.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/RimeSettings.kt
new file mode 100644
index 0000000000..9ec3682af9
--- /dev/null
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/langspecific/zh/RimeSettings.kt
@@ -0,0 +1,137 @@
+package org.futo.inputmethod.latin.uix.settings.pages.langspecific.zh
+
+import android.util.Log
+import androidx.compose.ui.platform.LocalResources
+import androidx.compose.ui.res.stringResource
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import icu.astronot233.rime.Rime
+import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.SettingsKey
+import org.futo.inputmethod.latin.uix.settings.DropDownPickerSettingItem
+import org.futo.inputmethod.latin.uix.settings.UserSetting
+import org.futo.inputmethod.latin.uix.settings.useDataStore
+import org.futo.inputmethod.latin.utils.toEnumOrNull
+import java.io.File
+import java.io.IOException
+
+object RimeSettings {
+    const val TAG = "RimeSettings"
+    const val ConfigVersion = "2.0.0"
+
+    // How should we get the context?
+    // Now RimeDir is initialized by ChineseIME
+    lateinit var RimeDir: File
+    val SharedDataDir: File get() = File(RimeDir, "shared")
+    val UserDataDir: File get() = File(RimeDir, "user")
+
+    enum class ChineseSimplificationMode(val stringResource: Int) {
+        // These must not be renamed, or the existing setting value for users will break
+        ByLanguage(R.string.chinese_setting_simplification_simplify_by_language_country),
+        Simplified(R.string.chinese_setting_simplification_force_simplified),
+        Traditional(R.string.chinese_setting_simplification_force_traditional);
+    }
+
+    val SimplificationSetting = SettingsKey(
+        stringPreferencesKey("ChineseIME_simplification"),
+        ChineseSimplificationMode.ByLanguage.name
+    )
+    val EnabledSchemaSetting = SettingsKey(
+        stringSetPreferencesKey("ChineseIME_enabledSchema"),
+        emptySet()
+    )
+
+    val settings = listOf(
+        UserSetting(R.string.chinese_setting_simplification) {
+            val resources = LocalResources.current
+            val (setting, setSetting) = useDataStore(SimplificationSetting)
+            DropDownPickerSettingItem<ChineseSimplificationMode>(
+                stringResource(R.string.chinese_setting_simplification),
+                ChineseSimplificationMode.entries,
+                setting.toEnumOrNull<ChineseSimplificationMode>()
+                    ?: ChineseSimplificationMode.ByLanguage,
+                { setSetting(it.name) },
+                { resources.getString(it.stringResource) }
+            )
+            generateDefaultYaml()
+            // TODO: request engine redeploy
+        },
+        UserSetting(R.string.chinese_setting_simplification) { // TODO: need a new string for enabled schemas
+            val resources = LocalResources.current
+            val (setting, setSetting) = useDataStore(EnabledSchemaSetting)
+            // TODO: show a list with checkboxes then save settings
+            generateDefaultYaml()
+            // TODO: request engine redeploy
+        }
+    )
+    private fun generateDefaultYaml() {
+        val dotYaml = File(UserDataDir, "default.yaml")
+        val newYaml = StringBuilder("config_version: $ConfigVersion\n")
+
+        newYaml.append(general)
+        newYaml.append(punctuator)
+
+        // TODO: replace (true) with ChineseSimplificationMode
+        newYaml.appendLine("convert:")
+        newYaml.appendLine("  - name: traditionalization")
+        newYaml.appendLine("    reset: ${if (true) 1 else 0}")
+        newYaml.appendLine("  - name: simplification")
+        newYaml.appendLine("    reset: ${if (true) 1 else 0}")
+
+        // TODO: As is mentioned before, use enabled schemata instead of all.
+        newYaml.appendLine("schema_list:")
+        availableSchemata.forEach { newYaml.appendLine("  - {schema: $it}") }
+
+        dotYaml.writeText(newYaml.toString())
+    }
+}
+
+private const val general =
+"""
+switches:
+  fold_options: true
+  abbreviate_options: true
+  save_options:
+    - emoji
+    __include: convert
+
+recognizer:
+  patterns:
+    uppercase: "[A-Z][0-9A-Za-z]*$"
+
+"""
+
+private const val punctuator =
+"""
+punctuator:
+  digit_separators: ",.:"
+  digit_separator_action: commit
+  half_shape:
+    ',' : { commit: ',' }
+    '.' : { commit: '.' }
+    '!' : { commit: '!' }
+    '?' : { commit: '?' }
+    ';' : { commit: ';' }
+    ':' : { commit: ':' }
+    '，' : { commit: '，' }
+    '。' : { commit: '。' }
+    '！' : { commit: '！' }
+    '？' : { commit: '？' }
+    '；' : { commit: '；' }
+    '：' : { commit: '：' }
+
+"""
+
+
+// TODO: Should be able to detect automatically
+private val availableSchemata = arrayOf(
+    "rime_ice",               // 雾凇拼音（全拼）
+    "t9",                     // 中文九键（仓输入法 & 元书输入法）
+    "double_pinyin",          // 自然码双拼
+    "double_pinyin_abc",      // 智能 ABC 双拼
+    "double_pinyin_mspy",     // 微软双拼
+    "double_pinyin_sogou",    // 搜狗双拼
+    "double_pinyin_flypy",    // 小鹤双拼
+    "double_pinyin_ziguang",  // 紫光双拼
+    "double_pinyin_jiajia",   // 拼音加加双拼
+)
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionary.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionary.kt
index d757b47ffa..c70a88ca00 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionary.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionary.kt
@@ -49,10 +49,10 @@ import org.futo.inputmethod.latin.uix.UserDictionaryIO
 import org.futo.inputmethod.latin.uix.getImportedUserDictFilesForLocale
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
-import org.futo.inputmethod.latin.uix.urlEncode
 import java.util.Locale
 import kotlin.collections.get
 
@@ -104,16 +104,20 @@ fun WordPopupDialog(selectedWord: PersonalWord? = null, locale: Locale? = null)
 
                 Spacer(Modifier.height(12.dp))
 
+                val shortcutError = remember(shortcut.value) {
+                    shortcut.value.firstOrNull()?.let {
+                        Settings.getInstance().current.isWordCodePoint(it.code)
+                    } == false
+                }
                 Text(stringResource(R.string.user_dict_settings_add_shortcut_option_name))
                 SettingsTextEdit(shortcut,
-                    placeholder = stringResource(R.string.user_dict_settings_add_shortcut_hint))
+                    placeholder = stringResource(R.string.user_dict_settings_add_shortcut_hint), error = shortcutError)
 
-                if (shortcut.value.firstOrNull()?.let {
-                        Settings.getInstance().current.isWordCodePoint(it.code)
-                    } == false) {
+                if (shortcutError) {
                     Text(
                         stringResource(R.string.personal_dictionary_shortcut_error_symbols),
-                        color = MaterialTheme.colorScheme.error
+                        color = MaterialTheme.colorScheme.error,
+                        style = MaterialTheme.typography.bodySmall
                     )
                 }
             }
@@ -176,21 +180,21 @@ fun WordPopupDialog(selectedWord: PersonalWord? = null, locale: Locale? = null)
 }
 
 @Composable
-fun WordPopupDialogF(selectedWord: String? = null, locale: String? = null) {
-    WordPopupDialog(
-        if(!selectedWord.isNullOrEmpty() && selectedWord != "add") { Json.decodeFromString(selectedWord) } else { null },
-        if(!locale.isNullOrEmpty() && locale != "all") { localeFromString(locale) } else { null }
-    )
+@Preview
+fun WordPopupDialogF(selectedWord: String? = null, locale: Locale? = null) {
+    val word = remember(selectedWord) {
+        selectedWord?.let { Json.decodeFromString<PersonalWord>(it) }
+    }
+    WordPopupDialog(word, locale)
 }
 
+
 @Composable
 fun PersonalDictionaryLanguageListForLocale(
     navController: NavHostController,
     backStackEntry: NavBackStackEntry,
-    localeString: String = "en"
+    locale: Locale?
 ) {
-    val locale = if(localeString == "all") { null } else { localeFromString(localeString) }
-
     val context = LocalContext.current
     val refreshCounter = remember { mutableIntStateOf(0) }
     val dict = remember { UserDictionaryIO(context) }
@@ -247,7 +251,7 @@ fun PersonalDictionaryLanguageListForLocale(
                     title = it.second,
                     style = NavigationItemStyle.MiscNoArrow,
                     navigate = {
-                        navController.navigate("pdictdelete/${it.first.name.urlEncode()}")
+                        navController.navigate(Route.PersonalDictDelete(it.first.name))
                     },
                     icon = painterResource(R.drawable.file_text)
                 )
@@ -261,7 +265,7 @@ fun PersonalDictionaryLanguageListForLocale(
                 title = stringResource(R.string.user_dict_settings_add_menu_title),
                 style = NavigationItemStyle.HomePrimary,
                 navigate = {
-                    navController.navigate("pdictword/${localeString}/add")
+                    navController.navigate(Route.PersonalDictWord(locale?.toLanguageTag(), null))
                 },
                 icon = painterResource(R.drawable.plus_circle)
             )
@@ -273,7 +277,7 @@ fun PersonalDictionaryLanguageListForLocale(
                 subtitle = transformed.shortcut,
                 style = NavigationItemStyle.MiscNoArrow,
                 navigate = {
-                    navController.navigate("pdictword/${localeString}/${Json.encodeToString(it).urlEncode()}")
+                    navController.navigate(Route.PersonalDictWord(locale?.toLanguageTag(), Json.encodeToString(it)))
                 }
             )
         }
@@ -306,7 +310,7 @@ fun PersonalDictionaryLanguageList() {
             subtitle = pluralStringResource(R.plurals.personal_dictionary_language_word_count, allLanguagesCount, allLanguagesCount),
             style = NavigationItemStyle.MiscNoArrow,
             navigate = {
-                nav!!.navigate("pdict/all")
+                nav!!.navigate(Route.PersonalDictList(null))
             }
         )
         languages.forEach {
@@ -318,7 +322,7 @@ fun PersonalDictionaryLanguageList() {
                 subtitle = pluralStringResource(R.plurals.personal_dictionary_language_word_count, it.second, it.second),
                 style = NavigationItemStyle.MiscNoArrow,
                 navigate = {
-                    nav!!.navigate("pdict/" + it.first.toString().urlEncode())
+                    nav!!.navigate(Route.PersonalDictList(it.first.toLanguageTag()))
                 }
             )
         }
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionaryJa.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionaryJa.kt
index 291fb6bec1..ecde4d6df1 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionaryJa.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/pdict/PersonalDictionaryJa.kt
@@ -11,6 +11,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -111,11 +112,24 @@ fun decodeJapanesePersonalWord(word: PersonalWord): JapanesePersonalWord? {
     )
 }
 
+
+private val miscPermitted = "？！…。〜ー、".toSet()
+
 @Composable
 @Preview
 fun JapaneseWordPopupDialog(selectedWord: JapanesePersonalWord? = null, locale: Locale? = Locale.JAPANESE) {
     val navController = LocalNavController.current
     val furigana = remember { mutableStateOf((selectedWord?.furigana ?: "")) }
+    val isError = remember { mutableStateOf(false) }
+
+    LaunchedEffect(furigana.value) {
+        isError.value = !furigana.value.all {
+            Character.UnicodeBlock.of(it) == Character.UnicodeBlock.HIRAGANA
+                    || miscPermitted.contains(it)
+        }
+    }
+
+
     val word = remember { mutableStateOf((selectedWord?.output ?: "")) }
     val pos = remember { mutableStateOf(selectedWord?.pos ?: PosTypes.NO_POS) }
     AlertDialog(
@@ -132,7 +146,15 @@ fun JapaneseWordPopupDialog(selectedWord: JapanesePersonalWord? = null, locale:
         text = {
             Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
                 Text("よみ:")
-                SettingsTextEdit(furigana, placeholder = "...")
+                SettingsTextEdit(furigana, placeholder = "...", error = isError.value)
+
+                if (isError.value) {
+                    Text(
+                        text = "ひらがなのみ入力してください",
+                        color = MaterialTheme.colorScheme.error,
+                        style = MaterialTheme.typography.bodySmall
+                    )
+                }
 
                 Spacer(Modifier.Companion.height(12.dp))
 
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeEditor.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeEditor.kt
index 2c59d36ae9..596ec8cfd2 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeEditor.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeEditor.kt
@@ -59,6 +59,7 @@ import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -141,6 +142,8 @@ internal fun ThemeEditor(
     startingBitmap: Bitmap? = null,
 ) {
     val context = LocalContext.current
+    val resources = LocalResources.current
+
     val ensureInitialized = remember {
         LayoutManager.init(context)
         RichInputMethodManager.init(context)
@@ -148,7 +151,7 @@ internal fun ThemeEditor(
     }
 
     val originalBitmap = remember {
-        (startingBitmap ?: BitmapFactory.decodeResource(context.resources, R.drawable.ic_launcher_keyboard)).let {
+        (startingBitmap ?: BitmapFactory.decodeResource(resources, R.drawable.ic_launcher_keyboard)).let {
             limitBitmapSize(context, it)
         }
     }
@@ -555,7 +558,7 @@ internal fun ThemeEditor(
                                             val suggestedWords = remember {
                                                 val suggestedWordsForActionBar = arrayListOf(
                                                     SuggestedWords.SuggestedWordInfo(
-                                                        context.getString(R.string.theme_customizer_adjust_background_image_hint),
+                                                        resources.getString(R.string.theme_customizer_adjust_background_image_hint),
                                                         "",
                                                         100,
                                                         1,
@@ -579,10 +582,10 @@ internal fun ThemeEditor(
                                                 words = suggestedWords,
                                                 suggestionStripListener = ExampleListener(),
                                                 onActionActivated = { },
+                                                onActionAltActivated = { },
                                                 inlineSuggestions = listOf(),
                                                 isActionsExpanded = false,
                                                 toggleActionsExpanded = { },
-                                                onActionAltActivated = { }
                                             )
                                             Spacer(Modifier.Companion.height(4.dp))
                                         }
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeScreen.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeScreen.kt
index 597138049a..649c30ccf8 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeScreen.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/themes/ThemeScreen.kt
@@ -38,6 +38,7 @@ import androidx.navigation.compose.rememberNavController
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.uix.THEME_KEY
 import org.futo.inputmethod.latin.uix.settings.RotatingChevronIcon
+import org.futo.inputmethod.latin.uix.settings.Route
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.useDataStore
 import org.futo.inputmethod.latin.uix.theme.ZipThemes
@@ -138,7 +139,7 @@ fun ThemeScreen(navController: NavHostController = rememberNavController()) {
         contract = ActivityResultContracts.GetContent(),
         onResult = { uri: Uri? ->
             uri ?: return@rememberLauncherForActivityResult
-            navController.navigate("customTheme/${uri.toString().urlEncode()}")
+            navController.navigate(Route.CustomTheme(uri.toString()))
         }
     )
 
@@ -159,7 +160,7 @@ fun ThemeScreen(navController: NavHostController = rememberNavController()) {
         Column(modifier = Modifier.fillMaxSize().padding(innerPadding)) {
             ScreenTitle(stringResource(R.string.theme_settings_title), showBack = true, navController)
             ThemePicker({
-                navController.navigate("deleteTheme/${it.urlEncode()}")
+                navController.navigate(Route.DeleteTheme(it))
             }, {
                 pickLauncher.launch("image/*")
                 //navController.navigate("customTheme")
diff --git a/java/src/org/futo/inputmethod/latin/uix/theme/Theme.kt b/java/src/org/futo/inputmethod/latin/uix/theme/Theme.kt
index 73bd16035e..3a8d111bc3 100644
--- a/java/src/org/futo/inputmethod/latin/uix/theme/Theme.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/theme/Theme.kt
@@ -2,7 +2,9 @@ package org.futo.inputmethod.latin.uix.theme
 
 import android.app.Activity
 import android.content.Context
+import android.graphics.Typeface
 import android.os.Build
+import android.text.TextPaint
 import android.view.View
 import android.view.Window
 import androidx.annotation.ColorInt
@@ -10,14 +12,16 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontFamily
 import org.futo.inputmethod.latin.uix.KeyboardColorScheme
 import org.futo.inputmethod.latin.uix.LocalKeyboardScheme
 import org.futo.inputmethod.latin.uix.THEME_KEY
+import org.futo.inputmethod.latin.uix.actions.compatEmojiTypeface
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValue
-import org.futo.inputmethod.latin.uix.theme.presets.DefaultDarkScheme
 import kotlin.math.sqrt
 
 fun applyWindowColors(window: Window, @ColorInt color: Int, statusBar: Boolean) {
@@ -53,12 +57,43 @@ fun StatusBarColorSetter() {
     }
 }
 
+val LocalCompatEmojiFamily = compositionLocalOf<FontFamily?> { null }
+val LocalCompatEmojiTypeface = compositionLocalOf<Typeface?> { null }
+
+private var systemPaint = TextPaint().apply {
+    typeface = Typeface.DEFAULT
+    textSize = 64f
+}
+private var compatPaint = TextPaint().apply {
+    textSize = 64f
+}
+private var compatCache = mutableMapOf<String, Int>()
+private fun putCompatCache(emoji: String, compatTypeface: Typeface?): Int {
+    compatPaint.typeface = compatTypeface
+
+    return when {
+        systemPaint.hasGlyph(emoji) -> 0
+        compatPaint.hasGlyph(emoji) -> 1
+        else -> 2
+    }
+}
+fun emojiNeedsCompat(emoji: String, compatTypeface: Typeface?): Boolean =
+    compatCache.getOrPut(emoji) { putCompatCache(emoji, compatTypeface) } == 1
+fun emojiShouldShow(emoji: String, compatTypeface: Typeface?): Boolean =
+    compatCache.getOrPut(emoji) { putCompatCache(emoji, compatTypeface) } != 2
+
 @Composable
 fun UixThemeWrapper(colorScheme: KeyboardColorScheme, content: @Composable () -> Unit) {
-    CompositionLocalProvider(LocalKeyboardScheme provides colorScheme) {
+    val context = LocalContext.current
+    val emojiTypeface = remember { context.compatEmojiTypeface }
+    val emojiFamily = remember(emojiTypeface) { emojiTypeface?.let { FontFamily(it) } }
+    CompositionLocalProvider(
+        LocalKeyboardScheme provides colorScheme,
+        LocalCompatEmojiFamily provides emojiFamily,
+        LocalCompatEmojiTypeface provides emojiTypeface
+    ) {
         MaterialTheme(
             colorScheme = colorScheme.base,
-            //typography = Typography,
             content = content,
         )
     }
diff --git a/java/src/org/futo/inputmethod/latin/utils/CapsModeUtils.java b/java/src/org/futo/inputmethod/latin/utils/CapsModeUtils.java
index 21bf082735..b59ee652da 100644
--- a/java/src/org/futo/inputmethod/latin/utils/CapsModeUtils.java
+++ b/java/src/org/futo/inputmethod/latin/utils/CapsModeUtils.java
@@ -156,7 +156,7 @@ public static int getCapsMode(final CharSequence cs, final int reqModes,
             j--;
         }
         if (j <= 0 || Character.isWhitespace(prevChar)) {
-            if (spacingAndPunctuations.mUsesGermanRules) {
+            if (spacingAndPunctuations.usesGermanRules) {
                 // In German typography rules, there is a specific case that the first character
                 // of a new line should not be capitalized if the previous line ends in a comma.
                 boolean hasNewLine = false;
@@ -198,7 +198,7 @@ public static int getCapsMode(final CharSequence cs, final int reqModes,
         // No other language has such a rule as far as I know, instead putting inside the quotation
         // mark as the exact thing quoted and handling the surrounding punctuation independently,
         // e.g. <<Did they say, "let's go home"?>>
-        if (spacingAndPunctuations.mUsesAmericanTypography) {
+        if (spacingAndPunctuations.usesAmericanTypography) {
             for (; j > 0; j--) {
                 // Here we look to go over any closing punctuation. This is because in dominant
                 // variants of English, the final period is placed within double quotes and maybe
@@ -283,7 +283,7 @@ public static int getCapsMode(final CharSequence cs, final int reqModes,
                     state = WORD;
                 } else if (Character.isWhitespace(c)) {
                     return noCaps;
-                } else if (Character.isDigit(c) && spacingAndPunctuations.mUsesGermanRules) {
+                } else if (Character.isDigit(c) && spacingAndPunctuations.usesGermanRules) {
                     state = NUMBER;
                 } else {
                     return caps;
diff --git a/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt b/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt
index f70ded4f60..5c0e099007 100644
--- a/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt
+++ b/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt
@@ -3,18 +3,17 @@ package org.futo.inputmethod.latin.xlm;
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.floatPreferencesKey
 import androidx.lifecycle.LifecycleCoroutineScope
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.futo.inputmethod.engine.general.GeneralIME
 import org.futo.inputmethod.engine.general.OnGetSuggestedWordsCallbackWithInputStyle
+import org.futo.inputmethod.keyboard.Keyboard
 import org.futo.inputmethod.keyboard.KeyboardSwitcher
 import org.futo.inputmethod.latin.BinaryDictionary
 import org.futo.inputmethod.latin.BuildConfig
@@ -26,15 +25,11 @@ import org.futo.inputmethod.latin.SuggestedWords
 import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo
 import org.futo.inputmethod.latin.SuggestionBlacklist
 import org.futo.inputmethod.latin.common.ComposedData
-import org.futo.inputmethod.latin.common.Constants
 import org.futo.inputmethod.latin.inputlogic.InputLogic
 import org.futo.inputmethod.latin.settings.Settings
-import org.futo.inputmethod.latin.uix.SHOW_EMOJI_SUGGESTIONS
 import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.USE_TRANSFORMER_FINETUNING
 import org.futo.inputmethod.latin.uix.getSetting
-import org.futo.inputmethod.latin.uix.getSettingFlow
-import org.futo.inputmethod.latin.utils.AsyncResultHolder
 import org.futo.inputmethod.latin.utils.SuggestionResults
 import kotlin.math.ceil
 
@@ -49,6 +44,11 @@ val BinaryDictTransformerWeightSetting = SettingsKey(
     3.4f
 )
 
+val AllowTransformerOnNonQWERTYLayouts = SettingsKey(
+    booleanPreferencesKey("allow_transformer_lm_on_non_qwerty"),
+    false
+)
+
 internal fun SuggestedWordInfo.add(other: SuggestedWordInfo): SuggestedWordInfo {
     assert(mWord == other.mWord)
 
@@ -448,14 +448,21 @@ public class LanguageModelFacilitator(
     }
 
     // This method should return null if transformer is disabled by settings or locale
+    var prevAcceptedLayout: Keyboard? = null
+    var prevAcceptedLayoutResult = false
     fun makePredictionInputValues(inputStyle: Int): PredictionInputValues? {
         if(shouldPassThroughToLegacy()) return null
 
+        if(inputStyle == SuggestedWords.INPUT_STYLE_TAIL_BATCH
+            || inputStyle == SuggestedWords.INPUT_STYLE_UPDATE_BATCH) return null
+
         val settingsValues = settings.current
-        if (!settingsValues.needsToLookupSuggestions() && inputStyle != SuggestedWords.INPUT_STYLE_TAIL_BATCH) {
+        if (!settingsValues.needsToLookupSuggestions()) {
             return null
         }
 
+        if(settingsValues.mInputAttributes.mIsEmailField) return null
+
         if(!inputLogic.mConnection.isConnected) return null
 
         try {
@@ -465,6 +472,28 @@ public class LanguageModelFacilitator(
                 2
             )
 
+            if(wordComposer.isComposingWord
+                && !context.getSetting(AllowTransformerOnNonQWERTYLayouts)
+            ) {
+                // Check we are on a supported layout
+                if(prevAcceptedLayout != keyboardSwitcher.keyboard) {
+                    if(keyboardSwitcher.keyboard?.mId?.mKeyboardLayoutSetName == "qwerty") {
+                        prevAcceptedLayoutResult = true
+                    } else {
+                        val letters = keyboardSwitcher.keyboard?.sortedKeys?.filter {
+                            settingsValues.isWordCodePoint(it.code) && it.code != '\''.code
+                        }?.sortedBy {
+                            it.x + 10000 * it.y
+                        }?.joinToString(separator = "") { it.label.lowercase() } ?: ""
+
+                        prevAcceptedLayoutResult = letters == "qwertyuiopasdfghjklzxcvbnm"
+                    }
+                }
+
+                if(prevAcceptedLayoutResult == false)
+                    return null
+            }
+
             val values = PredictionInputValues(
                 wordComposer.composedDataSnapshot,
                 ngramContext,
diff --git a/java/src/org/futo/inputmethod/v2keyboard/BaseKey.kt b/java/src/org/futo/inputmethod/v2keyboard/BaseKey.kt
index 6e48d8223b..c60c940670 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/BaseKey.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/BaseKey.kt
@@ -215,7 +215,13 @@ data class KeyAttributes(
      * flicking in all directions, rather it just triggers the morekey popup. Specifying this will
      * implicitly add the key as the first element in morekeys (may be broken with fixedColumnOrder)
      */
-    val fastMoreKeys: Boolean? = null
+    val fastMoreKeys: Boolean? = null,
+
+    /**
+     * Number of rows this key spans vertically. Defaults to 1.
+     * When set to a value > 1, the key will visually and functionally span multiple rows.
+     */
+    val rowSpan: Int? = null
 ) {
     fun getEffectiveAttributes(row: Row, keyboard: Keyboard, extraAttrs: List<KeyAttributes> = emptyList()): KeyAttributes {
         val attrs = if(row.isBottomRow) {
@@ -243,7 +249,8 @@ data class KeyAttributes(
             labelFlags          = resolve(attrs) { it.labelFlags         },
             repeatableEnabled   = resolve(attrs) { it.repeatableEnabled  },
             shiftable           = resolve(attrs) { it.shiftable          },
-            fastMoreKeys        = resolve(attrs) { it.fastMoreKeys       }
+            fastMoreKeys        = resolve(attrs) { it.fastMoreKeys       },
+            rowSpan             = resolve(attrs) { it.rowSpan            }
         )
     }
 
@@ -260,7 +267,8 @@ data class KeyAttributes(
             labelFlags          = resolve(attrs) { it.labelFlags         },
             repeatableEnabled   = resolve(attrs) { it.repeatableEnabled  },
             shiftable           = resolve(attrs) { it.shiftable          },
-            fastMoreKeys        = resolve(attrs) { it.fastMoreKeys       }
+            fastMoreKeys        = resolve(attrs) { it.fastMoreKeys       },
+            rowSpan             = resolve(attrs) { it.rowSpan            }
         )
     }
 }
@@ -280,7 +288,8 @@ val DefaultKeyAttributes = KeyAttributes(
     labelFlags          = LabelFlags(autoXScale = true),
     repeatableEnabled   = false,
     shiftable           = true,
-    fastMoreKeys        = false
+    fastMoreKeys        = false,
+    rowSpan             = 1
 )
 
 
@@ -437,7 +446,8 @@ data class BaseKey(
             countsToKeyCoordinate = moreKeyMode.autoNumFromCoord && moreKeyMode.autoSymFromCoord,
             hint = hint ?: "",
             labelFlags = attributes.labelFlags?.getValue() ?: 0,
-            fastLongPress = attributes.fastMoreKeys == true
+            fastLongPress = attributes.fastMoreKeys == true,
+            rowSpan = attributes.rowSpan ?: 1
         )
     }
 
@@ -512,6 +522,30 @@ data class CaseSelector(
         selectKeyFromElement(params.mId.mElementId).computeData(params, row, keyboard, coordinate)
 }
 
+
+/**
+ * Action selector key, to use a fallback key when the action key is disabled
+ */
+@Serializable
+@SerialName("actionKeySelect")
+data class ActionKeySelector(
+    val enabled: Key,
+    val none: Key
+) : AbstractKey {
+    private fun selectKeyFromElement(isEnabled: Boolean): Key = if(isEnabled) enabled else none
+
+    override fun countsToKeyCoordinate(params: KeyboardParams, row: Row, keyboard: Keyboard): Boolean =
+        selectKeyFromElement(params.mId.mBottomEmojiKeyEnabled).countsToKeyCoordinate(params, row, keyboard)
+
+    override fun computeData(
+        params: KeyboardParams,
+        row: Row,
+        keyboard: Keyboard,
+        coordinate: KeyCoordinate
+    ): ComputedKeyData? =
+        selectKeyFromElement(params.mId.mBottomEmojiKeyEnabled).computeData(params, row, keyboard, coordinate)
+}
+
 typealias Key = @Serializable(with = KeyPathSerializer::class) AbstractKey
 
 object KeyPathSerializer : PathDependentModifier<AbstractKey>(
@@ -625,7 +659,8 @@ class GapKey(val attributes: KeyAttributes = KeyAttributes()) : AbstractKey {
             moreKeyFlags = 0,
             countsToKeyCoordinate = moreKeyMode.autoNumFromCoord && moreKeyMode.autoSymFromCoord,
             hint = "",
-            labelFlags = 0
+            labelFlags = 0,
+            rowSpan = 1
         )
     }
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/v2keyboard/CombinerKind.kt b/java/src/org/futo/inputmethod/v2keyboard/CombinerKind.kt
index bf3bb765c4..4635b08cef 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/CombinerKind.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/CombinerKind.kt
@@ -4,7 +4,10 @@ import org.futo.inputmethod.event.Combiner
 import org.futo.inputmethod.event.DeadKeyCombiner
 import org.futo.inputmethod.event.combiners.NFCNormalizingCombiner
 import org.futo.inputmethod.event.combiners.DeadKeyPreCombiner
+import org.futo.inputmethod.event.combiners.KoashurCombiner
 import org.futo.inputmethod.event.combiners.KoreanCombiner
+import org.futo.inputmethod.event.combiners.vietnamese.VNICombiner
+import org.futo.inputmethod.event.combiners.vietnamese.VietTelexCombiner
 import org.futo.inputmethod.event.combiners.wylie.WylieCombiner
 
 enum class CombinerKind(val factory: () -> Combiner) {
@@ -13,5 +16,8 @@ enum class CombinerKind(val factory: () -> Combiner) {
     NFCNormalize({ NFCNormalizingCombiner() }),
     Korean({ KoreanCombiner() }),
     KoreanCombineInitials({ KoreanCombiner(combineInitials = true) }),
+    VietTelex( { VietTelexCombiner() }),
+    VNI( { VNICombiner() }),
     Wylie({ WylieCombiner() }),
+    Koashur({ KoashurCombiner() }),
 }
\ No newline at end of file
diff --git a/java/src/org/futo/inputmethod/v2keyboard/KeyData.kt b/java/src/org/futo/inputmethod/v2keyboard/KeyData.kt
index 73231e8be4..21a9a44e3c 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/KeyData.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/KeyData.kt
@@ -95,4 +95,5 @@ data class ComputedKeyData(
     val labelFlags: Int,
     val flick: ComputedFlickData? = null,
     val fastLongPress: Boolean = false,
+    val rowSpan: Int = 1
 )
diff --git a/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt b/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
index 2624629bf5..51eac535f1 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/Keyboard.kt
@@ -292,6 +292,19 @@ data class Keyboard(
      */
     val autoShift: Boolean = true,
 
+    /**
+     * (optional) Whether rows should be mirrored (reversed) in one-handed mode. When enabled and
+     * the keyboard is in left-handed one-hand mode, each row's keys are reversed so that keys
+     * like backspace move to the opposite (more reachable) side.
+     */
+    val mirrorInOneHanded: Boolean = false,
+
+    /**
+     * (optional) Whether the split keyboard mode should be offered for this layout. Set to false
+     * for layouts whose rows don't split well (e.g. due to rowSpan keys or unusual arrangements).
+     */
+    val supportsSplit: Boolean = true,
+
     val subKeyboards: Map<KeyboardLayoutKind, SubKeyboard> = emptyMap(),
     val imeHint: String? = null
 
diff --git a/java/src/org/futo/inputmethod/v2keyboard/KeyboardSizingCalculator.kt b/java/src/org/futo/inputmethod/v2keyboard/KeyboardSizingCalculator.kt
index 6aa363ff41..827da46895 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/KeyboardSizingCalculator.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/KeyboardSizingCalculator.kt
@@ -394,6 +394,16 @@ class KeyboardSizingCalculator(val context: Context, val uixManager: UixManager)
         currentMode = if(it.prefersSplit) KeyboardMode.Split else KeyboardMode.Regular
     ) }
 
+    fun doesCurrentLayoutSupportSplit(): Boolean {
+        val layoutName = uixManager.getCurrentLayoutName()
+        val layout = try {
+            LayoutManager.getLayout(context, layoutName)
+        } catch (e: Exception) {
+            return true
+        }
+        return layout.supportsSplit
+    }
+
     /// Allows empty ranges, may be less than min if max is smaller than min
     private fun Int.coerceInLoosely(min: Int, max: Int) = coerceAtLeast(min).coerceAtMost(max)
 
@@ -492,6 +502,14 @@ class KeyboardSizingCalculator(val context: Context, val uixManager: UixManager)
                 )
             }
 
+            savedSettings.currentMode == KeyboardMode.Split && !layout.supportsSplit ->
+                RegularKeyboardSize(
+                    width = width,
+                    height = recommendedHeight.roundToInt(),
+                    singleRowHeight = singularRowHeight.roundToInt(),
+                    padding = padding
+                )
+
             savedSettings.currentMode == KeyboardMode.Split ->
                 SplitKeyboardSize(
                     width = width,
diff --git a/java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt b/java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt
index f4519e35f3..889c1481c0 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/LayoutEngine.kt
@@ -23,7 +23,7 @@ val EPS = 1e-5.toFloat()
 // ___z x c v b n m___
 // ^^^ gap     gap ^^^
 sealed class LayoutEntry(val widthPx: Float) {
-    class Key(val data: ComputedKeyData, widthPx: Float) : LayoutEntry(widthPx)
+    class Key(val data: ComputedKeyData, widthPx: Float, val rowSpan: Int = 1, val heightOverride: Float? = null) : LayoutEntry(widthPx)
     class Gap(widthPx: Float): LayoutEntry(widthPx)
 }
 
@@ -335,7 +335,7 @@ data class LayoutEngine(
                             entry.widthPx + widthPerKey
                         } else {
                             widthPerKey
-                        })
+                        }, rowSpan = entry.rowSpan, heightOverride = entry.heightOverride)
                     } else {
                         entry
                     }
@@ -354,7 +354,7 @@ data class LayoutEngine(
         splittable: Boolean
     ): LayoutRow {
         val computedRow = computedRowWithoutWidths.map { key ->
-            LayoutEntry.Key(key.data, widths[key.data.width]!!)
+            LayoutEntry.Key(key.data, widths[key.data.width]!!, key.rowSpan)
         }
 
         val totalRowWidth = computedRow.sumOf { it.widthPx.toDouble() }.toFloat()
@@ -420,7 +420,7 @@ data class LayoutEngine(
                         regularColumn += 1
                     }
 
-                    LayoutEntry.Key(data, widthPx = -1.0f)
+                    LayoutEntry.Key(data, widthPx = -1.0f, rowSpan = data.rowSpan)
                 }
             }.let {
                 if (regularColumn > 0) {
@@ -474,7 +474,93 @@ data class LayoutEngine(
             )
         }
 
-        return alignForSplitLayout(computedRowWithWidths)
+        var result = computedRowWithWidths
+        result = processRowSpan(result)
+        result = mirrorForOneHanded(result)
+        result = alignForSplitLayout(result)
+
+        return result
+    }
+
+    private fun processRowSpan(rows: List<LayoutRow>): List<LayoutRow> {
+        // Post-process rowSpan: set heightOverride on spanning keys and replace
+        // corresponding entries in subsequent rows with gaps
+        val rowSpanProcessed = rows.toMutableList()
+        for (rowIdx in rowSpanProcessed.indices) {
+            val row = rowSpanProcessed[rowIdx]
+            val newEntries = row.entries.mapIndexed { entryIdx, entry ->
+                if (entry is LayoutEntry.Key && entry.rowSpan > 1) {
+                    // Accumulate height from this row and the next (rowSpan - 1) rows
+                    var totalHeight = row.height
+                    for (spanOffset in 1 until entry.rowSpan) {
+                        val targetRowIdx = rowIdx + spanOffset
+                        if (targetRowIdx < rowSpanProcessed.size) {
+                            totalHeight += rowSpanProcessed[targetRowIdx].height
+
+                            // Replace the matching entry in the subsequent row with a gap
+                            val targetRow = rowSpanProcessed[targetRowIdx]
+                            val targetEntries = targetRow.entries.toMutableList()
+
+                            // Find the entry at the same horizontal position
+                            var currentX = 0.0f
+                            var sourceX = 0.0f
+                            for (j in 0 until entryIdx) {
+                                sourceX += row.entries[j].widthPx
+                            }
+
+                            for (j in targetEntries.indices) {
+                                if (Math.abs(currentX - sourceX) < 1.0f &&
+                                    Math.abs(targetEntries[j].widthPx - entry.widthPx) < 1.0f) {
+                                    targetEntries[j] = LayoutEntry.Gap(targetEntries[j].widthPx)
+                                    break
+                                }
+                                currentX += targetEntries[j].widthPx
+                            }
+
+                            rowSpanProcessed[targetRowIdx] = targetRow.copy(entries = targetEntries)
+                        }
+                    }
+                    LayoutEntry.Key(entry.data, entry.widthPx, entry.rowSpan, heightOverride = totalHeight)
+                } else {
+                    entry
+                }
+            }
+            rowSpanProcessed[rowIdx] = row.copy(entries = newEntries)
+        }
+
+        return rowSpanProcessed
+    }
+
+    private fun mirrorForOneHanded(rows: List<LayoutRow>): List<LayoutRow> {
+        if(!isOneHandedLayout || !keyboard.mirrorInOneHanded) return rows
+
+        val direction = (layoutParams.size as OneHandedKeyboardSize).direction
+        if(direction != OneHandedDirection.Left) return rows
+
+        return rows.map { row ->
+            row.copy(entries = swapOuterKeys(row.entries))
+        }
+    }
+
+    // Swap the leading and trailing non-Regular-width entries (functional keys, gaps, grow keys)
+    // while keeping the inner letter keys in their original order.
+    private fun swapOuterKeys(entries: List<LayoutEntry>): List<LayoutEntry> {
+        fun isOuter(entry: LayoutEntry): Boolean = when(entry) {
+            is LayoutEntry.Gap -> true
+            is LayoutEntry.Key -> entry.data.width != KeyWidth.Regular
+        }
+
+        val leadingCount = entries.indexOfFirst { !isOuter(it) }.let { if(it == -1) entries.size else it }
+        val trailingCount = entries.asReversed().indexOfFirst { !isOuter(it) }.let { if(it == -1) entries.size else it }
+
+        if(leadingCount == 0 && trailingCount == 0) return entries
+        if(leadingCount + trailingCount >= entries.size) return entries
+
+        val leading = entries.subList(0, leadingCount)
+        val middle = entries.subList(leadingCount, entries.size - trailingCount)
+        val trailing = entries.subList(entries.size - trailingCount, entries.size)
+
+        return trailing + middle + leading
     }
 
     private fun mergeDuplicates(row: List<LayoutEntry>): List<LayoutEntry> {
@@ -489,7 +575,8 @@ data class LayoutEngine(
                     val lastVal = acc.removeAt(acc.size - 1)
                     acc.add(LayoutEntry.Key(
                         data = curr.data,
-                        widthPx = last.widthPx + curr.widthPx
+                        widthPx = last.widthPx + curr.widthPx,
+                        rowSpan = curr.rowSpan
                     ))
                 } else {
                     acc.add(curr)
@@ -529,8 +616,8 @@ data class LayoutEngine(
                 if(data.repeatable) { KeyConsts.ACTION_FLAGS_IS_REPEATABLE } else { 0 }
 
         val verticalGapForKey = when {
-            keyboard.rowHeightMode.clampHeight && height > layoutParams.standardRowHeight ->
-                height - layoutParams.standardRowHeight
+            keyboard.rowHeightMode.clampHeight && height > data.rowSpan * layoutParams.standardRowHeight ->
+                height - data.rowSpan * layoutParams.standardRowHeight
 
             else ->
                 0.0
@@ -637,7 +724,8 @@ data class LayoutEngine(
                     val leftGap = if(i < row.size / 2 && !entry.data.anchored) { row.getOrNull(i - 1) as? LayoutEntry.Gap } else { null }
                     val rightGap = if(i >= row.size / 2 && !entry.data.anchored) { row.getOrNull(i + 1) as? LayoutEntry.Gap } else { null }
 
-                    addKey(idx, colNum, entry.data, currentX.roundToInt(), y, entry.widthPx.roundToInt(), height, leftGap, rightGap)
+                    val keyHeight = entry.heightOverride?.roundToInt() ?: height
+                    addKey(idx, colNum, entry.data, currentX.roundToInt(), y, entry.widthPx.roundToInt(), keyHeight, leftGap, rightGap)
 
                     // i != colNum because of Gap entries
                     colNum += 1
diff --git a/java/src/org/futo/inputmethod/v2keyboard/LayoutManager.kt b/java/src/org/futo/inputmethod/v2keyboard/LayoutManager.kt
index aadcf7c45a..87bc6d749d 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/LayoutManager.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/LayoutManager.kt
@@ -9,7 +9,9 @@ import com.charleskorn.kaml.YamlConfiguration
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.modules.EmptySerializersModule
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.polymorphic
+import kotlinx.serialization.modules.subclass
 import org.futo.inputmethod.latin.localeFromString
 import org.futo.inputmethod.latin.uix.actions.BugInfo
 import org.futo.inputmethod.latin.uix.actions.BugViewerState
@@ -154,7 +156,20 @@ private fun parseNames(context: Context, namesPath: String): Map<String, Map<Str
 }
 
 private val yaml = Yaml(
-    EmptySerializersModule(),
+    SerializersModule {
+        polymorphic(AbstractKey::class) {
+            // Classes that extend TemplatedKey, since Kotlin serializers
+            // don't pick them up automatically.
+            subclass(ShiftKey::class)
+            subclass(DeleteKey::class)
+            subclass(SymbolsKey::class)
+            subclass(AlphabetKey::class)
+            subclass(NumberKey::class)
+            subclass(SpaceKey::class)
+            subclass(AltLayoutKey::class)
+
+        }
+    },
     YamlConfiguration(
         polymorphismStyle = PolymorphismStyle.Property,
         allowAnchorsAndAliases = true
diff --git a/java/src/org/futo/inputmethod/v2keyboard/TemplateKeys.kt b/java/src/org/futo/inputmethod/v2keyboard/TemplateKeys.kt
index 4d0f948ae3..2686f08f8b 100644
--- a/java/src/org/futo/inputmethod/v2keyboard/TemplateKeys.kt
+++ b/java/src/org/futo/inputmethod/v2keyboard/TemplateKeys.kt
@@ -22,83 +22,135 @@ val FunctionalAttributes = KeyAttributes(
 
 private val ShiftMoreKeys = listOf("!noPanelAutoMoreKey!", " |!code/key_capslock")
 
-val TemplateShiftKey = CaseSelector(
-    normal = BaseKey(
-        spec = "!icon/shift_key|!code/key_shift",
-        moreKeys = ShiftMoreKeys,
-        attributes = FunctionalAttributes
-    ),
-
-    shifted = BaseKey(
-        spec = "!icon/shift_key_shifted|!code/key_shift",
-        moreKeys = ShiftMoreKeys,
-        attributes = FunctionalAttributes
-    ),
-
-    shiftLocked = BaseKey(
-        spec = "!icon/shift_key_shifted|!code/key_shift",
-        moreKeys = ShiftMoreKeys,
-        attributes = FunctionalAttributes.copy(style = KeyVisualStyle.StickyOn)
-    ),
-
-    symbols = BaseKey(
-        spec = "!text/keylabel_to_more_symbol|!code/key_shift",
-        attributes = FunctionalAttributes
-    ),
-
-    symbolsShifted = BaseKey(
-        spec = "!text/keylabel_to_symbol|!code/key_shift",
-        attributes = FunctionalAttributes
+
+interface TemplatedKey : AbstractKey {
+    val templateKey: Key
+
+    override fun countsToKeyCoordinate(
+        params: KeyboardParams,
+        row: Row,
+        keyboard: Keyboard
+    ): Boolean = templateKey.countsToKeyCoordinate(params, row, keyboard)
+
+    override fun computeData(
+        params: KeyboardParams,
+        row: Row,
+        keyboard: Keyboard,
+        coordinate: KeyCoordinate
+    ): ComputedKeyData? = templateKey.computeData(params, row, keyboard, coordinate)
+}
+
+@Serializable
+@SerialName("shift")
+data class ShiftKey(
+    val attributes: KeyAttributes = KeyAttributes()
+): TemplatedKey {
+    override val templateKey: Key = CaseSelector(
+        normal = BaseKey(
+            spec = "!icon/shift_key|!code/key_shift",
+            moreKeys = ShiftMoreKeys,
+            attributes = attributes + FunctionalAttributes,
+        ),
+
+        shifted = BaseKey(
+            spec = "!icon/shift_key_shifted|!code/key_shift",
+            moreKeys = ShiftMoreKeys,
+            attributes = attributes + FunctionalAttributes
+        ),
+
+        shiftLocked = BaseKey(
+            spec = "!icon/shift_key_shifted|!code/key_shift",
+            moreKeys = ShiftMoreKeys,
+            attributes = KeyAttributes(style = KeyVisualStyle.StickyOn) + attributes + FunctionalAttributes
+        ),
+
+        symbols = BaseKey(
+            spec = "!text/keylabel_to_more_symbol|!code/key_shift",
+            attributes = attributes + FunctionalAttributes
+        ),
+
+        symbolsShifted = BaseKey(
+            spec = "!text/keylabel_to_symbol|!code/key_shift",
+            attributes = attributes + FunctionalAttributes
+        )
     )
-)
+}
+val TemplateShiftKey = ShiftKey()
 
-val TemplateDeleteKey = BaseKey(
-    spec = "!icon/delete_key|!code/key_delete",
-    attributes = FunctionalAttributes.copy(repeatableEnabled = true)
-)
 
-val TemplateSymbolsKey = BaseKey(
-    spec = "!text/keylabel_to_symbol|!code/key_switch_alpha_symbol",
-    attributes = FunctionalAttributes
-)
+@Serializable
+@SerialName("delete")
+data class DeleteKey(val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    override val templateKey: Key = BaseKey(
+        spec = "!icon/delete_key|!code/key_delete",
+        attributes = KeyAttributes(repeatableEnabled = true) + attributes + FunctionalAttributes
+    )
+}
+val TemplateDeleteKey = DeleteKey()
 
-val TemplateAlphabetKey = BaseKey(
-    spec = "!text/keylabel_to_alpha|!code/key_switch_alpha_symbol",
-    attributes = FunctionalAttributes
-)
+@Serializable
+@SerialName("symbols")
+data class SymbolsKey(val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    override val templateKey: Key = BaseKey(
+        spec = "!text/keylabel_to_symbol|!code/key_switch_alpha_symbol",
+        attributes = attributes + FunctionalAttributes
+    )
+}
+val TemplateSymbolsKey = SymbolsKey()
 
-val TemplateNumberKey = BaseKey(
-    spec = "!icon/numpad|!code/key_to_number_layout",
-    attributes = KeyAttributes(
-        showPopup = false
+@Serializable
+@SerialName("alphabet")
+data class AlphabetKey(val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    override val templateKey: Key = BaseKey(
+        spec = "!text/keylabel_to_alpha|!code/key_switch_alpha_symbol",
+        attributes = attributes + FunctionalAttributes
     )
-)
+}
+val TemplateAlphabetKey = AlphabetKey()
 
-val TemplateSpaceKey = BaseKey(
-    spec = "!icon/space_key|!code/key_space",
-    attributes = KeyAttributes(
-        width = KeyWidth.Grow,
-        style = KeyVisualStyle.Spacebar,
-        showPopup = false,
-        longPressEnabled = true,
-        moreKeyMode = MoreKeyMode.OnlyExplicit
+
+@Serializable
+@SerialName("number")
+data class NumberKey(val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    override val templateKey: Key = BaseKey(
+        spec = "!icon/numpad|!code/key_to_number_layout",
+        attributes = KeyAttributes(showPopup = false) + attributes
     )
-)
+}
+val TemplateNumberKey = NumberKey()
 
-val TemplateAlt0Key = BaseKey(
-    spec = "0|!code/key_to_alt_0_layout",
-    attributes = FunctionalAttributes
-)
+@Serializable
+@SerialName("space")
+data class SpaceKey(val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    override val templateKey: Key = BaseKey(
+        spec = "!icon/space_key|!code/key_space",
+        attributes = attributes + KeyAttributes(
+            width = KeyWidth.Grow,
+            style = KeyVisualStyle.Spacebar,
+            showPopup = false,
+            longPressEnabled = true,
+            moreKeyMode = MoreKeyMode.OnlyExplicit
+        )
+    )
+}
+val TemplateSpaceKey = SpaceKey()
 
-val TemplateAlt1Key = BaseKey(
-    spec = "1|!code/key_to_alt_1_layout",
-    attributes = FunctionalAttributes
-)
 
-val TemplateAlt2Key = BaseKey(
-    spec = "2|!code/key_to_alt_2_layout",
-    attributes = FunctionalAttributes
-)
+@Serializable
+@SerialName("alt")
+data class AltLayoutKey(val idx: Int, val attributes: KeyAttributes = KeyAttributes()) : TemplatedKey {
+    init {
+        if(idx !in 0..2) throw IllegalArgumentException("Alt layout key can only be in [0, 1, 2]")
+    }
+
+    override val templateKey: Key = BaseKey(
+        spec = "$idx|!code/key_to_alt_${idx}_layout",
+        attributes = attributes + FunctionalAttributes
+    )
+}
+val TemplateAlt0Key = AltLayoutKey(0)
+val TemplateAlt1Key = AltLayoutKey(1)
+val TemplateAlt2Key = AltLayoutKey(2)
 
 @Serializable
 @SerialName("enter")
@@ -188,7 +240,8 @@ data class EnterKey(
 @Serializable
 @SerialName("action")
 data class ActionKey(
-    val attributes: KeyAttributes = KeyAttributes()
+    val attributes: KeyAttributes = KeyAttributes(),
+    val fallbackKey: Key? = null,
 ) : AbstractKey {
     override fun countsToKeyCoordinate(params: KeyboardParams, row: Row, keyboard: Keyboard): Boolean = false
     override fun computeData(
@@ -198,7 +251,7 @@ data class ActionKey(
         coordinate: KeyCoordinate
     ): ComputedKeyData? {
         if(!params.mId.mBottomEmojiKeyEnabled) {
-            return null
+            return fallbackKey?.computeData(params, row, keyboard, coordinate)
         }
 
         val attributes = attributes.getEffectiveAttributes(row, keyboard)
diff --git a/libs b/libs
index 41315b0875..4b6ddbf9d4 160000
--- a/libs
+++ b/libs
@@ -1 +1 @@
-Subproject commit 41315b08758d6ca20a97c626d8b630b520e1c0d3
+Subproject commit 4b6ddbf9d4ae1abe379c6df609bafbb8be9a9e7c
diff --git a/native/jni/NativeFileList.cmake b/native/jni/NativeFileList.cmake
index 50bc1cbbbb..f79c204156 100755
--- a/native/jni/NativeFileList.cmake
+++ b/native/jni/NativeFileList.cmake
@@ -124,6 +124,7 @@ set(LATIN_IME_CORE_SRC_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dicnode/dic_node_utils.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dicnode/dic_nodes_cache.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dictionary/dictionary.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dictionary/dictionary_itrie.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dictionary/dictionary_utils.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dictionary/digraph_utils.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/suggest/core/dictionary/error_type_utils.cpp
diff --git a/native/jni/org_futo_inputmethod_latin_BinaryDictionary.cpp b/native/jni/org_futo_inputmethod_latin_BinaryDictionary.cpp
index 9517d5bd98..d845002411 100644
--- a/native/jni/org_futo_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/org_futo_inputmethod_latin_BinaryDictionary.cpp
@@ -38,6 +38,7 @@
 #include "utils/profiler.h"
 #include "utils/time_keeper.h"
 #include "suggest/core/suggest.h"
+#include "jni_utils.h"
 
 namespace latinime {
 
@@ -642,6 +643,16 @@ static bool latinime_BinaryDictionary_migrateNative(JNIEnv *env, jclass clazz, j
     return true;
 }
 
+static jlong latinime_BinaryDictionary_getITrieHandleNative(JNIEnv *env, jclass clazz, jlong dict,
+                                                            jstring letters) {
+    Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict);
+    if (!dictionary) return false;
+
+    std::string lettersValue = jstring2string(env, letters);
+
+    return (jlong)dictionary->getITrieHandle(lettersValue);
+}
+
 static const JNINativeMethod sMethods[] = {
     {
         const_cast<char *>("openNative"),
@@ -765,6 +776,11 @@ static const JNINativeMethod sMethods[] = {
         const_cast<char *>("migrateNative"),
         const_cast<char *>("(JLjava/lang/String;J)Z"),
         reinterpret_cast<void *>(latinime_BinaryDictionary_migrateNative)
+    },
+    {
+        const_cast<char *>("getITrieHandleNative"),
+        const_cast<char *>("(JLjava/lang/String;)J"),
+        reinterpret_cast<void *>(latinime_BinaryDictionary_getITrieHandleNative)
     }
 };
 
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index 5c9a1392e4..f6ed2a31a9 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -224,4 +224,11 @@ void Dictionary::logDictionaryInfo(JNIEnv *const env) const {
             dictionaryIdCharBuffer, versionStringCharBuffer, dateStringCharBuffer);
 }
 
+ITrie *Dictionary::getITrieHandle(std::string letters) {
+    itrieWrapper.structure = mDictionaryStructureWithBufferPolicy.get();
+    itrieWrapper.initLetters(letters);
+    itrieWrapper.populateITrie(&itrie);
+    return &itrie;
+}
+
 } // namespace latinime
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.h b/native/jni/src/suggest/core/dictionary/dictionary.h
index 9e224ebfb0..852a8bfa97 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.h
+++ b/native/jni/src/suggest/core/dictionary/dictionary.h
@@ -28,6 +28,8 @@
 #include "dictionary/property/word_property.h"
 #include "suggest/core/suggest_interface.h"
 #include "utils/int_array_view.h"
+#include "itrie.h"
+#include "dictionary_itrie.h"
 
 namespace latinime {
 
@@ -116,9 +118,14 @@ class Dictionary {
         return mDictionaryStructureWithBufferPolicy.get();
     }
 
- private:
+    ITrie *getITrieHandle(std::string letters);
+
+private:
     DISALLOW_IMPLICIT_CONSTRUCTORS(Dictionary);
 
+    ITrie itrie;
+    DicITrieWrapper itrieWrapper;
+
     typedef std::unique_ptr<SuggestInterface> SuggestInterfacePtr;
 
     class NgramListenerForPrediction : public NgramListener {
diff --git a/native/jni/src/suggest/core/dictionary/dictionary_itrie.cpp b/native/jni/src/suggest/core/dictionary/dictionary_itrie.cpp
new file mode 100644
index 0000000000..553f823969
--- /dev/null
+++ b/native/jni/src/suggest/core/dictionary/dictionary_itrie.cpp
@@ -0,0 +1,243 @@
+#include "dictionary_itrie.h"
+#include "dictionary/property/ngram_context.h"
+#include "suggest/core/dicnode/dic_node_vector.h"
+#include "dictionary/interface/dictionary_structure_with_buffer_policy.h"
+#include "ggml/unicode.h"
+
+namespace latinime {
+
+int get_letter_index(int code, DicITrieWrapper *wrapper) {
+    auto found = wrapper->letter_mapping.find(code);
+    if(found == wrapper->letter_mapping.end()) {
+        int idx = -1;
+        for (int i = 0; i < wrapper->lettersAsCodePoints.size(); i++) {
+            if (code == wrapper->lettersAsCodePoints[i]) {
+                idx = i;
+                break;
+            }
+        }
+
+        // If this is -1, try base letter
+        if(idx == -1){
+            int baseCode = CharUtils::toBaseLowerCase(code);
+            for (int i = 0; i < wrapper->lettersAsCodePoints.size(); i++) {
+                if (baseCode == wrapper->lettersAsCodePoints[i]) {
+                    idx = i;
+                    break;
+                }
+            }
+        }
+
+        wrapper->letter_mapping.emplace(code, idx);
+        return idx;
+    } else {
+        return found->second;
+    }
+}
+
+static int ITrie_NumChars(void* self) {
+    return ((DicITrieWrapper *)self)->letters.length();
+}
+static const char *ITrie_Letters(void* self) {
+    return ((DicITrieWrapper *)self)->letters.c_str();
+}
+static TrieId ITrie_Root(void* self) {
+    auto dic = ((DicITrieWrapper *)self);
+
+    DicNode rootNode;
+
+    NgramContext emptyNgramContext;
+    WordIdArray<MAX_PREV_WORD_COUNT_FOR_N_GRAM> prevWordIdArray;
+    const WordIdArrayView prevWordIds = emptyNgramContext.getPrevWordIds(dic->structure, &prevWordIdArray, false);
+
+    DicNodeUtils::initAsRoot(dic->structure, prevWordIds, &rootNode);
+
+    dic->nodes.emplace(0, rootNode);
+
+    return 0;
+}
+static int ITrie_GetCodepoint(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) {
+        return -1;
+    }
+
+    int codepoint = node->second.getNodeCodePoint();
+    int mapping = get_letter_index(codepoint, dic);
+    return mapping;
+}
+
+static bool isOmissible(DicITrieWrapper *dic, DicNode *node) {
+    return get_letter_index(node->getNodeCodePoint(), dic) == -1;
+}
+
+static TrieId CHILD_ID = 1;
+static void addChildrenRecursivelySkippingOmissible(
+        DicITrieWrapper *dic,
+        DicNode *node,
+        std::vector<TrieId> &fakeChildren
+) {
+    DicNodeVector childDicNodes;
+    DicNodeUtils::getAllChildDicNodes(node, dic->structure, &childDicNodes);
+
+    int size = childDicNodes.getSizeAndLock();
+    for(int i=0; i<size; i++) {
+        if(isOmissible(dic, childDicNodes[i])) {
+            addChildrenRecursivelySkippingOmissible(dic, childDicNodes[i], fakeChildren);
+        } else {
+            dic->nodes.emplace(CHILD_ID, *childDicNodes[i]);
+            fakeChildren.emplace_back(CHILD_ID++);
+        }
+    }
+}
+
+static uint32_t ITrie_GetChildCount(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+
+    auto precomputedChildren = dic->exceptional_children.find(id);
+    if(precomputedChildren != dic->exceptional_children.end()) {
+        return precomputedChildren->second.size();
+    }
+
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) {
+        return 0;
+    }
+
+    std::vector<TrieId> children;
+    addChildrenRecursivelySkippingOmissible(dic, &node->second, children);
+    dic->exceptional_children.emplace(id, children);
+    return children.size();
+}
+static TrieId ITrie_GetChild(void* self, TrieId id, uint32_t idx) {
+    auto dic = ((DicITrieWrapper *)self);
+
+    auto precomputedChildren = dic->exceptional_children.find(id);
+    if(precomputedChildren != dic->exceptional_children.end()) {
+        if(idx > precomputedChildren->second.size()) return 0;
+        else return precomputedChildren->second[idx];
+    }
+
+    return 0;
+}
+static bool ITrie_IsWord(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) return false;
+    if(!node->second.isTerminalDicNode()) return false;
+
+    BinaryDictionaryShortcutIterator shortcutIt = dic->structure->getShortcutIterator(node->second.getWordId());
+    if(shortcutIt.hasNextShortcutTarget()) return true;
+
+    const WordAttributes wordAttributes = dic->structure->getWordAttributesInContext(
+            node->second.getPrevWordIds(),
+            node->second.getWordId(), nullptr);
+
+    if(wordAttributes.isNotAWord()) return false;
+    if(wordAttributes.isBlacklisted()) return false;
+
+    return true;
+}
+
+static float ITrie_GetFrequency(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) {
+        return 0.0f;
+    }
+    int prob = dic->structure->getProbabilityOfWord(WordIdArrayView(), node->second.getWordId());
+
+    return prob;
+}
+
+static float ITrie_GetLogFrequency(void* self, TrieId id) {
+    return ITrie_GetFrequency(self, id);
+}
+
+static uint16_t ITrie_GetDepth(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) {
+        return 0;
+    }
+
+    int depth = 0;
+    const int* buf = node->second.getOutputWordBuf();
+    for(int i=0; i<node->second.getNodeCodePointCount(); i++) {
+        if(get_letter_index(buf[i], dic) != -1) depth++;
+    }
+
+    return depth;
+}
+static const char *ITrie_GetWord(void* self, TrieId id) {
+    auto dic = ((DicITrieWrapper *)self);
+    auto node = dic->nodes.find(id);
+    if(node == dic->nodes.end()) {
+        return nullptr;
+    }
+
+    static char charBuf[MAX_WORD_LENGTH];
+    int charBufHead = 0;
+    const int* buf = node->second.getOutputWordBuf();
+
+    if(id == 0) {
+        charBuf[0] = 0;
+        return charBuf;
+    }
+
+    if(true) {
+        BinaryDictionaryShortcutIterator shortcutIt = dic->structure->getShortcutIterator(node->second.getWordId());
+        if(shortcutIt.hasNextShortcutTarget()) {
+            int shortcutTarget[MAX_WORD_LENGTH];
+            int shortcutTargetLength;
+            bool isWhitelist;
+            shortcutIt.nextShortcutTarget(MAX_WORD_LENGTH, shortcutTarget, &shortcutTargetLength, &isWhitelist);
+            intArrayToCharArray(shortcutTarget, shortcutTargetLength, charBuf, MAX_WORD_LENGTH);
+            return charBuf;
+        }
+
+        intArrayToCharArray(buf, node->second.getNodeCodePointCount(), charBuf, MAX_WORD_LENGTH);
+        return charBuf;
+    } else {
+        for (int i = 0; i < node->second.getNodeCodePointCount(); i++) {
+            int letterIdx = get_letter_index(buf[i], dic);
+            if (letterIdx != -1) {
+                int code = dic->lettersAsCodePoints[letterIdx];
+                charBufHead += intArrayToCharArray(&code, 1, &charBuf[charBufHead],
+                                                   MAX_WORD_LENGTH - charBufHead);
+            }
+        }
+
+        return charBuf;
+    }
+}
+
+void ITrie_EndSearch(void *self) {
+    auto dic = ((DicITrieWrapper *)self);
+    dic->nodes.clear();
+    dic->exceptional_children.clear();
+    CHILD_ID = 1;
+}
+
+static const ITrieVTable dicTraverseVtable = {
+        &ITrie_NumChars, &ITrie_Root,
+        &ITrie_GetCodepoint, &ITrie_GetChildCount, &ITrie_GetChild,
+        &ITrie_IsWord, &ITrie_GetFrequency,
+        &ITrie_GetDepth, &ITrie_GetWord, &ITrie_EndSearch
+};
+
+void DicITrieWrapper::initLetters(const std::string &letters) {
+    if(this->letters == letters) return;
+
+    this->letters = letters;
+    this->lettersAsCodePoints = codepoints_from_utf8(letters);
+
+    this->letter_mapping.clear();
+}
+
+void DicITrieWrapper::populateITrie(ITrie *trie) const {
+    trie->userdata = (void *)this;
+    trie->vtable = &dicTraverseVtable;
+}
+}
\ No newline at end of file
diff --git a/native/jni/src/suggest/core/dictionary/dictionary_itrie.h b/native/jni/src/suggest/core/dictionary/dictionary_itrie.h
new file mode 100644
index 0000000000..daad7fd37c
--- /dev/null
+++ b/native/jni/src/suggest/core/dictionary/dictionary_itrie.h
@@ -0,0 +1,29 @@
+#ifndef LATINIME_DICTIONARY_ITRIE_H
+#define LATINIME_DICTIONARY_ITRIE_H
+
+#include <string>
+#include <unordered_map>
+#include "itrie.h"
+#include "suggest/core/dicnode/dic_node.h"
+
+namespace latinime {
+class DictionaryStructureWithBufferPolicy;
+
+class DicITrieWrapper {
+public:
+    DictionaryStructureWithBufferPolicy *structure;
+    std::string letters;
+    std::vector<uint32_t> lettersAsCodePoints;
+    std::unordered_map<int, int> letter_mapping;
+    std::unordered_map<int, DicNode> nodes;
+
+    // In nodes with siblings that are omissible (e.g. apostrophe), we need
+    // to merge these to the parent node for easier iteration
+    std::unordered_map<int, std::vector<TrieId>> exceptional_children;
+
+    void initLetters(const std::string &letters);
+    void populateITrie(ITrie *trie) const;
+};
+}
+
+#endif //LATINIME_DICTIONARY_ITRIE_H
diff --git a/native/jni/src/suggest/core/dictionary/itrie.h b/native/jni/src/suggest/core/dictionary/itrie.h
new file mode 100644
index 0000000000..2abaa739fd
--- /dev/null
+++ b/native/jni/src/suggest/core/dictionary/itrie.h
@@ -0,0 +1,111 @@
+/**
+ * Interface that allows the swipe decoder to traverse an abstract trie.
+ * You will need to implement all methods. You can see the built-in Trie
+ * implementation for an example.
+ *
+ * This currently depends on the letters you passed in the layout to
+ * SwipeEngine, and your ITrie implementation needs to be aware of those
+ * letters when returning in get_char_idx and num_chars.
+ */
+
+#ifndef SWIPE_DECODER_ITRIE_H
+#define SWIPE_DECODER_ITRIE_H
+
+#include <stdint.h>
+#define TrieId uint32_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Note: The first parameter to all of these is your userdata.
+ *
+ * TrieIds are arbitrarily defined by you and should correspond to a specific
+ * node in the trie.
+ */
+struct ITrieVTable {
+    /**
+     * The number of letters, e.g. 26 for English. This must correspond with
+     * the letters in your layout.
+     */
+    int (*num_chars)(void*);
+
+    /** Return the root node, called at beginning of traversal */
+    TrieId (*root)(void*);
+
+    /**
+     * Get the character index for a specified node.
+     * For example, if the letters are "abcdef", and this node represents
+     * the letter "b", then its get_char_idx should return 1. Then b's "a"
+     * child should return 0, and that child's "a" child should also return 0,
+     * and true for is_word, forming the word "baa".
+     *
+     * For the root node or invalid nodes, you can return -1, though the
+     * library should never call get_char_idx in such cases, most likely you
+     * are accidentally returning wrong TrieIds from get_child.
+     */
+    int (*get_char_idx)(void*, TrieId);
+
+    /** Get the number of children for the specified node */
+    uint32_t (*get_child_count)(void*, TrieId);
+
+    /** Get the id of a specified child of a specified node */
+    TrieId (*get_child)(void*, TrieId, uint32_t);
+
+    /**
+     * If this node forms a valid word, return true.
+     * For example, "ba" isn't a valid word yet, but its child "baa" is.
+     * Even a word can have more children with words, like "baa's"
+     */
+    bool (*is_word)(void*, TrieId);
+
+    /**
+     * Get the log frequency for this node. It should be 1 to 255, similar to
+     * the word frequencies in the AOSP dictionaries.
+     */
+    float (*get_log_frequency)(void*, TrieId);
+
+    /**
+     * Get the depth of this node
+     */
+    uint16_t (*get_depth)(void*, TrieId);   // normalized depth
+
+    /**
+     * Get the word as a null-terminated string. It'll be copied instantly, so
+     * you can return a static buffer that gets overwritten each time.
+     *
+     * If this word contains non-letters like apostrophes that don't exist on
+     * this layout, you can include them here
+     */
+    const char *(*get_word)(void*, TrieId);
+
+    /**
+     * Called at the end of traversal. You can clean up temporary state and
+     * invalidate all TrieIds here, they won't be reused.
+     */
+    void (*end_search)(void*);
+};
+
+struct ITrie {
+    void *userdata;
+    const ITrieVTable *vtable;
+
+    inline int    num_chars(void) const { return vtable->num_chars(userdata); }
+    inline TrieId root(void) const { return vtable->root(userdata); }
+
+    inline int         get_char_idx(TrieId id)            const { return vtable->get_char_idx(userdata, id);      }
+    inline uint32_t    get_child_count(TrieId id)         const { return vtable->get_child_count(userdata, id);   }
+    inline TrieId      get_child(TrieId id, uint32_t idx) const { return vtable->get_child(userdata, id, idx);    }
+    inline bool        is_word(TrieId id)                 const { return vtable->is_word(userdata, id);           }
+    inline float       get_log_frequency(TrieId id)       const { return vtable->get_log_frequency(userdata, id); }
+    inline uint16_t    get_depth(TrieId id)               const { return vtable->get_depth(userdata, id);         }
+    inline const char* get_word(TrieId id)                const { return vtable->get_word(userdata, id);          }
+    inline void        end_search(void)                   const { return vtable->end_search(userdata);            }
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp
index cf13328bd4..d543111a57 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -30,6 +30,7 @@
 #include "suggest/core/session/dic_traverse_session.h"
 #include "suggest/core/suggest_options.h"
 #include "utils/profiler.h"
+#include "src/suggest/core/dictionary/itrie.h"
 
 namespace latinime {
 
diff --git a/proguard-rules.pro b/proguard-rules.pro
index 2a9f0e1b26..a711254bf5 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -64,3 +64,6 @@
     <methods>;
 }
 -keep class org.mozc.android.inputmethod.japanese.protobuf.** { *; }
+
+# Keep swipe
+-keep class org.futo.ml.inference.** { *; }
\ No newline at end of file
diff --git a/tests/src/org/futo/inputmethod/keyboard/internal/MockKeyboardSwitcher.java b/tests/src/org/futo/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
index fb70998abd..636990b566 100644
--- a/tests/src/org/futo/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
+++ b/tests/src/org/futo/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
@@ -97,7 +97,7 @@ public void updateShiftState() {
     }
 
     public void loadKeyboard() {
-        mState.onLoadKeyboard(null, mAutoCapsState, null);
+        mState.onLoadKeyboard(null, mAutoCapsState, null, null);
     }
 
     public void saveKeyboardState() {
diff --git a/tests/src/org/futo/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/org/futo/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index f824476995..0cc00854af 100644
--- a/tests/src/org/futo/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/org/futo/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -21,11 +21,11 @@
 import org.futo.inputmethod.latin.common.Constants;
 import org.futo.inputmethod.latin.uix.Action;
 import org.futo.inputmethod.latin.uix.actions.ActionRegistry;
-import org.futo.inputmethod.latin.uix.actions.ClipboardHistoryActionKt;
 import org.futo.inputmethod.latin.uix.actions.EmojiActionKt;
 import org.futo.inputmethod.latin.uix.actions.SwitchLanguageActionKt;
 import org.futo.inputmethod.latin.uix.actions.TextEditActionKt;
 import org.futo.inputmethod.latin.uix.actions.UndoRedoActionsKt;
+import org.futo.inputmethod.latin.uix.actions.clipboard.ClipboardHistoryActionKt;
 
 /**
  * Base class to create an expected keyboard for unit test.
diff --git a/tests/src/org/futo/inputmethod/latin/NgramContextTests.java b/tests/src/org/futo/inputmethod/latin/NgramContextTests.java
index 3091c66d17..cc85bb959b 100644
--- a/tests/src/org/futo/inputmethod/latin/NgramContextTests.java
+++ b/tests/src/org/futo/inputmethod/latin/NgramContextTests.java
@@ -31,6 +31,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.Locale;
+
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class NgramContextTests {
@@ -140,8 +142,10 @@ public void testExtractPrevWordsContextArray() {
 
     @Test
     public void testGetNgramContextFromNthPreviousWord() {
-        SpacingAndPunctuations spacingAndPunctuations = new SpacingAndPunctuations(
-                InstrumentationRegistry.getTargetContext().getResources());
+        SpacingAndPunctuations spacingAndPunctuations = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            Locale.ENGLISH
+        );
         assertEquals("<S>", NgramContextUtils.getNgramContextFromNthPreviousWord("",
                 spacingAndPunctuations, 1).extractPrevWordsContext());
         assertEquals("<S> b", NgramContextUtils.getNgramContextFromNthPreviousWord("a. b ",
diff --git a/tests/src/org/futo/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/org/futo/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
index ae08ee405a..d7f4016111 100644
--- a/tests/src/org/futo/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
+++ b/tests/src/org/futo/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
@@ -21,12 +21,14 @@
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.inputmethodservice.InputMethodService;
 import android.os.Parcel;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.SuggestionSpan;
+import android.util.Log;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
@@ -40,6 +42,7 @@
 import org.futo.inputmethod.engine.InputMethodConnectionProvider;
 import org.futo.inputmethod.latin.common.Constants;
 import org.futo.inputmethod.latin.common.StringUtils;
+import org.futo.inputmethod.latin.settings.SettingsValues;
 import org.futo.inputmethod.latin.settings.SpacingAndPunctuations;
 import org.futo.inputmethod.latin.utils.NgramContextUtils;
 import org.futo.inputmethod.latin.utils.RunInLocale;
@@ -51,8 +54,13 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 
+import java.lang.reflect.Field;
+import java.util.Collections;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 @SmallTest
 @RunWith(AndroidJUnit4.class)
@@ -64,14 +72,10 @@ public class RichInputConnectionAndTextRangeTests {
 
     @Before
     public void setUp() throws Exception {
-        final RunInLocale<SpacingAndPunctuations> job = new RunInLocale<SpacingAndPunctuations>() {
-            @Override
-            protected SpacingAndPunctuations job(final Resources res) {
-                return new SpacingAndPunctuations(res);
-            }
-        };
-        final Resources res = InstrumentationRegistry.getTargetContext().getResources();
-        mSpacingAndPunctuations = job.runInLocale(res, Locale.ENGLISH);
+        mSpacingAndPunctuations = SpacingAndPunctuations.create(
+                InstrumentationRegistry.getTargetContext(),
+                Locale.ENGLISH
+        );
     }
 
     private class MockConnection extends InputConnectionWrapper {
@@ -171,7 +175,7 @@ public InputConnection getCurrentInputConnection() {
 
         @Override
         public @NotNull Context getContextForSettings() {
-            return null;
+            return InstrumentationRegistry.getTargetContext();
         }
     }
 
@@ -248,15 +252,15 @@ public void testGetWordRangeAtCursor() {
         /**
          * Test logic in getting the word range at the cursor.
          */
-        final SpacingAndPunctuations SPACE = new SpacingAndPunctuations(
-                mSpacingAndPunctuations, new int[] { Constants.CODE_SPACE });
-        final SpacingAndPunctuations TAB = new SpacingAndPunctuations(
-                mSpacingAndPunctuations, new int[] { Constants.CODE_TAB });
+        final SettingsValues SPACE = buildSettingsValues(SpacingAndPunctuations.createForTesting(
+                mSpacingAndPunctuations, new int[] { Constants.CODE_SPACE }));
+        final SettingsValues TAB = buildSettingsValues(SpacingAndPunctuations.createForTesting(
+                mSpacingAndPunctuations, new int[] { Constants.CODE_TAB }));
         // A character that needs surrogate pair to represent its code point (U+2008A).
         final String SUPPLEMENTARY_CHAR_STRING = "\uD840\uDC8A";
-        final SpacingAndPunctuations SUPPLEMENTARY_CHAR = new SpacingAndPunctuations(
+        final SettingsValues SUPPLEMENTARY_CHAR = buildSettingsValues(SpacingAndPunctuations.createForTesting(
                 mSpacingAndPunctuations, StringUtils.toSortedCodePointArray(
-                        SUPPLEMENTARY_CHAR_STRING));
+                        SUPPLEMENTARY_CHAR_STRING)));
         final String HIRAGANA_WORD = "\u3042\u3044\u3046\u3048\u304A"; // あいうえお
         final String GREEK_WORD = "\u03BA\u03B1\u03B9"; // και
 
@@ -294,7 +298,8 @@ public void testGetWordRangeAtCursor() {
         ic.beginBatchEdit();
         r = ic.getWordRangeAtCursor(SUPPLEMENTARY_CHAR, ScriptUtils.SCRIPT_LATIN, true);
         ic.endBatchEdit();
-        assertTrue(TextUtils.equals("word", r.mWord));
+        // Note: Originally, the behavior was to treat Latin and Greek as incompatible scripts
+        assertTrue(TextUtils.equals("word" + GREEK_WORD, r.mWord));
 
         // likewise for greek
         mockInputMethodService.setInputConnection(
@@ -302,7 +307,8 @@ public void testGetWordRangeAtCursor() {
         ic.beginBatchEdit();
         r = ic.getWordRangeAtCursor(SUPPLEMENTARY_CHAR, ScriptUtils.SCRIPT_GREEK, true);
         ic.endBatchEdit();
-        assertTrue(TextUtils.equals(GREEK_WORD, r.mWord));
+        // Note: Originally, the behavior was to treat Latin and Greek as incompatible scripts
+        assertTrue(TextUtils.equals("text" + GREEK_WORD + "text", r.mWord));
     }
 
     /**
@@ -316,15 +322,62 @@ public void testGetSuggestionSpansAtWord() {
         helpTestGetSuggestionSpansAtWord(16);
     }
 
+    private SettingsValues buildSettingsValues(final SpacingAndPunctuations spacingAndPunctuations) {
+        SharedPreferences emptyPrefs = new SharedPreferences() {
+            @Override public boolean getBoolean(String key, boolean def) { return def; }
+            @Override public int     getInt(String key, int def) { return def; }
+            @Override public long    getLong(String key, long def) { return def; }
+            @Override public float   getFloat(String key, float def) { return def; }
+            @Override public String  getString(String key, String def) { return def; }
+            @Override public Set<String> getStringSet(String key, Set<String> def) { return def; }
+
+            // --- boiler-plate that nobody calls in this test ---
+            @Override public Map<String, ?> getAll() { return Collections.emptyMap(); }
+            @Override public boolean contains(String key) { return false; }
+            @Override public Editor edit() { return new Editor() {
+                public Editor putBoolean(String k, boolean v) { return this; }
+                public Editor putInt   (String k, int    v) { return this; }
+                public Editor putLong(String key, long value) { return this; }
+                public Editor putFloat (String k, float  v) { return this; }
+                public Editor putString(String k, String v) { return this; }
+                public Editor putStringSet(String k, Set<String> v) { return this; }
+                public Editor remove(String k) { return this; }
+                public Editor clear() { return this; }
+                public boolean commit() { return true; }
+                public void apply() {}
+            };};
+            @Override public void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener l) {}
+            @Override public void unregisterOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener l) {}
+        };
+
+        SettingsValues real = new SettingsValues(
+                InstrumentationRegistry.getTargetContext(),
+                emptyPrefs,
+                InstrumentationRegistry.getTargetContext().getResources(),
+                new InputAttributes(null, false, ""));
+
+        try {
+            Field f = SettingsValues.class.getDeclaredField("mSpacingAndPunctuations");
+            f.setAccessible(true);
+            f.set(real, spacingAndPunctuations);
+        }catch(Exception e) {
+            throw new IllegalStateException(e);
+        }
+
+        return real;
+    }
+
     private void helpTestGetSuggestionSpansAtWord(final int cursorPos) {
-        final SpacingAndPunctuations SPACE = new SpacingAndPunctuations(
-                mSpacingAndPunctuations, new int[] { Constants.CODE_SPACE });
+        final SettingsValues SPACE = buildSettingsValues(SpacingAndPunctuations.createForTesting(
+                mSpacingAndPunctuations, new int[] { Constants.CODE_SPACE }));
         final MockInputMethodService mockInputMethodService = new MockInputMethodService();
         final RichInputConnection ic = new RichInputConnection(mockInputMethodService);
 
         final String[] SUGGESTIONS1 = { "swing", "strong" };
         final String[] SUGGESTIONS2 = { "storing", "strung" };
 
+
+
         // Test the usual case.
         SpannableString text = new SpannableString("This is a string for test");
         text.setSpan(new SuggestionSpan(Locale.ENGLISH, SUGGESTIONS1, 0 /* flags */),
diff --git a/tests/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuationsTests.java b/tests/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
index 26875b980f..7720b37f53 100644
--- a/tests/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
+++ b/tests/src/org/futo/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
@@ -108,13 +108,7 @@ public void setUp() throws Exception {
     }
 
     private SpacingAndPunctuations getSpacingAndPunctuations(final Locale locale) {
-        final RunInLocale<SpacingAndPunctuations> job = new RunInLocale<SpacingAndPunctuations>() {
-            @Override
-            protected SpacingAndPunctuations job(Resources res) {
-                return new SpacingAndPunctuations(res);
-            }
-        };
-        return job.runInLocale(getContext().getResources(), locale);
+        return SpacingAndPunctuations.create(getContext(), locale);
     }
 
     private static void testingStandardWordSeparator(final SpacingAndPunctuations sp) {
@@ -379,34 +373,34 @@ public void testIsSentenceSeparator() {
 
     @Test
     public void testLanguageHasSpace() {
-        assertTrue(ENGLISH.mCurrentLanguageHasSpaces);
-        assertTrue(FRENCH.mCurrentLanguageHasSpaces);
-        assertTrue(GERMAN.mCurrentLanguageHasSpaces);
-        assertFalse(THAI.mCurrentLanguageHasSpaces);
-        assertFalse(CAMBODIA_KHMER.mCurrentLanguageHasSpaces);
-        assertFalse(LAOS_LAO.mCurrentLanguageHasSpaces);
+        assertTrue(ENGLISH.currentLanguageHasSpaces);
+        assertTrue(FRENCH.currentLanguageHasSpaces);
+        assertTrue(GERMAN.currentLanguageHasSpaces);
+        assertFalse(THAI.currentLanguageHasSpaces);
+        assertFalse(CAMBODIA_KHMER.currentLanguageHasSpaces);
+        assertFalse(LAOS_LAO.currentLanguageHasSpaces);
         // TODO: We should fix these.
-        assertTrue(KHMER.mCurrentLanguageHasSpaces);
-        assertTrue(LAO.mCurrentLanguageHasSpaces);
+        assertTrue(KHMER.currentLanguageHasSpaces);
+        assertTrue(LAO.currentLanguageHasSpaces);
     }
 
     @Test
     public void testUsesAmericanTypography() {
-        assertTrue(ENGLISH.mUsesAmericanTypography);
-        assertTrue(UNITED_STATES.mUsesAmericanTypography);
-        assertTrue(UNITED_KINGDOM.mUsesAmericanTypography);
-        assertTrue(INDIA_ENGLISH.mUsesAmericanTypography);
-        assertFalse(FRENCH.mUsesAmericanTypography);
-        assertFalse(GERMAN.mUsesAmericanTypography);
-        assertFalse(SWISS_GERMAN.mUsesAmericanTypography);
+        assertTrue(ENGLISH.usesAmericanTypography);
+        assertTrue(UNITED_STATES.usesAmericanTypography);
+        assertTrue(UNITED_KINGDOM.usesAmericanTypography);
+        assertTrue(INDIA_ENGLISH.usesAmericanTypography);
+        assertFalse(FRENCH.usesAmericanTypography);
+        assertFalse(GERMAN.usesAmericanTypography);
+        assertFalse(SWISS_GERMAN.usesAmericanTypography);
     }
 
     @Test
     public void testUsesGermanRules() {
-        assertFalse(ENGLISH.mUsesGermanRules);
-        assertFalse(FRENCH.mUsesGermanRules);
-        assertTrue(GERMAN.mUsesGermanRules);
-        assertTrue(SWISS_GERMAN.mUsesGermanRules);
+        assertFalse(ENGLISH.usesGermanRules);
+        assertFalse(FRENCH.usesGermanRules);
+        assertTrue(GERMAN.usesGermanRules);
+        assertTrue(SWISS_GERMAN.usesGermanRules);
     }
 
     // Punctuations for phone.
@@ -444,7 +438,7 @@ public void testUsesGermanRules() {
 
     private static void testingStandardPunctuationSuggestions(final SpacingAndPunctuations sp,
             final String[] punctuationLabels, final String[] punctuationWords) {
-        final SuggestedWords suggestedWords = sp.mSuggestPuncList;
+        final SuggestedWords suggestedWords = sp.suggestPuncList;
         assertFalse("typedWordValid", suggestedWords.mTypedWordValid);
         assertFalse("willAutoCorrect", suggestedWords.mWillAutoCorrect);
         assertTrue("isPunctuationSuggestions", suggestedWords.isPunctuationSuggestions());
diff --git a/tests/src/org/futo/inputmethod/latin/utils/CapsModeUtilsTests.java b/tests/src/org/futo/inputmethod/latin/utils/CapsModeUtilsTests.java
index 92cb7607cf..721ba46e96 100644
--- a/tests/src/org/futo/inputmethod/latin/utils/CapsModeUtilsTests.java
+++ b/tests/src/org/futo/inputmethod/latin/utils/CapsModeUtilsTests.java
@@ -63,14 +63,10 @@ public void testGetCapsMode() {
         final int c = TextUtils.CAP_MODE_CHARACTERS;
         final int w = TextUtils.CAP_MODE_WORDS;
         final int s = TextUtils.CAP_MODE_SENTENCES;
-        final RunInLocale<SpacingAndPunctuations> job = new RunInLocale<SpacingAndPunctuations>() {
-            @Override
-            protected SpacingAndPunctuations job(final Resources res) {
-                return new SpacingAndPunctuations(res);
-            }
-        };
-        final Resources res = InstrumentationRegistry.getTargetContext().getResources();
-        SpacingAndPunctuations sp = job.runInLocale(res, Locale.ENGLISH);
+        SpacingAndPunctuations sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            Locale.ENGLISH
+        );
         allPathsForCaps("", c | w | s, sp, false);
         allPathsForCaps("Word", c, sp, false);
         allPathsForCaps("Word.", c, sp, false);
@@ -101,20 +97,29 @@ protected SpacingAndPunctuations job(final Resources res) {
         allPathsForCaps("Word.\n", c | w | s, sp, true);
         allPathsForCaps("Word.\n ", c | w | s, sp, true);
 
-        sp = job.runInLocale(res, Locale.FRENCH);
+        sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            Locale.FRENCH
+        );
         allPathsForCaps("\"Word.\" ", c | w, sp, false);
         allPathsForCaps("\"Word\". ", c | w | s, sp, false);
         allPathsForCaps("\"Word\" ", c | w, sp, false);
 
         // Test special case for German. German does not capitalize at the start of a
         // line when the previous line starts with a comma. It does in other cases.
-        sp = job.runInLocale(res, Locale.GERMAN);
+        sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            Locale.GERMAN
+        );
         allPathsForCaps("Liebe Sara,\n", c | w, sp, false);
         allPathsForCaps("Liebe Sara,\n", c | w, sp, true);
         allPathsForCaps("Liebe Sara,  \n  ", c | w, sp, false);
         allPathsForCaps("Liebe Sara  \n  ", c | w | s, sp, false);
         allPathsForCaps("Liebe Sara.\n  ", c | w | s, sp, false);
-        sp = job.runInLocale(res, Locale.ENGLISH);
+        sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            Locale.ENGLISH
+        );
         allPathsForCaps("Liebe Sara,\n", c | w | s, sp, false);
         allPathsForCaps("Liebe Sara,\n", c | w | s, sp, true);
         allPathsForCaps("Liebe Sara,  \n  ", c | w | s, sp, false);
@@ -122,7 +127,10 @@ protected SpacingAndPunctuations job(final Resources res) {
         allPathsForCaps("Liebe Sara.\n  ", c | w | s, sp, false);
 
         // Test armenian period
-        sp = job.runInLocale(res, LocaleUtils.constructLocaleFromString("hy_AM"));
+        sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            LocaleUtils.constructLocaleFromString("hy_AM")
+        );
         assertTrue("Period is not sentence separator in Armenian",
                 !sp.isSentenceSeparator('.'));
         assertTrue("Sentence separator is Armenian period in Armenian",
@@ -136,7 +144,10 @@ protected SpacingAndPunctuations job(final Resources res) {
         allPathsForCaps("Word\u0589 ", c | w | s, sp, false);
 
         // Test for sentence terminators
-        sp = job.runInLocale(res, Locale.ENGLISH);
+        sp = SpacingAndPunctuations.create(
+                InstrumentationRegistry.getTargetContext(),
+                Locale.ENGLISH
+        );
         allPathsForCaps("Word? ", c | w | s, sp, false);
         allPathsForCaps("Word?", c | w | s, sp, true);
         allPathsForCaps("Word?", c, sp, false);
@@ -147,7 +158,10 @@ protected SpacingAndPunctuations job(final Resources res) {
         allPathsForCaps("Word;", c | w, sp, true);
         allPathsForCaps("Word;", c, sp, false);
         // Test for sentence terminators in Greek
-        sp = job.runInLocale(res, LocaleUtils.constructLocaleFromString("el"));
+        sp = SpacingAndPunctuations.create(
+            InstrumentationRegistry.getTargetContext(),
+            LocaleUtils.constructLocaleFromString("el")
+        );
         allPathsForCaps("Word? ", c | w | s, sp, false);
         allPathsForCaps("Word?", c | w | s, sp, true);
         allPathsForCaps("Word?", c, sp, false);
diff --git a/tests/src/org/futo/inputmethod/latin/utils/DictionaryInfoUtilsTests.java b/tests/src/org/futo/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
index 3ee8dd945e..e8a4a506fa 100644
--- a/tests/src/org/futo/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
+++ b/tests/src/org/futo/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
@@ -39,14 +39,8 @@
 public class DictionaryInfoUtilsTests {
     @Test
     public void testLooksValidForDictionaryInsertion() {
-        final RunInLocale<SpacingAndPunctuations> job = new RunInLocale<SpacingAndPunctuations>() {
-            @Override
-            protected SpacingAndPunctuations job(final Resources res) {
-                return new SpacingAndPunctuations(res);
-            }
-        };
-        final Resources res = InstrumentationRegistry.getTargetContext().getResources();
-        final SpacingAndPunctuations sp = job.runInLocale(res, Locale.ENGLISH);
+        final SpacingAndPunctuations sp = SpacingAndPunctuations.create(
+                InstrumentationRegistry.getTargetContext(), Locale.ENGLISH);
         assertTrue(DictionaryInfoUtils.looksValidForDictionaryInsertion("aochaueo", sp));
         assertFalse(DictionaryInfoUtils.looksValidForDictionaryInsertion("", sp));
         assertTrue(DictionaryInfoUtils.looksValidForDictionaryInsertion("ao-ch'aueo", sp));
diff --git a/tools/contributors.py b/tools/contributors.py
index 575d4d4a67..10a176bf70 100644
--- a/tools/contributors.py
+++ b/tools/contributors.py
@@ -99,14 +99,15 @@ def main() -> None:
     )
 
     # 4. Output Kotlin
-    print("// Generated by tools/contributors.py, please do not update manually.")
-    print("package org.futo.inputmethod.latin.uix.settings.pages.credits")
-    print("")
-    print(to_kotlin_list("languageContribs", lang_lines))
-    print("")
-    print(to_kotlin_list("layoutContribs", layout_authors))
-    print("")
-    print(to_kotlin_list("codeContribs", code_authors))
+    with open(repo_root / "java/src/org/futo/inputmethod/latin/uix/settings/pages/credits/Contributors.kt", "w") as of:
+        of.write("// Generated by tools/contributors.py, please do not update manually.\n")
+        of.write("package org.futo.inputmethod.latin.uix.settings.pages.credits\n")
+        of.write("\n")
+        of.write(to_kotlin_list("languageContribs", lang_lines))
+        of.write("\n")
+        of.write(to_kotlin_list("layoutContribs", layout_authors))
+        of.write("\n")
+        of.write(to_kotlin_list("codeContribs", code_authors))
 
 
 if __name__ == "__main__":
diff --git a/tools/make-keyboard-text-py/locales/hi_ZZ.json b/tools/make-keyboard-text-py/locales/hi_ZZ.json
deleted file mode 100644
index c82f4856cb..0000000000
--- a/tools/make-keyboard-text-py/locales/hi_ZZ.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "locale": "hi_ZZ",
-    "morekeys": {},
-    "keyspec": {
-        "currency": "₹"
-    },
-    "label": {
-        "go_key": "Go",
-        "send_key": "Send",
-        "next_key": "Next",
-        "done_key": "Done",
-        "search_key": "Search",
-        "previous_key": "Prev",
-        "pause_key": "Pause",
-        "wait_key": "Wait"
-    },
-    "keylabel": {},
-    "keyhintlabel": {},
-    "additional_morekeys": {},
-    "other": {}
-}
\ No newline at end of file
diff --git a/tools/make-keyboard-text-py/locales/hi__Latn.json b/tools/make-keyboard-text-py/locales/hi__Latn.json
new file mode 100644
index 0000000000..577e4bc1d4
--- /dev/null
+++ b/tools/make-keyboard-text-py/locales/hi__Latn.json
@@ -0,0 +1,62 @@
+{
+    "locale": "hi__#Latn",
+    "morekeys": {
+        "period": [
+            "!autoColumnOrder!8",
+            "\\,",
+            "।",
+            "?",
+            "!",
+            "॥",
+            "#",
+            ")",
+            "(",
+            "/",
+            "'",
+            "@",
+            ":",
+            ";",
+            "-",
+            "\"",
+            "+"
+        ],
+        "tablet_period": [
+            "!autoColumnOrder!8",
+            "।",
+            "\\,",
+            "?",
+            "!",
+            "॥",
+            "#",
+            ")",
+            "(",
+            "'",
+            "/",
+            "@",
+            ":",
+            ";",
+            "-",
+            "\"",
+            "+"
+        ]
+    },
+    "keyspec": {
+        "currency": "₹"
+    },
+    "label": {},
+    "keylabel": {},
+    "keyhintlabel": {},
+    "additional_morekeys": {
+        "symbols_1": ["१"],
+        "symbols_2": ["२"],
+        "symbols_3": ["३"],
+        "symbols_4": ["४"],
+        "symbols_5": ["५"],
+        "symbols_6": ["६"],
+        "symbols_7": ["७"],
+        "symbols_8": ["८"],
+        "symbols_9": ["९"],
+        "symbols_0": ["०"]
+    },
+    "other": {}
+}
\ No newline at end of file
diff --git a/tools/make-keyboard-text-py/locales/it.json b/tools/make-keyboard-text-py/locales/it.json
index 25e8b2b7bc..8972fc3a17 100644
--- a/tools/make-keyboard-text-py/locales/it.json
+++ b/tools/make-keyboard-text-py/locales/it.json
@@ -33,7 +33,8 @@
             "ę",
             "ė",
             "ē",
-            "ə"
+            "ə",
+            "ɜ"
         ],
         "misc_i": [
             "í",
diff --git a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/RecognizerView.kt b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/RecognizerView.kt
index 2fe470232d..5a973c6264 100644
--- a/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/RecognizerView.kt
+++ b/voiceinput-shared/src/main/java/org/futo/voiceinput/shared/RecognizerView.kt
@@ -34,6 +34,7 @@ import org.futo.voiceinput.shared.whisper.MultiModelRunConfiguration
 data class RecognizerViewSettings(
     val shouldShowVerboseFeedback: Boolean,
     val shouldShowInlinePartialResult: Boolean,
+    val shouldAnimateBubble: Boolean,
 
     val modelRunConfiguration: MultiModelRunConfiguration,
     val decodingConfiguration: DecodingConfiguration,
@@ -225,7 +226,7 @@ class RecognizerView(
         }
 
         override fun updateMagnitude(magnitude: Float, state: MagnitudeState) {
-            magnitudeState.floatValue = magnitude
+            if(settings.shouldAnimateBubble) magnitudeState.floatValue = magnitude
             statusState.value = state
             currentViewState.value = CurrentView.InnerRecognize
         }