diff --git a/res/xml-sw600dp/rowkeys_dvorak3.xml b/res/xml-sw600dp/rowkeys_dvorak3.xml
index 27e90de..c8edb03 100644
--- a/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
-    <Key latin:keyLabel="q" />
-    <Key latin:moreKeys="!text/more_keys_for_j" latin:keyLabel="j" />
-    <Key latin:moreKeys="!text/more_keys_for_k" latin:keyLabel="k" />
+    <Key latin:moreKeys="!text/more_keys_for_y" latin:keyLabel="y" />
     <Key latin:keyLabel="x" />
-    <Key latin:keyLabel="b" />
-    <Key latin:keyLabel="m" />
-    <Key latin:moreKeys="!text/more_keys_for_w" latin:keyLabel="w" />
-    <Key latin:moreKeys="!text/more_keys_for_v" latin:keyLabel="v" />
-    <Key latin:moreKeys="!text/more_keys_for_z" latin:keyLabel="z" />
+    <Key latin:moreKeys="!text/more_keys_for_k" latin:keyLabel="k" />
+    <Key latin:keyLabel="q" />
+    <Key latin:moreKeys="!text/more_keys_for_g" latin:keyLabel="g" />
+    <Key latin:moreKeys="!text/more_keys_for_h" latin:keyLabel="h" />
+    <Key latin:keyLabel="f" />
 </merge>
\ No newline at end of file
diff --git a/res/xml-sw600dp/rows_dvorak.xml b/res/xml-sw600dp/rows_dvorak.xml
index 7eda0f5..1f47466 100644
--- a/res/xml-sw600dp/rows_dvorak.xml
+++ b/res/xml-sw600dp/rows_dvorak.xml
@@ -3,7 +3,6 @@
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="9.000004%p">
-        <include latin:keyboardLayout="@xml/keys_dvorak_123" />
         <include latin:keyLabelFlags="disableKeyHintLabel|disableAdditionalMoreKeys" latin:keyboardLayout="@xml/rowkeys_dvorak1" />
         <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" />
     </Row>
@@ -14,7 +13,8 @@
     <Row latin:keyWidth="9.000004%p">
         <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.000002%p" />
         <include latin:keyboardLayout="@xml/rowkeys_dvorak3" />
+		<include latin:keyboardLayout="@xml/keys_comma_period" />
         <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="fillRight" />
     </Row>
-    <include latin:keyboardLayout="@xml/row_dvorak4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
\ No newline at end of file
diff --git a/res/xml-sw768dp/rows_dvorak.xml b/res/xml-sw768dp/rows_dvorak.xml
index f88dc19..31410bb 100644
--- a/res/xml-sw768dp/rows_dvorak.xml
+++ b/res/xml-sw768dp/rows_dvorak.xml
@@ -4,7 +4,6 @@
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="8.281994%p">
         <Key latin:keyLabelFlags="alignLeft" latin:keyStyle="tabKeyStyle" latin:keyWidth="7.968998%p" />
-        <include latin:keyboardLayout="@xml/keys_dvorak_123" />
         <include latin:keyLabelFlags="disableKeyHintLabel|disableAdditionalMoreKeys" latin:keyboardLayout="@xml/rowkeys_dvorak1" />
         <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" />
     </Row>
@@ -16,7 +15,8 @@
     <Row latin:keyWidth="8.046997%p">
         <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="13.829004%p" />
         <include latin:keyboardLayout="@xml/rowkeys_dvorak3" />
+		<include latin:keyboardLayout="@xml/keys_comma_period" />
         <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="fillRight" />
     </Row>
-    <include latin:keyboardLayout="@xml/row_dvorak4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
\ No newline at end of file
diff --git a/res/xml/rowkeys_dvorak1.xml b/res/xml/rowkeys_dvorak1.xml
index ace8523..6c7cdf5 100644
--- a/res/xml/rowkeys_dvorak1.xml
+++ b/res/xml/rowkeys_dvorak1.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
-    <Key latin:additionalMoreKeys="4" latin:keyLabel="p" latin:keyHintLabel="4" />
-    <Key latin:moreKeys="!text/more_keys_for_y" latin:additionalMoreKeys="5" latin:keyLabel="y" latin:keyHintLabel="5" />
-    <Key latin:additionalMoreKeys="6" latin:keyLabel="f" latin:keyHintLabel="6" />
-    <Key latin:moreKeys="!text/more_keys_for_g" latin:additionalMoreKeys="7" latin:keyLabel="g" latin:keyHintLabel="7" />
-    <Key latin:moreKeys="!text/more_keys_for_c" latin:additionalMoreKeys="8" latin:keyLabel="c" latin:keyHintLabel="8" />
-    <Key latin:moreKeys="!text/more_keys_for_r" latin:additionalMoreKeys="9" latin:keyLabel="r" latin:keyHintLabel="9" />
-    <Key latin:moreKeys="!text/more_keys_for_l" latin:additionalMoreKeys="0" latin:keyLabel="l" latin:keyHintLabel="0" />
+    <Key latin:additionalMoreKeys="1" latin:keyLabel="b" latin:keyHintLabel="1" />
+    <Key latin:moreKeys="!text/more_keys_for_e" latin:additionalMoreKeys="2" latin:keyLabel="├®" latin:keyHintLabel="2" />
+    <Key latin:additionalMoreKeys="3" latin:keyLabel="p" latin:keyHintLabel="3" />
+    <Key latin:moreKeys="!text/more_keys_for_o" latin:additionalMoreKeys="4" latin:keyLabel="o" latin:keyHintLabel="4" />
+    <Key latin:moreKeys="!text/more_keys_for_w" latin:additionalMoreKeys="5" latin:keyLabel="w" latin:keyHintLabel="5" />
+    <Key latin:moreKeys="!text/more_keys_for_z" latin:additionalMoreKeys="6" latin:keyLabel="z" latin:keyHintLabel="6" />
+    <Key latin:moreKeys="!text/more_keys_for_v" latin:additionalMoreKeys="7" latin:keyLabel="v" latin:keyHintLabel="7" />
+    <Key latin:moreKeys="!text/more_keys_for_d" latin:additionalMoreKeys="8" latin:keyLabel="d" latin:keyHintLabel="8" />
+    <Key latin:moreKeys="!text/more_keys_for_l" latin:additionalMoreKeys="9" latin:keyLabel="l" latin:keyHintLabel="9" />
+    <Key latin:moreKeys="!text/more_keys_for_j" latin:additionalMoreKeys="0" latin:keyLabel="j" latin:keyHintLabel="0" />
 </merge>
