diff --git a/keyboards/ergodox_ez/keymaps/sirrow/keymap.c b/keyboards/ergodox_ez/keymaps/sirrow/keymap.c
index 2ec0863ee4..84d6cb660f 100644
--- a/keyboards/ergodox_ez/keymaps/sirrow/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/sirrow/keymap.c
@@ -10,7 +10,7 @@
 #define SYMB 4 // symbol keys
 #define ARSB 5 // arrow (sub)
 #define MAC  6 // Mac Setting
-#define DRIL 7 // Mr.Driller
+#define DJMX 7 // DJMX
 #define FPS  8 // FPS
 
 enum custom_keycodes {
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |      |      |      |      |      |Reset |           |  MAC |      |      |      |      |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           | DRIL |      |  [   |  ]   |      |      |        |
+ * |        |      |      |      |      |      |      |           | DJMX |      |  [   |  ]   |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |  CAPS  |      |      |      |      |      |------|           |------|      |  (   |  )   |      |      |        |
  * |--------+------+------+------+------+------|      |           |  PFS |------+------+------+------+------+--------|
@@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                   KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
        TG(MAC),  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       TG(DRIL), KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
+       TG(DJMX), KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
                  KC_TRNS, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_TRNS,
        TG(FPS),  KC_TRNS, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS,
                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -322,7 +322,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
 ),
 
-/* Keymap 7: Mr.Driller
+/* Keymap 7: DJMAX
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
@@ -345,24 +345,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 // left hand
-[DRIL] = LAYOUT_ergodox(
+[DJMX] = LAYOUT_ergodox(
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_A   , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(BRCT),
                                            KC_TRNS, KC_TRNS,
                                                     KC_TRNS,
-                                  KC_UP,KC_TRNS, KC_TRNS,
+                                  KC_SPC , KC_TAB , KC_TRNS,
     // right hand
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, RPD,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_M   , KC_SCLN, KC_DOT,  KC_SLSH, KC_TRNS,
                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS,
-       KC_ESC,
-       KC_TAB,  KC_ENT, RPD
+       KC_TRNS,
+       KC_TRNS, KC_ENT , KC_BSPC
 ),
 /* Keymap 8: FPS
  *