Talljoe's keymap for oddball keyboards.

keyboards/atreus/keymaps/talljoe-atreus/config.h

@@ -0,0 +1,42 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#define PREVENT_STUCK_MODIFIERS
+#define SPACE_COUNT 2
+
+#define TEMPLATE(                                                                     \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) LAYOUT( \
+  K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, \
+  K21, K22, K23, K24, K25,           K26, K27, K28, K29, K2A, \
+  K32, K33, K34, K35, K36,           K37, K38, K39, K3A, K3B, \
+  K10, K41, K42, K30, K44, K1D, K20, K45, K3C, K0D, K2B, K3D \
+)
+
+#define TEMPLATE_NUM(                                                                     \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) LAYOUT( \
+  K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, \
+  K21, K22, K23, K24, K25,           K26, K27, K28, K29, K2A, \
+  K32, K33, K34, K35, K36,           K37, K38, K39, K3A, K3B, \
+  K10, K41, K42, K30, K44, K1D, K20, K45, K48, K49, K2B, K3D \
+)
+
+
+#define TEMPLATE_RESET LAYOUT( \
+  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+)
+#endif

keyboards/atreus/keymaps/talljoe-atreus/keymap.c

@@ -0,0 +1 @@
+// This space intentionally left blank

keyboards/atreus/keymaps/talljoe-atreus/rules.mk

@@ -0,0 +1 @@
+USER_NAME := talljoe

keyboards/jd45/keymaps/talljoe/config.h

@@ -0,0 +1,22 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#define PREVENT_STUCK_MODIFIERS
+#define SPACE_COUNT 2
+
+#define TEMPLATE(                                                                   \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) { \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K0D,   K1D    }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2C,   KC_NO  }, \
+    { K30,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO  }, \
+    { K40,   K00,   K41,   K42,   K44,   KC_NO, K45,   KC_NO, K48,   K49,   K3D,   K4C,   KC_NO  }  \
+}
+
+#endif

keyboards/jd45/keymaps/talljoe/keymap.c

@@ -0,0 +1 @@
+// This space intentionally left blank

keyboards/tv44/keymaps/talljoe-minivan/config.h

@@ -0,0 +1,53 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#define SPACE_COUNT 2
+
+#define TEMPLATE(                                                                   \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) KEYMAP_ARROW( \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K0D, \
+    K41, K49, K42,      K44, K45,      K3C, K0B, K00, K3D       \
+)
+
+#define TEMPLATE_ALT(                                                              \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) KEYMAP_ARROW( \
+    K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+    K41, K49, K42,      K44, K45,      K48, K49, K4B, K4C       \
+)
+
+#define TEMPLATE_ADJUST(                                                            \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+) KEYMAP_ARROW( \
+    K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K2D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+    K40, K49, K42,      K44, K45,      K48, K0B, K0C, K4C       \
+)
+
+#define TEMPLATE_RESET KEYMAP_ARROW( \
+    RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
+    KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, RESET)
+
+#endif

keyboards/tv44/keymaps/talljoe-minivan/keymap.c

@@ -0,0 +1 @@
+// This space intentionally left blank

keyboards/tv44/keymaps/talljoe-minivan/rules.mk

@@ -0,0 +1,3 @@
+USER_NAME := talljoe
+
+COMMAND_ENABLE   = no  # Commands for debug and configuration

keyboards/zeal60/rules.mk

@@ -53,7 +53,7 @@ BOOTLOADER = atmel-dfu
 OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
@@ -76,3 +76,4 @@ RAW_ENABLE = yes
 DYNAMIC_KEYMAP_ENABLE = yes
 CIE1931_CURVE = yes
 
+LAYOUTS = 60_ansi 60_iso 60_hhkb 60_ansi_split_bs_rshift

layouts/community/60_ansi_split_bs_rshift/talljoe/keymap.c

@@ -1,23 +1,23 @@
 #ifdef KEYBOARD_zeal60
 #include "config.h"
 #include "zeal60.h"