\ No newline at end of file
diff --git a/res/xml/rowkeys_dvorak2.xml b/res/xml/rowkeys_dvorak2.xml
index eea0e57..fbb81e5 100644
--- a/res/xml/rowkeys_dvorak2.xml
+++ b/res/xml/rowkeys_dvorak2.xml
@@ -2,13 +2,13 @@
 <merge
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <Key latin:moreKeys="!text/more_keys_for_a" latin:keyLabel="a" />
-    <Key latin:moreKeys="!text/more_keys_for_o" latin:keyLabel="o" />
-    <Key latin:moreKeys="!text/more_keys_for_e" latin:keyLabel="e" />
     <Key latin:moreKeys="!text/more_keys_for_u" latin:keyLabel="u" />
     <Key latin:moreKeys="!text/more_keys_for_i" latin:keyLabel="i" />
-    <Key latin:moreKeys="!text/more_keys_for_d" latin:keyLabel="d" />
-    <Key latin:moreKeys="!text/more_keys_for_h" latin:keyLabel="h" />
+    <Key latin:moreKeys="!text/more_keys_for_e" latin:keyLabel="e" />
+    <Key latin:moreKeys="!text/more_keys_for_c" latin:keyLabel="c" />
     <Key latin:moreKeys="!text/more_keys_for_t" latin:keyLabel="t" />
-    <Key latin:moreKeys="!text/more_keys_for_n" latin:keyLabel="n" />
     <Key latin:moreKeys="!text/more_keys_for_s" latin:keyLabel="s" />
+	<Key latin:moreKeys="!text/more_keys_for_r" latin:keyLabel="r" />
+    <Key latin:moreKeys="!text/more_keys_for_n" latin:keyLabel="n" />
+	<Key latin:keyLabel="m" />
 </merge>
\ No newline at end of file
diff --git a/res/xml/rowkeys_dvorak3.xml b/res/xml/rowkeys_dvorak3.xml
index d438a3a..c8edb03 100644
--- a/res/xml/rowkeys_dvorak3.xml
+++ b/res/xml/rowkeys_dvorak3.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
-    <Key latin:moreKeys="!text/more_keys_for_j" latin:keyLabel="j" />
-    <Key latin:moreKeys="!text/more_keys_for_k" latin:keyLabel="k" />
+    <Key latin:moreKeys="!text/more_keys_for_y" latin:keyLabel="y" />
     <Key latin:keyLabel="x" />
-    <Key latin:keyLabel="b" />
-    <Key latin:keyLabel="m" />
-    <Key latin:moreKeys="!text/more_keys_for_w" latin:keyLabel="w" />
-    <Key latin:moreKeys="!text/more_keys_for_v" latin:keyLabel="v" />
+    <Key latin:moreKeys="!text/more_keys_for_k" latin:keyLabel="k" />
+    <Key latin:keyLabel="q" />
+    <Key latin:moreKeys="!text/more_keys_for_g" latin:keyLabel="g" />
+    <Key latin:moreKeys="!text/more_keys_for_h" latin:keyLabel="h" />
+    <Key latin:keyLabel="f" />
 </merge>
\ No newline at end of file
diff --git a/res/xml/rows_dvorak.xml b/res/xml/rows_dvorak.xml
index 29c47b0..7a49d07 100644
--- a/res/xml/rows_dvorak.xml
+++ b/res/xml/rows_dvorak.xml
@@ -3,7 +3,6 @@
   xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="10.000002%p">
-        <include latin:keyboardLayout="@xml/keys_dvorak_123" />
         <include latin:keyboardLayout="@xml/rowkeys_dvorak1" />
     </Row>
     <Row latin:keyWidth="10.000002%p">
@@ -14,5 +13,5 @@
         <include latin:keyboardLayout="@xml/rowkeys_dvorak3" />
         <Key latin:keyStyle="deleteKeyStyle" latin:visualInsetsLeft="0.99999905%p" latin:keyWidth="fillRight" />
     </Row>
-    <include latin:keyboardLayout="@xml/row_dvorak4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
\ No newline at end of file