From 91877b288b0bd4a70774633abd9fa8024aedae6b Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Sat, 18 Apr 2026 10:51:43 -0600
Subject: [PATCH 01/11] Intitial checkin

---
 srcs/layouts/latin_dvorak.xml           | 48 +++++++++++++++++++
 srcs/layouts/latin_dvorak_landscape.xml | 64 +++++++++++++++++++++++++
 srcs/layouts/latin_dvorak_left.xml      | 40 ++++++++++++++++
 3 files changed, 152 insertions(+)
 create mode 100644 srcs/layouts/latin_dvorak.xml
 create mode 100644 srcs/layouts/latin_dvorak_landscape.xml
 create mode 100644 srcs/layouts/latin_dvorak_left.xml

diff --git a/srcs/layouts/latin_dvorak.xml b/srcs/layouts/latin_dvorak.xml
new file mode 100644
index 000000000..d79645732
--- /dev/null
+++ b/srcs/layouts/latin_dvorak.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Dvorak" bottom_row="false" script="latin">
+  <row scale="10">
+    <key c="'" n="&quot;" se="esc" />
+    <key c="," sw=":" se=";" />
+    <key c="." sw="&lt;" se="&gt;" />
+    <key c="p" s="loc accent_ring" />
+    <key c="y" se="_" s="loc accent_grave" />
+    <key c="f" ne="=" se="." n="loc €" />
+    <key c="g" nw="+" ne="*" sw="-" se="/" />
+    <key c="c" nw="loc accent_trema" sw="{" se="}" />
+    <key c="r" sw="[" se="]" />
+    <key c="l" se="loc £" />
+  </row>
+  <row scale="10">
+    <key c="a" ne="!" e="¡" n="1" sw="loc å" />
+    <key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
+    <key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
+    <key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
+    <key c="i" ne="%" n="5" s="loc ı" />
+    <key c="d" ne="^" n="6" s="loc ð" />
+    <key c="h" ne="&amp;" n="7" s="ȝ" />
+    <key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
+    <key c="n" sw="(" se=")" n="9" />
+    <key c="s" n="0" se="loc ß" />
+  </row>
+  <row scale="10">
+    <key c="shift" sw="loc accent_tilde" n="~" />
+    <key c="q" sw="/" se="\\" s="loc shareText" />
+    <key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
+    <key c="k" n="|" />
+    <key c="x" n="loc accent_cedille"/>
+    <key c="b"  />
+    <key c="m" n="`" />
+    <key c="w"  />
+    <key c="v" />
+    <key c="z" />
+  </row>
+  <row scale="10" height="0.95">
+    <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
+    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="2.2" c="space" n="switch_forward" key5="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="loc compose" n="up" e="right" key5="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
+    <key width="2.2" c="space" n="switch_backward" key5="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="backspace" n="delete"/>
+    <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
+  </row>
+</keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latin_dvorak_landscape.xml b/srcs/layouts/latin_dvorak_landscape.xml
new file mode 100644
index 000000000..d4a0027a7
--- /dev/null
+++ b/srcs/layouts/latin_dvorak_landscape.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Dvorak-Landscape" bottom_row="false" script="latin">
+  <row scale="16">
+    <key c="'" n="&quot;" se="esc" />
+    <key c="," sw=":" se=";" />
+    <key c="." sw="&lt;" se="&gt;" />
+    <key c="p" s="loc accent_ring" />
+    <key c="y" se="_" s="loc accent_grave" />
+      <key c="7" shift="1.5"/>
+      <key c="8"/>
+      <key c="9"/>
+      <key c="/"/>
+    <key shift="0.5" c="f" ne="=" se="." n="loc €" />
+    <key c="g" nw="+" ne="*" sw="-" se="/" />
+    <key c="c" nw="loc accent_trema" sw="{" se="}" />
+    <key c="r" sw="[" se="]" />
+    <key c="l" se="loc £" />
+  </row>
+  <row scale="16">
+    <key c="a" ne="!" e="¡" n="1" sw="loc å" />
+    <key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
+    <key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
+    <key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
+    <key c="i" ne="%" n="5" s="loc ı" />
+      <key c="4" shift="1.5" />
+      <key c="5"/>
+      <key c="6"/>
+      <key c="*"/>    
+    <key shift="0.5"  c="d" ne="^" n="6" s="loc ð" />
+    <key c="h" ne="&amp;" n="7" s="ȝ" />
+    <key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
+    <key c="n" sw="(" se=")" n="9" />
+    <key c="s" n="0" se="loc ß" />
+  </row>
+  <row scale="16">
+    <key c="shift" sw="loc accent_tilde" n="~" />
+    <key c="q" sw="/" se="\\" s="loc shareText" />
+    <key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
+    <key c="k" n="|" />
+    <key c="x" n="loc accent_cedille"/>
+      <key c="1" shift="1.5"/>
+      <key c="2"/>
+      <key c="3"/>
+      <key c="-"/>    
+    <key shift="0.5" c="b"  />
+    <key c="m" n="`" />
+    <key c="w"  />
+    <key c="v" />
+    <key c="z" />
+  </row>
+  <row scale="16" height="0.95">
+    <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
+    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="2.2" c="space" n="switch_forward" w="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
+      <key c="0" shift="0.6"/>
+      <key c="."/>
+      <key c="="/>
+      <key c="+"/> 
+    <key width="2.4" shift=".5" c="space" n="switch_backward" w="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="backspace" n="delete"/>
+    <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
+  </row>
+</keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latin_dvorak_left.xml b/srcs/layouts/latin_dvorak_left.xml
new file mode 100644
index 000000000..ca882359f
--- /dev/null
+++ b/srcs/layouts/latin_dvorak_left.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Dvorak-Left" bottom_row="false" script="latin">
+  <row >
+    <key c="esc" />
+
+    <key width="1.5" c="&quot;" nw="`" w="_" e="\\" n="3" s="?" sw=":" se=";" n="~" />
+    <key width="1.5" c="/" nw="{" ne="}" w="(" e=")" sw="[" se="]" n="&lt;" s="&gt;" />
+    <key width="1.5" c="=" nw="+" ne="*" sw="-" se="/" n="," s="." />
+
+  </row>
+  <row >
+    <key c="shift" />
+    <key c="a" n="'"          w="1" e="!"  />
+    <key c="o" n="," s="q" w="2" e="\@" />
+    <key c="e" n="." s="j" w="3" e="\#" />
+    <key c="u" n="p" s="k" w="4" e="$"  />
+    <key c="i" n="y" s="x" w="5" e="%"  />
+    <key width="1.3" c="backspace" n="delete"/>
+    <key shift="2" c="" />
+
+  </row>
+  <row >
+    <key width="1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
+    <key c="d" n="f" s="b" w="6" e="^"     />
+    <key c="h" n="g" s="m" w="7" e="&amp;" />
+    <key c="t" n="c" s="w" w="8" e="*"     />
+    <key c="n" n="r" s="v" w="9" e="!"     />
+    <key c="s" n="l" s="z" w="0"              />
+    <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
+    <key shift="2" c="" />
+
+  </row>
+  <row height="0.95">
+    <key width="0.5" c="" />
+
+    <key width="1.5" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="2.5" c="space" n="switch_forward" s="switch_backward" w="cursor_left" e="cursor_right"/>
+    <key width="1.5" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
+  </row>
+</keyboard>
\ No newline at end of file

From a11533123313faac7166d2f3bf1327005936173d Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Sat, 18 Apr 2026 11:58:18 -0600
Subject: [PATCH 02/11] add modmap to add shift to ',. left layout add language
 key.

---
 srcs/layouts/latin_dvorak.xml           | 5 +++++
 srcs/layouts/latin_dvorak_landscape.xml | 6 ++++++
 srcs/layouts/latin_dvorak_left.xml      | 1 +
 3 files changed, 12 insertions(+)

diff --git a/srcs/layouts/latin_dvorak.xml b/srcs/layouts/latin_dvorak.xml
index d79645732..83eb63681 100644
--- a/srcs/layouts/latin_dvorak.xml
+++ b/srcs/layouts/latin_dvorak.xml
@@ -45,4 +45,9 @@
     <key width="1.3" c="backspace" n="delete"/>
     <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
   </row>
+  <modmap>
+    <shift a="'" b="&quot;"/>
+    <shift a="," b="&lt;"/>
+    <shift a="." b="&gt;"/>
+  </modmap>
 </keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latin_dvorak_landscape.xml b/srcs/layouts/latin_dvorak_landscape.xml
index d4a0027a7..5c692280a 100644
--- a/srcs/layouts/latin_dvorak_landscape.xml
+++ b/srcs/layouts/latin_dvorak_landscape.xml
@@ -61,4 +61,10 @@
     <key width="1.3" c="backspace" n="delete"/>
     <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
   </row>
+  <modmap>
+    <shift a="'" b="&quot;"/>
+    <shift a="," b="&lt;"/>
+    <shift a="." b="&gt;"/>
+
+  </modmap>  
 </keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latin_dvorak_left.xml b/srcs/layouts/latin_dvorak_left.xml
index ca882359f..252c81300 100644
--- a/srcs/layouts/latin_dvorak_left.xml
+++ b/srcs/layouts/latin_dvorak_left.xml
@@ -6,6 +6,7 @@
     <key width="1.5" c="&quot;" nw="`" w="_" e="\\" n="3" s="?" sw=":" se=";" n="~" />
     <key width="1.5" c="/" nw="{" ne="}" w="(" e=")" sw="[" se="]" n="&lt;" s="&gt;" />
     <key width="1.5" c="=" nw="+" ne="*" sw="-" se="/" n="," s="." />
+    <key width="1.5" c="¡" w="¿" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
 
   </row>
   <row >

From ef2e23777c4ae671febb9d8ec6560cab6a6ac103 Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Sat, 18 Apr 2026 14:15:04 -0600
Subject: [PATCH 03/11] Fix names

---
 res/values/layouts.xml                        |  6 ++
 srcs/layouts/latin_dvorak.xml                 | 53 ------------
 srcs/layouts/latn_dvorak.xml                  | 82 +++++++++++--------
 ...andscape.xml => latn_dvorak_landscape.xml} |  0
 ...n_dvorak_left.xml => latn_dvorak_left.xml} |  2 +-
 5 files changed, 56 insertions(+), 87 deletions(-)
 delete mode 100644 srcs/layouts/latin_dvorak.xml
 rename srcs/layouts/{latin_dvorak_landscape.xml => latn_dvorak_landscape.xml} (100%)
 rename srcs/layouts/{latin_dvorak_left.xml => latn_dvorak_left.xml} (94%)

diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 11ac6375e..91d23d96d 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -47,6 +47,8 @@
     <item>latn_azerty_fr</item>
     <item>latn_bepo_fr</item>
     <item>latn_bone</item>
+    <item>latn_dvorak_landscape</item>
+    <item>latn_dvorak_left</item>
     <item>latn_neo2</item>
     <item>latn_qwerty_apl</item>
     <item>latn_qwerty_az</item>
@@ -141,6 +143,8 @@
     <item>AZERTY (Français)</item>
     <item>BEPO (Français)</item>
     <item>Bone</item>
+    <item>Dvorak-Landscape</item>
+    <item>Dvorak-Left</item>
     <item>Neo 2</item>
     <item>QWERTY (APL)</item>
     <item>QWERTY (Azərbaycanca)</item>
@@ -235,6 +239,8 @@
     <item>@xml/latn_azerty_fr</item>
     <item>@xml/latn_bepo_fr</item>
     <item>@xml/latn_bone</item>
+    <item>@xml/latn_dvorak_landscape</item>
+    <item>@xml/latn_dvorak_left</item>
     <item>@xml/latn_neo2</item>
     <item>@xml/latn_qwerty_apl</item>
     <item>@xml/latn_qwerty_az</item>
