diff --git a/app/src/main/res/drawable/keyboard_key_feedback_ics.xml b/app/src/main/res/drawable/keyboard_key_feedback_ics.xml
index 90587519..cd42a143 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_ics.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_ics.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_klp.xml b/app/src/main/res/drawable/keyboard_key_feedback_klp.xml
index bc16bec4..bd197071 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_klp.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_klp.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml b/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml
index e95ed5a4..6d450708 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml b/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
index 14237071..1d5de96d 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml b/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
index 432a2fcf..6909874c 100644
--- a/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
+++ b/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_qwerty" />
diff --git a/app/src/main/res/xml-land/kbd_number.xml b/app/src/main/res/xml-land/kbd_number.xml
index cc708033..0cc244ac 100644
--- a/app/src/main/res/xml-land/kbd_number.xml
+++ b/app/src/main/res/xml-land/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/app/src/main/res/xml-land/kbd_phone.xml b/app/src/main/res/xml-land/kbd_phone.xml
index 3128e2d6..6755468e 100644
--- a/app/src/main/res/xml-land/kbd_phone.xml
+++ b/app/src/main/res/xml-land/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/app/src/main/res/xml-land/kbd_phone_symbols.xml b/app/src/main/res/xml-land/kbd_phone_symbols.xml
index 9d5877e3..7528b3e7 100644
--- a/app/src/main/res/xml-land/kbd_phone_symbols.xml
+++ b/app/src/main/res/xml-land/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/app/src/main/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml b/app/src/main/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
index b74f939f..b606dbdf 100644
--- a/app/src/main/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
+++ b/app/src/main/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="5%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/app/src/main/res/xml-sw600dp-land/kbd_number.xml b/app/src/main/res/xml-sw600dp-land/kbd_number.xml
index 0ecca852..de02deeb 100644
--- a/app/src/main/res/xml-sw600dp-land/kbd_number.xml
+++ b/app/src/main/res/xml-sw600dp-land/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/app/src/main/res/xml-sw600dp-land/kbd_phone.xml b/app/src/main/res/xml-sw600dp-land/kbd_phone.xml
index 770633e6..6a8acaf3 100644
--- a/app/src/main/res/xml-sw600dp-land/kbd_phone.xml
+++ b/app/src/main/res/xml-sw600dp-land/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/app/src/main/res/xml-sw600dp-land/kbd_phone_symbols.xml b/app/src/main/res/xml-sw600dp-land/kbd_phone_symbols.xml
index d7acbe74..6314c097 100644
--- a/app/src/main/res/xml-sw600dp-land/kbd_phone_symbols.xml
+++ b/app/src/main/res/xml-sw600dp-land/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/app/src/main/res/xml-sw600dp-land/key_space_3kw.xml b/app/src/main/res/xml-sw600dp-land/key_space_3kw.xml
index 87f625d2..1e74496e 100644
--- a/app/src/main/res/xml-sw600dp-land/key_space_3kw.xml
+++ b/app/src/main/res/xml-sw600dp-land/key_space_3kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- TODO: Consolidate the layout specification between protrait and landscape.
          Ideally just the keyWidth should be different -->
diff --git a/app/src/main/res/xml-sw600dp-land/row_qwerty4.xml b/app/src/main/res/xml-sw600dp-land/row_qwerty4.xml
index 07a73f26..41300c5b 100644
--- a/app/src/main/res/xml-sw600dp-land/row_qwerty4.xml
+++ b/app/src/main/res/xml-sw600dp-land/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <!-- Split the 4th row for split layouts -->
diff --git a/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml b/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
index ecba7616..c5264fec 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml b/app/src/main/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
index b3cdb9e3..cbed0e01 100644
--- a/app/src/main/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
+++ b/app/src/main/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="8%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/app/src/main/res/xml-sw600dp/kbd_number.xml b/app/src/main/res/xml-sw600dp/kbd_number.xml
index cf9f60dd..d46a575e 100644
--- a/app/src/main/res/xml-sw600dp/kbd_number.xml
+++ b/app/src/main/res/xml-sw600dp/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml-sw600dp/kbd_phone.xml b/app/src/main/res/xml-sw600dp/kbd_phone.xml
index f13696c6..dcfa1af1 100644
--- a/app/src/main/res/xml-sw600dp/kbd_phone.xml
+++ b/app/src/main/res/xml-sw600dp/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml-sw600dp/kbd_phone_symbols.xml b/app/src/main/res/xml-sw600dp/kbd_phone_symbols.xml
index 08b175b0..9af3c8ae 100644
--- a/app/src/main/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/app/src/main/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml-sw600dp/key_comma.xml b/app/src/main/res/xml-sw600dp/key_comma.xml
index b814f269..84ac7f98 100644
--- a/app/src/main/res/xml-sw600dp/key_comma.xml
+++ b/app/src/main/res/xml-sw600dp/key_comma.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/key_period.xml b/app/src/main/res/xml-sw600dp/key_period.xml
index 57d43720..554f7ab0 100644
--- a/app/src/main/res/xml-sw600dp/key_period.xml
+++ b/app/src/main/res/xml-sw600dp/key_period.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The table period key which may have different label depending on locale -->
     <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
diff --git a/app/src/main/res/xml-sw600dp/key_settings.xml b/app/src/main/res/xml-sw600dp/key_settings.xml
index 18f12952..a11efe1a 100644
--- a/app/src/main/res/xml-sw600dp/key_settings.xml
+++ b/app/src/main/res/xml-sw600dp/key_settings.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/key_space_3kw.xml b/app/src/main/res/xml-sw600dp/key_space_3kw.xml
index 4737aba8..0cfce930 100644
--- a/app/src/main/res/xml-sw600dp/key_space_3kw.xml
+++ b/app/src/main/res/xml-sw600dp/key_space_3kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/key_space_7kw.xml b/app/src/main/res/xml-sw600dp/key_space_7kw.xml
index 6fcc3fb5..4be7713d 100644
--- a/app/src/main/res/xml-sw600dp/key_space_7kw.xml
+++ b/app/src/main/res/xml-sw600dp/key_space_7kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/key_space_symbols.xml b/app/src/main/res/xml-sw600dp/key_space_symbols.xml
index 51125e62..43270970 100644
--- a/app/src/main/res/xml-sw600dp/key_space_symbols.xml
+++ b/app/src/main/res/xml-sw600dp/key_space_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="spaceKeyStyle"
diff --git a/app/src/main/res/xml-sw600dp/key_styles_common.xml b/app/src/main/res/xml-sw600dp/key_styles_common.xml
index cdf79bb9..8a1e81c2 100644
--- a/app/src/main/res/xml-sw600dp/key_styles_common.xml
+++ b/app/src/main/res/xml-sw600dp/key_styles_common.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/key_styles_enter.xml b/app/src/main/res/xml-sw600dp/key_styles_enter.xml
index 0544b870..14536cb5 100644
--- a/app/src/main/res/xml-sw600dp/key_styles_enter.xml
+++ b/app/src/main/res/xml-sw600dp/key_styles_enter.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Navigate more keys style -->
     <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
