diff --git a/README.md b/README.md
index 0bfdb2b..8b07409 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,24 @@
 # Christoph Cullmann's Layout
 
-Layout with 42 keys based on Miryoku, using Dhorf as base layer:
+Layout with 42 keys based on Miryoku, using Night as base layer:
 
-    dhorf (Oxey)
-      v l h k q  j f o u ,
-      s r n t w  y c a e i
-      z x m d b  p g ' ; .
+  night (CN) (8 likes)
+    b f l k q  p g o u .
+    n s h t m  y c a e i
+    x v j d z  ' w ; / ,
+          r
 
-    SHAI:
-      Alt: 31.42%
-      Rol: 40.03%   (In/Out: 19.86% | 20.17%)
-      One:  1.36%   (In/Out:  0.18% |  1.19%)
-      Red:  3.33%   (Bad:     0.11%)
+  SHAI:
+    Alt: 34.36%
+    Rol: 42.94%   (In/Out: 22.30% | 20.64%)
+    One:  1.97%   (In/Out:  0.58% |  1.38%)
+    Rtl: 44.90%   (In/Out: 22.88% | 22.02%)
+    Red:  3.01%   (Bad:     0.09%)
 
-      SFB: 0.70%
-      SFS: 5.96%    (Red/Alt: 0.98% | 4.98%)
+    SFB: 0.58%
+    SFS: 4.42%    (Red/Alt: 0.78% | 3.64%)
 
-      LH/RH: 48.52% | 51.48%
+    LH/RH: 49.16% | 50.84%
 
 # How to use
 
@@ -40,7 +42,6 @@ or for the Planck
 
 Based on ideas and code from:
 
-- https://oxey.dev/dhorf
 - https://github.com/manna-harbour/miryoku
 - https://github.com/getreuer/qmk-keymap
 - https://github.com/filterpaper/qmk_userspace
diff --git a/common/keymap.h b/common/keymap.h
index 951c177..ddf808a 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -16,10 +16,10 @@ enum my_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE] = LAYOUT(
-    C(KC_X),      KC_V,         KC_L,         KC_H,         KC_K,         KC_Q,            KC_J,           KC_F,         KC_O,         KC_U,         KC_COMM,      KC_PSCR,
-    C(KC_C),      RALT_T(KC_S), LALT_T(KC_R), LCTL_T(KC_N), LSFT_T(KC_T), KC_W,            KC_Y,           RSFT_T(KC_C), RCTL_T(KC_A), LALT_T(KC_E), RALT_T(KC_I), XXXXXXX,
-    C(KC_V),      KC_Z,         KC_X,         KC_M,         LGUI_T(KC_D), KC_B,            KC_P,           RGUI_T(KC_G), KC_QUOT,      KC_SCLN,      KC_DOT,       XXXXXXX,
-                                              MO(_SYM),     KC_SPC,       MO(_NUM),        MO(_NAV),       KC_BSPC,      MO(_FN)
+    C(KC_X),      KC_B,         KC_F,         KC_L,         KC_K,         KC_Q,            KC_P,           KC_G,         KC_O,         KC_U,         KC_DOT,       KC_PSCR,
+    C(KC_C),      RALT_T(KC_N), LALT_T(KC_S), LCTL_T(KC_H), LSFT_T(KC_T), KC_M,            KC_Y,           RSFT_T(KC_C), RCTL_T(KC_A), LALT_T(KC_E), RALT_T(KC_I), XXXXXXX,
+    C(KC_V),      KC_X,         KC_V,         KC_J,         LGUI_T(KC_D), KC_Z,            KC_QUOT,        RGUI_T(KC_W), KC_SCLN,      KC_SLSH,      KC_COMM,      XXXXXXX,
+                                              MO(_SYM),     KC_R,         MO(_NUM),        MO(_NAV),       KC_SPC,       MO(_FN)
 ),
 
 [_NUM] = LAYOUT(