diff --git a/leankeykeyboard/src/main/res/xml/accent_a_th.xml b/leankeykeyboard/src/main/res/xml/accent_a_th.xml
deleted file mode 100644
index 8b80214..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_a_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ี" />
-        <Key android:keyLabel="๊" />
-        <Key android:keyLabel="ร" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_c_th.xml b/leankeykeyboard/src/main/res/xml/accent_c_th.xml
deleted file mode 100644
index 6cabce6..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_c_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="็" />
-        <Key android:keyLabel="่" />
-        <Key android:keyLabel="๋" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_d_th.xml b/leankeykeyboard/src/main/res/xml/accent_d_th.xml
deleted file mode 100644
index f63ffd0..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_d_th.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ย" />
-        <Key android:keyLabel="บ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_e_th.xml b/leankeykeyboard/src/main/res/xml/accent_e_th.xml
deleted file mode 100644
index 29b42db..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_e_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="๓" />
-        <Key android:keyLabel="๔" />
-        <Key android:keyLabel="ุ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_f_th.xml b/leankeykeyboard/src/main/res/xml/accent_f_th.xml
deleted file mode 100644
index d9bbc80..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_f_th.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฐ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_g_th.xml b/leankeykeyboard/src/main/res/xml/accent_g_th.xml
deleted file mode 100644
index 1065340..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_g_th.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ล" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_h_th.xml b/leankeykeyboard/src/main/res/xml/accent_h_th.xml
deleted file mode 100644
index a5eeb19..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_h_th.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฅ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_i_th.xml b/leankeykeyboard/src/main/res/xml/accent_i_th.xml
deleted file mode 100644
index 697ac6a..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_i_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="๙" />
-        <Key android:keyLabel="ๆ" />
-        <Key android:keyLabel="๐" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_j_th.xml b/leankeykeyboard/src/main/res/xml/accent_j_th.xml
deleted file mode 100644
index 7d32562..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_j_th.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฃ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_k_th.xml b/leankeykeyboard/src/main/res/xml/accent_k_th.xml
deleted file mode 100644
index 969ba6b..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_k_th.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฟ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_o_th.xml b/leankeykeyboard/src/main/res/xml/accent_o_th.xml
deleted file mode 100644
index 5c845e5..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_o_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ไ" />
-        <Key android:keyLabel="ำ" />
-        <Key android:keyLabel="ฎ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_p2_th.xml b/leankeykeyboard/src/main/res/xml/accent_p2_th.xml
deleted file mode 100644
index 085a587..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_p2_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ธ" />
-        <Key android:keyLabel="ั" />
-        <Key android:keyLabel="ํ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_p_th.xml b/leankeykeyboard/src/main/res/xml/accent_p_th.xml
deleted file mode 100644
index 9bf04f9..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_p_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="พ" />
-        <Key android:keyLabel="ฑ" />
-        <Key android:keyLabel="ะ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_q_th.xml b/leankeykeyboard/src/main/res/xml/accent_q_th.xml
deleted file mode 100644
index 403819d..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_q_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฝ" />
-        <Key android:keyLabel="ฦ" />
-        <Key android:keyLabel="๑" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_r_th.xml b/leankeykeyboard/src/main/res/xml/accent_r_th.xml
deleted file mode 100644
index 2c0bdd2..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_r_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="3641" />
-        <Key android:keyLabel="3638" />
-        <Key android:keyLabel="3662" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_s_th.xml b/leankeykeyboard/src/main/res/xml/accent_s_th.xml
deleted file mode 100644
index e869129..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_s_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ณ" />
-        <Key android:keyLabel="น" />
-        <Key android:keyLabel="ฯ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_t_th.xml b/leankeykeyboard/src/main/res/xml/accent_t_th.xml
deleted file mode 100644
index a33f383..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_t_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ค" />
-        <Key android:keyLabel="๕" />
-        <Key android:keyLabel="ต" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_u_th.xml b/leankeykeyboard/src/main/res/xml/accent_u_th.xml
deleted file mode 100644
index 2df9159..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_u_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ข" />
-        <Key android:keyLabel="๘" />
-        <Key android:keyLabel="ช" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_w_th.xml b/leankeykeyboard/src/main/res/xml/accent_w_th.xml
deleted file mode 100644
index 538f23d..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_w_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="๒" />
-        <Key android:keyLabel="ภ" />
-        <Key android:keyLabel="๓" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_x_th.xml b/leankeykeyboard/src/main/res/xml/accent_x_th.xml
deleted file mode 100644
index 66b5950..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_x_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ด" />
-        <Key android:keyLabel="ฌ" />
-        <Key android:keyLabel="้" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_y_th.xml b/leankeykeyboard/src/main/res/xml/accent_y_th.xml
deleted file mode 100644
index a73dc30..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_y_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="๖" />
-        <Key android:keyLabel="จ" />
-        <Key android:keyLabel="๗" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/accent_z_th.xml b/leankeykeyboard/src/main/res/xml/accent_z_th.xml
deleted file mode 100644
index e074b9a..0000000
--- a/leankeykeyboard/src/main/res/xml/accent_z_th.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Keyboard android:keyWidth="@dimen/key_width" android:keyHeight="@dimen/key_height" android:horizontalGap="@dimen/keyboard_horizontal_gap" android:verticalGap="@dimen/keyboard_vertical_gap"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-    <Row>
-        <Key android:keyLabel="ฆ" />
-        <Key android:keyLabel="ก" />
-        <Key android:keyLabel="ฏ" />
-    </Row>
-</Keyboard>
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_th.xml b/leankeykeyboard/src/main/res/xml/qwerty_th.xml
index aff1142..8ea9e7b 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_th.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_th.xml
@@ -4,58 +4,58 @@
     <!-- Thai keyboard -->
     <!-- https://en.wikipedia.org/wiki/Thai_(Unicode_block) -->
     <Row android:rowEdgeFlags="top">
-        <Key android:codes="49" android:popupKeyboard="@xml/shift_1" android:keyEdgeFlags="left" android:keyLabel="1" />
-        <Key android:codes="50" android:popupKeyboard="@xml/shift_2" android:keyLabel="2" />
-        <Key android:codes="51" android:popupKeyboard="@xml/shift_3" android:keyLabel="3" />
-        <Key android:codes="52" android:popupKeyboard="@xml/shift_4" android:keyLabel="4" />
-        <Key android:codes="53" android:popupKeyboard="@xml/shift_5" android:keyLabel="5" />
-        <Key android:codes="54" android:popupKeyboard="@xml/shift_6" android:keyLabel="6" />
-        <Key android:codes="55" android:popupKeyboard="@xml/shift_7" android:keyLabel="7" />
-        <Key android:codes="56" android:popupKeyboard="@xml/shift_8" android:keyLabel="8" />
-        <Key android:codes="57" android:popupKeyboard="@xml/shift_9" android:keyLabel="9" />
-        <Key android:codes="48" android:popupKeyboard="@xml/shift_0" android:keyLabel="0" />
-        <Key android:codes="-5" android:keyEdgeFlags="right"         android:keyLabel="@string/keyboardview_keycode_delete" android:keyIcon="@drawable/ic_ime_delete" />
+        <Key android:keyEdgeFlags="left" android:keyLabel="ๆ|๑" />
+        <Key android:keyLabel="ภ|๒" />
+        <Key android:keyLabel="ถ|๓" />
+        <Key android:keyLabel="ุ|ู" />
+        <Key android:keyLabel="ึ|๔" />
+        <Key android:keyLabel="ค|๕" />
+        <Key android:keyLabel="ต|๖" />
+        <Key android:keyLabel="จ|๗" />
+        <Key android:keyLabel="ข|๘" />
+        <Key android:keyLabel="ช|๙" />
+        <Key android:codes="-5" android:keyEdgeFlags="right" android:keyLabel="@string/keyboardview_keycode_delete" android:keyIcon="@drawable/ic_ime_delete" />
     </Row>
     <Row>
         <!-- NOTE: example of adding different chars to uppercase/lowercase states  -->
         <!-- format is: android:keyLabel="lower_char|upper_char" e.g. android:keyLabel="ฝ|๒" -->
-        <Key android:popupKeyboard="@xml/accent_q_th"  android:keyLabel="ฝ|๒" android:keyEdgeFlags="left" />
-        <Key android:popupKeyboard="@xml/accent_w_th"  android:keyLabel="๒" />
-        <Key android:popupKeyboard="@xml/accent_e_th"  android:keyLabel="๓" />
-        <Key android:popupKeyboard="@xml/accent_r_th"  android:keyLabel="ู" />
-        <Key android:popupKeyboard="@xml/accent_t_th"  android:keyLabel="ค" />
-        <Key android:popupKeyboard="@xml/accent_y_th"  android:keyLabel="๖" />
-        <Key android:popupKeyboard="@xml/accent_u_th"  android:keyLabel="ข" />
-        <Key android:popupKeyboard="@xml/accent_i_th"  android:keyLabel="๙" />
-        <Key android:popupKeyboard="@xml/accent_o_th"  android:keyLabel="ไ" />
-        <Key android:popupKeyboard="@xml/accent_p_th"  android:keyLabel="พ" />
-        <Key android:popupKeyboard="@xml/accent_p2_th" android:keyLabel="ธ" android:keyEdgeFlags="right" />
+        <Key android:keyLabel="ไ|๐" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ำ|ฎ" />
+        <Key android:keyLabel="พ|ฑ" />
+        <Key android:keyLabel="ะ|ธ" />
+        <Key android:keyLabel="ั|ํ" />
+        <Key android:keyLabel="ี|๊" />
+        <Key android:keyLabel="ร|ณ" />
+        <Key android:keyLabel="น|ฯ" />
+        <Key android:keyLabel="ย|ญ" />
+        <Key android:keyLabel="บ|ฐ" />
+        <Key android:keyLabel="ล|," android:keyEdgeFlags="right" />
     </Row>
     <Row>
-        <Key android:popupKeyboard="@xml/accent_a_th"  android:keyLabel="ี" android:keyEdgeFlags="left" />
-        <Key android:popupKeyboard="@xml/accent_s_th"  android:keyLabel="ณ" />
-        <Key android:popupKeyboard="@xml/accent_d_th"  android:keyLabel="ย" />
-        <Key android:popupKeyboard="@xml/accent_f_th"  android:keyLabel="ฐ" />
-        <Key android:popupKeyboard="@xml/accent_g_th"  android:keyLabel="ล" />
-        <Key android:popupKeyboard="@xml/accent_h_th"  android:keyLabel="ฅ" />
-        <Key android:popupKeyboard="@xml/accent_j_th"  android:keyLabel="ฃ" />
-        <Key                                           android:keyLabel="ฟ" />
-        <Key                                           android:keyLabel="ฤ" />
-        <Key                                           android:keyLabel="ห" />
-        <Key                                           android:keyLabel="ş" android:keyEdgeFlags="right" />
+        <Key android:keyLabel="ฟ|ฤ" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ห|ฆ" />
+        <Key android:keyLabel="ก|ฏ" />
+        <Key android:keyLabel="ด|โ" />
+        <Key android:keyLabel="เ|ฌ" />
+        <Key android:keyLabel="้|็" />
+        <Key android:keyLabel="่|๋" />
+        <Key android:keyLabel="า|ษ" />
+        <Key android:keyLabel="ส|ศ" />
+        <Key android:keyLabel="ว|ซ" />
+        <Key android:keyLabel="ง|." android:keyEdgeFlags="right" />
     </Row>
     <Row>
-        <Key android:popupKeyboard="@xml/accent_z_th"  android:keyLabel="ฆ" android:keyEdgeFlags="left" />
-        <Key android:popupKeyboard="@xml/accent_x_th"  android:keyLabel="ด" />
-        <Key android:popupKeyboard="@xml/accent_c_th"  android:keyLabel="็" />
-        <Key                                           android:keyLabel="า" />
-        <Key                                           android:keyLabel="ษ" />
-        <Key                                           android:keyLabel="ส" />
-        <Key                                           android:keyLabel="ศ" />
-        <Key                                           android:keyLabel="ว" />
-        <Key                                           android:keyLabel="ซ" />
-        <Key                                           android:keyLabel="ง" />
-        <Key                                           android:keyLabel="," android:keyEdgeFlags="right" />
+        <Key android:keyLabel="ผ|(" android:keyEdgeFlags="left" />
+        <Key android:keyLabel="ป|)" />
+        <Key android:keyLabel="แ|ฉ" />
+        <Key android:keyLabel="อ|ฮ" />
+        <Key android:keyLabel="ิ|ฺ" />
+        <Key android:keyLabel="ื|์" />
+        <Key android:keyLabel="ท|?" />
+        <Key android:keyLabel="ม|ฒ" />
+        <Key android:keyLabel="ใ|ฬ" />
+        <Key android:keyLabel="ฝ|ฦ" />
+        <Key android:keyLabel="ฃ|ฅ" android:keyEdgeFlags="right" />
     </Row>
     <Row android:rowEdgeFlags="bottom">
         <Key android:codes="-2" android:keyEdgeFlags="left" android:keyLabel="@string/keyboardview_keycode_mode_change" android:keyIcon="@drawable/ic_ime_symbols" />