diff --git a/app/src/main/res/xml-sw600dp/keys_arabic3_left.xml b/app/src/main/res/xml-sw600dp/keys_arabic3_left.xml
index 9b40bb9e..baeb9804 100644
--- a/app/src/main/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/app/src/main/res/xml-sw600dp/keys_arabic3_left.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
diff --git a/app/src/main/res/xml-sw600dp/keys_dvorak_123.xml b/app/src/main/res/xml-sw600dp/keys_dvorak_123.xml
index 8f44811f..11842f8b 100644
--- a/app/src/main/res/xml-sw600dp/keys_dvorak_123.xml
+++ b/app/src/main/res/xml-sw600dp/keys_dvorak_123.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml b/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml
index a6f1afe0..3651fddf 100644
--- a/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!"
diff --git a/app/src/main/res/xml-sw600dp/keys_farsi3_right.xml b/app/src/main/res/xml-sw600dp/keys_farsi3_right.xml
index 6bf45344..396a4be2 100644
--- a/app/src/main/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/app/src/main/res/xml-sw600dp/keys_farsi3_right.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
diff --git a/app/src/main/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/app/src/main/res/xml-sw600dp/keys_pcqwerty2_right3.xml
index 90e93e75..02e8a971 100644
--- a/app/src/main/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ b/app/src/main/res/xml-sw600dp/keys_pcqwerty2_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/app/src/main/res/xml-sw600dp/keys_pcqwerty3_right2.xml
index 63df0753..a0ad182a 100644
--- a/app/src/main/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ b/app/src/main/res/xml-sw600dp/keys_pcqwerty3_right2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/app/src/main/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 3255396f..05f03f9d 100644
--- a/app/src/main/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/app/src/main/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/row_pcqwerty5.xml b/app/src/main/res/xml-sw600dp/row_pcqwerty5.xml
index 11b18aaa..aef0a9df 100644
--- a/app/src/main/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/app/src/main/res/xml-sw600dp/row_pcqwerty5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="7.0%p"
diff --git a/app/src/main/res/xml-sw600dp/row_qwerty4.xml b/app/src/main/res/xml-sw600dp/row_qwerty4.xml
index 4fe4cf0d..7eb6da8a 100644
--- a/app/src/main/res/xml-sw600dp/row_qwerty4.xml
+++ b/app/src/main/res/xml-sw600dp/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <!-- Split the 4th row for split layouts -->
diff --git a/app/src/main/res/xml-sw600dp/rowkeys_dvorak3.xml b/app/src/main/res/xml-sw600dp/rowkeys_dvorak3.xml
index b8f95759..ce98a973 100644
--- a/app/src/main/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/app/src/main/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q" />
diff --git a/app/src/main/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/app/src/main/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index 1b3592c5..094d1c6a 100644
--- a/app/src/main/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/app/src/main/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml-sw600dp/rows_arabic.xml b/app/src/main/res/xml-sw600dp/rows_arabic.xml
index 3542dc48..df2b1891 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_arabic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml b/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
index 39da7a3a..188c841a 100644
--- a/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_azerty.xml b/app/src/main/res/xml-sw600dp/rows_azerty.xml
index d2b2a721..d047c729 100644
--- a/app/src/main/res/xml-sw600dp/rows_azerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali.xml b/app/src/main/res/xml-sw600dp/rows_bengali.xml
index adcfc45b..9dfe3213 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml b/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
index 172226a3..d51cbb29 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_bepo.xml b/app/src/main/res/xml-sw600dp/rows_bepo.xml
index d64cdeda..88d95535 100644
--- a/app/src/main/res/xml-sw600dp/rows_bepo.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bepo.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
index be644b96..e575ead5 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
index a3b2e4dd..e290a8c1 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak.xml b/app/src/main/res/xml-sw600dp/rows_colemak.xml
index 29dc4cbb..f3f32d15 100644
--- a/app/src/main/res/xml-sw600dp/rows_colemak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_dvorak.xml b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
index e0f87c93..9fb3e649 100644
--- a/app/src/main/res/xml-sw600dp/rows_dvorak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_east_slavic.xml b/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
index f574135f..8c08bbff 100644
--- a/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_farsi.xml b/app/src/main/res/xml-sw600dp/rows_farsi.xml
index f0d44da1..2849df58 100644
--- a/app/src/main/res/xml-sw600dp/rows_farsi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_farsi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_georgian.xml b/app/src/main/res/xml-sw600dp/rows_georgian.xml
index 64d00f1e..7874c753 100644
--- a/app/src/main/res/xml-sw600dp/rows_georgian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_greek.xml b/app/src/main/res/xml-sw600dp/rows_greek.xml
index 578792d1..b2ed3e3a 100644
--- a/app/src/main/res/xml-sw600dp/rows_greek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_hebrew.xml b/app/src/main/res/xml-sw600dp/rows_hebrew.xml
index 565da8fe..fe582aff 100644
--- a/app/src/main/res/xml-sw600dp/rows_hebrew.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_hindi.xml b/app/src/main/res/xml-sw600dp/rows_hindi.xml
index 3d6de315..7608acf7 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hindi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml b/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
index 23220835..d4a247e4 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_kannada.xml b/app/src/main/res/xml-sw600dp/rows_kannada.xml
index 58858412..dc755a14 100644
--- a/app/src/main/res/xml-sw600dp/rows_kannada.xml
+++ b/app/src/main/res/xml-sw600dp/rows_kannada.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_khmer.xml b/app/src/main/res/xml-sw600dp/rows_khmer.xml
index dd843888..3af0b207 100644
--- a/app/src/main/res/xml-sw600dp/rows_khmer.xml
+++ b/app/src/main/res/xml-sw600dp/rows_khmer.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_lao.xml b/app/src/main/res/xml-sw600dp/rows_lao.xml
index 1f545da0..77a12c26 100644
--- a/app/src/main/res/xml-sw600dp/rows_lao.xml
+++ b/app/src/main/res/xml-sw600dp/rows_lao.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_malayalam.xml b/app/src/main/res/xml-sw600dp/rows_malayalam.xml
index d69c04e9..f7f425f2 100644
--- a/app/src/main/res/xml-sw600dp/rows_malayalam.xml
+++ b/app/src/main/res/xml-sw600dp/rows_malayalam.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_marathi.xml b/app/src/main/res/xml-sw600dp/rows_marathi.xml
index e536845c..f127e1a8 100644
--- a/app/src/main/res/xml-sw600dp/rows_marathi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_marathi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_mongolian.xml b/app/src/main/res/xml-sw600dp/rows_mongolian.xml
index 4fdccef2..39e67eb0 100644
--- a/app/src/main/res/xml-sw600dp/rows_mongolian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml b/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
index df6ffa9b..1f4eb5a3 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml b/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
index 32d83751..7b0678bf 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_nordic.xml b/app/src/main/res/xml-sw600dp/rows_nordic.xml
index 7ac3df56..f2242dd9 100644
--- a/app/src/main/res/xml-sw600dp/rows_nordic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_number_normal.xml b/app/src/main/res/xml-sw600dp/rows_number_normal.xml
index 57ea5f47..c364a33c 100644
--- a/app/src/main/res/xml-sw600dp/rows_number_normal.xml
+++ b/app/src/main/res/xml-sw600dp/rows_number_normal.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <Key
diff --git a/app/src/main/res/xml-sw600dp/rows_number_password.xml b/app/src/main/res/xml-sw600dp/rows_number_password.xml
index db7378c7..543cf7d7 100644
--- a/app/src/main/res/xml-sw600dp/rows_number_password.xml
+++ b/app/src/main/res/xml-sw600dp/rows_number_password.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
diff --git a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
index fa2e8182..2075c62c 100644
--- a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_phone.xml b/app/src/main/res/xml-sw600dp/rows_phone.xml
index 6c3137ab..9a9c9b9a 100644
--- a/app/src/main/res/xml-sw600dp/rows_phone.xml
+++ b/app/src/main/res/xml-sw600dp/rows_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_qwerty.xml b/app/src/main/res/xml-sw600dp/rows_qwerty.xml
index d02cf53a..259a6f00 100644
--- a/app/src/main/res/xml-sw600dp/rows_qwerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_qwertz.xml b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
index 1b77a7f0..164df5b8 100644
--- a/app/src/main/res/xml-sw600dp/rows_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_serbian_qwertz.xml b/app/src/main/res/xml-sw600dp/rows_serbian_qwertz.xml
index d0a21f53..5fd48c61 100644
--- a/app/src/main/res/xml-sw600dp/rows_serbian_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp/rows_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="8.182%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
diff --git a/app/src/main/res/xml-sw600dp/rows_sinhala.xml b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
index b5cd32bf..2fe89792 100644
--- a/app/src/main/res/xml-sw600dp/rows_sinhala.xml
+++ b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_south_slavic.xml b/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
index 42746f93..cfe5c575 100644
--- a/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_spanish.xml b/app/src/main/res/xml-sw600dp/rows_spanish.xml
index f12b24b3..27be76c9 100644
--- a/app/src/main/res/xml-sw600dp/rows_spanish.xml
+++ b/app/src/main/res/xml-sw600dp/rows_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_swiss.xml b/app/src/main/res/xml-sw600dp/rows_swiss.xml
index 92742641..e057f5fb 100644
--- a/app/src/main/res/xml-sw600dp/rows_swiss.xml
+++ b/app/src/main/res/xml-sw600dp/rows_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_symbols.xml b/app/src/main/res/xml-sw600dp/rows_symbols.xml
index 08d730c8..664a87e9 100644
--- a/app/src/main/res/xml-sw600dp/rows_symbols.xml
+++ b/app/src/main/res/xml-sw600dp/rows_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml b/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
index bfaf0556..ac9ca2ee 100644
--- a/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml-sw600dp/rows_tamil.xml b/app/src/main/res/xml-sw600dp/rows_tamil.xml
index a649508c..569a634c 100644
--- a/app/src/main/res/xml-sw600dp/rows_tamil.xml
+++ b/app/src/main/res/xml-sw600dp/rows_tamil.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_telugu.xml b/app/src/main/res/xml-sw600dp/rows_telugu.xml
index 4de98885..c782969f 100644
--- a/app/src/main/res/xml-sw600dp/rows_telugu.xml
+++ b/app/src/main/res/xml-sw600dp/rows_telugu.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_thai.xml b/app/src/main/res/xml-sw600dp/rows_thai.xml
index 0aa2aced..df3cca7b 100644
--- a/app/src/main/res/xml-sw600dp/rows_thai.xml
+++ b/app/src/main/res/xml-sw600dp/rows_thai.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_uzbek.xml b/app/src/main/res/xml-sw600dp/rows_uzbek.xml
index c674eb85..06e51a00 100644
--- a/app/src/main/res/xml-sw600dp/rows_uzbek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="8.182%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index b18ec628..439fda00 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
index 8e5353a8..1c114b7d 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
index cb0f9040..b7eccfc1 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
index 6ba6c16b..996a061a 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
index a62a2b2b..71befd93 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index 98323751..076db679 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index c97e8fcf..91d1de25 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index 41e18eca..50cfd650 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index 131728ec..805446a2 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index 77455782..5e446c01 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index ed1fac2b..bed052e9 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index f3e1dd74..60d27119 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 17555573..3e3b56c5 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index d0a0d0f7..608a0980 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index 82dbff58..acb60710 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index 34a88319..1adc3bb5 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index c7357547..268c7d8f 100644
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
diff --git a/app/src/main/res/xml/kbd_arabic.xml b/app/src/main/res/xml/kbd_arabic.xml
index 225174f9..4686a4c5 100644
--- a/app/src/main/res/xml/kbd_arabic.xml
+++ b/app/src/main/res/xml/kbd_arabic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_arabic" />
diff --git a/app/src/main/res/xml/kbd_armenian_phonetic.xml b/app/src/main/res/xml/kbd_armenian_phonetic.xml
index 06b9c9ef..11d8f912 100644
--- a/app/src/main/res/xml/kbd_armenian_phonetic.xml
+++ b/app/src/main/res/xml/kbd_armenian_phonetic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/app/src/main/res/xml/kbd_azerty.xml b/app/src/main/res/xml/kbd_azerty.xml
index 643ee7ee..4b95b010 100644
--- a/app/src/main/res/xml/kbd_azerty.xml
+++ b/app/src/main/res/xml/kbd_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_azerty" />
diff --git a/app/src/main/res/xml/kbd_bengali.xml b/app/src/main/res/xml/kbd_bengali.xml
index dd2ee9f6..5684fb88 100644
--- a/app/src/main/res/xml/kbd_bengali.xml
+++ b/app/src/main/res/xml/kbd_bengali.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bengali" />
diff --git a/app/src/main/res/xml/kbd_bengali_akkhor.xml b/app/src/main/res/xml/kbd_bengali_akkhor.xml
index 1b8cdc09..b5792603 100644
--- a/app/src/main/res/xml/kbd_bengali_akkhor.xml
+++ b/app/src/main/res/xml/kbd_bengali_akkhor.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_bengali_akkhor" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_bepo.xml b/app/src/main/res/xml/kbd_bepo.xml
index 3e102925..d0226991 100644
--- a/app/src/main/res/xml/kbd_bepo.xml
+++ b/app/src/main/res/xml/kbd_bepo.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bepo" />
diff --git a/app/src/main/res/xml/kbd_bulgarian.xml b/app/src/main/res/xml/kbd_bulgarian.xml
index 79210a46..6f09d03e 100644
--- a/app/src/main/res/xml/kbd_bulgarian.xml
+++ b/app/src/main/res/xml/kbd_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bulgarian" />
diff --git a/app/src/main/res/xml/kbd_bulgarian_bds.xml b/app/src/main/res/xml/kbd_bulgarian_bds.xml
index ad832df5..7005eddf 100644
--- a/app/src/main/res/xml/kbd_bulgarian_bds.xml
+++ b/app/src/main/res/xml/kbd_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bulgarian_bds" />
diff --git a/app/src/main/res/xml/kbd_colemak.xml b/app/src/main/res/xml/kbd_colemak.xml
index 77156d49..28ce857c 100644
--- a/app/src/main/res/xml/kbd_colemak.xml
+++ b/app/src/main/res/xml/kbd_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_colemak" />
diff --git a/app/src/main/res/xml/kbd_dvorak.xml b/app/src/main/res/xml/kbd_dvorak.xml
index d31dc634..a8f1d0e2 100644
--- a/app/src/main/res/xml/kbd_dvorak.xml
+++ b/app/src/main/res/xml/kbd_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_dvorak" />
diff --git a/app/src/main/res/xml/kbd_east_slavic.xml b/app/src/main/res/xml/kbd_east_slavic.xml
index 53e3002a..372938e8 100644
--- a/app/src/main/res/xml/kbd_east_slavic.xml
+++ b/app/src/main/res/xml/kbd_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_east_slavic" />
diff --git a/app/src/main/res/xml/kbd_emoji_category1.xml b/app/src/main/res/xml/kbd_emoji_category1.xml
index 3dba4970..ade946b1 100644
--- a/app/src/main/res/xml/kbd_emoji_category1.xml
+++ b/app/src/main/res/xml/kbd_emoji_category1.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category10.xml b/app/src/main/res/xml/kbd_emoji_category10.xml
index 51fb78f3..9188f6f6 100644
--- a/app/src/main/res/xml/kbd_emoji_category10.xml
+++ b/app/src/main/res/xml/kbd_emoji_category10.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category11.xml b/app/src/main/res/xml/kbd_emoji_category11.xml
index abf9771d..fb5ddf59 100644
--- a/app/src/main/res/xml/kbd_emoji_category11.xml
+++ b/app/src/main/res/xml/kbd_emoji_category11.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category12.xml b/app/src/main/res/xml/kbd_emoji_category12.xml
index b73b0e10..110cfb4a 100644
--- a/app/src/main/res/xml/kbd_emoji_category12.xml
+++ b/app/src/main/res/xml/kbd_emoji_category12.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category13.xml b/app/src/main/res/xml/kbd_emoji_category13.xml
index 10330923..cd3bcc70 100644
--- a/app/src/main/res/xml/kbd_emoji_category13.xml
+++ b/app/src/main/res/xml/kbd_emoji_category13.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category14.xml b/app/src/main/res/xml/kbd_emoji_category14.xml
index 97826f9b..e427cb17 100644
--- a/app/src/main/res/xml/kbd_emoji_category14.xml
+++ b/app/src/main/res/xml/kbd_emoji_category14.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category15.xml b/app/src/main/res/xml/kbd_emoji_category15.xml
index fba57aa3..dfdf124c 100644
--- a/app/src/main/res/xml/kbd_emoji_category15.xml
+++ b/app/src/main/res/xml/kbd_emoji_category15.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category16.xml b/app/src/main/res/xml/kbd_emoji_category16.xml
index f02e66f6..ece0ef0e 100644
--- a/app/src/main/res/xml/kbd_emoji_category16.xml
+++ b/app/src/main/res/xml/kbd_emoji_category16.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category2.xml b/app/src/main/res/xml/kbd_emoji_category2.xml
index 67dd00be..5aa8420a 100644
--- a/app/src/main/res/xml/kbd_emoji_category2.xml
+++ b/app/src/main/res/xml/kbd_emoji_category2.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category3.xml b/app/src/main/res/xml/kbd_emoji_category3.xml
index e461b46c..2fa40861 100644
--- a/app/src/main/res/xml/kbd_emoji_category3.xml
+++ b/app/src/main/res/xml/kbd_emoji_category3.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category4.xml b/app/src/main/res/xml/kbd_emoji_category4.xml
index 84202508..56b954a4 100644
--- a/app/src/main/res/xml/kbd_emoji_category4.xml
+++ b/app/src/main/res/xml/kbd_emoji_category4.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category5.xml b/app/src/main/res/xml/kbd_emoji_category5.xml
index bf34b100..7034454a 100644
--- a/app/src/main/res/xml/kbd_emoji_category5.xml
+++ b/app/src/main/res/xml/kbd_emoji_category5.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category6.xml b/app/src/main/res/xml/kbd_emoji_category6.xml
index b9b21f6b..64033ad5 100644
--- a/app/src/main/res/xml/kbd_emoji_category6.xml
+++ b/app/src/main/res/xml/kbd_emoji_category6.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:keyLabelSize="60%p"
diff --git a/app/src/main/res/xml/kbd_emoji_category7.xml b/app/src/main/res/xml/kbd_emoji_category7.xml
index f25aaad5..24eded61 100644
--- a/app/src/main/res/xml/kbd_emoji_category7.xml
+++ b/app/src/main/res/xml/kbd_emoji_category7.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category8.xml b/app/src/main/res/xml/kbd_emoji_category8.xml
index c8ca9d05..e0d64451 100644
--- a/app/src/main/res/xml/kbd_emoji_category8.xml
+++ b/app/src/main/res/xml/kbd_emoji_category8.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_category9.xml b/app/src/main/res/xml/kbd_emoji_category9.xml
index af8ef153..93958497 100644
--- a/app/src/main/res/xml/kbd_emoji_category9.xml
+++ b/app/src/main/res/xml/kbd_emoji_category9.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/app/src/main/res/xml/kbd_emoji_recents.xml b/app/src/main/res/xml/kbd_emoji_recents.xml
index a9b1d7a2..3a353dbc 100644
--- a/app/src/main/res/xml/kbd_emoji_recents.xml
+++ b/app/src/main/res/xml/kbd_emoji_recents.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size"
     latin:keyLabelSize="60%p"
diff --git a/app/src/main/res/xml/kbd_farsi.xml b/app/src/main/res/xml/kbd_farsi.xml
index 137f70d5..f36e04b9 100644
--- a/app/src/main/res/xml/kbd_farsi.xml
+++ b/app/src/main/res/xml/kbd_farsi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_farsi" />
diff --git a/app/src/main/res/xml/kbd_georgian.xml b/app/src/main/res/xml/kbd_georgian.xml
index 0db8ac9d..49785731 100644
--- a/app/src/main/res/xml/kbd_georgian.xml
+++ b/app/src/main/res/xml/kbd_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_georgian" />
diff --git a/app/src/main/res/xml/kbd_greek.xml b/app/src/main/res/xml/kbd_greek.xml
index 3d7f7304..748ca2c4 100644
--- a/app/src/main/res/xml/kbd_greek.xml
+++ b/app/src/main/res/xml/kbd_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_greek" />
diff --git a/app/src/main/res/xml/kbd_hebrew.xml b/app/src/main/res/xml/kbd_hebrew.xml
index cc255246..4152ea86 100644
--- a/app/src/main/res/xml/kbd_hebrew.xml
+++ b/app/src/main/res/xml/kbd_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hebrew" />
diff --git a/app/src/main/res/xml/kbd_hindi.xml b/app/src/main/res/xml/kbd_hindi.xml
index 4f0cdd1b..da1672ac 100644
--- a/app/src/main/res/xml/kbd_hindi.xml
+++ b/app/src/main/res/xml/kbd_hindi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hindi" />
diff --git a/app/src/main/res/xml/kbd_hindi_compact.xml b/app/src/main/res/xml/kbd_hindi_compact.xml
index 16e5b62e..be1c0f7b 100644
--- a/app/src/main/res/xml/kbd_hindi_compact.xml
+++ b/app/src/main/res/xml/kbd_hindi_compact.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hindi_compact" />
diff --git a/app/src/main/res/xml/kbd_kannada.xml b/app/src/main/res/xml/kbd_kannada.xml
index 61c15f1b..69a99cd6 100644
--- a/app/src/main/res/xml/kbd_kannada.xml
+++ b/app/src/main/res/xml/kbd_kannada.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_kannada" />
diff --git a/app/src/main/res/xml/kbd_khmer.xml b/app/src/main/res/xml/kbd_khmer.xml
index c92a4c89..a6c73f2f 100644
--- a/app/src/main/res/xml/kbd_khmer.xml
+++ b/app/src/main/res/xml/kbd_khmer.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/app/src/main/res/xml/kbd_lao.xml b/app/src/main/res/xml/kbd_lao.xml
index 2c3a8f63..489901e0 100644
--- a/app/src/main/res/xml/kbd_lao.xml
+++ b/app/src/main/res/xml/kbd_lao.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/app/src/main/res/xml/kbd_malayalam.xml b/app/src/main/res/xml/kbd_malayalam.xml
index 3f06efbb..85e0159a 100644
--- a/app/src/main/res/xml/kbd_malayalam.xml
+++ b/app/src/main/res/xml/kbd_malayalam.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_malayalam" />
diff --git a/app/src/main/res/xml/kbd_marathi.xml b/app/src/main/res/xml/kbd_marathi.xml
index b7aacc51..e0ae2225 100644
--- a/app/src/main/res/xml/kbd_marathi.xml
+++ b/app/src/main/res/xml/kbd_marathi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_marathi" />
diff --git a/app/src/main/res/xml/kbd_mongolian.xml b/app/src/main/res/xml/kbd_mongolian.xml
index 4abf4d74..57a5d15c 100644
--- a/app/src/main/res/xml/kbd_mongolian.xml
+++ b/app/src/main/res/xml/kbd_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_mongolian" />
diff --git a/app/src/main/res/xml/kbd_more_keys_keyboard_template.xml b/app/src/main/res/xml/kbd_more_keys_keyboard_template.xml
index 099562d0..0aa68d26 100644
--- a/app/src/main/res/xml/kbd_more_keys_keyboard_template.xml
+++ b/app/src/main/res/xml/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="10%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/app/src/main/res/xml/kbd_nepali_romanized.xml b/app/src/main/res/xml/kbd_nepali_romanized.xml
index 373c19f2..d1b5a277 100644
--- a/app/src/main/res/xml/kbd_nepali_romanized.xml
+++ b/app/src/main/res/xml/kbd_nepali_romanized.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nepali_romanized" />
diff --git a/app/src/main/res/xml/kbd_nepali_traditional.xml b/app/src/main/res/xml/kbd_nepali_traditional.xml
index 3b13f7a9..ace0cdc5 100644
--- a/app/src/main/res/xml/kbd_nepali_traditional.xml
+++ b/app/src/main/res/xml/kbd_nepali_traditional.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nepali_traditional" />
diff --git a/app/src/main/res/xml/kbd_nordic.xml b/app/src/main/res/xml/kbd_nordic.xml
index 10b5dd7e..109c254d 100644
--- a/app/src/main/res/xml/kbd_nordic.xml
+++ b/app/src/main/res/xml/kbd_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nordic" />
diff --git a/app/src/main/res/xml/kbd_number.xml b/app/src/main/res/xml/kbd_number.xml
index 0677ffe6..37598a1f 100644
--- a/app/src/main/res/xml/kbd_number.xml
+++ b/app/src/main/res/xml/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml/kbd_pcqwerty.xml b/app/src/main/res/xml/kbd_pcqwerty.xml
index 76f5bdf2..74e4a55f 100644
--- a/app/src/main/res/xml/kbd_pcqwerty.xml
+++ b/app/src/main/res/xml/kbd_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/app/src/main/res/xml/kbd_phone.xml b/app/src/main/res/xml/kbd_phone.xml
index 084b09fe..9ca88e20 100644
--- a/app/src/main/res/xml/kbd_phone.xml
+++ b/app/src/main/res/xml/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml/kbd_phone_symbols.xml b/app/src/main/res/xml/kbd_phone_symbols.xml
index f7658d62..db90b281 100644
--- a/app/src/main/res/xml/kbd_phone_symbols.xml
+++ b/app/src/main/res/xml/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/app/src/main/res/xml/kbd_qwerty.xml b/app/src/main/res/xml/kbd_qwerty.xml
index 432a2fcf..6909874c 100644
--- a/app/src/main/res/xml/kbd_qwerty.xml
+++ b/app/src/main/res/xml/kbd_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_qwerty" />
diff --git a/app/src/main/res/xml/kbd_qwertz.xml b/app/src/main/res/xml/kbd_qwertz.xml
index 1c0c8b3f..609e3e15 100644
--- a/app/src/main/res/xml/kbd_qwertz.xml
+++ b/app/src/main/res/xml/kbd_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_qwertz" />
diff --git a/app/src/main/res/xml/kbd_serbian_qwertz.xml b/app/src/main/res/xml/kbd_serbian_qwertz.xml
index 934fad47..0410376d 100644
--- a/app/src/main/res/xml/kbd_serbian_qwertz.xml
+++ b/app/src/main/res/xml/kbd_serbian_qwertz.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_serbian_qwertz" />
 </Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_sinhala.xml b/app/src/main/res/xml/kbd_sinhala.xml
index 986cbc59..fa407dd9 100644
--- a/app/src/main/res/xml/kbd_sinhala.xml
+++ b/app/src/main/res/xml/kbd_sinhala.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_sinhala" />
diff --git a/app/src/main/res/xml/kbd_south_slavic.xml b/app/src/main/res/xml/kbd_south_slavic.xml
index f1c6d583..71b76013 100644
--- a/app/src/main/res/xml/kbd_south_slavic.xml
+++ b/app/src/main/res/xml/kbd_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_south_slavic" />
diff --git a/app/src/main/res/xml/kbd_spanish.xml b/app/src/main/res/xml/kbd_spanish.xml
index 36540e8f..a8b9c1e7 100644
--- a/app/src/main/res/xml/kbd_spanish.xml
+++ b/app/src/main/res/xml/kbd_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_spanish" />
diff --git a/app/src/main/res/xml/kbd_suggestions_pane_template.xml b/app/src/main/res/xml/kbd_suggestions_pane_template.xml
index 2ad64e49..a8f9a87d 100644
--- a/app/src/main/res/xml/kbd_suggestions_pane_template.xml
+++ b/app/src/main/res/xml/kbd_suggestions_pane_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="10%p"
     latin:rowHeight="@dimen/config_more_suggestions_row_height"
     >
diff --git a/app/src/main/res/xml/kbd_swiss.xml b/app/src/main/res/xml/kbd_swiss.xml
index 9c78a7c1..3a1d1a6c 100644
--- a/app/src/main/res/xml/kbd_swiss.xml
+++ b/app/src/main/res/xml/kbd_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_swiss" />
diff --git a/app/src/main/res/xml/kbd_symbols.xml b/app/src/main/res/xml/kbd_symbols.xml
index 09015443..6bca4dce 100644
--- a/app/src/main/res/xml/kbd_symbols.xml
+++ b/app/src/main/res/xml/kbd_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
     <include
diff --git a/app/src/main/res/xml/kbd_symbols_shift.xml b/app/src/main/res/xml/kbd_symbols_shift.xml
index 62c7f6fa..01d6156d 100644
--- a/app/src/main/res/xml/kbd_symbols_shift.xml
+++ b/app/src/main/res/xml/kbd_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
     <include
diff --git a/app/src/main/res/xml/kbd_tamil.xml b/app/src/main/res/xml/kbd_tamil.xml
index 216b6ffe..7456ff99 100644
--- a/app/src/main/res/xml/kbd_tamil.xml
+++ b/app/src/main/res/xml/kbd_tamil.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_tamil" />
diff --git a/app/src/main/res/xml/kbd_telugu.xml b/app/src/main/res/xml/kbd_telugu.xml
index baa24c38..19fdf954 100644
--- a/app/src/main/res/xml/kbd_telugu.xml
+++ b/app/src/main/res/xml/kbd_telugu.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_telugu" />
diff --git a/app/src/main/res/xml/kbd_thai.xml b/app/src/main/res/xml/kbd_thai.xml
index 3fb3483b..081b6fc6 100644
--- a/app/src/main/res/xml/kbd_thai.xml
+++ b/app/src/main/res/xml/kbd_thai.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/app/src/main/res/xml/kbd_uzbek.xml b/app/src/main/res/xml/kbd_uzbek.xml
index a2c524d5..d577a8e5 100644
--- a/app/src/main/res/xml/kbd_uzbek.xml
+++ b/app/src/main/res/xml/kbd_uzbek.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_uzbek" />
 </Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/key_armenian_sha.xml b/app/src/main/res/xml/key_armenian_sha.xml
index b5db9d10..05779bb0 100644
--- a/app/src/main/res/xml/key_armenian_sha.xml
+++ b/app/src/main/res/xml/key_armenian_sha.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA -->
     <Key
diff --git a/app/src/main/res/xml/key_armenian_xeh.xml b/app/src/main/res/xml/key_armenian_xeh.xml
index 6b94b732..72861c9f 100644
--- a/app/src/main/res/xml/key_armenian_xeh.xml
+++ b/app/src/main/res/xml/key_armenian_xeh.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH -->
     <Key
diff --git a/app/src/main/res/xml/key_comma.xml b/app/src/main/res/xml/key_comma.xml
index 2c2f2c17..a1da5171 100644
--- a/app/src/main/res/xml/key_comma.xml
+++ b/app/src/main/res/xml/key_comma.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/key_emoji.xml b/app/src/main/res/xml/key_emoji.xml
index ab40252a..2d56c90a 100644
--- a/app/src/main/res/xml/key_emoji.xml
+++ b/app/src/main/res/xml/key_emoji.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/key_period.xml b/app/src/main/res/xml/key_period.xml
index 2e009f6c..9a138f21 100644
--- a/app/src/main/res/xml/key_period.xml
+++ b/app/src/main/res/xml/key_period.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/key_space_5kw.xml b/app/src/main/res/xml/key_space_5kw.xml
index 4b343b5e..a5870178 100644
--- a/app/src/main/res/xml/key_space_5kw.xml
+++ b/app/src/main/res/xml/key_space_5kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/key_space_symbols.xml b/app/src/main/res/xml/key_space_symbols.xml
index 51c7d689..d84783d3 100644
--- a/app/src/main/res/xml/key_space_symbols.xml
+++ b/app/src/main/res/xml/key_space_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="spaceKeyStyle"
diff --git a/app/src/main/res/xml/key_styles_actions.xml b/app/src/main/res/xml/key_styles_actions.xml
index e09f1b13..b35391ae 100644
--- a/app/src/main/res/xml/key_styles_actions.xml
+++ b/app/src/main/res/xml/key_styles_actions.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Go key -->
     <switch>
diff --git a/app/src/main/res/xml/key_styles_common.xml b/app/src/main/res/xml/key_styles_common.xml
index fd69faef..4cb7a85b 100644
--- a/app/src/main/res/xml/key_styles_common.xml
+++ b/app/src/main/res/xml/key_styles_common.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/key_styles_currency.xml b/app/src/main/res/xml/key_styles_currency.xml
index d1ea165c..22451c30 100644
--- a/app/src/main/res/xml/key_styles_currency.xml
+++ b/app/src/main/res/xml/key_styles_currency.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:passwordInput="true">
             <include latin:keyboardLayout="@xml/key_styles_currency_dollar" />
diff --git a/app/src/main/res/xml/key_styles_currency_dollar.xml b/app/src/main/res/xml/key_styles_currency_dollar.xml
index ff20025c..9a2f1d00 100644
--- a/app/src/main/res/xml/key_styles_currency_dollar.xml
+++ b/app/src/main/res/xml/key_styles_currency_dollar.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+00A3: "£" POUND SIGN
          U+00A2: "¢" CENT SIGN
          U+20AC: "€" EURO SIGN
diff --git a/app/src/main/res/xml/key_styles_currency_euro.xml b/app/src/main/res/xml/key_styles_currency_euro.xml
index c8653a16..dfae2017 100644
--- a/app/src/main/res/xml/key_styles_currency_euro.xml
+++ b/app/src/main/res/xml/key_styles_currency_euro.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+20AC: "€" EURO SIGN
          U+00A2: "¢" CENT SIGN
          U+00A3: "£" POUND SIGN
diff --git a/app/src/main/res/xml/key_styles_currency_generic.xml b/app/src/main/res/xml/key_styles_currency_generic.xml
index 618da09f..2f005255 100644
--- a/app/src/main/res/xml/key_styles_currency_generic.xml
+++ b/app/src/main/res/xml/key_styles_currency_generic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+00A3: "£" POUND SIGN
          U+20AC: "€" EURO SIGN
          U+00A2: "¢" CENT SIGN -->
diff --git a/app/src/main/res/xml/key_styles_enter.xml b/app/src/main/res/xml/key_styles_enter.xml
index d348bdc3..abdb5b77 100644
--- a/app/src/main/res/xml/key_styles_enter.xml
+++ b/app/src/main/res/xml/key_styles_enter.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Navigate more keys style -->
     <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
diff --git a/app/src/main/res/xml/key_styles_less_greater.xml b/app/src/main/res/xml/key_styles_less_greater.xml
index 36078a97..716838b0 100644
--- a/app/src/main/res/xml/key_styles_less_greater.xml
+++ b/app/src/main/res/xml/key_styles_less_greater.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The less and greater keys' style which may have different label depending on locale. -->
     <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
diff --git a/app/src/main/res/xml/key_styles_navigate_more_keys.xml b/app/src/main/res/xml/key_styles_navigate_more_keys.xml
index b40f80a5..67230e12 100644
--- a/app/src/main/res/xml/key_styles_navigate_more_keys.xml
+++ b/app/src/main/res/xml/key_styles_navigate_more_keys.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case latin:keyboardTheme="ICS|KLP">
diff --git a/app/src/main/res/xml/key_styles_number.xml b/app/src/main/res/xml/key_styles_number.xml
index cd223a09..b670998c 100644
--- a/app/src/main/res/xml/key_styles_number.xml
+++ b/app/src/main/res/xml/key_styles_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <key-style
         latin:styleName="numKeyBaseStyle"
diff --git a/app/src/main/res/xml/key_styles_settings.xml b/app/src/main/res/xml/key_styles_settings.xml
index 0e1ca429..07f4ac30 100644
--- a/app/src/main/res/xml/key_styles_settings.xml
+++ b/app/src/main/res/xml/key_styles_settings.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Key style for the key which may have settings key as more keys. -->
     <switch>
diff --git a/app/src/main/res/xml/key_thai_kho_khuat.xml b/app/src/main/res/xml/key_thai_kho_khuat.xml
index 15264031..d5b333b5 100644
--- a/app/src/main/res/xml/key_thai_kho_khuat.xml
+++ b/app/src/main/res/xml/key_thai_kho_khuat.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/keyboard_layout_set_arabic.xml b/app/src/main/res/xml/keyboard_layout_set_arabic.xml
index 1e0e6aab..9ce9af70 100644
--- a/app/src/main/res/xml/keyboard_layout_set_arabic.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_arabic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="arabic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_armenian_phonetic.xml b/app/src/main/res/xml/keyboard_layout_set_armenian_phonetic.xml
index 4ae7466d..a727fe29 100644
--- a/app/src/main/res/xml/keyboard_layout_set_armenian_phonetic.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_armenian_phonetic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="armenian" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_azerty.xml b/app/src/main/res/xml/keyboard_layout_set_azerty.xml
index 2ce6fb29..f793a21f 100644
--- a/app/src/main/res/xml/keyboard_layout_set_azerty.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_azerty"
diff --git a/app/src/main/res/xml/keyboard_layout_set_bengali.xml b/app/src/main/res/xml/keyboard_layout_set_bengali.xml
index af890d1e..da03bc51 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bengali.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bengali.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="bengali" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml b/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml
index 15f20e90..15a6c93d 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Feature latin:supportedScript="bengali" />
     <Element
         latin:elementKeyboard="@xml/kbd_bengali_akkhor"
diff --git a/app/src/main/res/xml/keyboard_layout_set_bepo.xml b/app/src/main/res/xml/keyboard_layout_set_bepo.xml
index 58a5f1a0..d9d248d2 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bepo.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bepo.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_bepo"
diff --git a/app/src/main/res/xml/keyboard_layout_set_bulgarian.xml b/app/src/main/res/xml/keyboard_layout_set_bulgarian.xml
index 296b8f98..6cb1efa6 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bulgarian.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_bulgarian_bds.xml b/app/src/main/res/xml/keyboard_layout_set_bulgarian_bds.xml
index 3219c0bf..91d7ff4c 100644
--- a/app/src/main/res/xml/keyboard_layout_set_bulgarian_bds.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_colemak.xml b/app/src/main/res/xml/keyboard_layout_set_colemak.xml
index d2232ebf..ef3260b9 100644
--- a/app/src/main/res/xml/keyboard_layout_set_colemak.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_colemak"
diff --git a/app/src/main/res/xml/keyboard_layout_set_dvorak.xml b/app/src/main/res/xml/keyboard_layout_set_dvorak.xml
index a5295ee5..b35951c4 100644
--- a/app/src/main/res/xml/keyboard_layout_set_dvorak.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_dvorak"
diff --git a/app/src/main/res/xml/keyboard_layout_set_east_slavic.xml b/app/src/main/res/xml/keyboard_layout_set_east_slavic.xml
index 7937596e..4490d6e7 100644
--- a/app/src/main/res/xml/keyboard_layout_set_east_slavic.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_emoji.xml b/app/src/main/res/xml/keyboard_layout_set_emoji.xml
index fc4f8916..ef9fb316 100644
--- a/app/src/main/res/xml/keyboard_layout_set_emoji.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_emoji.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="emojiRecents"
         latin:elementKeyboard="@xml/kbd_emoji_recents" />
diff --git a/app/src/main/res/xml/keyboard_layout_set_farsi.xml b/app/src/main/res/xml/keyboard_layout_set_farsi.xml
index d0fbaa9f..20fe42a1 100644
--- a/app/src/main/res/xml/keyboard_layout_set_farsi.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_farsi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="arabic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_georgian.xml b/app/src/main/res/xml/keyboard_layout_set_georgian.xml
index 3418ee16..35986ff9 100644
--- a/app/src/main/res/xml/keyboard_layout_set_georgian.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="georgian" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_greek.xml b/app/src/main/res/xml/keyboard_layout_set_greek.xml
index f33f8326..fefc618e 100644
--- a/app/src/main/res/xml/keyboard_layout_set_greek.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="greek" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_hebrew.xml b/app/src/main/res/xml/keyboard_layout_set_hebrew.xml
index 364ccaec..ac83d165 100644
--- a/app/src/main/res/xml/keyboard_layout_set_hebrew.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="hebrew" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_hindi.xml b/app/src/main/res/xml/keyboard_layout_set_hindi.xml
index 3703134c..a522af7c 100644
--- a/app/src/main/res/xml/keyboard_layout_set_hindi.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_hindi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_hindi_compact.xml b/app/src/main/res/xml/keyboard_layout_set_hindi_compact.xml
index 014ae210..1ce1d202 100644
--- a/app/src/main/res/xml/keyboard_layout_set_hindi_compact.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_hindi_compact.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_kannada.xml b/app/src/main/res/xml/keyboard_layout_set_kannada.xml
index a44c1775..72bca7cf 100644
--- a/app/src/main/res/xml/keyboard_layout_set_kannada.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_kannada.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="kannada" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_khmer.xml b/app/src/main/res/xml/keyboard_layout_set_khmer.xml
index 86827693..f6889d9d 100644
--- a/app/src/main/res/xml/keyboard_layout_set_khmer.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_khmer.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="khmer" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_lao.xml b/app/src/main/res/xml/keyboard_layout_set_lao.xml
index fd7e9a9f..860e3960 100644
--- a/app/src/main/res/xml/keyboard_layout_set_lao.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_lao.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="lao" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_malayalam.xml b/app/src/main/res/xml/keyboard_layout_set_malayalam.xml
index 249d7010..10931fcb 100644
--- a/app/src/main/res/xml/keyboard_layout_set_malayalam.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_malayalam.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="malayalam" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_marathi.xml b/app/src/main/res/xml/keyboard_layout_set_marathi.xml
index 6d230393..5822b7b5 100644
--- a/app/src/main/res/xml/keyboard_layout_set_marathi.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_marathi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_mongolian.xml b/app/src/main/res/xml/keyboard_layout_set_mongolian.xml
index ef5b3862..a476109d 100644
--- a/app/src/main/res/xml/keyboard_layout_set_mongolian.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_nepali_romanized.xml b/app/src/main/res/xml/keyboard_layout_set_nepali_romanized.xml
index cc9e3547..195429be 100644
--- a/app/src/main/res/xml/keyboard_layout_set_nepali_romanized.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_nepali_romanized.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_nepali_traditional.xml b/app/src/main/res/xml/keyboard_layout_set_nepali_traditional.xml
index 31f30923..9ca13645 100644
--- a/app/src/main/res/xml/keyboard_layout_set_nepali_traditional.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_nepali_traditional.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_nordic.xml b/app/src/main/res/xml/keyboard_layout_set_nordic.xml
index 48127ab5..9e37bf98 100644
--- a/app/src/main/res/xml/keyboard_layout_set_nordic.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_nordic"
diff --git a/app/src/main/res/xml/keyboard_layout_set_pcqwerty.xml b/app/src/main/res/xml/keyboard_layout_set_pcqwerty.xml
index 2e22abc3..87fdb16b 100644
--- a/app/src/main/res/xml/keyboard_layout_set_pcqwerty.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_pcqwerty"
diff --git a/app/src/main/res/xml/keyboard_layout_set_qwerty.xml b/app/src/main/res/xml/keyboard_layout_set_qwerty.xml
index 11f3061f..a95c5b6a 100644
--- a/app/src/main/res/xml/keyboard_layout_set_qwerty.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_qwerty"
diff --git a/app/src/main/res/xml/keyboard_layout_set_qwertz.xml b/app/src/main/res/xml/keyboard_layout_set_qwertz.xml
index ce0b37ac..968f5275 100644
--- a/app/src/main/res/xml/keyboard_layout_set_qwertz.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_qwertz"
diff --git a/app/src/main/res/xml/keyboard_layout_set_serbian_qwertz.xml b/app/src/main/res/xml/keyboard_layout_set_serbian_qwertz.xml
index da5a97fb..ee6353db 100644
--- a/app/src/main/res/xml/keyboard_layout_set_serbian_qwertz.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Element
         latin:allowRedundantMoreKeys="false"
         latin:elementKeyboard="@xml/kbd_serbian_qwertz"
diff --git a/app/src/main/res/xml/keyboard_layout_set_sinhala.xml b/app/src/main/res/xml/keyboard_layout_set_sinhala.xml
index 45d3b1ca..a72d3913 100644
--- a/app/src/main/res/xml/keyboard_layout_set_sinhala.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_sinhala.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="sinhala" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_south_slavic.xml b/app/src/main/res/xml/keyboard_layout_set_south_slavic.xml
index bbc4e58a..c51b3710 100644
--- a/app/src/main/res/xml/keyboard_layout_set_south_slavic.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_spanish.xml b/app/src/main/res/xml/keyboard_layout_set_spanish.xml
index 40ac99c2..78a3d0ff 100644
--- a/app/src/main/res/xml/keyboard_layout_set_spanish.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_spanish"
diff --git a/app/src/main/res/xml/keyboard_layout_set_swiss.xml b/app/src/main/res/xml/keyboard_layout_set_swiss.xml
index 65ea9d3e..ec7d0d0f 100644
--- a/app/src/main/res/xml/keyboard_layout_set_swiss.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_swiss"
diff --git a/app/src/main/res/xml/keyboard_layout_set_tamil.xml b/app/src/main/res/xml/keyboard_layout_set_tamil.xml
index bbd1884e..7a89a10f 100644
--- a/app/src/main/res/xml/keyboard_layout_set_tamil.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_tamil.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="tamil" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_telugu.xml b/app/src/main/res/xml/keyboard_layout_set_telugu.xml
index 859b3352..56d5b5a7 100644
--- a/app/src/main/res/xml/keyboard_layout_set_telugu.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_telugu.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="telugu" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_thai.xml b/app/src/main/res/xml/keyboard_layout_set_thai.xml
index b653a316..22ccd4e1 100644
--- a/app/src/main/res/xml/keyboard_layout_set_thai.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_thai.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="thai" />
     <Element
diff --git a/app/src/main/res/xml/keyboard_layout_set_uzbek.xml b/app/src/main/res/xml/keyboard_layout_set_uzbek.xml
index cd5d04b5..16b84331 100644
--- a/app/src/main/res/xml/keyboard_layout_set_uzbek.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_uzbek"
diff --git a/app/src/main/res/xml/keys_arabic3_left.xml b/app/src/main/res/xml/keys_arabic3_left.xml
index d892d5eb..309a15fc 100644
--- a/app/src/main/res/xml/keys_arabic3_left.xml
+++ b/app/src/main/res/xml/keys_arabic3_left.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
diff --git a/app/src/main/res/xml/keys_curly_brackets.xml b/app/src/main/res/xml/keys_curly_brackets.xml
index df55139f..20e4604c 100644
--- a/app/src/main/res/xml/keys_curly_brackets.xml
+++ b/app/src/main/res/xml/keys_curly_brackets.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_curly_bracket" />
diff --git a/app/src/main/res/xml/keys_dvorak_123.xml b/app/src/main/res/xml/keys_dvorak_123.xml
index 4223a41c..02419c1f 100644
--- a/app/src/main/res/xml/keys_dvorak_123.xml
+++ b/app/src/main/res/xml/keys_dvorak_123.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/keys_farsi3_right.xml b/app/src/main/res/xml/keys_farsi3_right.xml
index bfc8cf56..72607de1 100644
--- a/app/src/main/res/xml/keys_farsi3_right.xml
+++ b/app/src/main/res/xml/keys_farsi3_right.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
diff --git a/app/src/main/res/xml/keys_parentheses.xml b/app/src/main/res/xml/keys_parentheses.xml
index ed2848cd..98919d4c 100644
--- a/app/src/main/res/xml/keys_parentheses.xml
+++ b/app/src/main/res/xml/keys_parentheses.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_parenthesis"
diff --git a/app/src/main/res/xml/keys_pcqwerty2_right3.xml b/app/src/main/res/xml/keys_pcqwerty2_right3.xml
index 94cb97bb..aec7e409 100644
--- a/app/src/main/res/xml/keys_pcqwerty2_right3.xml
+++ b/app/src/main/res/xml/keys_pcqwerty2_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/keys_pcqwerty3_right2.xml b/app/src/main/res/xml/keys_pcqwerty3_right2.xml
index da2cbf7e..147c87a4 100644
--- a/app/src/main/res/xml/keys_pcqwerty3_right2.xml
+++ b/app/src/main/res/xml/keys_pcqwerty3_right2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/keys_pcqwerty4_right3.xml b/app/src/main/res/xml/keys_pcqwerty4_right3.xml
index b5284a4c..75bfd089 100644
--- a/app/src/main/res/xml/keys_pcqwerty4_right3.xml
+++ b/app/src/main/res/xml/keys_pcqwerty4_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/keys_square_brackets.xml b/app/src/main/res/xml/keys_square_brackets.xml
index 92fa821d..af78ffbe 100644
--- a/app/src/main/res/xml/keys_square_brackets.xml
+++ b/app/src/main/res/xml/keys_square_brackets.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_square_bracket" />
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml b/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
index 60021b32..f42e525e 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml b/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
index 4b3f955d..be48eef0 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml b/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
index 9277d1de..66e2997a 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml b/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
index 86160f0f..50900e13 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml b/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
index 68d1c6b2..bd90b24b 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+25CC: "◌" DOTTED CIRCLE
          U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index b4e1a54e..e91696cb 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index 335f640a..1b4731ee 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 89372e2d..743ab00c 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index 84d8b224..02d89710 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 944ffa68..0454a5da 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 59477a41..4e15e1cb 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 262055dc..a25d01b3 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index 089af4ea..8399a70f 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
