diff --git a/atreus/kaleidoscope/colemak-dhm.ino b/atreus/colemak-dhm/colemak-dhm.ino
similarity index 89%
rename from atreus/kaleidoscope/colemak-dhm.ino
rename to atreus/colemak-dhm/colemak-dhm.ino
index cf93462..f1eb219 100644
--- a/atreus/kaleidoscope/colemak-dhm.ino
+++ b/atreus/colemak-dhm/colemak-dhm.ino
@@ -65,13 +65,13 @@ KEYMAPS(
    Key_de_Q    ,Key_de_W    ,Key_de_F     ,Key_de_P   ,Key_de_B
   ,Key_de_A    ,Key_de_R    ,Key_de_S     ,Key_de_T   ,Key_de_G
   ,Key_de_Y    ,Key_de_X    ,Key_de_C     ,Key_de_D   ,Key_de_V         ,Key_de_Hash
-  ,Key_de_Tab  ,___         ,___          ,Key_de_Delete ,Key_de_Spacebar  ,Key_de_Escape
+  ,Key_de_Tab  ,___         ,___          ,Key_de_Delete ,Key_de_Escape ,Key_de_Tab
 
 
-                     ,Key_de_J     ,Key_de_L          ,Key_de_U      ,Key_de_Z       ,Key_de_Semicolon
+                     ,Key_de_J     ,Key_de_L          ,Key_de_U      ,Key_de_Z       ,Key_de_Backspace
                      ,Key_de_M     ,Key_de_N          ,Key_de_E      ,Key_de_I       ,Key_de_O
   ,Key_de_LessThan   ,Key_de_K     ,Key_de_H          ,Key_de_Comma  ,Key_de_Period  ,Key_de_Slash
-  ,Key_de_LeftAlt    ,MO(SYMBOLS)  ,Key_de_Backspace  ,___           ,TG(GAME)       ,Key_Enter
+  ,Key_de_Spacebar   ,Key_Enter    ,Key_de_Backspace  ,___           ,TG(GAME)       ,Key_Enter
   ),
 
   [SYMBOLS] = KEYMAP_STACKED
@@ -82,7 +82,7 @@ KEYMAPS(
   ,___                    ,___                 ,___                  ,Key_de_Pipe          ,Key_de_Tilde      ,Key_de_Ampersand
 
 
-                        ,Key_de_Slash     ,Key_de_7  ,Key_de_8      ,Key_de_9       ,Key_de_Plus
+                        ,Key_de_Circumflex,Key_de_7  ,Key_de_8      ,Key_de_9       ,Key_de_Plus
                         ,Key_de_Asterisk  ,Key_de_4  ,Key_de_5      ,Key_de_6       ,Key_de_Minus
    ,Key_de_Backtick     ,Key_de_0         ,Key_de_1  ,Key_de_2      ,Key_de_3       ,Key_de_Equals
    ,___                 ,___              ,___       ,___           ,___            ,Key_de_Equals
@@ -172,6 +172,15 @@ void setup() {
   QUKEYS(
     // Qukey(layer, key_addr, alternate_key)
 
+    // HomeRow mods
+         // Key_de_LeftAlt
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 1),  Key_de_LeftAlt),  // left thumb to shift
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 2),  Key_de_LeftShift),  // left thumb to shift
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 3),  Key_de_LeftControl),  // bottom left TAB to LCtrl
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 8),  Key_de_RightControl),  // bottom right Enter to LCtrl
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 9),  Key_de_RightShift),  // right thumb to shift
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 10),  Key_de_LeftAlt),  // left thumb to shift
+
     // Umlauts
     kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 2),  Key_de_SS),           // s -> ß
     kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 0),  Key_de_AUml),         // a -> ä
@@ -187,12 +196,13 @@ void setup() {
 
     //layer shifts/switches
     kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 0),  Key_de_LeftControl),  // bottom left TAB to LCtrl
-    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 3),  Key_de_LeftShift),  // left thumb to shift
-    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 8),  Key_de_RightShift),  // right thumb to shift
-    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 11), Key_de_RightControl),  // bottom right Enter to LCtrl
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 3),  Key_de_LeftShift),    // left outer thumb to shift
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 8),  Key_de_RightShift),   // right outer thumb to shift
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 11), Key_de_RightControl), // bottom right Enter to LCtrl
     kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 5),  Key_LeftGui),         // Esc to SUPER
     kaleidoscope::plugin::Qukey(BASE,  KeyAddr(1, 7),  MO(MOUSE)),           // M key to mouse layer
-    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 4),  MO(NAVI)),            // Space to NAVI layer
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 4),  MO(NAVI)),            // ESC to NAVI layer
+    kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 7),  MO(SYMBOLS)),         // Enter to SYMbol layer
 
     // hold for "ctrl+" version of the key
     // kaleidoscope::plugin::Qukey(BASE,  KeyAddr(2, 2),  LCTRL(Key_de_C)),     // c copy
@@ -212,7 +222,7 @@ void setup() {
     // kaleidoscope::plugin::Qukey(BASE,  KeyAddr(3, 11), Key_de_LeftAlt),       // esc -> alt
   )
 
-  //Qukey settings
+  // Qukey settings - this seems somehow calculated different than in QMK
   Qukeys.setHoldTimeout(390);
   Qukeys.setMaxIntervalForTapRepeat(170);
   Qukeys.setOverlapThreshold(80);