diff --git a/srcs/layouts/latin_dvorak.xml b/srcs/layouts/latin_dvorak.xml
deleted file mode 100644
index 83eb63681..000000000
--- a/srcs/layouts/latin_dvorak.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<keyboard name="Dvorak" bottom_row="false" script="latin">
-  <row scale="10">
-    <key c="'" n="&quot;" se="esc" />
-    <key c="," sw=":" se=";" />
-    <key c="." sw="&lt;" se="&gt;" />
-    <key c="p" s="loc accent_ring" />
-    <key c="y" se="_" s="loc accent_grave" />
-    <key c="f" ne="=" se="." n="loc €" />
-    <key c="g" nw="+" ne="*" sw="-" se="/" />
-    <key c="c" nw="loc accent_trema" sw="{" se="}" />
-    <key c="r" sw="[" se="]" />
-    <key c="l" se="loc £" />
-  </row>
-  <row scale="10">
-    <key c="a" ne="!" e="¡" n="1" sw="loc å" />
-    <key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
-    <key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
-    <key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
-    <key c="i" ne="%" n="5" s="loc ı" />
-    <key c="d" ne="^" n="6" s="loc ð" />
-    <key c="h" ne="&amp;" n="7" s="ȝ" />
-    <key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
-    <key c="n" sw="(" se=")" n="9" />
-    <key c="s" n="0" se="loc ß" />
-  </row>
-  <row scale="10">
-    <key c="shift" sw="loc accent_tilde" n="~" />
-    <key c="q" sw="/" se="\\" s="loc shareText" />
-    <key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
-    <key c="k" n="|" />
-    <key c="x" n="loc accent_cedille"/>
-    <key c="b"  />
-    <key c="m" n="`" />
-    <key c="w"  />
-    <key c="v" />
-    <key c="z" />
-  </row>
-  <row scale="10" height="0.95">
-    <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
-    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
-    <key width="2.2" c="space" n="switch_forward" key5="cursor_left" e="cursor_right"/>
-    <key width="1.3" c="loc compose" n="up" e="right" key5="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
-    <key width="2.2" c="space" n="switch_backward" key5="cursor_left" e="cursor_right"/>
-    <key width="1.3" c="backspace" n="delete"/>
-    <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
-  </row>
-  <modmap>
-    <shift a="'" b="&quot;"/>
-    <shift a="," b="&lt;"/>
-    <shift a="." b="&gt;"/>
-  </modmap>
-</keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latn_dvorak.xml b/srcs/layouts/latn_dvorak.xml
index 656320097..83eb63681 100644
--- a/srcs/layouts/latn_dvorak.xml
+++ b/srcs/layouts/latn_dvorak.xml
@@ -1,37 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard name="Dvorak" script="latin">
-  <row>
-    <key key0="shift" width="1.5" key2="loc esc" key4="loc tab"/>
-    <key key0="p" key1="loc accent_ring" key2="." key3="&lt;"/>
-    <key key0="y" key1="loc accent_grave" key2="," key3="&gt;"/>
-    <key key0="f" key4="loc €"/>
-    <key key0="g" key2="\\" key3="|"/>
-    <key key0="c" key1="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/>
-    <key key0="r" key3="[" key4="]"/>
-    <key key0="l" key2="=" key3="+" key4="loc £"/>
-    <key key0="backspace" key2="delete" width="1.5"/>
+<keyboard name="Dvorak" bottom_row="false" script="latin">
+  <row scale="10">
+    <key c="'" n="&quot;" se="esc" />
+    <key c="," sw=":" se=";" />
+    <key c="." sw="&lt;" se="&gt;" />
+    <key c="p" s="loc accent_ring" />
+    <key c="y" se="_" s="loc accent_grave" />
+    <key c="f" ne="=" se="." n="loc €" />
+    <key c="g" nw="+" ne="*" sw="-" se="/" />
+    <key c="c" nw="loc accent_trema" sw="{" se="}" />
+    <key c="r" sw="[" se="]" />
+    <key c="l" se="loc £" />
   </row>
-  <row>
-    <key key0="a" key2="1" key3="loc å" key4="!"/>
-    <key key0="o" key1="loc accent_macron" key2="2" key3="\@" key4="loc accent_ogonek"/>
-    <key key0="e" key1="loc accent_caron" key2="3" key3="\#" key4="loc accent_dot_above"/>
-    <key key0="u" key1="loc æ" key2="4" key3="$" key4="loc accent_double_aigu"/>
-    <key key0="i" key2="5" key3="%"/>
-    <key key0="d" key2="6" key3="^"/>
-    <key key0="h" key2="7" key3="&amp;"/>
-    <key key0="t" key2="8" key3="*"/>
-    <key key0="n" key2="9" key3="(" key4=")"/>
-    <key key0="s" key2="0" key3="loc ß"/>
+  <row scale="10">
+    <key c="a" ne="!" e="¡" n="1" sw="loc å" />
+    <key c="o" ne="\@" n="2" sw="loc accent_ogonek" s="loc ø" />
+    <key c="e" ne="\#" n="3" sw="loc accent_dot_above" s="loc ə" />
+    <key c="u" ne="$" s="loc æ" n="4" sw="loc accent_double_aigu" />
+    <key c="i" ne="%" n="5" s="loc ı" />
+    <key c="d" ne="^" n="6" s="loc ð" />
+    <key c="h" ne="&amp;" n="7" s="ȝ" />
+    <key c="t" ne="*" sw="?" se="¿" n="8" s="loc þ" />
+    <key c="n" sw="(" se=")" n="9" />
+    <key c="s" n="0" se="loc ß" />
   </row>
-  <row>
-    <key key0="q" shift="0.5" key1="loc accent_tilde" key2="`" key3="~"/>
-    <key key0="j" key1="loc accent_aigu" key2="'" key3="&quot;"/>
-    <key key0="k" key1="loc ø" key2=";" key3=":"/>
-    <key key0="x" key1="loc accent_cedille"/>
-    <key key0="b"/>
-    <key key0="m" key2="/" key3="\?"/>
-    <key key0="w"/>
-    <key key0="v"/>
-    <key key0="z" key2="-" key3="_"/>
+  <row scale="10">
+    <key c="shift" sw="loc accent_tilde" n="~" />
+    <key c="q" sw="/" se="\\" s="loc shareText" />
+    <key c="j" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />
+    <key c="k" n="|" />
+    <key c="x" n="loc accent_cedille"/>
+    <key c="b"  />
+    <key c="m" n="`" />
+    <key c="w"  />
+    <key c="v" />
+    <key c="z" />
   </row>
-</keyboard>
+  <row scale="10" height="0.95">
+    <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
+    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="2.2" c="space" n="switch_forward" key5="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="loc compose" n="up" e="right" key5="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
+    <key width="2.2" c="space" n="switch_backward" key5="cursor_left" e="cursor_right"/>
+    <key width="1.3" c="backspace" n="delete"/>
+    <key width="1.3" c="enter" nw="loc voice_typing" ne="action"/>
+  </row>
+  <modmap>
+    <shift a="'" b="&quot;"/>
+    <shift a="," b="&lt;"/>
+    <shift a="." b="&gt;"/>
+  </modmap>
+</keyboard>
\ No newline at end of file
diff --git a/srcs/layouts/latin_dvorak_landscape.xml b/srcs/layouts/latn_dvorak_landscape.xml
similarity index 100%
rename from srcs/layouts/latin_dvorak_landscape.xml
rename to srcs/layouts/latn_dvorak_landscape.xml
diff --git a/srcs/layouts/latin_dvorak_left.xml b/srcs/layouts/latn_dvorak_left.xml
similarity index 94%
rename from srcs/layouts/latin_dvorak_left.xml
rename to srcs/layouts/latn_dvorak_left.xml
index 252c81300..b31c5dfb7 100644
--- a/srcs/layouts/latin_dvorak_left.xml
+++ b/srcs/layouts/latn_dvorak_left.xml
@@ -3,7 +3,7 @@
   <row >
     <key c="esc" />
 
-    <key width="1.5" c="&quot;" nw="`" w="_" e="\\" n="3" s="?" sw=":" se=";" n="~" />
+    <key width="1.5" c="&quot;" nw="`" w="_" e="\\" s="?" sw=":" se=";" n="~" />
     <key width="1.5" c="/" nw="{" ne="}" w="(" e=")" sw="[" se="]" n="&lt;" s="&gt;" />
     <key width="1.5" c="=" nw="+" ne="*" sw="-" se="/" n="," s="." />
     <key width="1.5" c="¡" w="¿" nw="accent_grave" ne="accent_tilde" sw="accent_aigu" n="loc accent_aigu" />

From b23998e1c146c213b68cf9ffdf5ec48a171964fe Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Wed, 27 May 2026 07:55:18 -0600
Subject: [PATCH 04/11] 1. All-language dictionary list DictionaryListView.java
 now shows all 56 supported languages instead of only those matching your
 device locale. Any language can be downloaded and installed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2. Quick dictionary switcher in Settings
DictionaryPickerPreference.java — a new ListPreference under Settings → Suggestions → "Active dictionary". Options: Auto (based on language) + any installed dictionary by display name. Stored as pref key selected_dictionary.

3. Personal dictionary
PersonalDictionary.java — singleton that stores word/replacement pairs in SharedPreferences. Each entry is either:

A plain word (recognized for completions)
A trigger → replacement pair (autocorrect)
Personal dictionary suggestions appear before main-dictionary suggestions.

4. Personal dictionary manager
PersonalDictionaryActivity.java — accessible from Settings → Suggestions → "Personal dictionary". Shows all entries; tap any to edit (word field + replacement field + Delete button).

5. "+" button while typing
A + button appears in the suggestions bar while you're typing a word. Tapping it opens the personal dictionary manager with the current word pre-filled in the add-word dialog. You can then modify both the word (trigger) and the replacement before saving.

The button is wired via CandidatesView.java → set_current_word() which is called by Suggestions.java on every keystroke.
---
 AndroidManifest.xml                           |   6 +
 res/layout/keyboard.xml                       |   1 +
 res/layout/personal_dict_activity.xml         |  47 +++++
 res/layout/personal_dict_entry.xml            |  31 +++
 res/values/strings.xml                        |  18 ++
 res/xml/settings.xml                          |   7 +
 srcs/juloo.keyboard2/Config.java              |   5 +
 srcs/juloo.keyboard2/Keyboard2.java           |  35 +++-
 .../dict/DictionaryListView.java              |  18 +-
 .../dict/PersonalDictionary.java              | 128 +++++++++++++
 .../dict/PersonalDictionaryActivity.java      | 177 ++++++++++++++++++
 .../prefs/DictionaryPickerPreference.java     |  55 ++++++
 .../suggestions/CandidatesView.java           |  40 ++++
 .../suggestions/Suggestions.java              |  50 +++--
 14 files changed, 585 insertions(+), 33 deletions(-)
 create mode 100644 res/layout/personal_dict_activity.xml
 create mode 100644 res/layout/personal_dict_entry.xml
 create mode 100644 srcs/juloo.keyboard2/dict/PersonalDictionary.java
 create mode 100644 srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
 create mode 100644 srcs/juloo.keyboard2/prefs/DictionaryPickerPreference.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95d80b9bd..77d4f7513 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,12 @@
         <action android:name="android.intent.action.MAIN"/>
       </intent-filter>
     </activity>
+
+    <activity android:name="juloo.keyboard2.dict.PersonalDictionaryActivity" android:icon="@mipmap/ic_launcher" android:theme="@style/appTheme" android:exported="false">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+      </intent-filter>
+    </activity>
   </application>
 
   <!-- To query enabled input methods for voice IME detection -->
diff --git a/res/layout/keyboard.xml b/res/layout/keyboard.xml
index f51297956..f1d5f7850 100644
--- a/res/layout/keyboard.xml
+++ b/res/layout/keyboard.xml
@@ -4,6 +4,7 @@
     <TextView android:id="@+id/candidates_left" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
     <TextView android:id="@+id/candidates_middle" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
     <TextView android:id="@+id/candidates_right" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
+    <TextView android:id="@+id/candidates_add_word" android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center_vertical" android:layout_marginEnd="4dp" android:gravity="center" android:text="@string/candidates_add_word" android:textColor="?attr/colorLabel" android:textSize="18sp" android:visibility="gone" android:contentDescription="@string/candidates_add_word_desc"/>
   </juloo.keyboard2.suggestions.CandidatesView>
   <juloo.keyboard2.Keyboard2View android:id="@+id/keyboard_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/res/layout/personal_dict_activity.xml b/res/layout/personal_dict_activity.xml
new file mode 100644
index 000000000..e1d6143d1
--- /dev/null
+++ b/res/layout/personal_dict_activity.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:padding="8dp"
+      android:gravity="center_vertical">
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/personal_dict_title"
+        android:textAppearance="?android:textAppearanceMedium"/>
+
+    <Button
+        android:id="@+id/personal_dict_add_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/personal_dict_add_btn"/>
+
+  </LinearLayout>
+
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?android:attr/dividerHorizontal"/>
+
+  <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1">
+
+    <LinearLayout
+        android:id="@+id/personal_dict_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+  </ScrollView>
+
+</LinearLayout>
diff --git a/res/layout/personal_dict_entry.xml b/res/layout/personal_dict_entry.xml
new file mode 100644
index 000000000..c3c6b045a
--- /dev/null
+++ b/res/layout/personal_dict_entry.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="12dp"
+    android:gravity="center_vertical"
+    android:minHeight="48dp">
+
+  <LinearLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/personal_dict_entry_word"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:textAppearanceMedium"/>
+
+    <TextView
+        android:id="@+id/personal_dict_entry_replacement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:textAppearanceSmall"
+        android:textColor="?android:textColorSecondary"/>
+
+  </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5eb4e85cc..bdbe307dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -163,4 +163,22 @@
     <string name="dictionaries_activity_not_enabled">You must first enable the keyboard to download dictionaries.</string>
     <string name="candidates_status_no_dict">No dictionary installed</string>
     <string name="candidates_status_install">Install</string>
+    <string name="candidates_add_word">+</string>
+    <string name="candidates_add_word_desc">Add word to personal dictionary</string>
+    <string name="pref_selected_dictionary_title">Active dictionary</string>
+    <string name="pref_selected_dictionary_auto">Auto (based on language)</string>
+    <string name="pref_manage_dictionaries_title">Manage dictionaries</string>
+    <string name="pref_manage_dictionaries_summary">Download or remove language dictionaries</string>
+    <string name="pref_personal_dictionary_title">Personal dictionary</string>
+    <string name="pref_personal_dictionary_summary">Custom words and autocorrections</string>
+    <string name="personal_dict_title">Personal dictionary</string>
+    <string name="personal_dict_add_btn">Add word</string>
+    <string name="personal_dict_add_title">Add word</string>
+    <string name="personal_dict_edit_title">Edit word</string>
+    <string name="personal_dict_word_hint">Word (trigger)</string>
+    <string name="personal_dict_replacement_hint">Replacement (leave blank to use word as-is)</string>
+    <string name="personal_dict_save">Save</string>
+    <string name="personal_dict_delete">Delete</string>
+    <string name="personal_dict_word_empty">Word cannot be empty</string>
+    <string name="personal_dict_empty">No words added yet. Tap \"Add word\" or use the + button while typing.</string>
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index d846dd1f1..13dd0d993 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -15,6 +15,13 @@
   <PreferenceCategory android:title="@string/pref_category_suggestions">
     <CheckBoxPreference android:key="suggestions" android:title="@string/pref_suggestions_title" android:summary="@string/pref_suggestions_summary" android:defaultValue="true"/>
     <CheckBoxPreference android:key="space_bar_auto_complete" android:title="@string/pref_space_bar_auto_complete_title" android:summary="@string/pref_space_bar_auto_complete_summary" android:defaultValue="false"/>
+    <juloo.keyboard2.prefs.DictionaryPickerPreference android:key="selected_dictionary" android:title="@string/pref_selected_dictionary_title" android:summary="%s" android:defaultValue="auto" android:dependency="suggestions"/>
+    <Preference android:title="@string/pref_manage_dictionaries_title" android:summary="@string/pref_manage_dictionaries_summary" android:dependency="suggestions">
+      <intent android:targetClass="juloo.keyboard2.dict.DictionariesActivity" android:targetPackage="juloo.keyboard2"/>
+    </Preference>
+    <Preference android:title="@string/pref_personal_dictionary_title" android:summary="@string/pref_personal_dictionary_summary" android:dependency="suggestions">
+      <intent android:targetClass="juloo.keyboard2.dict.PersonalDictionaryActivity" android:targetPackage="juloo.keyboard2"/>
+    </Preference>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 98bb72bdc..fc56f8ef6 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 import juloo.cdict.Cdict;
 import juloo.keyboard2.dict.Dictionaries;
+import juloo.keyboard2.dict.PersonalDictionary;
 import juloo.keyboard2.prefs.CustomExtraKeysPreference;
 import juloo.keyboard2.prefs.ExtraKeysPreference;
 import juloo.keyboard2.prefs.LayoutsPreference;
@@ -84,6 +85,9 @@ public final class Config
   public Map<KeyValue, KeyboardData.PreferredPos> extra_keys_param;
   public Map<KeyValue, KeyboardData.PreferredPos> extra_keys_custom;
   public Cdict current_dictionary = null; // Might be 'null'.
+  public PersonalDictionary personal_dictionary = null; // Might be 'null'.
+  /** "auto" means use the locale-based dictionary. */
+  public String selected_dictionary;
   public IKeyEventHandler handler;
   public boolean orientation_landscape = false;
   public boolean foldable_unfolded = false;
@@ -193,6 +197,7 @@ public void refresh(Resources res, Boolean foldableUnfolded, Dictionaries dicts)
     clipboard_history_enabled = _prefs.getBoolean("clipboard_history_enabled", false);
     clipboard_history_duration = Integer.parseInt(_prefs.getString("clipboard_history_duration", "5"));
     space_bar_auto_complete = _prefs.getBoolean("space_bar_auto_complete", false);
+    selected_dictionary = _prefs.getString("selected_dictionary", "auto");
 
     float screen_width_dp = dm.widthPixels / dm.density;
     wide_screen = screen_width_dp >= WIDE_DEVICE_THRESHOLD;
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index d0d60478a..81a3d6f23 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -25,6 +25,8 @@
 import java.util.Set;
 import juloo.keyboard2.dict.Dictionaries;
 import juloo.keyboard2.dict.DictionariesActivity;
+import juloo.keyboard2.dict.PersonalDictionary;
+import juloo.keyboard2.dict.PersonalDictionaryActivity;
 import juloo.keyboard2.prefs.LayoutsPreference;
 import juloo.keyboard2.suggestions.CandidatesView;
 import juloo.cdict.Cdict;
@@ -44,6 +46,7 @@ public class Keyboard2 extends InputMethodService
   /** Installed and current locales. */
   private DeviceLocales _device_locales;
   private Dictionaries _dictionaries;
+  private PersonalDictionary _personal_dictionary;
   private ViewGroup _emojiPane = null;
   private ViewGroup _clipboard_pane = null;
   private Handler _handler;
@@ -121,9 +124,11 @@ public void onCreate()
     _handler = new Handler(getMainLooper());
     _foldStateTracker = new FoldStateTracker(this);
     _dictionaries = Dictionaries.instance(this);
+    _personal_dictionary = PersonalDictionary.instance(this);
     Config.initGlobalConfig(prefs, getResources(),
         _foldStateTracker.isUnfolded(), _dictionaries);
     _config = Config.globalConfig();
+    _config.personal_dictionary = _personal_dictionary;
     _keyeventhandler = new KeyEventHandler(this.new Receiver(), _config);
     _config.handler = _keyeventhandler;
     prefs.registerOnSharedPreferenceChangeListener(this);
@@ -173,10 +178,21 @@ private void refreshSubtypeImm()
   private void refresh_current_dictionary()
   {
     _config.current_dictionary = null;
-    String current = _device_locales.default_.dictionary;
-    if (current == null)
-      return;
-    Cdict[] dicts = _dictionaries.load(current);
+    String selected = _config.selected_dictionary;
+    String dict_name;
+    if (selected == null || selected.equals("auto"))
+    {
+      if (_device_locales.default_ == null)
+        return;
+      dict_name = _device_locales.default_.dictionary;
+      if (dict_name == null)
+        return;
+    }
+    else
+    {
+      dict_name = selected;
+    }
+    Cdict[] dicts = _dictionaries.load(dict_name);
     if (dicts == null)
       return;
     _config.current_dictionary = Dictionaries.find_by_name(dicts, "main");
@@ -368,6 +384,12 @@ public void launch_dictionaries_activity(View v)
     start_activity(DictionariesActivity.class);
   }
 
+  /** Called from [onClick] attributes. */
+  public void launch_personal_dictionary_activity(View v)
+  {
+    start_activity(PersonalDictionaryActivity.class);
+  }
+
   void start_activity(Class cls)
   {
     Intent intent = new Intent(this, cls);
@@ -494,6 +516,11 @@ public void set_suggestions(List<String> suggestions)
     {
       _candidates_view.set_candidates(suggestions);
     }
+
+    public void set_current_word(String word)
+    {
+      _candidates_view.set_current_word(word);
+    }
   }
 
   private IBinder getConnectionToken()
diff --git a/srcs/juloo.keyboard2/dict/DictionaryListView.java b/srcs/juloo.keyboard2/dict/DictionaryListView.java
index 19bbcd2f6..21ca09896 100644
--- a/srcs/juloo.keyboard2/dict/DictionaryListView.java
+++ b/srcs/juloo.keyboard2/dict/DictionaryListView.java
@@ -17,8 +17,6 @@
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
 import juloo.cdict.Cdict;
-import juloo.keyboard2.Config;
-import juloo.keyboard2.DeviceLocales;
 import juloo.keyboard2.Logs;
 import juloo.keyboard2.R;
 import juloo.keyboard2.Utils;