index d9707053..374cb599 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
index c48bf3ed..e0b1e0e0 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 63e07d02..abdc4d6f 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 73b3ef93..1381b3f0 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,7 +22,7 @@
      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/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 6688c893..13241b7a 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:key="english_ime_settings">
     <PreferenceScreen
         android:fragment="org.dslul.openboard.inputmethod.latin.settings.PreferencesSettingsFragment"
diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml
index 0df962b8..0dec0555 100644
--- a/app/src/main/res/xml/prefs_screen_advanced.xml
+++ b/app/src/main/res/xml/prefs_screen_advanced.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_advanced"
     android:key="screen_advanced">
     <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->
diff --git a/app/src/main/res/xml/prefs_screen_appearance.xml b/app/src/main/res/xml/prefs_screen_appearance.xml
index e8a54ecd..1060f9d6 100644
--- a/app/src/main/res/xml/prefs_screen_appearance.xml
+++ b/app/src/main/res/xml/prefs_screen_appearance.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:key="screen_appearance"
     android:title="@string/settings_screen_appearance">
     <PreferenceScreen
diff --git a/app/src/main/res/xml/prefs_screen_correction.xml b/app/src/main/res/xml/prefs_screen_correction.xml
index 15f57432..22ff6246 100644
--- a/app/src/main/res/xml/prefs_screen_correction.xml
+++ b/app/src/main/res/xml/prefs_screen_correction.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_correction"
     android:key="screen_correction">
     <PreferenceScreen
diff --git a/app/src/main/res/xml/prefs_screen_debug.xml b/app/src/main/res/xml/prefs_screen_debug.xml
index ec6c24b2..4c91da3a 100644
--- a/app/src/main/res/xml/prefs_screen_debug.xml
+++ b/app/src/main/res/xml/prefs_screen_debug.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/prefs_debug_mode"
     android:key="english_ime_debug_settings"
 >
diff --git a/app/src/main/res/xml/prefs_screen_preferences.xml b/app/src/main/res/xml/prefs_screen_preferences.xml
index 13085c11..0bc69ac4 100644
--- a/app/src/main/res/xml/prefs_screen_preferences.xml
+++ b/app/src/main/res/xml/prefs_screen_preferences.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_preferences">
     <CheckBoxPreference
         android:key="auto_cap"
diff --git a/app/src/main/res/xml/prefs_screen_theme.xml b/app/src/main/res/xml/prefs_screen_theme.xml
index cbdceff4..edad5332 100644
--- a/app/src/main/res/xml/prefs_screen_theme.xml
+++ b/app/src/main/res/xml/prefs_screen_theme.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_theme"
     android:key="screen_theme">
     <!-- Keyboard theme list will be populated programmatically here. -->
diff --git a/app/src/main/res/xml/row_pcqwerty5.xml b/app/src/main/res/xml/row_pcqwerty5.xml
index fc8b4613..accf64d1 100644
--- a/app/src/main/res/xml/row_pcqwerty5.xml
+++ b/app/src/main/res/xml/row_pcqwerty5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="7.692%p"
diff --git a/app/src/main/res/xml/row_qwerty4.xml b/app/src/main/res/xml/row_qwerty4.xml
index 496fc848..15f0b38d 100644
--- a/app/src/main/res/xml/row_qwerty4.xml
+++ b/app/src/main/res/xml/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="10%p"
diff --git a/app/src/main/res/xml/row_symbols4.xml b/app/src/main/res/xml/row_symbols4.xml
index b1d75a75..5d63403d 100644
--- a/app/src/main/res/xml/row_symbols4.xml
+++ b/app/src/main/res/xml/row_symbols4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Key
         latin:keySpec="!text/keyspec_comma" />
     <Key
diff --git a/app/src/main/res/xml/row_symbols_shift4.xml b/app/src/main/res/xml/row_symbols_shift4.xml
index 40e108be..c0e4194c 100644
--- a/app/src/main/res/xml/row_symbols_shift4.xml
+++ b/app/src/main/res/xml/row_symbols_shift4.xml
@@ -17,7 +17,7 @@
 ** limitations under the License.
 */
 -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include
         latin:keyboardLayout="@xml/key_styles_less_greater" />
     <Key
diff --git a/app/src/main/res/xml/rowkeys_arabic1.xml b/app/src/main/res/xml/rowkeys_arabic1.xml
index ed5a5470..21118614 100644
--- a/app/src/main/res/xml/rowkeys_arabic1.xml
+++ b/app/src/main/res/xml/rowkeys_arabic1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+0661: "١" ARABIC-INDIC DIGIT ONE -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_arabic2.xml b/app/src/main/res/xml/rowkeys_arabic2.xml
index 132c79f4..1f0b42f3 100644
--- a/app/src/main/res/xml/rowkeys_arabic2.xml
+++ b/app/src/main/res/xml/rowkeys_arabic2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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 -->
diff --git a/app/src/main/res/xml/rowkeys_arabic3.xml b/app/src/main/res/xml/rowkeys_arabic3.xml
index f390e7a5..c6abfb80 100644
--- a/app/src/main/res/xml/rowkeys_arabic3.xml
+++ b/app/src/main/res/xml/rowkeys_arabic3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/keys_arabic3_left" />
     <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
     <Key latin:keySpec="&#x0621;" />
diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
index 81de8e31..6289d3c1 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
     <Key
         latin:keySpec="&#x0567;"
diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic2.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic2.xml
index 312217c9..174468e5 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH -->
     <Key latin:keySpec="&#x0584;" />
     <!-- U+0578: "ո" ARMENIAN SMALL LETTER VO -->
diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
index 1d91c6cb..fe911b5c 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
     <Key latin:keySpec="&#x0561;" />
     <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic4.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic4.xml
index 95a9bb96..4436dc42 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA -->
     <Key latin:keySpec="&#x0566;" />
     <!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD -->
diff --git a/app/src/main/res/xml/rowkeys_azerty1.xml b/app/src/main/res/xml/rowkeys_azerty1.xml
index 51a94d3f..b5c1171b 100644
--- a/app/src/main/res/xml/rowkeys_azerty1.xml
+++ b/app/src/main/res/xml/rowkeys_azerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_azerty2.xml b/app/src/main/res/xml/rowkeys_azerty2.xml
index 6b2baba8..c03b6b60 100644
--- a/app/src/main/res/xml/rowkeys_azerty2.xml
+++ b/app/src/main/res/xml/rowkeys_azerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q" />
diff --git a/app/src/main/res/xml/rowkeys_azerty3.xml b/app/src/main/res/xml/rowkeys_azerty3.xml
index f3717ff9..5c63569c 100644
--- a/app/src/main/res/xml/rowkeys_azerty3.xml
+++ b/app/src/main/res/xml/rowkeys_azerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="w"
diff --git a/app/src/main/res/xml/rowkeys_bengali1.xml b/app/src/main/res/xml/rowkeys_bengali1.xml
index 95a3ea36..a1530262 100644
--- a/app/src/main/res/xml/rowkeys_bengali1.xml
+++ b/app/src/main/res/xml/rowkeys_bengali1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0994: "ঔ" BENGALI LETTER AU
          U+09CC: "ৌ" BENGALI VOWEL SIGN AU
          U+09E7: "১" BENGALI DIGIT ONE -->
diff --git a/app/src/main/res/xml/rowkeys_bengali2.xml b/app/src/main/res/xml/rowkeys_bengali2.xml
index eb76150a..8908201e 100644
--- a/app/src/main/res/xml/rowkeys_bengali2.xml
+++ b/app/src/main/res/xml/rowkeys_bengali2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0993: "ও" BENGALI LETTER O
          U+09CB: "ো" BENGALI VOWEL SIGN O -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bengali3.xml b/app/src/main/res/xml/rowkeys_bengali3.xml
index f17e157d..12fad6d1 100644
--- a/app/src/main/res/xml/rowkeys_bengali3.xml
+++ b/app/src/main/res/xml/rowkeys_bengali3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU
          U+0983: "ঃ" BENGALI SIGN VISARGA
          U+0982: "ং" BENGALI SIGN ANUSVARA -->
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
index 55670af1..30b09da7 100644
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_akkhor1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+09A2: "ঢ" BENGALI LETTER DDHA -->
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
index 516cc515..743dec0d 100644
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_akkhor2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0985: "অ" BENGALI LETTER A -->
diff --git a/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml b/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
index f3e7aad9..d5bb4d1d 100644
--- a/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
+++ b/app/src/main/res/xml/rowkeys_bengali_akkhor3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0964: "।" DEVANAGARI DANDA
diff --git a/app/src/main/res/xml/rowkeys_bepo1.xml b/app/src/main/res/xml/rowkeys_bepo1.xml
index bb46dd68..9d4decbf 100644
--- a/app/src/main/res/xml/rowkeys_bepo1.xml
+++ b/app/src/main/res/xml/rowkeys_bepo1.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="b"
diff --git a/app/src/main/res/xml/rowkeys_bepo2.xml b/app/src/main/res/xml/rowkeys_bepo2.xml
index af587683..360a0c8b 100644
--- a/app/src/main/res/xml/rowkeys_bepo2.xml
+++ b/app/src/main/res/xml/rowkeys_bepo2.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_bepo3.xml b/app/src/main/res/xml/rowkeys_bepo3.xml
index 92941c9d..a449c62e 100644
--- a/app/src/main/res/xml/rowkeys_bepo3.xml
+++ b/app/src/main/res/xml/rowkeys_bepo3.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="y"
diff --git a/app/src/main/res/xml/rowkeys_bulgarian1.xml b/app/src/main/res/xml/rowkeys_bulgarian1.xml
index 52a0f96f..86e5d477 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian1.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bulgarian2.xml b/app/src/main/res/xml/rowkeys_bulgarian2.xml
index 20bfdbda..f48b4cdc 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian2.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bulgarian3.xml b/app/src/main/res/xml/rowkeys_bulgarian3.xml
index d74a1fd4..c14aabdc 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian3.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bulgarian_bds1.xml b/app/src/main/res/xml/rowkeys_bulgarian_bds1.xml
index c889804c..70fa2b27 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian_bds1.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian_bds1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bulgarian_bds2.xml b/app/src/main/res/xml/rowkeys_bulgarian_bds2.xml
index f7393dd8..e61ee591 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian_bds2.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian_bds2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_bulgarian_bds3.xml b/app/src/main/res/xml/rowkeys_bulgarian_bds3.xml
index 3c07b52f..82f0bfe9 100644
--- a/app/src/main/res/xml/rowkeys_bulgarian_bds3.xml
+++ b/app/src/main/res/xml/rowkeys_bulgarian_bds3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_colemak1.xml b/app/src/main/res/xml/rowkeys_colemak1.xml
index b4d33bf6..33b4ae56 100644
--- a/app/src/main/res/xml/rowkeys_colemak1.xml
+++ b/app/src/main/res/xml/rowkeys_colemak1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q"
diff --git a/app/src/main/res/xml/rowkeys_colemak2.xml b/app/src/main/res/xml/rowkeys_colemak2.xml
index 03c7c493..d405d664 100644
--- a/app/src/main/res/xml/rowkeys_colemak2.xml
+++ b/app/src/main/res/xml/rowkeys_colemak2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_colemak3.xml b/app/src/main/res/xml/rowkeys_colemak3.xml
index bc039f46..d902da4e 100644
--- a/app/src/main/res/xml/rowkeys_colemak3.xml
+++ b/app/src/main/res/xml/rowkeys_colemak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="z"
diff --git a/app/src/main/res/xml/rowkeys_dvorak1.xml b/app/src/main/res/xml/rowkeys_dvorak1.xml
index a2022a7c..edf5bee0 100644
--- a/app/src/main/res/xml/rowkeys_dvorak1.xml
+++ b/app/src/main/res/xml/rowkeys_dvorak1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/keys_dvorak_123" />
diff --git a/app/src/main/res/xml/rowkeys_dvorak2.xml b/app/src/main/res/xml/rowkeys_dvorak2.xml
index d66345b1..cf72c10d 100644
--- a/app/src/main/res/xml/rowkeys_dvorak2.xml
+++ b/app/src/main/res/xml/rowkeys_dvorak2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_dvorak3.xml b/app/src/main/res/xml/rowkeys_dvorak3.xml
index 62266899..3558620b 100644
--- a/app/src/main/res/xml/rowkeys_dvorak3.xml
+++ b/app/src/main/res/xml/rowkeys_dvorak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="j"
diff --git a/app/src/main/res/xml/rowkeys_east_slavic1.xml b/app/src/main/res/xml/rowkeys_east_slavic1.xml
index 08feff37..4147a88a 100644
--- a/app/src/main/res/xml/rowkeys_east_slavic1.xml
+++ b/app/src/main/res/xml/rowkeys_east_slavic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_east_slavic2.xml b/app/src/main/res/xml/rowkeys_east_slavic2.xml
index ec7a8792..478cc8ad 100644
--- a/app/src/main/res/xml/rowkeys_east_slavic2.xml
+++ b/app/src/main/res/xml/rowkeys_east_slavic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_east_slavic3.xml b/app/src/main/res/xml/rowkeys_east_slavic3.xml
index ba4b5a98..affd5457 100644
--- a/app/src/main/res/xml/rowkeys_east_slavic3.xml
+++ b/app/src/main/res/xml/rowkeys_east_slavic3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_farsi1.xml b/app/src/main/res/xml/rowkeys_farsi1.xml
index 86303dab..363c28e2 100644
--- a/app/src/main/res/xml/rowkeys_farsi1.xml
+++ b/app/src/main/res/xml/rowkeys_farsi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_farsi2.xml b/app/src/main/res/xml/rowkeys_farsi2.xml
index 77d5a7f2..bec654d5 100644
--- a/app/src/main/res/xml/rowkeys_farsi2.xml
+++ b/app/src/main/res/xml/rowkeys_farsi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0634: "ش" ARABIC LETTER SHEEN -->
     <Key latin:keySpec="&#x0634;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
