diff --git a/converter/usb_usb/binary/usb_usb_unimap.hex b/converter/usb_usb/binary/usb_usb_unimap.hex
index f643dffc..d94d61ce 100644
--- a/converter/usb_usb/binary/usb_usb_unimap.hex
+++ b/converter/usb_usb/binary/usb_usb_unimap.hex
@@ -1601,8 +1601,8 @@
 :10692000010001004700480001000100E9440100A6
 :106930000100010001000100010001003A003B00DC
 :106940003C003D003E003F0040004100420043004B
-:10695000010001004C00010001004400450052000C
-:1069600049000100010050004F0001004D004E00A1
+:10695000010035004C0001000100440045005200D8
+:1069600049000100010050004F0029004D004E0079
 :1069700051000100010001000100010001000100BF
 :1069800001000100010001000100010001000100FF
 :1069900001000100010001000100010001004D00A3
@@ -1610,6 +1610,6 @@
 :1069B00001000100010001000100010001000100CF
 :1069C00001000100010001000100010001000100BF
 :1069D00001000100010001000100010001000100AF
-:1069E000010001000100010001000100010001009F
+:1069E0000100010001000100490001000100010057
 :1069F000010001000100010001000100010001008F
 :00000001FF
diff --git a/converter/usb_usb/unimap.c b/converter/usb_usb/unimap.c
index 98be28ce..2c123806 100644
--- a/converter/usb_usb/unimap.c
+++ b/converter/usb_usb/unimap.c
@@ -35,8 +35,8 @@ const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = {
     ),
     UNIMAP(
               TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-    TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,TRNS,TRNS,         TRNS,TRNS,TRNS,
-    TRNS,F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS,DEL,      TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,
+    GRV,      TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,TRNS,TRNS,         TRNS,TRNS,TRNS,
+    ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL,      TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,
     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP,  INS,      TRNS,     TRNS,TRNS,TRNS,    TRNS,TRNS,TRNS,TRNS,
     TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,TRNS,TRNS,HOME,PGUP,LEFT,RGHT,     TRNS,TRNS,                        TRNS,TRNS,TRNS,TRNS,
     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,END, PGDN,DOWN,     TRNS,TRNS,          PGUP,         TRNS,TRNS,TRNS,TRNS,
diff --git a/converter/usb_usb/unimap_trans.h b/converter/usb_usb/unimap_trans.h
index ff63c14e..e4e59d36 100644
--- a/converter/usb_usb/unimap_trans.h
+++ b/converter/usb_usb/unimap_trans.h
@@ -42,25 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * |Ctl|Gui|Alt|MHEN|     Space      |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent|
  * `-----------------------------------------------------------' `-----------' `---------------'
  */
-
-/* USB 16x16
-*         ,---------------. ,---------------. ,---------------.
-*         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
-* ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
-* |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
-* `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
-* ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
-* |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
-* |-----------------------------------------------------------| |-----------| |---------------| |-------|
-* |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
-* |-----------------------------------------------------------| `-----------' |---------------| |-------|
-* |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
-* |-----------------------------------------------------------|     ,---.     |---------------| |-------|
-* |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
-* |-----------------------------------------------------------| ,-----------. |---------------| |-------|
-* |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
-* `-----------------------------------------------------------' `-----------' `---------------' `-------'
-*/
 const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
     { UNIMAP_KANA,  UNIMAP_VOLUME_DOWN, UNIMAP_VOLUME_UP, UNIMAP_VOLUME_MUTE, UNIMAP_A, UNIMAP_B, UNIMAP_C, UNIMAP_D,
       UNIMAP_E,     UNIMAP_F,     UNIMAP_G,     UNIMAP_H,     UNIMAP_I,     UNIMAP_J,     UNIMAP_K,     UNIMAP_L },
@@ -90,7 +71,7 @@ const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
       UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO    }, /* C8-CF */ \
     { UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,      /* D0-D7 */ \
       UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO    }, /* D8-DF */ \
-    { UNIMAP_LCTRL, UNIMAP_LSHIFT,UNIMAP_LALT,  UNIMAP_LGUI,  UNIMAP_RCTRL, UNIMAP_RSHIFT,UNIMAP_RALT,  UNIMAP_RGUI,     /* E0-E7 */ \
+    { UNIMAP_LCTRL, UNIMAP_LSHIFT,UNIMAP_LALT,  UNIMAP_LGUI,  UNIMAP_RCTRL, UNIMAP_RSHIFT,UNIMAP_RALT,  UNIMAP_RGUI,    /* E0-E7 */ \
       UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO    }, /* E8-EF */ \
     { UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,      /* F0-F7 */ \
       UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO,    UNIMAP_NO    }, /* F8-FF */ \