@@ -39,24 +37,16 @@ public DictionaryListView(Context ctx, AttributeSet attrs)
 
   void inflate_views(Context ctx)
   {
-    DeviceLocales locales = DeviceLocales.load(ctx);
     SupportedDictionaries ds = new SupportedDictionaries(ctx.getResources());
     DownloadBtnListener listener = this.new DownloadBtnListener();
     _dict_views = new ArrayList<DictView>();
-    for (DeviceLocales.Loc loc : locales.installed)
+    for (int i = 0; i < ds.length(); i++)
     {
-      int idx = (loc.dictionary != null) ? ds.find(loc.dictionary) : -1;
-      if (idx >= 0)
-      {
-        DictView dv = new DictView(ctx, ds, idx, listener);
-        addView(dv.view);
-        _dict_views.add(dv);
-      }
+      DictView dv = new DictView(ctx, ds, i, listener);
+      addView(dv.view);
+      _dict_views.add(dv);
     }
     refresh();
-    // The keyboard is not enabled and the list is empty, show a message.
-    if (locales.installed.size() == 0)
-      addView(View.inflate(ctx, R.layout.dictionary_status_not_enabled, null));
   }
 
   /** Update the "installed" status of item views. Meaning whether the
diff --git a/srcs/juloo.keyboard2/dict/PersonalDictionary.java b/srcs/juloo.keyboard2/dict/PersonalDictionary.java
new file mode 100644
index 000000000..79e51a60c
--- /dev/null
+++ b/srcs/juloo.keyboard2/dict/PersonalDictionary.java
@@ -0,0 +1,128 @@
+package juloo.keyboard2.dict;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/** Manages user-defined words and custom autocorrections. */
+public final class PersonalDictionary
+{
+  static final char SEPARATOR = '\0';
+  static final String PREF_NAME = "personal_dictionary";
+  static final String PREF_WORDS = "words";
+
+  public static final class Entry
+  {
+    public final String word;        // trigger / word to recognise
+    public final String replacement; // what to insert (== word if no autocorrect)
+
+    Entry(String word, String replacement)
+    {
+      this.word = word;
+      this.replacement = (replacement != null && !replacement.isEmpty()) ? replacement : word;
+    }
+
+    static Entry parse(String raw)
+    {
+      int sep = raw.indexOf(SEPARATOR);
+      if (sep < 0)
+        return new Entry(raw, raw);
+      return new Entry(raw.substring(0, sep), raw.substring(sep + 1));
+    }
+
+    String serialize()
+    {
+      if (word.equals(replacement))
+        return word;
+      return word + SEPARATOR + replacement;
+    }
+  }
+
+  static PersonalDictionary _instance = null;
+
+  public static PersonalDictionary instance(Context ctx)
+  {
+    if (_instance == null)
+      _instance = new PersonalDictionary(ctx.getApplicationContext());
+    return _instance;
+  }
+
+  SharedPreferences _prefs;
+  List<Entry> _entries;
+
+  PersonalDictionary(Context ctx)
+  {
+    _prefs = ctx.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+    load();
+  }
+
+  void load()
+  {
+    Set<String> raw = _prefs.getStringSet(PREF_WORDS, null);
+    _entries = new ArrayList<>();
+    if (raw != null)
+    {
+      for (String s : raw)
+        _entries.add(Entry.parse(s));
+    }
+  }
+
+  void save()
+  {
+    Set<String> raw = new HashSet<>();
+    for (Entry e : _entries)
+      raw.add(e.serialize());
+    _prefs.edit().putStringSet(PREF_WORDS, raw).apply();
+  }
+
+  public List<Entry> get_all() { return _entries; }
+
+  /** Add (or update) an entry. [replacement] may be null/empty to mean the
+      word stands on its own without autocorrect. */
+  public void add(String word, String replacement)
+  {
+    for (int i = _entries.size() - 1; i >= 0; i--)
+      if (_entries.get(i).word.equalsIgnoreCase(word))
+        _entries.remove(i);
+    _entries.add(new Entry(word, (replacement != null && !replacement.isEmpty()) ? replacement : word));
+    save();
+  }
+
+  public void remove(String word)
+  {
+    for (int i = _entries.size() - 1; i >= 0; i--)
+      if (_entries.get(i).word.equalsIgnoreCase(word))
+        _entries.remove(i);
+    save();
+  }
+
+  /** Fill [dst] starting at [offset] with up to [max_count] suggestions.
+      Returns the number of entries added. */
+  public int find_suggestions(String typed_word, String[] dst, int offset, int max_count)
+  {
+    if (_entries.isEmpty() || typed_word.length() < 1)
+      return 0;
+    String lower = typed_word.toLowerCase();
+    int count = 0;
+    // Exact word match first (supports autocorrect replacements)
+    for (Entry e : _entries)
+    {
+      if (count >= max_count || offset + count >= dst.length)
+        break;
+      if (e.word.equalsIgnoreCase(typed_word))
+        dst[offset + count++] = e.replacement;
+    }
+    // Prefix match next
+    for (Entry e : _entries)
+    {
+      if (count >= max_count || offset + count >= dst.length)
+        break;
+      if (!e.word.equalsIgnoreCase(typed_word) && e.word.toLowerCase().startsWith(lower))
+        dst[offset + count++] = e.replacement;
+    }
+    return count;
+  }
+}
diff --git a/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
new file mode 100644
index 000000000..0758a82db
--- /dev/null
+++ b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
@@ -0,0 +1,177 @@
+package juloo.keyboard2.dict;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import java.util.List;
+import juloo.keyboard2.R;
+
+public class PersonalDictionaryActivity extends Activity
+{
+  public static final String EXTRA_WORD = "word";
+
+  PersonalDictionary _dict;
+  LinearLayout _list_container;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+    _dict = PersonalDictionary.instance(this);
+    setContentView(R.layout.personal_dict_activity);
+    _list_container = (LinearLayout)findViewById(R.id.personal_dict_list);
+
+    findViewById(R.id.personal_dict_add_btn).setOnClickListener(new View.OnClickListener()
+        {
+          @Override
+          public void onClick(View v) { show_add_dialog(null); }
+        });
+
+    String prefill = getIntent().getStringExtra(EXTRA_WORD);
+    if (prefill != null && !prefill.isEmpty())
+      show_add_dialog(prefill);
+
+    refresh_list();
+  }
+
+  void show_add_dialog(String initial_word)
+  {
+    show_word_dialog(
+        getString(R.string.personal_dict_add_title),
+        initial_word != null ? initial_word : "",
+        "",
+        new OnSaveListener()
+        {
+          @Override
+          public void on_save(String word, String replacement)
+          {
+            _dict.add(word, replacement);
+            refresh_list();
+          }
+        });
+  }
+
+  void show_edit_dialog(PersonalDictionary.Entry entry)
+  {
+    boolean has_replacement = !entry.word.equals(entry.replacement);
+    show_word_dialog(
+        getString(R.string.personal_dict_edit_title),
+        entry.word,
+        has_replacement ? entry.replacement : "",
+        new OnSaveListener()
+        {
+          @Override
+          public void on_save(String word, String replacement)
+          {
+            _dict.remove(entry.word);
+            _dict.add(word, replacement);
+            refresh_list();
+          }
+        });
+  }
+
+  interface OnSaveListener
+  {
+    void on_save(String word, String replacement);
+  }
+
+  void show_word_dialog(String title, String initial_word, String initial_replacement,
+      OnSaveListener listener)
+  {
+    LinearLayout form = new LinearLayout(this);
+    form.setOrientation(LinearLayout.VERTICAL);
+    int pad = dp(16);
+    form.setPadding(pad, pad, pad, 0);
+
+    EditText word_field = new EditText(this);
+    word_field.setHint(R.string.personal_dict_word_hint);
+    word_field.setText(initial_word);
+    word_field.setSingleLine(true);
+    form.addView(word_field);
+
+    EditText replacement_field = new EditText(this);
+    replacement_field.setHint(R.string.personal_dict_replacement_hint);
+    replacement_field.setText(initial_replacement);
+    replacement_field.setSingleLine(true);
+    form.addView(replacement_field);
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(this)
+      .setTitle(title)
+      .setView(form)
+      .setPositiveButton(R.string.personal_dict_save, new DialogInterface.OnClickListener()
+          {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+              String word = word_field.getText().toString().trim();
+              if (word.isEmpty())
+              {
+                Toast.makeText(PersonalDictionaryActivity.this,
+                    R.string.personal_dict_word_empty, Toast.LENGTH_SHORT).show();
+                return;
+              }
+              String replacement = replacement_field.getText().toString().trim();
+              listener.on_save(word, replacement.isEmpty() ? word : replacement);
+            }
+          })
+      .setNegativeButton(android.R.string.cancel, null);
+
+    if (!initial_word.isEmpty())
+    {
+      builder.setNeutralButton(R.string.personal_dict_delete, new DialogInterface.OnClickListener()
+          {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+              _dict.remove(initial_word);
+              refresh_list();
+            }
+          });
+    }
+
+    builder.show();
+  }
+
+  void refresh_list()
+  {
+    _list_container.removeAllViews();
+    List<PersonalDictionary.Entry> entries = _dict.get_all();
+    if (entries.isEmpty())
+    {
+      TextView empty = new TextView(this);
+      empty.setText(R.string.personal_dict_empty);
+      int pad = dp(16);
+      empty.setPadding(pad, pad, pad, pad);
+      _list_container.addView(empty);
+    }
+    else
+    {
+      for (PersonalDictionary.Entry e : entries)
+      {
+        View row = View.inflate(this, R.layout.personal_dict_entry, null);
+        ((TextView)row.findViewById(R.id.personal_dict_entry_word)).setText(e.word);
+        TextView repl_view = (TextView)row.findViewById(R.id.personal_dict_entry_replacement);
+        boolean has_replacement = !e.word.equals(e.replacement);
+        repl_view.setText(has_replacement ? ("→ " + e.replacement) : "");
+        repl_view.setVisibility(has_replacement ? View.VISIBLE : View.GONE);
+        row.setOnClickListener(new View.OnClickListener()
+            {
+              @Override
+              public void onClick(View v) { show_edit_dialog(e); }
+            });
+        _list_container.addView(row);
+      }
+    }
+  }
+
+  int dp(int value)
+  {
+    return (int)(value * getResources().getDisplayMetrics().density);
+  }
+}
diff --git a/srcs/juloo.keyboard2/prefs/DictionaryPickerPreference.java b/srcs/juloo.keyboard2/prefs/DictionaryPickerPreference.java
new file mode 100644
index 000000000..20a7ec7fd
--- /dev/null
+++ b/srcs/juloo.keyboard2/prefs/DictionaryPickerPreference.java
@@ -0,0 +1,55 @@
+package juloo.keyboard2.prefs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import juloo.keyboard2.R;
+import juloo.keyboard2.dict.Dictionaries;
+import juloo.keyboard2.dict.SupportedDictionaries;
+
+/** A [ListPreference] whose entries are built dynamically from the installed
+    dictionaries. Shows "Auto" plus each installed dictionary by display name. */
+public class DictionaryPickerPreference extends ListPreference
+{
+  public DictionaryPickerPreference(Context ctx, AttributeSet attrs)
+  {
+    super(ctx, attrs);
+  }
+
+  @Override
+  protected void onPrepareDialogBuilder(AlertDialog.Builder builder)
+  {
+    refresh_entries();
+    super.onPrepareDialogBuilder(builder);
+  }
+
+  void refresh_entries()
+  {
+    Context ctx = getContext();
+    Set<String> installed = Dictionaries.instance(ctx).get_installed();
+    SupportedDictionaries supported = new SupportedDictionaries(ctx.getResources());
+
+    List<CharSequence> entries = new ArrayList<>();
+    List<CharSequence> values = new ArrayList<>();
+
+    entries.add(ctx.getString(R.string.pref_selected_dictionary_auto));
+    values.add("auto");
+
+    for (int i = 0; i < supported.length(); i++)
+    {
+      String name = supported.dict_name(i);
+      if (installed.contains(name))
+      {
+        entries.add(supported.display_name(i));
+        values.add(name);
+      }
+    }
+
+    setEntries(entries.toArray(new CharSequence[0]));
+    setEntryValues(values.toArray(new CharSequence[0]));
+  }
+}
diff --git a/srcs/juloo.keyboard2/suggestions/CandidatesView.java b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
index 1768a52a9..c43936b12 100644
--- a/srcs/juloo.keyboard2/suggestions/CandidatesView.java
+++ b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
@@ -1,6 +1,7 @@
 package juloo.keyboard2.suggestions;
 
 import android.content.Context;
+import android.content.Intent;
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.TypedValue;
@@ -13,6 +14,7 @@
 import java.util.List;
 import juloo.keyboard2.Config;
 import juloo.keyboard2.R;
+import juloo.keyboard2.dict.PersonalDictionaryActivity;
 
 public class CandidatesView extends LinearLayout
 {
@@ -30,6 +32,13 @@ public class CandidatesView extends LinearLayout
       are shown. Might be [null]. */
   View _status_no_dict = null; // Dictionary not installed
 
+  /** Small button shown while typing to add the current word to the personal
+      dictionary. Might be [null] until inflated. */
+  View _add_word_btn = null;
+
+  /** Word currently being typed, used when the add-word button is tapped. */
+  String _current_word = null;
+
   public CandidatesView(Context context, AttributeSet attrs)
   {
     super(context, attrs);
@@ -42,6 +51,17 @@ protected void onFinishInflate()
     setup_item_view(0, R.id.candidates_middle);
     setup_item_view(1, R.id.candidates_right);
     setup_item_view(2, R.id.candidates_left);
+    setup_add_word_button();
+  }
+
+  /** Called with the word currently being typed so the add-word button knows
+      what to pre-fill. Pass [null] when no word is being typed. */
+  public void set_current_word(String word)
+  {
+    _current_word = word;
+    if (_add_word_btn != null)
+      _add_word_btn.setVisibility(
+          (word != null && !word.isEmpty()) ? View.VISIBLE : View.GONE);
   }
 
   public void set_candidates(List<String> suggestions)
@@ -133,6 +153,26 @@ public void onClick(View _v)
     _item_views[item_index] = v;
   }
 
+  private void setup_add_word_button()
+  {
+    _add_word_btn = findViewById(R.id.candidates_add_word);
+    if (_add_word_btn == null)
+      return;
+    _add_word_btn.setVisibility(View.GONE);
+    _add_word_btn.setOnClickListener(new View.OnClickListener()
+        {
+          @Override
+          public void onClick(View _v)
+          {
+            Intent i = new Intent(getContext(), PersonalDictionaryActivity.class);
+            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            if (_current_word != null && !_current_word.isEmpty())
+              i.putExtra(PersonalDictionaryActivity.EXTRA_WORD, _current_word);
+            getContext().startActivity(i);
+          }
+        });
+  }
+
   /** Whether the candidates view should be shown for a given editor. */
   public static boolean should_show(EditorInfo info)
   {
diff --git a/srcs/juloo.keyboard2/suggestions/Suggestions.java b/srcs/juloo.keyboard2/suggestions/Suggestions.java
index 41a79414c..f32da5a7e 100644
--- a/srcs/juloo.keyboard2/suggestions/Suggestions.java
+++ b/srcs/juloo.keyboard2/suggestions/Suggestions.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import juloo.cdict.Cdict;
 import juloo.keyboard2.dict.Dictionaries;
+import juloo.keyboard2.dict.PersonalDictionary;
 import juloo.keyboard2.Config;
 import juloo.keyboard2.ComposeKey;
 import juloo.keyboard2.ComposeKeyData;
@@ -34,52 +35,69 @@ public void started()
 
   public void currently_typed_word(String word)
   {
+    _callback.set_current_word(word.isEmpty() ? null : word);
     if (!_enabled)
       return;
     Cdict dict = _config.current_dictionary;
-    if (word.length() < 2 || dict == null)
+    PersonalDictionary pdict = _config.personal_dictionary;
+    boolean has_personal = pdict != null && !pdict.get_all().isEmpty();
+    if (word.length() < 2 || (dict == null && !has_personal))
     {
       set_suggestions(NO_SUGGESTIONS);
+      return;
     }
-    else
-    {
-      String[] dst = new String[3];
-      query_suggestions(dict, word, dst, 3);
-      set_suggestions(Arrays.asList(dst));
-    }
+    String[] dst = new String[3];
+    int count = 0;
+    if (has_personal)
+      count += pdict.find_suggestions(word, dst, count, 3 - count);
+    if (dict != null && count < 3)
+      count += query_suggestions(dict, word, dst, count, 3 - count);
+    set_suggestions(Arrays.asList(dst));
   }
 
-  int query_suggestions(Cdict dict, String word, String[] dst, int max_count)
+  /** Query the main dictionary for [word], writing results into [dst] starting
+      at [offset]. Returns the number of suggestions added. */
+  int query_suggestions(Cdict dict, String word, String[] dst, int offset, int max_count)
   {
     boolean first_char_upper = Character.isUpperCase(word.charAt(0));
     word = apply_substitutions(word);
     Cdict.Result r = dict.find(word);
     int i = 0;
     if (r.found)
-      dst[i++] = dict.word(r.index);
+      dst[offset + i++] = dict.word(r.index);
     int[] suffixes = dict.suffixes(r, max_count);
-    // Disable distance search for small words
     int[] dist = (word.length() < 3 || i + 1 >= max_count) ? NO_RESULTS :
       dict.distance(word, 1, max_count);
     for (int j = 0; j < max_count && i < max_count; j++)
     {
       if (suffixes.length > j)
-        dst[i++] = dict.word(suffixes[j]);
+        dst[offset + i++] = dict.word(suffixes[j]);
       if (dist.length > j && i < max_count)
-        dst[i++] = dict.word(dist[j]);
+        dst[offset + i++] = dict.word(dist[j]);
     }
     if (first_char_upper)
-      capitalize_results(dst);
+      capitalize_results(dst, offset, i);
     return i;
   }
 
-  void capitalize_results(String[] rs)
+  /** Kept for callers that don't need offset support. */
+  int query_suggestions(Cdict dict, String word, String[] dst, int max_count)
   {
-    for (int i = 0; i < rs.length; i++)
+    return query_suggestions(dict, word, dst, 0, max_count);
+  }
+
+  void capitalize_results(String[] rs, int offset, int count)
+  {
+    for (int i = offset; i < offset + count && i < rs.length; i++)
       if (rs[i] != null)
         rs[i] = rs[i].substring(0, 1).toUpperCase() + rs[i].substring(1);
   }
 
+  void capitalize_results(String[] rs)
+  {
+    capitalize_results(rs, 0, rs.length);
+  }
+
   /** Apply the same substitutions that were used when building the
       dictionaries to find word aliases. This catches missing diacritics for
       example. */
@@ -108,5 +126,7 @@ void set_suggestions(List<String> ws)
   public static interface Callback
   {
     public void set_suggestions(List<String> suggestions);
+    /** Called with the word currently being typed, or [null] when no word. */
+    public void set_current_word(String word);
   }
 }

From c0b4e588220a1a9f9b3dd12c05f72881fee5986e Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Wed, 27 May 2026 08:10:46 -0600
Subject: [PATCH 05/11] =?UTF-8?q?Works,=20dictionary=20download=20and=20ch?=
 =?UTF-8?q?ange=20active.=201.=20Settings=20crash=20=E2=80=94=20The=20<int?=
 =?UTF-8?q?ent>=20elements=20used=20android:targetPackage=3D"juloo.keyboar?=
 =?UTF-8?q?d2"=20but=20the=20debug=20build=20appends=20.debug=20to=20the?=
 =?UTF-8?q?=20app=20ID,=20so=20the=20intent=20couldn't=20resolve.=20Fixed?=
 =?UTF-8?q?=20by=20giving=20both=20preferences=20an=20android:key=20and=20?=
 =?UTF-8?q?wiring=20up=20OnPreferenceClickListener=20in=20SettingsActivity?=
 =?UTF-8?q?.java=20via=20wire=5Factivity=5Fpref(),=20which=20calls=20start?=
 =?UTF-8?q?Activity=20directly=20using=20the=20class=20reference=20(no=20p?=
 =?UTF-8?q?ackage=20string=20involved).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2. Manage dictionaries language list — The DictionaryListView.java change was already correct; the issue was just that the settings link crashed before you could reach it. After reinstalling the updated build, all 56 languages will appear.

3. "+" button always visible while typing — Fixed in CandidatesView.java: the "No dictionary installed" status view is now inserted before the "+" button in the layout (using addView(view, indexOfChild(_add_word_btn))), so the "+" always sits at the right edge. The "no dict" message also now hides if the personal dictionary has entries (so it won't keep saying "no dictionary" when personal words are in use).
---
 res/xml/settings.xml                          |  8 +---
 srcs/juloo.keyboard2/SettingsActivity.java    | 20 +++++++++
 .../suggestions/CandidatesView.java           | 41 ++++++++-----------
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 13dd0d993..16e0de463 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -16,12 +16,8 @@
     <CheckBoxPreference android:key="suggestions" android:title="@string/pref_suggestions_title" android:summary="@string/pref_suggestions_summary" android:defaultValue="true"/>
     <CheckBoxPreference android:key="space_bar_auto_complete" android:title="@string/pref_space_bar_auto_complete_title" android:summary="@string/pref_space_bar_auto_complete_summary" android:defaultValue="false"/>
     <juloo.keyboard2.prefs.DictionaryPickerPreference android:key="selected_dictionary" android:title="@string/pref_selected_dictionary_title" android:summary="%s" android:defaultValue="auto" android:dependency="suggestions"/>
-    <Preference android:title="@string/pref_manage_dictionaries_title" android:summary="@string/pref_manage_dictionaries_summary" android:dependency="suggestions">
-      <intent android:targetClass="juloo.keyboard2.dict.DictionariesActivity" android:targetPackage="juloo.keyboard2"/>
-    </Preference>
-    <Preference android:title="@string/pref_personal_dictionary_title" android:summary="@string/pref_personal_dictionary_summary" android:dependency="suggestions">
-      <intent android:targetClass="juloo.keyboard2.dict.PersonalDictionaryActivity" android:targetPackage="juloo.keyboard2"/>
-    </Preference>
+    <Preference android:key="pref_manage_dictionaries" android:title="@string/pref_manage_dictionaries_title" android:summary="@string/pref_manage_dictionaries_summary" android:dependency="suggestions"/>
+    <Preference android:key="pref_personal_dictionary" android:title="@string/pref_personal_dictionary_title" android:summary="@string/pref_personal_dictionary_summary" android:dependency="suggestions"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
diff --git a/srcs/juloo.keyboard2/SettingsActivity.java b/srcs/juloo.keyboard2/SettingsActivity.java
index dffc986dc..d40643b28 100644
--- a/srcs/juloo.keyboard2/SettingsActivity.java
+++ b/srcs/juloo.keyboard2/SettingsActivity.java
@@ -1,11 +1,15 @@
 package juloo.keyboard2;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
+import juloo.keyboard2.dict.DictionariesActivity;
+import juloo.keyboard2.dict.PersonalDictionaryActivity;
 
 public class SettingsActivity extends PreferenceActivity
 {
@@ -24,6 +28,9 @@ public void onCreate(Bundle savedInstanceState)
     catch (Exception _e) { fallbackEncrypted(); return; }
     addPreferencesFromResource(R.xml.settings);
 
+    wire_activity_pref("pref_manage_dictionaries", DictionariesActivity.class);
+    wire_activity_pref("pref_personal_dictionary", PersonalDictionaryActivity.class);
+
     boolean foldableDevice = FoldStateTracker.isFoldableDevice(this);
     findPreference("margin_bottom_portrait_unfolded").setEnabled(foldableDevice);
     findPreference("margin_bottom_landscape_unfolded").setEnabled(foldableDevice);
@@ -33,6 +40,19 @@ public void onCreate(Bundle savedInstanceState)
     findPreference("keyboard_height_landscape_unfolded").setEnabled(foldableDevice);
   }
 
+  void wire_activity_pref(String key, final Class<?> activity_class)
+  {
+    findPreference(key).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener()
+        {
+          @Override
+          public boolean onPreferenceClick(Preference preference)
+          {
+            startActivity(new Intent(SettingsActivity.this, activity_class));
+            return true;
+          }
+        });
+  }
+
   void fallbackEncrypted()
   {
     // Can't communicate with the user here.
diff --git a/srcs/juloo.keyboard2/suggestions/CandidatesView.java b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
index c43936b12..b97646c09 100644
--- a/srcs/juloo.keyboard2/suggestions/CandidatesView.java
+++ b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import juloo.keyboard2.Config;
 import juloo.keyboard2.R;
+import juloo.keyboard2.dict.PersonalDictionary;
 import juloo.keyboard2.dict.PersonalDictionaryActivity;
 
 public class CandidatesView extends LinearLayout
@@ -91,11 +92,21 @@ public void set_candidates(List<String> suggestions)
   public void refresh_config(Config config)
   {
     set_candidates(Suggestions.NO_SUGGESTIONS);
-    // The status message indicates whether the dictionaries should be
-    // installed.
-    _status_no_dict = inflate_and_show(_status_no_dict,
-        (config.current_dictionary == null),
-        R.layout.candidates_status_no_dict);
+    boolean no_dict =
+      config.current_dictionary == null
+      && (config.personal_dictionary == null || config.personal_dictionary.get_all().isEmpty());
+    if (_status_no_dict == null && no_dict)
+    {
+      _status_no_dict = View.inflate(getContext(), R.layout.candidates_status_no_dict, null);
+      // Insert before the "+" button so it stays at the right edge.
+      int add_idx = (_add_word_btn != null) ? indexOfChild(_add_word_btn) : -1;
+      if (add_idx >= 0)
+        addView(_status_no_dict, add_idx);
+      else
+        addView(_status_no_dict);
+    }
+    if (_status_no_dict != null)
+      _status_no_dict.setVisibility(no_dict ? View.VISIBLE : View.GONE);
     set_height(config);
   }
 
@@ -116,26 +127,6 @@ void set_height(Config config)
     }
   }
 
-  /** Show or hide a status view and inflate it if needed. */
-  View inflate_and_show(View v, boolean show, int layout_id)
-  {
-    if (!show)
-    {
-      if (v != null)
-        v.setVisibility(View.GONE);
-    }
-    else
-    {
-      if (v == null)
-      {
-        v = View.inflate(getContext(), layout_id, null);
-        addView(v);
-      }
-      v.setVisibility(View.VISIBLE);
-    }
-    return v;
-  }
-
   private void setup_item_view(final int item_index, int item_id)
   {
     TextView v = (TextView)findViewById(item_id);

From 32c2d5ecab026977f24e11ad0ae32e3e445e68ad Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Wed, 27 May 2026 08:25:46 -0600
Subject: [PATCH 06/11] The key: switch_dictionary Add it to any keyboard
 layout XML like this:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<key key0="switch_dictionary"/>
It displays as "¿" (upside-down question mark) — distinctive, small, no font glyphs to add.

How it works
Tapping the key opens a full-width dictionary picker pane that replaces the keyboard view (same pattern as the emoji/clipboard panes). It lists:

Auto (based on language) — the existing locale-derived behavior
One row per installed dictionary, by display name
The currently active dictionary is marked with a ✓ checkmark. Tapping any row immediately:

Writes selected_dictionary to SharedPreferences
Updates _config.selected_dictionary
Calls refresh_current_dictionary() and refreshes suggestions
Returns to the keyboard
The bottom of the pane has a standard keyboard row with an "ABC" key to close and return without changing anything.
---
 res/layout/dictionary_picker_item.xml | 28 ++++++++++++
 res/layout/dictionary_picker_pane.xml | 30 +++++++++++++
 res/values/strings.xml                |  1 +
 res/xml/dict_picker_bottom_row.xml    |  6 +++
 srcs/juloo.keyboard2/KeyValue.java    |  4 ++
 srcs/juloo.keyboard2/Keyboard2.java   | 64 +++++++++++++++++++++++++++
 6 files changed, 133 insertions(+)
 create mode 100644 res/layout/dictionary_picker_item.xml
 create mode 100644 res/layout/dictionary_picker_pane.xml
 create mode 100644 res/xml/dict_picker_bottom_row.xml

diff --git a/res/layout/dictionary_picker_item.xml b/res/layout/dictionary_picker_item.xml
new file mode 100644
index 000000000..e2a5b5838
--- /dev/null
+++ b/res/layout/dictionary_picker_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingHorizontal="24dp"
+    android:paddingVertical="14dp"
+    android:gravity="center_vertical"
+    android:minHeight="48dp">
+
+  <TextView
+      android:id="@+id/dict_picker_item_name"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:textSize="16sp"
+      android:textColor="?attr/colorLabel"/>
+
+  <TextView
+      android:id="@+id/dict_picker_item_check"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="✓"
+      android:textSize="18sp"
+      android:textColor="?attr/colorLabelActivated"
+      android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/res/layout/dictionary_picker_pane.xml b/res/layout/dictionary_picker_pane.xml
new file mode 100644
index 000000000..20ba219f9
--- /dev/null
+++ b/res/layout/dictionary_picker_pane.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorKeyboard">
+
+  <!-- Scrollable list of dictionaries -->
+  <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1">
+
+    <LinearLayout
+        android:id="@+id/dict_picker_list"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="8dp"/>
+
+  </ScrollView>
+
+  <!-- Bottom row with back button, themed as a keyboard row -->
+  <juloo.keyboard2.Keyboard2View
+      layout="@xml/dict_picker_bottom_row"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?attr/colorKeyboard"/>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bdbe307dc..8348b7429 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,6 +167,7 @@
     <string name="candidates_add_word_desc">Add word to personal dictionary</string>
     <string name="pref_selected_dictionary_title">Active dictionary</string>
     <string name="pref_selected_dictionary_auto">Auto (based on language)</string>
+    <string name="dict_picker_title">Select dictionary</string>
     <string name="pref_manage_dictionaries_title">Manage dictionaries</string>
     <string name="pref_manage_dictionaries_summary">Download or remove language dictionaries</string>
     <string name="pref_personal_dictionary_title">Personal dictionary</string>
diff --git a/res/xml/dict_picker_bottom_row.xml b/res/xml/dict_picker_bottom_row.xml
new file mode 100644
index 000000000..ce1251fda
--- /dev/null
+++ b/res/xml/dict_picker_bottom_row.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard bottom_row="false">
+  <row height="0.95">
+    <key key0="switch_back_dict_picker"/>
+  </row>
+</keyboard>
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index 04f695070..a2db1d20e 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -24,6 +24,8 @@ public static enum Event
     CAPS_LOCK,
     SWITCH_VOICE_TYPING,
     SWITCH_VOICE_TYPING_CHOOSER,
+    SWITCH_DICTIONARY,
+    SWITCH_BACK_DICT_PICKER,
   }
 
   // Must be evaluated in the reverse order of their values.
@@ -643,6 +645,8 @@ public static KeyValue getSpecialKeyByName(String name)
       case "capslock": return eventKey(0xE012, Event.CAPS_LOCK, 0);
       case "voice_typing": return eventKey(0xE015, Event.SWITCH_VOICE_TYPING, FLAG_SMALLER_FONT);
       case "voice_typing_chooser": return VOICE_TYPING_CHOOSER;
+      case "switch_dictionary": return eventKey("¿", Event.SWITCH_DICTIONARY, FLAG_SMALLER_FONT);
+      case "switch_back_dict_picker": return eventKey("ABC", Event.SWITCH_BACK_DICT_PICKER, 0);
 
       /* Key events */
       case "esc": return keyeventKey("Esc", KeyEvent.KEYCODE_ESCAPE, FLAG_SMALLER_FONT);
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 81a3d6f23..60c872a93 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -19,6 +19,7 @@
 import android.widget.LinearLayout;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import android.view.Gravity;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -27,6 +28,7 @@
 import juloo.keyboard2.dict.DictionariesActivity;
 import juloo.keyboard2.dict.PersonalDictionary;
 import juloo.keyboard2.dict.PersonalDictionaryActivity;
+import juloo.keyboard2.dict.SupportedDictionaries;
 import juloo.keyboard2.prefs.LayoutsPreference;
 import juloo.keyboard2.suggestions.CandidatesView;
 import juloo.cdict.Cdict;
@@ -49,6 +51,7 @@ public class Keyboard2 extends InputMethodService
   private PersonalDictionary _personal_dictionary;
   private ViewGroup _emojiPane = null;
   private ViewGroup _clipboard_pane = null;
+  private ViewGroup _dictionary_picker_pane = null;
   private Handler _handler;
 
   private Config _config;
@@ -221,6 +224,7 @@ private void refresh_config()
       create_keyboard_view();
       _emojiPane = null;
       _clipboard_pane = null;
+      _dictionary_picker_pane = null;
       setInputView(_keyboard_container_view);
     }
     // Set keyboard background opacity
@@ -429,6 +433,13 @@ public void handle_event_key(KeyValue.Event ev)
           setInputView(_clipboard_pane);
           break;
 
+        case SWITCH_DICTIONARY:
+          _dictionary_picker_pane = (ViewGroup)inflate_view(R.layout.dictionary_picker_pane);
+          build_dictionary_picker(_dictionary_picker_pane);
+          setInputView(_dictionary_picker_pane);
+          break;
+
+        case SWITCH_BACK_DICT_PICKER:
         case SWITCH_BACK_EMOJI:
         case SWITCH_BACK_CLIPBOARD:
           setInputView(_keyboard_container_view);
@@ -528,6 +539,59 @@ private IBinder getConnectionToken()
     return getWindow().getWindow().getAttributes().token;
   }
 
+  /** Populate the dictionary picker pane with the current set of installed
+      dictionaries and wire up selection callbacks. */
+  private void build_dictionary_picker(ViewGroup pane)
+  {
+    android.widget.LinearLayout list =
+      (android.widget.LinearLayout)pane.findViewById(R.id.dict_picker_list);
+    list.removeAllViews();
+    SupportedDictionaries supported = new SupportedDictionaries(getResources());
+    Set<String> installed = _dictionaries.get_installed();
+    String current = _config.selected_dictionary;
+
+    add_dictionary_picker_item(list, getString(R.string.pref_selected_dictionary_auto),
+        "auto", "auto".equals(current) || current == null);
+
+    for (int i = 0; i < supported.length(); i++)
+    {
+      final String name = supported.dict_name(i);
+      if (!installed.contains(name))
+        continue;
+      add_dictionary_picker_item(list, supported.display_name(i),
+          name, name.equals(current));
+    }
+  }
+
+  private void add_dictionary_picker_item(android.widget.LinearLayout list,
+      String label, String dict_key, boolean is_current)
+  {
+    android.view.View row =
+      View.inflate(new ContextThemeWrapper(this, _config.theme),
+          R.layout.dictionary_picker_item, null);
+    ((android.widget.TextView)row.findViewById(R.id.dict_picker_item_name))
+      .setText(label);
+    android.widget.TextView check =
+      (android.widget.TextView)row.findViewById(R.id.dict_picker_item_check);
+    check.setVisibility(is_current ? View.VISIBLE : View.GONE);
+
+    row.setOnClickListener(new View.OnClickListener()
+        {
+          @Override
+          public void onClick(View v)
+          {
+            Config.globalPrefs().edit()
+              .putString("selected_dictionary", dict_key)
+              .apply();
+            _config.selected_dictionary = dict_key;
+            refresh_current_dictionary();
+            _keyeventhandler.ime_subtype_changed();
+            setInputView(_keyboard_container_view);
+          }
+        });
+    list.addView(row);
+  }
+
   private View inflate_view(int layout)
   {
     return View.inflate(new ContextThemeWrapper(this, _config.theme), layout, null);

From 841028901d8eb15eb68a322d8b3814d9e034dd25 Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Wed, 27 May 2026 08:59:42 -0600
Subject: [PATCH 07/11] =?UTF-8?q?ActionBar=20title=20now=20shows=20"Person?=
 =?UTF-8?q?al=20Dictionary"=20(from=20setTitle(R.string.personal=5Fdict=5F?=
 =?UTF-8?q?title))=20"Add=20word"=20is=20now=20a=20clearly=20visible=20but?=
 =?UTF-8?q?ton=20in=20the=20ActionBar,=20always=20accessible=20at=20the=20?=
 =?UTF-8?q?top=20right=20Back=20arrow=20added=20via=20setDisplayHomeAsUpEn?=
 =?UTF-8?q?abled(true)=20so=20the=20user=20can=20navigate=20back=20The=20r?=
 =?UTF-8?q?edundant=20custom=20header=20row=20is=20gone=20=E2=80=94=20the?=
 =?UTF-8?q?=20layout=20is=20now=20just=20a=20scrollable=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/layout/personal_dict_activity.xml         | 45 +++----------------
 res/menu/personal_dict_menu.xml               |  6 +++
 .../dict/PersonalDictionaryActivity.java      | 35 ++++++++++++---
 3 files changed, 40 insertions(+), 46 deletions(-)
 create mode 100644 res/menu/personal_dict_menu.xml

diff --git a/res/layout/personal_dict_activity.xml b/res/layout/personal_dict_activity.xml
index e1d6143d1..9efa9dd7b 100644
--- a/res/layout/personal_dict_activity.xml
+++ b/res/layout/personal_dict_activity.xml
@@ -1,47 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
   <LinearLayout
+      android:id="@+id/personal_dict_list"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:padding="8dp"
-      android:gravity="center_vertical">
+      android:orientation="vertical"/>
 
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="@string/personal_dict_title"
-        android:textAppearance="?android:textAppearanceMedium"/>
-
-    <Button
-        android:id="@+id/personal_dict_add_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/personal_dict_add_btn"/>
-
-  </LinearLayout>
-
-  <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?android:attr/dividerHorizontal"/>
-
-  <ScrollView
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1">
-
-    <LinearLayout
-        android:id="@+id/personal_dict_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
-
-  </ScrollView>
-
-</LinearLayout>
+</ScrollView>
diff --git a/res/menu/personal_dict_menu.xml b/res/menu/personal_dict_menu.xml
new file mode 100644
index 000000000..51f111f7e
--- /dev/null
+++ b/res/menu/personal_dict_menu.xml
@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+      android:id="@+id/personal_dict_menu_add"
+      android:title="@string/personal_dict_add_btn"
+      android:showAsAction="always"/>
+</menu>
diff --git a/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
index 0758a82db..f34bb68cb 100644
--- a/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
+++ b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
@@ -4,6 +4,8 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -26,12 +28,9 @@ public void onCreate(Bundle savedInstanceState)
     _dict = PersonalDictionary.instance(this);
     setContentView(R.layout.personal_dict_activity);
     _list_container = (LinearLayout)findViewById(R.id.personal_dict_list);
-
-    findViewById(R.id.personal_dict_add_btn).setOnClickListener(new View.OnClickListener()
-        {
-          @Override
-          public void onClick(View v) { show_add_dialog(null); }
-        });
+    setTitle(R.string.personal_dict_title);
+    if (getActionBar() != null)
+      getActionBar().setDisplayHomeAsUpEnabled(true);
 
     String prefill = getIntent().getStringExtra(EXTRA_WORD);
     if (prefill != null && !prefill.isEmpty())
@@ -40,6 +39,30 @@ public void onCreate(Bundle savedInstanceState)
     refresh_list();
   }
 
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu)
+  {
+    getMenuInflater().inflate(R.menu.personal_dict_menu, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item)
+  {
+    int id = item.getItemId();
+    if (id == R.id.personal_dict_menu_add)
+    {
+      show_add_dialog(null);
+      return true;
+    }
+    if (id == android.R.id.home)
+    {
+      finish();
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
   void show_add_dialog(String initial_word)
   {
     show_word_dialog(

From ec9dddecaf9a0ec23026f51e9cc7fa86fcfeeea6 Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Wed, 27 May 2026 09:08:14 -0600
Subject: [PATCH 08/11] =?UTF-8?q?Overlap=20fixed=20=E2=80=94=20added=20fit?=
 =?UTF-8?q?sSystemWindows=3D"true"=20to=20the=20ScrollView=20so=20the=20li?=
 =?UTF-8?q?st=20starts=20below=20the=20ActionBar=20instead=20of=20sliding?=
 =?UTF-8?q?=20under=20it=20Single-line=20entries=20=E2=80=94=20word=20take?=
 =?UTF-8?q?s=20the=20left=20side=20(with=20weight=3D1),=20replacement=20te?=
 =?UTF-8?q?xt=20sits=20to=20the=20right=20with=20an=20ellipsis=20if=20it's?=
 =?UTF-8?q?=20too=20long?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/layout/personal_dict_activity.xml |  3 ++-
 res/layout/personal_dict_entry.xml    | 31 ++++++++++++---------------
 srcs/layouts/latn_dvorak.xml          |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/res/layout/personal_dict_activity.xml b/res/layout/personal_dict_activity.xml
index 9efa9dd7b..41577ed47 100644
--- a/res/layout/personal_dict_activity.xml
+++ b/res/layout/personal_dict_activity.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
   <LinearLayout
       android:id="@+id/personal_dict_list"
diff --git a/res/layout/personal_dict_entry.xml b/res/layout/personal_dict_entry.xml
index c3c6b045a..68b831233 100644
--- a/res/layout/personal_dict_entry.xml
+++ b/res/layout/personal_dict_entry.xml
@@ -3,29 +3,26 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="12dp"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp"
     android:gravity="center_vertical"
     android:minHeight="48dp">
 
-  <LinearLayout
+  <TextView
+      android:id="@+id/personal_dict_entry_word"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:orientation="vertical">
+      android:textAppearance="?android:textAppearanceMedium"/>
 
-    <TextView
-        android:id="@+id/personal_dict_entry_word"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearanceMedium"/>
-
-    <TextView
-        android:id="@+id/personal_dict_entry_replacement"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearanceSmall"
-        android:textColor="?android:textColorSecondary"/>
-
-  </LinearLayout>
+  <TextView
+      android:id="@+id/personal_dict_entry_replacement"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textAppearance="?android:textAppearanceSmall"
+      android:textColor="?android:textColorSecondary"
+      android:maxWidth="160dp"
+      android:ellipsize="end"
+      android:singleLine="true"/>
 
 </LinearLayout>
diff --git a/srcs/layouts/latn_dvorak.xml b/srcs/layouts/latn_dvorak.xml
index 83eb63681..ebc960481 100644
--- a/srcs/layouts/latn_dvorak.xml
+++ b/srcs/layouts/latn_dvorak.xml
@@ -38,7 +38,7 @@
   </row>
   <row scale="10" height="0.95">
     <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
-    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="1.3" c="fn" nw="switch_dictionary" ne="loc change_method" sw="switch_emoji" se="config"/>
     <key width="2.2" c="space" n="switch_forward" key5="cursor_left" e="cursor_right"/>
     <key width="1.3" c="loc compose" n="up" e="right" key5="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
     <key width="2.2" c="space" n="switch_backward" key5="cursor_left" e="cursor_right"/>

From 9ca14c6f7d9a90a7ec9645c012b65833170c868b Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Thu, 28 May 2026 08:45:37 -0600
Subject: [PATCH 09/11] =?UTF-8?q?Dictionary=20picker=20pane=20=E2=80=94=20?=
 =?UTF-8?q?two-column=20redesign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Narrow left column: Auto/Correct labels + Switch toggle at top, ABC button at bottom
Full-height right column: scrollable dictionary list
Height locked to keyboard height via OnPreDrawListener (no flash)
Dictionary item rows: padding halved, 14sp text
Autocorrect toggle

Switch in the dict picker left column persists to SharedPreferences
Wired to KeyEventHandler.set_space_bar_auto_complete() without resetting other state
switch_dictionary key glyph

New glyph at 0xE01D — ¿ inside a square outline with evenodd cutaway where they intersect
Built via FontForge from srcs/special_font/01D.svg
Key uses FLAG_KEY_FONT | FLAG_SMALLER_FONT
Always-visible + button

+ button stays visible at all times in the candidates bar (not just while typing)
Backspace undo → + button pre-population

Backspace undoing an autocorrect highlights the + button and stores the original/corrected words
_pending_word (original) and _pending_replacement (correction) stored separately from _current_word so they survive the word-tracking reset that fires when cursor lands after the restored space
Both fields persist until the user taps + (which opens PersonalDictionaryActivity pre-filled) or a new autocorrect fires
PersonalDictionaryActivity

Title set correctly; Add word moved to ActionBar options menu
Back navigation via ActionBar home button
Accepts EXTRA_WORD and EXTRA_REPLACEMENT intents for pre-filling both fields
Entry rows: compact single-line horizontal layout (word + → replacement)
---
 assets/special_font.ttf                       | Bin 23420 -> 23700 bytes
 res/layout/dictionary_picker_item.xml         |  10 +--
 res/layout/dictionary_picker_pane.xml         |  71 +++++++++++++++---
 res/layout/keyboard.xml                       |   2 +-
 res/values/strings.xml                        |   1 +
 srcs/juloo.keyboard2/KeyEventHandler.java     |  15 ++++
 srcs/juloo.keyboard2/KeyValue.java            |   2 +-
 srcs/juloo.keyboard2/Keyboard2.java           |  55 ++++++++++++++
 .../dict/PersonalDictionaryActivity.java      |  14 ++--
 .../suggestions/CandidatesView.java           |  51 +++++++++++--
 srcs/special_font/01D.svg                     |  50 ++++++++++++
 11 files changed, 240 insertions(+), 31 deletions(-)
 create mode 100644 srcs/special_font/01D.svg

diff --git a/assets/special_font.ttf b/assets/special_font.ttf
index b124fc55350b35b78c6a7b3631fc5409f08a44dd..6c7e38c12c7aacd3a5aaf6d87939d123ef53eca3 100644
GIT binary patch
delta 1095
zcmYLIZD?C%6h80G&5db3Z@!wO`MAkVlQgtja&K}|?4(;;hm^V&4Q)1tHfC*ZU1LHQ
zB^krGp+)hR+%f8?TBW~4f|_-6AjL2Iql{7fC_~VJ7Jp2Xp+iI)Puht0<#3*Jo^$T|
zp7)&h@2lkEby5cc00wvtR4{e)Xy)PfUb^}vz{x6lJ(G_f6r_zut^trN+Ozp$uAF{H
zdLKZAHgzcfOof90RRd68M4m3>&Xij%{1cokqkUgtu{Qt0N<$04ECNh!%X7I?2Y(%r
zkoyirlI6L2PIFt;zzuBZ2+74tHSn@~8SM{H))q_o+!fv0DcoQM`K@BET80m)Pmvo$
zn|mr(oV)bkCkUs<@IdBr=}hI@+cnJ1X7D`jz2dOIsaJ)~$4!U+0G;Y*42GQtTC4k-
zYOTKVTUsOUMas$n;w9fG6J(pF`(V5oqD117u%PxOd4MKv)Mi{*;tyV>tP*t(K^C5c
zx8MqVt~69%kV3OcYlw1QJyw^yR=V!$4(Qf(n|jd4^cnpH{T;&z!<O-|@m-VCbjfTs
zpELi-&azvU!&bBPg7vN~Yx~MRVc&GP9cLXsc8_(hb^qmDbl!3ey54rv?kC+hd+zUf
zz2}~1%JY#o=DqA=d}n>ze#yViQQRzdD{vyP6Pyix#!v7KTPPM<@3r(Uhar49!bGZ(
zI{?iL^NY1k!+7hu>U-*Iut601VG_U^WbCZXF+{?Va4O8Rf|L>?0gY&Lh%8dPMnn&r
z4D)I}C0dPy4`N(0E$yw8XlFEx#z^e8ZigtKPkb$yNCZbb3^7<N&JCIjs~S$0b;jr!
zK9NuGyC0uEeZD_8R315EvH1Pb82^|**5~wuqS0X~Df$?y7Uy^Md|XJGOnOpvva-xN
zcV9#u=gIGU+*<laYqqD;$CHsrfOGdao_@pPa@k!+`i8t-)?#fAyPZRI7bN$3hXVsz
zc%p+T(7?G4RzWY^>|h$Sq^pC~U?TtJGU(5?r+~&$1_5Os6R^Os4yM2eiyf?jad^Is
zi<m%T(7g_!1|JUkeli0VG6thif-=-#2^OFLGE{)Wj^v>awE%Gx3H!srJn~C0hZ;sp
z<=WChL9TGod><#o1*xB#Us#%(S0<;+tN?>B04bDCx^iRMrxgYVQUmQ!jNug9%rPB>
zRp8g!06}?^wi8)dp1DDhc_owGp%P=w<nd98$7{p)+zxF&0QkvpO=;`@pHFM`U)&n!
AYXATM

delta 836
zcmX|9T}V@57=FHU&VF>d9i4x3Kc4B-30gWu)YKA7ys!n9KWW(J)Xi{i=oBZx7Dz}J
zCLOOL%&YLG8<%0!ML&{4AyGHsMN}8!O?G1u5w3SOIv)@3^Zq>V`QDdr=?VMum_@(<
zq#+6(XD(bk>8M@rd<3v|in=_0cd(|WehuKy0$hV<IwZl$g#ksB@`Ber8H~qCiT)7z
zYVTNhWWXH{0?JE(^Uyc!9=g&0{fKgJ3AH{7sJ`$IslPzJ&F2qAX3T^6jTBfV+#3sc
z+_$#wSJDsWsNkL7Jrl%J?iJ<i<V)jj|FA1;bpl;<LCz2iOol2nwLgKLA-a!vJPZxA
zeb?x`s%!iK4Zlx1EF5-6|6A+PmQc-ilCK6QYgw7fd#v-y&CJX`$XD3MSRGf*3^g=a
zVml@XERU>6hi3h3lIQqpO&hv#9V=MFru>qB6T2-anJg>XA|<KO)MpxprbDx!+0cAV
z6VqnX_S0SIJKARL1D#E`ET)P##e)o2#!lw4UerhRds%~7yV)Jtt2yeNiJbSjCvxX=
zf9Lt~UK{ERcMQMs2lBU#<;FSVCzI2(VYZu>ENaV$WwXFhuvl;)`J{bo$a+xNS-4x&
zShOM99JZC>tm1_dd&yF%vUD~!ru?RlH5qeGMa*bCo{08|6pSZ12NmX%oQDm&NiHCT
z>62Um9cxN*CB@x|-3TePl?K8;&X9?|B<G;TOp^0x$6|s<NFY#A;>je$3Rsvq$(6`t
z=h2D)f(T;*qwvCq5G2^)K^fU9)T0iSC@0=Rmk$ua@ROawB+wcNh9^e7zK~@1lu1?f
zb(Q5(%XnZs><>&)x{Ipib3NB|Rj8m=2^_bRpZ8eQRTXqdA)oG%WL2+IOEYl<`r_+w
b$S;I!=9Q;=cjUIqd$F3nCQiZV;d6fh^whEU

diff --git a/res/layout/dictionary_picker_item.xml b/res/layout/dictionary_picker_item.xml
index e2a5b5838..c9afd464a 100644
--- a/res/layout/dictionary_picker_item.xml
+++ b/res/layout/dictionary_picker_item.xml
@@ -3,17 +3,17 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingHorizontal="24dp"
-    android:paddingVertical="14dp"
+    android:paddingHorizontal="12dp"
+    android:paddingVertical="7dp"
     android:gravity="center_vertical"
-    android:minHeight="48dp">
+    android:minHeight="28dp">
 
   <TextView
       android:id="@+id/dict_picker_item_name"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:textSize="16sp"
+      android:textSize="14sp"
       android:textColor="?attr/colorLabel"/>
 
   <TextView
@@ -21,7 +21,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="✓"
-      android:textSize="18sp"
+      android:textSize="16sp"
       android:textColor="?attr/colorLabelActivated"
       android:visibility="gone"/>
 
diff --git a/res/layout/dictionary_picker_pane.xml b/res/layout/dictionary_picker_pane.xml
index 20ba219f9..1b25df89c 100644
--- a/res/layout/dictionary_picker_pane.xml
+++ b/res/layout/dictionary_picker_pane.xml
@@ -1,14 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorKeyboard">
 
-  <!-- Scrollable list of dictionaries -->
+  <!-- Left column: autocorrect toggle at top, ABC back button at bottom -->
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      android:gravity="center_horizontal"
+      android:paddingVertical="8dp"
+      android:paddingHorizontal="6dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Auto"
+        android:textColor="?attr/colorLabel"
+        android:textSize="11sp"
+        android:gravity="center"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Correct"
+        android:textColor="?attr/colorLabel"
+        android:textSize="11sp"
+        android:gravity="center"/>
+
+    <Switch
+        android:id="@+id/dict_picker_autocorrect_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"/>
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:id="@+id/dict_picker_abc_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="ABC"
+        android:textColor="?attr/colorLabel"
+        android:textSize="14sp"
+        android:gravity="center"
+        android:padding="8dp"/>
+
+  </LinearLayout>
+
+  <!-- Vertical divider -->
+  <View
+      android:layout_width="1dp"
+      android:layout_height="match_parent"
+      android:background="?attr/colorKey"/>
+
+  <!-- Right column: scrollable list of dictionaries -->
   <ScrollView
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
+      android:layout_width="0dp"
+      android:layout_height="match_parent"
       android:layout_weight="1">
 
     <LinearLayout
@@ -16,15 +70,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingVertical="8dp"/>
+        android:paddingVertical="4dp"/>
 
   </ScrollView>
 
-  <!-- Bottom row with back button, themed as a keyboard row -->
-  <juloo.keyboard2.Keyboard2View
-      layout="@xml/dict_picker_bottom_row"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/colorKeyboard"/>
-
 </LinearLayout>
diff --git a/res/layout/keyboard.xml b/res/layout/keyboard.xml
index f1d5f7850..0add44044 100644
--- a/res/layout/keyboard.xml
+++ b/res/layout/keyboard.xml
@@ -4,7 +4,7 @@
     <TextView android:id="@+id/candidates_left" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
     <TextView android:id="@+id/candidates_middle" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
     <TextView android:id="@+id/candidates_right" style="@style/candidates_item" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1"/>
-    <TextView android:id="@+id/candidates_add_word" android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center_vertical" android:layout_marginEnd="4dp" android:gravity="center" android:text="@string/candidates_add_word" android:textColor="?attr/colorLabel" android:textSize="18sp" android:visibility="gone" android:contentDescription="@string/candidates_add_word_desc"/>
+    <TextView android:id="@+id/candidates_add_word" android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center_vertical" android:layout_marginEnd="4dp" android:gravity="center" android:text="@string/candidates_add_word" android:textColor="?attr/colorLabel" android:textSize="18sp" android:visibility="visible" android:contentDescription="@string/candidates_add_word_desc"/>
   </juloo.keyboard2.suggestions.CandidatesView>
   <juloo.keyboard2.Keyboard2View android:id="@+id/keyboard_view" android:layout_width="match_parent" android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8348b7429..c41fb19dd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -168,6 +168,7 @@
     <string name="pref_selected_dictionary_title">Active dictionary</string>
     <string name="pref_selected_dictionary_auto">Auto (based on language)</string>
     <string name="dict_picker_title">Select dictionary</string>
+    <string name="dict_picker_autocorrect_label">Auto-correct with space bar</string>
     <string name="pref_manage_dictionaries_title">Manage dictionaries</string>
     <string name="pref_manage_dictionaries_summary">Download or remove language dictionaries</string>
     <string name="pref_personal_dictionary_title">Personal dictionary</string>
diff --git a/srcs/juloo.keyboard2/KeyEventHandler.java b/srcs/juloo.keyboard2/KeyEventHandler.java
index 66a10dfca..32fcbebbf 100644
--- a/srcs/juloo.keyboard2/KeyEventHandler.java
+++ b/srcs/juloo.keyboard2/KeyEventHandler.java
@@ -137,6 +137,7 @@ public void suggestion_entered(String text)
     int cur_rel = _typedword.cursor_relative();
     replace_surrounding_text(old.length() + cur_rel, -cur_rel, text + " ");
     last_replaced_word = old;
+    last_correction_word = text;
     last_replacement_word_len = text.length() + 1;
     _next_last_action = LastAction.SUGGESTION_ENTERED;
   }
@@ -159,6 +160,11 @@ public void ime_subtype_changed()
     _suggestions.currently_typed_word(_typedword.get());
   }
 
+  public void set_space_bar_auto_complete(boolean enabled)
+  {
+    _space_bar_auto_complete = enabled;
+  }
+
   /** Update [_mods] to be consistent with the [mods], sending key events if
       needed. */
   void update_meta_state(Pointers.Modifiers mods)
@@ -525,6 +531,8 @@ void cancel_selection()
       enter a suggestion (with the space bar or the candidates view) or [null]
       otherwise. */
   String last_replaced_word = null;
+  /** The suggestion that replaced [last_replaced_word]. */
+  String last_correction_word = null;
   /** Length of the text before the cursor that should be replaced by
       backspace. */
   int last_replacement_word_len = 0;
@@ -548,7 +556,11 @@ void handle_backspace()
     {
       replace_surrounding_text(last_replacement_word_len, 0,
           last_replaced_word + " ");
+      String original = last_replaced_word;
+      String corrected = last_correction_word;
       last_replaced_word = null;
+      last_correction_word = null;
+      _recv.on_autocorrect_undone(original, corrected);
     }
     else
     {
@@ -564,6 +576,9 @@ public static interface IReceiver extends Suggestions.Callback
     public void selection_state_changed(boolean selection_is_ongoing);
     public InputConnection getCurrentInputConnection();
     public Handler getHandler();
+    /** Called after backspace undoes an autocorrect. [original] is the word
+        the user typed, [corrected] is what autocorrect inserted. */
+    public void on_autocorrect_undone(String original, String corrected);
   }
 
   class Autocapitalisation_callback implements Autocapitalisation.Callback
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index a2db1d20e..3f31e6423 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -645,7 +645,7 @@ public static KeyValue getSpecialKeyByName(String name)
       case "capslock": return eventKey(0xE012, Event.CAPS_LOCK, 0);
       case "voice_typing": return eventKey(0xE015, Event.SWITCH_VOICE_TYPING, FLAG_SMALLER_FONT);
       case "voice_typing_chooser": return VOICE_TYPING_CHOOSER;
-      case "switch_dictionary": return eventKey("¿", Event.SWITCH_DICTIONARY, FLAG_SMALLER_FONT);
+      case "switch_dictionary": return eventKey(0xE01D, Event.SWITCH_DICTIONARY, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
       case "switch_back_dict_picker": return eventKey("ABC", Event.SWITCH_BACK_DICT_PICKER, 0);
 
       /* Key events */
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 60c872a93..25847c430 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -436,7 +436,30 @@ public void handle_event_key(KeyValue.Event ev)
         case SWITCH_DICTIONARY:
           _dictionary_picker_pane = (ViewGroup)inflate_view(R.layout.dictionary_picker_pane);
           build_dictionary_picker(_dictionary_picker_pane);
+          final int dict_picker_h =
+            _keyboard_layout_view.getMeasuredHeight() + _candidates_view.getMeasuredHeight();
           setInputView(_dictionary_picker_pane);
+          if (dict_picker_h > 0)
+          {
+            final ViewGroup picker_pane = _dictionary_picker_pane;
+            picker_pane.getViewTreeObserver().addOnPreDrawListener(
+                new android.view.ViewTreeObserver.OnPreDrawListener()
+                {
+                  @Override
+                  public boolean onPreDraw()
+                  {
+                    picker_pane.getViewTreeObserver().removeOnPreDrawListener(this);
+                    android.view.ViewGroup.LayoutParams lp = picker_pane.getLayoutParams();
+                    if (lp != null && lp.height != dict_picker_h)
+                    {
+                      lp.height = dict_picker_h;
+                      picker_pane.setLayoutParams(lp);
+                      return false;
+                    }
+                    return true;
+                  }
+                });
+          }
           break;
 
         case SWITCH_BACK_DICT_PICKER:
@@ -532,6 +555,11 @@ public void set_current_word(String word)
     {
       _candidates_view.set_current_word(word);
     }
+
+    public void on_autocorrect_undone(String original, String corrected)
+    {
+      _candidates_view.on_autocorrect_undone(original, corrected);
+    }
   }
 
   private IBinder getConnectionToken()
@@ -543,6 +571,33 @@ private IBinder getConnectionToken()
       dictionaries and wire up selection callbacks. */
   private void build_dictionary_picker(ViewGroup pane)
   {
+    android.widget.Switch toggle =
+      (android.widget.Switch)pane.findViewById(R.id.dict_picker_autocorrect_switch);
+    toggle.setChecked(_config.space_bar_auto_complete);
+    toggle.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener()
+        {
+          @Override
+          public void onCheckedChanged(android.widget.CompoundButton btn, boolean checked)
+          {
+            Config.globalPrefs().edit()
+              .putBoolean("space_bar_auto_complete", checked)
+              .apply();
+            _config.space_bar_auto_complete = checked;
+            _keyeventhandler.set_space_bar_auto_complete(checked);
+          }
+        });
+
+    View abc_btn = pane.findViewById(R.id.dict_picker_abc_btn);
+    if (abc_btn != null)
+      abc_btn.setOnClickListener(new View.OnClickListener()
+          {
+            @Override
+            public void onClick(View v)
+            {
+              setInputView(_keyboard_container_view);
+            }
+          });
+
     android.widget.LinearLayout list =
       (android.widget.LinearLayout)pane.findViewById(R.id.dict_picker_list);
     list.removeAllViews();
diff --git a/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
index f34bb68cb..99416da88 100644
--- a/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
+++ b/srcs/juloo.keyboard2/dict/PersonalDictionaryActivity.java
@@ -17,6 +17,7 @@
 public class PersonalDictionaryActivity extends Activity
 {
   public static final String EXTRA_WORD = "word";
+  public static final String EXTRA_REPLACEMENT = "replacement";
 
   PersonalDictionary _dict;
   LinearLayout _list_container;
@@ -32,9 +33,10 @@ public void onCreate(Bundle savedInstanceState)
     if (getActionBar() != null)
       getActionBar().setDisplayHomeAsUpEnabled(true);
 
-    String prefill = getIntent().getStringExtra(EXTRA_WORD);
-    if (prefill != null && !prefill.isEmpty())
-      show_add_dialog(prefill);
+    String prefill_word = getIntent().getStringExtra(EXTRA_WORD);
+    String prefill_replacement = getIntent().getStringExtra(EXTRA_REPLACEMENT);
+    if (prefill_word != null && !prefill_word.isEmpty())
+      show_add_dialog(prefill_word, prefill_replacement != null ? prefill_replacement : "");
 
     refresh_list();
   }
@@ -52,7 +54,7 @@ public boolean onOptionsItemSelected(MenuItem item)
     int id = item.getItemId();
     if (id == R.id.personal_dict_menu_add)
     {
-      show_add_dialog(null);
+      show_add_dialog(null, null);
       return true;
     }
     if (id == android.R.id.home)
@@ -63,12 +65,12 @@ public boolean onOptionsItemSelected(MenuItem item)
     return super.onOptionsItemSelected(item);
   }
 
-  void show_add_dialog(String initial_word)
+  void show_add_dialog(String initial_word, String initial_replacement)
   {
     show_word_dialog(
         getString(R.string.personal_dict_add_title),
         initial_word != null ? initial_word : "",
-        "",
+        initial_replacement != null ? initial_replacement : "",
         new OnSaveListener()
         {
           @Override
diff --git a/srcs/juloo.keyboard2/suggestions/CandidatesView.java b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
index b97646c09..9f11027c7 100644
--- a/srcs/juloo.keyboard2/suggestions/CandidatesView.java
+++ b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
@@ -40,6 +40,16 @@ public class CandidatesView extends LinearLayout
   /** Word currently being typed, used when the add-word button is tapped. */
   String _current_word = null;
 
+  /** When set, tapping the add-word button will pre-fill the word field with
+      this value (the original word before autocorrect replaced it). Persists
+      independently of [_current_word] so it survives the word-tracking reset
+      that happens when the cursor lands after a space post-undo. */
+  String _pending_word = null;
+
+  /** When set, tapping the add-word button will pre-fill the replacement field
+      with this value (the word that autocorrect had previously inserted). */
+  String _pending_replacement = null;
+
   public CandidatesView(Context context, AttributeSet attrs)
   {
     super(context, attrs);
@@ -60,9 +70,33 @@ protected void onFinishInflate()
   public void set_current_word(String word)
   {
     _current_word = word;
-    if (_add_word_btn != null)
-      _add_word_btn.setVisibility(
-          (word != null && !word.isEmpty()) ? View.VISIBLE : View.GONE);
+  }
+
+  /** Called when backspace undoes an autocorrect. Highlights the add-word
+      button and pre-fills both the original word and the correction. */
+  public void on_autocorrect_undone(String original, String corrected)
+  {
+    _pending_word = original;
+    _pending_replacement = corrected;
+    set_add_word_highlight(true);
+  }
+
+  void set_add_word_highlight(boolean highlighted)
+  {
+    if (_add_word_btn == null) return;
+    android.util.TypedValue tv = new android.util.TypedValue();
+    int colorAttr = highlighted
+      ? R.attr.colorLabelActivated
+      : R.attr.colorLabel;
+    getContext().getTheme().resolveAttribute(colorAttr, tv, true);
+    ((TextView)_add_word_btn).setTextColor(tv.data);
+  }
+
+  void clear_add_word_highlight()
+  {
+    _pending_word = null;
+    _pending_replacement = null;
+    set_add_word_highlight(false);
   }
 
   public void set_candidates(List<String> suggestions)
@@ -149,7 +183,7 @@ private void setup_add_word_button()
     _add_word_btn = findViewById(R.id.candidates_add_word);
     if (_add_word_btn == null)
       return;
-    _add_word_btn.setVisibility(View.GONE);
+    _add_word_btn.setVisibility(View.VISIBLE);
     _add_word_btn.setOnClickListener(new View.OnClickListener()
         {
           @Override
@@ -157,8 +191,13 @@ public void onClick(View _v)
           {
             Intent i = new Intent(getContext(), PersonalDictionaryActivity.class);
             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            if (_current_word != null && !_current_word.isEmpty())
-              i.putExtra(PersonalDictionaryActivity.EXTRA_WORD, _current_word);
+            String word = (_pending_word != null && !_pending_word.isEmpty())
+              ? _pending_word : _current_word;
+            if (word != null && !word.isEmpty())
+              i.putExtra(PersonalDictionaryActivity.EXTRA_WORD, word);
+            if (_pending_replacement != null)
+              i.putExtra(PersonalDictionaryActivity.EXTRA_REPLACEMENT, _pending_replacement);
+            clear_add_word_highlight();
             getContext().startActivity(i);
           }
         });
diff --git a/srcs/special_font/01D.svg b/srcs/special_font/01D.svg
new file mode 100644
index 000000000..275c2a396
--- /dev/null
+++ b/srcs/special_font/01D.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- ? mark with square outline; evenodd gaps where ? crosses the border -->
+
+<svg
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="01D.svg"
+   inkscape:version="1.4.4 (dcaf3e7, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="26.0625"
+     inkscape:cx="9.9376499"
+     inkscape:cy="10.532374"
+     inkscape:window-width="2560"
+     inkscape:window-height="1511"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 3,4 C 1.8954305,4 1,4.8954305 1,6 v 12 c 0,1.104569 0.8954305,2 2,2 H 4.5800781 C 4.1575671,19.231284 3.8682705,18.387624 3.765625,17.513672 3.7381718,17.279928 3.7249194,17.045207 3.7246094,16.810547 3.5424613,16.619301 3.2849591,16.5 3,16.5 v -9 c 0.5522847,0 1,-0.4477153 1,-1 H 8.3378906 L 8.2441406,4 Z m 12.914063,0 -0.07227,2.5 H 20 c 0,0.5522847 0.447715,1 1,1 v 9 c -0.552285,0 -1,0.447715 -1,1 H 18.988281 L 18.916016,20 H 21 c 1.104569,0 2,-0.895431 2,-2 V 6 C 23,4.8954305 22.104569,4 21,4 Z"
+     style="fill-rule:evenodd"
+     id="path20"
+     sodipodi:nodetypes="sssscsccccccsccccccccssssc" />
+  <path
+     d="M 13.330481,4.4579915 H 10.767184 V 1.8067374 h 2.563297 z m 3.091036,15.5556995 q -1.04291,0.376955 -2.211473,0.628259 -1.168562,0.251304 -2.575863,0.251304 -2.7015145,0 -4.2721626,-1.306779 -1.558083,-1.319345 -1.558083,-3.467992 0,-1.231388 0.4272163,-2.173777 0.4397815,-0.942389 1.1811274,-1.72143 0.7287808,-0.779042 1.7088652,-1.407301 0.9926497,-0.640824 1.8470827,-1.1559968 V 6.8328115 h 2.249168 v 3.8323815 q -0.753911,0.414651 -1.746561,1.030345 -0.99265,0.603129 -1.5706482,1.105737 -0.67852,0.590563 -1.1057363,1.369605 -0.4272163,0.779041 -0.4272163,1.759126 0,1.419866 0.9549541,2.123516 0.9675197,0.691085 2.4879067,0.691085 1.294214,0 2.525602,-0.414651 1.243954,-0.414651 1.960169,-0.879563 h 0.125652 z"
+     id="text1"
+     style="fill:#000000"
+     aria-label=" ¿ " />
+</svg>

From 0a35e4326fbd0be92999cc5acb777d99a877f9e4 Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Thu, 28 May 2026 20:04:07 -0600
Subject: [PATCH 10/11] update other 2 layouts

---
 srcs/layouts/latn_dvorak_landscape.xml | 2 +-
 srcs/layouts/latn_dvorak_left.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcs/layouts/latn_dvorak_landscape.xml b/srcs/layouts/latn_dvorak_landscape.xml
index 5c692280a..1962ba980 100644
--- a/srcs/layouts/latn_dvorak_landscape.xml
+++ b/srcs/layouts/latn_dvorak_landscape.xml
@@ -50,7 +50,7 @@
   </row>
   <row scale="16" height="0.95">
     <key width="1.1" c="ctrl" nw="loc switch_greekmath" ne="loc meta" sw="loc switch_clipboard" se="switch_numeric"/>
-    <key width="1.3" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="1.3" c="fn" nw="switch_dictionary" ne="loc change_method" sw="switch_emoji" se="config"/>
     <key width="2.2" c="space" n="switch_forward" w="cursor_left" e="cursor_right"/>
     <key width="1.3" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
       <key c="0" shift="0.6"/>
diff --git a/srcs/layouts/latn_dvorak_left.xml b/srcs/layouts/latn_dvorak_left.xml
index b31c5dfb7..62ef8a75b 100644
--- a/srcs/layouts/latn_dvorak_left.xml
+++ b/srcs/layouts/latn_dvorak_left.xml
@@ -34,7 +34,7 @@
   <row height="0.95">
     <key width="0.5" c="" />
 
-    <key width="1.5" c="fn" nw="loc alt" ne="loc change_method" sw="switch_emoji" se="config"/>
+    <key width="1.5" c="fn" nw="switch_dictionary" ne="loc change_method" sw="switch_emoji" se="config"/>
     <key width="2.5" c="space" n="switch_forward" s="switch_backward" w="cursor_left" e="cursor_right"/>
     <key width="1.5" c="loc compose" n="up" e="right" w="left" s="down" nw="loc home" ne="loc page_up" sw="loc end" se="loc page_down"/>
   </row>

From 6f6e0692bb5cde6bb656038db336b82aecb0e749 Mon Sep 17 00:00:00 2001
From: Nathan <firefox_97@hotmail.com>
Date: Thu, 28 May 2026 20:47:26 -0600
Subject: [PATCH 11/11] seems to be working!

---
 srcs/juloo.keyboard2/Keyboard2.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index be8200486..f7e5b4664 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -188,9 +188,9 @@ private void refresh_current_dictionary()
     String dict_name;
     if (selected == null || selected.equals("auto"))
     {
-      if (_device_locales.default_ == null)
+      if (_config.device_locales.default_ == null)
         return;
-      dict_name = _device_locales.default_.dictionary;
+      dict_name = _config.device_locales.default_.dictionary;
       if (dict_name == null)
         return;
     }