diff --git a/keyboards/crkbd/keymaps/jesperhellberg/keymap_intl.h b/keyboards/crkbd/keymaps/jesperhellberg/keycode_aliases.h
similarity index 69%
rename from keyboards/crkbd/keymaps/jesperhellberg/keymap_intl.h
rename to keyboards/crkbd/keymaps/jesperhellberg/keycode_aliases.h
index 904c1c73abe2..356bfa764252 100644
--- a/keyboards/crkbd/keymaps/jesperhellberg/keymap_intl.h
+++ b/keyboards/crkbd/keymaps/jesperhellberg/keycode_aliases.h
@@ -1,7 +1,18 @@
 #pragma once
 
+// ***** home row mod *****
+#define GUI_A LGUI_T(KC_A)
+#define ALT_O LALT_T(KC_O)
+#define CTRL_E LCTL_T(KC_E)
+#define SFT_U LSFT_T(KC_U)
+#define SFT_H RSFT_T(KC_H)
+#define CTRL_T RCTL_T(KC_T)
+#define ALT_N LALT_T(KC_N)
+#define GUI_S RGUI_T(KC_S)
+
+
+
 #define OSM_SHIFT OSM(MOD_RSFT)
-//#define OSM_CTRL OSM(MOD_LCTL)
 #define GUI_ENT GUI_T(KC_ENT)
 #define OSM_ALT OSM(MOD_LALT)
 #define GUI_SCL GUI_T(KC_SCLN)
@@ -21,7 +32,6 @@
 #define IDEBUG A(S(KC_F9))
 #define IRUN A(S(KC_F10))
 #define IFORMAT A(C(S(KC_L)))
-//#define ICLASS C(S(KC_N))
 #define ICLASS C(KC_N)
 #define GOSUP C(S(A(KC_U)))
 
diff --git a/keyboards/crkbd/keymaps/jesperhellberg/keymap.c b/keyboards/crkbd/keymaps/jesperhellberg/keymap.c
index 4d27e225f62a..655a6f29abb6 100644
--- a/keyboards/crkbd/keymaps/jesperhellberg/keymap.c
+++ b/keyboards/crkbd/keymaps/jesperhellberg/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 #include <stdio.h>
-#include "keymap_intl.h"
+#include "keycode_aliases.h"
 
 enum layers {
     BASE, 
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,                         KC_F,    KC_G,    KC_C,    KC_R,   KC_L,  KC_SLSH,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                         KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
+      KC_LSFT,   GUI_A,   ALT_O,  CTRL_E,   SFT_U,    KC_I,                         KC_D,   SFT_H,  CTRL_T,   ALT_N,    KC_S, KC_MINS,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LCTL, GUI_SCL,    KC_Q,    KC_J,    KC_K,    KC_X,                         KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,OSM_SHIFT,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|