diff --git a/app/src/main/res/xml/rowkeys_farsi3.xml b/app/src/main/res/xml/rowkeys_farsi3.xml
index e84b3766..e82a1d5d 100644
--- a/app/src/main/res/xml/rowkeys_farsi3.xml
+++ b/app/src/main/res/xml/rowkeys_farsi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
     <Key latin:keySpec="&#x0638;" />
     <!-- U+0637: "ط" ARABIC LETTER TAH -->
diff --git a/app/src/main/res/xml/rowkeys_georgian1.xml b/app/src/main/res/xml/rowkeys_georgian1.xml
index 24470946..4bdf3488 100644
--- a/app/src/main/res/xml/rowkeys_georgian1.xml
+++ b/app/src/main/res/xml/rowkeys_georgian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_georgian2.xml b/app/src/main/res/xml/rowkeys_georgian2.xml
index f715b08b..1d4b8ae8 100644
--- a/app/src/main/res/xml/rowkeys_georgian2.xml
+++ b/app/src/main/res/xml/rowkeys_georgian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_georgian3.xml b/app/src/main/res/xml/rowkeys_georgian3.xml
index b3c0fd44..106f140a 100644
--- a/app/src/main/res/xml/rowkeys_georgian3.xml
+++ b/app/src/main/res/xml/rowkeys_georgian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_greek1.xml b/app/src/main/res/xml/rowkeys_greek1.xml
index 5b598e6d..9f325553 100644
--- a/app/src/main/res/xml/rowkeys_greek1.xml
+++ b/app/src/main/res/xml/rowkeys_greek1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_greek2.xml b/app/src/main/res/xml/rowkeys_greek2.xml
index c1727a21..a1d607a5 100644
--- a/app/src/main/res/xml/rowkeys_greek2.xml
+++ b/app/src/main/res/xml/rowkeys_greek2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
          U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS -->
diff --git a/app/src/main/res/xml/rowkeys_greek3.xml b/app/src/main/res/xml/rowkeys_greek3.xml
index 645c1cb3..e7f9d8f6 100644
--- a/app/src/main/res/xml/rowkeys_greek3.xml
+++ b/app/src/main/res/xml/rowkeys_greek3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_hebrew1.xml b/app/src/main/res/xml/rowkeys_hebrew1.xml
index 5d92dfac..d55b7cfa 100644
--- a/app/src/main/res/xml/rowkeys_hebrew1.xml
+++ b/app/src/main/res/xml/rowkeys_hebrew1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_hebrew2.xml b/app/src/main/res/xml/rowkeys_hebrew2.xml
index d85a33ca..4c692f12 100644
--- a/app/src/main/res/xml/rowkeys_hebrew2.xml
+++ b/app/src/main/res/xml/rowkeys_hebrew2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_hebrew3.xml b/app/src/main/res/xml/rowkeys_hebrew3.xml
index 4238a03e..6db9bacf 100644
--- a/app/src/main/res/xml/rowkeys_hebrew3.xml
+++ b/app/src/main/res/xml/rowkeys_hebrew3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
          U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
diff --git a/app/src/main/res/xml/rowkeys_hindi1.xml b/app/src/main/res/xml/rowkeys_hindi1.xml
index 25d0fe6c..d1ae4351 100644
--- a/app/src/main/res/xml/rowkeys_hindi1.xml
+++ b/app/src/main/res/xml/rowkeys_hindi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU
diff --git a/app/src/main/res/xml/rowkeys_hindi2.xml b/app/src/main/res/xml/rowkeys_hindi2.xml
index adf9b4b9..57f9d5cd 100644
--- a/app/src/main/res/xml/rowkeys_hindi2.xml
+++ b/app/src/main/res/xml/rowkeys_hindi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O
diff --git a/app/src/main/res/xml/rowkeys_hindi3.xml b/app/src/main/res/xml/rowkeys_hindi3.xml
index fcbf2804..016930a5 100644
--- a/app/src/main/res/xml/rowkeys_hindi3.xml
+++ b/app/src/main/res/xml/rowkeys_hindi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
diff --git a/app/src/main/res/xml/rowkeys_hindi_compact1.xml b/app/src/main/res/xml/rowkeys_hindi_compact1.xml
index 49cd4b91..a8235df9 100644
--- a/app/src/main/res/xml/rowkeys_hindi_compact1.xml
+++ b/app/src/main/res/xml/rowkeys_hindi_compact1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_hindi_compact2.xml b/app/src/main/res/xml/rowkeys_hindi_compact2.xml
index d3f7416f..9d7d795f 100644
--- a/app/src/main/res/xml/rowkeys_hindi_compact2.xml
+++ b/app/src/main/res/xml/rowkeys_hindi_compact2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_hindi_compact3.xml b/app/src/main/res/xml/rowkeys_hindi_compact3.xml
index f76fa16b..41b48081 100644
--- a/app/src/main/res/xml/rowkeys_hindi_compact3.xml
+++ b/app/src/main/res/xml/rowkeys_hindi_compact3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_kannada1.xml b/app/src/main/res/xml/rowkeys_kannada1.xml
index 763baf53..d3f825cb 100644
--- a/app/src/main/res/xml/rowkeys_kannada1.xml
+++ b/app/src/main/res/xml/rowkeys_kannada1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CCC: "ೌ" KANNADA VOWEL SIGN AU
          U+0C94: "ಔ" KANNADA LETTER AU
          U+0CE7: "೧" KANNADA DIGIT ONE -->
diff --git a/app/src/main/res/xml/rowkeys_kannada2.xml b/app/src/main/res/xml/rowkeys_kannada2.xml
index 9d295449..89d2cfc1 100644
--- a/app/src/main/res/xml/rowkeys_kannada2.xml
+++ b/app/src/main/res/xml/rowkeys_kannada2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CCB: "ೋ" KANNADA VOWEL SIGN OO
          U+0C93: "ಓ" KANNADA LETTER OO -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_kannada3.xml b/app/src/main/res/xml/rowkeys_kannada3.xml
index 64e27ceb..8cdaa256 100644
--- a/app/src/main/res/xml/rowkeys_kannada3.xml
+++ b/app/src/main/res/xml/rowkeys_kannada3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CC6: "ೆ" KANNADA VOWEL SIGN E
          U+0C92: "ಒ" KANNADA LETTER O -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_khmer1.xml b/app/src/main/res/xml/rowkeys_khmer1.xml
index 6e8de465..c70b7481 100644
--- a/app/src/main/res/xml/rowkeys_khmer1.xml
+++ b/app/src/main/res/xml/rowkeys_khmer1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+200D: ZERO WIDTH JOINER -->
diff --git a/app/src/main/res/xml/rowkeys_khmer2.xml b/app/src/main/res/xml/rowkeys_khmer2.xml
index 1745a25f..eb45c1fa 100644
--- a/app/src/main/res/xml/rowkeys_khmer2.xml
+++ b/app/src/main/res/xml/rowkeys_khmer2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1788: "ឈ" KHMER LETTER CHO
diff --git a/app/src/main/res/xml/rowkeys_khmer3.xml b/app/src/main/res/xml/rowkeys_khmer3.xml
index ba912ec1..1201c0fe 100644
--- a/app/src/main/res/xml/rowkeys_khmer3.xml
+++ b/app/src/main/res/xml/rowkeys_khmer3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
diff --git a/app/src/main/res/xml/rowkeys_khmer4.xml b/app/src/main/res/xml/rowkeys_khmer4.xml
index 7148d425..8f1ce82e 100644
--- a/app/src/main/res/xml/rowkeys_khmer4.xml
+++ b/app/src/main/res/xml/rowkeys_khmer4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+178D: "ឍ" KHMER LETTER TTHO -->
diff --git a/app/src/main/res/xml/rowkeys_lao1.xml b/app/src/main/res/xml/rowkeys_lao1.xml
index 0a0ccfef..020e4b9f 100644
--- a/app/src/main/res/xml/rowkeys_lao1.xml
+++ b/app/src/main/res/xml/rowkeys_lao1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0ED1: "໑" LAO DIGIT ONE -->
diff --git a/app/src/main/res/xml/rowkeys_lao2.xml b/app/src/main/res/xml/rowkeys_lao2.xml
index b148a951..56b6f26f 100644
--- a/app/src/main/res/xml/rowkeys_lao2.xml
+++ b/app/src/main/res/xml/rowkeys_lao2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
diff --git a/app/src/main/res/xml/rowkeys_lao3.xml b/app/src/main/res/xml/rowkeys_lao3.xml
index 30886f73..f59e0dcd 100644
--- a/app/src/main/res/xml/rowkeys_lao3.xml
+++ b/app/src/main/res/xml/rowkeys_lao3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
diff --git a/app/src/main/res/xml/rowkeys_lao4.xml b/app/src/main/res/xml/rowkeys_lao4.xml
index d62c481f..1b18a120 100644
--- a/app/src/main/res/xml/rowkeys_lao4.xml
+++ b/app/src/main/res/xml/rowkeys_lao4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+20AD: "₭" KIP SIGN -->
diff --git a/app/src/main/res/xml/rowkeys_malayalam1.xml b/app/src/main/res/xml/rowkeys_malayalam1.xml
index bc9512bf..f7d99676 100644
--- a/app/src/main/res/xml/rowkeys_malayalam1.xml
+++ b/app/src/main/res/xml/rowkeys_malayalam1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <!-- U+0D4D: "്" MALAYALAM SIGN VIRAMA
          U+0D05: "അ" MALAYALAM LETTER A -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_malayalam2.xml b/app/src/main/res/xml/rowkeys_malayalam2.xml
index fa9626d3..0c9dd391 100644
--- a/app/src/main/res/xml/rowkeys_malayalam2.xml
+++ b/app/src/main/res/xml/rowkeys_malayalam2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0D15: "ക" MALAYALAM LETTER KA
          U+0D16: "ഖ" MALAYALAM LETTER KHA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_malayalam3.xml b/app/src/main/res/xml/rowkeys_malayalam3.xml
index accde8ea..5485f147 100644
--- a/app/src/main/res/xml/rowkeys_malayalam3.xml
+++ b/app/src/main/res/xml/rowkeys_malayalam3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0D2A: "പ" MALAYALAM LETTER PA
          U+0D2B: "ഫ" MALAYALAM LETTER PHA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_marathi1.xml b/app/src/main/res/xml/rowkeys_marathi1.xml
index 1786cf53..b18042d2 100644
--- a/app/src/main/res/xml/rowkeys_marathi1.xml
+++ b/app/src/main/res/xml/rowkeys_marathi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_marathi2.xml b/app/src/main/res/xml/rowkeys_marathi2.xml
index 544732a4..7517c49a 100644
--- a/app/src/main/res/xml/rowkeys_marathi2.xml
+++ b/app/src/main/res/xml/rowkeys_marathi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_marathi3.xml b/app/src/main/res/xml/rowkeys_marathi3.xml
index 0edc30aa..9529ba1f 100644
--- a/app/src/main/res/xml/rowkeys_marathi3.xml
+++ b/app/src/main/res/xml/rowkeys_marathi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- 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. -->
diff --git a/app/src/main/res/xml/rowkeys_mongolian1.xml b/app/src/main/res/xml/rowkeys_mongolian1.xml
index d8c4f302..14108b40 100644
--- a/app/src/main/res/xml/rowkeys_mongolian1.xml
+++ b/app/src/main/res/xml/rowkeys_mongolian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_mongolian2.xml b/app/src/main/res/xml/rowkeys_mongolian2.xml
index 49b627da..3426771a 100644
--- a/app/src/main/res/xml/rowkeys_mongolian2.xml
+++ b/app/src/main/res/xml/rowkeys_mongolian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_mongolian3.xml b/app/src/main/res/xml/rowkeys_mongolian3.xml
index ad74866e..5300b2ce 100644
--- a/app/src/main/res/xml/rowkeys_mongolian3.xml
+++ b/app/src/main/res/xml/rowkeys_mongolian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_nepali_romanized1.xml b/app/src/main/res/xml/rowkeys_nepali_romanized1.xml
index 89f3ece3..b471f5dd 100644
--- a/app/src/main/res/xml/rowkeys_nepali_romanized1.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_romanized1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
diff --git a/app/src/main/res/xml/rowkeys_nepali_romanized2.xml b/app/src/main/res/xml/rowkeys_nepali_romanized2.xml
index 7f4dc685..2f3ee14c 100644
--- a/app/src/main/res/xml/rowkeys_nepali_romanized2.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_romanized2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
diff --git a/app/src/main/res/xml/rowkeys_nepali_romanized3.xml b/app/src/main/res/xml/rowkeys_nepali_romanized3.xml
index 039717c1..552c9a98 100644
--- a/app/src/main/res/xml/rowkeys_nepali_romanized3.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_romanized3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
diff --git a/app/src/main/res/xml/rowkeys_nepali_traditional1.xml b/app/src/main/res/xml/rowkeys_nepali_traditional1.xml
index becc539c..76159069 100644
--- a/app/src/main/res/xml/rowkeys_nepali_traditional1.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_traditional1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
diff --git a/app/src/main/res/xml/rowkeys_nepali_traditional2.xml b/app/src/main/res/xml/rowkeys_nepali_traditional2.xml
index d50951bb..d55692de 100644
--- a/app/src/main/res/xml/rowkeys_nepali_traditional2.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_traditional2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
diff --git a/app/src/main/res/xml/rowkeys_nepali_traditional3.xml b/app/src/main/res/xml/rowkeys_nepali_traditional3.xml
index f7240e16..1057aac0 100644
--- a/app/src/main/res/xml/rowkeys_nepali_traditional3.xml
+++ b/app/src/main/res/xml/rowkeys_nepali_traditional3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
diff --git a/app/src/main/res/xml/rowkeys_nordic1.xml b/app/src/main/res/xml/rowkeys_nordic1.xml
index 954c23ef..89f4358e 100644
--- a/app/src/main/res/xml/rowkeys_nordic1.xml
+++ b/app/src/main/res/xml/rowkeys_nordic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty1" />
diff --git a/app/src/main/res/xml/rowkeys_nordic2.xml b/app/src/main/res/xml/rowkeys_nordic2.xml
index 198444b9..5cd8152a 100644
--- a/app/src/main/res/xml/rowkeys_nordic2.xml
+++ b/app/src/main/res/xml/rowkeys_nordic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/app/src/main/res/xml/rowkeys_pcqwerty1.xml b/app/src/main/res/xml/rowkeys_pcqwerty1.xml
index 93737bcf..2e4067ff 100644
--- a/app/src/main/res/xml/rowkeys_pcqwerty1.xml
+++ b/app/src/main/res/xml/rowkeys_pcqwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_pcqwerty1_shift.xml b/app/src/main/res/xml/rowkeys_pcqwerty1_shift.xml
index f950f0e6..c925a86b 100644
--- a/app/src/main/res/xml/rowkeys_pcqwerty1_shift.xml
+++ b/app/src/main/res/xml/rowkeys_pcqwerty1_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="~" />
diff --git a/app/src/main/res/xml/rowkeys_pcqwerty2.xml b/app/src/main/res/xml/rowkeys_pcqwerty2.xml
index 15b30de1..781aec8b 100644
--- a/app/src/main/res/xml/rowkeys_pcqwerty2.xml
+++ b/app/src/main/res/xml/rowkeys_pcqwerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and
          some symbols keys. -->
