diff --git a/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c b/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c
index 9643e44dbbe..54c9492ee03 100644
--- a/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/helix_type_r/keymaps/default/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
       KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, EISU,   LOWER,   KC_SPC,  KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
+      ADJUST,  KC_ESC,  KC_LALT, KC_LGUI, EISU,    LOWER,   KC_SPC,  KC_SPC,  RAISE,   KANA,    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
     ),
   /* Lower
    * ,-----------------------------------------.             ,-----------------------------------------.
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      | Reset|RGBRST|EEPRST|      |      |             |      |      |      |      |      |  Del |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |      |      |      |      |      | Mac  |             | Win  |      |      |      |      |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      |RGB ON| HUE+ | SAT+ | VAL+ |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
@@ -118,15 +118,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] =  LAYOUT( \
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
       _______, RESET,   RGBRST,  EEP_RST, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, \
+      _______, _______, _______, _______, _______, AG_NORM,                   AG_SWAP, _______, _______, _______, _______, _______, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
       )
 
 };
 
-static bool mode_windows = false;
-
 void encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* Left side encoder */
         if (clockwise) {
@@ -147,9 +145,9 @@ void dip_switch_update_user(uint8_t index, bool active) {
     switch (index) {
         case 0:
             if(active) { // Left no.1
-              mode_windows = true;
+              keymap_config.swap_lalt_lgui = true;
             } else { 
-              mode_windows = false;
+              keymap_config.swap_lalt_lgui = false;
             }
             break;
         case 1:
@@ -178,7 +176,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case EISU:
       if (record->event.pressed) {
-        if(mode_windows==false){
+        if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG2);
         }else{
           SEND_STRING(SS_LALT("`"));
@@ -190,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case KANA:
       if (record->event.pressed) {
-        if(mode_windows==false){
+        if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG1);
         }else{
           SEND_STRING(SS_LALT("`"));
diff --git a/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c b/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c
index 6907f695b41..70b9ec5ac4d 100644
--- a/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c
+++ b/keyboards/yushakobo/helix_type_r/keymaps/default4/keymap.c
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      | Reset|RGBRST|EEPRST|      |      |             |      |      |      |      |      |  Del |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+   * |      |      |      |      |      | Mac  |             | Win  |      |RGB ON| HUE+ | SAT+ | VAL+ |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      | MODE | HUE- | SAT- | VAL- |
    * `-------------------------------------------------------------------------------------------------'
@@ -109,14 +109,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] =  LAYOUT4( \
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
       _______, RESET,   RGBRST,  EEP_RST, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
-      _______, _______, _______, _______, _______, _______,                   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
+      _______, _______, _______, _______, _______, AG_NORM,                   AG_SWAP, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
       )
 
 };
 
-static bool mode_windows = false;
-
 void encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* Left side encoder */
         if (clockwise) {
@@ -137,9 +135,9 @@ void dip_switch_update_user(uint8_t index, bool active) {
     switch (index) {
         case 0:
             if(active) { // Left no.1
-              mode_windows = true;
+              keymap_config.swap_lalt_lgui = true;
             } else { 
-              mode_windows = false;
+              keymap_config.swap_lalt_lgui = false;
             }
             break;
         case 1:
@@ -168,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case EISU:
       if (record->event.pressed) {
-        if(mode_windows==false){
+        if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG2);
         }else{
           SEND_STRING(SS_LALT("`"));
@@ -180,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case KANA:
       if (record->event.pressed) {
-        if(mode_windows==false){
+        if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG1);
         }else{
           SEND_STRING(SS_LALT("`"));
diff --git a/keyboards/yushakobo/helix_type_r/keymaps/via/keymap.c b/keyboards/yushakobo/helix_type_r/keymaps/via/keymap.c
index e6917c23270..563c4153f12 100644
--- a/keyboards/yushakobo/helix_type_r/keymaps/via/keymap.c
+++ b/keyboards/yushakobo/helix_type_r/keymaps/via/keymap.c
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      | Reset|RGBRST|      |      |      |             |      |      |      |      |      |  Del |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |      |      |      |      |      | Mac  |             | Win  |      |      |      |      |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      |      |      |      |      |      |      |      |      |RGB ON| HUE+ | SAT+ | VAL+ |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
@@ -118,15 +118,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_ADJUST] =  LAYOUT( \
       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
       _______, RESET,   RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, \
-      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, \
+      _______, _______, _______, _______, _______, AG_NORM,                   AG_SWAP, _______, _______, _______, _______, _______, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD \
       )
 
 };
 
-static bool mode_windows = false;
-
 void encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* Left side encoder */
         if (clockwise) {
@@ -147,9 +145,9 @@ void dip_switch_update_user(uint8_t index, bool active) {
     switch (index) {
         case 0:
             if(active) { // Left no.1
-              mode_windows = true;
+              keymap_config.swap_lalt_lgui = true;
             } else { 
-              mode_windows = false;
+              keymap_config.swap_lalt_lgui = false;
             }
             break;
         case 1: