diff --git a/keyboards/planck/keymaps/sijmen/keymap.c b/keyboards/planck/keymaps/sijmen/keymap.c
index 7685348f5..b7cffbd77 100644
--- a/keyboards/planck/keymaps/sijmen/keymap.c
+++ b/keyboards/planck/keymaps/sijmen/keymap.c
@@ -34,27 +34,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Default
  * ,-----------------------------------------------------------------------------------.
- * |   q  |   w  |   e  |   r  |   t  |      |      |   y  |   u  |   i  |   o  |   p  |
+ * |   q  |   d  |   r  |   w  |   b  |      |      |   j  |   f  |   u  |   p  |   ;  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   a  |   s  |   d  |   f  |   g  | LSFT | LSFT |   h  |   j  |   k  |   l  |   ;  |
+ * |   a  |   s  |   h  |   t  |   g  | LSFT | LSFT |   y  |   n  |   e  |   o  |   i  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   z  |   x  |   c  |   v  |   b  |  ENT |  ENT |   n  |   m  |   ,  |   .  |   '  |
+ * |   z  |   x  |   m  |   c  |   v  |  ENT |  ENT |   k  |   l  |   ,  |   .  |   '  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | LCTL | LALT | LGUI |  ESC |  SPC |  TAB | BSPC | BSPC | LEFT | DOWN |  UP  | RGHT |
  * `-----------------------------------------------------------------------------------'
  */
 [0] = {
-  {KC_Q,    KC_W,    KC_E,    KC_R,        KC_T,        O_CTL_ALT, O_CTL_GUI, KC_Y,         KC_U,        KC_I,    KC_O,    KC_P       },
-  {KC_A,    KC_S,    KC_D,    KC_F,        KC_G,        O_SFT,     O_SFT_CTL, KC_H,         KC_J,        KC_K,    KC_L,    KC_SCLN    },
-  {KC_Z,    KC_X,    KC_C,    KC_V,        KC_B,        KC_ENT,    KC_ENT,    KC_N,         KC_M,        KC_COMM, KC_DOT,  TD(TD_QUOT)},
+  {KC_Q,    KC_D,    KC_R,    KC_W,        KC_B,        O_CTL_ALT, O_CTL_GUI, KC_J,         KC_F,        KC_U,    KC_P,    KC_SCLN    },
+  {KC_A,    KC_S,    KC_H,    KC_T,        KC_G,        O_SFT,     O_SFT,     KC_Y,         KC_N,        KC_E,    KC_O,    KC_I       },
+  {KC_Z,    KC_X,    KC_M,    KC_C,        KC_V,        KC_ENT,    KC_ENT,    KC_K,         KC_L,        KC_COMM, KC_DOT,  TD(TD_QUOT)},
   {KC_LCTL, KC_LALT, KC_LGUI, LT_LNUM_ESC, LT_LSFT_SPC, KC_TAB,    KC_BSPC,   LT_RSFT_BSPC, LT_SYM_LEFT, KC_DOWN, KC_UP,   KC_RGHT    },
 },
 
 /* Symbol
  * ,-----------------------------------------------------------------------------------.
- * |   {  |   .  |   *  |   &  |   }  |      |      |   +  | HOME |  UP  |  END |      |
+ * |   {  |   .  |   *  |   &  |   }  |      |      |   +  | HOME |  UP  |  END |   ;  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   (  |   ^  |   %  |   $  |   )  | LSFT | LSFT |   =  | LEFT | DOWN | RGHT |   ;  |
+ * |   (  |   ^  |   %  |   $  |   )  | LSFT | LSFT |   =  | LEFT | DOWN | RGHT |      |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |   [  |   #  |   @  |   !  |   ]  |  ENT |  ENT |      | PGDN | PGUP |      |   '  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -62,46 +62,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [1] = {
-  {KC_LCBR, KC_DOT,  KC_ASTR, KC_AMPR, KC_RCBR, _______, _______, S(KC_EQL), KC_HOME, KC_UP,   KC_END,  XXXXXXX},
-  {KC_LPRN, KC_CIRC, KC_PERC, KC_DLR,  KC_RPRN, _______, _______, KC_EQL,    KC_LEFT, KC_DOWN, KC_RGHT, _______},
+  {KC_LCBR, KC_DOT,  KC_ASTR, KC_AMPR, KC_RCBR, _______, _______, S(KC_EQL), KC_HOME, KC_UP,   KC_END,  _______},
+  {KC_LPRN, KC_CIRC, KC_PERC, KC_DLR,  KC_RPRN, _______, _______, KC_EQL,    KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX},
   {KC_LBRC, KC_HASH, KC_AT,   KC_EXLM, KC_RBRC, _______, _______, XXXXXXX,   KC_PGDN, KC_PGUP, XXXXXXX, _______},
   {_______, _______, _______, KC_BSLS, KC_PIPE, _______, _______, _______,   _______, _______, _______, _______},
 },
 
 /* Left Shift
  * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  |
+ * |   Q  |   D  |   R  |   W  |   B  |      |      |   J  |   F  |   U  |   P  |   ;  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  | LSFT | LSFT |   H  |   J  |   K  |   L  |   ;  |
+ * |   A  |   S  |   H  |   T  |   G  | LSFT | LSFT |   Y  |   N  |   E  |   O  |   I  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |  ENT |  ENT |   N  |   M  |   /  |   ?  |   "  |
+ * |   Z  |   X  |   M  |   C  |   V  |  ENT |  ENT |   K  |   L  |   /  |   ?  |   "  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | LCTL | LALT | LGUI |  ESC |[LSFT]|  TAB | BSPC |   -  | LEFT | DOWN |  UP  | RGHT |
  * `-----------------------------------------------------------------------------------'
  */
 [2] = {
-  {S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T),  O_CTL_ALT, O_CTL_GUI, S(KC_Y), S(KC_U), S(KC_I), S(KC_O),    S(KC_P)   },
-  {S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G),  O_SFT,     O_SFT_CTL, S(KC_H), S(KC_J), S(KC_K), S(KC_L),    S(KC_SCLN)},
-  {S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B),  O_SFT_ALT, O_SFT_GUI, S(KC_N), S(KC_M), KC_SLSH, S(KC_SLSH), S(TD_QUOT)},
-  {_______, _______, _______, _______, _______,  _______,   KC_DEL,    KC_MINS, KC_LEFT, KC_DOWN, KC_UP,      KC_RGHT   },
+  {S(KC_Q), S(KC_D), S(KC_R), S(KC_W), S(KC_B),  _______, _______, S(KC_J), S(KC_F), S(KC_U), S(KC_P),    S(KC_SCLN)},
+  {S(KC_A), S(KC_S), S(KC_H), S(KC_T), S(KC_G),  _______, _______, S(KC_Y), S(KC_N), S(KC_E), S(KC_O),    S(KC_I)   },
+  {S(KC_Z), S(KC_X), S(KC_M), S(KC_C), S(KC_V),  _______, _______, S(KC_K), S(KC_L), KC_SLSH, S(KC_SLSH), S(TD_QUOT)},
+  {_______, _______, _______, _______, _______,  _______, KC_DEL,  KC_MINS, KC_LEFT, _______, _______,    _______   },
 },
 
 /* Right Shift
  * ,-----------------------------------------------------------------------------------.
- * |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  |
+ * |   Q  |   D  |   R  |   W  |   B  |      |      |   J  |   F  |   U  |   P  |   ;  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   A  |   S  |   D  |   F  |   G  | LSFT | LSFT |   H  |   J  |   K  |   L  |   ;  |
+ * |   A  |   S  |   H  |   T  |   G  | LSFT | LSFT |   Y  |   N  |   E  |   O  |   I  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |   Z  |   X  |   C  |   V  |   B  |  ENT |  ENT |   N  |   M  |   ,  |   .  |   "  |
+ * |   Z  |   X  |   M  |   C  |   V  |  ENT |  ENT |   K  |   L  |   `  |   ~  |   "  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | LCTL | LALT | LGUI |  ESC |   _  |  TAB | BSPC |[RSFT]| LEFT | DOWN |  UP  | RGHT |
  * `-----------------------------------------------------------------------------------'
  */
 [3] = {
-  {S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T),    O_CTL_ALT, O_CTL_GUI, S(KC_Y), S(KC_U), S(KC_I), S(KC_O),   S(KC_P)   },
-  {S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G),    O_SFT,     O_SFT_CTL, S(KC_H), S(KC_J), S(KC_K), S(KC_L),   S(KC_SCLN)},
-  {S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B),    O_SFT_ALT, O_SFT_GUI, S(KC_N), S(KC_M), KC_GRV,  S(KC_GRV), S(TD_QUOT)},
-  {_______, _______, _______, _______, S(KC_MINS), _______,   KC_DEL,    _______, KC_LEFT, KC_DOWN, KC_UP,     KC_RGHT   },
+  {S(KC_Q), S(KC_D), S(KC_R), S(KC_W), S(KC_B),    _______, _______, S(KC_J), S(KC_F), S(KC_U), S(KC_P),   S(KC_SCLN)},
+  {S(KC_A), S(KC_S), S(KC_H), S(KC_T), S(KC_G),    _______, _______, S(KC_Y), S(KC_N), S(KC_E), S(KC_O),   S(KC_I)   },
+  {S(KC_Z), S(KC_X), S(KC_M), S(KC_C), S(KC_V),    _______, _______, S(KC_K), S(KC_L), KC_GRV,  S(KC_GRV), S(TD_QUOT)},
+  {_______, _______, _______, _______, S(KC_MINS), _______, KC_DEL,  _______, KC_LEFT, _______, _______,   _______   },
 },
 
 /* Left Number
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |   x  |   b  |   [  |   ]  |  ENT |  ENT |   a  |   1  |   2  |   3  |   b  |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | LCTL | LALT | LGUI |  ESC | LSFT |  TAB | BSPC | RSFT | LEFT | DOWN |  UP  | RGHT |
+ * | LCTL | LALT | LGUI |  ESC | LSFT |  TAB | BSPC | RSFT |   0  |   .  |   u  |   i  |
  * `-----------------------------------------------------------------------------------'
  */
 [4] = {