Rebase to QMK 0.17.6, space shaving shenanigans

Also added Rollow Updated Kyria, Atreus, Ferris, CandybarO, Naked48. Only HD_rh (Rhodium/Titanium-esque) has been updated. All other files are included for cherry-picking opportunities, (esp. combo keys). Combos have not been updated to use new features (layer stuff. It's clunky). Tons of unorthodox hacks to save space on AVR. 0.17.6 has freed up more space, but I'm inclined to leave these hacks for now. They work and have been on all my boards for months. I'll use the space for other things, like add more layers with HD variations, perhaps (and the implications for combos and Adaptive Keys?).
moutis · Aug 5, 2022 · f5d9549 · f5d9549
1 parent f593b84
commit f5d9549
Show file tree

Hide file tree

Showing 64 changed files with 14,262 additions and 1,288 deletions.
diff --git a/Atreus/ATREUS-HD_RH.pdf b/Atreus/ATREUS-HD_RH.pdf
diff --git a/Atreus/atreus_hd_keymap.c b/Atreus/atreus_hd_keymap.c
@@ -1,18 +1,20 @@
 #include QMK_KEYBOARD_H
 
+
 /* THIS FILE WAS GENERATED!
  *
  * This file was generated by qmk json2c. You may or may not want to
  * edit it directly.
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_J, KC_G, KC_M, KC_P, KC_V, KC_HASH, KC_DOT, KC_SLSH, KC_QUOT, KC_DQUO, LCTL_T(KC_R), LALT_T(KC_S), LGUI_T(KC_N), LSFT_T(KC_T), LT(5,KC_B), LT(4,KC_COMM), RSFT_T(KC_A), RGUI_T(KC_E), RALT_T(KC_C), RCTL_T(KC_I), KC_X, KC_F, KC_L, KC_D, KC_K, LT(5,KC_ESC), TT(5), KC_MINS, KC_U, KC_O, KC_W, KC_Y, KC_DOWN, KC_UP, KC_APP, LT(4,KC_BSPC), LT(6,KC_H), LT(7,KC_MUTE), LT(4,KC_MPLY), LT(3,KC_SPC), LT(6,KC_ENT), LT(7,KC_TAB), KC_LEFT, KC_RGHT),
+	[0] = LAYOUT(KC_J, KC_G, KC_M, KC_P, KC_V, KC_HASH, KC_DOT, KC_SLSH, KC_QUOT, KC_DQUO, LCTL_T(KC_R), LALT_T(KC_S), LGUI_T(KC_N), LSFT_T(KC_T), LT(5,KC_K), LT(4,KC_COMM), RSFT_T(KC_A), RGUI_T(KC_E), RALT_T(KC_C), RCTL_T(KC_I), KC_X, KC_F, KC_L, KC_D, KC_B, TT(5), LT(7,KC_MPLY), KC_MINS, KC_U, KC_O, KC_W, KC_Y, KC_LEFT, KC_RGHT, KC_APP, LT(4,KC_BSPC), LT(6,KC_H), LT(7,KC_MUTE), LT(4,KC_MPLY), LT(3,KC_SPC), LT(6,KC_ENT), LT(7,KC_MPLY), KC_UP, KC_DOWN),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DQUO, KC_QUOT, LCTL_T(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT_T(KC_I), RCTL_T(KC_H), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_Y, KC_W, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_R), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[2] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, LT(7,KC_TAB), LT(5,KC_QUOT), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_BSPC), KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[3] = LAYOUT(KC_Z, KC_Q, LSA(KC_5), LSA(KC_7), LALT(KC_7), LALT(KC_4), KC_DLR, A(S(KC_2)), RALT(KC_3), LALT(KC_Y), KC_LT, KC_LBRC, KC_LPRN, KC_LCBR, LALT(KC_8), RALT(KC_1), RSFT_T(KC_PAST), RGUI_T(KC_PEQL), RALT_T(KC_PPLS), RCTL_T(KC_RO), KC_GT, KC_RBRC, KC_RPRN, KC_RCBR, RALT(KC_5), KC_TRNS, KC_TRNS, KC_UNDS, KC_PIPE, KC_AMPR, KC_CIRC, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, SK_DELWDL, SK_DELWDR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCTL_T(KC_H), 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_R), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[3] = LAYOUT(KC_Z, KC_Q, RALT(KC_5), LALT(KC_7), LSA(KC_7), LALT(KC_4), KC_DLR, A(S(KC_2)), RALT(KC_3), LALT(KC_Y), KC_LT, KC_LBRC, KC_LPRN, KC_LCBR, LALT(KC_8), RALT(KC_1), RSFT_T(KC_PAST), RGUI_T(KC_PEQL), RALT_T(KC_PPLS), RCTL_T(KC_RO), KC_GT, KC_RBRC, KC_RPRN, KC_RCBR, LSA(KC_5), KC_TRNS, KC_TRNS, KC_UNDS, KC_PIPE, KC_AMPR, KC_CIRC, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, SK_DELWDL, SK_DELWDR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 	[4] = LAYOUT(KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_GRV, KC_6, KC_7, KC_8, KC_BSLS, LCTL_T(KC_F5), LALT_T(KC_F6), LGUI_T(KC_F7), LSFT_T(KC_F8), KC_F14, KC_SCLN, RSFT_T(KC_1), RGUI_T(KC_5), RALT_T(KC_9), RCTL_T(KC_SLSH), KC_F1, KC_F2, KC_F3, KC_F4, KC_F15, KC_PAUS, KC_TAB, KC_MINS, KC_2, KC_3, KC_4, KC_EQL, KC_PSCR, KC_LSCR, KC_TRNS, KC_BSPC, KC_ENT, KC_TRNS, KC_DEL, KC_0, KC_DOT, KC_COMM, KC_TRNS, KC_TRNS),
-	[5] = LAYOUT(KC_NLCK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, LALT_T(KC_TAB), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, KC_SPC, KC_TRNS, TG(5), KC_PCMM, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, LGUI_T(KC_BSPC), LSFT_T(KC_ENT), KC_TRNS, KC_DEL, KC_P0, KC_PDOT, KC_C, KC_TRNS, KC_TRNS),
-	[6] = LAYOUT(SK_QUIT, SK_CLOZ, SK_SCAP, SK_SCLP, SK_FAGN, SK_DOCBEG, KC_HOME, KC_UP, KC_PGUP, SK_PARAPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, SK_FIND, SK_WORDPRV, KC_LEFT, KC_DOWN, KC_RGHT, SK_WORDNXT, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, SK_PSTM, KC_ESC, KC_TAB, SK_DOCEND, KC_END, KC_DOWN, KC_PGDN, SK_PARANXT, SK_ZOOMIN, SK_ZOOMOUT, SK_ZOOMRST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SK_HISTPRV, SK_HISTNXT, KC_TRNS, SK_HISTPRV, SK_HISTNXT),
-	[7] = LAYOUT(KC_NO, KC_NO, KC_EJCT, KC_NO, LCA(KC_DEL), SK_KILL, AG_SWAP, AG_NORM, KC_NO, KC_NO, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLU, KC_BRIU, KC_NO, HD_L_Bronze, HD_L_Gold, HD_L_QWERTY, KC_NO, KC_MRWD, KC_MFFD, KC_MSTP, KC_VOLD, KC_BRID, KC_NO, KC_NO, HD_AdaptKeyToggle, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, RESET, KC_MUTE, KC_MPLY, KC_MUTE, KC_NO, CG_NORM, CG_SWAP, KC_NO, KC_MPRV, KC_MNXT)
+	[5] = LAYOUT(KC_LNUM, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, LALT_T(KC_TAB), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, KC_SPC, TG(5), KC_TRNS, KC_PCMM, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, LGUI_T(KC_BSPC), LSFT_T(KC_ENT), KC_TRNS, KC_DEL, KC_P0, KC_PDOT, KC_C, KC_TRNS, KC_TRNS),
+	[6] = LAYOUT(SK_QUIT, SK_CLOZ, SK_SCAP, SK_SCLP, SK_FAGN, SK_DOCBEG, KC_HOME, KC_UP, KC_PGUP, SK_PARAPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, SK_FIND, SK_WORDPRV, KC_LEFT, KC_DOWN, KC_RGHT, SK_WORDNXT, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, SK_PSTM, KC_ESC, KC_TAB, SK_DOCEND, KC_END, KC_DOWN, KC_PGDN, SK_PARANXT, SK_HISTPRV, SK_HISTNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SK_HISTPRV, SK_HISTNXT, SK_ZOOMRST, SK_ZOOMOUT, SK_ZOOMIN),
+	[7] = LAYOUT(KC_NO, KC_NO, KC_EJCT, KC_NO, LCA(KC_DEL), SK_KILL, CG_SWAP, AG_SWAP, KC_NO, EE_CLR, KC_MPRV, KC_MNXT, KC_MPLY, KC_VOLU, KC_BRIU, KC_NO, HD_L_Bronze, HD_L_Titanium, HD_L_Rhodium, KC_NO, KC_MRWD, KC_MFFD, KC_MSTP, KC_VOLD, KC_BRID, KC_NO, KC_NO, HD_AdaptKeyToggle, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, QK_BOOT, KC_MUTE, KC_MPLY, KC_MUTE, KC_NO, CG_NORM, AG_NORM, KC_NO, KC_MPRV, KC_MNXT)
 };
+
diff --git a/Atreus/atreus_hd_keymap.c.bak b/Atreus/atreus_hd_keymap.c.bak
@@ -7,12 +7,12 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_J, KC_G, KC_M, KC_P, KC_V, HD_HASH, KC_DOT, KC_SLSH, KC_QUOT, KC_DQUO, LCTL_T(KC_R), LALT_T(KC_S), LGUI_T(KC_N), LSFT_T(KC_T), KC_B, KC_COMM, RSFT_T(KC_A), RGUI_T(KC_E), RALT_T(KC_C), RCTL_T(KC_I), KC_X, KC_F, KC_L, KC_D, KC_K, LT(7,KC_ESC), LT(7,KC_HENK), KC_MINS, KC_U, KC_O, KC_W, KC_Y, KC_DOWN, KC_UP, KC_APP, LT(4,KC_BSPC), LT(6,KC_H), LT(5,KC_MHEN), LT(5,KC_HENK), LT(3,KC_SPC), LT(6,KC_ENT), LT(5,KC_TAB), KC_LEFT, KC_RGHT),
+	[0] = LAYOUT(KC_J, KC_G, KC_M, KC_P, KC_V, KC_HASH, KC_DOT, KC_SLSH, KC_QUOT, KC_DQUO, LCTL_T(KC_R), LALT_T(KC_S), LGUI_T(KC_N), LSFT_T(KC_T), LT(5,KC_K), LT(4,KC_COMM), RSFT_T(KC_A), RGUI_T(KC_E), RALT_T(KC_C), RCTL_T(KC_I), KC_X, KC_F, KC_L, KC_D, KC_B, TT(5), LT(7,KC_MPLY), KC_MINS, KC_U, KC_O, KC_W, KC_Y, KC_LEFT, KC_RGHT, KC_APP, LT(4,KC_BSPC), LT(6,KC_H), LT(7,KC_MUTE), LT(4,KC_MPLY), LT(3,KC_SPC), LT(6,KC_ENT), LT(7,KC_MPLY), KC_UP, KC_DOWN),
 	[1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DQUO, KC_QUOT, LCTL_T(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RALT_T(KC_I), RCTL_T(KC_H), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_Y, KC_W, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_R), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[2] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, LT(7,KC_TAB), LT(5,KC_QUOT), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_BSPC), KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[3] = LAYOUT(KC_Z, KC_Q, LALT(KC_8), LSA(KC_5), LSA(KC_7), LALT(KC_4), KC_DLR, A(S(KC_2)), RALT(KC_3), LALT(KC_Y), LALT(KC_7), KC_LT, KC_LPRN, KC_LCBR, KC_LBRC, RALT(KC_1), RSFT_T(KC_PAST), RGUI_T(KC_PEQL), RALT_T(KC_PPLS), RCTL_T(KC_RO), RALT(KC_5), KC_GT, KC_RPRN, KC_RCBR, KC_RBRC, KC_TRNS, KC_TRNS, KC_UNDS, KC_PIPE, KC_AMPR, KC_CIRC, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, SK_DELWDL, SK_DELWDR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-	[4] = LAYOUT(LALT(KC_RBRC), LSA(KC_RBRC), LALT(KC_LBRC), LSA(KC_LBRC), LSA(KC_8), KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, LSA(KC_3), KC_LT, KC_LPRN, KC_LCBR, KC_LBRC, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, LSA(KC_4), KC_GT, KC_RPRN, KC_RCBR, KC_RBRC, KC_NLCK, KC_TAB, KC_COMM, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_ENT, KC_TRNS, KC_DEL, KC_P0, KC_PDOT, KC_C, KC_TRNS, KC_TRNS),
-	[5] = LAYOUT(KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_GRV, KC_7, KC_8, KC_9, KC_BSLS, LCTL_T(KC_F5), LALT_T(KC_F6), LGUI_T(KC_F7), LSFT_T(KC_F8), KC_F14, KC_SCLN, RSFT_T(KC_4), RGUI_T(KC_5), RALT_T(KC_6), RCTL_T(KC_SLSH), KC_F1, KC_F2, KC_F3, KC_F4, KC_F15, KC_PAUS, KC_TAB, KC_MINS, KC_1, KC_2, KC_3, KC_EQL, KC_PSCR, KC_LSCR, KC_TRNS, KC_BSPC, KC_ENT, KC_TRNS, KC_DEL, KC_0, KC_DOT, KC_COMM, KC_TRNS, KC_TRNS),
-	[6] = LAYOUT(SK_QUIT, SK_CLOZ, SK_SCAP, SK_SCLP, SK_FAGN, SK_DOCBEG, KC_HOME, KC_UP, KC_PGUP, SK_PARAPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, SK_FIND, SK_WORDPRV, KC_LEFT, KC_DOWN, KC_RGHT, SK_WORDNXT, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, SK_PSTM, KC_TRNS, KC_NLCK, SK_DOCEND, KC_END, KC_DOWN, KC_PGDN, SK_PARANXT, SK_ZOOMIN, SK_ZOOMOUT, SK_ZOOMRST, KC_TRNS, KC_TRNS, KC_ESC, KC_TRNS, SK_HISTPRV, SK_HISTNXT, KC_TRNS, SK_HISTPRV, SK_HISTNXT),
-	[7] = LAYOUT(KC_NO, KC_NO, KC_EJCT, KC_NO, LCA(KC_DEL), SK_KILL, KC_NO, CG_SWAP, AG_SWAP, KC_NO, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLU, KC_BRIU, KC_NO, HD_L_Bronze, HD_L_Gold, HD_L_QWERTY, KC_NO, KC_MRWD, KC_MFFD, KC_MSTP, KC_VOLD, KC_BRID, RESET, RESET, HD_AdaptKeyToggle, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_NO, KC_MUTE, KC_MPLY, KC_MUTE, KC_NO, CG_NORM, AG_NORM, KC_NO, KC_MPRV, KC_MNXT)
+	[2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LCTL_T(KC_H), 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, LT(6,KC_R), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[3] = LAYOUT(KC_Z, KC_Q, RALT(KC_5), LALT(KC_7), LSA(KC_7), LALT(KC_4), KC_DLR, A(S(KC_2)), RALT(KC_3), LALT(KC_Y), KC_LT, KC_LBRC, KC_LPRN, KC_LCBR, LALT(KC_8), RALT(KC_1), RSFT_T(KC_PAST), RGUI_T(KC_PEQL), RALT_T(KC_PPLS), RCTL_T(KC_RO), KC_GT, KC_RBRC, KC_RPRN, KC_RCBR, LSA(KC_5), KC_TRNS, KC_TRNS, KC_UNDS, KC_PIPE, KC_AMPR, KC_CIRC, KC_PERC, KC_TRNS, KC_TRNS, KC_TRNS, SK_DELWDL, SK_DELWDR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[4] = LAYOUT(KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_GRV, KC_6, KC_7, KC_8, KC_BSLS, LCTL_T(KC_F5), LALT_T(KC_F6), LGUI_T(KC_F7), LSFT_T(KC_F8), KC_F14, KC_SCLN, RSFT_T(KC_1), RGUI_T(KC_5), RALT_T(KC_9), RCTL_T(KC_SLSH), KC_F1, KC_F2, KC_F3, KC_F4, KC_F15, KC_PAUS, KC_TAB, KC_MINS, KC_2, KC_3, KC_4, KC_EQL, KC_PSCR, KC_LSCR, KC_TRNS, KC_BSPC, KC_ENT, KC_TRNS, KC_DEL, KC_0, KC_DOT, KC_COMM, KC_TRNS, KC_TRNS),
+	[5] = LAYOUT(KC_LNUM, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, LALT_T(KC_TAB), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, KC_SPC, TG(5), KC_TRNS, KC_PCMM, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, LGUI_T(KC_BSPC), LSFT_T(KC_ENT), KC_TRNS, KC_DEL, KC_P0, KC_PDOT, KC_C, KC_TRNS, KC_TRNS),
+	[6] = LAYOUT(SK_QUIT, SK_CLOZ, SK_SCAP, SK_SCLP, SK_FAGN, SK_DOCBEG, KC_HOME, KC_UP, KC_PGUP, SK_PARAPRV, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, SK_FIND, SK_WORDPRV, KC_LEFT, KC_DOWN, KC_RGHT, SK_WORDNXT, SK_UNDO, SK_CUT, SK_COPY, SK_PSTE, SK_PSTM, KC_ESC, KC_TAB, SK_DOCEND, KC_END, KC_DOWN, KC_PGDN, SK_PARANXT, SK_HISTPRV, SK_HISTNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, SK_HISTPRV, SK_HISTNXT, SK_ZOOMRST, SK_ZOOMOUT, SK_ZOOMIN),
+	[7] = LAYOUT(KC_NO, KC_NO, KC_EJCT, KC_NO, LCA(KC_DEL), SK_KILL, CG_SWAP, AG_SWAP, KC_NO, KC_NO, KC_MPRV, KC_MNXT, KC_MPLY, KC_VOLU, KC_BRIU, KC_NO, HD_L_Bronze, HD_L_Titanium, HD_L_Rhodium, KC_NO, KC_MRWD, KC_MFFD, KC_MSTP, KC_VOLD, KC_BRID, KC_NO, KC_NO, HD_AdaptKeyToggle, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, RESET, KC_MUTE, KC_MPLY, KC_MUTE, KC_NO, CG_NORM, AG_NORM, KC_NO, KC_MPRV, KC_MNXT)
 };
diff --git a/Atreus/atreus_hd_neu_sk-trim.json b/Atreus/atreus_hd_neu_sk-trim.json
@@ -31,25 +31,25 @@
       "KC_L",
       "KC_D",
       "KC_K",
-      "LT(5,KC_ESC)",
       "TT(5)",
+      "LT(7,KC_MUTE)",
       "KC_MINS",
       "KC_U",
       "KC_O",
       "KC_W",
       "KC_Y",
-      "KC_DOWN",
-      "KC_UP",
-      "KC_APP",
+      "KC_LEFT",
+      "KC_RGHT",
+      "KC_NO",
       "LT(4,KC_BSPC)",
       "LT(6,KC_H)",
-      "LT(7,KC_MUTE)",
+      "KC_APP",
       "LT(4,KC_MPLY)",
       "LT(3,KC_SPC)",
       "LT(6,KC_ENT)",
-      "LT(7,KC_TAB)",
-      "KC_LEFT",
-      "KC_RGHT"
+      "KC_NO",
+      "KC_UP",
+      "KC_DOWN"
     ],
     [
       "KC_TRNS",
@@ -86,69 +86,69 @@
       "KC_W",
       "KC_TRNS",
       "KC_TRNS",
-      "KC_TRNS",
+      "KC_NO",
       "KC_TRNS",
       "LT(6,KC_R)",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
-      "KC_TRNS",
+      "KC_NO",
       "KC_TRNS",
       "KC_TRNS"
     ],
     [
-      "KC_Q",
-      "KC_W",
-      "KC_E",
-      "KC_R",
-      "KC_T",
-      "KC_Y",
-      "KC_U",
-      "KC_I",
-      "KC_O",
+      "KC_J",
+      "KC_G",
+      "KC_M",
       "KC_P",
-      "KC_A",
+      "KC_V",
+      "KC_HASH",
+      "KC_DOT",
+      "KC_SLSH",
+      "KC_DQUO",
+      "KC_QUOT",
+      "KC_C",
       "KC_S",
-      "KC_D",
-      "KC_F",
-      "KC_G",
+      "KC_N",
+      "KC_T",
+      "KC_B",
+      "KC_COMM",
+      "KC_A",
+      "KC_E",
+      "KC_I",
       "KC_H",
-      "KC_J",
-      "KC_K",
-      "KC_L",
-      "KC_SCLN",
-      "KC_Z",
       "KC_X",
-      "KC_C",
-      "KC_V",
-      "KC_B",
-      "LT(7,KC_TAB)",
+      "KC_F",
+      "KC_L",
+      "KC_D",
+      "KC_K",
       "LT(5,KC_QUOT)",
+      "LT(7,KC_TAB)",
       "KC_N",
-      "KC_M",
-      "KC_COMM",
-      "KC_DOT",
-      "KC_SLSH",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
-      "LT(6,KC_BSPC)",
-      "KC_LSFT",
-      "KC_TRNS",
-      "KC_TRNS",
-      "KC_TRNS",
+      "KC_U",
+      "KC_O",
+      "KC_Y",
+      "KC_W",
       "KC_TRNS",
       "KC_TRNS",
+      "KC_NO",
+      "KC_BSPC",
+      "KC_R",
+      "KC_Q",
+      "KC_Z",
+      "KC_SPC",
+      "KC_ENT",
+      "KC_NO",
       "KC_TRNS",
       "KC_TRNS"
     ],
     [
       "KC_Z",
       "KC_Q",
-      "LSA(KC_5)",
-      "LSA(KC_7)",
+      "RALT(KC_5)",
       "LALT(KC_7)",
+      "LSA(KC_7)",
       "LALT(KC_4)",
       "KC_DLR",
       "ANY(A(S(KC_2)))",
@@ -168,7 +168,7 @@
       "KC_RBRC",
       "KC_RPRN",
       "KC_RCBR",
-      "RALT(KC_5)",
+      "LSA(KC_5)",
       "KC_TRNS",
       "KC_TRNS",
       "KC_UNDS",
@@ -314,18 +314,18 @@
       "KC_DOWN",
       "KC_PGDN",
       "ANY(SK_PARANXT)",
-      "ANY(SK_ZOOMIN)",
-      "ANY(SK_ZOOMOUT)",
-      "ANY(SK_ZOOMRST)",
+      "ANY(SK_HISTPRV)",
+      "ANY(SK_HISTNXT)",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
-      "ANY(SK_HISTPRV)",
-      "ANY(SK_HISTNXT)",
       "KC_TRNS",
       "ANY(SK_HISTPRV)",
-      "ANY(SK_HISTNXT)"
+      "ANY(SK_HISTNXT)",
+      "ANY(SK_ZOOMRST)",
+      "ANY(SK_ZOOMOUT)",
+      "ANY(SK_ZOOMIN)"
     ],
     [
       "KC_NO",