diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index e07b4f3fb..01968ac76 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -7,22 +7,17 @@ on:
 
 jobs:
   develop:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-24.04
-          - macos-14
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-24.04
     steps:
       - name: Fetch source code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: recursive
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: fcitx5-android
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index bb9b3ce50..43438a178 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Android environment
         uses: android-actions/setup-android@v3
         with:
-          packages: cmake;3.22.1
+          packages: cmake;3.31.6
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index fb5246f61..dcc86c2e1 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Install Android NDK
         run: |
-          sdkmanager --install "cmake;3.22.1"
+          sdkmanager --install "cmake;3.31.6"
 
       - name: Install system dependencies (Ubuntu)
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
diff --git a/.gitmodules b/.gitmodules
index b710f89d6..2f3d38b6d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,7 @@
 [submodule "lib/fcitx5/src/main/cpp/prebuilt"]
 	path = lib/fcitx5/src/main/cpp/prebuilt
 	url = https://github.com/fcitx5-android/prebuilt.git
+	shallow = true
 [submodule "lib/fcitx5-lua/src/main/cpp/fcitx5-lua"]
 	path = lib/fcitx5-lua/src/main/cpp/fcitx5-lua
 	url = https://github.com/fcitx/fcitx5-lua.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b38416157..cf0517db7 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/README.md b/README.md
index 7943e9d50..85f9bba0f 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ GitHub: [![release version](https://img.shields.io/github/v/release/fcitx5-andro
 - Virtual Keyboard (layout not customizable yet)
 - Expandable candidate view
 - Clipboard management (plain text only)
-- Theming (custom color scheme and background image)
+- Theming (custom color scheme, background image and dynamic color aka monet color after Android 12)
 - Popup preview on key press
 - Long press popup keyboard for convenient symbol input
 - Symbol and Emoji picker
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a549cba47..1f435a29b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -140,7 +140,6 @@ dependencies {
     androidTestImplementation(libs.junit)
 }
 
-@Suppress("UnstableApiUsage")
 configurations {
     all {
         // remove Baseline Profile Installer or whatever it is...
diff --git a/app/org.fcitx.fcitx5.android.yml b/app/org.fcitx.fcitx5.android.yml
index 6c1dd0953..7c2ffc2eb 100644
--- a/app/org.fcitx.fcitx5.android.yml
+++ b/app/org.fcitx.fcitx5.android.yml
@@ -21,9 +21,9 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y g++ libtool make automake gettext bzip2 xz-utils zstd pkg-config
-        cmake extra-cmake-modules ninja-build libfmt-dev libboost-all-dev libfcitx5utils-dev opencc
-        ghc cabal-install libghc-shake-dev libghc-aeson-pretty-dev libghc-js-flot-data
-        haskell-js-dgtable-utils fcitx5-modules python-is-python3
+        cmake extra-cmake-modules ninja-build libfmt-dev libsystemd-dev libboost-all-dev
+        ghc cabal-install libghc-shake-dev libghc-aeson-pretty-dev libghc-js-flot-data haskell-js-dgtable-utils 
+        python-is-python3 opencc
     gradle:
       - yes
     binary: https://jenkins.fcitx-im.org/job/android/job/fcitx5-android/lastSuccessfulBuild/artifact/out/org.fcitx.fcitx5.android-%v-%abi-release.apk
@@ -32,7 +32,7 @@ Builds:
     rm:
       - lib/fcitx5/src/main/cpp/prebuilt
     prebuild:
-      - sdkmanager 'cmake;3.22.1'
+      - sdkmanager 'cmake;3.31.6'
       - sed -i -e '/ImportQualifiedPost/d' $$fcitx5-android-prebuilder$$/src/Main.hs
       - sed -i -e 's/import \(.*\) qualified as/import qualified \1 as/g' $$fcitx5-android-prebuilder$$/src/*.hs
       - sed -i -e 's|https://maven.pkg.github.com|https://jitpack.io|g' ../build-logic/convention/build.gradle.kts
@@ -43,12 +43,11 @@ Builds:
       - build-logic/convention/build
     build:
       - pushd $$fcitx5-android-prebuilder$$
-      - ABI=%abi ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23
-        COMP_SPELL_DICT=/usr/lib/x86_64-linux-gnu/fcitx5/libexec/comp-spell-dict
-        ./build-cabal -j spell-dict fmt libuv libintl-lite boost marisa opencc libime lua chinese-addons-data zstd
+      - ABI=%abi ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.31.6 ANDROID_PLATFORM=23
+        ./build-cabal -j app
       - popd
       - mv $$fcitx5-android-prebuilder$$/build ../lib/fcitx5/src/main/cpp/prebuilt
-    ndk: 25.2.9519653
+    ndk: 28.0.13004108
     gradleprops:
       - buildABI=%abi
       - buildTimestamp=%ts
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 686b0355d..fcc089b60 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -87,6 +87,10 @@
                 <data android:scheme="content" />
                 <data android:mimeType="*/*" />
                 <data android:host="*" />
+                <!--
+                  there has to be so many segments:
+                  https://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension/8599921#8599921
+                -->
                 <data android:pathPattern=".*\\.dict" />
                 <data android:pathPattern=".*\\..*\\.dict" />
                 <data android:pathPattern=".*\\..*\\..*\\.dict" />
@@ -99,6 +103,10 @@
                 <data android:pathPattern=".*\\..*\\.txt" />
                 <data android:pathPattern=".*\\..*\\..*\\.txt" />
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.txt" />
+                <!-- pathSuffix works on API 31+ -->
+                <data android:pathSuffix=".dict" />
+                <data android:pathSuffix=".scel" />
+                <data android:pathSuffix=".txt" />
             </intent-filter>
         </activity>
 
@@ -149,12 +157,22 @@
             </intent-filter>
         </provider>
 
+        <!-- remove unneeded components from com.canhub.cropper -->
+        <!--suppress DeprecatedClassUsageInspection -->
+        <activity
+            android:name="com.canhub.cropper.CropImageActivity"
+            tools:node="remove" />
+
+        <provider
+            android:name="com.canhub.cropper.CropFileProvider"
+            android:authorities="${applicationId}.cropper.fileprovider"
+            tools:node="remove" />
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             android:directBootAware="true"
             android:exported="false"
-            tools:ignore="MissingClass"
             tools:node="merge">
             <!-- do not inject splitties AppCompat -->
             <meta-data
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 7e5e85908..9777b761f 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -31,10 +31,6 @@ add_subdirectory(androidfrontend)
 add_subdirectory(androidkeyboard)
 add_subdirectory(androidnotification)
 
-# prebuilt fmt
-set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
-find_package(fmt)
-
 # prebuilt libuv
 set(libuv_DIR "${PREBUILT_DIR}/libuv/${ANDROID_ABI}/lib/cmake/libuv")
 find_package(libuv)
@@ -46,7 +42,7 @@ find_package(Boost 1.86.0 REQUIRED COMPONENTS headers iostreams CONFIG)
 set(CHINESE_ADDONS_PINYIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons/im/pinyin")
 add_library(pinyin-customphrase STATIC "${CHINESE_ADDONS_PINYIN_DIR}/customphrase.cpp")
 target_include_directories(pinyin-customphrase INTERFACE "${CHINESE_ADDONS_PINYIN_DIR}")
-target_link_libraries(pinyin-customphrase PRIVATE fmt::fmt-header-only Fcitx5::Utils LibIME::Core)
+target_link_libraries(pinyin-customphrase PRIVATE Fcitx5::Utils LibIME::Core)
 
 add_library(native-lib SHARED native-lib.cpp)
 target_link_libraries(native-lib
diff --git a/app/src/main/cpp/androidfrontend/androidfrontend.cpp b/app/src/main/cpp/androidfrontend/androidfrontend.cpp
index 81fa44063..620452604 100644
--- a/app/src/main/cpp/androidfrontend/androidfrontend.cpp
+++ b/app/src/main/cpp/androidfrontend/androidfrontend.cpp
@@ -191,24 +191,6 @@ class AndroidInputContext : public InputContextV2 {
         return candidates;
     }
 
-    bool doesCandidateHaveAction(const int idx) {
-        const auto &list = inputPanel().candidateList();
-        if (!list) return false;
-        const auto &actionable = list->toActionable();
-        if (!actionable) return false;
-        if (idx >= list->size()) {
-            const auto &bulk = list->toBulk();
-            if (bulk && idx < bulk->totalSize()) {
-                const auto &c = bulk->candidateFromAll(idx);
-                return actionable->hasAction(c);
-            }
-            return false;
-        } else {
-            const auto &c = list->candidate(idx);
-            return actionable->hasAction(c);
-        }
-    }
-
     std::vector<CandidateAction> getCandidateAction(const int idx) {
         std::vector<CandidateAction> actions;
         const auto &list = inputPanel().candidateList();
@@ -217,10 +199,14 @@ class AndroidInputContext : public InputContextV2 {
             if (actionable) {
                 if (idx >= list->size()) {
                     const auto &bulk = list->toBulk();
-                    if (bulk && idx < bulk->totalSize()) {
-                        const auto &c = bulk->candidateFromAll(idx);
-                        for (const auto &a: actionable->candidateActions(c)) {
-                            actions.emplace_back(a);
+                    if (bulk) {
+                        try {
+                            const auto &c = bulk->candidateFromAll(idx);
+                            for (const auto &a: actionable->candidateActions(c)) {
+                                actions.emplace_back(a);
+                            }
+                        } catch (const std::exception &e) {
+                            FCITX_WARN() << "getCandidateAction(" << idx << ") failed:" << e.what();
                         }
                     }
                 } else {
@@ -241,9 +227,13 @@ class AndroidInputContext : public InputContextV2 {
         if (!actionable) return;
         if (idx >= list->size()) {
             const auto &bulk = list->toBulk();
-            if (bulk && idx < bulk->totalSize()) {
-                const auto &c = bulk->candidateFromAll(idx);
-                actionable->triggerAction(c, actionIdx);
+            if (bulk) {
+                try {
+                    const auto &c = bulk->candidateFromAll(idx);
+                    actionable->triggerAction(c, actionIdx);
+                } catch (const std::exception &e) {
+                    FCITX_WARN() << "triggerCandidateAction(" << idx << ") failed:" << e.what();
+                }
             }
         } else {
             const auto &c = list->candidate(idx);
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
index fb66925d2..bdeb17191 100644
--- a/app/src/main/cpp/native-lib.cpp
+++ b/app/src/main/cpp/native-lib.cpp
@@ -698,7 +698,7 @@ Java_org_fcitx_fcitx5_android_core_Fcitx_startupFcitx(
     };
 
     umask(007);
-    fcitx::StandardPath::global().syncUmask();
+    fcitx::StandardPaths::global().syncUmask();
 
     Fcitx::Instance().startup([&](auto *androidfrontend) {
         FCITX_INFO() << "Setting up callback";
@@ -1172,7 +1172,7 @@ Java_org_fcitx_fcitx5_android_data_table_TableManager_checkTableDictFormat(JNIEn
 extern "C"
 JNIEXPORT jobjectArray JNICALL
 Java_org_fcitx_fcitx5_android_data_pinyin_CustomPhraseManager_load(JNIEnv *env, jclass clazz) {
-    auto fp = fcitx::StandardPath::global().open(fcitx::StandardPath::Type::PkgData, "pinyin/customphrase", O_RDONLY);
+    auto fp = fcitx::StandardPaths::global().open(fcitx::StandardPathsType::PkgData, "pinyin/customphrase");
     if (fp.fd() < 0) {
         FCITX_INFO() << "cannot open pinyin/customphrase";
         return nullptr;
@@ -1218,8 +1218,8 @@ Java_org_fcitx_fcitx5_android_data_pinyin_CustomPhraseManager_save(JNIEnv *env,
                        *CString(env, phraseValue),
                        static_cast<int>(phraseOrder));
     }
-    fcitx::StandardPath::global().safeSave(
-            fcitx::StandardPath::Type::PkgData, "pinyin/customphrase",
+    fcitx::StandardPaths::global().safeSave(
+            fcitx::StandardPathsType::PkgData, "pinyin/customphrase",
             [&](int fd) {
                 boost::iostreams::stream_buffer<boost::iostreams::file_descriptor_sink>
                         buffer(fd, boost::iostreams::file_descriptor_flags::never_close_handle);
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/FcitxApplication.kt b/app/src/main/java/org/fcitx/fcitx5/android/FcitxApplication.kt
index 2e9085d6e..e52553b36 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/FcitxApplication.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/FcitxApplication.kt
@@ -165,8 +165,8 @@ class FcitxApplication : Application() {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        ThemeManager.onSystemDarkModeChange(newConfig.isDarkMode())
-        Locales.onLocaleChange(resources.configuration)
+        ThemeManager.onSystemPlatteChange(newConfig)
+        Locales.onLocaleChange(newConfig)
     }
 
     companion object {
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt
index 800ede315..098f34c06 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/core/CapabilityFlag.kt
@@ -148,6 +148,7 @@ value class CapabilityFlags constructor(val flags: ULong) {
                             }
                             if (equals(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)) {
                                 flags += CapabilityFlag.Sensitive
+                                flags += CapabilityFlag.NoSpellCheck
                             }
                             if (equals(InputType.TYPE_TEXT_VARIATION_URI)) {
                                 flags += CapabilityFlag.Url
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/FcitxDispatcher.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/FcitxDispatcher.kt
index 33e0025e4..c596c8117 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/core/FcitxDispatcher.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/core/FcitxDispatcher.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.core
 
@@ -21,23 +21,18 @@ import kotlin.coroutines.CoroutineContext
 
 class FcitxDispatcher(private val controller: FcitxController) : CoroutineDispatcher() {
 
-    class WrappedRunnable(private val runnable: Runnable, private val name: String? = null) :
-        Runnable by runnable {
+    class WrappedRunnable(private val runnable: Runnable) : Runnable by runnable {
         private val time = System.currentTimeMillis()
-        var started = false
-            private set
-
-        private val delta
-            get() = System.currentTimeMillis() - time
 
         override fun run() {
-            if (delta > JOB_WAITING_LIMIT)
-                Timber.w("${toString()} has waited $delta ms to get run since created!")
-            started = true
+            val delta = System.currentTimeMillis() - time
+            if (delta > JOB_WAITING_LIMIT) {
+                Timber.w("$this has waited $delta ms to get run since created!")
+            }
             runnable.run()
         }
 
-        override fun toString(): String = "WrappedRunnable[${name ?: hashCode()}]"
+        override fun toString(): String = "WrappedRunnable[${hashCode()}]"
     }
 
     // this is fcitx main thread
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/InputFeedbacks.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/InputFeedbacks.kt
index d71ed91cd..fef6d17b1 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/InputFeedbacks.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/InputFeedbacks.kt
@@ -6,7 +6,6 @@ package org.fcitx.fcitx5.android.data
 
 import android.media.AudioManager
 import android.os.Build
-import android.os.Build.VERSION
 import android.os.VibrationEffect
 import android.provider.Settings
 import android.view.HapticFeedbackConstants
@@ -71,19 +70,24 @@ object InputFeedbacks {
         } else {
             duration = buttonPressVibrationMilliseconds.toLong()
             amplitude = buttonPressVibrationAmplitude
-            hfc = if (VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && keyUp) {
+            hfc = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && keyUp) {
                 HapticFeedbackConstants.KEYBOARD_RELEASE
             } else {
                 HapticFeedbackConstants.KEYBOARD_TAP
             }
         }
-        val useVibrator = duration != 0L
 
-        if (useVibrator) {
+        // there is `VibrationEffect.DEFAULT_AMPLITUDE` but no default duration;
+        // also `VibrationEffect.createOneShot()` only accepts positive duration.
+        // so changing amplitude without changing duration makes no sense
+        if (duration != 0L) {
             // on Android 13, if system haptic feedback was disabled, `vibrator.vibrate()` won't work
             // but `view.performHapticFeedback()` with `FLAG_IGNORE_GLOBAL_SETTING` still works
             if (hasAmplitudeControl && amplitude != 0) {
                 vibrator.vibrate(VibrationEffect.createOneShot(duration, amplitude))
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val ve = VibrationEffect.createOneShot(duration, VibrationEffect.DEFAULT_AMPLITUDE)
+                vibrator.vibrate(ve)
             } else {
                 @Suppress("DEPRECATION")
                 vibrator.vibrate(duration)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/RecentlyUsed.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/RecentlyUsed.kt
index 9afc698aa..deeadf0db 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/RecentlyUsed.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/RecentlyUsed.kt
@@ -1,43 +1,76 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
+
 package org.fcitx.fcitx5.android.data
 
+import android.content.Context
+import androidx.core.content.edit
+import kotlinx.serialization.json.Json
 import org.fcitx.fcitx5.android.FcitxApplication
+import timber.log.Timber
 
-// Not thread-safe
-class RecentlyUsed(
-    val fileName: String,
-    val capacity: Int
-) : LinkedHashMap<String, String>(0, .75f, true) {
+class RecentlyUsed(val type: String, val limit: Int) {
 
     companion object {
+        // for backwords compatibility only
         const val DIR_NAME = "recently_used"
+        const val PREFERENCE_NAME = "picker_recently_used"
     }
 
-    private val file =
-        FcitxApplication.getInstance().directBootAwareContext.filesDir.resolve(DIR_NAME).run {
-            mkdirs()
-            resolve(fileName).apply { createNewFile() }
-        }
+    private val sharedPreferences = FcitxApplication.getInstance().directBootAwareContext
+        .getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE)
 
-    fun load() {
-        val xs = file.readLines()
-        xs.forEach {
-            if (it.isNotBlank())
-                put(it, it)
-        }
+    private val map = LinkedHashMap<String, Boolean>(limit).apply {
+        (migrate() ?: load()).forEach { put(it, true) }
     }
 
-    fun save() {
-        file.writeText(values.joinToString("\n"))
+    val items: List<String> get() = map.keys.reversed()
+
+    private fun load(): List<String> {
+        val rawValue = sharedPreferences.getString(type, "") ?: ""
+        if (rawValue.isEmpty()) {
+            return emptyList()
+        }
+        return try {
+            Json.decodeFromString<List<String>>(rawValue)
+        } catch (_: Exception) {
+            sharedPreferences.edit {
+                remove(type)
+            }
+            emptyList()
+        }
     }
 
-    override fun removeEldestEntry(eldest: MutableMap.MutableEntry<String, String>?) =
-        size > capacity
+    private fun save() {
+        sharedPreferences.edit {
+            putString(type, Json.encodeToString<List<String>>(map.keys.toList()))
+        }
+    }
 
-    fun insert(s: String) = put(s, s)
+    fun insert(item: String) {
+        map.put(item, true)
+        save()
+    }
 
-    fun toOrderedList() = values.toList().reversed()
+    fun migrate(): List<String>? {
+        val dir = FcitxApplication.getInstance().directBootAwareContext.filesDir.resolve(DIR_NAME)
+        val file = dir.resolve(type)
+        if (file.exists()) {
+            try {
+                val lines = file.readLines()
+                file.delete()
+                if (dir.list()?.isEmpty() == true) {
+                    dir.delete()
+                }
+                return lines
+            } catch (e: Exception) {
+                Timber.w("Failed to migrate RecentlyUsed(type=$type)")
+                Timber.w(e)
+                return null
+            }
+        }
+        return null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/UserDataManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/UserDataManager.kt
index c67b69965..39a31ab64 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/UserDataManager.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/UserDataManager.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.data
 
@@ -65,8 +65,7 @@ object UserDataManager {
             writeFileTree(dataBasesDir, "databases", zipStream)
             // external
             writeFileTree(externalDir, "external", zipStream)
-            // recently_used
-            writeFileTree(recentlyUsedDir, "recently_used", zipStream)
+            // recently_used moved to SharedPreference and shoud not be exported
             // metadata
             zipStream.putNextEntry(ZipEntry("metadata.json"))
             val pkgInfo = appContext.packageManager.getPackageInfo(appContext.packageName, 0)
@@ -87,7 +86,6 @@ object UserDataManager {
         if (exists && isDir) {
             source.copyRecursively(target, overwrite = true)
         } else {
-            source.toString()
             Timber.w("Cannot import user data: path='${source.path}', exists=$exists, isDir=$isDir")
         }
     }
@@ -104,6 +102,7 @@ object UserDataManager {
                 copyDir(File(tempDir, "shared_prefs"), sharedPrefsDir)
                 copyDir(File(tempDir, "databases"), dataBasesDir)
                 copyDir(File(tempDir, "external"), externalDir)
+                // keep importing recently_used for backwords compatibility
                 copyDir(File(tempDir, "recently_used"), recentlyUsedDir)
                 metadata
             }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/clipboard/ClipboardManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/clipboard/ClipboardManager.kt
index 4dae02bae..92bc85285 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/clipboard/ClipboardManager.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/clipboard/ClipboardManager.kt
@@ -88,7 +88,7 @@ object ClipboardManager : ClipboardManager.OnPrimaryClipChangedListener,
         clbDb = Room
             .databaseBuilder(context, ClipboardDatabase::class.java, "clbdb")
             // allow wipe the database instead of crashing when downgrade
-            .fallbackToDestructiveMigrationOnDowngrade()
+            .fallbackToDestructiveMigrationOnDowngrade(dropAllTables = true)
             .build()
         clbDao = clbDb.clipboardDao()
         enabledListener.onChange(enabledPref.key, enabledPref.getValue())
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt
index 492d3057a..d84a0215b 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt
@@ -20,6 +20,7 @@ import org.fcitx.fcitx5.android.input.keyboard.LangSwitchBehavior
 import org.fcitx.fcitx5.android.input.keyboard.SpaceLongPressBehavior
 import org.fcitx.fcitx5.android.input.keyboard.SwipeSymbolDirection
 import org.fcitx.fcitx5.android.input.picker.PickerWindow
+import org.fcitx.fcitx5.android.input.popup.EmojiModifier
 import org.fcitx.fcitx5.android.utils.DeviceUtil
 import org.fcitx.fcitx5.android.utils.appContext
 import org.fcitx.fcitx5.android.utils.vibrator
@@ -294,6 +295,9 @@ class AppPrefs(private val sharedPreferences: SharedPreferences) {
         val fontSize =
             int(R.string.candidates_font_size, "candidates_window_font_size", 20, 4, 64, "sp")
 
+        val windowRadius =
+            int(R.string.candidates_window_radius, "candidates_window_radius", 0, 0, 48, "dp")
+
         val itemPaddingVertical: ManagedPreference.PInt
         val itemPaddingHorizontal: ManagedPreference.PInt
 
@@ -341,6 +345,14 @@ class AppPrefs(private val sharedPreferences: SharedPreferences) {
         ) { clipboardListening.getValue() }
     }
 
+    inner class Symbols : ManagedPreferenceCategory(R.string.emoji_and_symbols, sharedPreferences) {
+        val defaultEmojiSkinTone = enumList(
+            R.string.default_emoji_skin_tone,
+            "default_emoji_skin_tone",
+            EmojiModifier.SkinTone.Default,
+        )
+    }
+
     private val providers = mutableListOf<ManagedPreferenceProvider>()
 
     fun <T : ManagedPreferenceProvider> registerProvider(
@@ -359,6 +371,7 @@ class AppPrefs(private val sharedPreferences: SharedPreferences) {
     val keyboard = Keyboard().register()
     val candidates = Candidates().register()
     val clipboard = Clipboard().register()
+    val symbols = Symbols().register()
     val advanced = Advanced().register()
 
     @Keep
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/Theme.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/Theme.kt
index d9501d4b7..d7f2791b2 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/Theme.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/Theme.kt
@@ -14,6 +14,7 @@ import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import org.fcitx.fcitx5.android.utils.DarkenColorFilter
 import org.fcitx.fcitx5.android.utils.RectSerializer
+import org.fcitx.fcitx5.android.utils.alpha
 import org.fcitx.fcitx5.android.utils.appContext
 import java.io.File
 
@@ -261,4 +262,94 @@ sealed class Theme : Parcelable {
         )
     }
 
-}
\ No newline at end of file
+    @Parcelize
+    data class Monet(
+        override val name: String,
+        override val isDark: Boolean,
+        override val backgroundColor: Int,
+        override val barColor: Int,
+        override val keyboardColor: Int,
+        override val keyBackgroundColor: Int,
+        override val keyTextColor: Int,
+        override val candidateTextColor: Int,
+        override val candidateLabelColor: Int,
+        override val candidateCommentColor: Int,
+        override val altKeyBackgroundColor: Int,
+        override val altKeyTextColor: Int,
+        override val accentKeyBackgroundColor: Int,
+        override val accentKeyTextColor: Int,
+        override val keyPressHighlightColor: Int,
+        override val keyShadowColor: Int,
+        override val popupBackgroundColor: Int,
+        override val popupTextColor: Int,
+        override val spaceBarColor: Int,
+        override val dividerColor: Int,
+        override val clipboardEntryColor: Int,
+        override val genericActiveBackgroundColor: Int,
+        override val genericActiveForegroundColor: Int
+    ) : Theme() {
+        constructor(
+            isDark: Boolean,
+            surfaceContainer: Int,
+            surfaceContainerHigh: Int,
+            surfaceBright: Int,
+            onSurface: Int,
+            primary: Int,
+            onPrimary: Int,
+            secondaryContainer: Int,
+            onSurfaceVariant: Int,
+        ) : this(
+            name = "Monet" + if (isDark) "Dark" else "Light",
+            isDark = isDark,
+            backgroundColor = surfaceContainer,
+            barColor = surfaceContainerHigh,
+            keyboardColor = surfaceContainer,
+            keyBackgroundColor = surfaceBright,
+            keyTextColor = onSurface,
+            candidateTextColor = onSurface,
+            candidateLabelColor = onSurface,
+            candidateCommentColor = onSurfaceVariant,
+            altKeyBackgroundColor = secondaryContainer,
+            altKeyTextColor = onSurfaceVariant,
+            accentKeyBackgroundColor = primary,
+            accentKeyTextColor = onPrimary,
+            keyPressHighlightColor = onSurface.alpha(if (isDark) 0.2f else 0.12f),
+            keyShadowColor = 0x000000,
+            popupBackgroundColor = surfaceContainer,
+            popupTextColor = onSurface,
+            spaceBarColor = surfaceBright,
+            dividerColor = surfaceBright,
+            clipboardEntryColor = surfaceBright,
+            genericActiveBackgroundColor = primary,
+            genericActiveForegroundColor = onPrimary
+        )
+
+        @OptIn(ExperimentalStdlibApi::class)
+        fun toCustom() = Custom(
+            name = name + "#" + this.accentKeyBackgroundColor.toHexString(), // Use primary color as identifier
+            isDark = isDark,
+            backgroundImage = null,
+            backgroundColor = backgroundColor,
+            barColor = barColor,
+            keyboardColor = keyboardColor,
+            keyBackgroundColor = keyBackgroundColor,
+            keyTextColor = keyTextColor,
+            candidateTextColor = candidateTextColor,
+            candidateLabelColor = candidateLabelColor,
+            candidateCommentColor = candidateCommentColor,
+            altKeyBackgroundColor = altKeyBackgroundColor,
+            altKeyTextColor = altKeyTextColor,
+            accentKeyBackgroundColor = accentKeyBackgroundColor,
+            accentKeyTextColor = accentKeyTextColor,
+            keyPressHighlightColor = keyPressHighlightColor,
+            keyShadowColor = keyShadowColor,
+            popupBackgroundColor = popupBackgroundColor,
+            popupTextColor = popupTextColor,
+            spaceBarColor = spaceBarColor,
+            dividerColor = dividerColor,
+            clipboardEntryColor = clipboardEntryColor,
+            genericActiveBackgroundColor = genericActiveBackgroundColor,
+            genericActiveForegroundColor = genericActiveForegroundColor
+        )
+    }
+}
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeManager.kt
index ef9ef45c0..93ba4d47f 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeManager.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeManager.kt
@@ -12,6 +12,7 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import org.fcitx.fcitx5.android.data.prefs.AppPrefs
 import org.fcitx.fcitx5.android.data.prefs.ManagedPreferenceProvider
+import org.fcitx.fcitx5.android.data.theme.ThemeManager.activeTheme
 import org.fcitx.fcitx5.android.utils.WeakHashSet
 import org.fcitx.fcitx5.android.utils.appContext
 import org.fcitx.fcitx5.android.utils.isDarkMode
@@ -36,12 +37,14 @@ object ThemeManager {
 
     val DefaultTheme = ThemePreset.PixelDark
 
+    private var monetThemes = listOf(ThemeMonet.getLight(), ThemeMonet.getDark())
+
     private val customThemes: MutableList<Theme.Custom> = ThemeFilesManager.listThemes()
 
     fun getTheme(name: String) =
         customThemes.find { it.name == name } ?: BuiltinThemes.find { it.name == name }
 
-    fun getAllThemes() = customThemes + BuiltinThemes
+    fun getAllThemes() = customThemes + monetThemes + BuiltinThemes
 
     fun refreshThemes() {
         customThemes.clear()
@@ -134,8 +137,11 @@ object ThemeManager {
         _activeTheme = evaluateActiveTheme()
     }
 
-    fun onSystemDarkModeChange(isDark: Boolean) {
-        isDarkMode = isDark
+    fun onSystemPlatteChange(newConfig: Configuration) {
+        isDarkMode = newConfig.isDarkMode()
+        monetThemes = listOf(ThemeMonet.getLight(), ThemeMonet.getDark())
+        // `ManagedThemePreference` finds a theme with same name in `getAllThemes()`
+        // thus `evaluateActiveTheme()` should be called after updating `monetThemes`
         activeTheme = evaluateActiveTheme()
     }
 
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeMonet.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeMonet.kt
new file mode 100644
index 000000000..ef9e32433
--- /dev/null
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeMonet.kt
@@ -0,0 +1,95 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-FileCopyrightText: Copyright 2025 Fcitx5 for Android Contributors
+ */
+package org.fcitx.fcitx5.android.data.theme
+
+import android.os.Build
+import org.fcitx.fcitx5.android.utils.appContext
+
+// Ref:
+// https://github.com/material-components/material-components-android/blob/master/docs/theming/Color.md
+// https://www.figma.com/community/file/809865700885504168/material-3-android-15
+// https://material-foundation.github.io/material-theme-builder/
+
+// FIXME: SDK < 34 can only have approximate color values, maybe we can implement our own color algorithm.
+// See: https://github.com/XayahSuSuSu/Android-DataBackup/blob/e8b087fb55519c659bebdc46c0217731fe80a0d7/source/core/ui/src/main/kotlin/com/xayah/core/ui/material3/DynamicTonalPalette.kt#L185
+
+object ThemeMonet {
+    fun getLight(): Theme.Monet =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) // Real Monet colors
+            Theme.Monet(
+                isDark = false,
+                surfaceContainer = appContext.getColor(android.R.color.system_surface_container_light),
+                surfaceContainerHigh = appContext.getColor(android.R.color.system_surface_container_highest_light),
+                surfaceBright = appContext.getColor(android.R.color.system_surface_bright_light),
+                onSurface = appContext.getColor(android.R.color.system_on_surface_light),
+                primary = appContext.getColor(android.R.color.system_primary_light),
+                onPrimary = appContext.getColor(android.R.color.system_on_primary_light),
+                secondaryContainer = appContext.getColor(android.R.color.system_secondary_container_light),
+                onSurfaceVariant = appContext.getColor(android.R.color.system_on_surface_variant_light)
+            )
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) // Approximate color values
+            Theme.Monet(
+                isDark = false,
+                surfaceContainer = appContext.getColor(android.R.color.system_neutral1_50), // neutral94
+                surfaceContainerHigh = appContext.getColor(android.R.color.system_neutral2_100), // neutral92
+                surfaceBright = appContext.getColor(android.R.color.system_neutral1_10), // neutral98
+                onSurface = appContext.getColor(android.R.color.system_neutral1_900),
+                primary = appContext.getColor(android.R.color.system_accent1_600),
+                onPrimary = appContext.getColor(android.R.color.system_accent1_0),
+                secondaryContainer = appContext.getColor(android.R.color.system_accent2_100),
+                onSurfaceVariant = appContext.getColor(android.R.color.system_accent2_700)
+            )
+        else // Static MD3 colors, based on #769CDF
+            Theme.Monet(
+                isDark = false,
+                surfaceContainer = 0xffededf4.toInt(),
+                surfaceContainerHigh = 0xffe7e8ee.toInt(),
+                surfaceBright = 0xfff9f9ff.toInt(),
+                onSurface = 0xff191c20.toInt(),
+                primary = 0xff415f91.toInt(),
+                onPrimary = 0xffffffff.toInt(),
+                secondaryContainer = 0xffdae2f9.toInt(),
+                onSurfaceVariant = 0xff44474e.toInt(),
+            )
+
+    fun getDark(): Theme.Monet =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) // Real Monet colors
+            Theme.Monet(
+                isDark = true,
+                surfaceContainer = appContext.getColor(android.R.color.system_surface_container_dark),
+                surfaceContainerHigh = appContext.getColor(android.R.color.system_surface_container_high_dark),
+                surfaceBright = appContext.getColor(android.R.color.system_surface_bright_dark),
+                onSurface = appContext.getColor(android.R.color.system_on_surface_dark),
+                primary = appContext.getColor(android.R.color.system_primary_dark),
+                onPrimary = appContext.getColor(android.R.color.system_on_primary_dark),
+                secondaryContainer = appContext.getColor(android.R.color.system_secondary_container_dark),
+                onSurfaceVariant = appContext.getColor(android.R.color.system_on_surface_variant_dark)
+            )
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) // Approximate color values
+            Theme.Monet(
+                isDark = true,
+                surfaceContainer = appContext.getColor(android.R.color.system_neutral1_900), // neutral12
+                surfaceContainerHigh = appContext.getColor(android.R.color.system_neutral2_1000), // neutral17
+                surfaceBright = appContext.getColor(android.R.color.system_neutral1_800), // neutral24
+                onSurface = appContext.getColor(android.R.color.system_neutral1_100),
+                primary = appContext.getColor(android.R.color.system_accent1_200),
+                onPrimary = appContext.getColor(android.R.color.system_accent1_800),
+                secondaryContainer = appContext.getColor(android.R.color.system_accent2_700),
+                onSurfaceVariant = appContext.getColor(android.R.color.system_accent2_200)
+            )
+        else // Static MD3 colors, based on #769CDF
+            Theme.Monet(
+                isDark = true,
+                surfaceContainer = 0xff1d2024.toInt(),
+                surfaceContainerHigh = 0xff282a2f.toInt(),
+                surfaceBright = 0xff37393e.toInt(),
+                onSurface = 0xffe2e2e9.toInt(),
+                primary = 0xffaac7ff.toInt(),
+                onPrimary = 0xff0a305f.toInt(),
+                secondaryContainer = 0xff3e4759.toInt(),
+                onSurfaceVariant = 0xffc4c6d0.toInt(),
+            )
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt
index 4817d44e5..a42ef8d52 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemePrefs.kt
@@ -87,6 +87,7 @@ class ThemePrefs(sharedPreferences: SharedPreferences) :
         int(R.string.clipboard_entry_radius, "clipboard_entry_radius", 2, 0, 48, "dp")
 
     enum class PunctuationPosition(override val stringRes: Int) : ManagedPreferenceEnum {
+        None(R.string.punctuation_pos_none),
         Bottom(R.string.punctuation_pos_bottom),
         TopRight(R.string.punctuation_pos_top_right);
     }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/CandidatesView.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/CandidatesView.kt
index f5d0eb290..c03eb61ff 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/CandidatesView.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/CandidatesView.kt
@@ -6,8 +6,10 @@
 package org.fcitx.fcitx5.android.input
 
 import android.annotation.SuppressLint
+import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.view.ViewGroup
+import android.view.ViewOutlineProvider
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.view.ViewTreeObserver.OnPreDrawListener
 import android.view.WindowInsets
@@ -22,7 +24,6 @@ import org.fcitx.fcitx5.android.data.theme.Theme
 import org.fcitx.fcitx5.android.input.candidates.floating.PagedCandidatesUi
 import org.fcitx.fcitx5.android.input.preedit.PreeditUi
 import splitties.dimensions.dp
-import splitties.views.backgroundColor
 import splitties.views.dsl.constraintlayout.below
 import splitties.views.dsl.constraintlayout.bottomOfParent
 import splitties.views.dsl.constraintlayout.centerHorizontally
@@ -49,6 +50,7 @@ class CandidatesView(
     private val orientation by candidatesPrefs.orientation
     private val windowMinWidth by candidatesPrefs.windowMinWidth
     private val windowPadding by candidatesPrefs.windowPadding
+    private val windowRadius by candidatesPrefs.windowRadius
     private val fontSize by candidatesPrefs.fontSize
     private val itemPaddingVertical by candidatesPrefs.itemPaddingVertical
     private val itemPaddingHorizontal by candidatesPrefs.itemPaddingHorizontal
@@ -95,7 +97,8 @@ class CandidatesView(
 
     private val preeditUi = PreeditUi(ctx, theme, setupTextView)
 
-    private val candidatesUi = PagedCandidatesUi(ctx, theme, setupTextView,
+    private val candidatesUi = PagedCandidatesUi(
+        ctx, theme, setupTextView,
         onCandidateClick = { index -> fcitx.launchOnReady { it.select(index) } },
         onPrevPage = { fcitx.launchOnReady { it.offsetCandidatePage(-1) } },
         onNextPage = { fcitx.launchOnReady { it.offsetCandidatePage(1) } }
@@ -160,8 +163,13 @@ class CandidatesView(
         } else {
             if (horizontal + selfWidth > parentWidth) parentWidth - selfWidth else horizontal
         }
-        val tY: Float =
-            if (bottom + selfHeight > parentHeight - bottomInsets) top - selfHeight else bottom
+        val bottomLimit = parentHeight - bottomInsets
+        val bottomSpace = bottomLimit - bottom
+        // move CandidatesView above cursor anchor, only when
+        val tY: Float = if (
+            bottom + selfHeight > bottomLimit   // bottom space is not enough
+            && top > bottomSpace                // top space is larger than bottom
+        ) top - selfHeight else bottom
         translationX = tX
         translationY = tY
         // update touchEventReceiverWindow's position after CandidatesView's
@@ -186,7 +194,13 @@ class CandidatesView(
 
         minWidth = dp(windowMinWidth)
         padding = dp(windowPadding)
-        backgroundColor = theme.backgroundColor
+        background = GradientDrawable().apply {
+            setColor(theme.backgroundColor)
+            shape = GradientDrawable.RECTANGLE
+            cornerRadius = dp(windowRadius).toFloat()
+        }
+        clipToOutline = true
+        outlineProvider = ViewOutlineProvider.BACKGROUND
         add(preeditUi.root, lParams(wrapContent, wrapContent) {
             topOfParent()
             startOfParent()
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt
index 0ddcec215..b417f5a64 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt
@@ -6,7 +6,6 @@
 package org.fcitx.fcitx5.android.input
 
 import android.annotation.SuppressLint
-import android.annotation.TargetApi
 import android.app.Dialog
 import android.content.res.ColorStateList
 import android.content.res.Configuration
@@ -540,9 +539,14 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
         // try send charCode first, allow upper case and lower case character generating different KeySym
         // skip \t, because it's charCode is different from KeySym
         // skip \n, because fcitx wants \r for return
-        if (charCode > 0 && charCode != '\t'.code && charCode != '\n'.code) {
+        // skip ' ', because it would produce same KeySym regardless of the modifier
+        if (charCode > 0 && charCode != '\t'.code && charCode != '\n'.code && charCode != ' '.code) {
+            // drop modifier state when using combination keys to input number/symbol on some phones
+            // because fcitx doesn't recognize selection key with modifiers (eg. Alt+Q for 1)
+            // in which case event.getNumber().toInt() == event.getUnicodeChar()
+            val s = if (event.number.code == charCode) KeyStates.Empty else states
             postFcitxJob {
-                sendKey(charCode, states.states, event.scanCode, up, timestamp)
+                sendKey(charCode, s.states, event.scanCode, up, timestamp)
             }
             return true
         }
@@ -581,7 +585,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
         }
     }
 
-    @TargetApi(34)
+    @RequiresApi(34)
     override fun onUpdateEditorToolType(toolType: Int) {
         super.onUpdateEditorToolType(toolType)
         inputDeviceMgr.evaluateOnUpdateEditorToolType(toolType, this)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/InputDeviceManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/InputDeviceManager.kt
index ac5fe1dd1..656f40dfd 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/InputDeviceManager.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/InputDeviceManager.kt
@@ -92,8 +92,8 @@ class InputDeviceManager(private val onChange: (Boolean) -> Unit) {
      */
     fun evaluateOnKeyDown(e: KeyEvent, service: FcitxInputMethodService): Boolean {
         if (startedInputView) {
-            // filter out back/home/volume buttons
-            if (e.isPrintingKey) {
+            // filter out back/home/volume buttons and combination keys
+            if (e.isPrintingKey && e.hasNoModifiers()) {
                 // evaluate virtual keyboard visibility when pressing physical keyboard while InputView visible
                 evaluateOnKeyDownInner(service)
             }
@@ -102,7 +102,7 @@ class InputDeviceManager(private val onChange: (Boolean) -> Unit) {
         } else {
             // force show InputView when focusing on text input (likely inputType is not TYPE_NULL)
             // and pressing any digit/letter/punctuation key on physical keyboard
-            val showInputView = !isNullInputType && e.isPrintingKey
+            val showInputView = !isNullInputType && e.isPrintingKey && e.hasNoModifiers()
             if (showInputView) {
                 evaluateOnKeyDownInner(service)
             }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/NavigationBarManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/NavigationBarManager.kt
index 691b89d53..6361670be 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/NavigationBarManager.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/NavigationBarManager.kt
@@ -97,10 +97,7 @@ class NavigationBarManager {
         }
         if (shouldUpdateNavbarBackground) {
             window.setNavbarBackgroundColor(
-                when (theme) {
-                    is Theme.Builtin -> if (keyBorder) theme.backgroundColor else theme.keyboardColor
-                    is Theme.Custom -> theme.backgroundColor
-                }
+                if (!keyBorder && theme is Theme.Builtin) theme.keyboardColor else theme.backgroundColor
             )
         }
     }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/candidates/floating/PagedCandidatesUi.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/candidates/floating/PagedCandidatesUi.kt
index 6fe623387..f0684d18b 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/candidates/floating/PagedCandidatesUi.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/candidates/floating/PagedCandidatesUi.kt
@@ -9,6 +9,8 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.TextView
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
@@ -50,10 +52,6 @@ class PagedCandidatesUi(
             return when (viewType) {
                 0 -> UiHolder.Candidate(LabeledCandidateItemUi(ctx, theme, setupTextView))
                 else -> UiHolder.Pagination(PaginationUi(ctx, theme)).apply {
-                    val wrap = ViewGroup.LayoutParams.WRAP_CONTENT
-                    ui.root.layoutParams = FlexboxLayoutManager.LayoutParams(wrap, wrap).apply {
-                        flexGrow = 1f
-                    }
                     ui.prevIcon.setOnClickListener {
                         onPrevPage.invoke()
                     }
@@ -61,6 +59,9 @@ class PagedCandidatesUi(
                         onNextPage.invoke()
                     }
                 }
+            }.apply {
+                // assign default LayoutParams, otherwise updateLayoutParams won't work
+                ui.root.layoutParams = FlexboxLayoutManager.LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
             }
         }
 
@@ -72,11 +73,15 @@ class PagedCandidatesUi(
                     holder.ui.root.setOnClickListener {
                         onCandidateClick.invoke(position)
                     }
+                    holder.ui.root.updateLayoutParams<FlexboxLayoutManager.LayoutParams> {
+                        width = if (isVertical) MATCH_PARENT else WRAP_CONTENT
+                    }
                 }
                 is UiHolder.Pagination -> {
                     holder.ui.update(data)
                     holder.ui.root.updateLayoutParams<FlexboxLayoutManager.LayoutParams> {
-                        width = if (isVertical) ViewGroup.LayoutParams.MATCH_PARENT else ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexGrow = 1f
+                        width = if (isVertical) MATCH_PARENT else WRAP_CONTENT
                         alignSelf = if (isVertical) AlignItems.STRETCH else AlignItems.CENTER
                     }
                 }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardAdapter.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardAdapter.kt
index acce63b68..bd7c7fa3e 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardAdapter.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardAdapter.kt
@@ -111,6 +111,9 @@ abstract class ClipboardAdapter(
                 menu.item(R.string.edit, R.drawable.ic_baseline_edit_24, iconTint) {
                     onEdit(entry.id)
                 }
+                menu.item(R.string.share, R.drawable.ic_baseline_share_24, iconTint) {
+                    onShare(entry)
+                }
                 menu.item(R.string.delete, R.drawable.ic_baseline_delete_24, iconTint) {
                     onDelete(entry.id)
                 }
@@ -143,6 +146,8 @@ abstract class ClipboardAdapter(
 
     abstract fun onEdit(id: Int)
 
+    abstract fun onShare(entry: ClipboardEntry)
+
     abstract fun onDelete(id: Int)
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardWindow.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardWindow.kt
index 9dd164040..6b6fac783 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardWindow.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardWindow.kt
@@ -5,6 +5,7 @@
 package org.fcitx.fcitx5.android.input.clipboard
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -103,6 +104,17 @@ class ClipboardWindow : InputWindow.ExtendedInputWindow<ClipboardWindow>() {
                 AppUtil.launchClipboardEdit(context, id)
             }
 
+            override fun onShare(entry: ClipboardEntry) {
+                val target = Intent(Intent.ACTION_SEND).apply {
+                    type = "text/plain"
+                    putExtra(Intent.EXTRA_TEXT, entry.text)
+                }
+                val chooser = Intent.createChooser(target, null).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+                service.startActivity(chooser)
+            }
+
             override fun onDelete(id: Int) {
                 service.lifecycleScope.launch {
                     ClipboardManager.delete(id)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt
index 382d27209..2252d7459 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyView.kt
@@ -298,6 +298,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
             topToTop = parentId
             bottomToBottom = parentId
         }
+        altText.visibility = View.VISIBLE
         altText.updateLayoutParams<ConstraintLayout.LayoutParams> {
             // reset
             bottomToBottom = unset; bottomMargin = 0
@@ -316,6 +317,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
             topToTop = parentId; topMargin = vMargin
             bottomToTop = altText.existingOrNewId
         }
+        altText.visibility = View.VISIBLE
         altText.updateLayoutParams<ConstraintLayout.LayoutParams> {
             // reset
             topToTop = unset; topMargin = 0
@@ -327,6 +329,18 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
         }
     }
 
+    private fun applyNoAltTextPosition() {
+        mainText.updateLayoutParams<ConstraintLayout.LayoutParams> {
+            // reset
+            topMargin = 0
+            bottomToTop = unset
+            // set
+            topToTop = parentId
+            bottomToBottom = parentId
+        }
+        altText.visibility = View.GONE
+    }
+
     private fun applyLayout(orientation: Int) {
         when (ThemeManager.prefs.punctuationPosition.getValue()) {
             PunctuationPosition.Bottom -> when (orientation) {
@@ -334,6 +348,7 @@ class AltTextKeyView(ctx: Context, theme: Theme, def: KeyDef.Appearance.AltText)
                 else -> applyBottomAltTextPosition()
             }
             PunctuationPosition.TopRight -> applyTopRightAltTextPosition()
+            PunctuationPosition.None -> applyNoAltTextPosition()
         }
     }
 
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerData.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerData.kt
index d23b9b7d0..67545fe64 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerData.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerData.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.input.picker
 
@@ -8,7 +8,7 @@ import org.fcitx.fcitx5.android.R
 
 object PickerData {
 
-    class Category(val label: String = "", val icon: Int = 0)
+    data class Category(val label: String = "", val icon: Int = 0)
 
     val RecentlyUsedCategory = Category("⟳", R.drawable.ic_baseline_access_time_24)
 
@@ -97,19 +97,19 @@ object PickerData {
             "😀", "😃", "😄", "😁", "😆", "😅", "🤣", "😂", "🙂", "🙃", "🫠", "😉", "😊",
             "😇", "🥰", "😍", "🤩", "😘", "😗", "☺️", "😚", "😙", "🥲", "😋", "😛", "😜",
             "🤪", "😝", "🤑", "🤗", "🤭", "🫢", "🫣", "🤫", "🤔", "🫡", "🤐", "🤨", "😐",
-            "😑", "😶", "🫥", "😶‍🌫️", "😏", "😒", "🙄", "😬", "😮‍💨", "🤥", "😌", "😔", "😪",
-            "🤤", "😴", "😷", "🤒", "🤕", "🤢", "🤮", "🤧", "🥵", "🥶", "🥴", "😵", "😵‍💫",
+            "😑", "😶", "🫥", "😶‍🌫️", "😏", "😒", "🙄", "😬", "😮‍💨", "🤥", "😌", "😔", "🙂‍↕️", "🙂‍↔️", "😪",
+            "🤤", "😴", "😷", "🤒", "🤕", "🤢", "🤮", "🤧", "🥵", "🥶", "🥴", "😵", "😵‍💫", "🫨", "🫩",
             "🤯", "🤠", "🥳", "🥸", "😎", "🤓", "🧐", "😕", "🫤", "😟", "🙁", "☹️", "😮",
             "😯", "😲", "😳", "🥺", "🥹", "😦", "😧", "😨", "😰", "😥", "😢", "😭", "😱",
             "😖", "😣", "😞", "😓", "😩", "😫", "🥱", "😤", "😡", "😠", "🤬", "😈", "👿",
             "💀", "☠️", "💩", "🤡", "👹", "👺", "👻", "👽", "👾", "🤖", "😺", "😸", "😹",
             "😻", "😼", "😽", "🙀", "😿", "😾", "🙈", "🙉", "🙊", "💋", "💌", "💘", "💝",
             "💖", "💗", "💓", "💞", "💕", "💟", "❣️", "💔", "❤️‍🔥", "❤️‍🩹", "❤️", "🧡", "💛",
-            "💚", "💙", "💜", "🤎", "🖤", "🤍", "💯", "💢", "💥", "💫", "💦", "💨", "🕳️",
+            "💚", "💙", "💜", "🤎", "🖤", "🤍", "🩷", "🩵", "🩶", "💯", "💢", "💥", "💫", "💦", "💨", "🕳️",
             "💣", "💬", "👁️‍🗨️", "🗨️", "🗯️", "💭", "💤",
         ),
         Category("🧑", R.drawable.ic_baseline_emoji_people_24) to arrayOf(
-            "👋", "🤚", "🖐️", "✋", "🖖", "🫱", "🫲", "🫳", "🫴", "👌", "🤌", "🤏", "✌️",
+            "👋", "🤚", "🖐️", "✋", "🖖", "🫱", "🫲", "🫸", "🫷", "🫳", "🫴", "👌", "🤌", "🤏", "✌️",
             "🤞", "🫰", "🤟", "🤘", "🤙", "👈", "👉", "👆", "🖕", "👇", "☝️", "🫵", "👍",
             "👎", "✊", "👊", "🤛", "🤜", "👏", "🙌", "🫶", "👐", "🤲", "🤝", "🙏", "✍️",
             "💅", "🤳", "💪", "🦾", "🦿", "🦵", "🦶", "👂", "🦻", "👃", "🧠", "🫀", "🫁",
@@ -127,8 +127,8 @@ object PickerData {
             "🤱", "👩‍🍼", "👨‍🍼", "🧑‍🍼", "👼", "🎅", "🤶", "🧑‍🎄", "🦸", "🦸‍♂️", "🦸‍♀️", "🦹", "🦹‍♂️",
             "🦹‍♀️", "🧙", "🧙‍♂️", "🧙‍♀️", "🧚", "🧚‍♂️", "🧚‍♀️", "🧛", "🧛‍♂️", "🧛‍♀️", "🧜", "🧜‍♂️", "🧜‍♀️",
             "🧝", "🧝‍♂️", "🧝‍♀️", "🧞", "🧞‍♂️", "🧞‍♀️", "🧟", "🧟‍♂️", "🧟‍♀️", "🧌", "💆", "💆‍♂️", "💆‍♀️",
-            "💇", "💇‍♂️", "💇‍♀️", "🚶", "🚶‍♂️", "🚶‍♀️", "🧍", "🧍‍♂️", "🧍‍♀️", "🧎", "🧎‍♂️", "🧎‍♀️", "🧑‍🦯",
-            "👨‍🦯", "👩‍🦯", "🧑‍🦼", "👨‍🦼", "👩‍🦼", "🧑‍🦽", "👨‍🦽", "👩‍🦽", "🏃", "🏃‍♂️", "🏃‍♀️", "💃", "🕺",
+            "💇", "💇‍♂️", "💇‍♀️", "🚶", "🚶‍♂️", "🚶‍♀️", "🚶‍➡️", "🚶‍♀️‍➡️", "🚶‍♂️‍➡️", "🧍", "🧍‍♂️", "🧍‍♀️", "🧎", "🧎‍♂️", "🧎‍♀️", "🧎‍➡️", "🧎‍♀️‍➡️", "🧎‍♂️‍➡️", "🧑‍🦯",
+            "👨‍🦯", "👩‍🦯", "🧑‍🦯‍➡️", "👨‍🦯‍➡️", "👩‍🦯‍➡️", "🧑‍🦽", "👨‍🦽", "👩‍🦽", "🧑‍🦽‍➡️", "👨‍🦽‍➡️", "👩‍🦽‍➡️", "🧑‍🦼", "👨‍🦼", "👩‍🦼", "🧑‍🦼‍➡️", "👨‍🦼‍➡️", "👩‍🦼‍➡️", "🏃", "🏃‍♂️", "🏃‍♀️", "🏃‍➡️", "🏃‍♂️‍➡️", "🏃‍♀️‍➡️", "💃", "🕺",
             "🕴️", "👯", "👯‍♂️", "👯‍♀️", "🧖", "🧖‍♂️", "🧖‍♀️", "🧗", "🧗‍♂️", "🧗‍♀️", "🤺", "🏇", "⛷️",
             "🏂", "🏌️", "🏌️‍♂️", "🏌️‍♀️", "🏄", "🏄‍♂️", "🏄‍♀️", "🚣", "🚣‍♂️", "🚣‍♀️", "🏊", "🏊‍♂️", "🏊‍♀️",
             "⛹️", "⛹️‍♂️", "⛹️‍♀️", "🏋️", "🏋️‍♂️", "🏋️‍♀️", "🚴", "🚴‍♂️", "🚴‍♀️", "🚵", "🚵‍♂️", "🚵‍♀️", "🤸",
@@ -136,26 +136,26 @@ object PickerData {
             "🤹‍♀️", "🧘", "🧘‍♂️", "🧘‍♀️", "🛀", "🛌", "🧑‍🤝‍🧑", "👭", "👫", "👬", "💏", "👩‍❤️‍💋‍👨", "👨‍❤️‍💋‍👨",
             "👩‍❤️‍💋‍👩", "💑", "👩‍❤️‍👨", "👨‍❤️‍👨", "👩‍❤️‍👩", "👪", "👨‍👩‍👦", "👨‍👩‍👧", "👨‍👩‍👧‍👦", "👨‍👩‍👦‍👦", "👨‍👩‍👧‍👧", "👨‍👨‍👦", "👨‍👨‍👧",
             "👨‍👨‍👧‍👦", "👨‍👨‍👦‍👦", "👨‍👨‍👧‍👧", "👩‍👩‍👦", "👩‍👩‍👧", "👩‍👩‍👧‍👦", "👩‍👩‍👦‍👦", "👩‍👩‍👧‍👧", "👨‍👦", "👨‍👦‍👦", "👨‍👧", "👨‍👧‍👦", "👨‍👧‍👧",
-            "👩‍👦", "👩‍👦‍👦", "👩‍👧", "👩‍👧‍👦", "👩‍👧‍👧", "🗣️", "👤", "👥", "🫂", "👣"
+            "👩‍👦", "👩‍👦‍👦", "👩‍👧", "👩‍👧‍👦", "👩‍👧‍👧", "🧑‍🧑‍🧒", "🧑‍🧑‍🧒‍🧒", "🧑‍🧒", "🧑‍🧒‍🧒", "🗣️", "👤", "👥", "🫂", "👣"
         ),
         Category("🌸", R.drawable.ic_baseline_flower_24) to arrayOf(
             "🐵", "🐒", "🦍", "🦧", "🐶", "🐕", "🦮", "🐕‍🦺", "🐩", "🐺", "🦊", "🦝", "🐱",
             "🐈", "🐈‍⬛", "🦁", "🐯", "🐅", "🐆", "🐴", "🐎", "🦄", "🦓", "🦌", "🦬", "🐮",
             "🐂", "🐃", "🐄", "🐷", "🐖", "🐗", "🐽", "🐏", "🐑", "🐐", "🐪", "🐫", "🦙",
             "🦒", "🐘", "🦣", "🦏", "🦛", "🐭", "🐁", "🐀", "🐹", "🐰", "🐇", "🐿️", "🦫",
-            "🦔", "🦇", "🐻", "🐻‍❄️", "🐨", "🐼", "🦥", "🦦", "🦨", "🦘", "🦡", "🐾", "🦃",
-            "🐔", "🐓", "🐣", "🐤", "🐥", "🐦", "🐧", "🕊️", "🦅", "🦆", "🦢", "🦉", "🦤",
-            "🪶", "🦩", "🦚", "🦜", "🐸", "🐊", "🐢", "🦎", "🐍", "🐲", "🐉", "🦕", "🦖",
-            "🐳", "🐋", "🐬", "🦭", "🐟", "🐠", "🐡", "🦈", "🐙", "🐚", "🪸", "🐌", "🦋",
+            "🦔", "🦇", "🐻", "🐻‍❄️", "🐨", "🐼", "🫎", "🫏", "🦥", "🦦", "🦨", "🦘", "🦡", "🐾", "🦃",
+            "🐔", "🐓", "🐣", "🐤", "🐥", "🐦", "🐦‍⬛", "🐧", "🕊️", "🦅", "🦆", "🦢", "🦉", "🦤", "🪿",
+            "🪽", "🪶", "🦩", "🦚", "🐦‍🔥", "🦜", "🐸", "🐊", "🐢", "🦎", "🐍", "🐲", "🐉", "🦕", "🦖",
+            "🐳", "🐋", "🐬", "🦭", "🐟", "🐠", "🐡", "🦈", "🐙", "🪼", "🐚", "🪸", "🐌", "🦋",
             "🐛", "🐜", "🐝", "🪲", "🐞", "🦗", "🪳", "🕷️", "🕸️", "🦂", "🦟", "🪰", "🪱",
-            "🦠", "💐", "🌸", "💮", "🪷", "🏵️", "🌹", "🥀", "🌺", "🌻", "🌼", "🌷", "🌱",
-            "🪴", "🌲", "🌳", "🌴", "🌵", "🌾", "🌿", "☘️", "🍀", "🍁", "🍂", "🍃", "🪹",
+            "🦠", "💐", "🌸", "💮", "🪷", "🏵️", "🌹", "🥀", "🌺", "🌻", "🌼", "🌷", "🪻", "🌱",
+            "🪴", "🌲", "🌳", "🌴", "🪾", "🌵", "🌾", "🌿", "☘️", "🍀", "🍁", "🍂", "🍃", "🪹",
             "🪺"
         ),
         Category("🎂", R.drawable.ic_baseline_cake_24) to arrayOf(
-            "🍇", "🍈", "🍉", "🍊", "🍋", "🍌", "🍍", "🥭", "🍎", "🍏", "🍐", "🍑", "🍒",
-            "🍓", "🫐", "🥝", "🍅", "🫒", "🥥", "🥑", "🍆", "🥔", "🥕", "🌽", "🌶️", "🫑",
-            "🥒", "🥬", "🥦", "🧄", "🧅", "🍄", "🥜", "🫘", "🌰", "🍞", "🥐", "🥖", "🫓",
+            "🍇", "🍈", "🍉", "🍊", "🍋", "🍋‍🟩", "🍌", "🍍", "🥭", "🍎", "🍏", "🍐", "🍑", "🍒",
+            "🍓", "🫐", "🥝", "🍅", "🫒", "🥥", "🥑", "🍆", "🥔", "🥕", "🌽", "🌶️", "🫑", "🫛",
+            "🥒", "🥬", "🥦", "🧄", "🧅", "🫚", "🫜", "🍄", "🍄‍🟫", "🥜", "🫘", "🌰", "🍞", "🥐", "🥖", "🫓",
             "🥨", "🥯", "🥞", "🧇", "🧀", "🍖", "🍗", "🥩", "🥓", "🍔", "🍟", "🍕", "🌭",
             "🥪", "🌮", "🌯", "🫔", "🥙", "🧆", "🥚", "🍳", "🥘", "🍲", "🫕", "🥣", "🥗",
             "🍿", "🧈", "🧂", "🥫", "🍱", "🍘", "🍙", "🍚", "🍛", "🍜", "🍝", "🍠", "🍢",
@@ -197,9 +197,9 @@ object PickerData {
             "👓", "🕶️", "🥽", "🥼", "🦺", "👔", "👕", "👖", "🧣", "🧤", "🧥", "🧦", "👗",
             "👘", "🥻", "🩱", "🩲", "🩳", "👙", "👚", "👛", "👜", "👝", "🛍️", "🎒", "🩴",
             "👞", "👟", "🥾", "🥿", "👠", "👡", "🩰", "👢", "👑", "👒", "🎩", "🎓", "🧢",
-            "🪖", "⛑️", "📿", "💄", "💍", "💎", "🔇", "🔈", "🔉", "🔊", "📢", "📣", "📯",
+            "🪖", "⛑️", "📿", "💄", "🪭", "💍", "💎", "🔇", "🔈", "🔉", "🔊", "📢", "📣", "📯",
             "🔔", "🔕", "🎼", "🎵", "🎶", "🎙️", "🎚️", "🎛️", "🎤", "🎧", "📻", "🎷", "🪗",
-            "🎸", "🎹", "🎺", "🎻", "🪕", "🥁", "🪘", "📱", "📲", "☎️", "📞", "📟", "📠",
+            "🎸", "🎹", "🎺", "🎻", "🪕", "🪉", "🥁", "🪘", "🪇", "🪈", "📱", "📲", "☎️", "📞", "📟", "📠",
             "🔋", "🪫", "🔌", "💻", "🖥️", "🖨️", "⌨️", "🖱️", "🖲️", "💽", "💾", "💿", "📀",
             "🧮", "🎥", "🎞️", "📽️", "🎬", "📺", "📷", "📸", "📹", "📼", "🔍", "🔎", "🕯️",
             "💡", "🔦", "🏮", "🪔", "📔", "📕", "📖", "📗", "📘", "📙", "📚", "📓", "📒",
@@ -209,10 +209,10 @@ object PickerData {
             "📁", "📂", "🗂️", "📅", "📆", "🗒️", "🗓️", "📇", "📈", "📉", "📊", "📋", "📌",
             "📍", "📎", "🖇️", "📏", "📐", "✂️", "🗃️", "🗄️", "🗑️", "🔒", "🔓", "🔏", "🔐",
             "🔑", "🗝️", "🔨", "🪓", "⛏️", "⚒️", "🛠️", "🗡️", "⚔️", "🔫", "🪃", "🏹", "🛡️",
-            "🪚", "🔧", "🪛", "🔩", "⚙️", "🗜️", "⚖️", "🦯", "🔗", "⛓️", "🪝", "🧰", "🧲",
+            "🪚", "🔧", "🪛", "🔩", "⚙️", "🗜️", "⚖️", "🦯", "🔗", "⛓️", "⛓️‍💥", "🪝", "🧰", "🧲",
             "🪜", "⚗️", "🧪", "🧫", "🧬", "🔬", "🔭", "📡", "💉", "🩸", "💊", "🩹", "🩼",
             "🩺", "🩻", "🚪", "🛗", "🪞", "🪟", "🛏️", "🛋️", "🪑", "🚽", "🪠", "🚿", "🛁",
-            "🪤", "🪒", "🧴", "🧷", "🧹", "🧺", "🧻", "🪣", "🧼", "🫧", "🪥", "🧽", "🧯",
+            "🪤", "🪒", "🧴", "🧷", "🧹", "🪏", "🧺", "🧻", "🪣", "🧼", "🫧", "🫟", "🪥", "🪮", "🧽", "🧯",
             "🛒", "🚬", "⚰️", "🪦", "⚱️", "🗿", "🪧", "🪪"
         ),
         Category("🔣", R.drawable.ic_baseline_emoji_symbols_24) to arrayOf(
@@ -220,10 +220,10 @@ object PickerData {
             "⚠️", "🚸", "⛔", "🚫", "🚳", "🚭", "🚯", "🚱", "🚷", "📵", "🔞", "☢️", "☣️",
             "⬆️", "↗️", "➡️", "↘️", "⬇️", "↙️", "⬅️", "↖️", "↕️", "↔️", "↩️", "↪️", "⤴️", "⤵️",
             "🔃", "🔄", "🔙", "🔚", "🔛", "🔜", "🔝", "🛐", "⚛️", "🕉️", "✡️", "☸️", "☯️",
-            "✝️", "☦️", "☪️", "☮️", "🕎", "🔯", "♈", "♉", "♊", "♋", "♌", "♍", "♎",
+            "✝️", "☦️", "☪️", "☮️", "🕎", "🪯", "🔯", "♈", "♉", "♊", "♋", "♌", "♍", "♎",
             "♏", "♐", "♑", "♒", "♓", "⛎", "🔀", "🔁", "🔂", "▶️", "⏩", "⏭️", "⏯️",
             "◀️", "⏪", "⏮️", "🔼", "⏫", "🔽", "⏬", "⏸️", "⏹️", "⏺️", "⏏️", "🎦", "🔅",
-            "🔆", "📶", "📳", "📴", "♀️", "♂️", "⚧️", "✖️", "➕", "➖", "➗", "🟰", "♾️",
+            "🔆", "📶", "📳", "📴", "🛜", "🫆", "♀️", "♂️", "⚧️", "✖️", "➕", "➖", "➗", "🟰", "♾️",
             "‼️", "⁉️", "❓", "❔", "❕", "❗", "〰️", "💱", "💲", "⚕️", "♻️", "⚜️", "🔱",
             "📛", "🔰", "⭕", "✅", "☑️", "✔️", "❌", "❎", "➰", "➿", "〽️", "✳️", "✴️",
             "❇️", "©️", "®️", "™️", "#️⃣", "*️⃣", "0️⃣", "1️⃣", "2️⃣", "3️⃣", "4️⃣", "5️⃣", "6️⃣",
@@ -239,7 +239,7 @@ object PickerData {
             "🇦🇮", "🇦🇱", "🇦🇲", "🇦🇴", "🇦🇶", "🇦🇷", "🇦🇸", "🇦🇹", "🇦🇺", "🇦🇼", "🇦🇽", "🇦🇿", "🇧🇦",
             "🇧🇧", "🇧🇩", "🇧🇪", "🇧🇫", "🇧🇬", "🇧🇭", "🇧🇮", "🇧🇯", "🇧🇱", "🇧🇲", "🇧🇳", "🇧🇴", "🇧🇶",
             "🇧🇷", "🇧🇸", "🇧🇹", "🇧🇻", "🇧🇼", "🇧🇾", "🇧🇿", "🇨🇦", "🇨🇨", "🇨🇩", "🇨🇫", "🇨🇬", "🇨🇭",
-            "🇨🇮", "🇨🇰", "🇨🇱", "🇨🇲", "🇨🇳", "🇨🇴", "🇨🇵", "🇨🇷", "🇨🇺", "🇨🇻", "🇨🇼", "🇨🇽", "🇨🇾",
+            "🇨🇮", "🇨🇰", "🇨🇱", "🇨🇲", "🇨🇳", "🇨🇴", "🇨🇵", "🇨🇶", "🇨🇷", "🇨🇺", "🇨🇻", "🇨🇼", "🇨🇽", "🇨🇾",
             "🇨🇿", "🇩🇪", "🇩🇬", "🇩🇯", "🇩🇰", "🇩🇲", "🇩🇴", "🇩🇿", "🇪🇦", "🇪🇨", "🇪🇪", "🇪🇬", "🇪🇭",
             "🇪🇷", "🇪🇸", "🇪🇹", "🇪🇺", "🇫🇮", "🇫🇯", "🇫🇰", "🇫🇲", "🇫🇴", "🇫🇷", "🇬🇦", "🇬🇧", "🇬🇩",
             "🇬🇪", "🇬🇫", "🇬🇬", "🇬🇭", "🇬🇮", "🇬🇱", "🇬🇲", "🇬🇳", "🇬🇵", "🇬🇶", "🇬🇷", "🇬🇸", "🇬🇹",
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt
index 8d82c6c33..d36086d97 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPageUi.kt
@@ -4,7 +4,6 @@
  */
 package org.fcitx.fcitx5.android.input.picker
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
@@ -30,6 +29,7 @@ import org.fcitx.fcitx5.android.input.keyboard.KeyDef.Appearance.Border
 import org.fcitx.fcitx5.android.input.keyboard.KeyDef.Appearance.Variant
 import org.fcitx.fcitx5.android.input.keyboard.KeyView
 import org.fcitx.fcitx5.android.input.keyboard.TextKeyView
+import org.fcitx.fcitx5.android.input.popup.EmojiModifier
 import org.fcitx.fcitx5.android.input.popup.PopupAction
 import org.fcitx.fcitx5.android.input.popup.PopupActionListener
 import splitties.views.dsl.constraintlayout.below
@@ -179,12 +179,11 @@ class PickerPageUi(
         keyActionListener?.onKeyAction(CommitAction(str), Source.Keyboard)
     }
 
-    fun setItems(items: Array<String>) {
+    fun setItems(items: List<String>, withSkinTone: Boolean = false) {
         keyViews.forEachIndexed { i, keyView ->
             keyView.apply {
                 if (i >= items.size) {
                     isEnabled = false
-                    @SuppressLint("SetTextI18n")
                     mainText.text = ""
                     setOnClickListener(null)
                     setOnLongClickListener(null)
@@ -192,10 +191,12 @@ class PickerPageUi(
                     onGestureListener = null
                 } else {
                     isEnabled = true
-                    val text = items[i]
-                    mainText.text = text
+                    val label = items[i]
+                    val commitString =
+                        if (withSkinTone) EmojiModifier.getPreferredTone(label) else label
+                    mainText.text = commitString
                     setOnClickListener {
-                        onSymbolClick(text)
+                        onSymbolClick(commitString)
                     }
                     setOnLongClickListener { view ->
                         view as KeyView
@@ -208,7 +209,7 @@ class PickerPageUi(
                         onPopupAction(
                             PopupAction.ShowKeyboardAction(
                                 view.id,
-                                KeyDef.Popup.Keyboard(text),
+                                KeyDef.Popup.Keyboard(label),
                                 bounds
                             )
                         )
@@ -226,7 +227,7 @@ class PickerPageUi(
                                     // so update bounds when it's pressed
                                     view.updateBounds()
                                     onPopupAction(
-                                        PopupAction.PreviewAction(view.id, text, view.bounds)
+                                        PopupAction.PreviewAction(view.id, label, view.bounds)
                                     )
                                 }
                                 false
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt
index bde559fcf..13e9f40b7 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPagesAdapter.kt
@@ -4,6 +4,7 @@
  */
 package org.fcitx.fcitx5.android.input.picker
 
+import android.text.TextPaint
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.fcitx.fcitx5.android.data.RecentlyUsed
@@ -18,96 +19,56 @@ class PickerPagesAdapter(
     data: List<Pair<PickerData.Category, Array<String>>>,
     private val density: PickerPageUi.Density,
     recentlyUsedFileName: String,
-    private val bordered: Boolean = false
+    private val bordered: Boolean = false,
+    private val isEmoji: Boolean = false
 ) : RecyclerView.Adapter<PickerPagesAdapter.ViewHolder>() {
 
     class ViewHolder(val ui: PickerPageUi) : RecyclerView.ViewHolder(ui.root)
 
     /**
-     * calculated layout of data in the form of
-     * [(start page of the category, # of pages)]
-     * Note: unlike [ranges], [pages], and [categories],
-     * this does not include recently used category.
+     * list<`Category` to `[start, end]`>, starting with empty "RecentlyUsed" category
      */
-    private val cats: Array<Pair<Int, Int>>
-
-    private val ranges: List<IntRange>
-
-    private val pages: ArrayList<Array<String>>
+    private val categories: MutableList<Pair<PickerData.Category, IntRange>> = mutableListOf(
+        PickerData.RecentlyUsedCategory to IntRange(0, 0)
+    )
 
     /**
-     * INVARIANT: The recently used category only takes one page
-     * It does not interleave the layout calculation for data.
-     * See the note on [cats] for details
+     * list<page of symbols>, starting with empty "RecentlyUsed" page
      */
-    private val recentlyUsed = RecentlyUsed(recentlyUsedFileName, density.pageSize)
+    private val pages: MutableList<List<String>> = mutableListOf(listOf())
 
-    @Suppress("JoinDeclarationAndAssignment")
-    val categories: List<PickerData.Category>
+    fun getCategoryList(): List<PickerData.Category> {
+        return categories.map { it.first }
+    }
 
     init {
-        // Add recently used category
-        categories = listOf(PickerData.RecentlyUsedCategory) + data.map { it.first }
-        val concat = data.flatMap { it.second.toList() }
-        // shift the start page of each category in data by one
-        var start = 1
-        var p = 0
-        pages = ArrayList()
-        // Add a placeholder for the recently used page
-        // We will update it in [updateRecent]
-        pages.add(arrayOf())
-        cats = Array(data.size) { i ->
-            val v = data[i].second
-            val filled = v.size / density.pageSize
-            val rest = v.size % density.pageSize
-            val pageNum = filled + if (rest != 0) 1 else 0
-            for (j in start until start + filled) {
-                pages.add(j, (p until p + density.pageSize).map {
-                    concat[it]
-                }.toTypedArray())
-                p += density.pageSize
-            }
-            if (rest != 0) {
-                pages.add(start + pageNum - 1, (p until p + rest).map {
-                    concat[it]
-                }.toTypedArray())
-                p += rest
-            }
-            (start to pageNum).also { start += pageNum }
-        }
-        // Add recently used page
-        ranges = listOf(0..0) + cats.map { (start, pageNum) ->
-            start until start + pageNum
+        val textPaint = TextPaint()
+        data.forEach { (cat, arr) ->
+            val chunks = arr.filter { if (isEmoji) textPaint.hasGlyph(it) else true }
+                .chunked(density.pageSize)
+            categories.add(cat to IntRange(pages.size, pages.size + chunks.size - 1))
+            pages.addAll(chunks)
         }
-        recentlyUsed.load()
     }
 
+    private val recentlyUsed = RecentlyUsed(recentlyUsedFileName, density.pageSize)
+
     fun insertRecent(text: String) {
         if (text.length == 1 && text[0].code.let { it in Digit || it in FullWidthDigit }) return
         recentlyUsed.insert(text)
     }
 
-    private fun updateRecent() {
-        pages[0] = recentlyUsed.toOrderedList().toTypedArray()
+    fun getCategoryIndexOfPage(page: Int): Int {
+        return categories.indexOfFirst { page in it.second }
     }
 
-    fun saveRecent() {
-        recentlyUsed.save()
+    fun getCategoryRangeOfPage(page: Int): IntRange {
+        return categories.find { page in it.second }?.second ?: IntRange(0, 0)
     }
 
-    fun getCategoryOfPage(page: Int) =
-        ranges.indexOfFirst { page in it }
-
-    fun getCategoryRangeOfPage(page: Int) =
-        ranges.find { page in it } ?: (0..0)
-
-    fun getStartPageOfCategory(cat: Int) =
-        // Recently used category only has one page which must be the first page
-        if (cat == 0)
-            0
-        // Otherwise, we need offset it by one
-        else
-            cats[cat - 1].first
+    fun getRangeOfCategoryIndex(cat: Int): IntRange {
+        return categories[cat].second
+    }
 
     override fun getItemCount() = pages.size
 
@@ -116,7 +77,7 @@ class PickerPagesAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.ui.setItems(pages[position])
+        holder.ui.setItems(pages[position], isEmoji)
     }
 
     override fun onViewAttachedToWindow(holder: ViewHolder) {
@@ -124,9 +85,8 @@ class PickerPagesAdapter(
         if (holder.bindingAdapterPosition == 0) {
             // prevent popup on RecentlyUsed page
             holder.ui.popupActionListener = null
-            // update RecentlyUsed when it's page attached
-            updateRecent()
-            holder.ui.setItems(pages[0])
+            // RecentlyUsed content are already modified with skin tones
+            holder.ui.setItems(recentlyUsed.items, withSkinTone = false)
         } else {
             holder.ui.popupActionListener = popupActionListener
         }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerWindow.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerWindow.kt
index a7f5163a7..115e455be 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerWindow.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerWindow.kt
@@ -1,17 +1,17 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.input.picker
 
+import android.annotation.SuppressLint
 import android.view.Gravity
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
 import androidx.transition.Slide
 import androidx.transition.Transition
 import androidx.viewpager2.widget.ViewPager2
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import org.fcitx.fcitx5.android.data.prefs.AppPrefs
+import org.fcitx.fcitx5.android.data.prefs.ManagedPreference
 import org.fcitx.fcitx5.android.data.theme.ThemeManager
 import org.fcitx.fcitx5.android.input.broadcast.ReturnKeyDrawableComponent
 import org.fcitx.fcitx5.android.input.dependency.inputMethodService
@@ -121,26 +121,26 @@ class PickerWindow(
     override fun onCreateView() = PickerLayout(context, theme, switchKey).apply {
         pickerLayout = this
         val bordered = followKeyBorder && keyBorder
+        val isEmoji = key === Key.Emoji
         pickerPagesAdapter = PickerPagesAdapter(
-            theme, keyActionListener, popupActionListener, data, density, key.name, bordered
+            theme, keyActionListener, popupActionListener, data,
+            density, key.name, bordered, isEmoji
         )
         tabsUi.apply {
-            setTabs(pickerPagesAdapter.categories)
+            setTabs(pickerPagesAdapter.getCategoryList())
             setOnTabClickListener { i ->
-                pager.setCurrentItem(pickerPagesAdapter.getStartPageOfCategory(i), false)
+                pager.setCurrentItem(pickerPagesAdapter.getRangeOfCategoryIndex(i).first, false)
             }
         }
         pager.apply {
             adapter = pickerPagesAdapter
             // show first symbol category by default, rather than recently used
-            val initialPage = pickerPagesAdapter.getStartPageOfCategory(1)
-            setCurrentItem(initialPage, false)
+            val range = pickerPagesAdapter.getRangeOfCategoryIndex(1)
+            setCurrentItem(range.first, false)
             // update initial tab and page manually to avoid
             // "Adding or removing callbacks during dispatch to callbacks"
             tabsUi.activateTab(1)
-            paginationUi.updatePageCount(
-                pickerPagesAdapter.getCategoryRangeOfPage(initialPage).run { last - first + 1 }
-            )
+            paginationUi.updatePageCount(range.run { last - first + 1 })
             registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageScrolled(
                     position: Int,
@@ -148,15 +148,12 @@ class PickerWindow(
                     positionOffsetPixels: Int
                 ) {
                     val range = pickerPagesAdapter.getCategoryRangeOfPage(position)
-                    val start = range.first
-                    val total = range.last - start + 1
-                    val current = position - start
-                    paginationUi.updatePageCount(total)
-                    paginationUi.updateScrollProgress(current, positionOffset)
+                    paginationUi.updatePageCount(range.run { last - first + 1 })
+                    paginationUi.updateScrollProgress(position - range.first, positionOffset)
                 }
 
                 override fun onPageSelected(position: Int) {
-                    tabsUi.activateTab(pickerPagesAdapter.getCategoryOfPage(position))
+                    tabsUi.activateTab(pickerPagesAdapter.getCategoryIndexOfPage(position))
                     popup.dismissAll()
                 }
             })
@@ -165,18 +162,28 @@ class PickerWindow(
 
     override fun onCreateBarExtension() = pickerLayout.tabsUi.root
 
+    private val skinTonePreference = AppPrefs.getInstance().symbols.defaultEmojiSkinTone
+
+    @SuppressLint("NotifyDataSetChanged")
+    private val refreshPagesListener = ManagedPreference.OnChangeListener<Any> { _, _ ->
+        pickerPagesAdapter.notifyDataSetChanged()
+    }
+
     override fun onAttached() {
         pickerLayout.embeddedKeyboard.also {
             it.onReturnDrawableUpdate(returnKeyDrawable.resourceId)
             it.keyActionListener = keyActionListener
         }
+        if (key === Key.Emoji) {
+            skinTonePreference.registerOnChangeListener(refreshPagesListener)
+        }
     }
 
     override fun onDetached() {
         popup.dismissAll()
         pickerLayout.embeddedKeyboard.keyActionListener = null
-        service.lifecycleScope.launch(Dispatchers.IO) {
-            pickerPagesAdapter.saveRecent()
+        if (key === Key.Emoji) {
+            skinTonePreference.unregisterOnChangeListener(refreshPagesListener)
         }
     }
 
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/popup/EmojiModifier.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/popup/EmojiModifier.kt
new file mode 100644
index 000000000..600095d09
--- /dev/null
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/popup/EmojiModifier.kt
@@ -0,0 +1,114 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-FileCopyrightText: Copyright 2025 Fcitx5 for Android Contributors
+ */
+
+package org.fcitx.fcitx5.android.input.popup
+
+import android.icu.lang.UCharacter
+import android.icu.lang.UProperty
+import android.os.Build
+import android.text.TextPaint
+import androidx.annotation.RequiresApi
+import org.fcitx.fcitx5.android.R
+import org.fcitx.fcitx5.android.data.prefs.AppPrefs
+import org.fcitx.fcitx5.android.data.prefs.ManagedPreferenceEnum
+import org.fcitx.fcitx5.android.utils.includes
+
+object EmojiModifier {
+
+    enum class SkinTone(val value: String, override val stringRes: Int) : ManagedPreferenceEnum {
+        Default("", R.string.emoji_skin_tone_none),
+        Type_1_2("🏻", R.string.emoji_skin_tone_type_1_2),
+        Type_3("🏼", R.string.emoji_skin_tone_type_3),
+        Type_4("🏽", R.string.emoji_skin_tone_type_4),
+        Type_5("🏾", R.string.emoji_skin_tone_type_5),
+        Type_6("🏿", R.string.emoji_skin_tone_type_6)
+    }
+
+    /**
+     * **Special Case 1:** Drop `U+FE0F` (Variation Selector-16) when combining with skin tone
+     */
+    private val SpecialCase1 = intArrayOf(
+        0x261D,  // ☝️
+        0x26F9,  // ⛹️
+        0x270C,  // ✌️
+        0x1F3CB, // 🏋️
+        0x1F3CC, // 🏌️
+        0x1F574, // 🕴️
+        0x1F575, // 🕵️
+        0x1F590, // 🖐️
+    )
+    private const val VariationSelector16 = 0xFE0F
+
+    /**
+     * **Special Case 2:** Make `U+1F91D`(🤝 Handshake) in 🧑‍🤝‍🧑 not modifiable
+     */
+    private val SpecialCase2 = intArrayOf(
+        0x1F9D1, 0x200D, 0x1F91D, 0x200D, 0x1F9D1,
+    )
+
+    private val defaultSkinTone by AppPrefs.getInstance().symbols.defaultEmojiSkinTone
+
+    fun isSupported(): Boolean {
+        // UProperty.EMOJI_MODIFIER_BASE requires API 28
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
+    }
+
+    private fun isModifiable(modifiable: BooleanArray): Boolean {
+        val sum = modifiable.sumOf { if (it) 1 else 0 }
+        // bail if too crowded
+        // eg. https://emojipedia.org/family-man-medium-light-skin-tone-woman-medium-light-skin-tone-girl-medium-light-skin-tone-boy-medium-light-skin-tone
+        return sum == 1 || sum == 2
+    }
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    private fun getCodePoints(emoji: String): Pair<IntArray, BooleanArray> {
+        val codePoints = emoji.codePoints().toArray()
+        val modifiable = BooleanArray(codePoints.size) {
+            UCharacter.hasBinaryProperty(codePoints[it], UProperty.EMOJI_MODIFIER_BASE)
+        }
+        // make U+1F91D not modifiable if the whole sequence is special
+        if (codePoints contentEquals SpecialCase2) {
+            modifiable[2] = false
+        }
+        return codePoints to modifiable
+    }
+
+    private fun buildEmoji(codePoints: IntArray, modifiable: BooleanArray, tone: SkinTone): String {
+        return buildString {
+            for (i in 0..<codePoints.size) {
+                // skip U+FE0F if the preceding character is special
+                if (i > 0 && codePoints[i] == VariationSelector16 &&
+                    SpecialCase1.includes(codePoints[i - 1]) &&
+                    tone != SkinTone.Default
+                ) continue
+                appendCodePoint(codePoints[i])
+                if (modifiable[i]) {
+                    append(tone.value)
+                }
+            }
+        }
+    }
+
+    private val DefaultTextPaint = TextPaint()
+
+    fun getPreferredTone(emoji: String): String {
+        if (!isSupported()) return emoji
+        val (codePoints, modifiable) = getCodePoints(emoji)
+        if (!isModifiable(modifiable)) return emoji
+        val candidate = buildEmoji(codePoints, modifiable, defaultSkinTone)
+        return if (DefaultTextPaint.hasGlyph(candidate)) candidate else emoji
+    }
+
+    fun produceSkinTones(emoji: String): Array<String>? {
+        if (!isSupported()) return null
+        val (codePoints, modifiable) = getCodePoints(emoji)
+        if (!isModifiable(modifiable)) return null
+        val candidates = SkinTone.entries
+            .filter { it != defaultSkinTone }
+            .map { buildEmoji(codePoints, modifiable, it) }
+            .filter { DefaultTextPaint.hasGlyph(it) }
+        return if (candidates.isEmpty()) null else candidates.toTypedArray()
+    }
+}
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt
index 1b46ccb15..1d8ffe161 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.input.popup
 
@@ -107,7 +107,9 @@ class PopupComponent :
     }
 
     private fun showKeyboard(viewId: Int, keyboard: KeyDef.Popup.Keyboard, bounds: Rect) {
-        val keys = PopupPreset[keyboard.label] ?: return
+        val keys = PopupPreset[keyboard.label]
+            ?: EmojiModifier.produceSkinTones(keyboard.label)
+            ?: return
         // clear popup preview text         OR create empty popup preview
         showingEntryUi[viewId]?.setText("") ?: showPopup(viewId, "", bounds)
         reallyShowKeyboard(viewId, keys, bounds)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/preedit/PreeditComponent.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/preedit/PreeditComponent.kt
index b2258931a..0f2c4a59a 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/input/preedit/PreeditComponent.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/input/preedit/PreeditComponent.kt
@@ -27,10 +27,8 @@ class PreeditComponent : UniqueComponent<PreeditComponent>(), Dependent, InputBr
 
     val ui by lazy {
         val keyBorder = ThemeManager.prefs.keyBorder.getValue()
-        val bkgColor = when (theme) {
-            is Theme.Builtin -> if (keyBorder) theme.backgroundColor else theme.barColor
-            is Theme.Custom -> theme.backgroundColor
-        }
+        val bkgColor =
+            if (!keyBorder && theme is Theme.Builtin) theme.barColor else theme.backgroundColor
         PreeditUi(context, theme, setupTextView = {
             backgroundColor = bkgColor
             horizontalPadding = dp(8)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/provider/FcitxDataProvider.kt b/app/src/main/java/org/fcitx/fcitx5/android/provider/FcitxDataProvider.kt
index aacef75d6..ab4127cf7 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/provider/FcitxDataProvider.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/provider/FcitxDataProvider.kt
@@ -78,7 +78,7 @@ class FcitxDataProvider : DocumentsProvider() {
     private fun fileFromDocId(docId: String) = File(docIdPrefix, docId)
 
     override fun onCreate(): Boolean {
-        baseDir = context!!.getExternalFilesDir(null)!!
+        baseDir = context!!.getExternalFilesDir(null) ?: return false
         docIdPrefix = "${baseDir.parent}${File.separator}"
         textFilePaths = Array(TEXT_FILES.size) { baseDir.resolve(TEXT_FILES[it]).absolutePath }
         return true
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/MainFragment.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/MainFragment.kt
index cf71efca5..a55e22b33 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/MainFragment.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/MainFragment.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.ui.main
 
@@ -80,6 +80,11 @@ class MainFragment : PaddingPreferenceFragment() {
                     R.drawable.ic_clipboard,
                     R.id.action_mainFragment_to_clipboardSettingsFragment
                 )
+                addDestinationPreference(
+                    R.string.emoji_and_symbols,
+                    R.drawable.ic_baseline_emoji_symbols_24,
+                    R.id.action_mainFragment_to_symbolSettingsFragment
+                )
                 addDestinationPreference(
                     R.string.plugins,
                     R.drawable.ic_baseline_android_24,
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/behavior/SymbolSettingsFragment.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/behavior/SymbolSettingsFragment.kt
new file mode 100644
index 000000000..3c7a0ff40
--- /dev/null
+++ b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/behavior/SymbolSettingsFragment.kt
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-FileCopyrightText: Copyright 2025 Fcitx5 for Android Contributors
+ */
+
+package org.fcitx.fcitx5.android.ui.main.settings.behavior
+
+import org.fcitx.fcitx5.android.data.prefs.AppPrefs
+import org.fcitx.fcitx5.android.data.prefs.ManagedPreferenceFragment
+
+class SymbolSettingsFragment : ManagedPreferenceFragment(AppPrefs.getInstance().symbols)
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt
index dab226ba0..c8702b3eb 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt
@@ -127,6 +127,9 @@ abstract class ThemeListAdapter : RecyclerView.Adapter<ThemeListAdapter.ViewHold
                     if (theme is Theme.Custom) {
                         onExportTheme(theme)
                         true
+                    } else if (theme is Theme.Monet) {
+                        onExportTheme(theme.toCustom())
+                        true
                     } else false
                 }
                 editButton.setOnClickListener {
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeThumbnailUi.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeThumbnailUi.kt
index bf56b1875..db8964561 100644
--- a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeThumbnailUi.kt
+++ b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeThumbnailUi.kt
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-or-later
- * SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
+ * SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
  */
 package org.fcitx.fcitx5.android.ui.main.settings.theme
 
@@ -9,6 +9,7 @@ import android.content.res.ColorStateList
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.ShapeDrawable
 import android.graphics.drawable.shapes.OvalShape
+import android.os.Build
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.ImageView
@@ -25,6 +26,7 @@ import splitties.views.dsl.constraintlayout.constraintLayout
 import splitties.views.dsl.constraintlayout.endOfParent
 import splitties.views.dsl.constraintlayout.lParams
 import splitties.views.dsl.constraintlayout.rightOfParent
+import splitties.views.dsl.constraintlayout.startOfParent
 import splitties.views.dsl.constraintlayout.topOfParent
 import splitties.views.dsl.core.Ui
 import splitties.views.dsl.core.add
@@ -59,6 +61,12 @@ class ThemeThumbnailUi(override val ctx: Context) : Ui {
         imageResource = R.drawable.ic_baseline_edit_24
     }
 
+    val dynamicIcon = imageView {
+        setPaddingDp(5, 5, 5, 5)
+        scaleType = ImageView.ScaleType.FIT_CENTER
+        imageResource = R.drawable.ic_baseline_auto_awesome_24
+    }
+
     override val root = constraintLayout {
         outlineProvider = ViewOutlineProvider.BOUNDS
         elevation = dp(2f)
@@ -80,6 +88,10 @@ class ThemeThumbnailUi(override val ctx: Context) : Ui {
             topOfParent()
             endOfParent()
         })
+        add(dynamicIcon, lParams(dp(32), dp(32)) {
+            topOfParent()
+            startOfParent()
+        })
     }
 
     fun setTheme(theme: Theme) {
@@ -102,6 +114,11 @@ class ThemeThumbnailUi(override val ctx: Context) : Ui {
             background = rippleDrawable(theme.keyPressHighlightColor)
             imageTintList = foregroundTint
         }
+        dynamicIcon.apply {
+            visibility =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && theme is Theme.Monet) View.VISIBLE else View.GONE
+            imageTintList = foregroundTint
+        }
         checkMark.imageTintList = foregroundTint
     }
 
@@ -115,8 +132,8 @@ class ThemeThumbnailUi(override val ctx: Context) : Ui {
         checkMark.imageResource = when (state) {
             State.Normal -> 0
             State.Selected -> R.drawable.ic_baseline_check_24
-            State.LightMode -> R.drawable.ic_sharp_light_mode_24
-            State.DarkMode -> R.drawable.ic_sharp_mode_night_24
+            State.LightMode -> R.drawable.ic_baseline_light_mode_24
+            State.DarkMode -> R.drawable.ic_baseline_dark_mode_24
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/utils/Array.kt b/app/src/main/java/org/fcitx/fcitx5/android/utils/Array.kt
new file mode 100644
index 000000000..7a675e2a4
--- /dev/null
+++ b/app/src/main/java/org/fcitx/fcitx5/android/utils/Array.kt
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-FileCopyrightText: Copyright 2025 Fcitx5 for Android Contributors
+ */
+
+package org.fcitx.fcitx5.android.utils
+
+fun <T> Array<T>.includes(element: T?): Boolean {
+    return indexOf(element) >= 0
+}
+
+fun IntArray.includes(element: Int): Boolean {
+    return indexOf(element) >= 0
+}
diff --git a/app/src/main/res/drawable/ic_baseline_auto_awesome_24.xml b/app/src/main/res/drawable/ic_baseline_auto_awesome_24.xml
new file mode 100644
index 000000000..3fa1ea95d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_auto_awesome_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19,9l1.25,-2.75L23,5l-2.75,-1.25L19,1l-1.25,2.75L15,5l2.75,1.25L19,9zM11.5,9.5L9,4 6.5,9.5 1,12l5.5,2.5L9,20l2.5,-5.5L17,12l-5.5,-2.5zM19,15l-1.25,2.75L15,19l2.75,1.25L19,23l1.25,-2.75L23,19l-2.75,-1.25L19,15z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_sharp_mode_night_24.xml b/app/src/main/res/drawable/ic_baseline_dark_mode_24.xml
similarity index 50%
rename from app/src/main/res/drawable/ic_sharp_mode_night_24.xml
rename to app/src/main/res/drawable/ic_baseline_dark_mode_24.xml
index da75edbd0..10cccb646 100644
--- a/app/src/main/res/drawable/ic_sharp_mode_night_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_dark_mode_24.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#ffffff"
-        android:pathData="M9.5,2c-1.82,0 -3.53,0.5 -5,1.35c2.99,1.73 5,4.95 5,8.65s-2.01,6.92 -5,8.65C5.97,21.5 7.68,22 9.5,22c5.52,0 10,-4.48 10,-10S15.02,2 9.5,2z" />
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9s9,-4.03 9,-9c0,-0.46 -0.04,-0.92 -0.1,-1.36c-0.98,1.37 -2.58,2.26 -4.4,2.26c-2.98,0 -5.4,-2.42 -5.4,-5.4c0,-1.81 0.89,-3.42 2.26,-4.4C12.92,3.04 12.46,3 12,3L12,3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sharp_light_mode_24.xml b/app/src/main/res/drawable/ic_baseline_light_mode_24.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sharp_light_mode_24.xml
rename to app/src/main/res/drawable/ic_baseline_light_mode_24.xml
diff --git a/app/src/main/res/drawable/ic_baseline_share_24.xml b/app/src/main/res/drawable/ic_baseline_share_24.xml
new file mode 100644
index 000000000..d38ab1c98
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_share_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+</vector>
diff --git a/app/src/main/res/navigation/settings_nav.xml b/app/src/main/res/navigation/settings_nav.xml
index 8e9844d53..9455ff401 100644
--- a/app/src/main/res/navigation/settings_nav.xml
+++ b/app/src/main/res/navigation/settings_nav.xml
@@ -57,6 +57,13 @@
             app:exitAnim="@animator/nav_default_exit_anim"
             app:popEnterAnim="@animator/nav_default_pop_enter_anim"
             app:popExitAnim="@animator/nav_default_pop_exit_anim" />
+        <action
+            android:id="@+id/action_mainFragment_to_symbolSettingsFragment"
+            app:destination="@id/symbolSettingsFragment"
+            app:enterAnim="@animator/nav_default_enter_anim"
+            app:exitAnim="@animator/nav_default_exit_anim"
+            app:popEnterAnim="@animator/nav_default_pop_enter_anim"
+            app:popExitAnim="@animator/nav_default_pop_exit_anim" />
         <action
             android:id="@+id/action_mainFragment_to_advancedSettingsFragment"
             app:destination="@id/advancedSettingsFragment"
@@ -250,6 +257,10 @@
         android:id="@+id/clipboardSettingsFragment"
         android:name="org.fcitx.fcitx5.android.ui.main.settings.behavior.ClipboardSettingsFragment"
         android:label="@string/clipboard" />
+    <fragment
+        android:id="@+id/symbolSettingsFragment"
+        android:name="org.fcitx.fcitx5.android.ui.main.settings.behavior.SymbolSettingsFragment"
+        android:label="@string/emoji_and_symbols" />
     <fragment
         android:id="@+id/advancedSettingsFragment"
         android:name="org.fcitx.fcitx5.android.ui.main.settings.behavior.AdvancedSettingsFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 840e7b5ed..e51081e3e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,6 +122,7 @@
     <string name="punctuation_position">Punctuation position</string>
     <string name="punctuation_pos_bottom">Bottom (Portrait only)</string>
     <string name="punctuation_pos_top_right">Top Right</string>
+    <string name="punctuation_pos_none">None</string>
     <string name="expand_toolbar_by_default">Expand toolbar by default</string>
     <string name="popup_on_key_press">Popup on key press</string>
     <string name="disable_animation">Disable animation</string>
@@ -270,6 +271,7 @@
     <string name="crop">Crop</string>
     <string name="candidates_window">Candidates Window</string>
     <string name="show_candidates_window">Show candidates window</string>
+    <string name="candidates_window_radius">Candidates window radius</string>
     <string name="follow_input_device">Depends on input device</string>
     <string name="candidates_orientation">Candidates list orientation</string>
     <string name="automatic">Automatic</string>
@@ -303,4 +305,13 @@
     <string name="move_cursor_to_end">Move cursor to end</string>
     <string name="open_input_method_settings">Open input method settings</string>
     <string name="delete_all">Delete all</string>
+    <string name="share">Share</string>
+    <string name="emoji_and_symbols">Emoji &amp; Symbols</string>
+    <string name="default_emoji_skin_tone">Default emoji skin tone modifier</string>
+    <string name="emoji_skin_tone_none">No modifier</string>
+    <string name="emoji_skin_tone_type_1_2">🏻 Type-1-2</string>
+    <string name="emoji_skin_tone_type_3">🏼 Type-3</string>
+    <string name="emoji_skin_tone_type_4">🏽 Type-4</string>
+    <string name="emoji_skin_tone_type_5">🏾 Type-5</string>
+    <string name="emoji_skin_tone_type_6">🏿 Type-6</string>
 </resources>
diff --git a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
index e47719bab..327f3b75d 100644
--- a/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidAppConventionPlugin.kt
@@ -17,6 +17,7 @@ import org.gradle.api.internal.provider.Providers
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.File
 
 /**
  * The prototype of an Android Application
@@ -141,13 +142,17 @@ class AndroidAppConventionPlugin : AndroidBaseConventionPlugin() {
         target.pluginManager.apply(target.libs.plugins.aboutlibraries.get().pluginId)
 
         target.configure<AboutLibrariesExtension> {
-            configPath = target.rootProject.relativePath(target.file("licenses"))
-            excludeFields = arrayOf(
-                "generated", "developers", "organization", "scm", "funding", "content"
-            )
-            fetchRemoteLicense = false
-            fetchRemoteFunding = false
-            includePlatform = false
+            collect {
+                configPath.set(File("licenses").takeIf { it.exists() })
+                fetchRemoteLicense.set(false)
+                fetchRemoteFunding.set(false)
+                includePlatform.set(false)
+            }
+            export {
+                excludeFields.set(
+                    setOf("generated", "developers", "organization", "scm", "funding", "content")
+                )
+            }
         }
 
         target.dependencies.add("coreLibraryDesugaring", target.libs.android.desugarJDKLibs)
diff --git a/build-logic/convention/src/main/kotlin/AndroidBaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidBaseConventionPlugin.kt
index 8b175d775..5c49fcf03 100644
--- a/build-logic/convention/src/main/kotlin/AndroidBaseConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidBaseConventionPlugin.kt
@@ -32,6 +32,8 @@ open class AndroidBaseConventionPlugin : Plugin<Project> {
             compilerOptions {
                 // https://youtrack.jetbrains.com/issue/KT-55947
                 jvmTarget.set(JvmTarget.fromTarget(Versions.java.toString()))
+                // https://youtrack.jetbrains.com/issue/KT-73255/Change-defaulting-rule-for-annotations
+                freeCompilerArgs.add("-Xannotation-default-target=param-property")
             }
         }
 
diff --git a/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt
index 6ff01b69e..494709f8c 100644
--- a/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt
@@ -22,7 +22,6 @@ open class NativeBaseConventionPlugin : Plugin<Project> {
                     cmake {
                         arguments(
                             "-DANDROID_STL=c++_shared",
-                            "-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF",
                             "-DVERSION_NAME=${Versions.baseVersionName}",
                             "-DPREBUILT_DIR=${prebuiltDir.absolutePath}"
                         )
diff --git a/build-logic/convention/src/main/kotlin/Versions.kt b/build-logic/convention/src/main/kotlin/Versions.kt
index 29131adb4..6a9c1fd9d 100644
--- a/build-logic/convention/src/main/kotlin/Versions.kt
+++ b/build-logic/convention/src/main/kotlin/Versions.kt
@@ -12,8 +12,8 @@ object Versions {
     const val minSdk = 23
     const val targetSdk = 35
 
-    const val defaultCMake = "3.22.1"
-    const val defaultNDK = "25.2.9519653"
+    const val defaultCMake = "3.31.6"
+    const val defaultNDK = "28.0.13004108"
     const val defaultBuildTools = "35.0.1"
 
     // NOTE: increase this value to bump version code
diff --git a/flake.lock b/flake.lock
index a4b1c9ca3..60e6877b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f94cac598..949933457 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,11 +30,11 @@
 
               # Update versions here
               # This should match to build-logic/convention/src/main/kotlin/Versions.kt
-              cmakeVersion = "3.22.1";
-              buildToolsVersion = "35.0.0";
+              cmakeVersion = "3.31.6";
+              buildToolsVersion = "35.0.1";
               platformToolsVersion = "35.0.2";
               platformVersion = "35";
-              ndkVersion = "25.2.9519653";
+              ndkVersion = "28.0.13004108";
 
               includeNDK = true;
               androidComposition = final.androidenv.composeAndroidPackages {
@@ -55,7 +55,7 @@
                       androidComposition.androidsdk
                       extra-cmake-modules
                       gettext
-                      python39
+                      python3
                       icu
                       androidStudio
                     ];
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d87c51b0b..854ac264d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,26 +1,26 @@
 [versions]
-androidGradlePlugin = "8.8.2"
-kotlin = "2.1.10"
-ksp = "2.1.10-1.0.31"
-lifecycle = "2.8.7"
-navigation = "2.8.8"
-room = "2.6.1"
+androidGradlePlugin = "8.11.1"
+kotlin = "2.2.0"
+ksp = "2.2.0-2.0.2"
+lifecycle = "2.9.2"
+navigation = "2.9.2"
+room = "2.7.2"
 splitties = "3.0.0"
-aboutlibraries = "11.6.3"
-arrow = "2.0.1"
+aboutlibraries = "12.2.4"
+arrow = "2.1.2"
 
 [libraries]
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 android-desugarJDKLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version = "2.1.5" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.1" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.2" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.8.1" }
 androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.10.1" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
-androidx-autofill = { module = "androidx.autofill:autofill", version = "1.1.0" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
+androidx-autofill = { module = "androidx.autofill:autofill", version = "1.3.0" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
 androidx-coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version = "1.3.0" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.15.0" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
@@ -59,7 +59,7 @@ junit = { module = "junit:junit", version = "4.13.2" }
 androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
 androidx-test-rules = { module = "androidx.test:rules", version = "1.6.1" }
 androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "lifecycle" }
-kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version = "2.1.0" }
+kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version = "2.2.0" }
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 
 [plugins]
@@ -71,4 +71,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-gitVersion = { id = "com.palantir.git-version", version = "3.1.0" }
+gitVersion = { id = "com.palantir.git-version", version = "4.0.0" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 525a264d9..5147a0112 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 23 02:51:12 CST 2024
+#Sat Jun 28 02:09:40 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt b/lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt
index 744a0cfae..f489e8a2d 100644
--- a/lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt
+++ b/lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt
@@ -31,13 +31,10 @@ find_package(Fcitx5ModuleLuaAddonLoader MODULE)
 # dummy target to export src/main/cpp/cmake
 add_custom_target(cmake)
 
-# prebuilt fmt
-set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
-find_package(fmt)
-
 # prebuilt boost
 list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
-find_package(Boost 1.86.0 REQUIRED COMPONENTS iostreams CONFIG)
+find_package(Boost 1.87.0 REQUIRED COMPONENTS iostreams CONFIG)
+add_compile_definitions("BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS")
 
 # prebuilt marisa-tire, OpenCC needs it
 set(marisa_DIR "${PREBUILT_DIR}/marisa/${ANDROID_ABI}/lib/cmake/marisa")
diff --git a/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons b/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons
index 4e6ba3e12..f97d91882 160000
--- a/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons
+++ b/lib/fcitx5-chinese-addons/src/main/cpp/fcitx5-chinese-addons
@@ -1 +1 @@
-Subproject commit 4e6ba3e12aa0d48fb4599030092073adbbf4070d
+Subproject commit f97d91882b549e658d89f147955dc3693823be33
diff --git a/lib/fcitx5-lua/src/main/cpp/fcitx5-lua b/lib/fcitx5-lua/src/main/cpp/fcitx5-lua
index fa7a16fbc..b2f2a5583 160000
--- a/lib/fcitx5-lua/src/main/cpp/fcitx5-lua
+++ b/lib/fcitx5-lua/src/main/cpp/fcitx5-lua
@@ -1 +1 @@
-Subproject commit fa7a16fbc56dd111fcda3bc7504ff2b9925892b0
+Subproject commit b2f2a5583895d93a69d64f537f2e9fb5f226c939
diff --git a/lib/fcitx5/src/main/cpp/CMakeLists.txt b/lib/fcitx5/src/main/cpp/CMakeLists.txt
index 8087f32fd..8d561bafa 100644
--- a/lib/fcitx5/src/main/cpp/CMakeLists.txt
+++ b/lib/fcitx5/src/main/cpp/CMakeLists.txt
@@ -17,10 +17,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 # cmake/FindECM.cmake
 find_package(ECM)
 
-# prebuilt fmt
-set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
-find_package(fmt)
-
 # prebuilt libintl-lite
 set(LibIntl_DIR "${PREBUILT_DIR}/libintl-lite/${ANDROID_ABI}/lib/cmake")
 find_package(LibIntl)
@@ -34,6 +30,9 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Fcitx5AndroidInstallDirs.cmake")
 # LIBDATADIR is not a standard CMake install dir, defined in fcitx5/CMakeLists.txt#L169
 set(CMAKE_INSTALL_LIBDATADIR "/usr/lib")
 
+# hook add_custom_command before configuring fcitx5
+include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/HookAddCustomCommand.cmake")
+
 option(ENABLE_TEST "" OFF)
 option(ENABLE_COVERAGE "" OFF)
 option(ENABLE_ENCHANT "" OFF)
@@ -48,3 +47,5 @@ option(ENABLE_XDGAUTOSTART "" OFF)
 option(ENABLE_EMOJI "" OFF)
 option(ENABLE_LIBUUID "" OFF)
 add_subdirectory(fcitx5)
+# for std::osyncstream
+target_compile_options(Fcitx5Utils PRIVATE "-fexperimental-library")
diff --git a/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfig.cmake b/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfig.cmake
new file mode 100644
index 000000000..2beb19a26
--- /dev/null
+++ b/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfig.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/FindFcitx5Utils.cmake")
diff --git a/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfigVersion.cmake b/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfigVersion.cmake
new file mode 100644
index 000000000..cc99644ed
--- /dev/null
+++ b/lib/fcitx5/src/main/cpp/cmake/Fcitx5UtilsConfigVersion.cmake
@@ -0,0 +1,2 @@
+# https://cmake.org/cmake/help/latest/command/find_package.html#config-mode
+set(PACKAGE_VERSION_COMPATIBLE TRUE)
diff --git a/lib/fcitx5/src/main/cpp/cmake/FindFcitx5Utils.cmake b/lib/fcitx5/src/main/cpp/cmake/FindFcitx5Utils.cmake
index b25039907..9544f7045 100644
--- a/lib/fcitx5/src/main/cpp/cmake/FindFcitx5Utils.cmake
+++ b/lib/fcitx5/src/main/cpp/cmake/FindFcitx5Utils.cmake
@@ -19,6 +19,7 @@ find_package(Gettext REQUIRED)
 set(FCITX_INSTALL_CMAKECONFIG_DIR "${FCITX5_DEVEL_FILES}")
 
 # mimic fcitx5/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
+include("${CMAKE_CURRENT_LIST_DIR}/HookAddCustomCommand.cmake") # hook before macros
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5Macros.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5AndroidInstallDirs.cmake")
 
diff --git a/lib/fcitx5/src/main/cpp/cmake/HookAddCustomCommand.cmake b/lib/fcitx5/src/main/cpp/cmake/HookAddCustomCommand.cmake
new file mode 100644
index 000000000..e9edae9cb
--- /dev/null
+++ b/lib/fcitx5/src/main/cpp/cmake/HookAddCustomCommand.cmake
@@ -0,0 +1,19 @@
+find_package(Gettext)
+
+# Do as I say, not as I do
+# https://crascit.com/2018/09/14/do-not-redefine-cmake-commands/
+if (NOT COMMAND _add_custom_command)
+    function(add_custom_command)
+        cmake_parse_arguments(arg "" "" "COMMAND" ${ARGN})
+        list(GET arg_COMMAND 0 cmd_0)
+        # find calls in fcitx5_install_translation
+        if (cmd_0 STREQUAL GETTEXT_MSGFMT_EXECUTABLE AND NOT "-d" IN_LIST arg_COMMAND)
+            # ARGV is a list like: "COMMAND;/path/to/msgfmt;-o;mo_file;po_file"
+            # insert arguments after GETTEXT_MSGFMT_EXECUTABLE
+            list(FIND ARGV "${GETTEXT_MSGFMT_EXECUTABLE}" idx)
+            math(EXPR idx "${idx} + 1")
+            list(INSERT ARGV ${idx} "--no-hash" "--endianness=little")
+        endif ()
+        _add_custom_command(${ARGV})
+    endfunction()
+endif ()
diff --git a/lib/fcitx5/src/main/cpp/fcitx5 b/lib/fcitx5/src/main/cpp/fcitx5
index 7745ce431..5fcfab177 160000
--- a/lib/fcitx5/src/main/cpp/fcitx5
+++ b/lib/fcitx5/src/main/cpp/fcitx5
@@ -1 +1 @@
-Subproject commit 7745ce431ec7140a88437aa6b62ef7852d2232fa
+Subproject commit 5fcfab177b4b68c07ded22eef45d58894d87c6c0
diff --git a/lib/fcitx5/src/main/cpp/prebuilt b/lib/fcitx5/src/main/cpp/prebuilt
index 498e68f9a..2936527df 160000
--- a/lib/fcitx5/src/main/cpp/prebuilt
+++ b/lib/fcitx5/src/main/cpp/prebuilt
@@ -1 +1 @@
-Subproject commit 498e68f9af9ce3ce4d81b337ecefa6c8f3bdfa72
+Subproject commit 2936527dfd5209ee3d96fc25e6d1b1fb0673669a
diff --git a/lib/libime/src/main/cpp/CMakeLists.txt b/lib/libime/src/main/cpp/CMakeLists.txt
index 44926eef3..a7cbc3a8e 100644
--- a/lib/libime/src/main/cpp/CMakeLists.txt
+++ b/lib/libime/src/main/cpp/CMakeLists.txt
@@ -11,18 +11,18 @@ get_target_property(FCITX5_CMAKE_MODULES fcitx5::cmake INTERFACE_INCLUDE_DIRECTO
 set(CMAKE_MODULE_PATH ${FCITX5_CMAKE_MODULES} ${CMAKE_MODULE_PATH})
 
 find_package(ECM MODULE)
-find_package(Fcitx5Utils MODULE)
+
+# libime finds Fcitx5Utils in CONFIG mode: https://github.com/fcitx/libime/commit/16bd90df7daa94aee92e5106a513c4aeb5c4ced5
+set(Fcitx5Utils_DIR ${FCITX5_CMAKE_MODULES})
+find_package(Fcitx5Utils CONFIG)
 
 # dummy target to export src/main/cpp/cmake
 add_custom_target(cmake)
 
-# prebuilt fmt
-set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
-find_package(fmt)
-
 # prebuilt boost
 list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
-find_package(Boost 1.86.0 REQUIRED COMPONENTS iostreams CONFIG)
+find_package(Boost 1.87.0 REQUIRED COMPONENTS iostreams CONFIG)
+add_compile_definitions("BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS")
 
 # prebuilt zstd
 set(zstd_DIR "${PREBUILT_DIR}/zstd/${ANDROID_ABI}/lib/cmake/zstd")
diff --git a/lib/libime/src/main/cpp/cmake/FindLibIMECore.cmake b/lib/libime/src/main/cpp/cmake/FindLibIMECore.cmake
index cac00a021..3adf7e9c3 100644
--- a/lib/libime/src/main/cpp/cmake/FindLibIMECore.cmake
+++ b/lib/libime/src/main/cpp/cmake/FindLibIMECore.cmake
@@ -6,7 +6,9 @@ find_package(libime REQUIRED CONFIG)
 
 if (NOT TARGET LibIME::Core)
     # fix target dependency
-    set_target_properties(libime::IMECore PROPERTIES INTERFACE_LINK_LIBRARIES fcitx5::Fcitx5Utils)
+    set_target_properties(libime::IMECore PROPERTIES
+            INTERFACE_LINK_LIBRARIES "fcitx5::Fcitx5Utils;Boost::boost"
+    )
     # fix target name
     add_library(LibIME::Core ALIAS libime::IMECore)
 endif()
diff --git a/lib/libime/src/main/cpp/cmake/FindLibIMEPinyin.cmake b/lib/libime/src/main/cpp/cmake/FindLibIMEPinyin.cmake
index af9c2a237..ff24a8d1f 100644
--- a/lib/libime/src/main/cpp/cmake/FindLibIMEPinyin.cmake
+++ b/lib/libime/src/main/cpp/cmake/FindLibIMEPinyin.cmake
@@ -8,7 +8,6 @@ find_package(LibIMECore MODULE)
 
 if (NOT TARGET LibIME::Pinyin)
     # fix target dependency
-    set_target_properties(libime::IMEPinyin PROPERTIES INTERFACE_LINK_LIBRARIES fcitx5::Fcitx5Utils)
     set_target_properties(libime::IMEPinyin PROPERTIES INTERFACE_LINK_LIBRARIES libime::IMECore)
     # fix target name
     add_library(LibIME::Pinyin ALIAS libime::IMEPinyin)
diff --git a/lib/libime/src/main/cpp/cmake/FindLibIMETable.cmake b/lib/libime/src/main/cpp/cmake/FindLibIMETable.cmake
index a09a5c32e..7dd476107 100644
--- a/lib/libime/src/main/cpp/cmake/FindLibIMETable.cmake
+++ b/lib/libime/src/main/cpp/cmake/FindLibIMETable.cmake
@@ -8,8 +8,7 @@ find_package(LibIMECore MODULE)
 
 if (NOT TARGET LibIME::Table)
     # fix target dependency
-    set_target_properties(libime::IMETable PROPERTIES INTERFACE_LINK_LIBRARIES fcitx5::Fcitx5Utils)
-    set_target_properties(libime::IMEPinyin PROPERTIES INTERFACE_LINK_LIBRARIES libime::IMECore)
+    set_target_properties(libime::IMETable PROPERTIES INTERFACE_LINK_LIBRARIES libime::IMECore)
     # fix target name
     add_library(LibIME::Table ALIAS libime::IMETable)
 endif()
diff --git a/lib/libime/src/main/cpp/libime b/lib/libime/src/main/cpp/libime
index 58414fc0d..a6609b120 160000
--- a/lib/libime/src/main/cpp/libime
+++ b/lib/libime/src/main/cpp/libime
@@ -1 +1 @@
-Subproject commit 58414fc0d42c4a59881e929f0dd8cb070b2da509
+Subproject commit a6609b1206bb036dffe8c2d8829f1448e54a97ad
diff --git a/lib/plugin-base/src/main/java/org/fcitx/fcitx5/android/lib/plugin_base/AboutActivity.kt b/lib/plugin-base/src/main/java/org/fcitx/fcitx5/android/lib/plugin_base/AboutActivity.kt
index 2ca64e30f..db465c1ba 100644
--- a/lib/plugin-base/src/main/java/org/fcitx/fcitx5/android/lib/plugin_base/AboutActivity.kt
+++ b/lib/plugin-base/src/main/java/org/fcitx/fcitx5/android/lib/plugin_base/AboutActivity.kt
@@ -11,7 +11,6 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -67,7 +66,7 @@ class AboutActivity : PreferenceActivity() {
     class AboutContentFragment : PreferenceFragment() {
 
         private val copyPreferenceSummaryListener = OnPreferenceClickListener {
-            (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager)
+            context.getSystemService(ClipboardManager::class.java)
                 .setPrimaryClip(ClipData.newPlainText("", it.summary))
             Toast.makeText(context, R.string.copied, Toast.LENGTH_SHORT).show()
             true
@@ -117,7 +116,7 @@ class AboutActivity : PreferenceActivity() {
             if (pluginXmlRes == 0) return
             val parser = resources.getXml(pluginXmlRes)
             var eventType = parser.eventType
-            var domain = ""
+            var gettextDomain = ""
             var apiVersion = ""
             var description = ""
             var text = ""
@@ -127,7 +126,7 @@ class AboutActivity : PreferenceActivity() {
                     XmlPullParser.TEXT -> text = parser.text
                     XmlPullParser.END_TAG -> when (parser.name) {
                         "apiVersion" -> apiVersion = text
-                        "domain" -> domain = text
+                        "domain" -> gettextDomain = text
                         "description" -> description = text.let {
                             if (it.startsWith("@string/")) {
                                 val resName = it.removePrefix("@string/")
@@ -143,7 +142,9 @@ class AboutActivity : PreferenceActivity() {
             screen.addCategory(R.string.plugin_info) {
                 addPreference(R.string.pkg_name, pkg)
                 addPreference(R.string.api_version, apiVersion)
-                addPreference(R.string.gettext_domain, domain)
+                if (gettextDomain.isNotBlank()) {
+                    addPreference(R.string.gettext_domain, gettextDomain)
+                }
                 addPreference(R.string.plugin_description, description)
                 addPreference(R.string.has_service, hasService.toString())
             }
@@ -220,6 +221,7 @@ class AboutActivity : PreferenceActivity() {
 
         private fun showLicenseContent(license: License) {
             if (license.url?.isNotBlank() == true) {
+                @SuppressLint("UseKtx")
                 startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(license.url)))
             }
         }
diff --git a/plugin/anthy/src/main/cpp/fcitx5-anthy b/plugin/anthy/src/main/cpp/fcitx5-anthy
index 2aa3cb41b..676cec867 160000
--- a/plugin/anthy/src/main/cpp/fcitx5-anthy
+++ b/plugin/anthy/src/main/cpp/fcitx5-anthy
@@ -1 +1 @@
-Subproject commit 2aa3cb41b1b0858cba741be4c420decd3f22a4cd
+Subproject commit 676cec8673b394cfd6a88797ccc366d68b432e4a
diff --git a/plugin/chewing/licenses/libraries/fcitx5-chewing.json b/plugin/chewing/licenses/libraries/fcitx5-chewing.json
index 6120715e1..6f8e0db8e 100644
--- a/plugin/chewing/licenses/libraries/fcitx5-chewing.json
+++ b/plugin/chewing/licenses/libraries/fcitx5-chewing.json
@@ -6,6 +6,6 @@
     "website": "https://github.com/fcitx/fcitx5-chewing",
     "tag": "native",
     "licenses": [
-        "GPL-2.0-or-later"
+        "LGPL-2.1-or-later"
     ]
 }
diff --git a/plugin/chewing/src/main/cpp/fcitx5-chewing b/plugin/chewing/src/main/cpp/fcitx5-chewing
index bd5951485..fb44de7bf 160000
--- a/plugin/chewing/src/main/cpp/fcitx5-chewing
+++ b/plugin/chewing/src/main/cpp/fcitx5-chewing
@@ -1 +1 @@
-Subproject commit bd595148534b547fc93306988dc2b4a915dd4215
+Subproject commit fb44de7bfc5e36e7d3abccc8502f40f6bfdc8cdc
diff --git a/plugin/clipboard-filter/ClearURLsRules b/plugin/clipboard-filter/ClearURLsRules
index b935388cb..3a0ec6a8a 160000
--- a/plugin/clipboard-filter/ClearURLsRules
+++ b/plugin/clipboard-filter/ClearURLsRules
@@ -1 +1 @@
-Subproject commit b935388cbae3ed9c4441bd81ff46473df5bf8faf
+Subproject commit 3a0ec6a8a9baf86b508214d4d4c2d48062b0216a
diff --git a/plugin/hangul/src/main/cpp/fcitx5-hangul b/plugin/hangul/src/main/cpp/fcitx5-hangul
index 5826227ec..91ac8384a 160000
--- a/plugin/hangul/src/main/cpp/fcitx5-hangul
+++ b/plugin/hangul/src/main/cpp/fcitx5-hangul
@@ -1 +1 @@
-Subproject commit 5826227ec0a5e833f6602d6f09e1b26e65c59627
+Subproject commit 91ac8384abddd03db894da6b7fdc2d3bf8d7e167
diff --git a/plugin/jyutping/src/main/cpp/CMakeLists.txt b/plugin/jyutping/src/main/cpp/CMakeLists.txt
index 37d41016e..05a5b8b7d 100644
--- a/plugin/jyutping/src/main/cpp/CMakeLists.txt
+++ b/plugin/jyutping/src/main/cpp/CMakeLists.txt
@@ -26,13 +26,10 @@ set(CMAKE_MODULE_PATH ${FCITX5_CHINESE_ADDONS_CMAKE_MODULES} ${CMAKE_MODULE_PATH
 
 find_package(Fcitx5ModulePunctuation MODULE)
 
-# prebuilt fmt
-set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
-find_package(fmt)
-
 # prebuilt boost
 list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
-find_package(Boost 1.86.0 REQUIRED COMPONENTS iostreams CONFIG)
+find_package(Boost 1.87.0 REQUIRED COMPONENTS iostreams CONFIG)
+add_compile_definitions("BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS")
 
 # prebuilt zstd
 set(zstd_DIR "${PREBUILT_DIR}/zstd/${ANDROID_ABI}/lib/cmake/zstd")
diff --git a/plugin/jyutping/src/main/cpp/libime-jyutping b/plugin/jyutping/src/main/cpp/libime-jyutping
index 7ad0e426f..c4e50525d 160000
--- a/plugin/jyutping/src/main/cpp/libime-jyutping
+++ b/plugin/jyutping/src/main/cpp/libime-jyutping
@@ -1 +1 @@
-Subproject commit 7ad0e426f9af2105033bd1afe52c0cb3057b127e
+Subproject commit c4e50525d6b40b48f82e682228a374cd6cf91ed3
diff --git a/plugin/rime/src/main/cpp/CMakeLists.txt b/plugin/rime/src/main/cpp/CMakeLists.txt
index 62fa626ff..6ee8e78c9 100644
--- a/plugin/rime/src/main/cpp/CMakeLists.txt
+++ b/plugin/rime/src/main/cpp/CMakeLists.txt
@@ -34,9 +34,8 @@ set_target_properties(Rime_static PROPERTIES
 
 # https://github.com/rime/librime/blob/1.9.0/src/rime_api.h#L663
 # https://stackoverflow.com/questions/805555/ld-linker-question-the-whole-archive-option
-# use $<LINK_LIBRARY:WHOLE_ARCHIVE,Rime_static> when cmake updated to 3.24+
 # https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#link-features
-set(RIME_TARGET "-Wl,--whole-archive" Rime_static "-Wl,--no-whole-archive")
+set(RIME_TARGET $<LINK_LIBRARY:WHOLE_ARCHIVE,Rime_static>)
 set(RIME_DATA_DIR "${CMAKE_INSTALL_DATADIR}/rime-data")
 add_subdirectory(fcitx5-rime)
 
diff --git a/plugin/rime/src/main/cpp/fcitx5-rime b/plugin/rime/src/main/cpp/fcitx5-rime
index 9155bf3ff..f1b4b0119 160000
--- a/plugin/rime/src/main/cpp/fcitx5-rime
+++ b/plugin/rime/src/main/cpp/fcitx5-rime
@@ -1 +1 @@
-Subproject commit 9155bf3ffc5bb42460d87303332d0cf5b8481ecc
+Subproject commit f1b4b011971f80fc7db8a8599e18f08ec2d78a16
diff --git a/plugin/rime/src/main/cpp/rime-essay b/plugin/rime/src/main/cpp/rime-essay
index 13674aade..6025fc701 160000
--- a/plugin/rime/src/main/cpp/rime-essay
+++ b/plugin/rime/src/main/cpp/rime-essay
@@ -1 +1 @@
-Subproject commit 13674aadebc482e418067c1980c7f69bf4a30f90
+Subproject commit 6025fc7014fb0e7f0c243edca6605e6ca41ee98f
diff --git a/plugin/rime/src/main/cpp/rime-luna-pinyin b/plugin/rime/src/main/cpp/rime-luna-pinyin
index b7db6ce96..959309008 160000
--- a/plugin/rime/src/main/cpp/rime-luna-pinyin
+++ b/plugin/rime/src/main/cpp/rime-luna-pinyin
@@ -1 +1 @@
-Subproject commit b7db6ce9640a49fc8884a1b223abb420e636eccc
+Subproject commit 9593090080294a7dfc3c864c087e4070459c0168
diff --git a/plugin/rime/src/main/cpp/rime-prelude b/plugin/rime/src/main/cpp/rime-prelude
index 3803f0945..3c602fdb0 160000
--- a/plugin/rime/src/main/cpp/rime-prelude
+++ b/plugin/rime/src/main/cpp/rime-prelude
@@ -1 +1 @@
-Subproject commit 3803f09458072e03b9ed396692ce7e1d35c88c95
+Subproject commit 3c602fdb0dcca7825103e281efc50ef7580f99ec
diff --git a/plugin/sayura/src/main/cpp/fcitx5-sayura b/plugin/sayura/src/main/cpp/fcitx5-sayura
index ca2953c8a..1a213cd15 160000
--- a/plugin/sayura/src/main/cpp/fcitx5-sayura
+++ b/plugin/sayura/src/main/cpp/fcitx5-sayura
@@ -1 +1 @@
-Subproject commit ca2953c8acf967eb87c7ea8eef8558709d7e503c
+Subproject commit 1a213cd15485cdbc827d7dd7bfab082dca441b3d
diff --git a/plugin/thai/src/main/cpp/fcitx5-libthai b/plugin/thai/src/main/cpp/fcitx5-libthai
index 3157f2850..22ccdf4d6 160000
--- a/plugin/thai/src/main/cpp/fcitx5-libthai
+++ b/plugin/thai/src/main/cpp/fcitx5-libthai
@@ -1 +1 @@
-Subproject commit 3157f28506e15a04a6e4a28bf6afaba8f1f0b418
+Subproject commit 22ccdf4d6a35898637c7d8addf74cc4e3dd36a4d
diff --git a/plugin/unikey/src/main/cpp/fcitx5-unikey b/plugin/unikey/src/main/cpp/fcitx5-unikey
index 95f71e9b5..c11b64ca1 160000
--- a/plugin/unikey/src/main/cpp/fcitx5-unikey
+++ b/plugin/unikey/src/main/cpp/fcitx5-unikey
@@ -1 +1 @@
-Subproject commit 95f71e9b5b58f0b6994f8aea0bdbf80baa8bf1b0
+Subproject commit c11b64ca1572ef62f1da5f1f84e53ecb2c6c29df

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/fcitx5-android/fcitx5-android/compare/0.1.1...master.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/fcitx5-android/fcitx5-android/compare/0.1.1...master.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/fcitx5-android/fcitx5-android/compare/0.1.1...master.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/fcitx5-android/fcitx5-android/compare/0.1.1...master.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>