diff --git a/README.md b/README.md
index 1e6d72c3aae..0dbef95e7e7 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ The keymap is compiled using a GitHub Action. See more about that below. If you
 - Efficient symbol layer.
 - [Word Selection](https://getreuer.info/posts/keyboards/select-word/index.html) macro
 - [Swapper](https://github.com/callum-oakley/qmk_firmware/tree/master/users/callum#swapper). Sends `cmd-key`, but holds `cmd` between consecutive keypresses.
-- N-Shot macros.
+- [N-Shot](https://github.com/possumvibes/qmk_userspace/blob/possumdev/users/possumvibes/features/nshot_mod.c) macros.
 - QMK Features:
     - [Dynamic Macros](https://docs.qmk.fm/#/feature_dynamic_macros)
     - [Caps Word](https://docs.qmk.fm/#/feature_caps_word)
diff --git a/docs/generated/corne_4/corne_qwerty.svg b/docs/generated/corne_4/corne_qwerty.svg
index 3005efe6acb..2f8bbff23ec 100644
--- a/docs/generated/corne_4/corne_qwerty.svg
+++ b/docs/generated/corne_4/corne_qwerty.svg
@@ -1,26 +1,5 @@
 <svg width="900" height="1709" viewBox="0 0 900 1709" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
-<svg id="tabler:alt">
-<svg
-  xmlns="http://www.w3.org/2000/svg"
- 
- 
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
-  class="icon icon-tabler icons-tabler-outline icon-tabler-alt"
->
-  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-  <path d="M4 16v-6a2 2 0 1 1 4 0v6" />
-  <path d="M4 13h4" />
-  <path d="M11 8v8h4" />
-  <path d="M16 8h4" />
-  <path d="M18 8v8" />
-</svg>
-</svg>
 <svg id="tabler:arrow-big-up-line">
 <svg
   xmlns="http://www.w3.org/2000/svg"
@@ -338,25 +317,6 @@
   <path d="M4 18h4" />
 </svg>
 </svg>
-<svg id="tabler:lock">
-<svg
-  xmlns="http://www.w3.org/2000/svg"
- 
- 
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
-  class="icon icon-tabler icons-tabler-outline icon-tabler-lock"
->
-  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-  <path d="M5 13a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v6a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2v-6z" />
-  <path d="M11 16a1 1 0 1 0 2 0a1 1 0 0 0 -2 0" />
-  <path d="M8 11v-4a4 4 0 1 1 8 0v4" />
-</svg>
-</svg>
 <svg id="tabler:palette">
 <svg
   xmlns="http://www.w3.org/2000/svg"
@@ -473,43 +433,6 @@
   <path d="M10 5v14l-8 -7z" />
 </svg>
 </svg>
-<svg id="tabler:repeat">
-<svg
-  xmlns="http://www.w3.org/2000/svg"
- 
- 
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
-  class="icon icon-tabler icons-tabler-outline icon-tabler-repeat"
->
-  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-  <path d="M4 12v-3a3 3 0 0 1 3 -3h13m-3 -3l3 3l-3 3" />
-  <path d="M20 12v3a3 3 0 0 1 -3 3h-13m3 3l-3 -3l3 -3" />
-</svg>
-</svg>
-<svg id="tabler:repeat-off">
-<svg
-  xmlns="http://www.w3.org/2000/svg"
- 
- 
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
-  class="icon icon-tabler icons-tabler-outline icon-tabler-repeat-off"
->
-  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-  <path d="M4 12v-3c0 -1.336 .873 -2.468 2.08 -2.856m3.92 -.144h10m-3 -3l3 3l-3 3" />
-  <path d="M20 12v3a3 3 0 0 1 -.133 .886m-1.99 1.984a3 3 0 0 1 -.877 .13h-13m3 3l-3 -3l3 -3" />
-  <path d="M3 3l18 18" />
-</svg>
-</svg>
 <svg id="tabler:space">
 <svg
   xmlns="http://www.w3.org/2000/svg"
@@ -755,11 +678,11 @@ path.combo {
 </g>
 <g transform="translate(364, 70)" class="key keypos-6">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:repeat" xlink:href="#tabler:repeat" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:repeat"/>
+<use href="#tabler:brand-windows" xlink:href="#tabler:brand-windows" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:brand-windows"/>
 </g>
 <g transform="translate(476, 70)" class="key keypos-7">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:brand-windows" xlink:href="#tabler:brand-windows" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:brand-windows"/>
+<text x="0" y="0" class="key tap">PGUP</text>
 </g>
 <g transform="translate(532, 42)" class="key keypos-8">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -788,7 +711,6 @@ path.combo {
 <g transform="translate(28, 105)" class="key keypos-14">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">TAB</text>
-<text x="0" y="24" class="key hold">LCTL</text>
 </g>
 <g transform="translate(84, 105)" class="key keypos-15">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -797,14 +719,17 @@ path.combo {
 <g transform="translate(140, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">S</text>
+<text x="0" y="24" class="key hold">LALT</text>
 </g>
 <g transform="translate(196, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">D</text>
+<text x="0" y="24" class="key hold">LCTL</text>
 </g>
 <g transform="translate(252, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">F</text>
+<text x="0" y="24" class="key hold">LSFT</text>
 </g>
 <g transform="translate(308, 98)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -812,11 +737,12 @@ path.combo {
 </g>
 <g transform="translate(364, 126)" class="key keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:repeat-off" xlink:href="#tabler:repeat-off" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:repeat-off"/>
+<text x="0" y="0" class="key tap">MEH</text>
+<text x="0" y="24" class="key hold">sticky</text>
 </g>
 <g transform="translate(476, 126)" class="key keypos-21">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:lock" xlink:href="#tabler:lock" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:lock"/>
+<text x="0" y="0" class="key tap">PGDN</text>
 </g>
 <g transform="translate(532, 98)" class="key keypos-22">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -825,14 +751,17 @@ path.combo {
 <g transform="translate(588, 91)" class="key keypos-23">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">J</text>
+<text x="0" y="24" class="key hold">RSFT</text>
 </g>
 <g transform="translate(644, 84)" class="key keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">K</text>
+<text x="0" y="24" class="key hold">RCTL</text>
 </g>
 <g transform="translate(700, 91)" class="key keypos-25">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">L</text>
+<text x="0" y="24" class="key hold">RALT</text>
 </g>
 <g transform="translate(756, 105)" class="key keypos-26">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -841,11 +770,10 @@ path.combo {
 <g transform="translate(812, 105)" class="key keypos-27">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">ENT</text>
-<text x="0" y="24" class="key hold">LCTL</text>
 </g>
 <g transform="translate(28, 161)" class="key keypos-28">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MEH</text>
+<use href="#tabler:arrow-big-up-line" xlink:href="#tabler:arrow-big-up-line" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:arrow-big-up-line"/>
 <text x="0" y="24" class="key hold">sticky</text>
 </g>
 <g transform="translate(84, 161)" class="key keypos-29">
@@ -890,7 +818,7 @@ path.combo {
 </g>
 <g transform="translate(812, 161)" class="key keypos-39">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">MEH</text>
+<use href="#tabler:arrow-big-up-line" xlink:href="#tabler:arrow-big-up-line" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:arrow-big-up-line"/>
 <text x="0" y="24" class="key hold">sticky</text>
 </g>
 <g transform="translate(224, 205)" class="key keypos-40">
@@ -901,8 +829,7 @@ path.combo {
 </g>
 <g transform="translate(286, 213) rotate(15.0)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:arrow-big-up-line" xlink:href="#tabler:arrow-big-up-line" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:arrow-big-up-line"/>
-<text x="0" y="24" class="key hold">sticky</text>
+<text x="0" y="0" class="key tap">LALT</text>
 </g>
 <g transform="translate(351, 224) rotate(30.0)" class="key keypos-42">
 <rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
@@ -927,42 +854,18 @@ path.combo {
 </a><text x="0" y="24" class="key hold"><tspan style="font-size: 70%">tap-toggle</tspan></text>
 </g>
 <g class="combo combopos-0">
-<rect rx="6" ry="6" x="126" y="106" width="28" height="26" class="combo"/>
-<use href="#tabler:alt" xlink:href="#tabler:alt" x="133" y="112" height="14" width="14.0" class="combo tap glyph tabler:alt"/>
-</g>
-<g class="combo combopos-1">
-<rect rx="6" ry="6" x="182" y="99" width="28" height="26" class="combo"/>
-<text x="196" y="112" class="combo tap">ctrl</text>
-</g>
-<g class="combo combopos-2">
-<rect rx="6" ry="6" x="238" y="106" width="28" height="26" class="combo"/>
-<use href="#tabler:arrow-big-up-line" xlink:href="#tabler:arrow-big-up-line" x="245" y="112" height="14" width="14.0" class="combo tap glyph tabler:arrow-big-up-line"/>
-</g>
-<g class="combo combopos-3">
-<rect rx="6" ry="6" x="574" y="106" width="28" height="26" class="combo"/>
-<use href="#tabler:arrow-big-up-line" xlink:href="#tabler:arrow-big-up-line" x="581" y="112" height="14" width="14.0" class="combo tap glyph tabler:arrow-big-up-line"/>
-</g>
-<g class="combo combopos-4">
-<rect rx="6" ry="6" x="630" y="99" width="28" height="26" class="combo"/>
-<text x="644" y="112" class="combo tap">ctrl</text>
-</g>
-<g class="combo combopos-5">
-<rect rx="6" ry="6" x="686" y="106" width="28" height="26" class="combo"/>
-<use href="#tabler:alt" xlink:href="#tabler:alt" x="693" y="112" height="14" width="14.0" class="combo tap glyph tabler:alt"/>
-</g>
-<g class="combo combopos-6">
 <rect rx="6" ry="6" x="266" y="82" width="28" height="26" class="combo"/>
 <text x="280" y="94" class="combo tap">TAB</text>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-1">
 <rect rx="6" ry="6" x="238" y="50" width="28" height="26" class="combo"/>
 <use href="#tabler:list-search" xlink:href="#tabler:list-search" x="245" y="56" height="14" width="14.0" class="combo tap glyph tabler:list-search"/>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-2">
 <rect rx="6" ry="6" x="546" y="82" width="28" height="26" class="combo"/>
 <text x="560" y="94" class="combo tap">ESC</text>
 </g>
-<g class="combo combopos-9">
+<g class="combo combopos-3">
 <rect rx="6" ry="6" x="574" y="50" width="28" height="26" class="combo"/>
 <use href="#tabler:letter-case-upper" xlink:href="#tabler:letter-case-upper" x="581" y="56" height="14" width="14.0" class="combo tap glyph tabler:letter-case-upper"/>
 </g>
@@ -1037,13 +940,11 @@ path.combo {
 </g>
 <g transform="translate(140, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:alt" xlink:href="#tabler:alt" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:alt"/>
+<text x="0" y="0" class="key tap">LALT</text>
 </g>
 <g transform="translate(196, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">Ctrl</tspan>
-</text>
+<text x="0" y="0" class="key tap">LCTL</text>
 </g>
 <g transform="translate(252, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1254,13 +1155,11 @@ path.combo {
 </g>
 <g transform="translate(644, 84)" class="key keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">Ctrl</tspan>
-</text>
+<text x="0" y="0" class="key tap">LCTL</text>
 </g>
 <g transform="translate(700, 91)" class="key keypos-25">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:alt" xlink:href="#tabler:alt" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:alt"/>
+<text x="0" y="0" class="key tap">LALT</text>
 </g>
 <g transform="translate(756, 105)" class="key keypos-26">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1409,13 +1308,11 @@ path.combo {
 </g>
 <g transform="translate(140, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#tabler:alt" xlink:href="#tabler:alt" x="-7" y="-7" height="14" width="14.0" class="key tap glyph tabler:alt"/>
+<text x="0" y="0" class="key tap">LALT</text>
 </g>
 <g transform="translate(196, 84)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">OS</tspan><tspan x="0" dy="1.2em">Ctrl</tspan>
-</text>
+<text x="0" y="0" class="key tap">LCTL</text>
 </g>
 <g transform="translate(252, 91)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/docs/generated/corne_4/corne_qwerty.yaml b/docs/generated/corne_4/corne_qwerty.yaml
index 1bc87f0c75c..13a2350d7c1 100644
--- a/docs/generated/corne_4/corne_qwerty.yaml
+++ b/docs/generated/corne_4/corne_qwerty.yaml
@@ -1,24 +1,24 @@
 layout: {qmk_keyboard: crkbd/rev4_1/standard, layout_name: LAYOUT_split_3x6_3_ex2}
 layers:
   Qwerty:
-  - [ESC, Q, W, E, R, T, '$$tabler:repeat$$', '$$tabler:brand-windows$$', Y, U, I, O]
+  - [ESC, Q, W, E, R, T, '$$tabler:brand-windows$$', PGUP, Y, U, I, O]
   - - P
     - $$tabler:backspace$$
-    - {t: TAB, h: LCTL}
+    - TAB
     - A
-    - S
-    - D
-    - F
+    - {t: S, h: LALT}
+    - {t: D, h: LCTL}
+    - {t: F, h: LSFT}
     - G
-    - $$tabler:repeat-off$$
-    - $$tabler:lock$$
+    - {t: MEH, h: sticky}
+    - PGDN
     - H
-    - J
-  - - K
-    - L
+    - {t: J, h: RSFT}
+  - - {t: K, h: RCTL}
+    - {t: L, h: RALT}
     - ;
-    - {t: ENT, h: LCTL}
-    - {t: MEH, h: sticky}
+    - ENT
+    - {t: '$$tabler:arrow-big-up-line$$', h: sticky}
     - Z
     - X
     - C
@@ -29,9 +29,9 @@ layers:
   - - ','
     - .
     - /
-    - {t: MEH, h: sticky}
-    - {t: Num, h: tap-toggle}
     - {t: '$$tabler:arrow-big-up-line$$', h: sticky}
+    - {t: Num, h: tap-toggle}
+    - LALT
     - {t: Nav, h: tap-toggle}
     - {t: Fun, h: tap-toggle}
     - $$tabler:space$$
@@ -53,8 +53,8 @@ layers:
     - {t: ▽, type: trans}
     - {t: ▽, type: trans}
     - $$tabler:brackets-contain$$
-    - $$tabler:alt$$
-    - OS Ctrl
+    - LALT
+    - LCTL
     - $$tabler:arrow-big-up-line$$
     - ''
     - {t: ▽, type: trans}
@@ -108,8 +108,8 @@ layers:
     - {t: ▽, type: trans}
     - ''
     - $$tabler:arrow-big-up-line$$
-  - - OS Ctrl
-    - $$tabler:alt$$
+  - - LCTL
+    - LALT
     - $$tabler:brackets-contain$$
     - {t: ▽, type: trans}
     - {t: ▽, type: trans}
@@ -147,8 +147,8 @@ layers:
     - {t: ▽, type: trans}
     - {t: ▽, type: trans}
     - $$tabler:brackets-contain$$
-    - $$tabler:alt$$
-    - OS Ctrl
+    - LALT
+    - LCTL
     - $$tabler:arrow-big-up-line$$
     - '='
     - {t: ▽, type: trans}
diff --git a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.def b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.def
index 67831c8c9e0..51f4b5fc5fb 100644
--- a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.def
+++ b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.def
@@ -16,13 +16,3 @@ COMB(fgTab,  KC_TAB,   KC_F, KC_G)
 COMB(jhEsc,  KC_ESC,   KC_J, KC_H)
 COMB(rfSelW,  SELWORD,   KC_R, KC_F)
 COMB(ujCwT,  CW_TOGG,   KC_U, KC_J)
-
-// Home row combos for Graphite
-COMB(O_LSHFT, OSM(MOD_LSFT), KC_F, KC_V)
-COMB(O_LCTRL, OSM(MOD_LCTL), KC_D, KC_C)
-COMB(O_LALT, OSM(MOD_LALT), KC_S, KC_X)
-
-COMB(O_RSHFT, OSM(MOD_RSFT), KC_J, KC_M)
-COMB(O_RCTRL, OSM(MOD_RCTL), KC_K, KC_COMM)
-COMB(O_RALT, OSM(MOD_RALT), KC_L, KC_DOT)
-
diff --git a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.yaml b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.yaml
index 245acf26c59..f378f76a257 100644
--- a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.yaml
+++ b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/combos.yaml
@@ -1,13 +1,6 @@
 # This is used to draw the keymap
 combos:
-  - {tk: [S, X], k: $$tabler:alt$$, l: [Qwerty]}
-  - {tk: [D, C], k: ctrl, l: [Qwerty]}
-  - {tk: [F, V], k: $$tabler:arrow-big-up-line$$, l: [Qwerty]}
-  - {tk: [J, M], k: $$tabler:arrow-big-up-line$$, l: [Qwerty]}
-  - {p: [24, 36], k: ctrl, l: [Qwerty]}
-  - {tk: [L, .], k: $$tabler:alt$$, l: [Qwerty]}
-  # Other combos
   - {tk: [F, G], k: TAB, l: [Qwerty]}
-  - {tk: [F, R], k: $$tabler:list-search$$, l: [Qwerty]}
+  - {tk: [F, R], k: "$$tabler:list-search$$", l: [Qwerty]}
   - {tk: [H, J], k: ESC, l: [Qwerty]}
-  - {tk: [U, J], k: $$tabler:letter-case-upper$$, l: [Qwerty]}
+  - {tk: [U, J], k: "$$tabler:letter-case-upper$$", l: [Qwerty]}
diff --git a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/config.h b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/config.h
index 5de50c0d345..f100ebfe8cb 100644
--- a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/config.h
+++ b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/config.h
@@ -2,13 +2,14 @@
 
 #define BINDINGS_OS_WIN
 
+// Home row mods
+#define TAPPING_TERM 250
+#define CHORDAL_HOLD
+#define PERMISSIVE_HOLD
+
 // Turn off layer lock after 60 seconds of idle time.
 #define LAYER_LOCK_IDLE_TIMEOUT 60000
 
-// Tap-Hold behavior
-#define TAPPING_TERM 220
-#define PERMISSIVE_HOLD
-
 // Colors
 #define RGBLIGHT_DISABLE_KEYCODES
 #define RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/keymap.json b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/keymap.json
index f39b4505c06..a2c521bd473 100644
--- a/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/keymap.json
+++ b/keyboards/crkbd/rev4_1/standard/keymaps/ratoru/keymap.json
@@ -12,29 +12,29 @@
       "KC_E",
       "KC_R",
       "KC_T",
-      "QK_REP",
       "KC_LGUI",
+      "KC_PGUP",
       "KC_Y",
       "KC_U",
       "KC_I",
       "KC_O",
       "KC_P",
       "KC_BSPC",
-      "LCTL_T(KC_TAB)",
+      "KC_TAB",
       "KC_A",
-      "KC_S",
-      "KC_D",
-      "KC_F",
+      "LALT_T(KC_S)",
+      "LCTL_T(KC_D)",
+      "LSFT_T(KC_F)",
       "KC_G",
-      "QK_AREP",
-      "ANY(QK_LLCK)",
+      "OSM(MOD_MEH)",
+      "KC_PGDN",
       "KC_H",
-      "KC_J",
-      "KC_K",
-      "KC_L",
+      "RSFT_T(KC_J)",
+      "RCTL_T(KC_K)",
+      "RALT_T(KC_L)",
       "KC_SCLN",
-      "LCTL_T(KC_ENT)",
-      "OSM(MOD_MEH)",
+      "KC_ENT",
+      "OSM(MOD_LSFT)",
       "KC_Z",
       "KC_X",
       "KC_C",
@@ -45,9 +45,9 @@
       "KC_COMM",
       "KC_DOT",
       "KC_SLSH",
-      "OSM(MOD_MEH)",
+      "OSM(MOD_RSFT)",
       "TT(3)",
-      "OSM(MOD_LSFT)",
+      "KC_LALT",
       "TT(1)",
       "TT(2)",
       "KC_SPC",
@@ -70,9 +70,9 @@
       "KC_TRNS",
       "KC_TRNS",
       "ANY(SELWORD)",
-      "ANY(OS_LALT)",
-      "ANY(OS_LCTL)",
-      "ANY(OS_LSFT)",
+      "KC_LALT",
+      "KC_LCTL",
+      "KC_LSFT",
       "KC_NO",
       "KC_TRNS",
       "KC_TRNS",
@@ -125,9 +125,9 @@
       "KC_TRNS",
       "KC_TRNS",
       "KC_NO",
-      "ANY(OS_LSFT)",
-      "ANY(OS_LCTL)",
-      "ANY(OS_LALT)",
+      "KC_LSFT",
+      "KC_LCTL",
+      "KC_LALT",
       "ANY(SELWORD)",
       "KC_TRNS",
       "KC_TRNS",
@@ -166,9 +166,9 @@
       "KC_TRNS",
       "KC_TRNS",
       "ANY(SELWORD)",
-      "ANY(OS_LALT)",
-      "ANY(OS_LCTL)",
-      "ANY(OS_LSFT)",
+      "KC_LALT",
+      "KC_LCTL",
+      "KC_LSFT",
       "KC_EQL",
       "KC_TRNS",
       "KC_TRNS",
@@ -249,7 +249,8 @@
   "modules": [
     "getreuer/select_word",
     "getreuer/lumino",
-    "getreuer/palettefx"
+    "getreuer/palettefx",
+    "getreuer/tap_flow"
   ],
   "author": "ratoru"
 }