diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
index d7aca00..ae71ecb 100644
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -21,12 +21,21 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
-            <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
-            <Key latin:keySpec="&#x1017;" />
-            <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
-            <Key latin:keySpec="&#x1012;" />
-            <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
-            <Key latin:keySpec="&#x1013;" />
+            <!-- U+1017: "ဗ" MYANMAR LETTER BA
+                 U+1039/U+1017: "္ဗ" MYANMAR SIGN VIRAMA/MYANMAR LETTER BA -->
+            <Key
+                latin:keySpec="&#x1017;"
+                latin:moreKeys="&#x1039;&#x1017;" />
+            <!-- U+1012: "ဒ" MYANMAR LETTER DA
+                 U+1039/U+1012: "္ဒ" MYANMAR SIGN VIRAMA/MYANMAR LETTER DA -->
+            <Key
+                latin:keySpec="&#x1012;"
+                latin:moreKeys="&#x1039;&#x1012;" />
+            <!-- U+1013: "ဓ" MYANMAR LETTER DHA
+                 U+1039/U+1013: "္ဓ" MYANMAR SIGN VIRAMA/MYANMAR LETTER DHA -->
+            <Key
+                latin:keySpec="&#x1013;"
+                latin:moreKeys="&#x1039;&#x1013;" />
             <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
             <Key latin:keySpec="&#x1003;" />
             <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
@@ -35,34 +44,61 @@
             <Key latin:keySpec="&#x103F;" />
             <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
             <Key latin:keySpec="&#x100F;" />
-            <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
-            <Key latin:keySpec="&#x1008;" />
-            <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
-            <Key latin:keySpec="&#x1007;" />
-            <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
-            <Key latin:keySpec="&#x1002;" />
+            <!-- U+1008: "ဈ" MYANMAR LETTER JHA
+                 U+1039/U+1008: "္ဈ" MYANMAR SIGN VIRAMA/MYANMAR LETTER JHA -->
+            <Key
+                latin:keySpec="&#x1008;"
+                latin:moreKeys="&#x1039;&#x1008;" />
+            <!-- U+1007: "ဇ" MYANMAR LETTER JA
+                 U+1039/U+1007: "္ဇ" MYANMAR SIGN VIRAMA/MYANMAR LETTER JA -->
+            <Key
+                latin:keySpec="&#x1007;"
+                latin:moreKeys="&#x1039;&#x1007;" />
+            <!-- U+1002: "ဂ" MYANMAR LETTER GA
+                 U+1039/U+1002: "္ဂ" MYANMAR SIGN VIRAMA/MYANMAR LETTER GA -->
+            <Key
+                latin:keySpec="&#x1002;"
+                latin:moreKeys="&#x1039;&#x1002;" />
         </case>
         <default>
-            <!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
-            <Key latin:keySpec="&#x1006;" />
-            <!-- U+1010: "တ" MYANMAR LETTER TA -->
-            <Key latin:keySpec="&#x1010;" />
-            <!-- U+1014: "န" MYANMAR LETTER NA -->
-            <Key latin:keySpec="&#x1014;" />
-            <!-- U+1019: "မ" MYANMAR LETTER MA -->
-            <Key latin:keySpec="&#x1019;" />
+            <!-- U+1006: "ဆ" MYANMAR LETTER CHA
+                 U+1039/U+1006: "္ဆ" MYANMAR SIGN VIRAMA/MYANMAR LETTER CHA -->
+            <Key
+                latin:keySpec="&#x1006;"
+                latin:moreKeys="&#x1039;&#x1006;" />
+            <!-- U+1010: "တ" MYANMAR LETTER TA
+                 U+1039/U+1010: "္တ" MYANMAR SIGN VIRAMA/MYANMAR LETTER TA -->
+            <Key
+                latin:keySpec="&#x1010;"
+                latin:moreKeys="&#x1039;&#x1010;" />
+            <!-- U+1014: "န" MYANMAR LETTER NA
+                 U+1039/U+1014: "္န" MYANMAR SIGN VIRAMA/MYANMAR LETTER NA -->
+            <Key
+                latin:keySpec="&#x1014;"
+                latin:moreKeys="&#x1039;&#x1014;" />
+            <!-- U+1019: "မ" MYANMAR LETTER MA
+                 U+1039/U+1019: "္မ" MYANMAR SIGN VIRAMA/MYANMAR LETTER MA -->
+            <Key
+                latin:keySpec="&#x1019;"
+                latin:moreKeys="&#x1039;&#x1019;" />
             <!-- U+1021: "အ" MYANMAR LETTER A -->
             <Key latin:keySpec="&#x1021;" />
             <!-- U+1015: "ပ" MYANMAR LETTER PA -->
             <Key latin:keySpec="&#x1015;" />
-            <!-- U+1000: "က" MYANMAR LETTER KA -->
-            <Key latin:keySpec="&#x1000;" />
+            <!-- U+1000: "က" MYANMAR LETTER KA
+                 U+1039/U+1000: "္က" MYANMAR SIGN VIRAMA/MYANMAR LETTER KA -->
+            <Key
+                latin:keySpec="&#x1000;"
+                latin:moreKeys="&#x1039;&#x1000;" />
             <!-- U+1004: "င" MYANMAR LETTER NGA -->
             <Key latin:keySpec="&#x1004;" />
             <!-- U+101E: "သ" MYANMAR LETTER SA -->
             <Key latin:keySpec="&#x101E;" />
-            <!-- U+1005: "စ" MYANMAR LETTER CA -->
-            <Key latin:keySpec="&#x1005;" />
+            <!-- U+1005: "စ" MYANMAR LETTER CA
+                 U+1039/U+1005: "္စ" MYANMAR SIGN VIRAMA/MYANMAR LETTER CA -->
+            <Key
+                latin:keySpec="&#x1005;"
+                latin:moreKeys="&#x1039;&#x1005;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index c585068..4dafe09 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -67,8 +67,11 @@
             <Key
                 latin:keySpec="&#x102F;"
                 latin:moreKeys="&#x1030;" />
-            <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
-            <Key latin:keySpec="&#x102C;" />
+            <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA
+                 U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
+            <Key
+                latin:keySpec="&#x102C;"
+                latin:moreKeys="&#x102B;" />
             <!-- U+103A: "်" MYANMAR SIGN ASAT
                  U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
             <Key
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
index 210ebaa..a1befcf 100644
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -47,14 +47,26 @@
         <default>
             <!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
             <Key latin:keySpec="&#x1016;" />
-            <!-- U+1011: "ထ" MYANMAR LETTER THA -->
-            <Key latin:keySpec="&#x1011;" />
-            <!-- U+1001: "ခ" MYANMAR LETTER KHA -->
-            <Key latin:keySpec="&#x1001;" />
-            <!-- U+101C: "လ" MYANMAR LETTER LA -->
-            <Key latin:keySpec="&#x101C;" />
-            <!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
-            <Key latin:keySpec="&#x1018;" />
+            <!-- U+1011: "ထ" MYANMAR LETTER THA
+                 U+1039/U+1011: "္ထ" MYANMAR SIGN VIRAMA/MYANMAR LETTER THA -->
+            <Key
+                latin:keySpec="&#x1011;"
+                latin:moreKeys="&#x1039;&#x1011;" />
+            <!-- U+1001: "ခ" MYANMAR LETTER KHA
+                 U+1039/U+1001: "္ခ" MYANMAR SIGN VIRAMA/MYANMAR LETTER KHA -->
+            <Key
+                latin:keySpec="&#x1001;"
+                latin:moreKeys="&#x1039;&#x1001;" />
+            <!-- U+101C: "လ" MYANMAR LETTER LA
+                 U+1039/U+101C: "္လ" MYANMAR SIGN VIRAMA/MYANMAR LETTER LA -->
+            <Key
+                latin:keySpec="&#x101C;"
+                latin:moreKeys="&#x1039;&#x101C;" />
+            <!-- U+1018: "ဘ" MYANMAR LETTER BHA
+                 U+1039/U+1018: "္ဘ" MYANMAR SIGN VIRAMA/MYANMAR LETTER BHA -->
+            <Key
+                latin:keySpec="&#x1018;"
+                latin:moreKeys="&#x1039;&#x1018;" />
             <!-- U+100A: "ည" MYANMAR LETTER NNYA
                  U+1009: "ဉ" MYANMAR LETTER NYA -->
             <Key