diff --git a/keymaps_generated.h b/keymaps_generated.h
index c756fa84..5b26af67 100644
--- a/keymaps_generated.h
+++ b/keymaps_generated.h
@@ -1,13 +1,13 @@
 #define KEYMAP_COLEMAK { /* Generated keymap for COLEMAK */ 	{Key_skip, Key_1, Key_2, Key_3, Key_4, Key_5, Key_skip, Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip},\
 	{Key_Backtick, Key_Q, Key_W, Key_F, Key_P, Key_G, Key_skip, Key_skip, Key_J, Key_L, Key_U, Key_Y, Key_Semicolon, Key_Equals},\
 	{Key_PageUp, Key_A, Key_R, Key_S, Key_T, Key_D, Key_Tab, Key_Return, Key_H, Key_N, Key_E, Key_I, Key_O, Key_Quote},\
-	{Key_PageDn, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Keymap0, Key_K, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus},\
-	{Key_LGUI, Key_Backspace, Key_LShift, Key_LCtrl, Key_KeymapNext_Momentary, Key_skip, Key_skip, Key_skip, Key_skip, Key_KeymapNext_Momentary, Key_RCtrl, Key_RShift, Key_Space, Key_RAlt},\
+	{Key_PageDn, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Keymap2, Key_K, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus},\
+	{Key_LCtrl, Key_Backspace, Key_LShift, Key_LGUI, Key_KeymapNext_Momentary, Key_skip, Key_skip, Key_skip, Key_skip, Key_KeymapNext_Momentary, Key_RAlt, Key_RShift, Key_Space, Key_RCtrl},\
 },
 #define KEYMAP_DVORAK { /* Generated keymap for DVORAK */ 	{Key_skip, Key_1, Key_2, Key_3, Key_4, Key_5, Key_skip, Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip},\
 	{Key_Backtick, Key_Quote, Key_Comma, Key_Period, Key_P, Key_Y, Key_skip, Key_skip, Key_F, Key_G, Key_C, Key_R, Key_L, Key_Slash},\
 	{Key_PageUp, Key_A, Key_O, Key_E, Key_U, Key_I, Key_Tab, Key_Return, Key_D, Key_H, Key_T, Key_N, Key_S, Key_Minus},\
-	{Key_PageDn, Key_Semicolon, Key_Q, Key_J, Key_K, Key_X, Key_Esc, Key_Keymap0, Key_B, Key_M, Key_W, Key_V, Key_Z, Key_Equals},\
+	{Key_PageDn, Key_Semicolon, Key_Q, Key_J, Key_K, Key_X, Key_Esc, Key_Keymap2, Key_B, Key_M, Key_W, Key_V, Key_Z, Key_Equals},\
 	{Key_LCtrl, Key_Backspace, Key_LShift, Key_LGUI, Key_KeymapNext_Momentary, Key_skip, Key_skip, Key_skip, Key_skip, Key_KeymapNext_Momentary, Key_RAlt, Key_RShift, Key_Space, Key_RCtrl},\
 },
 #define KEYMAP_GENERIC_FN2 { /* Generated keymap for GENERIC_FN2 */ 	{Key_skip, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, Key_NoKey, Key_NoKey, Key_F6, Key_F7, Key_F8, Key_F9, Key_F10, Key_skip},\
@@ -46,9 +46,9 @@ static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
 	KEYMAP_NUMPAD
-    KEYMAP_DVORAK
-	KEYMAP_GENERIC_FN2
 	KEYMAP_COLEMAK
+	KEYMAP_GENERIC_FN2
+    KEYMAP_DVORAK
     KEYMAP_WORKMAN
 	KEYMAP_GENERIC_FN2
 
diff --git a/keymaps_h-template b/keymaps_h-template
index 1e770671..755504cf 100644
--- a/keymaps_h-template
+++ b/keymaps_h-template
@@ -4,9 +4,9 @@ static const Key keymaps[KEYMAPS][ROWS][COLS] = {
 	KEYMAP_QWERTY
 	KEYMAP_GENERIC_FN2
 	KEYMAP_NUMPAD
-    KEYMAP_DVORAK
-	KEYMAP_GENERIC_FN2
 	KEYMAP_COLEMAK
+	KEYMAP_GENERIC_FN2
+    KEYMAP_DVORAK
     KEYMAP_WORKMAN
 	KEYMAP_GENERIC_FN2
 
diff --git a/layouts/colemak b/layouts/colemak
index e2fc1aee..3eb2c709 100644
--- a/layouts/colemak
+++ b/layouts/colemak
@@ -2,5 +2,5 @@
 skip 	1 2 3 4 5  skip 	skip   6 7 8 9 0 skip  
 ` 	Q W F P G  skip 	skip   J L U Y ;  = 
 PageUp 	A R S T D  Tab  	Return H N E I O ' 
-PageDn 	Z X C V B  Esc  	Keymap0  K M , . / -
-LGUI Backspace LShift LCtrl KeymapNext_Momentary skip  skip skip skip  KeymapNext_Momentary RCtrl RShift Space  RAlt 
+PageDn 	Z X C V B  Esc  	Keymap2  K M , . / -
+LCtrl Backspace LShift LGUI KeymapNext_Momentary skip  skip skip skip  KeymapNext_Momentary RAlt RShift Space  RCtrl
diff --git a/layouts/dvorak b/layouts/dvorak
index f71470c0..1adcdce5 100644
--- a/layouts/dvorak
+++ b/layouts/dvorak
@@ -2,5 +2,5 @@
 skip 	1 2 3 4 5  skip 	skip    6 7 8 9 0 skip  
 `       ' , . P Y  skip 	skip    F G C R L /
 PageUp 	A O E U I  Tab  	Return  D H T N S -
-PageDn 	; Q J K X  Esc  	Keymap0 B M W V Z =
+PageDn 	; Q J K X  Esc  	Keymap2 B M W V Z =
 LCtrl Backspace LShift LGUI KeymapNext_Momentary skip  skip skip skip  KeymapNext_Momentary RAlt RShift Space  RCtrl