diff --git a/app/src/main/res/xml/rowkeys_pcqwerty3.xml b/app/src/main/res/xml/rowkeys_pcqwerty3.xml
index dadc8a78..f888fe2b 100644
--- a/app/src/main/res/xml/rowkeys_pcqwerty3.xml
+++ b/app/src/main/res/xml/rowkeys_pcqwerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and
          some symbols keys. -->
diff --git a/app/src/main/res/xml/rowkeys_pcqwerty4.xml b/app/src/main/res/xml/rowkeys_pcqwerty4.xml
index f6f8a7a8..7e46828a 100644
--- a/app/src/main/res/xml/rowkeys_pcqwerty4.xml
+++ b/app/src/main/res/xml/rowkeys_pcqwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and
          some symbols keys. -->
diff --git a/app/src/main/res/xml/rowkeys_qwerty1.xml b/app/src/main/res/xml/rowkeys_qwerty1.xml
index fa0a2ba5..35c34fad 100644
--- a/app/src/main/res/xml/rowkeys_qwerty1.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- q,w,e,r,t -->
     <include
diff --git a/app/src/main/res/xml/rowkeys_qwerty1_left5.xml b/app/src/main/res/xml/rowkeys_qwerty1_left5.xml
index cb351caf..3655e388 100644
--- a/app/src/main/res/xml/rowkeys_qwerty1_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty1_left5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_q"
diff --git a/app/src/main/res/xml/rowkeys_qwerty1_right5.xml b/app/src/main/res/xml/rowkeys_qwerty1_right5.xml
index 25550d81..5fb548bd 100644
--- a/app/src/main/res/xml/rowkeys_qwerty1_right5.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty1_right5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_y"
diff --git a/app/src/main/res/xml/rowkeys_qwerty2.xml b/app/src/main/res/xml/rowkeys_qwerty2.xml
index 465bddf6..794bb82a 100644
--- a/app/src/main/res/xml/rowkeys_qwerty2.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- a,s,d,f,g -->
     <include
diff --git a/app/src/main/res/xml/rowkeys_qwerty2_left5.xml b/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
index 0ac062d4..7d470306 100644
--- a/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_qwerty2_right4.xml b/app/src/main/res/xml/rowkeys_qwerty2_right4.xml
index 7ab21bdd..2bd49f56 100644
--- a/app/src/main/res/xml/rowkeys_qwerty2_right4.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty2_right4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="h"
diff --git a/app/src/main/res/xml/rowkeys_qwerty3.xml b/app/src/main/res/xml/rowkeys_qwerty3.xml
index bacf70be..97f46b74 100644
--- a/app/src/main/res/xml/rowkeys_qwerty3.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- z,x,c,v -->
     <include
diff --git a/app/src/main/res/xml/rowkeys_qwerty3_left4.xml b/app/src/main/res/xml/rowkeys_qwerty3_left4.xml
index 5b007b3a..524cc0ad 100644
--- a/app/src/main/res/xml/rowkeys_qwerty3_left4.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty3_left4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="z"
diff --git a/app/src/main/res/xml/rowkeys_qwerty3_right3.xml b/app/src/main/res/xml/rowkeys_qwerty3_right3.xml
index 409a01e6..3fea623b 100644
--- a/app/src/main/res/xml/rowkeys_qwerty3_right3.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty3_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="b"
diff --git a/app/src/main/res/xml/rowkeys_qwertz1.xml b/app/src/main/res/xml/rowkeys_qwertz1.xml
index 18a48305..28f6a2c7 100644
--- a/app/src/main/res/xml/rowkeys_qwertz1.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q"
diff --git a/app/src/main/res/xml/rowkeys_qwertz2.xml b/app/src/main/res/xml/rowkeys_qwertz2.xml
index cfde51a5..9437dfe9 100644
--- a/app/src/main/res/xml/rowkeys_qwertz2.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- a,s,d,f,g -->
     <include
diff --git a/app/src/main/res/xml/rowkeys_qwertz2_left5.xml b/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
index 355d78fb..317c863f 100644
--- a/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/app/src/main/res/xml/rowkeys_qwertz2_right4.xml b/app/src/main/res/xml/rowkeys_qwertz2_right4.xml
index 7ab21bdd..2bd49f56 100644
--- a/app/src/main/res/xml/rowkeys_qwertz2_right4.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz2_right4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="h"
diff --git a/app/src/main/res/xml/rowkeys_qwertz3.xml b/app/src/main/res/xml/rowkeys_qwertz3.xml
index a1d7bb73..027f2b41 100644
--- a/app/src/main/res/xml/rowkeys_qwertz3.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="y"
diff --git a/app/src/main/res/xml/rowkeys_serbian_qwertz1.xml b/app/src/main/res/xml/rowkeys_serbian_qwertz1.xml
index 84a497f8..4cc58cac 100644
--- a/app/src/main/res/xml/rowkeys_serbian_qwertz1.xml
+++ b/app/src/main/res/xml/rowkeys_serbian_qwertz1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwertz1" />
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
     <Key latin:keySpec="&#x0161;" />
diff --git a/app/src/main/res/xml/rowkeys_serbian_qwertz2.xml b/app/src/main/res/xml/rowkeys_serbian_qwertz2.xml
index 309e7e6d..b008f805 100644
--- a/app/src/main/res/xml/rowkeys_serbian_qwertz2.xml
+++ b/app/src/main/res/xml/rowkeys_serbian_qwertz2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
     <Key latin:keySpec="&#x010D;" />
diff --git a/app/src/main/res/xml/rowkeys_serbian_qwertz3.xml b/app/src/main/res/xml/rowkeys_serbian_qwertz3.xml
index 7caa2d9e..8bf69d90 100644
--- a/app/src/main/res/xml/rowkeys_serbian_qwertz3.xml
+++ b/app/src/main/res/xml/rowkeys_serbian_qwertz3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwertz3" />
     <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
     <Key latin:keySpec="&#x0111;" />
diff --git a/app/src/main/res/xml/rowkeys_sinhala1.xml b/app/src/main/res/xml/rowkeys_sinhala1.xml
index baf39d26..8affb37a 100644
--- a/app/src/main/res/xml/rowkeys_sinhala1.xml
+++ b/app/src/main/res/xml/rowkeys_sinhala1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
diff --git a/app/src/main/res/xml/rowkeys_sinhala2.xml b/app/src/main/res/xml/rowkeys_sinhala2.xml
index a0d5cd45..1e1fffc1 100644
--- a/app/src/main/res/xml/rowkeys_sinhala2.xml
+++ b/app/src/main/res/xml/rowkeys_sinhala2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DDF: "ෟ" SINHALA VOWEL SIGN GAYANUKITTA -->
diff --git a/app/src/main/res/xml/rowkeys_sinhala3.xml b/app/src/main/res/xml/rowkeys_sinhala3.xml
index 36330ebe..fae9f5ef 100644
--- a/app/src/main/res/xml/rowkeys_sinhala3.xml
+++ b/app/src/main/res/xml/rowkeys_sinhala3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
diff --git a/app/src/main/res/xml/rowkeys_south_slavic1.xml b/app/src/main/res/xml/rowkeys_south_slavic1.xml
index e39a67d0..a289bfa0 100644
--- a/app/src/main/res/xml/rowkeys_south_slavic1.xml
+++ b/app/src/main/res/xml/rowkeys_south_slavic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_south_slavic2.xml b/app/src/main/res/xml/rowkeys_south_slavic2.xml
index 4be63790..4a5e67dc 100644
--- a/app/src/main/res/xml/rowkeys_south_slavic2.xml
+++ b/app/src/main/res/xml/rowkeys_south_slavic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_south_slavic3.xml b/app/src/main/res/xml/rowkeys_south_slavic3.xml
index 597a3859..de580b2a 100644
--- a/app/src/main/res/xml/rowkeys_south_slavic3.xml
+++ b/app/src/main/res/xml/rowkeys_south_slavic3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_south_slavic_row3_1" />
diff --git a/app/src/main/res/xml/rowkeys_spanish2.xml b/app/src/main/res/xml/rowkeys_spanish2.xml
index aa0dfff4..8866d327 100644
--- a/app/src/main/res/xml/rowkeys_spanish2.xml
+++ b/app/src/main/res/xml/rowkeys_spanish2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/app/src/main/res/xml/rowkeys_swiss1.xml b/app/src/main/res/xml/rowkeys_swiss1.xml
index 62bb86f1..9c8e3bb7 100644
--- a/app/src/main/res/xml/rowkeys_swiss1.xml
+++ b/app/src/main/res/xml/rowkeys_swiss1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwertz1" />
diff --git a/app/src/main/res/xml/rowkeys_swiss2.xml b/app/src/main/res/xml/rowkeys_swiss2.xml
index 4ed3d62e..b4f2c8eb 100644
--- a/app/src/main/res/xml/rowkeys_swiss2.xml
+++ b/app/src/main/res/xml/rowkeys_swiss2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/app/src/main/res/xml/rowkeys_symbols1.xml b/app/src/main/res/xml/rowkeys_symbols1.xml
index 90237f5c..93937cff 100644
--- a/app/src/main/res/xml/rowkeys_symbols1.xml
+++ b/app/src/main/res/xml/rowkeys_symbols1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_symbols_1"
diff --git a/app/src/main/res/xml/rowkeys_symbols2.xml b/app/src/main/res/xml/rowkeys_symbols2.xml
index 55a1806c..40d4817b 100644
--- a/app/src/main/res/xml/rowkeys_symbols2.xml
+++ b/app/src/main/res/xml/rowkeys_symbols2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/app/src/main/res/xml/rowkeys_symbols3.xml b/app/src/main/res/xml/rowkeys_symbols3.xml
index 29490e00..57e06f54 100644
--- a/app/src/main/res/xml/rowkeys_symbols3.xml
+++ b/app/src/main/res/xml/rowkeys_symbols3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="*"
diff --git a/app/src/main/res/xml/rowkeys_symbols_shift1.xml b/app/src/main/res/xml/rowkeys_symbols_shift1.xml
index abc29f77..93992091 100644
--- a/app/src/main/res/xml/rowkeys_symbols_shift1.xml
+++ b/app/src/main/res/xml/rowkeys_symbols_shift1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="~" />
diff --git a/app/src/main/res/xml/rowkeys_symbols_shift2.xml b/app/src/main/res/xml/rowkeys_symbols_shift2.xml
index e6565b48..990a9504 100644
--- a/app/src/main/res/xml/rowkeys_symbols_shift2.xml
+++ b/app/src/main/res/xml/rowkeys_symbols_shift2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="moreCurrency1KeyStyle" />
diff --git a/app/src/main/res/xml/rowkeys_symbols_shift3.xml b/app/src/main/res/xml/rowkeys_symbols_shift3.xml
index d3277547..4d1818e4 100644
--- a/app/src/main/res/xml/rowkeys_symbols_shift3.xml
+++ b/app/src/main/res/xml/rowkeys_symbols_shift3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="\\" />
diff --git a/app/src/main/res/xml/rowkeys_tamil1.xml b/app/src/main/res/xml/rowkeys_tamil1.xml
index 9b3423d5..8f723bdb 100644
--- a/app/src/main/res/xml/rowkeys_tamil1.xml
+++ b/app/src/main/res/xml/rowkeys_tamil1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B94: "ஔ" TAMIL LETTER AU
          U+0BCC: "ௌ" TAMIL VOWEL SIGN AU -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_tamil2.xml b/app/src/main/res/xml/rowkeys_tamil2.xml
index d8143e47..ccf98b36 100644
--- a/app/src/main/res/xml/rowkeys_tamil2.xml
+++ b/app/src/main/res/xml/rowkeys_tamil2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B93: "ஓ" TAMIL LETTER OO
          U+0BCB: "ோ" TAMIL VOWEL SIGN OO
          U+0BD0: "ௐ" TAMIL OM -->
diff --git a/app/src/main/res/xml/rowkeys_tamil3.xml b/app/src/main/res/xml/rowkeys_tamil3.xml
index d1f591be..281314dd 100644
--- a/app/src/main/res/xml/rowkeys_tamil3.xml
+++ b/app/src/main/res/xml/rowkeys_tamil3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B92: "ஒ" TAMIL LETTER O
          U+0BCA: "ொ" TAMIL VOWEL SIGN O -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_telugu1.xml b/app/src/main/res/xml/rowkeys_telugu1.xml
index 7f46886c..20bc695b 100644
--- a/app/src/main/res/xml/rowkeys_telugu1.xml
+++ b/app/src/main/res/xml/rowkeys_telugu1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4C: "ౌ" TELUGU VOWEL SIGN AU
          U+0C14: "ఔ" TELUGU LETTER AU -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_telugu2.xml b/app/src/main/res/xml/rowkeys_telugu2.xml
index d3d669a5..c3c4a6b8 100644
--- a/app/src/main/res/xml/rowkeys_telugu2.xml
+++ b/app/src/main/res/xml/rowkeys_telugu2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4B: "ో" TELUGU VOWEL SIGN OO
          U+0C13: "ఓ" TELUGU LETTER OO -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_telugu3.xml b/app/src/main/res/xml/rowkeys_telugu3.xml
index 97b2b86a..e42eaa50 100644
--- a/app/src/main/res/xml/rowkeys_telugu3.xml
+++ b/app/src/main/res/xml/rowkeys_telugu3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4A: "ొ" TELUGU VOWEL SIGN O
          U+0C12: "ఒ" TELUGU LETTER O -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_thai1.xml b/app/src/main/res/xml/rowkeys_thai1.xml
index e32c7b05..2211994b 100644
--- a/app/src/main/res/xml/rowkeys_thai1.xml
+++ b/app/src/main/res/xml/rowkeys_thai1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
diff --git a/app/src/main/res/xml/rowkeys_thai2.xml b/app/src/main/res/xml/rowkeys_thai2.xml
index c798a0d9..4aee1cd1 100644
--- a/app/src/main/res/xml/rowkeys_thai2.xml
+++ b/app/src/main/res/xml/rowkeys_thai2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E50: "๐" THAI DIGIT ZERO -->
diff --git a/app/src/main/res/xml/rowkeys_thai3.xml b/app/src/main/res/xml/rowkeys_thai3.xml
index 96953e85..fd219133 100644
--- a/app/src/main/res/xml/rowkeys_thai3.xml
+++ b/app/src/main/res/xml/rowkeys_thai3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
diff --git a/app/src/main/res/xml/rowkeys_thai4.xml b/app/src/main/res/xml/rowkeys_thai4.xml
index 9ab02070..3e70d7e8 100644
--- a/app/src/main/res/xml/rowkeys_thai4.xml
+++ b/app/src/main/res/xml/rowkeys_thai4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
diff --git a/app/src/main/res/xml/rowkeys_uzbek1.xml b/app/src/main/res/xml/rowkeys_uzbek1.xml
index 80b84470..1a12d337 100644
--- a/app/src/main/res/xml/rowkeys_uzbek1.xml
+++ b/app/src/main/res/xml/rowkeys_uzbek1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty1" />
     <!-- U+006F/U+02BB: "oʻ" LATIN SMALL LETTER O/MODIFIER LETTER TURNED COMMA -->
     <Key
diff --git a/app/src/main/res/xml/rowkeys_uzbek2.xml b/app/src/main/res/xml/rowkeys_uzbek2.xml
index 32c47bcb..171482b6 100644
--- a/app/src/main/res/xml/rowkeys_uzbek2.xml
+++ b/app/src/main/res/xml/rowkeys_uzbek2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <!-- U+0067/U+02BB: "gʻ" LATIN SMALL LETTER G/MODIFIER LETTER TURNED COMMA -->
     <Key
diff --git a/app/src/main/res/xml/rows_arabic.xml b/app/src/main/res/xml/rows_arabic.xml
index 48a0d051..cff4a153 100644
--- a/app/src/main/res/xml/rows_arabic.xml
+++ b/app/src/main/res/xml/rows_arabic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_armenian_phonetic.xml b/app/src/main/res/xml/rows_armenian_phonetic.xml
index 504f31b2..d997f12d 100644
--- a/app/src/main/res/xml/rows_armenian_phonetic.xml
+++ b/app/src/main/res/xml/rows_armenian_phonetic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
diff --git a/app/src/main/res/xml/rows_azerty.xml b/app/src/main/res/xml/rows_azerty.xml
index 33f77003..13bc2592 100644
--- a/app/src/main/res/xml/rows_azerty.xml
+++ b/app/src/main/res/xml/rows_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_bengali.xml b/app/src/main/res/xml/rows_bengali.xml
index bee3f59b..e4a4b922 100644
--- a/app/src/main/res/xml/rows_bengali.xml
+++ b/app/src/main/res/xml/rows_bengali.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_bengali_akkhor.xml b/app/src/main/res/xml/rows_bengali_akkhor.xml
index bc9ec963..6ace8003 100644
--- a/app/src/main/res/xml/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml/rows_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_bepo.xml b/app/src/main/res/xml/rows_bepo.xml
index 28ef41b7..6e97fea3 100644
--- a/app/src/main/res/xml/rows_bepo.xml
+++ b/app/src/main/res/xml/rows_bepo.xml
@@ -14,7 +14,7 @@
      limitations under the License.
  -->
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_bulgarian.xml b/app/src/main/res/xml/rows_bulgarian.xml
index 5dc79ec6..9f892e07 100644
--- a/app/src/main/res/xml/rows_bulgarian.xml
+++ b/app/src/main/res/xml/rows_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_bulgarian_bds.xml b/app/src/main/res/xml/rows_bulgarian_bds.xml
index ccc62f84..871e73ba 100644
--- a/app/src/main/res/xml/rows_bulgarian_bds.xml
+++ b/app/src/main/res/xml/rows_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_colemak.xml b/app/src/main/res/xml/rows_colemak.xml
index d62cd941..6b036521 100644
--- a/app/src/main/res/xml/rows_colemak.xml
+++ b/app/src/main/res/xml/rows_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_dvorak.xml b/app/src/main/res/xml/rows_dvorak.xml
index eef1bcf1..3a2be744 100644
--- a/app/src/main/res/xml/rows_dvorak.xml
+++ b/app/src/main/res/xml/rows_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_east_slavic.xml b/app/src/main/res/xml/rows_east_slavic.xml
index 12d9d955..deed0675 100644
--- a/app/src/main/res/xml/rows_east_slavic.xml
+++ b/app/src/main/res/xml/rows_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_farsi.xml b/app/src/main/res/xml/rows_farsi.xml
index a58821ca..4c24772b 100644
--- a/app/src/main/res/xml/rows_farsi.xml
+++ b/app/src/main/res/xml/rows_farsi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_georgian.xml b/app/src/main/res/xml/rows_georgian.xml
index 527ee929..45510768 100644
--- a/app/src/main/res/xml/rows_georgian.xml
+++ b/app/src/main/res/xml/rows_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_greek.xml b/app/src/main/res/xml/rows_greek.xml
index 1f968369..90621916 100644
--- a/app/src/main/res/xml/rows_greek.xml
+++ b/app/src/main/res/xml/rows_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_hebrew.xml b/app/src/main/res/xml/rows_hebrew.xml
index e7961962..aa2d2f14 100644
--- a/app/src/main/res/xml/rows_hebrew.xml
+++ b/app/src/main/res/xml/rows_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_hindi.xml b/app/src/main/res/xml/rows_hindi.xml
index d67d1e50..c6b6135c 100644
--- a/app/src/main/res/xml/rows_hindi.xml
+++ b/app/src/main/res/xml/rows_hindi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_hindi_compact.xml b/app/src/main/res/xml/rows_hindi_compact.xml
index bc07c301..5055c412 100644
--- a/app/src/main/res/xml/rows_hindi_compact.xml
+++ b/app/src/main/res/xml/rows_hindi_compact.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_kannada.xml b/app/src/main/res/xml/rows_kannada.xml
index d3c3095b..ccc78283 100644
--- a/app/src/main/res/xml/rows_kannada.xml
+++ b/app/src/main/res/xml/rows_kannada.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_khmer.xml b/app/src/main/res/xml/rows_khmer.xml
index ba7d5539..0347bad6 100644
--- a/app/src/main/res/xml/rows_khmer.xml
+++ b/app/src/main/res/xml/rows_khmer.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/app/src/main/res/xml/rows_lao.xml b/app/src/main/res/xml/rows_lao.xml
index de2e7a1b..f1fbaca3 100644
--- a/app/src/main/res/xml/rows_lao.xml
+++ b/app/src/main/res/xml/rows_lao.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/app/src/main/res/xml/rows_malayalam.xml b/app/src/main/res/xml/rows_malayalam.xml
index 0af1a851..5bbae944 100644
--- a/app/src/main/res/xml/rows_malayalam.xml
+++ b/app/src/main/res/xml/rows_malayalam.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_marathi.xml b/app/src/main/res/xml/rows_marathi.xml
index e1064903..1f9aa274 100644
--- a/app/src/main/res/xml/rows_marathi.xml
+++ b/app/src/main/res/xml/rows_marathi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_mongolian.xml b/app/src/main/res/xml/rows_mongolian.xml
index dcbe4165..7eb19418 100644
--- a/app/src/main/res/xml/rows_mongolian.xml
+++ b/app/src/main/res/xml/rows_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_nepali_romanized.xml b/app/src/main/res/xml/rows_nepali_romanized.xml
index 42419835..3e0f9d2f 100644
--- a/app/src/main/res/xml/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml/rows_nepali_romanized.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_nepali_traditional.xml b/app/src/main/res/xml/rows_nepali_traditional.xml
index f4465a31..deb42b67 100644
--- a/app/src/main/res/xml/rows_nepali_traditional.xml
+++ b/app/src/main/res/xml/rows_nepali_traditional.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
diff --git a/app/src/main/res/xml/rows_nordic.xml b/app/src/main/res/xml/rows_nordic.xml
index be15eaf6..083af21e 100644
--- a/app/src/main/res/xml/rows_nordic.xml
+++ b/app/src/main/res/xml/rows_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_number.xml b/app/src/main/res/xml/rows_number.xml
index 5e5e4548..0312b04a 100644
--- a/app/src/main/res/xml/rows_number.xml
+++ b/app/src/main/res/xml/rows_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_number_normal.xml b/app/src/main/res/xml/rows_number_normal.xml
index 21ce5d63..dbe77f17 100644
--- a/app/src/main/res/xml/rows_number_normal.xml
+++ b/app/src/main/res/xml/rows_number_normal.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <Key
diff --git a/app/src/main/res/xml/rows_number_password.xml b/app/src/main/res/xml/rows_number_password.xml
index 97d2a35a..a59b8ef7 100644
--- a/app/src/main/res/xml/rows_number_password.xml
+++ b/app/src/main/res/xml/rows_number_password.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
diff --git a/app/src/main/res/xml/rows_pcqwerty.xml b/app/src/main/res/xml/rows_pcqwerty.xml
index 5efc6c9d..2417fc9b 100644
--- a/app/src/main/res/xml/rows_pcqwerty.xml
+++ b/app/src/main/res/xml/rows_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_phone.xml b/app/src/main/res/xml/rows_phone.xml
index 8aa86519..3ac9acf9 100644
--- a/app/src/main/res/xml/rows_phone.xml
+++ b/app/src/main/res/xml/rows_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_phone_symbols.xml b/app/src/main/res/xml/rows_phone_symbols.xml
index 859664ff..e8ca7f0c 100644
--- a/app/src/main/res/xml/rows_phone_symbols.xml
+++ b/app/src/main/res/xml/rows_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_qwerty.xml b/app/src/main/res/xml/rows_qwerty.xml
index 9016e478..41e410fa 100644
--- a/app/src/main/res/xml/rows_qwerty.xml
+++ b/app/src/main/res/xml/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_qwertz.xml b/app/src/main/res/xml/rows_qwertz.xml
index 8a7b395a..1104a2f8 100644
--- a/app/src/main/res/xml/rows_qwertz.xml
+++ b/app/src/main/res/xml/rows_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_serbian_qwertz.xml b/app/src/main/res/xml/rows_serbian_qwertz.xml
index 23c3c85a..5dd2a92d 100644
--- a/app/src/main/res/xml/rows_serbian_qwertz.xml
+++ b/app/src/main/res/xml/rows_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
diff --git a/app/src/main/res/xml/rows_sinhala.xml b/app/src/main/res/xml/rows_sinhala.xml
index 201fd3ae..13d583a3 100644
--- a/app/src/main/res/xml/rows_sinhala.xml
+++ b/app/src/main/res/xml/rows_sinhala.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_south_slavic.xml b/app/src/main/res/xml/rows_south_slavic.xml
index 60185ce8..f46c457a 100644
--- a/app/src/main/res/xml/rows_south_slavic.xml
+++ b/app/src/main/res/xml/rows_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_spanish.xml b/app/src/main/res/xml/rows_spanish.xml
index 4c5ffc3b..9234fddb 100644
--- a/app/src/main/res/xml/rows_spanish.xml
+++ b/app/src/main/res/xml/rows_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_swiss.xml b/app/src/main/res/xml/rows_swiss.xml
index 2e223514..459c07f8 100644
--- a/app/src/main/res/xml/rows_swiss.xml
+++ b/app/src/main/res/xml/rows_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_symbols.xml b/app/src/main/res/xml/rows_symbols.xml
index eb8746ee..fcedf05b 100644
--- a/app/src/main/res/xml/rows_symbols.xml
+++ b/app/src/main/res/xml/rows_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_symbols_shift.xml b/app/src/main/res/xml/rows_symbols_shift.xml
index 318ec430..28646375 100644
--- a/app/src/main/res/xml/rows_symbols_shift.xml
+++ b/app/src/main/res/xml/rows_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/app/src/main/res/xml/rows_tamil.xml b/app/src/main/res/xml/rows_tamil.xml
index d7242997..e0dc48cc 100644
--- a/app/src/main/res/xml/rows_tamil.xml
+++ b/app/src/main/res/xml/rows_tamil.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_telugu.xml b/app/src/main/res/xml/rows_telugu.xml
index 11d8b884..5ce333fc 100644
--- a/app/src/main/res/xml/rows_telugu.xml
+++ b/app/src/main/res/xml/rows_telugu.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/app/src/main/res/xml/rows_thai.xml b/app/src/main/res/xml/rows_thai.xml
index 067822ca..ef56a9a8 100644
--- a/app/src/main/res/xml/rows_thai.xml
+++ b/app/src/main/res/xml/rows_thai.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/app/src/main/res/xml/rows_uzbek.xml b/app/src/main/res/xml/rows_uzbek.xml
index 14fd469b..fbbdba36 100644
--- a/app/src/main/res/xml/rows_uzbek.xml
+++ b/app/src/main/res/xml/rows_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/org.dslul.openboard.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />