diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 9b4031e5589c283b41b208c583a1363e62f24757..87ca1055ed8166cf9e10e603b93c3ce4d9e90819 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -23,10 +23,8 @@
 >
     <!-- U+0630: "Ø°" ARABIC LETTER THAL -->
     <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0630;" />
     <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
     <Key
-        latin:keySpec="&#x0626;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0626;" />
 </merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index 45d12862891ea13b045fef7705166a76051f8350..c832d554292f1f9932887c81f10c466f113ba500 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -23,10 +23,8 @@
 >
     <!-- U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
-        latin:keySpec="&#x0622;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0622;" />
     <!-- U+0686: "Ú†" ARABIC LETTER TCHEH -->
     <Key
-        latin:keySpec="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0686;" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 5a28d457242ec94ec6a7c696d37c9061eb56b260..1b7b4161e8d4ccdcda8d17cb6150da056a7547fc 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic3" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_armenian_phonetic.xml b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
index 9bc2a182104b987c45f6ae03ec19fde28350c85d..ebd16cba08a95d970035b87c34d25397d9b69adc 100644
--- a/java/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -18,53 +18,46 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_xeh" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_sha" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+        <include latin:keyboardLayout="@xml/key_armenian_sha" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.8889%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_bengali.xml b/java/res/xml-sw600dp/rows_bengali.xml
index b1e787849fe0c0bcb82facb9043c87166657ca2e..10b3e4fb576d61f9b282bbf8d86984dcacb65dbf 100644
--- a/java/res/xml-sw600dp/rows_bengali.xml
+++ b/java/res/xml-sw600dp/rows_bengali.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali1" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali2" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index a353b67c768a806126bd1759bcd99942b45a1e5d..1d098df9a5a3e6f5988dba27728d7edf9fadd910 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -18,36 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_farsi3"
             latin:keyXPos="4.091%p" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index ca581be140d7888a2e91ab1f6d20b4111150221e..42b92a72a1c6a1a7aa59535ae74ff64d67c67c11 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
index ac476eb3bd762c68484d0dde9c50e1939f08d8ff..6493451693b1ade17a74f746fecafd88839cf9c2 100644
--- a/java/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/java/res/xml-sw600dp/rows_hindi_compact.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_khmer.xml b/java/res/xml-sw600dp/rows_khmer.xml
index 2824a5c2f53bb7496158053d1df1fafebee366c7..800a3ee571d1386269468abfde5331f9b70bc5c1 100644
--- a/java/res/xml-sw600dp/rows_khmer.xml
+++ b/java/res/xml-sw600dp/rows_khmer.xml
@@ -18,55 +18,48 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer1" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer2" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer3" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer4" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_lao.xml b/java/res/xml-sw600dp/rows_lao.xml
index 446d9bd5aeb3d3706bb2406117a414bddcc183f1..264e2d9ed258652533260d6a3d45627b49775e4e 100644
--- a/java/res/xml-sw600dp/rows_lao.xml
+++ b/java/res/xml-sw600dp/rows_lao.xml
@@ -18,55 +18,48 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao1" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao2" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao3" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao4" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
index 51dc7a2b981ba9b421d927b107396e22892953e8..c77bea567186d428d79883be7bbc2fa153147d7a 100644
--- a/java/res/xml-sw600dp/rows_marathi.xml
+++ b/java/res/xml-sw600dp/rows_marathi.xml
@@ -18,37 +18,32 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml
index 8eedf9d2f5d67bc4898acc9d610eb4f07404033d..20d9d8ab2322df5f8c727a0d06018b4e7bd7a635 100644
--- a/java/res/xml-sw600dp/rows_myanmar.xml
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@@ -18,46 +18,41 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="9.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml
index 21d1dc6e03b3adc09bb38afb545bdd4e4612edb4..fe73fbd9ead7d221ebb1f2724fd7072f742398d5 100644
--- a/java/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/java/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml
index 90703da7668c6a67dcc7da78ce88135265fca8cf..e56271f21c45f2a74bcf250916d76bd9ea82be41 100644
--- a/java/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/java/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -18,40 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
-        </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
+    </Row>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index d3a5ca53594f9fa5553e86ff8fd5c456f8771a93..27860282078abbea53af9d8acf8117815771e204 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -18,17 +18,13 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
@@ -37,8 +33,7 @@
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillRight" />
@@ -50,11 +45,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+        <include latin:keyboardLayout="@xml/keys_exclamation_question" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index 7738c7f0470d2fc9b6e6c78d5fb9ed087cc47a85..2006056a463b1407a6b3553fbfa25062d376278c 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -18,31 +18,29 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai1" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
-        </Row>
+    </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_thai2"
             latin:keyXPos="2.5%p" />
-        <include
-            latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_thai3"
@@ -53,24 +51,20 @@
     </Row>
     <Row
         latin:keyWidth="7.5%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.0%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai4" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
         <switch>
-            <case
-                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-            >
+            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
                 <Spacer />
             </case>
             <default>
-                <include
-                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+                <include latin:keyboardLayout="@xml/keys_exclamation_question" />
             </default>
         </switch>
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index 405aebc50538b3991040a15b416fc0ae8f9433ba..d5491d29d9f51998326f9a7979a5a1a627b0dd76 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
                  U+093C: "़" DEVANAGARI SIGN NUKTA -->
@@ -36,9 +32,7 @@
                 latin:styleName="moreKeysDevanagariSignAnusvara"
                 latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
             <key-style
@@ -46,14 +40,12 @@
                 latin:moreKeys="&#x0903;,&#x0901;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara" />
+            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
         </default>
     </switch>
     <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignAnusvara"
         latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x0902;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0902;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
index 6198d01a9299bbb589d51a4d874e756ac3bd1eb9..ef8dec37cf0a1ef1803b0b602d7aae7f58448c37 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -22,27 +22,21 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignCandrabindu"
                 latin:moreKeys="&#x0945;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu" />
+            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
         </default>
     </switch>
     <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
     <key-style
         latin:styleName="baseKeyDevanagariSignCandrabindu"
         latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x0901;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0901;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
index e0b47bb6f29e7538fbe58a24fdd5a9e09df6eb34..734d0600a3d703681c4559decf4f4c8d3df2f7ba 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -22,37 +22,29 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
                  U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_romanized"
-        >
+        <case latin:keyboardLayoutSet="nepali_romanized">
             <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x093C;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignNukta" />
+            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
         </default>
     </switch>
     <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignNukta"
         latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x093C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093C;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
index 73248e4c2e54292b5c182a150fd3a9aa9612cb01..0300e4a8b22cdeb06685900e917cd346a98b2968 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x094D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x0905;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignVirama" />
+            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
         </default>
     </switch>
     <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVirama"
         latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x094D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094D;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
index b047893a6416850df3335dd99fac554db54bb552..ea64a1009f7e5237ec8efb9e7c4b0c1ab70ad989 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -22,12 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x0903;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0903;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index cd07999b577aa4abc74c81d8dad3e6ecfaff7707..1e638507ac1cef4fa597edb3ae869ee40fce18bd 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
                  U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x093E;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x0906;,%" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
         </default>
     </switch>
     <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAa"
         latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x093E;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093E;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index 75a49b19dff6f6fd37dbb3b32b67837208c92d90..acb2894062d64b4deac86d4839795d0f8856e858 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,51 +22,39 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0948;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0948;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0910;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
         </default>
     </switch>
     <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAi"
         latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x0948;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0948;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index 26f1aca5a53432a5939f554d2344344c3800d218..e2c367784f9412fd9ec268fe9b130e08b2b62328 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x094C;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x094C;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x0914;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
         </default>
     </switch>
     <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAu"
         latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x094C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094C;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index ec056a3804c26dbf89c17ab27c15bdeadd47886f..75ad44f34c4694993c11219893a1c4a1df353019 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x0945;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x090D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
         </default>
     </switch>
     <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraE"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x0945;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0945;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index fb4d4eb17ee5b9cf146bb1de3c08d82f9b0fa821..e1a4c613c2201aea88772a79a016ff412dd01f40 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,35 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0949;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0911;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
         </default>
     </switch>
     <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraO"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x0949;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0949;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index 965bccbd2914e7ca683b05872d3946f0e5f3f38a..6a99eace0a3ff0011d10888fda02192c8080f227 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -22,37 +22,27 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x0947;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x0947;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x090F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <key-style
@@ -60,14 +50,12 @@
                 latin:moreKeys="&#x0903;,&#x093D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
         </default>
     </switch>
     <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignE"
         latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x0947;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0947;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index ec71c4dcdd87bdf5fed2587546382e51de78b1eb..b66149d28c9ace150aefc8bde10e5ddff41f6b9d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x0907;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
         </default>
     </switch>
     <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignI"
         latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x093F;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x093F;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 9a9f9158c21d47b43f3bd1bd4598ad948404fdbe..97e5007139e4e8bc687bfaf99aaddb05e28467ee 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,43 +22,33 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0940;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0940;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0908;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
         </default>
     </switch>
     <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignIi"
         latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x0940;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0940;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index 77389c22d0f98d00c5837379069a35d7f7562394..7cec76d434e0be7db9ffd22ab97ea913dda73b22 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
                  U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
@@ -36,31 +32,25 @@
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x094B;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
         </default>
     </switch>
     <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignO"
         latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x094B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x094B;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index e2167bf248ae8583156465ca056714533adba493..c14f920bc2aba660dbb35f6edce16a7397fbea89 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
                  U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0941;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0909;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
         </default>
     </switch>
     <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignU"
         latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x0941;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0941;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index 745236816a5cc338516fed957591241bf759dd65..3134de7c875ceae86a2dca8046c1a734d0aecee8 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,44 +22,34 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
                  U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x0942;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x090A;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
         </default>
     </switch>
     <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignUu"
         latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x0942;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0942;" />
 </merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 9c930d348d8d0ba26426fd8d76c0b077639f88e7..da510c1f56d1112682343bbd3f34572e37028465 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,30 +22,22 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0944;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x090B;,&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
@@ -53,23 +45,19 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0931;,&#x090B;,&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
         </default>
     </switch>
     <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignVocalicR"
         latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x0943;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0943;" />
 </merge>
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
index b6418f26f0fd29a32da50638a6e96d7e8ae6ae96..111d4263b7d258fe2ec9951a71ad48bdc0170014 100644
--- a/java/res/xml/key_armenian_sha.xml
+++ b/java/res/xml/key_armenian_sha.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0577: "Õ·" ARMENIAN SMALL LETTER SHA -->
     <Key
-        latin:keySpec="&#x0577;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0577;" />
 </merge>
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
index cfc5bc0f9e3c4f45ddbcc6929a69ba49b546b02b..3bbc405dc7083a0e5f6bd122280b6b85ff113674 100644
--- a/java/res/xml/key_armenian_xeh.xml
+++ b/java/res/xml/key_armenian_xeh.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+056D: "Õ­" ARMENIAN SMALL LETTER XEH -->
     <Key
-        latin:keySpec="&#x056D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x056D;" />
 </merge>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
index 84988f870cf1834c0cc2df5a60cb3174245cd64f..a43a87ccdc99ed1e371c2fb9094261ce3d31c9db 100644
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -27,14 +27,12 @@
         >
             <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
             <Key
-                latin:keySpec="&#x0E05;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="&#x0E05;" />
         </case>
         <default>
             <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
             <Key
-                latin:keySpec="&#x0E03;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="&#x0E03;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
index 2b3e12c030b8b5bcc01a7f40e330f10a0e3de9af..05ba6d8f3a6229ccc6e95b649ab197e77d12e0a5 100644
--- a/java/res/xml/keys_arabic3_left.xml
+++ b/java/res/xml/keys_arabic3_left.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0630: "Ø°" ARABIC LETTER THAL -->
     <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0630;" />
 </merge>
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
index 2618e478c6a6436a2db45b75e558c42339a77cb9..867c02143772f5cabcb2fb074de6f52ba3c0693d 100644
--- a/java/res/xml/keys_farsi3_right.xml
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -23,6 +23,5 @@
 >
     <!-- U+0686: "Ú†" ARABIC LETTER TCHEH -->
     <Key
-        latin:keySpec="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keySpec="&#x0686;" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
index a7e421d174938aab5f70f382be293cf9ee843581..2517ac5625a333056be7768a441e08d596207afb 100644
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
@@ -37,9 +33,7 @@
                 latin:styleName="moreKeysDevanagariSignAnusvara"
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;,&#x25CC;&#x093C;|&#x093C;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
@@ -48,8 +42,7 @@
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara" />
+            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -58,5 +51,5 @@
         latin:styleName="baseKeyDevanagariSignAnusvara"
         latin:parentStyle="moreKeysDevanagariSignAnusvara"
         latin:keySpec="&#x25CC;&#x0902;|&#x0902;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
index 24cb44ba8597b1fa362651591adf331254b01fdb..3eb6ca0c0e1fa79a3cf80e2681850d6fc50d960a 100644
--- a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
@@ -36,8 +32,7 @@
                 latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu" />
+            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -46,5 +41,5 @@
         latin:styleName="baseKeyDevanagariSignCandrabindu"
         latin:parentStyle="moreKeysDevanagariSignCandrabindu"
         latin:keySpec="&#x25CC;&#x0901;|&#x0901;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
index 41da555ce52e1849489a9e2054cc7af44116123b..e12848c6c6caedba42a9c6ad1976662e1bcd7d8e 100644
--- a/java/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -22,33 +22,26 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
                  U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_romanized"
-        >
+        <case latin:keyboardLayoutSet="nepali_romanized">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093C: "़" DEVANAGARI SIGN NUKTA -->
-             <key-style
+            <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
                 latin:moreKeys="&#x25CC;&#x093C;|&#x093C;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignNukta" />
+            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -57,5 +50,5 @@
         latin:styleName="baseKeyDevanagariSignNukta"
         latin:parentStyle="moreKeysDevanagariSignNukta"
         latin:keySpec="&#x25CC;&#x093C;|&#x093C;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index 58dd42a2af9a1855a283fd9254bb565d41e9e305..a7c5998effea46f73f35c5eff5eb8a17d35cc3aa 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094D: "्" DEVANAGARI SIGN VIRAMA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
                 latin:moreKeys="&#x0905;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariSignVirama" />
+            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariSignVirama"
         latin:parentStyle="moreKeysDevanagariSignVirama"
         latin:keySpec="&#x25CC;&#x094D;|&#x094D;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- </merge>
+        latin:keyLabelFlags="followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
index 45f519a43fffd3be2d3174ad3d6d74acb2325b3f..d66e8e244848291a26b9f645011b4353e2596e5b 100644
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -22,13 +22,11 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+25CC: "◌" DOTTED CIRCLE
          U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
         latin:keySpec="&#x25CC;&#x0903;|&#x0903;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 1a60ca22ff7d5b5eff637d0dff80a8558c006ab9..6a62a1f1c5420369f30bf714132c606a294ce23e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
                  U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x25CC;&#x093E;|&#x093E;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
                 latin:moreKeys="&#x0906;,%" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAa"
         latin:parentStyle="moreKeysDevanagariVowelSignAa"
         latin:keySpec="&#x25CC;&#x093E;|&#x093E;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index e6b64e56ca7875f8b599b2f210e3963035743b4b..53f83172596dfd312cdf94a250ffd1d5a02acbfe 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,47 +22,36 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x25CC;&#x0948;|&#x0948;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0910;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
                 latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
         </case>
         <default>
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -71,5 +60,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAi"
         latin:parentStyle="moreKeysDevanagariVowelSignAi"
         latin:keySpec="&#x25CC;&#x0948;|&#x0948;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 3e129ec873b0fca87e837428384ee1cbce058792..04f84562d12050c1631b0a160f0a9d13c2e0b85e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x25CC;&#x094C;|&#x094C;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
                 latin:moreKeys="&#x0914;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
         </default>
     </switch>
     <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
@@ -62,5 +53,5 @@
         latin:styleName="baseKeyDevanagariVowelSignAu"
         latin:parentStyle="moreKeysDevanagariVowelSignAu"
         latin:keySpec="&#x25CC;&#x094C;|&#x094C;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index b7d0908e1877ee0436f8db2e48b17e444606f9e1..2f2998fb80ad5db337bf73c4a7a5d9b8f693c1e6 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
                 latin:moreKeys="&#x090D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariVowelSignCandraE"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
         latin:keySpec="&#x25CC;&#x0945;|&#x0945;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 861dd1a3dc0aff280b6cd1f886bb9fb9a1719477..c36e3fbac8d34c09675e2e2eba0bbf2b0bba5bd5 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,30 +22,23 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x25CC;&#x0949;|&#x0949;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
                 latin:moreKeys="&#x0911;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
         latin:styleName="baseKeyDevanagariVowelSignCandraO"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
         latin:keySpec="&#x25CC;&#x0949;|&#x0949;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 95d85a91d776e2c28d361fcceec6f8b017c7d671..481e53eb4d040148bf3ef6129b6708e729789b14 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -22,39 +22,29 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0947: "े" DEVANAGARI VOWEL SIGN E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x25CC;&#x0947;|&#x0947;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
                 latin:moreKeys="&#x090F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
@@ -63,8 +53,7 @@
                 latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x093D;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -73,5 +62,5 @@
         latin:styleName="baseKeyDevanagariVowelSignE"
         latin:parentStyle="moreKeysDevanagariVowelSignE"
         latin:keySpec="&#x25CC;&#x0947;|&#x0947;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 5817be1c6451b5a61ff80426cf610ac1a3045d16..4b3a240b952808195f8e61d38dae11035c1c2390 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x25CC;&#x093F;|&#x093F;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
                 latin:moreKeys="&#x0907;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
         latin:styleName="baseKeyDevanagariVowelSignI"
         latin:parentStyle="moreKeysDevanagariVowelSignI"
         latin:keySpec="&#x25CC;&#x093F;|&#x093F;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index a7863c65f57051a6bb716f90a107075eece99554..8ade6efc8734a5c2eb4a57b280a56ef337280aee 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,39 +22,30 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x25CC;&#x0940;|&#x0940;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
                 latin:moreKeys="&#x0908;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
         latin:styleName="baseKeyDevanagariVowelSignIi"
         latin:parentStyle="moreKeysDevanagariVowelSignIi"
         latin:keySpec="&#x25CC;&#x0940;|&#x0940;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 3dc874e1a94d97bf76147ca73a131619aae202ef..3afded4260f1194e9a231b2c0b7a6f6870ee1d5c 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
@@ -37,26 +33,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;|&#x0949;,&#x25CC;&#x094A;|&#x094A;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x25CC;&#x094B;|&#x094B;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -65,5 +56,5 @@
         latin:styleName="baseKeyDevanagariVowelSignO"
         latin:parentStyle="moreKeysDevanagariVowelSignO"
         latin:keySpec="&#x25CC;&#x094B;|&#x094B;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 226c11a06ce79f838985a4d83028c7aa477d04f8..1eb19b5734c809f8760933b61214b4dc9c743cbc 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
                  U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x25CC;&#x0941;|&#x0941;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
                 latin:moreKeys="&#x0909;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignU"
         latin:parentStyle="moreKeysDevanagariVowelSignU"
         latin:keySpec="&#x25CC;&#x0941;|&#x0941;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 7a9f47d77ebd461b9bf6cd70e860e847f9a245b9..0bb3426e4c44e9d19684c544b914b15ddf991728 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,13 +22,9 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
                  U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x25CC;&#x0942;|&#x0942;,%" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
                 latin:moreKeys="&#x090A;,%" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
         latin:styleName="baseKeyDevanagariVowelSignUu"
         latin:parentStyle="moreKeysDevanagariVowelSignUu"
         latin:keySpec="&#x25CC;&#x0942;|&#x0942;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 56b73964285b82113f2c9bba9cb55c64b4b5ca61..688826a43eb0e5d27be5ddfd12e1014d53a4ab0e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,22 +22,16 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSet="hindi"
-        >
+        <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
                  U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x25CC;&#x0944;|&#x0944;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="hindi_compact"
-        >
+        <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+25CC: "◌" DOTTED CIRCLE
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
@@ -45,9 +39,7 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="marathi"
-        >
+        <case latin:keyboardLayoutSet="marathi">
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+25CC: "◌" DOTTED CIRCLE
@@ -56,17 +48,14 @@
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0931;,&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
         </case>
-        <case
-            latin:keyboardLayoutSet="nepali_traditional"
-        >
+        <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
                 latin:moreKeys="&#x0913;" />
         </case>
         <default>
-             <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
         </default>
     </switch>
     <!-- U+25CC: "◌" DOTTED CIRCLE
@@ -75,5 +64,5 @@
         latin:styleName="baseKeyDevanagariVowelSignVocalicR"
         latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
         latin:keySpec="&#x25CC;&#x0943;|&#x0943;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 266bba407d1a09e97ea654f3f1928d6f48bc839d..9f83fef50f9519554c123a3334e87601c9f31245 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -18,30 +18,25 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+0661: "Ù¡" ARABIC-INDIC DIGIT ONE -->
     <Key
         latin:keySpec="&#x0636;"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1,&#x0661;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="1,&#x0661;" />
     <!-- U+0635: "ص" ARABIC LETTER SAD
          U+0662: "Ù¢" ARABIC-INDIC DIGIT TWO -->
     <Key
         latin:keySpec="&#x0635;"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,&#x0662;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="2,&#x0662;" />
     <!-- U+062B: "Ø«" ARABIC LETTER THEH
          U+0663: "Ù£" ARABIC-INDIC DIGIT THREE -->
     <Key
         latin:keySpec="&#x062B;"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3,&#x0663;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="3,&#x0663;" />
     <!-- U+0642: "Ù‚" ARABIC LETTER QAF
          U+0664: "Ù¤" ARABIC-INDIC DIGIT FOUR
          U+06A8: "Ú¨" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
@@ -50,8 +45,7 @@
         latin:keySpec="&#x0642;"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4,&#x0664;"
-        latin:moreKeys="&#x06A8;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A8;" />
     <!-- U+0641: "ف" ARABIC LETTER FEH
          U+0665: "Ù¥" ARABIC-INDIC DIGIT FIVE
          U+06A4: "Ú¤" ARABIC LETTER VEH
@@ -63,22 +57,19 @@
         latin:keySpec="&#x0641;"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5,&#x0665;"
-        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
     <!-- U+063A: "غ" ARABIC LETTER GHAIN
          U+0666: "Ù¦" ARABIC-INDIC DIGIT SIX -->
     <Key
         latin:keySpec="&#x063A;"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6,&#x0666;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="6,&#x0666;" />
     <!-- U+0639: "ع" ARABIC LETTER AIN
          U+0667: "Ù§" ARABIC-INDIC DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0639;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7,&#x0667;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="7,&#x0667;" />
     <!-- U+0647: "Ù‡" ARABIC LETTER HEH
          U+0668: "Ù¨" ARABIC-INDIC DIGIT EIGHT
          U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
@@ -87,26 +78,22 @@
         latin:keySpec="&#x0647;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8,&#x0668;"
-        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
     <!-- U+062E: "Ø®" ARABIC LETTER KHAH
          U+0669: "Ù©" ARABIC-INDIC DIGIT NINE -->
     <Key
         latin:keySpec="&#x062E;"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9,&#x0669;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="9,&#x0669;" />
     <!-- U+062D: "Ø­" ARABIC LETTER HAH
          U+0660: "Ù " ARABIC-INDIC DIGIT ZERO -->
     <Key
         latin:keySpec="&#x062D;"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0,&#x0660;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="0,&#x0660;" />
     <!-- U+062C: "ج" ARABIC LETTER JEEM
          U+0686: "Ú†" ARABIC LETTER TCHEH -->
     <Key
         latin:keySpec="&#x062C;"
-        latin:moreKeys="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0686;" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index 9bc91e8c7813d388b4b50f7b8b0145341d51833f..4f401e8bcf4a2db47536b4af2e491e36e0802ba7 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -18,33 +18,26 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0634: "Ø´" ARABIC LETTER SHEEN
          U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
     <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
     <Key
         latin:keySpec="&#x0634;"
-        latin:moreKeys="&#x069C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x069C;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key
-        latin:keySpec="&#x0633;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0633;" />
     <!-- U+064A: "ÙŠ" ARABIC LETTER YEH
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
          U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
     <Key
         latin:keySpec="&#x064A;"
-        latin:moreKeys="&#x0626;,&#x0649;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;,&#x0649;" />
     <!-- U+0628: "ب" ARABIC LETTER BEH
          U+067E: "Ù¾" ARABIC LETTER PEH -->
     <Key
         latin:keySpec="&#x0628;"
-        latin:moreKeys="&#x067E;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x067E;" />
     <!-- U+0644: "Ù„" ARABIC LETTER LAM
          U+FEFB: "ï»»" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
          U+0627: "ا" ARABIC LETTER ALEF
@@ -56,8 +49,7 @@
          U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
         latin:keySpec="&#x0644;"
-        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
     <!-- U+0627: "ا" ARABIC LETTER ALEF
          U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE
          U+0621: "Ø¡" ARABIC LETTER HAMZA
@@ -66,29 +58,19 @@
          U+0671: "Ù±" ARABIC LETTER ALEF WASLA -->
     <Key
         latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="!fixedColumnOrder!5,&#x0622;,&#x0621;,&#x0623;,&#x0625;,&#x0671;" />
     <!-- U+062A: "ت" ARABIC LETTER TEH -->
-    <Key
-        latin:keySpec="&#x062A;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062A;" />
     <!-- U+0646: "Ù†" ARABIC LETTER NOON -->
-    <Key
-        latin:keySpec="&#x0646;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0646;" />
     <!-- U+0645: "Ù…" ARABIC LETTER MEEM -->
-    <Key
-        latin:keySpec="&#x0645;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0645;" />
     <!-- U+0643: "Ùƒ" ARABIC LETTER KAF
          U+06AF: "Ú¯" ARABIC LETTER GAF
          U+06A9: "Ú©" ARABIC LETTER KEHEH -->
     <Key
         latin:keySpec="&#x0643;"
-        latin:moreKeys="&#x06AF;,&#x06A9;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06AF;,&#x06A9;" />
     <!-- U+0637: "Ø·" ARABIC LETTER TAH -->
-    <Key
-        latin:keySpec="&#x0637;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0637;" />
 </merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 0bfc66a7de94acabd4108ec327a6fc5607d2a189..8b178013e5e13db5cd26211cec6d6f2951e47ce5 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -18,49 +18,30 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/keys_arabic3_left" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/keys_arabic3_left" />
     <!-- U+0621: "Ø¡" ARABIC LETTER HAMZA -->
-    <Key
-        latin:keySpec="&#x0621;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0621;" />
     <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
-    <Key
-        latin:keySpec="&#x0624;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0624;" />
     <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key
-        latin:keySpec="&#x0631;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0631;" />
     <!-- U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
     <Key
         latin:keySpec="&#x0649;"
-        latin:moreKeys="&#x0626;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;" />
     <!-- U+0629: "Ø©" ARABIC LETTER TEH MARBUTA -->
-    <Key
-        latin:keySpec="&#x0629;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0629;" />
     <!-- U+0648: "Ùˆ" ARABIC LETTER WAW -->
-    <Key
-        latin:keySpec="&#x0648;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0648;" />
     <!-- U+0632: "ز" ARABIC LETTER ZAIN
          U+0698: "Ú˜" ARABIC LETTER JEH -->
     <Key
         latin:keySpec="&#x0632;"
-        latin:moreKeys="&#x0698;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0698;" />
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key
-        latin:keySpec="&#x0638;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0638;" />
     <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key
-        latin:keySpec="&#x062F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062F;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
index 8ca78dab449276659df43b333e7c385c0aa4261e..8d54b179c988dd2fe17ef82ae885f5035a698519 100644
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic1.xml
@@ -18,67 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0567: "Õ§" ARMENIAN SMALL LETTER EH -->
     <Key
         latin:keySpec="&#x0567;"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="1" />
     <!-- U+0569: "Õ©" ARMENIAN SMALL LETTER TO -->
     <Key
         latin:keySpec="&#x0569;"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="2" />
     <!-- U+0583: "Öƒ" ARMENIAN SMALL LETTER PIWR -->
     <Key
         latin:keySpec="&#x0583;"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="3" />
     <!-- U+0571: "Õ±" ARMENIAN SMALL LETTER JA -->
     <Key
         latin:keySpec="&#x0571;"
         latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="4" />
     <!-- U+057B: "Õ»" ARMENIAN SMALL LETTER JHEH -->
     <Key
         latin:keySpec="&#x057B;"
         latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="5" />
     <!-- U+0580: "Ö€" ARMENIAN SMALL LETTER REH -->
     <Key
         latin:keySpec="&#x0580;"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="6" />
     <!-- U+0579: "Õ¹" ARMENIAN SMALL LETTER CHA -->
     <Key
         latin:keySpec="&#x0579;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="7" />
     <!-- U+0573: "Õ³" ARMENIAN SMALL LETTER CHEH -->
     <Key
         latin:keySpec="&#x0573;"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="8" />
     <!-- U+056A: "Õª" ARMENIAN SMALL LETTER ZHE -->
     <Key
         latin:keySpec="&#x056A;"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="9" />
     <!-- U+056E: "Õ®" ARMENIAN SMALL LETTER CA -->
     <Key
         latin:keySpec="&#x056E;"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="0" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
index 9991f739d28f684b4967afba0447f2f1d5bd1363..cb1b932b9e38bf22fcebb1b49fc15ef5c8880205 100644
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic2.xml
@@ -18,50 +18,29 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0584: "Ö„" ARMENIAN SMALL LETTER KEH -->
-    <Key
-        latin:keySpec="&#x0584;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0584;" />
     <!-- U+0578: "Õ¸" ARMENIAN SMALL LETTER VO -->
-    <Key
-        latin:keySpec="&#x0578;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0578;" />
     <!-- U+0565: "Õ¥" ARMENIAN SMALL LETTER ECH
          U+0587: "Ö‡" ARMENIAN SMALL LIGATURE ECH YIWN -->
     <Key
         latin:keySpec="&#x0565;"
         latin:moreKeys="&#x0587;"
-        latin:keyHintLabel="&#x0587;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyHintLabel="&#x0587;" />
     <!-- U+057C: "Õ¼" ARMENIAN SMALL LETTER RA -->
-    <Key
-        latin:keySpec="&#x057C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057C;" />
     <!-- U+057F: "Õ¿" ARMENIAN SMALL LETTER TIWN -->
-    <Key
-        latin:keySpec="&#x057F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057F;" />
     <!-- U+0568: "Õ¨" ARMENIAN SMALL LETTER ET -->
-    <Key
-        latin:keySpec="&#x0568;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0568;" />
     <!-- U+0582: "Ö‚" ARMENIAN SMALL LETTER YIWN -->
-    <Key
-        latin:keySpec="&#x0582;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0582;" />
     <!-- U+056B: "Õ«" ARMENIAN SMALL LETTER INI -->
-    <Key
-        latin:keySpec="&#x056B;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056B;" />
     <!-- U+0585: "Ö…" ARMENIAN SMALL LETTER OH -->
-    <Key
-        latin:keySpec="&#x0585;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0585;" />
     <!-- U+057A: "Õº" ARMENIAN SMALL LETTER PEH -->
-    <Key
-        latin:keySpec="&#x057A;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057A;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
index 2b79386acf99b7f08b3c22cfca0410a4ddfc5e32..33db4529f3edee15752ff863367e966fb474aa89 100644
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic3.xml
@@ -18,43 +18,23 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0561: "Õ¡" ARMENIAN SMALL LETTER AYB -->
-    <Key
-        latin:keySpec="&#x0561;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0561;" />
     <!-- U+057D: "Õ½" ARMENIAN SMALL LETTER SEH -->
-    <Key
-        latin:keySpec="&#x057D;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057D;" />
     <!-- U+0564: "Õ¤" ARMENIAN SMALL LETTER DA -->
-    <Key
-        latin:keySpec="&#x0564;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0564;" />
     <!-- U+0586: "Ö†" ARMENIAN SMALL LETTER FEH -->
-    <Key
-        latin:keySpec="&#x0586;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0586;" />
     <!-- U+0563: "Õ£" ARMENIAN SMALL LETTER GIM -->
-    <Key
-        latin:keySpec="&#x0563;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0563;" />
     <!-- U+0570: "Õ°" ARMENIAN SMALL LETTER HO -->
-    <Key
-        latin:keySpec="&#x0570;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0570;" />
     <!-- U+0575: "Õµ" ARMENIAN SMALL LETTER YI -->
-    <Key
-        latin:keySpec="&#x0575;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0575;" />
     <!-- U+056F: "Õ¯" ARMENIAN SMALL LETTER KEN -->
-    <Key
-        latin:keySpec="&#x056F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056F;" />
     <!-- U+056C: "Õ¬" ARMENIAN SMALL LETTER LIWN -->
-    <Key
-        latin:keySpec="&#x056C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x056C;" />
 </merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
index f8cdd12216ed04d807bf843b6fe5586914e6ac1f..c7db25b73d4c1004671613069924444199c56e7a 100644
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic4.xml
@@ -18,35 +18,19 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0566: "Õ¦" ARMENIAN SMALL LETTER ZA -->
-    <Key
-        latin:keySpec="&#x0566;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0566;" />
     <!-- U+0572: "Õ²" ARMENIAN SMALL LETTER GHAD -->
-    <Key
-        latin:keySpec="&#x0572;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0572;" />
     <!-- U+0581: "ց" ARMENIAN SMALL LETTER CO -->
-    <Key
-        latin:keySpec="&#x0581;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0581;" />
     <!-- U+057E: "Õ¾" ARMENIAN SMALL LETTER VEW -->
-    <Key
-        latin:keySpec="&#x057E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x057E;" />
     <!-- U+0562: "Õ¢" ARMENIAN SMALL LETTER BEN -->
-    <Key
-        latin:keySpec="&#x0562;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0562;" />
     <!-- U+0576: "Õ¶" ARMENIAN SMALL LETTER NOW -->
-    <Key
-        latin:keySpec="&#x0576;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0576;" />
     <!-- U+0574: "Õ´" ARMENIAN SMALL LETTER MEN -->
-    <Key
-        latin:keySpec="&#x0574;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0574;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index c137d12e0f277f8a89b26008f544c7ab07e02f3c..c1fd8b434274c01c51e79867b1d3bf85e02c8df5 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -18,44 +18,37 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0994: "ঔ" BENGALI LETTER AU
          U+09E7: "১" BENGALI DIGIT ONE -->
     <Key
         latin:keySpec="&#x0994;"
         latin:keyHintLabel="&#x09E7;"
-        latin:additionalMoreKeys="&#x09E7;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E7;,1" />
     <!-- U+0990: "ঐ" BENGALI LETTER AI
          U+09E8: "২" BENGALI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0990;"
         latin:keyHintLabel="&#x09E8;"
-        latin:additionalMoreKeys="&#x09E8;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E8;,2" />
     <!-- U+0986: "আ" BENGALI LETTER AA
          U+09E9: "৩" BENGALI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0986;"
         latin:keyHintLabel="&#x09E9;"
-        latin:additionalMoreKeys="&#x09E9;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E9;,3" />
     <!-- U+0988: "ঈ" BENGALI LETTER II
          U+09EA: "৪" BENGALI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0988;"
         latin:keyHintLabel="&#x09EA;"
-        latin:additionalMoreKeys="&#x09EA;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EA;,4" />
     <!-- U+098A: "ঊ" BENGALI LETTER UU
          U+09EB: "৫" BENGALI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x098A;"
         latin:keyHintLabel="&#x09EB;"
-        latin:additionalMoreKeys="&#x09EB;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EB;,5" />
     <!-- U+09AC: "ব" BENGALI LETTER BA
          U+09AD: "ভ" BENGALI LETTER BHA
          U+09EC: "৬" BENGALI DIGIT SIX -->
@@ -63,15 +56,13 @@
         latin:keySpec="&#x09AC;"
         latin:moreKeys="&#x09AD;,%"
         latin:keyHintLabel="&#x09EC;"
-        latin:additionalMoreKeys="&#x09EC;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EC;,6" />
     <!-- U+09B9: "হ" BENGALI LETTER HA
          U+09ED: "৭" BENGALI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x09B9;"
         latin:keyHintLabel="&#x09ED;"
-        latin:additionalMoreKeys="&#x09ED;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09ED;,7" />
     <!-- U+0997: "গ" BENGALI LETTER GA
          U+0998: "ঘ" BENGALI LETTER GHA
          U+09EE: "৮" BENGALI DIGIT EIGHT -->
@@ -79,8 +70,7 @@
         latin:keySpec="&#x0997;"
         latin:moreKeys="&#x0998;,%"
         latin:keyHintLabel="&#x09EE;"
-        latin:additionalMoreKeys="&#x09EE;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EE;,8" />
     <!-- U+09A6: "দ" BENGALI LETTER DA
          U+09A7: "ধ" BENGALI LETTER DHA
          U+09EF: "৯" BENGALI DIGIT NINE -->
@@ -88,8 +78,7 @@
         latin:keySpec="&#x09A6;"
         latin:moreKeys="&#x09A7;,%"
         latin:keyHintLabel="&#x09EF;"
-        latin:additionalMoreKeys="&#x09EF;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09EF;,9" />
     <!-- U+099C: "জ" BENGALI LETTER JA
          U+099D: "ঝ" BENGALI LETTER JHA
          U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
@@ -98,12 +87,10 @@
         latin:keySpec="&#x099C;"
         latin:moreKeys="&#x099D;,&#x099C;&#x09CD;&#x099E;,%"
         latin:keyHintLabel="&#x09E6;"
-        latin:additionalMoreKeys="&#x09E6;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x09E6;,0" />
     <!-- U+09A1: "ড" BENGALI LETTER DDA
          U+09A1/U+09BC: "ড়" BENGALI LETTER DDA/BENGALI SIGN NUKTA -->
     <Key
         latin:keySpec="&#x09A1;"
-        latin:moreKeys="&#x09A1;&#x09BC;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A1;&#x09BC;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml
index 589ce017d310a99264ea755492668be0e6cd86ac..44b361797141441471e31af12feabd48e2c76831 100644
--- a/java/res/xml/rowkeys_bengali2.xml
+++ b/java/res/xml/rowkeys_bengali2.xml
@@ -18,77 +18,64 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0993: "ও" BENGALI LETTER O
          U+09CB: "ো" BENGALI VOWEL SIGN O -->
     <Key
         latin:keySpec="&#x0993;"
-        latin:moreKeys="&#x09CB;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CB;" />
     <!-- U+098F: "এ" BENGALI LETTER E
          U+09C7: "ে" BENGALI VOWEL SIGN E -->
     <Key
         latin:keySpec="&#x098F;"
-        latin:moreKeys="&#x09C7;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C7;" />
     <!-- U+0985: "অ" BENGALI LETTER A
          U+09CD: "্" BENGALI SIGN VIRAMA -->
     <Key
         latin:keySpec="&#x0985;"
-        latin:moreKeys="&#x09CD;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CD;" />
     <!-- U+0987: "ই" BENGALI LETTER I
          U+09BF: "ি" BENGALI VOWEL SIGN I -->
     <Key
         latin:keySpec="&#x0987;"
-        latin:moreKeys="&#x09BF;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09BF;" />
     <!-- U+0989: "উ" BENGALI LETTER U
          U+09C1: "ু" BENGALI VOWEL SIGN U -->
     <Key
         latin:keySpec="&#x0989;"
-        latin:moreKeys="&#x09C1;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C1;" />
     <!-- U+09AA: "প" BENGALI LETTER PA
          U+09AB: "ফ" BENGALI LETTER PHA -->
     <Key
         latin:keySpec="&#x09AA;"
-        latin:moreKeys="&#x09AB;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09AB;" />
     <!-- U+09B0: "র" BENGALI LETTER RA
          U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
          U+098B: "ঋ" BENGALI LETTER VOCALIC R
          U+09A4/U+09CD/U+09B0: "ত্র" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
     <Key
         latin:keySpec="&#x09B0;"
-        latin:moreKeys="&#x09C3;,&#x098B;,&#x09A4;&#x09CD;&#x09B0;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09C3;,&#x098B;,&#x09A4;&#x09CD;&#x09B0;" />
     <!-- U+0995: "ক" BENGALI LETTER KA
          U+0996: "খ" BENGALI LETTER KHA -->
     <Key
         latin:keySpec="&#x0995;"
-        latin:moreKeys="&#x0996;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0996;" />
     <!-- U+09A4: "ত" BENGALI LETTER TA
          U+09CE: "ৎ" BENGALI LETTER KHANDA TA
          U+09A5: "থ" BENGALI LETTER THA
          U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA -->
     <Key
         latin:keySpec="&#x09A4;"
-        latin:moreKeys="&#x09CE;,&#x09A5;,&#x09A4;&#x09CD;&#x09A4;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09CE;,&#x09A5;,&#x09A4;&#x09CD;&#x09A4;" />
     <!-- U+099A: "চ" BENGALI LETTER CA
          U+099B: "ছ" BENGALI LETTER CHA -->
     <Key
         latin:keySpec="&#x099A;"
-        latin:moreKeys="&#x099B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x099B;" />
     <!-- U+099F: "ট" BENGALI LETTER TTA
          U+09A0: "ঠ" BENGALI LETTER TTHA -->
     <Key
         latin:keySpec="&#x099F;"
-        latin:moreKeys="&#x09A0;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A0;" />
 </merge>
diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml
index b6d46850f74914c083b9026a0f8a276e5ee6e3d3..5222b096b805ddc3b20c8609ec07b4a193ce07c9 100644
--- a/java/res/xml/rowkeys_bengali3.xml
+++ b/java/res/xml/rowkeys_bengali3.xml
@@ -18,65 +18,51 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU
          U+0983: "ঃ" BENGALI SIGN VISARGA
          U+0982: "ং" BENGALI SIGN ANUSVARA -->
     <Key
         latin:keySpec="&#x0981;"
-        latin:moreKeys="&#x0983;,&#x0982;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0983;,&#x0982;" />
     <!-- U+09A2: "ঢ" BENGALI LETTER DDHA
          U+09A2/U+09BC: "ঢ়" BENGALI LETTER DDHA/BENGALI SIGN NUKTA -->
     <Key
         latin:keySpec="&#x09A2;"
-        latin:moreKeys="&#x09A2;&#x09BC;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A2;&#x09BC;" />
     <!-- U+09AE: "ম" BENGALI LETTER MA -->
-    <Key
-        latin:keySpec="&#x09AE;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x09AE;" />
     <!-- U+09A8: "ন" BENGALI LETTER NA
          U+09A3: "ণ" BENGALI LETTER NNA -->
     <Key
         latin:keySpec="&#x09A8;"
-        latin:moreKeys="&#x09A3;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09A3;" />
     <!-- U+099E: "ঞ" BENGALI LETTER NYA
          U+0999: "ঙ" BENGALI LETTER NGA
          U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
     <Key
         latin:keySpec="&#x099E;"
-        latin:moreKeys="&#x0999;,&#x099E;&#x09CD;&#x099C;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0999;,&#x099E;&#x09CD;&#x099C;" />
     <!-- U+09B2: "ল" BENGALI LETTER LA -->
-    <Key
-        latin:keySpec="&#x09B2;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x09B2;" />
     <!-- U+09B7: "ষ" BENGALI LETTER SSA
          U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA -->
     <Key
         latin:keySpec="&#x09B7;"
-        latin:moreKeys="&#x0995;&#x09CD;&#x09B7;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0995;&#x09CD;&#x09B7;" />
     <!-- U+09B8: "স" BENGALI LETTER SA
          U+09B6: "শ" BENGALI LETTER SHA -->
     <Key
         latin:keySpec="&#x09B8;"
-        latin:moreKeys="&#x09B6;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09B6;" />
     <!-- U+09DF: "য়" BENGALI LETTER YYA
          U+09AF: "য" BENGALI LETTER YA -->
     <Key
         latin:keySpec="&#x09DF;"
-        latin:moreKeys="&#x09AF;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x09AF;" />
     <!-- U+0964: "।" DEVANAGARI DANDA
          U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
     <Key
         latin:keySpec="&#x0964;"
-        latin:moreKeys="&#x0965;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0965;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 46fef423671b860bf5afc3a090da017bfc321f90..abc2c961417c9b644122776af44b809a094754c0 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -18,58 +18,49 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+06F1: "Û±" EXTENDED ARABIC-INDIC DIGIT ONE -->
     <Key
         latin:keySpec="&#x0636;"
         latin:keyHintLabel="&#x06F1;"
-        latin:additionalMoreKeys="&#x06F1;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F1;,1" />
     <!-- U+0635: "ص" ARABIC LETTER SAD
          U+06F2: "Û²" EXTENDED ARABIC-INDIC DIGIT TWO -->
     <Key
         latin:keySpec="&#x0635;"
         latin:keyHintLabel="&#x06F2;"
-        latin:additionalMoreKeys="&#x06F2;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F2;,2" />
     <!-- U+062B: "Ø«" ARABIC LETTER THEH
          U+06F3: "Û³" EXTENDED ARABIC-INDIC DIGIT THREE -->
     <Key
         latin:keySpec="&#x062B;"
         latin:keyHintLabel="&#x06F3;"
-        latin:additionalMoreKeys="&#x06F3;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F3;,3" />
     <!-- U+0642: "Ù‚" ARABIC LETTER QAF
          U+06F4: "Û´" EXTENDED ARABIC-INDIC DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0642;"
         latin:keyHintLabel="&#x06F4;"
-        latin:additionalMoreKeys="&#x06F4;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F4;,4" />
     <!-- U+0641: "ف" ARABIC LETTER FEH
          U+06F5: "Ûµ" EXTENDED ARABIC-INDIC DIGIT FIVE -->
     <Key
         latin:keySpec="&#x0641;"
         latin:keyHintLabel="&#x06F5;"
-        latin:additionalMoreKeys="&#x06F5;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F5;,5" />
     <!-- U+063A: "غ" ARABIC LETTER GHAIN
          U+06F6: "Û¶" EXTENDED ARABIC-INDIC DIGIT SIX -->
     <Key
         latin:keySpec="&#x063A;"
         latin:keyHintLabel="&#x06F6;"
-        latin:additionalMoreKeys="&#x06F6;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F6;,6" />
     <!-- U+0639: "ع" ARABIC LETTER AIN
          U+06F7: "Û·" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0639;"
         latin:keyHintLabel="&#x06F7;"
-        latin:additionalMoreKeys="&#x06F7;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F7;,7" />
     <!-- U+0647: "Ù‡" ARABIC LETTER HEH
          U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
          U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -80,24 +71,19 @@
         latin:keySpec="&#x0647;"
         latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
         latin:keyHintLabel="&#x06F8;"
-        latin:additionalMoreKeys="&#x06F8;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F8;,8" />
     <!-- U+062E: "Ø®" ARABIC LETTER KHAH
          U+06F9: "Û¹" EXTENDED ARABIC-INDIC DIGIT NINE -->
     <Key
         latin:keySpec="&#x062E;"
         latin:keyHintLabel="&#x06F9;"
-        latin:additionalMoreKeys="&#x06F9;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F9;,9" />
     <!-- U+062D: "Ø­" ARABIC LETTER HAH
          U+06F0: "Û°" EXTENDED ARABIC-INDIC DIGIT ZERO -->
     <Key
         latin:keySpec="&#x062D;"
         latin:keyHintLabel="&#x06F0;"
-        latin:additionalMoreKeys="&#x06F0;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x06F0;,0" />
     <!-- U+062C: "ج" ARABIC LETTER JEEM -->
-    <Key
-        latin:keySpec="&#x062C;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062C;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index f94ee8e49730638548d8ce2624cdfc535be75f92..82f1903c7ea95cb796b5fa9fd80018ec9ba685f4 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -18,17 +18,11 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0634: "Ø´" ARABIC LETTER SHEEN -->
-    <Key
-        latin:keySpec="&#x0634;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0634;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
-    <Key
-        latin:keySpec="&#x0633;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0633;" />
     <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
          U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
          U+064A: "ÙŠ" ARABIC LETTER YEH
@@ -36,16 +30,11 @@
          U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
     <Key
         latin:keySpec="&#x06CC;"
-        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />
     <!-- U+0628: "ب" ARABIC LETTER BEH -->
-    <Key
-        latin:keySpec="&#x0628;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0628;" />
     <!-- U+0644: "Ù„" ARABIC LETTER LAM -->
-    <Key
-        latin:keySpec="&#x0644;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0644;" />
     <!-- U+0627: "ا" ARABIC LETTER ALEF
          U+0671: "Ù±" ARABIC LETTER ALEF WASLA
          U+0621: "Ø¡" ARABIC LETTER HAMZA
@@ -54,30 +43,21 @@
          U+0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW -->
     <Key
         latin:keySpec="&#x0627;"
-        latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="!fixedColumnOrder!5,&#x0671;,&#x0621;,&#x0622;,&#x0623;,&#x0625;" />
     <!-- U+062A: "ت" ARABIC LETTER TEH
          U+0629: "Ø©": ARABIC LETTER TEH MARBUTA -->
     <Key
         latin:keySpec="&#x062A;"
-        latin:moreKeys="&#x0629;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0629;" />
     <!-- U+0646: "Ù†" ARABIC LETTER NOON -->
-    <Key
-        latin:keySpec="&#x0646;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0646;" />
     <!-- U+0645: "Ù…" ARABIC LETTER MEEM -->
-    <Key
-        latin:keySpec="&#x0645;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0645;" />
     <!-- U+06A9: "Ú©" ARABIC LETTER KEHEH
          U+0643: "Ùƒ" ARABIC LETTER KAF -->
     <Key
         latin:keySpec="&#x06A9;"
-        latin:moreKeys="&#x0643;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0643;" />
     <!-- U+06AF: "Ú¯" ARABIC LETTER GAF -->
-    <Key
-        latin:keySpec="&#x06AF;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x06AF;" />
 </merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index edc22f95a7fe776eb7a3fcee25773722e138374f..b825a36d512fd349909ef00f6826b5633869546e 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -18,47 +18,27 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
-    <Key
-        latin:keySpec="&#x0638;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0638;" />
     <!-- U+0637: "Ø·" ARABIC LETTER TAH -->
-    <Key
-        latin:keySpec="&#x0637;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0637;" />
     <!-- U+0698: "Ú˜" ARABIC LETTER JEH -->
-    <Key
-        latin:keySpec="&#x0698;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0698;" />
     <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
-    <Key
-        latin:keySpec="&#x0632;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0632;" />
     <!-- U+0631: "ر" ARABIC LETTER REH -->
-    <Key
-        latin:keySpec="&#x0631;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0631;" />
     <!-- U+0630: "Ø°" ARABIC LETTER THAL -->
-    <Key
-        latin:keySpec="&#x0630;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0630;" />
     <!-- U+062F: "د" ARABIC LETTER DAL -->
-    <Key
-        latin:keySpec="&#x062F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x062F;" />
     <!-- U+067E: "Ù¾" ARABIC LETTER PEH -->
-    <Key
-        latin:keySpec="&#x067E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x067E;" />
     <!-- U+0648: "Ùˆ" ARABIC LETTER WAW
          U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
     <Key
         latin:keySpec="&#x0648;"
-        latin:moreKeys="&#x0624;"
-        latin:keyLabelFlags="fontNormal" />
-    <include
-        latin:keyboardLayout="@xml/keys_farsi3_right" />
+        latin:moreKeys="&#x0624;" />
+    <include latin:keyboardLayout="@xml/keys_farsi3_right" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index cff9756cfaba545b705afb84831e9c3a72b7f375..cd08e160023075a8c0e7ec7b97140f245170f9a1 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -18,82 +18,61 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU
                  U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0914;"
-                latin:moreKeys="&#x0912;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0912;&#x0902;" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
                  U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0910;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0910;&#x0902;" />
             <!-- U+0906: "आ" DEVANAGARI LETTER AA
                  U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
                  U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0906;"
-                latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0906;&#x0902;,&#x0906;&#x0901;" />
             <!-- U+0908: "ई" DEVANAGARI LETTER II
                  U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x0908;"
-                latin:moreKeys="&#x0908;&#x0902;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0908;&#x0902;" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
                  U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
                  U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090A;&#x0902;,&#x090A;&#x0901;" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVisarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
             <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key
-                latin:keySpec="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0918;" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA
                  U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
                  U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0927;"
-                latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0915;&#x094D;&#x0937;,&#x0936;&#x094D;&#x0930;" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0922;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
             <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -102,8 +81,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
             <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -112,8 +90,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
             <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -122,8 +99,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
             <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -132,8 +108,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
             <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -146,15 +121,13 @@
                 latin:keySpec="&#x092C;"
                 latin:moreKeys="&#x092C;&#x0952;,%"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA
                  U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0939;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096D;,7" />
             <!-- U+0917: "ग" DEVANAGARI LETTER GA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
                  U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA
@@ -164,15 +137,13 @@
                 latin:keySpec="&#x0917;"
                 latin:moreKeys="&#x091C;&#x094D;&#x091E;,&#x0917;&#x093C;,&#x0917;&#x0952;,%"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096E;,8" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA
                  U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0926;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096F;,9" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA
                  U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -182,15 +153,13 @@
                 latin:keySpec="&#x091C;"
                 latin:moreKeys="&#x091C;&#x0952;,&#x091C;&#x094D;&#x091E;,&#x091C;&#x093C;,%"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0921: "ड" DEVANAGARI LETTER DDA
                  U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA
                  U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0921;"
-                latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0921;&#x0952;,&#x0921;&#x093C;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index 7ba4ee1ecea7fcdfc52c0fd04c29317aa2c5df0f..fec93f3c6858764ba8b8be93f054d90f6f7f4a65 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -18,21 +18,16 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O
                  U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA
                  U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
                  U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
             <Key
                 latin:keySpec="&#x0913;"
-                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E
                  U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA
                  U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU
@@ -40,129 +35,97 @@
                  U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
             <Key
                 latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A
                  U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
                  U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0905;"
-                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
                  U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U
                  U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
                  U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0909;"
-                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA
                  U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x092B;"
-                latin:moreKeys="&#x092B;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x092B;&#x093C;" />
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
                  U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0931;"
-                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA
                  U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0916;"
-                latin:moreKeys="&#x0916;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0916;&#x093C;" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0925;" />
             <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091B;" />
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0920;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
             <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092A;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
                  U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA
                  U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0915;"
-                latin:moreKeys="&#x0915;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0915;&#x093C;" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0924;"
-                latin:moreKeys="&#x0924;&#x094D;&#x0930;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0924;&#x094D;&#x0930;" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091A;" />
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
-            <Key
-                latin:keySpec="&#x091F;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x091F;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index cf36fc5d4236010d64111733f3a6834ff53e40f3..2e6d6864eef140438ba62f143f121cd7330c635a 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -18,114 +18,80 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <Key
-                latin:keySpec="&#x0911;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0911;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key
-                latin:keySpec="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0923;" />
             <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA -->
-            <Key
-                latin:keySpec="&#x0929;" />
+            <Key latin:keySpec="&#x0929;" />
             <!-- U+0933: "ळ" DEVANAGARI LETTER LLA
                  U+0934: "ऴ" DEVANAGARI LETTER LLLA -->
             <Key
                 latin:keySpec="&#x0933;"
-                latin:moreKeys="&#x0934;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0934;" />
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key
-                latin:keySpec="&#x0937;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0937;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
             <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key
-                latin:keySpec="&#x091E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091E;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA
                  U+0950: "ॐ" DEVANAGARI OM -->
             <Key
                 latin:keySpec="&#x092E;"
-                latin:moreKeys="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0950;" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA
                  U+091E: "ञ" DEVANAGARI LETTER NYA
                  U+0919: "ङ" DEVANAGARI LETTER NGA
                  U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0928;"
-                latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x091E;,&#x0919;,&#x0928;&#x093C;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA
                  U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L
                  U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL -->
             <Key
                 latin:keySpec="&#x0932;"
-                latin:moreKeys="&#x090C;,&#x0961;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090C;,&#x0961;" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+095F: "य़" DEVANAGARI LETTER YYA -->
             <Key
                 latin:keySpec="&#x092F;"
-                latin:moreKeys="&#x095F;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x095F;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignNukta" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+            <Key latin:keyStyle="baseKeyDevanagariSignNukta" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
index c63de4f0b9d76acc0dc092d5c605a377bd03d969..06a014162f8fe3762920bec400dbfd258edee4b5 100644
--- a/java/res/xml/rowkeys_hindi_compact1.xml
+++ b/java/res/xml/rowkeys_hindi_compact1.xml
@@ -18,74 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
     <!-- U+0914: "औ" DEVANAGARI LETTER AU
          U+0967: "१" DEVANAGARI DIGIT ONE -->
     <Key
         latin:keySpec="&#x0914;"
         latin:keyStyle="moreKeysDevanagariVowelSignAu"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="&#x0967;,1"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0967;,1" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
     <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
          U+0968: "२" DEVANAGARI DIGIT TWO -->
     <Key
         latin:keySpec="&#x0910;"
         latin:keyStyle="moreKeysDevanagariVowelSignAi"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="&#x0968;,2"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0968;,2" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
     <!-- U+0906: "आ" DEVANAGARI LETTER AA
          U+0969: "३" DEVANAGARI DIGIT THREE -->
     <Key
         latin:keySpec="&#x0906;"
         latin:keyStyle="moreKeysDevanagariVowelSignAa"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="&#x0969;,3"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0969;,3" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
     <!-- U+0908: "ई" DEVANAGARI LETTER II
          U+096A: "४" DEVANAGARI DIGIT FOUR -->
     <Key
         latin:keySpec="&#x0908;"
         latin:keyStyle="moreKeysDevanagariVowelSignIi"
         latin:keyHintLabel="4"
-        latin:additionalMoreKeys="&#x096A;,4"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096A;,4" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
     <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
          U+096B: "५" DEVANAGARI DIGIT FIVE -->
     <Key
         latin:keySpec="&#x090A;"
         latin:keyStyle="moreKeysDevanagariVowelSignUu"
         latin:keyHintLabel="5"
-        latin:additionalMoreKeys="&#x096B;,5"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096B;,5" />
     <!-- U+092C: "ब" DEVANAGARI LETTER BA
          U+092D: "भ" DEVANAGARI LETTER BHA
          U+096C: "६" DEVANAGARI DIGIT SIX -->
@@ -93,15 +81,13 @@
         latin:keySpec="&#x092C;"
         latin:moreKeys="&#x092D;,%"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096C;,6" />
     <!-- U+0939: "ह" DEVANAGARI LETTER HA
          U+096D: "७" DEVANAGARI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0939;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096D;,7" />
     <!-- U+0917: "ग" DEVANAGARI LETTER GA
          U+0918: "घ" DEVANAGARI LETTER GHA
          U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -109,8 +95,7 @@
         latin:keySpec="&#x0917;"
         latin:moreKeys="&#x0918;,%"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096E;,8" />
     <!-- U+0926: "द" DEVANAGARI LETTER DA
          U+0927: "ध" DEVANAGARI LETTER DHA
          U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -118,8 +103,7 @@
         latin:keySpec="&#x0926;"
         latin:moreKeys="&#x0927;,%"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096F;,9" />
     <!-- U+091C: "ज" DEVANAGARI LETTER JA
          U+091D: "झ" DEVANAGARI LETTER JHA
          U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -128,12 +112,10 @@
         latin:keySpec="&#x091C;"
         latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0966;,0" />
     <!-- U+0921: "ड" DEVANAGARI LETTER DDA
          U+0922: "ढ" DEVANAGARI LETTER DDHA -->
     <Key
         latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0922;" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
index 06364c209dfe358f20f33d805cdb019f5455c3f5..7cbe5efbbec4d12f5b2962ae09e30173459b5796 100644
--- a/java/res/xml/rowkeys_hindi_compact2.xml
+++ b/java/res/xml/rowkeys_hindi_compact2.xml
@@ -18,98 +18,79 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
     <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
     <Key
         latin:keySpec="&#x0913;"
-        latin:keyStyle="moreKeysDevanagariVowelSignO"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
     <!-- U+090F: "ए" DEVANAGARI LETTER E -->
     <Key
         latin:keySpec="&#x090F;"
-        latin:keyStyle="moreKeysDevanagariVowelSignE"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
     <!-- U+0905: "अ" DEVANAGARI LETTER A -->
     <Key
         latin:keySpec="&#x0905;"
-        latin:keyStyle="moreKeysDevanagariSignVirama"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariSignVirama" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
     <!-- U+0907: "इ" DEVANAGARI LETTER I -->
     <Key
         latin:keySpec="&#x0907;"
-        latin:keyStyle="moreKeysDevanagariVowelSignI"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignI" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
     <!-- U+0909: "उ" DEVANAGARI LETTER U -->
     <Key
         latin:keySpec="&#x0909;"
-        latin:keyStyle="moreKeysDevanagariVowelSignU"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignU" />
     <!-- U+092A: "प" DEVANAGARI LETTER PA
          U+092B: "फ" DEVANAGARI LETTER PHA -->
     <Key
         latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x092B;" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
     <!-- U+0930: "र" DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
     <!-- U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA -->
     <Key
         latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0916;" />
     <!-- U+0924: "त" DEVANAGARI LETTER TA
          U+0925: "थ" DEVANAGARI LETTER THA
          U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
     <!-- U+091A: "च" DEVANAGARI LETTER CA
          U+091B: "छ" DEVANAGARI LETTER CHA -->
     <Key
         latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x091B;" />
     <!-- U+091F: "ट" DEVANAGARI LETTER TTA
          U+0920: "ठ" DEVANAGARI LETTER TTHA -->
     <Key
         latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0920;" />
 </merge>
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
index 0e8165ecc650913054e6b8ceb3a3325a1936c70b..89a9f9d60d8ff0c80fec083a6ee0133d5f20997a 100644
--- a/java/res/xml/rowkeys_hindi_compact3.xml
+++ b/java/res/xml/rowkeys_hindi_compact3.xml
@@ -18,72 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
     <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
     <Key
         latin:keySpec="&#x0911;"
-        latin:keyStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignCandraO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
     <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
     <Key
         latin:keySpec="&#x090D;"
-        latin:keyStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignCandraE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
     <!-- U+092E: "म" DEVANAGARI LETTER MA
          U+0950: "ॐ" DEVANAGARI OM -->
     <Key
         latin:keySpec="&#x092E;"
-        latin:moreKeys="&#x0950;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0950;" />
     <!-- U+0928: "न" DEVANAGARI LETTER NA
          U+0923: "ण" DEVANAGARI LETTER NNA
          U+091E: "ञ" DEVANAGARI LETTER NYA
          U+0919: "ङ" DEVANAGARI LETTER NGA -->
     <Key
         latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
     <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key
-        latin:keySpec="&#x0935;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0935;" />
     <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-    <Key
-        latin:keySpec="&#x0932;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0932;" />
     <!-- U+0938: "स" DEVANAGARI LETTER SA
          U+0936: "श" DEVANAGARI LETTER SHA
          U+0937: "ष" DEVANAGARI LETTER SSA
          U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
     <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key
-        latin:keySpec="&#x092F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092F;" />
     <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
     <Key
         latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
index 567c6aff0b0496d3f2de4445c36bb330b0d44213..79fd231a075e7538cda2a902dc8c503cfba94609 100644
--- a/java/res/xml/rowkeys_khmer1.xml
+++ b/java/res/xml/rowkeys_khmer1.xml
@@ -18,82 +18,75 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+200D: ZERO WIDTH JOINER -->
             <Key
                 latin:keySpec="!"
-                latin:moreKeys="!icon/zwj_key|&#x200D;" />
+                latin:moreKeys="!icon/zwj_key|&#x200D;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17D7: "ៗ" KHMER SIGN LEK TOO
                  U+200C: ZERO WIDTH NON-JOINER -->
             <Key
                 latin:keySpec="&#x17D7;"
-                latin:moreKeys="!icon/zwnj_key|&#x200C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="!icon/zwnj_key|&#x200C;" />
             <!-- U+17D1: "៑" KHMER SIGN VIRIAM -->
             <Key
                 latin:keySpec="&quot;"
                 latin:keyHintLabel="&#x17D1;"
-                latin:moreKeys="&#x17D1;" />
+                latin:moreKeys="&#x17D1;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
                  U+20AC: "€" EURO SIGN -->
             <Key
                 latin:keySpec="&#x17DB;"
                 latin:keyHintLabel="$"
-                latin:moreKeys="$,&#x20AC;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="$,&#x20AC;" />
             <!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH -->
             <Key
                 latin:keySpec="%"
                 latin:keyHintLabel="&#x17D6;"
-                latin:moreKeys="&#x17D6;" />
+                latin:moreKeys="&#x17D6;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17CD: "៍" KHMER SIGN TOANDAKHIAT
                  U+17D9: "៙" KHMER SIGN PHNAEK MUAN -->
             <Key
                 latin:keySpec="&#x17CD;"
                 latin:keyHintLabel="&#x17D9;"
-                latin:moreKeys="&#x17D9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17D9;" />
             <!-- U+17D0: "័" KHMER SIGN SAMYOK SANNYA
                  U+17DA: "៚" KHMER SIGN KOOMUUT -->
             <Key
                 latin:keySpec="&#x17D0;"
                 latin:keyHintLabel="&#x17DA;"
                 latin:keyHintLabelVerticalAdjustment="-30%"
-                latin:moreKeys="&#x17DA;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17DA;" />
             <!-- U+17CF: "៏" KHMER SIGN AHSDA -->
             <Key
                 latin:keySpec="&#x17CF;"
                 latin:keyHintLabel="*"
-                latin:moreKeys="*"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="*" />
             <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
             <Key
                 latin:keySpec="("
                 latin:keyHintLabel="{"
-                latin:moreKeys="{,&#x00AB;" />
+                latin:moreKeys="{,&#x00AB;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
             <Key
                 latin:keySpec=")"
                 latin:keyHintLabel="}"
-                latin:moreKeys="},&#x00BB;" />
+                latin:moreKeys="},&#x00BB;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+17CC: "៌" KHMER SIGN ROBAT
                  U+00D7: "×" MULTIPLICATION SIGN -->
             <Key
                 latin:keySpec="&#x17CC;"
                 latin:keyHintLabel="&#x00D7;"
-                latin:moreKeys="&#x00D7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x00D7;" />
             <!-- U+17CE: "៎" KHMER SIGN KAKABAT -->
-            <Key
-                latin:keySpec="&#x17CE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CE;" />
         </case>
         <default>
             <!-- U+17E1: "១" KHMER DIGIT ONE
@@ -102,94 +95,82 @@
                 latin:keySpec="&#x17E1;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x17F1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F1;" />
             <!-- U+17E2: "២" KHMER DIGIT TWO
                  U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII -->
             <Key
                 latin:keySpec="&#x17E2;"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x17F2;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F2;" />
             <!-- U+17E3: "៣" KHMER DIGIT THREE
                  U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI -->
             <Key
                 latin:keySpec="&#x17E3;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x17F3;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F3;" />
             <!-- U+17E4: "៤" KHMER DIGIT FOUR
                  U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON -->
             <Key
                 latin:keySpec="&#x17E4;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x17F4;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F4;" />
             <!-- U+17E5: "៥" KHMER DIGIT FIVE
                  U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM -->
             <Key
                 latin:keySpec="&#x17E5;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x17F5;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F5;" />
             <!-- U+17E6: "៦" KHMER DIGIT SIX
                  U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY -->
             <Key
                 latin:keySpec="&#x17E6;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x17F6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F6;" />
             <!-- U+17E7: "៧" KHMER DIGIT SEVEN
                  U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII -->
             <Key
                 latin:keySpec="&#x17E7;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x17F7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F7;" />
             <!-- U+17E8: "៨" KHMER DIGIT EIGHT
                  U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI -->
             <Key
                 latin:keySpec="&#x17E8;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x17F8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F8;" />
             <!-- U+17E9: "៩" KHMER DIGIT NINE
                  U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON -->
             <Key
                 latin:keySpec="&#x17E9;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x17F9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F9;" />
             <!-- U+17E0: "០" KHMER DIGIT ZERO
                  U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON -->
             <Key
                 latin:keySpec="&#x17E0;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x17F0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17F0;" />
             <!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI
                  U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII -->
             <Key
                 latin:keySpec="&#x17A5;"
                 latin:keyHintLabel="&#x17A6;"
-                latin:moreKeys=",&#x17A6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys=",&#x17A6;" />
             <!-- U+17B2: "áž²" KHMER INDEPENDENT VOWEL QOO TYPE TWO
                  U+17B1: "áž±" KHMER INDEPENDENT VOWEL QOO TYPE ONE -->
             <Key
                 latin:keySpec="&#x17B2;"
                 latin:keyHintLabel="&#x17B1;"
-                latin:moreKeys="&#x17B1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17B1;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index 4146895f716c7c7fc4787cab703248c997907b45..04ca1e0df8c85c5c5d4dfa15c5b9209d77972922 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -18,117 +18,70 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1788: "ឈ" KHMER LETTER CHO
                  U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
             <Key
                 latin:keySpec="&#x1788;"
                 latin:keyHintLabel="&#x17DC;"
-                latin:moreKeys="&#x17DC;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:moreKeys="&#x17DC;" />
             <!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
                  U+17DD: "៝" KHMER SIGN ATTHACAN -->
             <Key
                 latin:keySpec="&#x17BA;"
                 latin:keyHintLabel="&#x17DD;"
                 latin:keyHintLabelVerticalAdjustment="40%"
-                latin:moreKeys="&#x17DD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17DD;" />
             <!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
-            <Key
-                latin:keySpec="&#x17C2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C2;" />
             <!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
                  U+17AB: "áž«" KHMER INDEPENDENT VOWEL RY -->
             <Key
                 latin:keySpec="&#x17AC;"
                 latin:keyHintLabel="&#x17AB;"
-                latin:moreKeys="&#x17AB;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17AB;" />
             <!-- U+1791: "áž‘" KHMER LETTER TO -->
-            <Key
-                latin:keySpec="&#x1791;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1791;" />
             <!-- U+17BD: "áž½" KHMER VOWEL SIGN UA -->
-            <Key
-                latin:keySpec="&#x17BD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BD;" />
             <!-- U+17BC: "áž¼" KHMER VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x17BC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BC;" />
             <!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x17B8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B8;" />
             <!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
-            <Key
-                latin:keySpec="&#x17C5;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C5;" />
             <!-- U+1797: "áž—" KHMER LETTER PHO -->
-            <Key
-                latin:keySpec="&#x1797;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1797;" />
             <!-- U+17BF: "áž¿" KHMER VOWEL SIGN YA -->
-            <Key
-                latin:keySpec="&#x17BF;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17BF;" />
             <!-- U+17B0: "áž°" KHMER INDEPENDENT VOWEL QAI -->
-            <Key
-                latin:keySpec="&#x17B0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B0;" />
         </case>
         <default>
             <!-- U+1786: "ឆ" KHMER LETTER CHA -->
-            <Key
-                latin:keySpec="&#x1786;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1786;" />
             <!-- U+17B9: "áž¹" KHMER VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x17B9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B9;" />
             <!-- U+17C1: "េ" KHMER VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x17C1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C1;" />
             <!-- U+179A: "ážš" KHMER LETTER RO -->
-            <Key
-                latin:keySpec="&#x179A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179A;" />
             <!-- U+178F: "ត" KHMER LETTER TA -->
-            <Key
-                latin:keySpec="&#x178F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178F;" />
             <!-- U+1799: "áž™" KHMER LETTER YO -->
-            <Key
-                latin:keySpec="&#x1799;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1799;" />
             <!-- U+17BB: "áž»" KHMER VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x17BB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BB;" />
             <!-- U+17B7: "áž·" KHMER VOWEL SIGN I -->
-            <Key
-                latin:keySpec="&#x17B7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B7;" />
             <!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
-            <Key
-                latin:keySpec="&#x17C4;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C4;" />
             <!-- U+1795: "áž•" KHMER LETTER PHA -->
-            <Key
-                latin:keySpec="&#x1795;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1795;" />
             <!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
-            <Key
-                latin:keySpec="&#x17C0;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C0;" />
             <!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
                  U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
                  U+17B1: "áž±" KHMER INDEPENDENT VOWEL QOO TYPE ONE
@@ -138,8 +91,7 @@
             <Key
                 latin:keySpec="&#x17AA;"
                 latin:keyHintLabel="&#x17A7;"
-                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index 5e6d01fb2922cddd69cffba076711537e271c491..c2db364494f8efc7b467ca0341f8d7213bf852cd 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -18,121 +18,76 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
             <Key
                 latin:keySpec="&#x17B6;&#x17C6;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI -->
-            <Key
-                latin:keySpec="&#x17C3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C3;" />
             <!-- U+178C: "ឌ" KHMER LETTER DO -->
-            <Key
-                latin:keySpec="&#x178C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178C;" />
             <!-- U+1792: "áž’" KHMER LETTER THO -->
-            <Key
-                latin:keySpec="&#x1792;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1792;" />
             <!-- U+17A2: "អ" KHMER LETTER QA -->
-            <Key
-                latin:keySpec="&#x17A2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A2;" />
             <!-- U+17C7: "ះ" KHMER SIGN REAHMUK
                  U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
             <Key
                 latin:keySpec="&#x17C7;"
                 latin:keyHintLabel="&#x17C8;"
-                latin:moreKeys="&#x17C8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17C8;" />
             <!-- U+1789: "ញ" KHMER LETTER NYO -->
-            <Key
-                latin:keySpec="&#x1789;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1789;" />
             <!-- U+1782: "áž‚" KHMER LETTER KO
                  U+179D: "ឝ" KHMER LETTER SHA -->
             <Key
                 latin:keySpec="&#x1782;"
                 latin:keyHintLabel="&#x179D;"
-                latin:moreKeys="&#x179D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x179D;" />
             <!-- U+17A1: "áž¡" KHMER LETTER LA -->
-            <Key
-                latin:keySpec="&#x17A1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A1;" />
             <!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17C4;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
             <!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN -->
-            <Key
-                latin:keySpec="&#x17C9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C9;" />
             <!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE -->
-            <Key
-                latin:keySpec="&#x17AF;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17AF;" />
         </case>
         <default>
             <!-- U+17B6: "ា" KHMER VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x17B6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B6;" />
             <!-- U+179F: "ស" KHMER LETTER SA -->
-            <Key
-                latin:keySpec="&#x179F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179F;" />
             <!-- U+178A: "ដ" KHMER LETTER DA -->
-            <Key
-                latin:keySpec="&#x178A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178A;" />
             <!-- U+1790: "ថ" KHMER LETTER THA -->
-            <Key
-                latin:keySpec="&#x1790;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1790;" />
             <!-- U+1784: "áž„" KHMER LETTER NGO -->
-            <Key
-                latin:keySpec="&#x1784;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1784;" />
             <!-- U+17A0: "áž " KHMER LETTER HA -->
-            <Key
-                latin:keySpec="&#x17A0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17A0;" />
             <!-- U+17D2: "្" KHMER SIGN COENG -->
-            <Key
-                latin:keySpec="&#x17D2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17D2;" />
             <!-- U+1780: "ក" KHMER LETTER KA -->
-            <Key
-                latin:keySpec="&#x1780;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1780;" />
             <!-- U+179B: "áž›" KHMER LETTER LO -->
-            <Key
-                latin:keySpec="&#x179B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179B;" />
             <!-- U+17BE: "áž¾" KHMER VOWEL SIGN OE -->
-            <Key
-                latin:keySpec="&#x17BE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BE;" />
             <!-- U+17CB: "់" KHMER SIGN BANTOC -->
-            <Key
-                latin:keySpec="&#x17CB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CB;" />
             <!-- U+17AE: "áž®" KHMER INDEPENDENT VOWEL LYY
                  U+17AD: "áž­" KHMER INDEPENDENT VOWEL LY
                  U+17B0: "áž°" KHMER INDEPENDENT VOWEL QAI -->
             <Key
                 latin:keySpec="&#x17AE;"
                 latin:keyHintLabel="&#x17AD;"
-                latin:moreKeys="&#x17AD;,&#x17B0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17AD;,&#x17B0;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
index 5523d86b7a58906e965af7f1b951dc1d45720ed3..70bdcf1bb0cd612d8e3fb8ae2c358fcd88fdd126 100644
--- a/java/res/xml/rowkeys_khmer4.xml
+++ b/java/res/xml/rowkeys_khmer4.xml
@@ -18,96 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+178D: "ឍ" KHMER LETTER TTHO -->
-            <Key
-                latin:keySpec="&#x178D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178D;" />
             <!-- U+1783: "ឃ" KHMER LETTER KHO -->
-            <Key
-                latin:keySpec="&#x1783;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1783;" />
             <!-- U+1787: "ជ" KHMER LETTER CO -->
-            <Key
-                latin:keySpec="&#x1787;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1787;" />
             <!-- U+17C1/U+17C7: "េះ" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17C1;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+1796: "áž–" KHMER LETTER PO
                  U+179E: "ážž" KHMER LETTER SSO -->
             <Key
                 latin:keySpec="&#x1796;"
                 latin:keyHintLabel="&#x179E;"
-                latin:moreKeys="&#x179E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x179E;" />
             <!-- U+178E: "ណ" KHMER LETTER NNO -->
-            <Key
-                latin:keySpec="&#x178E;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x178E;" />
             <!-- U+17C6: "ំ" KHMER SIGN NIKAHIT -->
-            <Key
-                latin:keySpec="&#x17C6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C6;" />
             <!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK -->
             <Key
                 latin:keySpec="&#x17BB;&#x17C7;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN -->
+            <Key latin:keySpec="&#x17D5;" />
             <Key
-                latin:keySpec="&#x17D5;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+178B: "áž‹" KHMER LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x178B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178B;" />
             <!-- U+1781: "ខ" KHMER LETTER KHA -->
-            <Key
-                latin:keySpec="&#x1781;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1781;" />
             <!-- U+1785: "áž…" KHMER LETTER CA -->
-            <Key
-                latin:keySpec="&#x1785;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1785;" />
             <!-- U+179C: "វ" KHMER LETTER VO -->
-            <Key
-                latin:keySpec="&#x179C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179C;" />
             <!-- U+1794: "áž”" KHMER LETTER BA -->
-            <Key
-                latin:keySpec="&#x1794;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1794;" />
             <!-- U+1793: "áž“" KHMER LETTER NO -->
-            <Key
-                latin:keySpec="&#x1793;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1793;" />
             <!-- U+1798: "ម" KHMER LETTER MO -->
-            <Key
-                latin:keySpec="&#x1798;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1798;" />
             <!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT -->
             <Key
                 latin:keySpec="&#x17BB;&#x17C6;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+17D4: "។" KHMER SIGN KHAN -->
-            <Key
-                latin:keySpec="&#x17D4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17D4;" />
             <!-- U+17CA: "៊" KHMER SIGN TRIISAP -->
-            <Key
-                latin:keySpec="&#x17CA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17CA;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index a5085a540f94307cc2263385a8c4bc671d668197..f88d5fd662a57a26c4fc782672b5195ad9473358 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -18,61 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0ED1: "໑" LAO DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED1;" />
             <!-- U+0ED2: "à»’" LAO DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED2;" />
             <!-- U+0ED3: "໓" LAO DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED3;" />
             <!-- U+0ED4: "à»”" LAO DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED4;" />
             <!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
-            <Key
-                latin:keySpec="&#x0ECC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECC;" />
             <!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
-            <Key
-                latin:keySpec="&#x0EBC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBC;" />
             <!-- U+0ED5: "໕" LAO DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED5;" />
             <!-- U+0ED6: "à»–" LAO DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED6;" />
             <!-- U+0ED7: "à»—" LAO DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED7;" />
             <!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED8;" />
             <!-- U+0ED9: "à»™" LAO DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED9;" />
             <!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK -->
             <Key
                 latin:keySpec="&#x0ECD;&#x0EC8;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+0EA2: "ຢ" LAO LETTER YO
@@ -81,84 +55,69 @@
                 latin:keySpec="&#x0EA2;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED1;" />
             <!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
                  U+0ED2: "à»’" LAO DIGIT TWO -->
             <Key
                 latin:keySpec="&#x0E9F;"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED2;" />
             <!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
                  U+0ED3: "໓" LAO DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0EC2;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED3;" />
             <!-- U+0E96: "ຖ" LAO LETTER THO SUNG
                  U+0ED4: "à»”" LAO DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E96;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED4;" />
             <!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x0EB8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB8;" />
             <!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x0EB9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB9;" />
             <!-- U+0E84: "ຄ" LAO LETTER KHO TAM
                  U+0ED5: "໕" LAO DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E84;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED5;" />
             <!-- U+0E95: "ຕ" LAO LETTER TO
                  U+0ED6: "à»–" LAO DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E95;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED6;" />
             <!-- U+0E88: "ຈ" LAO LETTER CO
                  U+0ED7: "à»—" LAO DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E88;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED7;" />
             <!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
                  U+0ED8: "໘" LAO DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E82;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED8;" />
             <!-- U+0E8A: "ຊ" LAO LETTER SO TAM
                  U+0ED9: "à»™" LAO DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E8A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED9;" />
             <!-- U+0ECD: "ໍ" LAO NIGGAHITA -->
-            <Key
-                latin:keySpec="&#x0ECD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECD;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
index 67c474f98421dbe05d0b18f71744268e14cc70d0..46b6395d72158c3905b3a3376046b1c7a0ce157e 100644
--- a/java/res/xml/rowkeys_lao2.xml
+++ b/java/res/xml/rowkeys_lao2.xml
@@ -18,110 +18,78 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EBB;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0ED0: "໐" LAO DIGIT ZERO -->
-            <Key
-                latin:keySpec="&#x0ED0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED0;" />
             <!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB3;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="_" />
+                latin:keySpec="_"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="+" />
+                latin:keySpec="+"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB4;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB5;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EA3: "ຣ" LAO LETTER LO LING -->
-            <Key
-                latin:keySpec="&#x0EA3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA3;" />
             <!-- U+0EDC: "ໜ" LAO HO NO -->
-            <Key
-                latin:keySpec="&#x0EDC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EDC;" />
             <!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO -->
-            <Key
-                latin:keySpec="&#x0EBD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBD;" />
             <!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO -->
             <Key
                 latin:keySpec="&#x0EAB;&#x0EBC;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+201D: "”" RIGHT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201D;" />
+                latin:keySpec="&#x201D;"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON -->
-            <Key
-                latin:keySpec="&#x0EBB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBB;" />
             <!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI
                  U+0ED0: "໐" LAO DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x0EC4;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0ED0;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED0;" />
             <!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM -->
-            <Key
-                latin:keySpec="&#x0EB3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB3;" />
             <!-- U+0E9E: "ພ" LAO LETTER PHO TAM -->
-            <Key
-                latin:keySpec="&#x0E9E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9E;" />
             <!-- U+0EB0: "ະ" LAO VOWEL SIGN A -->
-            <Key
-                latin:keySpec="&#x0EB0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB0;" />
             <!-- U+0EB4: "ິ" LAO VOWEL SIGN I -->
-            <Key
-                latin:keySpec="&#x0EB4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB4;" />
             <!-- U+0EB5: "ີ" LAO VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x0EB5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB5;" />
             <!-- U+0EAE: "ຮ" LAO LETTER HO TAM -->
-            <Key
-                latin:keySpec="&#x0EAE;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAE;" />
             <!-- U+0E99: "ນ" LAO LETTER NO -->
-            <Key
-                latin:keySpec="&#x0E99;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E99;" />
             <!-- U+0E8D: "ຍ" LAO LETTER NYO -->
-            <Key
-                latin:keySpec="&#x0E8D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E8D;" />
             <!-- U+0E9A: "ບ" LAO LETTER BO -->
-            <Key
-                latin:keySpec="&#x0E9A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9A;" />
             <!-- U+0EA5: "ລ" LAO LETTER LO LOOT -->
-            <Key
-                latin:keySpec="&#x0EA5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA5;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index 172716ddecc222a5b879b3558ab8643fb9d6277f..ab3e25131f0ea874d46f43d5bdfd8a42d73905de 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -18,93 +18,73 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB1;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec=";" />
+                latin:keySpec=";"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="." />
+                latin:keySpec="."
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec=":" />
+                latin:keySpec=":"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0ECA: "໊" LAO TONE MAI TI -->
-            <Key
-                latin:keySpec="&#x0ECA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECA;" />
             <!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
+            <Key latin:keySpec="&#x0ECB;" />
             <Key
-                latin:keySpec="&#x0ECB;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="!" />
+                latin:keySpec="!"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="%" />
+                latin:keySpec="%"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="=" />
+                latin:keySpec="="
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
-            <Key
-                latin:keySpec="&#x0EB1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB1;" />
             <!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAB;" />
             <!-- U+0E81: "ກ" LAO LETTER KO -->
-            <Key
-                latin:keySpec="&#x0E81;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E81;" />
             <!-- U+0E94: "ດ" LAO LETTER DO -->
-            <Key
-                latin:keySpec="&#x0E94;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E94;" />
             <!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x0EC0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC0;" />
             <!-- U+0EC9: "້" LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EC9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC9;" />
             <!-- U+0EC8: "່" LAO TONE MAI EK -->
-            <Key
-                latin:keySpec="&#x0EC8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC8;" />
             <!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x0EB2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB2;" />
             <!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAA;" />
             <!-- U+0EA7: "ວ" LAO LETTER WO -->
-            <Key
-                latin:keySpec="&#x0EA7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA7;" />
             <!-- U+0E87: "ງ" LAO LETTER NGO -->
-            <Key
-                latin:keySpec="&#x0E87;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E87;" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index ed4b9b1f10e99ffd824a7bf70dd49be698d9cd86..5beb1cbcb0bebe957ccaa76afa78196e8e52b42b 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -18,86 +18,60 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+20AD: "â‚­" KIP SIGN -->
             <Key
-                latin:keySpec="&#x20AD;" />
+                latin:keySpec="&#x20AD;"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="(" />
-            <!-- U+0EAF: "ຯ" LAO ELLIPSIS -->
+                latin:keySpec="("
+                latin:keyLabelFlags="fontDefault" />
+            <Key latin:keySpec="&#x0EAF;" />
             <Key
-                latin:keySpec="&#x0EAF;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="\@" />
+                latin:keySpec="\@"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB6;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB7;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EC6: "ໆ" LAO KO LA -->
-            <Key
-                latin:keySpec="&#x0EC6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC6;" />
             <!-- U+0EDD: "ໝ" LAO HO MO -->
+            <Key latin:keySpec="&#x0EDD;" />
             <Key
-                latin:keySpec="&#x0EDD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="$"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="$" />
-            <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
-            <Key
-                latin:keySpec="&#x0E9C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9C;" />
             <!-- U+0E9B: "ປ" LAO LETTER PO -->
-            <Key
-                latin:keySpec="&#x0E9B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9B;" />
             <!-- U+0EC1: "ແ" LAO VOWEL SIGN EI -->
-            <Key
-                latin:keySpec="&#x0EC1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC1;" />
             <!-- U+0EAD: "ອ" LAO LETTER O -->
-            <Key
-                latin:keySpec="&#x0EAD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAD;" />
             <!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x0EB6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB6;" />
             <!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
-            <Key
-                latin:keySpec="&#x0EB7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB7;" />
             <!-- U+0E97: "ທ" LAO LETTER THO TAM -->
-            <Key
-                latin:keySpec="&#x0E97;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E97;" />
             <!-- U+0EA1: "ມ" LAO LETTER MO -->
-            <Key
-                latin:keySpec="&#x0EA1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA1;" />
             <!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
-            <Key
-                latin:keySpec="&#x0EC3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC3;" />
             <!-- U+0E9D: "ຝ" LAO LETTER FO TAM -->
-            <Key
-                latin:keySpec="&#x0E9D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
index 810e71e3cbe0a08c86271824c7db88447e847a57..596664bc663e599b93882540902a60c0eda2182a 100644
--- a/java/res/xml/rowkeys_marathi1.xml
+++ b/java/res/xml/rowkeys_marathi1.xml
@@ -18,14 +18,11 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
     <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -34,8 +31,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
     <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -44,8 +40,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
     <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -54,8 +49,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
     <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -64,8 +58,7 @@
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
     <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
     <Key
         latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -78,15 +71,13 @@
         latin:keySpec="&#x092C;"
         latin:moreKeys="&#x092D;,%"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="&#x096C;,6"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096C;,6" />
     <!-- U+0939: "ह" DEVANAGARI LETTER HA
          U+096D: "७" DEVANAGARI DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0939;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="&#x096D;,7"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096D;,7" />
     <!-- U+0917: "ग" DEVANAGARI LETTER GA
          U+0918: "घ" DEVANAGARI LETTER GHA
          U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -94,8 +85,7 @@
         latin:keySpec="&#x0917;"
         latin:moreKeys="&#x0918;,%"
         latin:keyHintLabel="8"
-        latin:additionalMoreKeys="&#x096E;,8"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096E;,8" />
     <!-- U+0926: "द" DEVANAGARI LETTER DA
          U+0927: "ध" DEVANAGARI LETTER DHA
          U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -103,8 +93,7 @@
         latin:keySpec="&#x0926;"
         latin:moreKeys="&#x0927;,%"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="&#x096F;,9"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x096F;,9" />
     <!-- U+091C: "ज" DEVANAGARI LETTER JA
          U+091D: "झ" DEVANAGARI LETTER JHA
          U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA -->
@@ -112,12 +101,10 @@
         latin:keySpec="&#x091C;"
         latin:moreKeys="&#x091D;,&#x091C;&#x094D;&#x091E;,%"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="&#x0966;,0"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="&#x0966;,0" />
     <!-- U+0921: "ड" DEVANAGARI LETTER DDA
          U+0922: "ढ" DEVANAGARI LETTER DDHA -->
     <Key
         latin:keySpec="&#x0921;"
-        latin:moreKeys="&#x0922;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0922;" />
 </merge>
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
index f95091529ec591893c05aef2fcceacb832ff6215..060822ee50b01a1f8098ad780a3a3b2d3640d174 100644
--- a/java/res/xml/rowkeys_marathi2.xml
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -18,83 +18,64 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignO" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignE" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignVirama" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+    <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignI" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignU" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
     <!-- U+092A: "प" DEVANAGARI LETTER PA
          U+092B: "फ" DEVANAGARI LETTER PHA -->
     <Key
         latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x092B;" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
     <!-- U+0930: "र" DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
     <!-- U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA -->
     <Key
         latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0916;" />
     <!-- U+0924: "त" DEVANAGARI LETTER TA
          U+0925: "थ" DEVANAGARI LETTER THA
          U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
     <!-- U+091A: "च" DEVANAGARI LETTER CA
          U+091B: "छ" DEVANAGARI LETTER CHA -->
     <Key
         latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x091B;" />
     <!-- U+091F: "ट" DEVANAGARI LETTER TTA
          U+0920: "ठ" DEVANAGARI LETTER TTHA -->
     <Key
         latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0920;" />
 </merge>
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
index 17fc5ac7792001d0f5df655ba1b251de21eae450..661e79672ce5cb07e713ee98cae6ff01a72217a8 100644
--- a/java/res/xml/rowkeys_marathi3.xml
+++ b/java/res/xml/rowkeys_marathi3.xml
@@ -18,66 +18,49 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+    <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
-    <include
-        latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-    <Key
-        latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+    <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
     <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-    <Key
-        latin:keySpec="&#x092E;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092E;" />
     <!-- U+0928: "न" DEVANAGARI LETTER NA
          U+0923: "ण" DEVANAGARI LETTER NNA
          U+091E: "ञ" DEVANAGARI LETTER NYA
          U+0919: "ङ" DEVANAGARI LETTER NGA -->
     <Key
         latin:keySpec="&#x0928;"
-        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0923;,&#x091E;,&#x0919;" />
     <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-    <Key
-        latin:keySpec="&#x0935;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x0935;" />
     <!-- U+0932: "ल" DEVANAGARI LETTER LA
          U+0933: "ळ" DEVANAGARI LETTER LLA -->
     <Key
         latin:keySpec="&#x0932;"
-        latin:moreKeys="&#x0933;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0933;" />
     <!-- U+0938: "स" DEVANAGARI LETTER SA
          U+0936: "श" DEVANAGARI LETTER SHA
          U+0937: "ष" DEVANAGARI LETTER SSA
          U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0938;"
-        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0936;,&#x0937;,&#x0936;&#x094D;&#x0930;" />
     <!-- U+092F: "य" DEVANAGARI LETTER YA -->
-    <Key
-        latin:keySpec="&#x092F;"
-        latin:keyLabelFlags="fontNormal" />
+    <Key latin:keySpec="&#x092F;" />
     <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
     <Key
         latin:keySpec="&#x0915;&#x094D;&#x0937;"
-        latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+        latin:keyLabelFlags="followKeyLetterRatio" />
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
index b7c820922bc4214f1b2b3dff102cfb9dd050a16e..117007431b2e3872680ddd30ac6b11c3b22f5de7 100644
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -18,116 +18,88 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1027: "ဧ" MYANMAR LETTER E -->
-            <Key
-                latin:keySpec="&#x1027;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1027;" />
             <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
-            <Key
-                latin:keySpec="&#x104F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104F;" />
             <!-- U+1024: "ဤ" MYANMAR LETTER II -->
-            <Key
-                latin:keySpec="&#x1024;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1024;" />
             <!-- U+1023: "ဣ" MYANMAR LETTER I -->
-            <Key
-                latin:keySpec="&#x1023;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1023;" />
             <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
-            <Key
-                latin:keySpec="&#x104E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104E;" />
             <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်"
                  MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT -->
             <Key
                 latin:keySpec="&#x1000;&#x103B;&#x1015;&#x103A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
             <!-- U+1029: "ဩ" MYANMAR LETTER O -->
             <Key
                 latin:keySpec="&#x1029;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
             <Key
                 latin:keySpec="&#x102A;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
-            <Key
-                latin:keySpec="&#x104D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104D;" />
             <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
-            <Key
-                latin:keySpec="&#x104C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104C;" />
         </case>
         <default>
             <!-- U+1041: "၁" MYANMAR DIGIT ONE -->
             <Key
                 latin:keySpec="&#x1041;"
                 latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="1" />
             <!-- U+1042: "၂" MYANMAR DIGIT TWO -->
             <Key
                 latin:keySpec="&#x1042;"
                 latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="2" />
             <!-- U+1043: "၃" MYANMAR DIGIT THREE -->
             <Key
                 latin:keySpec="&#x1043;"
                 latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="3" />
             <!-- U+1044: "၄" MYANMAR DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x1044;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="4" />
             <!-- U+1045: "၅" MYANMAR DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x1045;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="5" />
             <!-- U+1046: "၆" MYANMAR DIGIT SIX -->
             <Key
                 latin:keySpec="&#x1046;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="6" />
             <!-- U+1047: "၇" MYANMAR DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x1047;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="7" />
             <!-- U+1048: "၈" MYANMAR DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x1048;"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="8" />
             <!-- U+1049: "၉" MYANMAR DIGIT NINE -->
             <Key
                 latin:keySpec="&#x1049;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="9" />
             <!-- U+1040: "၀" MYANMAR DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x1040;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="0" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
index 5f0115f396dc761294422740cd7bb929acabd8a9..d7aca006326380544563ac35e5f73e69dc24d56e 100644
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -18,95 +18,51 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
-            <Key
-                latin:keySpec="&#x1017;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1017;" />
             <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
-            <Key
-                latin:keySpec="&#x1012;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1012;" />
             <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
-            <Key
-                latin:keySpec="&#x1013;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1013;" />
             <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
-            <Key
-                latin:keySpec="&#x1003;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1003;" />
             <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x100E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100E;" />
             <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
-            <Key
-                latin:keySpec="&#x103F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103F;" />
             <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
-            <Key
-                latin:keySpec="&#x100F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100F;" />
             <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
-            <Key
-                latin:keySpec="&#x1008;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1008;" />
             <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
-            <Key
-                latin:keySpec="&#x1007;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1007;" />
             <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
-            <Key
-                latin:keySpec="&#x1002;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1002;" />
         </case>
         <default>
             <!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
-            <Key
-                latin:keySpec="&#x1006;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1006;" />
             <!-- U+1010: "တ" MYANMAR LETTER TA -->
-            <Key
-                latin:keySpec="&#x1010;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1010;" />
             <!-- U+1014: "န" MYANMAR LETTER NA -->
-            <Key
-                latin:keySpec="&#x1014;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1014;" />
             <!-- U+1019: "မ" MYANMAR LETTER MA -->
-            <Key
-                latin:keySpec="&#x1019;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1019;" />
             <!-- U+1021: "အ" MYANMAR LETTER A -->
-            <Key
-                latin:keySpec="&#x1021;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1021;" />
             <!-- U+1015: "ပ" MYANMAR LETTER PA -->
-            <Key
-                latin:keySpec="&#x1015;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1015;" />
             <!-- U+1000: "က" MYANMAR LETTER KA -->
-            <Key
-                latin:keySpec="&#x1000;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1000;" />
             <!-- U+1004: "င" MYANMAR LETTER NGA -->
-            <Key
-                latin:keySpec="&#x1004;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1004;" />
             <!-- U+101E: "သ" MYANMAR LETTER SA -->
-            <Key
-                latin:keySpec="&#x101E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101E;" />
             <!-- U+1005: "စ" MYANMAR LETTER CA -->
-            <Key
-                latin:keySpec="&#x1005;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1005;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index 612bcd31b7eb014c592fb502635f612d0140f952..c5850689bfe1050a30c10fcf478dbba0bc3b5648 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -18,106 +18,69 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+101A: "ယ" MYANMAR LETTER YA -->
-            <Key
-                latin:keySpec="&#x101A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101A;" />
             <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x1039;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1039;" />
             <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x1004;&#x103A;&#x1039;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
-            <Key
-                latin:keySpec="&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103E;" />
             <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102E;" />
             <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1030;" />
             <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
-            <Key
-                latin:keySpec="&#x102B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102B;" />
             <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
-            <Key
-                latin:keySpec="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1032;" />
             <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1036;" />
             <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
-            <Key
-                latin:keySpec="&#x101F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101F;" />
         </case>
         <default>
             <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x1031;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1031;" />
             <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
-            <Key
-                latin:keySpec="&#x103B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103B;" />
             <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
-            <Key
-                latin:keySpec="&#x103C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103C;" />
             <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA
                  U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA
                  U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA -->
             <Key
                 latin:keySpec="&#x103D;"
-                latin:moreKeys="&#x103E;,&#x103D;&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x103E;,&#x103D;&#x103E;" />
             <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I
                  U+102E: "ီ" MYANMAR VOWEL SIGN II -->
             <Key
                 latin:keySpec="&#x102D;"
-                latin:moreKeys="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x102E;" />
             <!-- U+102F: "ု" MYANMAR VOWEL SIGN U
                  U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
             <Key
                 latin:keySpec="&#x102F;"
-                latin:moreKeys="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1030;" />
             <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x102C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102C;" />
             <!-- U+103A: "်" MYANMAR SIGN ASAT
                  U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
             <Key
                 latin:keySpec="&#x103A;"
-                latin:moreKeys="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1032;" />
             <!-- U+1037: "့" MYANMAR SIGN DOT BELOW
                  U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x1037;"
-                latin:moreKeys="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1036;" />
             <!-- U+1038: "း" MYANMAR SIGN VISARGA -->
-            <Key
-                latin:keySpec="&#x1038;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1038;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
index 57466c565ad072272e902bfc219042e57577c8a1..210ebaa8f1242cf114ee6ef0b1f8ed8f900c512b 100644
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -18,83 +18,52 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1025: "ဥ" MYANMAR LETTER U -->
-            <Key
-                latin:keySpec="&#x1025;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1025;" />
             <!-- U+1026: "ဦ" MYANMAR LETTER UU -->
-            <Key
-                latin:keySpec="&#x1026;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1026;" />
             <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x100C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100C;" />
             <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
-            <Key
-                latin:keySpec="&#x100B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100B;" />
             <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
-            <Key
-                latin:keySpec="&#x100D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x100D;" />
             <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
-            <Key
-                latin:keySpec="&#x1020;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1020;" />
             <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
             <Key
                 latin:keySpec="&#x100B;&#x1039;&#x100C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA
                  U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
             <Key
                 latin:keySpec="&#x100F;&#x1039;&#x100D;"
                 latin:moreKeys="&#x100F;&#x1039;&#x100C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
-            <Key
-                latin:keySpec="&#x1016;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1016;" />
             <!-- U+1011: "ထ" MYANMAR LETTER THA -->
-            <Key
-                latin:keySpec="&#x1011;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1011;" />
             <!-- U+1001: "ခ" MYANMAR LETTER KHA -->
-            <Key
-                latin:keySpec="&#x1001;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1001;" />
             <!-- U+101C: "လ" MYANMAR LETTER LA -->
-            <Key
-                latin:keySpec="&#x101C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101C;" />
             <!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
-            <Key
-                latin:keySpec="&#x1018;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1018;" />
             <!-- U+100A: "ည" MYANMAR LETTER NNYA
                  U+1009: "ဉ" MYANMAR LETTER NYA -->
             <Key
                 latin:keySpec="&#x100A;"
-                latin:moreKeys="&#x1009;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1009;" />
             <!-- U+101B: "ရ" MYANMAR LETTER RA -->
-            <Key
-                latin:keySpec="&#x101B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101B;" />
             <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
-            <Key
-                latin:keySpec="&#x101D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
index 616b259a3d19d31dbfcb97e765232248e49699b9..67be51bb054c69610ec615855be691fd12f49d5e 100644
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ b/java/res/xml/rowkeys_nepali_romanized1.xml
@@ -18,89 +18,60 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0920;" />
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <Key
-                latin:keySpec="&#x0914;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0914;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0925;" />
             <!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
-            <Key
-                latin:keySpec="&#x091E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091E;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <Key
-                latin:keySpec="&#x0913;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0913;" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key
-                latin:keySpec="&#x092B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092B;" />
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <Key
-                latin:keySpec="&#x0908;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0908;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA
                  U+0967: "१" DEVANAGARI DIGIT ONE -->
             <Key
                 latin:keySpec="&#x091F;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="&#x0967;,1"
-                latin:keyStyle="moreKeysDevanagariSignNukta"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keyStyle="moreKeysDevanagariSignNukta" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
             <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -109,8 +80,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
             <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignE"
@@ -121,27 +91,23 @@
             <Key
                 latin:keySpec="&#x0930;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096A;,4" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0924;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096B;,5" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+096C: "६" DEVANAGARI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x092F;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
             <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignU"
@@ -150,8 +116,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
             <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignI"
@@ -160,8 +125,7 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
             <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keyStyle="baseKeyDevanagariVowelSignO"
@@ -172,12 +136,9 @@
             <Key
                 latin:keySpec="&#x092A;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <Key
-                latin:keySpec="&#x0907;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x0907;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
index 561ae6c9325e1b1d51a78de033d33e81604c25bc..2e2583ccabf2dff908b1ebc56e5d1d1063b6c910 100644
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ b/java/res/xml/rowkeys_nepali_romanized2.xml
@@ -18,109 +18,61 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key
-                latin:keySpec="&#x0906;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0906;" />
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA -->
-            <Key
-                latin:keySpec="&#x0927;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0927;" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <Key
-                latin:keySpec="&#x090A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090A;" />
             <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
-            <Key
-                latin:keySpec="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0918;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key
-                latin:keySpec="&#x0905;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0905;" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key
-                latin:keySpec="&#x0916;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0916;" />
             <!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
-            <Key
-                latin:keySpec="&#x0965;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0965;" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <Key
-                latin:keySpec="&#x0910;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0910;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVisarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key
-                latin:keySpec="&#x0926;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0926;" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <Key
-                latin:keySpec="&#x0909;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0909;" />
             <!-- U+0917: "ग" DEVANAGARI LETTER GA -->
-            <Key
-                latin:keySpec="&#x0917;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0917;" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key
-                latin:keySpec="&#x0939;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0939;" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key
-                latin:keySpec="&#x091C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091C;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key
-                latin:keySpec="&#x0915;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0915;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0932;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0932;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E -->
-            <Key
-                latin:keySpec="&#x090F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090F;" />
             <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key
-                latin:keySpec="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x0950;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml
index cc2ca8c8447b8569607286afcc649f30171c2988..24f5908328d14e0b56232135007c579782c83a08 100644
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ b/java/res/xml/rowkeys_nepali_romanized3.xml
@@ -18,101 +18,62 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x090B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090B;" />
             <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
-            <Key
-                latin:keySpec="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0922;" />
             <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091B;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092D;" />
             <!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
-            <Key
-                latin:keySpec="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0923;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
         </case>
         <default>
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
-            <Key
-                latin:keySpec="&#x0937;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0937;" />
             <!-- U+0921: "ड" DEVANAGARI LETTER DDA -->
-            <Key
-                latin:keySpec="&#x0921;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0921;" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091A;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+092C: "ब" DEVANAGARI LETTER BHA -->
-            <Key
-                latin:keySpec="&#x092C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092C;" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0928;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0928;" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key
-                latin:keySpec="&#x092E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092E;" />
             <!-- U+0964: "।" DEVANAGARI DANDA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <Key
                 latin:keySpec="&#x0964;"
-                latin:moreKeys="&#x093D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x093D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
index cf4bda982ebe4542c62abaccb538fd4d2220ef23..73b2275ef32632390ee7d3fc39204e500e213702 100644
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ b/java/res/xml/rowkeys_nepali_traditional1.xml
@@ -18,13 +18,9 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
                  U+091E: "ञ" DEVANAGARI LETTER NYA
                  U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -32,68 +28,62 @@
             <Key
                 latin:keySpec="&#x0924;&#x094D;&#x0924;"
                 latin:moreKeys="&#x091E;,&#x091C;&#x094D;&#x091E;,&#x0965;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0921/U+094D/U+0922: "ड्ढ" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA
                  U+0908: "ई" DEVANAGARI LETTER II -->
             <Key
                 latin:keySpec="&#x0921;&#x094D;&#x0922;"
                 latin:moreKeys="&#x0908;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI
                  U+0918: "घ" DEVANAGARI LETTER GHA -->
             <Key
                 latin:keySpec="&#x0910;"
-                latin:moreKeys="&#x0918;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0918;" />
             <!-- U+0926/U+094D/U+0935: "द्व" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA
                  U+0926/U+094D/U+0927: "द्ध" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x0935;"
                 latin:moreKeys="&#x0926;&#x094D;&#x0927;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+091F/U+094D/U+091F: "ट्ट" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA
                  U+091B: "छ" DEVANAGARI LETTER CHA -->
             <Key
                 latin:keySpec="&#x091F;&#x094D;&#x091F;"
                 latin:moreKeys="&#x091B;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0920/U+094D/U+0920: "ठ्ठ" DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA
                  U+091F: "ट" DEVANAGARI LETTER TTA -->
             <Key
                 latin:keySpec="&#x0920;&#x094D;&#x0920;"
                 latin:moreKeys="&#x091F;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU
                  U+0920: "ठ" DEVANAGARI LETTER TTHA -->
             <Key
                 latin:keySpec="&#x090A;"
-                latin:moreKeys="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0920;" />
             <!-- U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
                  U+0921: "ड" DEVANAGARI LETTER DDA -->
             <Key
                 latin:keySpec="&#x0915;&#x094D;&#x0937;"
                 latin:moreKeys="&#x0921;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0922: "ढ" DEVANAGARI LETTER DDHA -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0922;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0922;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E
                  U+0923: "ण" DEVANAGARI LETTER NNA -->
             <Key
                 latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x0923;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0923;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
         </case>
         <default>
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA
@@ -101,77 +91,66 @@
             <Key
                 latin:keySpec="&#x091F;"
                 latin:keyHintLabel="1"
-                latin:additionalMoreKeys="&#x0967;,1"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0967;,1" />
             <!-- U+0927: "ध" DEVANAGARI LETTER DHA
                  U+0968: "२" DEVANAGARI DIGIT TWO -->
             <Key
                 latin:keySpec="&#x0927;"
                 latin:keyHintLabel="2"
-                latin:additionalMoreKeys="&#x0968;,2"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0968;,2" />
             <!-- U+092D: "भ" DEVANAGARI LETTER BHA
                  U+0969: "३" DEVANAGARI DIGIT THREE -->
             <Key
                 latin:keySpec="&#x092D;"
                 latin:keyHintLabel="3"
-                latin:additionalMoreKeys="&#x0969;,3"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0969;,3" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA
                  U+096A: "४" DEVANAGARI DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x091A;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="&#x096A;,4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096A;,4" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+096B: "५" DEVANAGARI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0924;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="&#x096B;,5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096B;,5" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA
                  U+096C: "६" DEVANAGARI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0925;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="&#x096C;,6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096C;,6" />
             <!-- U+0917: "ग" DEVANAGARI LETTER G
                  U+096D: "७" DEVANAGARI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0917;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="&#x096D;,7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096D;,7" />
             <!-- U+0937: "ष" DEVANAGARI LETTER SSA
                  U+096E: "८" DEVANAGARI DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0937;"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="&#x096E;,8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096E;,8" />
             <!-- U+092F: "य" DEVANAGARI LETTER YA
                  U+096F: "९" DEVANAGARI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x092F;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="&#x096F;,9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x096F;,9" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U
                  U+0966: "०" DEVANAGARI DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x0909;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="&#x0966;,0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="&#x0966;,0" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0914: "औ" DEVANAGARI LETTER AU -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0914;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0914;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
index 58a463e71b3532e024836dcff9adf01f04798889..c443daf5da90c33b7027665a5ed24168c7f244f0 100644
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ b/java/res/xml/rowkeys_nepali_traditional2.xml
@@ -18,124 +18,84 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <Key
-                latin:keySpec="&#x0906;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0906;" />
             <!-- U+0919/U+094D: "ङ्" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0919;&#x094D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0921/U+094D/U+0921: "ड्ड" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA -->
             <Key
                 latin:keySpec="&#x0921;&#x094D;&#x0921;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+            <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
             <!-- U+0926/U+094D/U+0926: "द्द" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x0926;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
-            <Key
-                latin:keySpec="&#x091D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091D;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
-            <Key
-                latin:keySpec="&#x092B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092B;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
             <!-- U+091F/U+094D/U+0920: "ट्ठ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA -->
             <Key
                 latin:keySpec="&#x091F;&#x094D;&#x0920;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
         </case>
         <default>
             <!-- U+092C: "ब" DEVANAGARI LETTER BA -->
-            <Key
-                latin:keySpec="&#x092C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092C;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA -->
-            <Key
-                latin:keySpec="&#x0915;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0915;" />
             <!-- U+092E: "म" DEVANAGARI LETTER MA -->
-            <Key
-                latin:keySpec="&#x092E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092E;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
             <!-- U+0928: "न" DEVANAGARI LETTER NA -->
-            <Key
-                latin:keySpec="&#x0928;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0928;" />
             <!-- U+091C: "ज" DEVANAGARI LETTER JA -->
-            <Key
-                latin:keySpec="&#x091C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091C;" />
             <!-- U+0935: "व" DEVANAGARI LETTER VA -->
-            <Key
-                latin:keySpec="&#x0935;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0935;" />
             <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092A;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
             <!-- U+0938: "स" DEVANAGARI LETTER SA -->
-            <Key
-                latin:keySpec="&#x0938;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0938;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU" />
-         </default>
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
index 59f6e651aacc60025ee5d8e7403914f233b60cb8..ade278710db00068e470f9efe004303d669f415d 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
@@ -18,66 +18,44 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0915;&#x094D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA -->
             <Key
                 latin:keySpec="&#x0939;&#x094D;&#x092E;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
-            <Key
-                latin:keySpec="&#x090B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x090B;" />
             <!-- U+0950: "ॐ" DEVANAGARI OM -->
-            <Key
-                latin:keySpec="&#x0950;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0950;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAu" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" />
             <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA -->
             <Key
                 latin:keySpec="&#x0926;&#x094D;&#x092F;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+0936: "श" DEVANAGARI LETTER SHA -->
-            <Key
-                latin:keySpec="&#x0936;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0936;" />
             <!-- U+0939: "ह" DEVANAGARI LETTER HA -->
-            <Key
-                latin:keySpec="&#x0939;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0939;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <Key
-                latin:keySpec="&#x0905;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0905;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
-            <Key
-                latin:keySpec="&#x0916;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0916;" />
             <!-- U+0926: "द" DEVANAGARI LETTER DA -->
-            <Key
-                latin:keySpec="&#x0926;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0926;" />
             <!-- U+0932: "ल" DEVANAGARI LETTER LA -->
-            <Key
-                latin:keySpec="&#x0932;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0932;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right3.xml b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
index 3e6187d11036fbc804d1ce49c613aadaf8e38f6a..4db438d81e0bfe01a318eca2773ea568cc5a78c4 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
@@ -18,50 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- U+0964: "।" DEVANAGARI DANDA -->
-            <Key
-                latin:keySpec="&#x0964;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0964;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA
                  U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x0930;&#x0941;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+                latin:moreKeys="&#x0930;&#x0941;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
index 89d5aa46970be715304b098b3a6c67e544ade04b..c7c73a446058eac26cdd710e97745f7425d3acbc 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
@@ -18,45 +18,35 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+            <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
             <!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
-            <Key
-                latin:keySpec="&#x0919;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0919;" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignAi" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
             <!-- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
             <Key
                 latin:keySpec="&#x0930;&#x0941;"
                 latin:moreKeys="!"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
             <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <Key
                 latin:keyStyle="baseKeyDevanagariSignVisarga"
@@ -64,27 +54,20 @@
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
             <!-- Override more keys with empty definition -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- U+0964: "।" DEVANAGARI DANDA -->
-            <Key
-                latin:keySpec="&#x0964;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0964;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="!"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="!" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
             <Key
                 latin:keyStyle="baseKeyDevanagariSignVirama"
                 latin:moreKeys="\?" />
diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
index e784d2d3af87eb4ae384a0cbaf8fa8cf3f00de6f..fcad5eaa3cda1f48caf1ecaab5f75ebdb462be4e 100644
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ b/java/res/xml/rowkeys_sinhala1.xml
@@ -18,43 +18,29 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DD6: "à·–" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD6;" />
+            <Key latin:keySpec="&#x0DD6;" />
             <!-- U+0D8B: "උ" SINHALA LETTER UYANNA -->
-            <Key
-                latin:keySpec="&#x0D8B;" />
+            <Key latin:keySpec="&#x0D8B;" />
             <!-- U+0DD1: "à·‘" SINHALA VOWEL SIGN DIGA AEDA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD1;" />
+            <Key latin:keySpec="&#x0DD1;" />
             <!-- U+0D8D: "ඍ" SINHALA LETTER IRUYANNA -->
-            <Key
-                latin:keySpec="&#x0D8D;" />
+            <Key latin:keySpec="&#x0D8D;" />
             <!-- U+0D94: "ඔ" SINHALA LETTER OYANNA -->
-            <Key
-                latin:keySpec="&#x0D94;" />
+            <Key latin:keySpec="&#x0D94;" />
             <!-- U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC1;" />
+            <Key latin:keySpec="&#x0DC1;" />
             <!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB9;" />
+            <Key latin:keySpec="&#x0DB9;" />
             <!-- U+0DC2: "à·‚" SINHALA LETTER MUURDHAJA SAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC2;" />
+            <Key latin:keySpec="&#x0DC2;" />
             <!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB0;" />
+            <Key latin:keySpec="&#x0DB0;" />
             <!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA1;" />
+            <Key latin:keySpec="&#x0DA1;" />
             <!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
                  U+0DF4: "à·´" SINHALA PUNCTUATION KUNDDALIYA  -->
             <Key
@@ -120,6 +106,6 @@
             <Key
                 latin:keySpec="&#x0DA4;"
                 latin:moreKeys="&#x0DF4;" />
-         </default>
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml
index 91c1928bafaae6fbfd0cbc0444f15ede0c1ba6ab..92c1e089248688a26972b07e5cd673a611ba9485 100644
--- a/java/res/xml/rowkeys_sinhala2.xml
+++ b/java/res/xml/rowkeys_sinhala2.xml
@@ -18,81 +18,55 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DDF: "à·Ÿ" SINHALA VOWEL SIGN GAYANUKITTA -->
-            <Key
-                latin:keySpec="&#x0DDF;" />
+            <Key latin:keySpec="&#x0DDF;" />
             <!-- U+0DD3: "à·“" SINHALA VOWEL SIGN DIGA IS-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD3;" />
+            <Key latin:keySpec="&#x0DD3;" />
             <!-- U+0DD8: "à·˜" SINHALA VOWEL SIGN GAETTA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD8;" />
+            <Key latin:keySpec="&#x0DD8;" />
             <!-- U+0DC6: "à·†" SINHALA LETTER FAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC6;" />
+            <Key latin:keySpec="&#x0DC6;" />
             <!-- U+0DA8: "ඨ" SINHALA LETTER MAHAAPRAANA TTAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA8;" />
+            <Key latin:keySpec="&#x0DA8;" />
             <!-- U+0DCA/U+200D/U+0DBA: "්‍ය" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER YAYANNA -->
-            <Key
-                latin:keySpec="&#x0DCA;&#x200D;&#x0DBA;" />
+            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBA;" />
             <!-- U+0DC5/U+0DD4: "à·…à·”" SINHALA LETTER MUURDHAJA LAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DC5;&#x0DD4;" />
+            <Key latin:keySpec="&#x0DC5;&#x0DD4;" />
             <!-- U+0DAB: "ණ" SINHALA LETTER MUURDHAJA NAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAB;" />
+            <Key latin:keySpec="&#x0DAB;" />
             <!-- U+0D9B: "ඛ" SINHALA LETTER MAHAAPRAANA KAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9B;" />
+            <Key latin:keySpec="&#x0D9B;" />
             <!-- U+0DAE: "ථ" SINHALA LETTER MAHAAPRAANA TAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAE;" />
+            <Key latin:keySpec="&#x0DAE;" />
             <!-- U+0DCA/U+200D/U+0DBB: "්‍ර" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER RAYANNA -->
-            <Key
-                latin:keySpec="&#x0DCA;&#x200D;&#x0DBB;" />
+            <Key latin:keySpec="&#x0DCA;&#x200D;&#x0DBB;" />
         </case>
         <default>
             <!-- U+0DCA: "à·Š" SINHALA SIGN AL-LAKUNA -->
-            <Key
-                latin:keySpec="&#x0DCA;" />
+            <Key latin:keySpec="&#x0DCA;" />
             <!-- U+0DD2: "à·’" SINHALA VOWEL SIGN KETTI IS-PILLA -->
-            <Key
-                latin:keySpec="&#x0DD2;" />
+            <Key latin:keySpec="&#x0DD2;" />
             <!-- U+0DCF: "ා" SINHALA VOWEL SIGN AELA-PILLA -->
-            <Key
-                latin:keySpec="&#x0DCF;" />
+            <Key latin:keySpec="&#x0DCF;" />
             <!-- U+0DD9: "à·™" SINHALA VOWEL SIGN KOMBUVA -->
-            <Key
-                latin:keySpec="&#x0DD9;" />
+            <Key latin:keySpec="&#x0DD9;" />
             <!-- U+0DA7: "ට" SINHALA LETTER ALPAPRAANA TTAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA7;" />
+            <Key latin:keySpec="&#x0DA7;" />
             <!-- U+0DBA: "ය" SINHALA LETTER YAYANNA -->
-            <Key
-                latin:keySpec="&#x0DBA;" />
+            <Key latin:keySpec="&#x0DBA;" />
             <!-- U+0DC0: "à·€" SINHALA LETTER VAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC0;" />
+            <Key latin:keySpec="&#x0DC0;" />
             <!-- U+0DB1: "න" SINHALA LETTER DANTAJA NAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB1;" />
+            <Key latin:keySpec="&#x0DB1;" />
             <!-- U+0D9A: "ක" SINHALA LETTER ALPAPRAANA KAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9A;" />
+            <Key latin:keySpec="&#x0D9A;" />
             <!-- U+0DAD: "ත" SINHALA LETTER ALPAPRAANA TAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAD;" />
+            <Key latin:keySpec="&#x0DAD;" />
             <!-- U+0D8F: "ඏ" SINHALA LETTER ILUYANNA -->
-            <Key
-                latin:keySpec="&#x0D8F;" />
-         </default>
+            <Key latin:keySpec="&#x0D8F;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml
index 64ba9f339bea1c93c14167d55692791091fe46e2..8727875175a59ceebc10ca26d5ecdcd275897f39 100644
--- a/java/res/xml/rowkeys_sinhala3.xml
+++ b/java/res/xml/rowkeys_sinhala3.xml
@@ -18,40 +18,27 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
-            <Key
-                latin:keySpec="&#x0D9E;" />
+            <Key latin:keySpec="&#x0D9E;" />
             <!-- U+0DA3: "ඣ" SINHALA LETTER MAHAAPRAANA JAYANNA -->
-            <Key
-                latin:keySpec="&#x0DA3;" />
+            <Key latin:keySpec="&#x0DA3;" />
             <!-- U+0DAA: "ඪ" SINHALA LETTER MAHAAPRAANA DDAYANNA -->
-            <Key
-                latin:keySpec="&#x0DAA;" />
+            <Key latin:keySpec="&#x0DAA;" />
             <!-- U+0D8A: "ඊ" SINHALA LETTER IIYANNA -->
-            <Key
-                latin:keySpec="&#x0D8A;" />
+            <Key latin:keySpec="&#x0D8A;" />
             <!-- U+0DB7: "භ" SINHALA LETTER MAHAAPRAANA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB7;" />
+            <Key latin:keySpec="&#x0DB7;" />
             <!-- U+0DB5: "ඵ" SINHALA LETTER MAHAAPRAANA PAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB5;" />
+            <Key latin:keySpec="&#x0DB5;" />
             <!-- U+0DC5: "à·…" SINHALA LETTER MUURDHAJA LAYANNA -->
-            <Key
-                latin:keySpec="&#x0DC5;" />
+            <Key latin:keySpec="&#x0DC5;" />
             <!-- U+0D9D: "ඝ" SINHALA LETTER MAHAAPRAANA GAYANNA -->
-            <Key
-                latin:keySpec="&#x0D9D;" />
+            <Key latin:keySpec="&#x0D9D;" />
             <!-- U+0DBB/U+0DCA/U+200D: "ර්‍" SINHALA LETTER RAYANNA/SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER -->
-            <Key
-                latin:keySpec="&#x0DBB;&#x0DCA;&#x200D;" />
+            <Key latin:keySpec="&#x0DBB;&#x0DCA;&#x200D;" />
         </case>
         <default>
             <!-- U+0D82: "ං" SINHALA SIGN ANUSVARAYA
@@ -70,25 +57,20 @@
                 latin:keySpec="&#x0DA9;"
                 latin:moreKeys="&#x0DAC;" />
             <!-- U+0D89: "ඉ" SINHALA LETTER IYANNA -->
-            <Key
-                latin:keySpec="&#x0D89;" />
+            <Key latin:keySpec="&#x0D89;" />
             <!-- U+0DB6: "බ" SINHALA LETTER ALPAPRAANA BAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB6;" />
+            <Key latin:keySpec="&#x0DB6;" />
             <!-- U+0DB4: "ප" SINHALA LETTER ALPAPRAANA PAYANNA -->
-            <Key
-                latin:keySpec="&#x0DB4;" />
+            <Key latin:keySpec="&#x0DB4;" />
             <!-- U+0DBD: "ල" SINHALA LETTER DANTAJA LAYANNA -->
-            <Key
-                latin:keySpec="&#x0DBD;" />
+            <Key latin:keySpec="&#x0DBD;" />
             <!-- U+0D9C: "ග" SINHALA LETTER ALPAPRAANA GAYANNA
                  U+0D9F: "ඟ" SINHALA LETTER SANYAKA GAYANNA -->
             <Key
                 latin:keySpec="&#x0D9C;"
                 latin:moreKeys="&#x0D9F;" />
             <!-- U+0DF3: "à·³" SINHALA VOWEL SIGN DIGA GAYANUKITTA -->
-            <Key
-                latin:keySpec="&#x0DF3;" />
-         </default>
+            <Key latin:keySpec="&#x0DF3;" />
+        </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index e42bda391d5309ce78e837f769a54ec4c6d984a8..864bca87659417e76110810aaa733e8dd78494bb 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -18,150 +18,120 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
-                latin:keySpec="+" />
+                latin:keySpec="+"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0E51;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E51;" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0E52;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E52;" />
             <!-- U+0E53: "๓" THAI DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E53;" />
             <!-- U+0E54: "๔" THAI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E39: " ู" THAI CHARACTER SARA UU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E39;|&#x0E39;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
-            <Key
-                latin:keySpec="&#x0E3F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E3F;" />
             <!-- U+0E55: "๕" THAI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E55;" />
             <!-- U+0E56: "๖" THAI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E56;" />
             <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E57;" />
             <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E58;" />
             <!-- U+0E59: "๙" THAI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E59;" />
         </case>
         <default>
             <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
-            <Key
-                latin:keySpec="&#x0E45;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E45;" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
             <Key
+                latin:keySpec="/"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
                 latin:moreKeys="&#x0E51;"
-                latin:keySpec="/" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
             <Key
+                latin:keySpec="_"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
                 latin:moreKeys="&#x0E52;"
-                latin:keySpec="_" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
                  U+0E53: "๓" THAI DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0E20;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E53;" />
             <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
                  U+0E54: "๔" THAI DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E16;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E38: " ุ" THAI CHARACTER SARA U -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E38;|&#x0E38;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E36: " ึ" THAI CHARACTER SARA UE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E36;|&#x0E36;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
                  U+0E55: "๕" THAI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E04;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E55;" />
             <!-- U+0E15: "ต" THAI CHARACTER TO TAO
                  U+0E56: "๖" THAI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E15;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E56;" />
             <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
                  U+0E57: "๗" THAI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E08;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E57;" />
             <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
                  U+0E58: "๘" THAI DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E02;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E58;" />
             <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
                  U+0E59: "๙" THAI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E0A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E59;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 7ab036a050969693528b69d90521f96843eaf25c..f43d31fffe54b6776b117a0232efe61ecac11c89 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -18,63 +18,45 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E50: "๐" THAI DIGIT ZERO -->
+            <Key latin:keySpec="&#x0E50;" />
             <Key
-                latin:keySpec="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="&quot;" />
+                latin:keySpec="&quot;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
-            <Key
-                latin:keySpec="&#x0E0E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0E;" />
             <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
-            <Key
-                latin:keySpec="&#x0E11;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E11;" />
             <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
-            <Key
-                latin:keySpec="&#x0E18;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E18;" />
             <!-- U+0020: " " SPACE
                  U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4D;|&#x0E4D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4A;|&#x0E4A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
-            <Key
-                latin:keySpec="&#x0E13;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E13;" />
             <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
-            <Key
-                latin:keySpec="&#x0E2F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2F;" />
             <!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
-            <Key
-                latin:keySpec="&#x0E0D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0D;" />
             <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
+            <Key latin:keySpec="&#x0E10;" />
             <Key
-                latin:keySpec="&#x0E10;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
@@ -83,58 +65,39 @@
                 latin:keySpec="&#x0E46;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E50;" />
             <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
-            <Key
-                latin:keySpec="&#x0E44;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E44;" />
             <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
-            <Key
-                latin:keySpec="&#x0E33;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E33;" />
             <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
-            <Key
-                latin:keySpec="&#x0E1E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1E;" />
             <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
-            <Key
-                latin:keySpec="&#x0E30;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E30;" />
             <!-- U+0020: " " SPACE
                  U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E31;|&#x0E31;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E35: " ี" HAI CHARACTER SARA II -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E35;|&#x0E35;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
-            <Key
-                latin:keySpec="&#x0E23;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E23;" />
             <!-- U+0E19: "น" THAI CHARACTER NO NU -->
-            <Key
-                latin:keySpec="&#x0E19;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E19;" />
             <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
-            <Key
-                latin:keySpec="&#x0E22;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E22;" />
             <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
-            <Key
-                latin:keySpec="&#x0E1A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1A;" />
             <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
-            <Key
-                latin:keySpec="&#x0E25;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E25;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 098d8a780de6aff327bded2b2b43e34e12417892..03959b9aaa928eca04df2e6bc1583d2679e4dcd1 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -18,113 +18,76 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
-            <Key
-                latin:keySpec="&#x0E24;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E24;" />
             <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
-            <Key
-                latin:keySpec="&#x0E06;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E06;" />
             <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
-            <Key
-                latin:keySpec="&#x0E0F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0F;" />
             <!-- U+0E42: "โ" THAI CHARACTER SARA O -->
-            <Key
-                latin:keySpec="&#x0E42;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E42;" />
             <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
-            <Key
-                latin:keySpec="&#x0E0C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0C;" />
             <!-- U+0020: " " SPACE
                  U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E47;|&#x0E47;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4B;|&#x0E4B;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
-            <Key
-                latin:keySpec="&#x0E29;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E29;" />
             <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
-            <Key
-                latin:keySpec="&#x0E28;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E28;" />
             <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
+            <Key latin:keySpec="&#x0E0B;" />
             <Key
-                latin:keySpec="&#x0E0B;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="." />
+                latin:keySpec="."
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
-            <Key
-                latin:keySpec="&#x0E1F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1F;" />
             <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
-            <Key
-                latin:keySpec="&#x0E2B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2B;" />
             <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
-            <Key
-                latin:keySpec="&#x0E01;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E01;" />
             <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
-            <Key
-                latin:keySpec="&#x0E14;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E14;" />
             <!-- U+0E40: "เ" THAI CHARACTER SARA E -->
-            <Key
-                latin:keySpec="&#x0E40;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E40;" />
             <!-- U+0020: " " SPACE
                  U+0E49: " ้" THAI CHARACTER MAI THO -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E49;|&#x0E49;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E48: " ่" THAI CHARACTER MAI EK -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E48;|&#x0E48;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E32: "า" THAI CHARACTER SARA AA -->
-            <Key
-                latin:keySpec="&#x0E32;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E32;" />
             <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
-            <Key
-                latin:keySpec="&#x0E2A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2A;" />
             <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
-            <Key
-                latin:keySpec="&#x0E27;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E27;" />
             <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
-            <Key
-                latin:keySpec="&#x0E07;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E07;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index 332d09d7e43ea56a0f6969b6224f16d4a670a660..db665bed55a890da80dcd7b6dc8f797101626502 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -18,101 +18,74 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
-                latin:keySpec="(" />
+                latin:keySpec="("
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
-            <Key
-                latin:keySpec="&#x0E09;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E09;" />
             <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
-            <Key
-                latin:keySpec="&#x0E2E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2E;" />
             <!-- U+0020: " " SPACE
                  U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E3A;|&#x0E3A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4C;|&#x0E4C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
-            <Key
-                latin:keySpec="&#x0E12;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E12;" />
             <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
-            <Key
-                latin:keySpec="&#x0E2C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2C;" />
             <!-- U+0E26: "ฦ" THAI CHARACTER LU -->
-            <Key
-                latin:keySpec="&#x0E26;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E26;" />
         </case>
         <default>
             <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
-            <Key
-                latin:keySpec="&#x0E1C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1C;" />
             <!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
-            <Key
-                latin:keySpec="&#x0E1B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1B;" />
             <!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
-            <Key
-                latin:keySpec="&#x0E41;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E41;" />
             <!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
-            <Key
-                latin:keySpec="&#x0E2D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2D;" />
             <!-- U+0020: " " SPACE
                  U+0E34: " ิ" THAI CHARACTER SARA I -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E34;|&#x0E34;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E37: " ื" THAI CHARACTER SARA UEE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E37;|&#x0E37;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
-            <Key
-                latin:keySpec="&#x0E17;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E17;" />
             <!-- U+0E21: "ม" THAI CHARACTER MO MA -->
-            <Key
-                latin:keySpec="&#x0E21;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E21;" />
             <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
-            <Key
-                latin:keySpec="&#x0E43;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E43;" />
             <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
-            <Key
-                latin:keySpec="&#x0E1D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1D;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 798c23e81b585900962e7b56a266a07180397491..3f765f3476d472718a9250e9fcd69f4886441ab2 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_arabic3" />
+        <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml
index ea8870e1ae3b2efb57616c1a70ca0a287c6b785e..198436ca1e37c109ec62fd10d7550d82c65cf797 100644
--- a/java/res/xml/rows_armenian_phonetic.xml
+++ b/java/res/xml/rows_armenian_phonetic.xml
@@ -18,47 +18,40 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_xeh" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+        <include latin:keyboardLayout="@xml/key_armenian_xeh" />
     </Row>
     <Row
         latin:keyWidth="9.8000%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
-        <include
-            latin:keyboardLayout="@xml/key_armenian_sha" />
+        <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+        <include latin:keyboardLayout="@xml/key_armenian_sha" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
index 890f9352f8bbc2b5c0e54463e760c90b65a3ffb7..4e4223b0329133b3db3299cf2718bbd3571010fd 100644
--- a/java/res/xml/rows_bengali.xml
+++ b/java/res/xml/rows_bengali.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali1" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali2" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_bengali3" />
+        <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index c74614fcf3d29deedee72db4c68fe92307e01d59..b78048c9d7af7baf96c7266b84d07d16076536ea 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_farsi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_farsi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index 5c631ebff46a60b881856f67184ad7b1768dafd2..da869b144a3321c65a039883c87a0183fca9c6bf 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
index a60cf2b02fe63fe0f748f29442b9e7ba6b31b45f..d21fada1c32a48ac45ccb9e69d5fa569a6341626 100644
--- a/java/res/xml/rows_hindi_compact.xml
+++ b/java/res/xml/rows_hindi_compact.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+        <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
index e3993871b87ac6eb19c1ab367be49869d40ecedd..69334f33e614f1a6331cec2f44ff1e1d62a7fb20 100644
--- a/java/res/xml/rows_khmer.xml
+++ b/java/res/xml/rows_khmer.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer1" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer2" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer3" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_khmer4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml
index 321f4112ad1c05d5b837b0a0e6735be74eb8548f..b3fbf56c58572f9b5e9f187d9b7cad57bba6c942 100644
--- a/java/res/xml/rows_lao.xml
+++ b/java/res/xml/rows_lao.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao1" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao2" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao3" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao3" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_lao4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_lao4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
index 42a036374e9385e6a8aaa8c0ad6943ad505f7fa2..ff11adb7588c59b95bcf7af386b7f38bd99dd500 100644
--- a/java/res/xml/rows_marathi.xml
+++ b/java/res/xml/rows_marathi.xml
@@ -18,32 +18,28 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi1" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi2" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_marathi3" />
+        <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml
index 5de47f7b823e9dbce735e304fa5628849d49d9a1..54538a9b963e130ba485017f9ac92ef46c6ee0d2 100644
--- a/java/res/xml/rows_myanmar.xml
+++ b/java/res/xml/rows_myanmar.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />
     </Row>
     <Row
         latin:keyWidth="10.0%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
index 6df09c830dadb51d4cb84054055e49f955a2fd77..daca3ee86fd26e7a6d29f2d84da7406c7b774804 100644
--- a/java/res/xml/rows_nepali_romanized.xml
+++ b/java/res/xml/rows_nepali_romanized.xml
@@ -18,35 +18,31 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml
index 7789135ae7ea2f91628803246fe6fc099bc4484e..edcc73a20a2cde4cce56b34a1887edaad082a602 100644
--- a/java/res/xml/rows_nepali_traditional.xml
+++ b/java/res/xml/rows_nepali_traditional.xml
@@ -18,39 +18,33 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
-    <include
-        latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
+        <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index 5a058c96ea6df79d586aadb0261b71ea9a31f173..a2ba0bb8b16f28224d42dc6650a4733e084b831b 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -18,24 +18,19 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
@@ -44,12 +39,10 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.8%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+        <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
index 108b7e1fc935e38916b62671911d82d5e8d0d248..fffdb4415c33cc95c18e2d75fa5b5b5c921ff4c9 100644
--- a/java/res/xml/rows_thai.xml
+++ b/java/res/xml/rows_thai.xml
@@ -18,41 +18,34 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
-    <include
-        latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai1" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai1" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai2" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai2" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai3" />
-        <include
-            latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai3" />
+        <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
     </Row>
     <Row
         latin:keyWidth="8.3333%p"
+        latin:keyLabelFlags="fontNormal"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_thai4" />
-        <Key
-            latin:keyStyle="deleteKeyStyle" />
+        <Key latin:keyStyle="shiftKeyStyle" />
+        <include latin:keyboardLayout="@xml/rowkeys_thai4" />
+        <Key latin:keyStyle="deleteKeyStyle" />
     </Row>
-    <include
-        latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>