-#include "zeal_backlight.h"
+#include "rgb_backlight.h"
 #include "action_layer.h"
 #include "solarized.h"
 #include "talljoe.h"
 
 // from zeal_backlight.c
 // we want to be able to set indicators for the spacebar stabs
 // but they are not represented by a row/index.
-extern zeal_backlight_config g_config;
+extern backlight_config g_config;
 void map_row_column_to_led( uint8_t row, uint8_t column, uint8_t *led );
 
 void set_backlight_defaults(void) {
   uint8_t space;
   uint8_t caps_lock;
   map_row_column_to_led(3, 12, &caps_lock);
   map_row_column_to_led(4, 7, &space);
-  zeal_backlight_config default_values = {
+  backlight_config default_values = {
     .use_split_backspace = USE_SPLIT_BACKSPACE,
     .use_split_left_shift = USE_SPLIT_LEFT_SHIFT,
     .use_split_right_shift = USE_SPLIT_RIGHT_SHIFT,
@@ -34,15 +34,17 @@ void set_backlight_defaults(void) {
     .layer_2_indicator = { .index = space, .color = solarized.yellow },
     .layer_3_indicator = { .index = 254, .color = solarized.red },
     .alphas_mods = {
-      BACKLIGHT_ALPHAS_MODS_ROW_0,
-      BACKLIGHT_ALPHAS_MODS_ROW_1,
-      BACKLIGHT_ALPHAS_MODS_ROW_2,
-      BACKLIGHT_ALPHAS_MODS_ROW_3,
-      BACKLIGHT_ALPHAS_MODS_ROW_4 }
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_0,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_1,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_2,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_3,
+      RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 }
   };
-  memcpy(&g_config, &default_values, sizeof(zeal_backlight_config));
+  memcpy(&g_config, &default_values, sizeof(backlight_config));
   backlight_config_save();
 
+#undef CUSTOM_RGB_LAYOUTS
+#ifdef CUSTOM_RGB_LAYOUTS
   solarized_t* S = &solarized;
   HSV alphas = S->base2;
   HSV custom_color_map[MATRIX_ROWS][MATRIX_COLS] = CM(
@@ -54,9 +56,12 @@ void set_backlight_defaults(void) {
   );
   for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
     for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
-      backlight_set_key_color(row, col, custom_color_map[row][col]);
+      uint8_t index;
+			map_row_column_to_led( row, col, &index );
+      set_key_color(index, custom_color_map[row][col]);
     }
   }
+#endif // CUSTOM_RGB_LAYOUTS
 }
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {

layouts/community/60_ansi_split_bs_rshift/talljoe/rules.mk

@@ -0,0 +1 @@
+SRC += $(KEYMAP_PATH)/solarized.c

layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c

@@ -0,0 +1,23 @@
+#include "solarized.h"
+
+#define MAKE_COLOR(_H, _S, _V) \
+  { .h = (((uint32_t)_H) * 255) / 360, .s = (((uint16_t)_S) * 255) / 100, .v = (((uint16_t)_V) * 255) / 100 }
+
+solarized_t solarized = {
+  .base03   = MAKE_COLOR(193, 100,  21),
+  .base02   = MAKE_COLOR(192,  90,  26),
+  .base01   = MAKE_COLOR(194,  25,  46),
+  .base00   = MAKE_COLOR(195,  23,  51),
+  .base0    = MAKE_COLOR(186,  13,  59),
+  .base1    = MAKE_COLOR(180,   9,  63),
+  .base2    = MAKE_COLOR( 44,  11,  93),
+  .base3    = MAKE_COLOR( 44,  10,  99),
+  .yellow   = MAKE_COLOR( 45, 100,  71),
+  .orange   = MAKE_COLOR( 18,  89,  80),
+  .red      = MAKE_COLOR(  1,  79,  86),
+  .magenta  = MAKE_COLOR(331,  74,  83),
+  .violet   = MAKE_COLOR(237,  45,  77),
+  .blue     = MAKE_COLOR(205,  82,  82),
+  .cyan     = MAKE_COLOR(175,  74,  63),
+  .green    = MAKE_COLOR( 68, 100,  60),
+};

layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h

@@ -0,0 +1,27 @@
+#ifndef SOLARIZED_H
+#define SOLARIZED_H
+
+#include "quantum/color.h"
+
+typedef struct {
+  HSV base03;
+  HSV base02;
+  HSV base01;
+  HSV base00;
+  HSV base0;
+  HSV base1;
+  HSV base2;
+  HSV base3;
+  HSV yellow;
+  HSV orange;
+  HSV red;
+  HSV magenta;
+  HSV violet;
+  HSV blue;
+  HSV cyan;
+  HSV green;
+} solarized_t;
+
+extern solarized_t solarized;
+
+#endif

users/talljoe/config.h

@@ -1,7 +1,7 @@
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
-#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
 
 #define RESET_LAYER 15
 

users/talljoe/talljoe.c

@@ -5,10 +5,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = TEMPLATE_TKL(
       KC_ESC,  KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_PSCR, KC_SLCK, MO_ADJ ,
-      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_INS , KC_HOME, KC_PGUP,
-      KC_TAB , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , KC_END , KC_PGDN,
-      US_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    US_SCLN, US_QUOT,          US_ENT ,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,          KC_UP  ,
+      US_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , US_BSLS, KC_INS , KC_HOME, KC_PGUP,
+      US_TAB , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , KC_END , KC_PGDN,
+      CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    US_SCLN, US_QUOT,          US_ENT ,
+      SH_LBRC, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   SH_RBRC,          KC_UP  ,
       KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC2, KC_SPC1, KC_SPC3,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT , KC_LEFT, KC_DOWN, KC_RGHT),
   [_WORKMAN] = TEMPLATE(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -34,41 +34,44 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D   , KC_H,    KC_N,    KC_E,    KC_I,    KC_O   , _______,          _______,
       _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B   , KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,
       _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______),
-
+#if (SPACE_COUNT > 1)
+  // A tweaked version of the Maltron layout
+  [_MALTROFF] = TEMPLATE(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, KC_Q,    KC_P,    KC_Y,    KC_G,    KC_B   , KC_J,    KC_M,    KC_U,    KC_K,    KC_L,    _______, _______, _______,
+      _______, KC_A,    KC_N,    KC_I,    KC_S,    KC_F   , KC_D,    KC_T,    KC_H,    KC_O,    KC_R   , US_ENT ,          KC_BSPC,
+      _______, KC_Z,    KC_X,    KC_C,    KC_V,    US_QUOT, KC_SCLN, KC_W,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,
+      _______, _______, _______,                   MLT_E  , _______, _______,                   _______, _______, _______, _______),
+#endif
 #ifdef ENABLE_GAME_LAYER
   [_GAME] = TEMPLATE(
       KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV,
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,
       MO_NAV , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT ,
       KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          KC_RSFT, MO_ADJ ,
-      KC_LCTL, KC_PTT , KC_PGDN,                   KC_SPC , KC_SPC , KC_SPC ,                    KC_RALT, KC_APP , KC_RCTL, KC_PTT ),
+      KC_LCTL, KC_PTT , KC_PGDN,                   KC_SPC , KC_SPC , KC_SPC ,                   KC_RALT, KC_APP , KC_RCTL, KC_PTT ),
 #endif
-  [_NAV] = TEMPLATE(
+  [_NAV] = TEMPLATE_NAV(
       KC_GRV , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      KC_TAB , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_VOLU, KC_INS , KC_PGUP, KC_UP  , KC_PGDN, KC_BTN1, KC_BTN2, KC_BTN3, KC_DEL ,
-      US_CAPS, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_MUTE, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , KC_RCTL,          TG_ADJ ,
-      KC_LSFT, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_VOLD, KC_END , KC_PGDN, KC_WBAK, KC_WFWD, KC_WREF,          KC_RSFT, KC_APP ,
+      US_TAB , KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_INS , KC_PGUP, KC_UP  , KC_PGDN, KC_BTN1, KC_BTN3, KC_BTN2, KC_DEL ,
+      CTL_ESC, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AMPR, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , US_QUOT,          TG_ADJ ,
+      KC_LSFT, KC_EQL,  KC_PLUS, KC_MINS, KC_UNDS, KC_ASTR, KC_CALC, US_GRV , KC_WBAK, KC_WFWD, KC_WREF,          KC_RSFT, KC_APP ,
       KC_LCTL, KC_LGUI, KC_LALT,                   NV_SPC2, NV_SPC1, NV_SPC3,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
-  [_NUM] = TEMPLATE(
+  [_NUM] = TEMPLATE_NUM(
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, XXXXXXX, KC_DEL ,
-      US_CAPS, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_PPLS, KC_PENT,          XXXXXXX,
-      KC_LSFT, KC_EQL,  KC_PLUS, KC_BSLS, KC_PIPE, KC_SCLN, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_PAST,          KC_PSLS, XXXXXXX,
+      KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_VOLU, KC_CIRC, KC_7,    KC_8,    KC_9,    KC_PMNS, XXXXXXX, XXXXXXX, KC_DEL ,
+      CTL_ESC, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_MUTE, KC_PENT, KC_4,    KC_5,    KC_6,    KC_PPLS, XXXXXXX,          KC_ENT ,
+      KC_LSFT, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_VOLD, KC_PIPE, KC_1,    KC_2,    KC_3,    KC_PAST,          KC_PSLS, TG_NUM ,
       KC_LCTL, KC_LGUI, KC_LALT,                   NM_SPC2, NM_SPC1, NM_SPC3,                   KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
  // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
-  [_ADJUST] = TEMPLATE(
-      MO_RST , FX(1)  , FX(2)  , FX(3)  , FX(4)  , FX(5)  , FX(6)  , FX(7)  , FX(8)  , FX(9)  , FX(10) , BR_DEC , BR_INC , XXXXXXX, MO_RST ,
-      XXXXXXX, H1_INC , S1_INC , H2_INC , S2_INC , EF_INC , RGB_HUI, RGB_SAI, RGB_MOD, RGB_M_P, DFAULTS, RGB_VAD, RGB_VAI, KC_DEL ,
+  [_ADJUST] = TEMPLATE_ADJUST(
+      MO_RST , FX(1)  , FX(2)  , FX(3)  , FX(4)  , FX(5)  , FX(8)  , FX(9)  , FX(10) , FX(20) , FX(0)  , BR_DEC , BR_INC , XXXXXXX, MO_RST ,
+      MO_RST , H1_INC , S1_INC , H2_INC , S2_INC , EF_INC , RGB_HUI, RGB_SAI, RGB_MOD, RGB_M_P, DFAULTS, RGB_VAD, RGB_VAI, MO_RST ,
       XXXXXXX, H1_DEC , S1_DEC , H2_DEC , S2_DEC , EF_DEC , RGB_HUD, RGB_SAD, RGB_RMOD,RGB_M_K, RGB_M_B, RGB_M_G,          TG_ADJ ,
-      TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE,          KC_CAPS, XXXXXXX,
-      MO_RST , AG_NORM, AG_SWAP,                   XXXXXXX, BL_STEP, XXXXXXX,                   RGB_TOG, XXXXXXX, XXXXXXX, TG_GAME),
+      TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, LY_MALT, XXXXXXX, XXXXXXX, KC_MAKE,          KC_CAPS, XXXXXXX,
+      MO_RST , AG_SWAP, AG_NORM,                   XXXXXXX, BL_TOGG, XXXXXXX,                   RGB_TOG, XXXXXXX, XXXXXXX, TG_GAME),
   // To Reset hit FN + ` + Esc
-  [_RESET] = TEMPLATE(
-      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
-      RESET  , XXXXXXX, XXXXXXX,                   XXXXXXX, KC_SLEP, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
+  [_RESET] = TEMPLATE_RESET,
 };
 
 void matrix_scan_user(void) {