From 1c380c80dded643f3a3eb618c4a4fc9c21b46ecd Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 7 Jan 2023 18:52:56 -0600
Subject: [PATCH 01/66] Initial commit

---
 keyboards/fjlabs/vanguard65/config.h          | 117 ++++++++++++++++++
 keyboards/fjlabs/vanguard65/info.json         |  89 +++++++++++++
 .../vanguard65/keymaps/default/keymap.c       |  39 ++++++
 .../fjlabs/vanguard65/keymaps/via/keymap.c    | 114 +++++++++++++++++
 .../fjlabs/vanguard65/keymaps/via/rules.mk    |   3 +
 keyboards/fjlabs/vanguard65/readme.md         |  16 +++
 keyboards/fjlabs/vanguard65/rules.mk          |  23 ++++
 keyboards/fjlabs/vanguard65/vanguard65.c      |  14 +++
 keyboards/fjlabs/vanguard65/vanguard65.h      |  32 +++++
 9 files changed, 447 insertions(+)
 create mode 100644 keyboards/fjlabs/vanguard65/config.h
 create mode 100644 keyboards/fjlabs/vanguard65/info.json
 create mode 100644 keyboards/fjlabs/vanguard65/keymaps/default/keymap.c
 create mode 100644 keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
 create mode 100644 keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
 create mode 100644 keyboards/fjlabs/vanguard65/readme.md
 create mode 100644 keyboards/fjlabs/vanguard65/rules.mk
 create mode 100644 keyboards/fjlabs/vanguard65/vanguard65.c
 create mode 100644 keyboards/fjlabs/vanguard65/vanguard65.h

diff --git a/keyboards/fjlabs/vanguard65/config.h b/keyboards/fjlabs/vanguard65/config.h
new file mode 100644
index 000000000000..9afb378a7f3e
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/config.h
@@ -0,0 +1,117 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
+#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Define RGB */
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 36
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_SPD 144
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+/* #define RGBLIGHT_LAYER_BLINK*/
+
+/* Define MIDI */
+#define MIDI_ADVANCED
+#define SLIDER_PINA D6
+
+/* Define Encoder */
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { D4 }
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/fjlabs/vanguard65/info.json b/keyboards/fjlabs/vanguard65/info.json
new file mode 100644
index 000000000000..926a7d3f28ab
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Vanguard65",
+    "manufacturer": "FJLaboratories",
+    "url": "https://www.fjlaboratories.com",
+    "maintainer": "FJLabs",
+    "usb": {
+        "vid": "0x7074",
+        "pid": "0x1823",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/vanguard65/keymaps/default/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/default/keymap.c
new file mode 100644
index 000000000000..9d34865dd700
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
+        QK_GESC, 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_BSPC, KC_DEL,
+        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_BSLS, KC_PGUP, 
+        KC_CAPS, 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_PGDN, 
+        KC_LSFT, 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, KC_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
+        QK_GESC, 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_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+};
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
new file mode 100644
index 000000000000..455c1ac438aa
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
@@ -0,0 +1,114 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "analog.h"
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3
+};
+
+enum custom_keycodeas {
+    A_CW = USER00,
+    A_CCW
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_LAYER0] = { ENCODER_CCW_CW(A_CCW, A_CW) },
+    [_LAYER1] = { ENCODER_CCW_CW(A_CCW, A_CW) },
+    [_LAYER2] = { ENCODER_CCW_CW(A_CCW, A_CW) },
+    [_LAYER3] = { ENCODER_CCW_CW(A_CCW, A_CW) },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_all(
+        QK_GESC, 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_BSPC, KC_DEL,
+        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_BSLS, KC_PGUP, 
+        KC_CAPS, 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_BSPC, KC_PGDN, 
+        KC_LSFT, 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, KC_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_all(
+        QK_GESC, 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_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT_all(
+        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, 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, 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
+    ),
+
+    [_LAYER3] = LAYOUT_all(
+        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, 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, 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
+    ),
+
+};
+
+/* Define MIDI custom keycodes here */
+extern MidiDevice midi_device;
+#define MIDI_CC_OFF 0
+#define MIDI_CC_ON 127
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case A_CW:
+            if (record->event.pressed) {
+                midi_send_cc(&midi_device, midi_config.channel, 46, 1);
+            }
+            return true;
+        case A_CCW:
+            if (record->event.pressed) {
+                midi_send_cc(&midi_device, midi_config.channel, 46, 127);
+            }
+            return true;
+        default:
+            return true;
+    };
+}
+
+uint8_t last_read = 0;
+ 
+void slider(void) {
+    uint8_t current_read = (analogReadPin(SLIDER_PINA) +last_read) / 8; //filter strength
+ 
+    if (current_read != last_read ) { // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
+        midi_send_cc(&midi_device, 0, 0x30, 127 - (0x7F - (analogReadPin(SLIDER_PINA) >>3 )));
+ 
+    last_read = current_read;
+    }
+
+}
+ 
+ 
+void matrix_scan_user(void) {
+    slider();
+}
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk b/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
new file mode 100644
index 000000000000..ec3403dbccd6
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+SRC += analog.c
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/readme.md b/keyboards/fjlabs/vanguard65/readme.md
new file mode 100644
index 000000000000..775868c5d128
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/readme.md
@@ -0,0 +1,16 @@
+# PaperSky Studio Kyuu Hotswap
+
+The following is the QMK Firmware for the Kyuu compatible Hotswap PCB
+
+---
+
+* Keyboard Maintainer: FJLabs
+* Hardware Supported: Kyuu Hotswap PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/kyuu:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+You can enter the bootloader by pressing the two reset pads on the back of the PCB with tweezers.
diff --git a/keyboards/fjlabs/vanguard65/rules.mk b/keyboards/fjlabs/vanguard65/rules.mk
new file mode 100644
index 000000000000..9a3516f93dbe
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+LTO_ENABLE = yes
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes      # Mouse keys [NOTE TO SELF CHANGE TO YES]
+EXTRAKEY_ENABLE = yes      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+ENCODER_ENABLE = yes	   # Enable encoder
+MIDI_ENABLE = yes          # Enable MIDI
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/vanguard65.c b/keyboards/fjlabs/vanguard65/vanguard65.c
new file mode 100644
index 000000000000..f64da261aade
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/vanguard65.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "vanguard65.h"
diff --git a/keyboards/fjlabs/vanguard65/vanguard65.h b/keyboards/fjlabs/vanguard65/vanguard65.h
new file mode 100644
index 000000000000..d220eca90b69
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/vanguard65.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+/* Vanguard65 Keymap Definitions */
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C, K0D,   K0E }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C, K1D,   K1E }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, K2D,   K2E }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C, K3D,   K3E }, \
+    { K40, K41, K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D,   K4E }  \
+}

From 2c2be5769490fa073e70790e38edbf5992aae752 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 8 Jan 2023 16:36:50 -0600
Subject: [PATCH 02/66] update

---
 keyboards/fjlabs/vanguard65/config.h          |  7 ++---
 .../fjlabs/vanguard65/keymaps/via/keymap.c    | 28 ++++++++++---------
 keyboards/fjlabs/vanguard65/rules.mk          | 20 ++++++++++---
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/keyboards/fjlabs/vanguard65/config.h b/keyboards/fjlabs/vanguard65/config.h
index 9afb378a7f3e..c4c9df3ab3ba 100644
--- a/keyboards/fjlabs/vanguard65/config.h
+++ b/keyboards/fjlabs/vanguard65/config.h
@@ -54,20 +54,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGB_DI_PIN C7
-#define RGBLED_NUM 36
+#define RGBLED_NUM 4
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 255
 #define RGB_VAL_STEP 12
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-/* #define RGBLIGHT_LAYER_BLINK*/
 
 /* Define MIDI */
 #define MIDI_ADVANCED
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
index 455c1ac438aa..e45fe9cb4d0e 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
@@ -14,6 +14,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 #include "analog.h"
+#include "print.h"
+#include "string.h"
 
 enum layers {
     _LAYER0,
@@ -40,7 +42,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        QK_GESC, 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_BSPC, KC_DEL,
+        QK_BOOTLOADER, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
         KC_LSFT, 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, KC_END, 
@@ -82,12 +84,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case A_CW:
             if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 46, 1);
+                midi_send_cc(&midi_device, midi_config.channel, 90, 1);
             }
             return true;
         case A_CCW:
             if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 46, 127);
+                midi_send_cc(&midi_device, midi_config.channel, 90, 127);
             }
             return true;
         default:
@@ -95,20 +97,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     };
 }
 
-uint8_t last_read = 0;
- 
+/* MIDI Slider controls */
+uint16_t denoise_level = 16;
+uint8_t last_val = 0;
+
 void slider(void) {
-    uint8_t current_read = (analogReadPin(SLIDER_PINA) +last_read) / 8; //filter strength
- 
-    if (current_read != last_read ) { // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
-        midi_send_cc(&midi_device, 0, 0x30, 127 - (0x7F - (analogReadPin(SLIDER_PINA) >>3 )));
- 
-    last_read = current_read;
-    }
 
+    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
+
+    if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
+        midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
+        last_val = comp_val;
+    }
 }
  
- 
 void matrix_scan_user(void) {
     slider();
 }
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/rules.mk b/keyboards/fjlabs/vanguard65/rules.mk
index 9a3516f93dbe..7ccb0554fadc 100644
--- a/keyboards/fjlabs/vanguard65/rules.mk
+++ b/keyboards/fjlabs/vanguard65/rules.mk
@@ -10,13 +10,25 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
+# LTO_ENABLE = yes
+# BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+# MOUSEKEY_ENABLE = yes      # Mouse keys [NOTE TO SELF CHANGE TO YES]
+# EXTRAKEY_ENABLE = yes      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
+# CONSOLE_ENABLE = no        # Console for debug
+# COMMAND_ENABLE = no        # Commands for debug and configuration
+# NKRO_ENABLE = yes          # Enable N-Key Rollover
+# BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+# RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+# ENCODER_ENABLE = yes	   # Enable encoder
+# MIDI_ENABLE = yes          # Enable MIDI
+
 LTO_ENABLE = yes
 BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys [NOTE TO SELF CHANGE TO YES]
-EXTRAKEY_ENABLE = yes      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
-CONSOLE_ENABLE = no        # Console for debug
+MOUSEKEY_ENABLE = no      # Mouse keys [NOTE TO SELF CHANGE TO YES]
+EXTRAKEY_ENABLE = no      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
+CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
+NKRO_ENABLE = no          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes	   # Enable encoder

From 2c736f08dd892b9eef77402b9617161248f3c839 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 28 Jan 2023 14:25:26 -0600
Subject: [PATCH 03/66] added two options for the slider

---
 keyboards/fjlabs/vanguard65/config.h          |   3 +-
 keyboards/fjlabs/vanguard65/info.json         |   3 +-
 .../vanguard65/keymaps/via-midi/keymap.c      | 116 ++++++++++++++++++
 .../vanguard65/keymaps/via-midi/rules.mk      |   3 +
 .../fjlabs/vanguard65/keymaps/via/keymap.c    |  32 ++---
 keyboards/fjlabs/vanguard65/rules.mk          |  23 +---
 keyboards/fjlabs/vanguard65/vanguard65.h      |   2 +-
 7 files changed, 147 insertions(+), 35 deletions(-)
 create mode 100644 keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
 create mode 100644 keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk

diff --git a/keyboards/fjlabs/vanguard65/config.h b/keyboards/fjlabs/vanguard65/config.h
index c4c9df3ab3ba..94cd7e7c3a3c 100644
--- a/keyboards/fjlabs/vanguard65/config.h
+++ b/keyboards/fjlabs/vanguard65/config.h
@@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define RGB */
 #define RGB_DI_PIN C7
-#define RGBLED_NUM 4
+#define RGBLED_NUM 36
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -67,6 +67,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 255
 #define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 
 /* Define MIDI */
 #define MIDI_ADVANCED
diff --git a/keyboards/fjlabs/vanguard65/info.json b/keyboards/fjlabs/vanguard65/info.json
index 926a7d3f28ab..000e092b502a 100644
--- a/keyboards/fjlabs/vanguard65/info.json
+++ b/keyboards/fjlabs/vanguard65/info.json
@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -26,6 +26,7 @@
                 {"x": 12, "y": 0},
                 {"x": 13, "y": 0},
                 {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
 
                 {"x": 0, "y": 1, "w": 1.5},
                 {"x": 1.5, "y": 1},
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
new file mode 100644
index 000000000000..433eaa701893
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
@@ -0,0 +1,116 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "analog.h"
+#include "print.h"
+#include "string.h"
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3
+};
+
+enum custom_keycodeas {
+    A_CW = USER00,
+    A_CCW
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        QK_GESC, 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_BSPC, KC_DEL,
+        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_BSLS, KC_PGUP, 
+        KC_CAPS, 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_BSPC, KC_PGDN, 
+        KC_LSFT, 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, KC_MUTE, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        QK_GESC, 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_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT(
+        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, 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, 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
+    ),
+
+    [_LAYER3] = LAYOUT(
+        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, 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, 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
+    ),
+
+};
+
+/* Define MIDI custom keycodes here */
+extern MidiDevice midi_device;
+#define MIDI_CC_OFF 0
+#define MIDI_CC_ON 127
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case A_CW:
+            if (record->event.pressed) {
+                midi_send_cc(&midi_device, midi_config.channel, 89, 1);
+            }
+            return true;
+        case A_CCW:
+            if (record->event.pressed) {
+                midi_send_cc(&midi_device, midi_config.channel, 89, 127);
+            }
+            return true;
+        default:
+            return true;
+    };
+}
+
+/* MIDI Slider controls */
+uint16_t denoise_level = 16;
+uint8_t last_val = 0;
+
+void slider(void) {
+
+    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
+
+    if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
+        midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
+        last_val = current_val;
+    }
+}
+ 
+void matrix_scan_user(void) {
+    slider();
+}
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk b/keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk
new file mode 100644
index 000000000000..ec3403dbccd6
--- /dev/null
+++ b/keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+SRC += analog.c
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
index e45fe9cb4d0e..8f178223fd6a 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
@@ -32,24 +32,24 @@ enum custom_keycodeas {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER0] = { ENCODER_CCW_CW(A_CCW, A_CW) },
-    [_LAYER1] = { ENCODER_CCW_CW(A_CCW, A_CW) },
-    [_LAYER2] = { ENCODER_CCW_CW(A_CCW, A_CW) },
-    [_LAYER3] = { ENCODER_CCW_CW(A_CCW, A_CW) },
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 };
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_all(
-        QK_BOOTLOADER, 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_BSPC, KC_DEL,
+    [_LAYER0] = LAYOUT(
+        QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
-        KC_LSFT, 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, KC_END, 
+        KC_LSFT, 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, KC_MUTE, 
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_all(
+    [_LAYER1] = LAYOUT(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT_all(
+    [_LAYER2] = LAYOUT(
         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, 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,
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [_LAYER3] = LAYOUT_all(
+    [_LAYER3] = LAYOUT(
         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, 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,
@@ -84,12 +84,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case A_CW:
             if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 90, 1);
+                midi_send_cc(&midi_device, midi_config.channel, 89, 1);
             }
             return true;
         case A_CCW:
             if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 90, 127);
+                midi_send_cc(&midi_device, midi_config.channel, 89, 127);
             }
             return true;
         default:
@@ -100,14 +100,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 /* MIDI Slider controls */
 uint16_t denoise_level = 16;
 uint8_t last_val = 0;
+uint8_t rgb_hue = 0;
+uint8_t rgb_sat = 0;
 
 void slider(void) {
 
     uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
 
     if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
-        midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
-        last_val = comp_val;
+        rgb_hue = rgblight_get_hue();
+        rgb_sat = rgblight_get_sat();
+        rgblight_sethsv(rgb_hue, rgb_sat, current_val * 2);
+        last_val = current_val;
     }
 }
  
diff --git a/keyboards/fjlabs/vanguard65/rules.mk b/keyboards/fjlabs/vanguard65/rules.mk
index 7ccb0554fadc..d649fd163b4b 100644
--- a/keyboards/fjlabs/vanguard65/rules.mk
+++ b/keyboards/fjlabs/vanguard65/rules.mk
@@ -9,27 +9,14 @@ BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
-#
-# LTO_ENABLE = yes
-# BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-# MOUSEKEY_ENABLE = yes      # Mouse keys [NOTE TO SELF CHANGE TO YES]
-# EXTRAKEY_ENABLE = yes      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
-# CONSOLE_ENABLE = no        # Console for debug
-# COMMAND_ENABLE = no        # Commands for debug and configuration
-# NKRO_ENABLE = yes          # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-# RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-# ENCODER_ENABLE = yes	   # Enable encoder
-# MIDI_ENABLE = yes          # Enable MIDI
-
 LTO_ENABLE = yes
 BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no      # Mouse keys [NOTE TO SELF CHANGE TO YES]
-EXTRAKEY_ENABLE = no      # Audio control and System control [NOTE TO SELF CHANGE TO YES]
-CONSOLE_ENABLE = yes        # Console for debug
+MOUSEKEY_ENABLE = yes      # Mouse keys 
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no          # Enable N-Key Rollover
+NKRO_ENABLE = yes          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes	   # Enable encoder
-MIDI_ENABLE = yes          # Enable MIDI
\ No newline at end of file
+MIDI_ENABLE = yes          # Enable MIDI
diff --git a/keyboards/fjlabs/vanguard65/vanguard65.h b/keyboards/fjlabs/vanguard65/vanguard65.h
index d220eca90b69..d255c4b98b32 100644
--- a/keyboards/fjlabs/vanguard65/vanguard65.h
+++ b/keyboards/fjlabs/vanguard65/vanguard65.h
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 /* Vanguard65 Keymap Definitions */
-#define LAYOUT_all( \
+#define LAYOUT( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \

From 3d53b360e1e4a6f2652586ed550240fa19173f5b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 28 Jan 2023 14:33:11 -0600
Subject: [PATCH 04/66] comments

---
 keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c | 4 ++--
 keyboards/fjlabs/vanguard65/keymaps/via/keymap.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
index 433eaa701893..ef6029382ddc 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
+++ b/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
@@ -24,7 +24,7 @@ enum layers {
     _LAYER3
 };
 
-enum custom_keycodeas {
+enum custom_keycodes { // Define keycodes for MIDI usage of the volume knob
     A_CW = USER00,
     A_CCW
 };
@@ -84,7 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case A_CW:
             if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 89, 1);
+                midi_send_cc(&midi_device, midi_config.channel, 89, 1); 
             }
             return true;
         case A_CCW:
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
index 8f178223fd6a..933ac9d33d80 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
@@ -108,7 +108,7 @@ void slider(void) {
     uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
 
     if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
-        rgb_hue = rgblight_get_hue();
+        rgb_hue = rgblight_get_hue(); // Pull current hue and saturation values since we're just adjusting brightness
         rgb_sat = rgblight_get_sat();
         rgblight_sethsv(rgb_hue, rgb_sat, current_val * 2);
         last_val = current_val;

From 985376e8d44f5fdecbcef9e08984d08418da7031 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Fri, 3 Feb 2023 20:21:17 -0600
Subject: [PATCH 05/66] added rounding for the lower end of the LED values

---
 .../fjlabs/vanguard65/keymaps/via/keymap.c    | 142 +++++++++++++++++-
 1 file changed, 138 insertions(+), 4 deletions(-)

diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
index 933ac9d33d80..952555edeba6 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
@@ -30,6 +30,32 @@ enum custom_keycodeas {
 };
 
 
+// Set up EEPROM. Mostly boilerplate from QMK docs
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t slider_func_state : 8; // Hold only the slider function state. Will be a low value integer, so 8 bits will be used to store.
+    };
+} user_config_t;
+user_config_t user_config; 
+uint8_t slider_func = 0;
+
+// On keyboard initialization, pull the EEPROM values
+void keyboard_post_init_user(void) {
+    // Call the keymap level matrix init.
+
+    user_config.raw = eeconfig_read_user();
+
+    slider_func = user_config.slider_func_state;
+};
+
+// When the EEPROM gets forcefully reset, set the initialization value
+void eeconfig_init_user(void) {
+    user_config.raw = 0;
+    user_config.slider_func_state = 0;
+    eeconfig_update_user(user_config.raw);
+}
+
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
@@ -97,8 +123,88 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     };
 }
 
+// ====== Process VIA Custom UI ======
+// enum for the Value ID of the slider control
+enum via_slider_control {
+    id_slider_func = 1
+};
+
+// Define the function to set the slider value
+void slider_func_set_value ( uint8_t *data ) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch ( *value_id )
+    {
+        case id_slider_func:
+        {
+            slider_func = *value_data;
+            user_config.slider_func_state = *value_data;
+            eeconfig_update_user(user_config.raw); // Going to set it here instead of separately in the VIA save function. No point since this value is not being toggled very often
+            break;
+        }
+    }
+}
+
+// Define the function to read the slider value [so that VIA UI knows what to display]
+void slider_func_get_value( uint8_t *data ) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch ( *value_id )
+    {
+        case id_slider_func:
+        {
+            *value_data = slider_func;
+            break;
+        }
+    }
+}
+
+// Boilerplate from VIA Custom UI Documentation. Listen on the custom command channel, 
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if ( *channel_id == id_custom_channel ) {
+        switch ( *command_id )
+        {
+            case id_custom_set_value:
+            {
+                slider_func_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value:
+            {
+                slider_func_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save:
+            {
+                //buttglow_config_save(); // Not doing this
+                break;
+            }
+            default:
+            {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    // Return the unhandled state
+    *command_id = id_unhandled;
+
+    // DO NOT call raw_hid_send(data,length) here, let caller do this
+}
+
 /* MIDI Slider controls */
-uint16_t denoise_level = 16;
 uint8_t last_val = 0;
 uint8_t rgb_hue = 0;
 uint8_t rgb_sat = 0;
@@ -108,9 +214,37 @@ void slider(void) {
     uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
 
     if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
-        rgb_hue = rgblight_get_hue(); // Pull current hue and saturation values since we're just adjusting brightness
-        rgb_sat = rgblight_get_sat();
-        rgblight_sethsv(rgb_hue, rgb_sat, current_val * 2);
+
+        // Underglow RGB Brightness
+        if ( slider_func == 0 ) {
+            uint8_t rounded_val = 0;
+            rgb_hue = rgblight_get_hue(); // Pull current hue and saturation values since we're just adjusting brightness
+            rgb_sat = rgblight_get_sat();
+
+            // Since the lower end range of the slider can be a little bit noisy, it's going to make the zero-value a little hard to hit when it bounces around between 0-1-2. Better off to round any super low values to zero so the lights will affirmatively turn off at lower values.
+            if ( current_val < 3 ) {
+                rounded_val = 0;
+            } else {
+                rounded_val = current_val;
+            }
+
+            rgblight_sethsv(rgb_hue, rgb_sat, rounded_val * 2); // At 8 bits, it's going to be 0-128, so double to get full range.
+        }
+
+        // MIDI CC 90
+        else if ( slider_func == 1 ) {
+            midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
+        }
+
+        // Layer shift between layers 1 - 4 
+        else if ( slider_func == 2 ) {
+            layer_move(current_val >>5);
+        }
+
+        else {
+            return;
+        }
+
         last_val = current_val;
     }
 }

From 22c16d66640ad6ae1f19e769f91d4be8b0d3a5c5 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:18:55 -0600
Subject: [PATCH 06/66] moved folder, cleaned up code

---
 .../vanguard65/keymaps/via-midi/keymap.c      | 116 ------------------
 .../fjlabs/vanguard65/keymaps/via/rules.mk    |   3 -
 .../{fjlabs => keebfront}/vanguard65/config.h |   2 +-
 .../vanguard65/info.json                      |   6 +-
 .../vanguard65/keymaps/default/keymap.c       |   2 +-
 .../vanguard65/keymaps/via/keymap.c           |  18 ++-
 .../vanguard65/keymaps/via}/rules.mk          |   0
 .../vanguard65/readme.md                      |  10 +-
 .../{fjlabs => keebfront}/vanguard65/rules.mk |   0
 .../vanguard65/vanguard65.c                   |   2 +-
 .../vanguard65/vanguard65.h                   |   2 +-
 11 files changed, 20 insertions(+), 141 deletions(-)
 delete mode 100644 keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
 delete mode 100644 keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
 rename keyboards/{fjlabs => keebfront}/vanguard65/config.h (98%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/info.json (96%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/keymaps/default/keymap.c (98%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/keymaps/via/keymap.c (94%)
 rename keyboards/{fjlabs/vanguard65/keymaps/via-midi => keebfront/vanguard65/keymaps/via}/rules.mk (100%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/readme.md (69%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/rules.mk (100%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/vanguard65.c (93%)
 rename keyboards/{fjlabs => keebfront}/vanguard65/vanguard65.h (97%)

diff --git a/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c b/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
deleted file mode 100644
index ef6029382ddc..000000000000
--- a/keyboards/fjlabs/vanguard65/keymaps/via-midi/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright 2021 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "analog.h"
-#include "print.h"
-#include "string.h"
-
-enum layers {
-    _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3
-};
-
-enum custom_keycodes { // Define keycodes for MIDI usage of the volume knob
-    A_CW = USER00,
-    A_CCW
-};
-
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-};
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = LAYOUT(
-        QK_GESC, 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_BSPC, KC_DEL,
-        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_BSLS, KC_PGUP, 
-        KC_CAPS, 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_BSPC, KC_PGDN, 
-        KC_LSFT, 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, KC_MUTE, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT(
-        QK_GESC, 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_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
-    ),
-
-    [_LAYER2] = LAYOUT(
-        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, 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, 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
-    ),
-
-    [_LAYER3] = LAYOUT(
-        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, 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, 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
-    ),
-
-};
-
-/* Define MIDI custom keycodes here */
-extern MidiDevice midi_device;
-#define MIDI_CC_OFF 0
-#define MIDI_CC_ON 127
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case A_CW:
-            if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 89, 1); 
-            }
-            return true;
-        case A_CCW:
-            if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 89, 127);
-            }
-            return true;
-        default:
-            return true;
-    };
-}
-
-/* MIDI Slider controls */
-uint16_t denoise_level = 16;
-uint8_t last_val = 0;
-
-void slider(void) {
-
-    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
-
-    if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
-        midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
-        last_val = current_val;
-    }
-}
- 
-void matrix_scan_user(void) {
-    slider();
-}
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk b/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
deleted file mode 100644
index ec3403dbccd6..000000000000
--- a/keyboards/fjlabs/vanguard65/keymaps/via/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-SRC += analog.c
\ No newline at end of file
diff --git a/keyboards/fjlabs/vanguard65/config.h b/keyboards/keebfront/vanguard65/config.h
similarity index 98%
rename from keyboards/fjlabs/vanguard65/config.h
rename to keyboards/keebfront/vanguard65/config.h
index 94cd7e7c3a3c..0aea3cb6d45d 100644
--- a/keyboards/fjlabs/vanguard65/config.h
+++ b/keyboards/keebfront/vanguard65/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 <felix@fjlaboratories.com>
+Copyright 2022 <hello@keebfront.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/fjlabs/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
similarity index 96%
rename from keyboards/fjlabs/vanguard65/info.json
rename to keyboards/keebfront/vanguard65/info.json
index 000e092b502a..220fa77adee0 100644
--- a/keyboards/fjlabs/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Vanguard65",
-    "manufacturer": "FJLaboratories",
-    "url": "https://www.fjlaboratories.com",
-    "maintainer": "FJLabs",
+    "manufacturer": "Keebfront",
+    "url": "https://www.keebfront.com",
+    "maintainer": "Keebfront",
     "usb": {
         "vid": "0x7074",
         "pid": "0x1823",
diff --git a/keyboards/fjlabs/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/fjlabs/vanguard65/keymaps/default/keymap.c
rename to keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 9d34865dd700..4bfc378e091a 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 <felix@fjlaboratories.com>
+Copyright 2022 <hello@keebfront.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
similarity index 94%
rename from keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
rename to keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 952555edeba6..87ba6ce7ea52 100644
--- a/keyboards/fjlabs/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 <felix@fjlaboratories.com>
+Copyright 2022 <hello@keebfront.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
@@ -14,7 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 #include "analog.h"
-#include "print.h"
 #include "string.h"
 
 enum layers {
@@ -29,7 +28,6 @@ enum custom_keycodeas {
     A_CCW
 };
 
-
 // Set up EEPROM. Mostly boilerplate from QMK docs
 typedef union {
     uint32_t raw;
@@ -38,14 +36,13 @@ typedef union {
     };
 } user_config_t;
 user_config_t user_config; 
+
 uint8_t slider_func = 0;
 
 // On keyboard initialization, pull the EEPROM values
 void keyboard_post_init_user(void) {
     // Call the keymap level matrix init.
-
     user_config.raw = eeconfig_read_user();
-
     slider_func = user_config.slider_func_state;
 };
 
@@ -101,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-/* Define MIDI custom keycodes here */
+/* Configure custom MIDI Keycodes that will be placed on USER_00 and USER_01 */
 extern MidiDevice midi_device;
 #define MIDI_CC_OFF 0
 #define MIDI_CC_ON 127
@@ -211,18 +208,19 @@ uint8_t rgb_sat = 0;
 
 void slider(void) {
 
-    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
+    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3; // Bit shift 2^10 [1024] to 2^7 [128]
 
     if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
 
         // Underglow RGB Brightness
         if ( slider_func == 0 ) {
             uint8_t rounded_val = 0;
+            uint8_t round_coefficient = 3; // Set round-to-zero value target
             rgb_hue = rgblight_get_hue(); // Pull current hue and saturation values since we're just adjusting brightness
             rgb_sat = rgblight_get_sat();
 
             // Since the lower end range of the slider can be a little bit noisy, it's going to make the zero-value a little hard to hit when it bounces around between 0-1-2. Better off to round any super low values to zero so the lights will affirmatively turn off at lower values.
-            if ( current_val < 3 ) {
+            if ( current_val < round_coefficient ) {
                 rounded_val = 0;
             } else {
                 rounded_val = current_val;
@@ -233,12 +231,12 @@ void slider(void) {
 
         // MIDI CC 90
         else if ( slider_func == 1 ) {
-            midi_send_cc(&midi_device, 0, 90, current_val ); // (&midi_device, chan, message, highest control value - (current pin reading) >>resolution)
+            midi_send_cc(&midi_device, 0, 90, current_val );
         }
 
         // Layer shift between layers 1 - 4 
         else if ( slider_func == 2 ) {
-            layer_move(current_val >>5);
+            layer_move(current_val >>5); // Bit shift 2^7 to 2^2
         }
 
         else {
diff --git a/keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk b/keyboards/keebfront/vanguard65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/fjlabs/vanguard65/keymaps/via-midi/rules.mk
rename to keyboards/keebfront/vanguard65/keymaps/via/rules.mk
diff --git a/keyboards/fjlabs/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
similarity index 69%
rename from keyboards/fjlabs/vanguard65/readme.md
rename to keyboards/keebfront/vanguard65/readme.md
index 775868c5d128..740ade2941f1 100644
--- a/keyboards/fjlabs/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -1,15 +1,15 @@
-# PaperSky Studio Kyuu Hotswap
+# Keebfront Vanguard65
 
-The following is the QMK Firmware for the Kyuu compatible Hotswap PCB
+The following is the QMK Firmware for the Keebfront Vanguard65
 
 ---
 
-* Keyboard Maintainer: FJLabs
-* Hardware Supported: Kyuu Hotswap PCB
+* Keyboard Maintainer: Keebfront
+* Hardware Supported: Vanguard65
 
 Make example for this keyboard (after setting up your build environment):
 
-    make fjlabs/kyuu:default
+    make keebfront/vanguard65:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/fjlabs/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
similarity index 100%
rename from keyboards/fjlabs/vanguard65/rules.mk
rename to keyboards/keebfront/vanguard65/rules.mk
diff --git a/keyboards/fjlabs/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c
similarity index 93%
rename from keyboards/fjlabs/vanguard65/vanguard65.c
rename to keyboards/keebfront/vanguard65/vanguard65.c
index f64da261aade..3ddaf40257dd 100644
--- a/keyboards/fjlabs/vanguard65/vanguard65.c
+++ b/keyboards/keebfront/vanguard65/vanguard65.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <felix@fjlaboratories.com>
+Copyright 2022 <hello@keebfront.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
diff --git a/keyboards/fjlabs/vanguard65/vanguard65.h b/keyboards/keebfront/vanguard65/vanguard65.h
similarity index 97%
rename from keyboards/fjlabs/vanguard65/vanguard65.h
rename to keyboards/keebfront/vanguard65/vanguard65.h
index d255c4b98b32..e8703b31434c 100644
--- a/keyboards/fjlabs/vanguard65/vanguard65.h
+++ b/keyboards/keebfront/vanguard65/vanguard65.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 <felix@fjlaboratories.com>
+Copyright 2022 <hello@keebfront.com>
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or

From 7912ba932ddc06d0eb9a6ad8317b4ac5dd33bf1a Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:27:56 -0600
Subject: [PATCH 07/66] fixed layout def

---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 4bfc378e091a..6b8683132d60 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
+    [_LAYER0] = LAYOUT(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_PGDN, 
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
+    [_LAYER1] = LAYOUT(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 

From d9f4960a0fc8da5ea405583488d998cad032e78d Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:29:29 -0600
Subject: [PATCH 08/66] fioxed default layout

---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 6b8683132d60..ac1aa8f07f8c 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -24,16 +24,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER0] = LAYOUT(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
-        KC_CAPS, 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_PGDN, 
-        KC_LSFT, 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, KC_END, 
+        KC_CAPS, 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_BSPC, KC_PGDN, 
+        KC_LSFT, 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, KC_MUTE, 
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
-    )
+    ),
 };

From c8ed95a902c8b949bc021a96fbcfe5511b4a3f45 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:46:32 -0600
Subject: [PATCH 09/66] Update keyboards/keebfront/vanguard65/config.h

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/config.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/config.h b/keyboards/keebfront/vanguard65/config.h
index 0aea3cb6d45d..d76af6451422 100644
--- a/keyboards/keebfront/vanguard65/config.h
+++ b/keyboards/keebfront/vanguard65/config.h
@@ -79,25 +79,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Define less important options */
 
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
 //#define FORCE_NKRO
 
 /*

From a51d1f653a6c1a480fc6f49d0580a3845abbe85c Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:46:40 -0600
Subject: [PATCH 10/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 87ba6ce7ea52..06afbdca2f2f 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -23,7 +23,7 @@ enum layers {
     _LAYER3
 };
 
-enum custom_keycodeas {
+enum custom_keycodes {
     A_CW = USER00,
     A_CCW
 };

From c536fe6cc62d79761b804ecac99552aa2187f94f Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:46:48 -0600
Subject: [PATCH 11/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 06afbdca2f2f..9a83a39eaf41 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -117,7 +117,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return true;
         default:
             return true;
-    };
+    }
 }
 
 // ====== Process VIA Custom UI ======

From 2e45bf80fb77a35d6c9469cf2618b52f6427e6e3 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:46:56 -0600
Subject: [PATCH 12/66] Update keyboards/keebfront/vanguard65/readme.md

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/readme.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
index 740ade2941f1..df9f6b0bd1d6 100644
--- a/keyboards/keebfront/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -2,7 +2,6 @@
 
 The following is the QMK Firmware for the Keebfront Vanguard65
 
----
 
 * Keyboard Maintainer: Keebfront
 * Hardware Supported: Vanguard65
@@ -10,6 +9,11 @@ The following is the QMK Firmware for the Keebfront Vanguard65
 Make example for this keyboard (after setting up your build environment):
 
     make keebfront/vanguard65:default
+ 
+Flashing example for this keyboard:
+
+    make keebfront/vanguard65:default:flash
+
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 

From c0a5916f590f720926ead0a6dde9b8a7dc8d8c07 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:47:03 -0600
Subject: [PATCH 13/66] Update keyboards/keebfront/vanguard65/rules.mk

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/rules.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index d649fd163b4b..d59d825120ec 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -1,12 +1,5 @@
-# MCU name
-MCU = atmega32u4
-
 # Processor frequency
 F_CPU = 8000000
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 LTO_ENABLE = yes

From a463710519c86a86b30d2ba96f7eb53db0112dc0 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:47:23 -0600
Subject: [PATCH 14/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 220fa77adee0..cabcc24c3e8f 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -8,6 +8,8 @@
         "pid": "0x1823",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [

From 58f26a6d9784fda21d7ae2fd96cb51ab7997b6c7 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:50:18 -0600
Subject: [PATCH 15/66] updated default keymap to have encoder map
 functionality

---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 7 +++++++
 keyboards/keebfront/vanguard65/keymaps/default/rules.mk | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 keyboards/keebfront/vanguard65/keymaps/default/rules.mk

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index ac1aa8f07f8c..f21c7faff517 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -37,3 +37,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/keebfront/vanguard65/keymaps/default/rules.mk b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
new file mode 100644
index 000000000000..a40474b4d5c7
--- /dev/null
+++ b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file

From cf764f0b853df37873afffbeea6298ea45bf93a3 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:50:47 -0600
Subject: [PATCH 16/66] Update keyboards/keebfront/vanguard65/rules.mk

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index d59d825120ec..4b342c9a27dd 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -11,5 +11,5 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = yes          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes	   # Enable encoder
+ENCODER_ENABLE = yes       # Enable encoder
 MIDI_ENABLE = yes          # Enable MIDI

From 0349d63e973cd7ca8ef885a3ee86896781faa9da Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:57:12 -0600
Subject: [PATCH 17/66] Update keyboards/keebfront/vanguard65/config.h

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/config.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/config.h b/keyboards/keebfront/vanguard65/config.h
index d76af6451422..e48cdf2a7362 100644
--- a/keyboards/keebfront/vanguard65/config.h
+++ b/keyboards/keebfront/vanguard65/config.h
@@ -16,24 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
 // Checked with Eagle Schematic
 #define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
 #define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }

From 902eea4b031bc0b5865f1d7d638ab8721dd24d69 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 6 Feb 2023 18:57:26 -0600
Subject: [PATCH 18/66] Update keyboards/keebfront/vanguard65/config.h

Co-authored-by: jack <0x6a73@protonmail.com>
---
 keyboards/keebfront/vanguard65/config.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/config.h b/keyboards/keebfront/vanguard65/config.h
index e48cdf2a7362..e5955b7de6a2 100644
--- a/keyboards/keebfront/vanguard65/config.h
+++ b/keyboards/keebfront/vanguard65/config.h
@@ -23,12 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

From 8129f8d9f0f50f404748dc8956bff1d5893f6af6 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 8 Feb 2023 23:01:42 -0600
Subject: [PATCH 19/66] add encoder_update_kb

---
 keyboards/keebfront/vanguard65/vanguard65.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/keyboards/keebfront/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c
index 3ddaf40257dd..1736421dd227 100644
--- a/keyboards/keebfront/vanguard65/vanguard65.c
+++ b/keyboards/keebfront/vanguard65/vanguard65.c
@@ -12,3 +12,15 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "vanguard65.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+  if (!encoder_update_user(index, clockwise)) { return false; }
+  if (clockwise) {
+    tap_code_delay(KC_VOLU, 10);
+  } else {
+    tap_code_delay(KC_VOLD, 10);  
+  }
+  return true;
+}
+#endif
\ No newline at end of file

From cb7c0d0dbf598f4b1464dbeebec395c346c1b3b9 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 3 Apr 2023 19:37:23 -0500
Subject: [PATCH 20/66] Update keyboards/keebfront/vanguard65/vanguard65.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/vanguard65.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/keyboards/keebfront/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c
index 3ddaf40257dd..0409b1b56a1b 100644
--- a/keyboards/keebfront/vanguard65/vanguard65.c
+++ b/keyboards/keebfront/vanguard65/vanguard65.c
@@ -12,3 +12,17 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "vanguard65.h"
+
+#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif

From 9885c93d94eba3f352c45c47c478ebb88a7c001c Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 16 Apr 2023 16:00:04 -0500
Subject: [PATCH 21/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/info.json | 30 ++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index cabcc24c3e8f..101e111f86a1 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -10,6 +10,36 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "E6",
+                "pin_b": "D4"
+            }
+        ]
+    },
+    "rgblight": {
+        "led_count": 36,
+        "pin": "C7"
+        "val_step": 12,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

From a4c8a5eab7d5a7e18d1988998f128508e95b743b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 16 Apr 2023 16:00:11 -0500
Subject: [PATCH 22/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/info.json | 142 +++++++++++------------
 1 file changed, 69 insertions(+), 73 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 101e111f86a1..5bedd469ab08 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -43,79 +43,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
-
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
-                {"x": 15, "y": 1},
-
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
-                {"x": 15, "y": 2},
-
-                {"x": 0, "y": 3, "w": 1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-                {"x": 15, "y": 3},
-
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4}
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "K0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "K0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "K0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1, "x": 15, "y": 0 },
+                { "label": "K11", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 1.5, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 2.5, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 3.5, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 4.5, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 5.5, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 6.5, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 7.5, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 8.5, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 9.5, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1, "x": 10.5, "y": 1 },
+                { "label": "K1C", "matrix": [1, 12], "w": 1, "x": 11.5, "y": 1 },
+                { "label": "K1D", "matrix": [1, 13], "w": 1, "x": 12.5, "y": 1 },
+                { "label": "K1E", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1, "x": 15, "y": 1 },
+                { "label": "K21", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2C", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K2D", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "K2E", "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
+                { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
+                { "label": "K33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
+                { "label": "K34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
+                { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
+                { "label": "K36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
+                { "label": "K37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
+                { "label": "K38", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
+                { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
+                { "label": "K3B", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
+                { "label": "K3C", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "K3D", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
+                { "label": "K3E", "matrix": [3, 14], "w": 1, "x": 15, "y": 3 },
+                { "label": "K40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "K41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "K42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "K4A", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "K4B", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "K4C", "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
+                { "label": "K4D", "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
+                { "label": "K4E", "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
             ]
         }
     }

From 6d5d45a7d532f53ad48da6f160f5c08561b20f4c Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 16 Apr 2023 16:00:20 -0500
Subject: [PATCH 23/66] Update keyboards/keebfront/vanguard65/vanguard65.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/vanguard65.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c
index 0409b1b56a1b..4767d0c30bd6 100644
--- a/keyboards/keebfront/vanguard65/vanguard65.c
+++ b/keyboards/keebfront/vanguard65/vanguard65.c
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#include "vanguard65.h"
+#include "quantum.h"
 
 #if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
 bool encoder_update_kb(uint8_t index, bool clockwise) {

From 200aa62f1104acaef2c00075a78de1fbb8b3fcdd Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 16 Apr 2023 16:13:05 -0500
Subject: [PATCH 24/66] new qmk

---
 keyboards/keebfront/vanguard65/config.h  | 52 ------------------------
 keyboards/keebfront/vanguard65/info.json |  4 +-
 keyboards/keebfront/vanguard65/rules.mk  |  1 -
 3 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/config.h b/keyboards/keebfront/vanguard65/config.h
index e5955b7de6a2..71e47341d9b3 100644
--- a/keyboards/keebfront/vanguard65/config.h
+++ b/keyboards/keebfront/vanguard65/config.h
@@ -16,59 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-// Checked with Eagle Schematic
-#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
-#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* Define RGB */
-#define RGB_DI_PIN C7
-#define RGBLED_NUM 36
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LIMIT_VAL 255
-#define RGB_VAL_STEP 12
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
 
 /* Define MIDI */
 #define MIDI_ADVANCED
 #define SLIDER_PINA D6
-
-/* Define Encoder */
-#define ENCODERS_PAD_A { E6 }
-#define ENCODERS_PAD_B { D4 }
-
-/* Define less important options */
-
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 5bedd469ab08..07f74eb98a96 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -25,8 +25,8 @@
     },
     "rgblight": {
         "led_count": 36,
-        "pin": "C7"
-        "val_step": 12,
+        "pin": "C7",
+        "brightness_steps": 12,
         "animations": {
             "alternating": true,
             "breathing": true,
diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index 4b342c9a27dd..f46001760b83 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -11,5 +11,4 @@ COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = yes          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes       # Enable encoder
 MIDI_ENABLE = yes          # Enable MIDI

From 20d1ba1b4ddf861faef758fa783e7b02050bc900 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Fri, 28 Apr 2023 00:31:51 -0500
Subject: [PATCH 25/66] misc fixes

---
 keyboards/keebfront/vanguard65/info.json    |  1 +
 keyboards/keebfront/vanguard65/vanguard65.h | 32 ---------------------
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 keyboards/keebfront/vanguard65/vanguard65.h

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 07f74eb98a96..ef23ad223bc6 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -10,6 +10,7 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
         "rows": ["F4", "F1", "F7", "F6", "F5"]
diff --git a/keyboards/keebfront/vanguard65/vanguard65.h b/keyboards/keebfront/vanguard65/vanguard65.h
deleted file mode 100644
index e8703b31434c..000000000000
--- a/keyboards/keebfront/vanguard65/vanguard65.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2022 <hello@keebfront.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-/* Vanguard65 Keymap Definitions */
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C, K0D,   K0E }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C, K1D,   K1E }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, K2D,   K2E }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C, K3D,   K3E }, \
-    { K40, K41, K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D,   K4E }  \
-}

From 9bde9b72f4e05617f11573199a980334eb0af5d6 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Fri, 28 Apr 2023 01:57:17 -0500
Subject: [PATCH 26/66] Test

---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 9a83a39eaf41..e5dcc2a223fe 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -24,7 +24,7 @@ enum layers {
 };
 
 enum custom_keycodes {
-    A_CW = USER00,
+    A_CW = QK_KB_0,
     A_CCW
 };
 

From 8cf0fe94520dae68295819086301c8d5535d0fca Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 15 May 2023 17:18:12 -0500
Subject: [PATCH 27/66] Removed extraneous parts of hte rules.mk

---
 keyboards/keebfront/vanguard65/rules.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index f46001760b83..fc47c820d1a5 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -3,12 +3,5 @@ F_CPU = 8000000
 # Build Options
 #   change yes to no to disable
 LTO_ENABLE = yes
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes      # Mouse keys 
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
 MIDI_ENABLE = yes          # Enable MIDI

From c82ee931acef589c8ef260e26a3de7ecd88acb53 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 12 Jun 2023 18:10:48 -0500
Subject: [PATCH 28/66] Remove extra layers in the keymap

---
 .../keebfront/vanguard65/keymaps/via/keymap.c | 24 ++-----------------
 lib/lvgl                                      |  1 +
 2 files changed, 3 insertions(+), 22 deletions(-)
 create mode 160000 lib/lvgl

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index e5dcc2a223fe..7dac2eb69e83 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -18,9 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 enum layers {
     _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3
+    _LAYER1
 };
 
 enum custom_keycodes {
@@ -55,10 +53,8 @@ void eeconfig_init_user(void) {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
 #endif
 
@@ -80,22 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT(
-        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, 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, 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
-    ),
-
-    [_LAYER3] = LAYOUT(
-        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, 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, 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
-    ),
-
 };
 
 /* Configure custom MIDI Keycodes that will be placed on USER_00 and USER_01 */
diff --git a/lib/lvgl b/lib/lvgl
new file mode 160000
index 000000000000..e19410f8f8a2
--- /dev/null
+++ b/lib/lvgl
@@ -0,0 +1 @@
+Subproject commit e19410f8f8a256609da72cff549598e0df6fa4cf

From ed8904849492e1fe2c6cfa705d58f6540ca49410 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 12 Jun 2023 18:11:09 -0500
Subject: [PATCH 29/66] Revert "Remove extra layers in the keymap"

This reverts commit c82ee931acef589c8ef260e26a3de7ecd88acb53.
---
 .../keebfront/vanguard65/keymaps/via/keymap.c | 24 +++++++++++++++++--
 lib/lvgl                                      |  1 -
 2 files changed, 22 insertions(+), 3 deletions(-)
 delete mode 160000 lib/lvgl

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 7dac2eb69e83..e5dcc2a223fe 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -18,7 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 enum layers {
     _LAYER0,
-    _LAYER1
+    _LAYER1,
+    _LAYER2,
+    _LAYER3
 };
 
 enum custom_keycodes {
@@ -53,8 +55,10 @@ void eeconfig_init_user(void) {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
 #endif
 
@@ -76,6 +80,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
+    [_LAYER2] = LAYOUT(
+        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, 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, 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
+    ),
+
+    [_LAYER3] = LAYOUT(
+        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, 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, 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
+    ),
+
 };
 
 /* Configure custom MIDI Keycodes that will be placed on USER_00 and USER_01 */
diff --git a/lib/lvgl b/lib/lvgl
deleted file mode 160000
index e19410f8f8a2..000000000000
--- a/lib/lvgl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e19410f8f8a256609da72cff549598e0df6fa4cf

From 816715784fbd94954ecf466d3830acc76b119404 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 12 Jun 2023 18:12:59 -0500
Subject: [PATCH 30/66] removed excess layers

---
 .../keebfront/vanguard65/keymaps/via/keymap.c | 24 ++-----------------
 lib/lvgl                                      |  1 +
 2 files changed, 3 insertions(+), 22 deletions(-)
 create mode 160000 lib/lvgl

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index e5dcc2a223fe..7dac2eb69e83 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -18,9 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 enum layers {
     _LAYER0,
-    _LAYER1,
-    _LAYER2,
-    _LAYER3
+    _LAYER1
 };
 
 enum custom_keycodes {
@@ -55,10 +53,8 @@ void eeconfig_init_user(void) {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
 };
 #endif
 
@@ -80,22 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     ),
 
-    [_LAYER2] = LAYOUT(
-        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, 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, 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
-    ),
-
-    [_LAYER3] = LAYOUT(
-        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, 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, 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
-    ),
-
 };
 
 /* Configure custom MIDI Keycodes that will be placed on USER_00 and USER_01 */
diff --git a/lib/lvgl b/lib/lvgl
new file mode 160000
index 000000000000..e19410f8f8a2
--- /dev/null
+++ b/lib/lvgl
@@ -0,0 +1 @@
+Subproject commit e19410f8f8a256609da72cff549598e0df6fa4cf

From 8419b8cf926bf840694f7f7edbc6a71a00eed72b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 12 Jun 2023 18:49:05 -0500
Subject: [PATCH 31/66] update for latest QMK led definition

---
 keyboards/keebfront/vanguard65/info.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index ef23ad223bc6..1f5dca6b838c 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -26,7 +26,6 @@
     },
     "rgblight": {
         "led_count": 36,
-        "pin": "C7",
         "brightness_steps": 12,
         "animations": {
             "alternating": true,
@@ -41,6 +40,9 @@
             "twinkle": true
         }
     },
+    "ws2812": {
+        "pin": "C7"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

From 16749b6987bf2b45d63f71772ba311de8338f035 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 24 Jun 2023 14:44:52 -0500
Subject: [PATCH 32/66] update

---
 keyboards/keebfront/vanguard65/info.json            | 6 ++++++
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 4 ++--
 keyboards/keebfront/vanguard65/rules.mk             | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 1f5dca6b838c..2de2a98cf3f1 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -15,6 +15,12 @@
         "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
         "rows": ["F4", "F1", "F7", "F6", "F5"]
     },
+    "features": {
+        "extrakey": true,
+        "midi": true,
+        "rgblight": true,
+        "lto": true
+    }
     "encoder": {
         "enabled": true,
         "rotary": [
diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 7dac2eb69e83..7f44cb061f27 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -53,8 +53,8 @@ void eeconfig_init_user(void) {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
 };
 #endif
 
diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index fc47c820d1a5..be19296fdd58 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -2,6 +2,6 @@
 F_CPU = 8000000
 # Build Options
 #   change yes to no to disable
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-MIDI_ENABLE = yes          # Enable MIDI
+#LTO_ENABLE = yes
+#RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+#MIDI_ENABLE = yes          # Enable MIDI

From ac0b229746161ba651eab96e9085b970f64bf559 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 15 Jul 2023 01:29:04 -0500
Subject: [PATCH 33/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 2de2a98cf3f1..97d261f59393 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -20,7 +20,7 @@
         "midi": true,
         "rgblight": true,
         "lto": true
-    }
+    },
     "encoder": {
         "enabled": true,
         "rotary": [

From 456733e8189aaed49a1c6b7f3af014f67afe2494 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sat, 15 Jul 2023 01:29:13 -0500
Subject: [PATCH 34/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 7f44cb061f27..d7d660699a30 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -227,6 +227,6 @@ void slider(void) {
     }
 }
  
-void matrix_scan_user(void) {
+void housekeeping_task_user(void) {
     slider();
 }
\ No newline at end of file

From 0a5bf9fe6a085cef7ffc4fe30230ed9f19139a68 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 28 Aug 2023 20:47:43 -0500
Subject: [PATCH 35/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 97d261f59393..b092730edfe2 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -18,7 +18,9 @@
     "features": {
         "extrakey": true,
         "midi": true,
-        "rgblight": true,
+        "rgblight": true
+    },
+    "build": {
         "lto": true
     },
     "encoder": {

From 4bbf49c3ca57705be93794bf3349c620967ed550 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 28 Aug 2023 20:48:00 -0500
Subject: [PATCH 36/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index b092730edfe2..ac3f72cf96bd 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -51,8 +51,9 @@
     "ws2812": {
         "pin": "C7"
     },
+    "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
                 { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },

From d50489b2e3b19226c0f1ae3f02acdabe232d37f9 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 28 Aug 2023 20:48:15 -0500
Subject: [PATCH 37/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index f21c7faff517..954eb61c9bdd 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_65_ansi_blocker(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_65_ansi_blocker(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 

From 5e653bd777f759d73db23b100ddf89c66599a18a Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 28 Aug 2023 20:48:29 -0500
Subject: [PATCH 38/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index d7d660699a30..579231d5b50a 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_65_ansi_blocker(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_65_ansi_blocker(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 

From 9c4c679cad2e2787a07c5b1a10aa0870e2572a74 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 15:48:42 -0500
Subject: [PATCH 39/66] Update keyboards/keebfront/vanguard65/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/readme.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
index df9f6b0bd1d6..0c912da386e5 100644
--- a/keyboards/keebfront/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -17,4 +17,9 @@ Flashing example for this keyboard:
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-You can enter the bootloader by pressing the two reset pads on the back of the PCB with tweezers.
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset**: pressing the two reset pads on the back of the PCB with tweezers.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

From 184462b9688e93d9a9e50793b1c22db7124dd02b Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 15:49:00 -0500
Subject: [PATCH 40/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 954eb61c9bdd..bd7b5a50ea25 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LAYER1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
 #endif
\ No newline at end of file

From 8b99a190dd512964c144bab289391feb34cd6ce8 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 18:11:27 -0500
Subject: [PATCH 41/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index ac3f72cf96bd..b092730edfe2 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -51,9 +51,8 @@
     "ws2812": {
         "pin": "C7"
     },
-    "community_layouts": ["65_ansi_blocker"],
     "layouts": {
-        "LAYOUT_65_ansi_blocker": {
+        "LAYOUT": {
             "layout": [
                 { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
                 { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },

From 351d90a54c7322ab607b44d4421e7d24d9335248 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 18:11:40 -0500
Subject: [PATCH 42/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index bd7b5a50ea25..4f249c6aedec 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_65_ansi_blocker(
+    [_LAYER0] = LAYOUT(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_65_ansi_blocker(
+    [_LAYER1] = LAYOUT(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 

From 665672a3e1339456152553c24b383f5ed1104e10 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 18:11:49 -0500
Subject: [PATCH 43/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 579231d5b50a..d7d660699a30 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_65_ansi_blocker(
+    [_LAYER0] = LAYOUT(
         QK_GESC, 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_BSPC, KC_DEL,
         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_BSLS, KC_PGUP, 
         KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_65_ansi_blocker(
+    [_LAYER1] = LAYOUT(
         QK_GESC, 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_DEL, KC_HOME, 
         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 

From 7fafb86cc2a3d6b5d7605c3bf12ed43938c20b75 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 18:12:01 -0500
Subject: [PATCH 44/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index b092730edfe2..573bd42a0273 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -69,7 +69,7 @@
                 { "label": "K0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
                 { "label": "K0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
                 { "label": "K0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
-                { "label": "K10", "matrix": [1, 0], "w": 1, "x": 15, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1, "x": 15.25, "y": 0 },
                 { "label": "K11", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
                 { "label": "K12", "matrix": [1, 2], "w": 1, "x": 1.5, "y": 1 },
                 { "label": "K13", "matrix": [1, 3], "w": 1, "x": 2.5, "y": 1 },
@@ -84,7 +84,7 @@
                 { "label": "K1C", "matrix": [1, 12], "w": 1, "x": 11.5, "y": 1 },
                 { "label": "K1D", "matrix": [1, 13], "w": 1, "x": 12.5, "y": 1 },
                 { "label": "K1E", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "K20", "matrix": [2, 0], "w": 1, "x": 15, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1, "x": 15.25, "y": 1 },
                 { "label": "K21", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
                 { "label": "K22", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 },
                 { "label": "K23", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 },
@@ -98,7 +98,7 @@
                 { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 },
                 { "label": "K2C", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 },
                 { "label": "K2D", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "K2E", "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
+                { "label": "K2E", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2 },
                 { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
                 { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
                 { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },

From 36cca47b12da035afabd9ad25c2509d55eed782d Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 22:10:32 -0500
Subject: [PATCH 45/66] Delete vanguard65.c

---
 keyboards/keebfront/vanguard65/vanguard65.c | 28 ---------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 keyboards/keebfront/vanguard65/vanguard65.c

diff --git a/keyboards/keebfront/vanguard65/vanguard65.c b/keyboards/keebfront/vanguard65/vanguard65.c
deleted file mode 100644
index 4767d0c30bd6..000000000000
--- a/keyboards/keebfront/vanguard65/vanguard65.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2022 <hello@keebfront.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "quantum.h"
-
-#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif

From 0f5bd2242cc55cd27b116bccbf5a2c36d7d4c900 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 22:14:48 -0500
Subject: [PATCH 46/66] run qmk format_json

---
 keyboards/keebfront/vanguard65/info.json | 185 +++++++++++------------
 1 file changed, 91 insertions(+), 94 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index 573bd42a0273..fb2edf1b7b06 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -1,40 +1,29 @@
 {
-    "keyboard_name": "Vanguard65",
     "manufacturer": "Keebfront",
-    "url": "https://www.keebfront.com",
+    "keyboard_name": "Vanguard65",
     "maintainer": "Keebfront",
-    "usb": {
-        "vid": "0x7074",
-        "pid": "0x1823",
-        "device_version": "0.0.1"
-    },
-    "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
-        "rows": ["F4", "F1", "F7", "F6", "F5"]
-    },
-    "features": {
-        "extrakey": true,
-        "midi": true,
-        "rgblight": true
-    },
     "build": {
         "lto": true
     },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "enabled": true,
         "rotary": [
-            {
-                "pin_a": "E6",
-                "pin_b": "D4"
-            }
+            {"pin_a": "E6", "pin_b": "D4"}
         ]
     },
+    "features": {
+        "extrakey": true,
+        "midi": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
+        "rows": ["F4", "F1", "F7", "F6", "F5"]
+    },
+    "processor": "atmega32u4",
     "rgblight": {
-        "led_count": 36,
-        "brightness_steps": 12,
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -46,7 +35,15 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
-        }
+        },
+        "brightness_steps": 12,
+        "led_count": 36
+    },
+    "url": "https://www.keebfront.com",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1823",
+        "vid": "0x7074"
     },
     "ws2812": {
         "pin": "C7"
@@ -54,75 +51,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "label": "K0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "label": "K0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-                { "label": "K0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
-                { "label": "K0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
-                { "label": "K10", "matrix": [1, 0], "w": 1, "x": 15.25, "y": 0 },
-                { "label": "K11", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
-                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 1.5, "y": 1 },
-                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 2.5, "y": 1 },
-                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 3.5, "y": 1 },
-                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 4.5, "y": 1 },
-                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 5.5, "y": 1 },
-                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 6.5, "y": 1 },
-                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 7.5, "y": 1 },
-                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 8.5, "y": 1 },
-                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 9.5, "y": 1 },
-                { "label": "K1B", "matrix": [1, 11], "w": 1, "x": 10.5, "y": 1 },
-                { "label": "K1C", "matrix": [1, 12], "w": 1, "x": 11.5, "y": 1 },
-                { "label": "K1D", "matrix": [1, 13], "w": 1, "x": 12.5, "y": 1 },
-                { "label": "K1E", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label": "K20", "matrix": [2, 0], "w": 1, "x": 15.25, "y": 1 },
-                { "label": "K21", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
-                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 1.75, "y": 2 },
-                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 2.75, "y": 2 },
-                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 3.75, "y": 2 },
-                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 4.75, "y": 2 },
-                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 5.75, "y": 2 },
-                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 6.75, "y": 2 },
-                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 7.75, "y": 2 },
-                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 8.75, "y": 2 },
-                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 9.75, "y": 2 },
-                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 10.75, "y": 2 },
-                { "label": "K2C", "matrix": [2, 12], "w": 1, "x": 11.75, "y": 2 },
-                { "label": "K2D", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label": "K2E", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2 },
-                { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-                { "label": "K33", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-                { "label": "K34", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-                { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-                { "label": "K36", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-                { "label": "K37", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-                { "label": "K38", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
-                { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
-                { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
-                { "label": "K3B", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3 },
-                { "label": "K3C", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
-                { "label": "K3D", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
-                { "label": "K3E", "matrix": [3, 14], "w": 1, "x": 15, "y": 3 },
-                { "label": "K40", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label": "K41", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "K42", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label": "K46", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label": "K4A", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
-                { "label": "K4B", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label": "K4C", "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
-                { "label": "K4D", "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
-                { "label": "K4E", "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0, "w": 1},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0, "w": 1},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0, "w": 1},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0, "w": 1},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0, "w": 1},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0, "w": 1},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 1},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0, "w": 1},
+                {"label": "K10", "matrix": [1, 0], "x": 15.25, "y": 0, "w": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K12", "matrix": [1, 2], "x": 1.5, "y": 1, "w": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 2.5, "y": 1, "w": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 3.5, "y": 1, "w": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 4.5, "y": 1, "w": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 5.5, "y": 1, "w": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1, "w": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 7.5, "y": 1, "w": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 8.5, "y": 1, "w": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 9.5, "y": 1, "w": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 10.5, "y": 1, "w": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 11.5, "y": 1, "w": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 12.5, "y": 1, "w": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K20", "matrix": [2, 0], "x": 15.25, "y": 1, "w": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K22", "matrix": [2, 2], "x": 1.75, "y": 2, "w": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 2.75, "y": 2, "w": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 3.75, "y": 2, "w": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 4.75, "y": 2, "w": 1},
+                {"label": "K26", "matrix": [2, 6], "x": 5.75, "y": 2, "w": 1},
+                {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2, "w": 1},
+                {"label": "K28", "matrix": [2, 8], "x": 7.75, "y": 2, "w": 1},
+                {"label": "K29", "matrix": [2, 9], "x": 8.75, "y": 2, "w": 1},
+                {"label": "K2A", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1},
+                {"label": "K2B", "matrix": [2, 11], "x": 10.75, "y": 2, "w": 1},
+                {"label": "K2C", "matrix": [2, 12], "x": 11.75, "y": 2, "w": 1},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 1},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3, "w": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3, "w": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3, "w": 1},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 1},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3, "w": 1},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3, "w": 1},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3, "w": 1},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3, "w": 1},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3, "w": 1},
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4, "w": 1},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4, "w": 1},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4, "w": 1}
             ]
         }
     }

From db3b81d5f311b38623f77ab93bda96cbe6847370 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Tue, 5 Sep 2023 23:27:19 -0500
Subject: [PATCH 47/66] Update keyboards/keebfront/vanguard65/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keebfront/vanguard65/rules.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/rules.mk b/keyboards/keebfront/vanguard65/rules.mk
index be19296fdd58..3437a35bdf1d 100644
--- a/keyboards/keebfront/vanguard65/rules.mk
+++ b/keyboards/keebfront/vanguard65/rules.mk
@@ -1,7 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-# Build Options
-#   change yes to no to disable
-#LTO_ENABLE = yes
-#RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-#MIDI_ENABLE = yes          # Enable MIDI

From 2f55115c6fb06ea1c54e6f02742991a33b08b6b3 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 11 Sep 2023 19:59:58 -0500
Subject: [PATCH 48/66] Update keyboards/keebfront/vanguard65/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/keebfront/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
index 0c912da386e5..3ca4b102d937 100644
--- a/keyboards/keebfront/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -23,3 +23,6 @@ Enter the bootloader in 2 ways:
 
 * **Physical reset**: pressing the two reset pads on the back of the PCB with tweezers.
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Matrix Diagram
+![MatrixCoordinates](https://i.imgur.com/rQfEXyeh.jpeg)

From db3970ba15e978d388e5242e71ed30a483e51e81 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 11 Sep 2023 20:00:07 -0500
Subject: [PATCH 49/66] Update keyboards/keebfront/vanguard65/readme.md

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/keebfront/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
index 3ca4b102d937..2eb36c158f1a 100644
--- a/keyboards/keebfront/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -1,5 +1,6 @@
 # Keebfront Vanguard65
 
+![Vanguard65](https://i.imgur.com/1AnyRaEh.png)
 The following is the QMK Firmware for the Keebfront Vanguard65
 
 

From fc617cc70d1d5b5373c98fcc0d7deb969c376cd9 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 11 Sep 2023 20:01:11 -0500
Subject: [PATCH 50/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 143 ++++++++++++-----------
 1 file changed, 74 insertions(+), 69 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index fb2edf1b7b06..c6b1f3653b1f 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -51,75 +51,80 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0, "w": 1},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0, "w": 1},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0, "w": 1},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0, "w": 1},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0, "w": 1},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0, "w": 1},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 1},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0, "w": 1},
-                {"label": "K10", "matrix": [1, 0], "x": 15.25, "y": 0, "w": 1},
-                {"label": "K11", "matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"label": "K12", "matrix": [1, 2], "x": 1.5, "y": 1, "w": 1},
-                {"label": "K13", "matrix": [1, 3], "x": 2.5, "y": 1, "w": 1},
-                {"label": "K14", "matrix": [1, 4], "x": 3.5, "y": 1, "w": 1},
-                {"label": "K15", "matrix": [1, 5], "x": 4.5, "y": 1, "w": 1},
-                {"label": "K16", "matrix": [1, 6], "x": 5.5, "y": 1, "w": 1},
-                {"label": "K17", "matrix": [1, 7], "x": 6.5, "y": 1, "w": 1},
-                {"label": "K18", "matrix": [1, 8], "x": 7.5, "y": 1, "w": 1},
-                {"label": "K19", "matrix": [1, 9], "x": 8.5, "y": 1, "w": 1},
-                {"label": "K1A", "matrix": [1, 10], "x": 9.5, "y": 1, "w": 1},
-                {"label": "K1B", "matrix": [1, 11], "x": 10.5, "y": 1, "w": 1},
-                {"label": "K1C", "matrix": [1, 12], "x": 11.5, "y": 1, "w": 1},
-                {"label": "K1D", "matrix": [1, 13], "x": 12.5, "y": 1, "w": 1},
-                {"label": "K1E", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "K20", "matrix": [2, 0], "x": 15.25, "y": 1, "w": 1},
-                {"label": "K21", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"label": "K22", "matrix": [2, 2], "x": 1.75, "y": 2, "w": 1},
-                {"label": "K23", "matrix": [2, 3], "x": 2.75, "y": 2, "w": 1},
-                {"label": "K24", "matrix": [2, 4], "x": 3.75, "y": 2, "w": 1},
-                {"label": "K25", "matrix": [2, 5], "x": 4.75, "y": 2, "w": 1},
-                {"label": "K26", "matrix": [2, 6], "x": 5.75, "y": 2, "w": 1},
-                {"label": "K27", "matrix": [2, 7], "x": 6.75, "y": 2, "w": 1},
-                {"label": "K28", "matrix": [2, 8], "x": 7.75, "y": 2, "w": 1},
-                {"label": "K29", "matrix": [2, 9], "x": 8.75, "y": 2, "w": 1},
-                {"label": "K2A", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1},
-                {"label": "K2B", "matrix": [2, 11], "x": 10.75, "y": 2, "w": 1},
-                {"label": "K2C", "matrix": [2, 12], "x": 11.75, "y": 2, "w": 1},
-                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "K2E", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 1},
-                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1},
-                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1},
-                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3, "w": 1},
-                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3, "w": 1},
-                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3, "w": 1},
-                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 1},
-                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3, "w": 1},
-                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1},
-                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3, "w": 1},
-                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3, "w": 1},
-                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1},
-                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3, "w": 1},
-                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3, "w": 1},
-                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "K4A", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4, "w": 1},
-                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4, "w": 1},
-                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4, "w": 1}
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
             ]
         }
     }

From 71c1cf6a3bee59da74695454c927242be3b07b77 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 11 Sep 2023 20:01:46 -0500
Subject: [PATCH 51/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 .../vanguard65/keymaps/default/keymap.c       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 4f249c6aedec..6e9523a7c69b 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -22,19 +22,19 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        QK_GESC, 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_BSPC, KC_DEL,
-        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_BSLS, KC_PGUP, 
-        KC_CAPS, 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_BSPC, KC_PGDN, 
-        KC_LSFT, 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, KC_MUTE, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
+                 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_BSLS, KC_PGUP, 
+                 KC_CAPS, 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_BSPC, KC_PGDN, 
+                 KC_LSFT, 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, 
+                 KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
-        QK_GESC, 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_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+        _______, QK_GESC, 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_END, 
+                 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+                 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,  
+                 _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
 };
 

From 51d125dccfb0978ea6463b7face29d96c4d44655 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 11 Sep 2023 20:03:11 -0500
Subject: [PATCH 52/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 .../keebfront/vanguard65/keymaps/via/keymap.c | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index d7d660699a30..7749e292a8a4 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -61,19 +61,19 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT(
-        QK_GESC, 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_BSPC, KC_DEL,
-        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_BSLS, KC_PGUP, 
-        KC_CAPS, 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_BSPC, KC_PGDN, 
-        KC_LSFT, 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, KC_MUTE, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
+                 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_BSLS, KC_PGUP, 
+                 KC_CAPS, 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_BSPC, KC_PGDN, 
+                 KC_LSFT, 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, 
+                 KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT(
-        QK_GESC, 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_DEL, KC_HOME, 
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_PGUP,
-        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+        _______, QK_GESC, 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_END, 
+                 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
+                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+                 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,  
+                 _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
 };

From d196bb4ce4452f2c02c3595781d65c0c7b6686f0 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 13 Sep 2023 18:48:57 -0500
Subject: [PATCH 53/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 7749e292a8a4..16af79186c86 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_ansi_blocker_split_bs(
         KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
                  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_BSLS, KC_PGUP, 
                  KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_ansi_blocker_split_bs(
         _______, QK_GESC, 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_END, 
                  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
                  _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 

From 9b31f1dff8ecb56b078df61bbe0fe7d36300c6a8 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 13 Sep 2023 18:49:07 -0500
Subject: [PATCH 54/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 6e9523a7c69b..59a4753842db 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT(
+    [_LAYER0] = LAYOUT_ansi_blocker_split_bs(
         KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
                  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_BSLS, KC_PGUP, 
                  KC_CAPS, 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_BSPC, KC_PGDN, 
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT(
+    [_LAYER1] = LAYOUT_ansi_blocker_split_bs(
         _______, QK_GESC, 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_END, 
                  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
                  _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 

From 071d75e75dc48b54bf32107de5c2e6b2bbb572c8 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 13 Sep 2023 18:49:17 -0500
Subject: [PATCH 55/66] Update keyboards/keebfront/vanguard65/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/info.json | 614 ++++++++++++++++++++++-
 1 file changed, 613 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/info.json
index c6b1f3653b1f..8a20c3a649fd 100644
--- a/keyboards/keebfront/vanguard65/info.json
+++ b/keyboards/keebfront/vanguard65/info.json
@@ -49,7 +49,7 @@
         "pin": "C7"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"matrix": [3, 14], "x": 0, "y": 0},
 
@@ -126,6 +126,618 @@
                 {"matrix": [4, 13], "x": 15.5, "y": 4},
                 {"matrix": [4, 14], "x": 16.5, "y": 4}
             ]
+        },
+        "LAYOUT_ansi_blocker": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_split_bs": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_split_bs": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
+        },
+        "LAYOUT_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 13], "x": 15.5, "y": 0},
+                {"matrix": [0, 14], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [2, 6], "x": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 3, "y": 4},
+                {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
+            ]
         }
     }
 }

From d54123dc12d8c977f4e08bcff6dd28c54ca0e771 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 20 Sep 2023 22:17:34 -0500
Subject: [PATCH 56/66] Update
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 16af79186c86..7a142adb4b4d 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -60,15 +60,15 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_ansi_blocker_split_bs(
+    [_LAYER0] = LAYOUT_all(
         KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
                  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_BSLS, KC_PGUP, 
                  KC_CAPS, 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_BSPC, KC_PGDN, 
-                 KC_LSFT, 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, 
+                 KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, 
                  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_ansi_blocker_split_bs(
+    [_LAYER1] = LAYOUT_all(
         _______, QK_GESC, 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_END, 
                  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
                  _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 

From 643b7f1545e832fee69cca932eac7543e43e43d9 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 20 Sep 2023 22:17:45 -0500
Subject: [PATCH 57/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 59a4753842db..a59b84ef1a7a 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -21,11 +21,11 @@ enum layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_LAYER0] = LAYOUT_ansi_blocker_split_bs(
+    [_LAYER0] = LAYOUT_all(
         KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
                  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_BSLS, KC_PGUP, 
                  KC_CAPS, 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_BSPC, KC_PGDN, 
-                 KC_LSFT, 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, 
+                 KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, 
                  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 

From 11bc0ac987e786791a45a1abf3c600aecdbe9c9d Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 9 Oct 2023 18:17:08 -0500
Subject: [PATCH 58/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 .../keebfront/vanguard65/keymaps/default/keymap.c      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index a59b84ef1a7a..8eb32d3aa03c 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -22,11 +22,11 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
-                 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_BSLS, KC_PGUP, 
-                 KC_CAPS, 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_BSPC, KC_PGDN, 
-                 KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, 
-                 KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL,  KC_HOME,
+                 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_BSLS,          KC_PGUP,
+                 KC_CAPS, 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_PGDN,
+                 KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+                 KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT_ansi_blocker_split_bs(

From a378b1536c40c3060abe5240cbbf74e8a4fa6c03 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 9 Oct 2023 18:17:16 -0500
Subject: [PATCH 59/66] Update
 keyboards/keebfront/vanguard65/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 .../keebfront/vanguard65/keymaps/default/keymap.c      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 8eb32d3aa03c..12ee7241bfa2 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -30,11 +30,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_LAYER1] = LAYOUT_ansi_blocker_split_bs(
-        _______, QK_GESC, 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_END, 
-                 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
-                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-                 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,  
-                 _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+        _______, QK_GESC, 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_END,
+                 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,          _______,
+                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+                 _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,
+                 _______, _______, _______,                            _______,                   _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT
     ),
 };
 

From ee5ea81509d70becf0944f3465e2188ad727c7d6 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Mon, 9 Oct 2023 18:26:39 -0500
Subject: [PATCH 60/66] Confirm all keymaps compile

---
 keyboards/keebfront/vanguard65/keymaps/via/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
index 7a142adb4b4d..7b3b79b45cfc 100644
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
@@ -61,9 +61,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_all(
-        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME
-                 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_BSLS, KC_PGUP, 
-                 KC_CAPS, 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_BSPC, KC_PGDN, 
+        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME,
+                 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_BSLS,         KC_PGUP, 
+                 KC_CAPS, 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_PGDN, 
                  KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, 
                  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_LAYER1] = LAYOUT_all(
         _______, QK_GESC, 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_END, 
                  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
-                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
                  _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,  
                  _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
     ),

From 221021b17ae04fd284989b995c05454011cfdd5c Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 16 Oct 2024 10:21:54 -0700
Subject: [PATCH 61/66] update for latest QMK best definitions

---
 .../vanguard65/{info.json => keyboard.json}   |   0
 .../keebfront/vanguard65/keymaps/via/keymap.c | 232 ------------------
 .../keebfront/vanguard65/keymaps/via/rules.mk |   3 -
 3 files changed, 235 deletions(-)
 rename keyboards/keebfront/vanguard65/{info.json => keyboard.json} (100%)
 delete mode 100644 keyboards/keebfront/vanguard65/keymaps/via/keymap.c
 delete mode 100644 keyboards/keebfront/vanguard65/keymaps/via/rules.mk

diff --git a/keyboards/keebfront/vanguard65/info.json b/keyboards/keebfront/vanguard65/keyboard.json
similarity index 100%
rename from keyboards/keebfront/vanguard65/info.json
rename to keyboards/keebfront/vanguard65/keyboard.json
diff --git a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c b/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
deleted file mode 100644
index 7b3b79b45cfc..000000000000
--- a/keyboards/keebfront/vanguard65/keymaps/via/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-Copyright 2022 <hello@keebfront.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "analog.h"
-#include "string.h"
-
-enum layers {
-    _LAYER0,
-    _LAYER1
-};
-
-enum custom_keycodes {
-    A_CW = QK_KB_0,
-    A_CCW
-};
-
-// Set up EEPROM. Mostly boilerplate from QMK docs
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t slider_func_state : 8; // Hold only the slider function state. Will be a low value integer, so 8 bits will be used to store.
-    };
-} user_config_t;
-user_config_t user_config; 
-
-uint8_t slider_func = 0;
-
-// On keyboard initialization, pull the EEPROM values
-void keyboard_post_init_user(void) {
-    // Call the keymap level matrix init.
-    user_config.raw = eeconfig_read_user();
-    slider_func = user_config.slider_func_state;
-};
-
-// When the EEPROM gets forcefully reset, set the initialization value
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    user_config.slider_func_state = 0;
-    eeconfig_update_user(user_config.raw);
-}
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [_LAYER1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
-};
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = LAYOUT_all(
-        KC_MUTE, QK_GESC, 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_BSPC, KC_DEL, KC_HOME,
-                 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_BSLS,         KC_PGUP, 
-                 KC_CAPS, 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_PGDN, 
-                 KC_LSFT, KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, 
-                 KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [_LAYER1] = LAYOUT_all(
-        _______, QK_GESC, 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_END, 
-                 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, _______,
-                 _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-                 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,  
-                 _______, _______, _______,                            _______,                   _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-
-};
-
-/* Configure custom MIDI Keycodes that will be placed on USER_00 and USER_01 */
-extern MidiDevice midi_device;
-#define MIDI_CC_OFF 0
-#define MIDI_CC_ON 127
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case A_CW:
-            if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 89, 1);
-            }
-            return true;
-        case A_CCW:
-            if (record->event.pressed) {
-                midi_send_cc(&midi_device, midi_config.channel, 89, 127);
-            }
-            return true;
-        default:
-            return true;
-    }
-}
-
-// ====== Process VIA Custom UI ======
-// enum for the Value ID of the slider control
-enum via_slider_control {
-    id_slider_func = 1
-};
-
-// Define the function to set the slider value
-void slider_func_set_value ( uint8_t *data ) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch ( *value_id )
-    {
-        case id_slider_func:
-        {
-            slider_func = *value_data;
-            user_config.slider_func_state = *value_data;
-            eeconfig_update_user(user_config.raw); // Going to set it here instead of separately in the VIA save function. No point since this value is not being toggled very often
-            break;
-        }
-    }
-}
-
-// Define the function to read the slider value [so that VIA UI knows what to display]
-void slider_func_get_value( uint8_t *data ) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch ( *value_id )
-    {
-        case id_slider_func:
-        {
-            *value_data = slider_func;
-            break;
-        }
-    }
-}
-
-// Boilerplate from VIA Custom UI Documentation. Listen on the custom command channel, 
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if ( *channel_id == id_custom_channel ) {
-        switch ( *command_id )
-        {
-            case id_custom_set_value:
-            {
-                slider_func_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value:
-            {
-                slider_func_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save:
-            {
-                //buttglow_config_save(); // Not doing this
-                break;
-            }
-            default:
-            {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    // Return the unhandled state
-    *command_id = id_unhandled;
-
-    // DO NOT call raw_hid_send(data,length) here, let caller do this
-}
-
-/* MIDI Slider controls */
-uint8_t last_val = 0;
-uint8_t rgb_hue = 0;
-uint8_t rgb_sat = 0;
-
-void slider(void) {
-
-    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3; // Bit shift 2^10 [1024] to 2^7 [128]
-
-    if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
-
-        // Underglow RGB Brightness
-        if ( slider_func == 0 ) {
-            uint8_t rounded_val = 0;
-            uint8_t round_coefficient = 3; // Set round-to-zero value target
-            rgb_hue = rgblight_get_hue(); // Pull current hue and saturation values since we're just adjusting brightness
-            rgb_sat = rgblight_get_sat();
-
-            // Since the lower end range of the slider can be a little bit noisy, it's going to make the zero-value a little hard to hit when it bounces around between 0-1-2. Better off to round any super low values to zero so the lights will affirmatively turn off at lower values.
-            if ( current_val < round_coefficient ) {
-                rounded_val = 0;
-            } else {
-                rounded_val = current_val;
-            }
-
-            rgblight_sethsv(rgb_hue, rgb_sat, rounded_val * 2); // At 8 bits, it's going to be 0-128, so double to get full range.
-        }
-
-        // MIDI CC 90
-        else if ( slider_func == 1 ) {
-            midi_send_cc(&midi_device, 0, 90, current_val );
-        }
-
-        // Layer shift between layers 1 - 4 
-        else if ( slider_func == 2 ) {
-            layer_move(current_val >>5); // Bit shift 2^7 to 2^2
-        }
-
-        else {
-            return;
-        }
-
-        last_val = current_val;
-    }
-}
- 
-void housekeeping_task_user(void) {
-    slider();
-}
\ No newline at end of file
diff --git a/keyboards/keebfront/vanguard65/keymaps/via/rules.mk b/keyboards/keebfront/vanguard65/keymaps/via/rules.mk
deleted file mode 100644
index ec3403dbccd6..000000000000
--- a/keyboards/keebfront/vanguard65/keymaps/via/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
-SRC += analog.c
\ No newline at end of file

From 46cf4602475a4b61ba3008930af18bb41fdc5200 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 16 Oct 2024 13:55:53 -0700
Subject: [PATCH 62/66] Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/keebfront/vanguard65/keyboard.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keyboard.json b/keyboards/keebfront/vanguard65/keyboard.json
index 8a20c3a649fd..d74dcea2e8f8 100644
--- a/keyboards/keebfront/vanguard65/keyboard.json
+++ b/keyboards/keebfront/vanguard65/keyboard.json
@@ -8,7 +8,6 @@
     },
     "diode_direction": "COL2ROW",
     "encoder": {
-        "enabled": true,
         "rotary": [
             {"pin_a": "E6", "pin_b": "D4"}
         ]
@@ -16,7 +15,9 @@
     "features": {
         "extrakey": true,
         "midi": true,
-        "rgblight": true
+        "rgblight": true,
+        "mousekey": true,
+        "encoder": true
     },
     "matrix_pins": {
         "cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
@@ -31,7 +32,6 @@
             "knight": true,
             "rainbow_mood": true,
             "rainbow_swirl": true,
-            "rgb_test": true,
             "snake": true,
             "static_gradient": true,
             "twinkle": true

From e1328a0099983b4c2a808dfdb41bb33c105fa627 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Wed, 16 Oct 2024 14:53:44 -0700
Subject: [PATCH 63/66] Added minimum slider functionality.

---
 .../vanguard65/keymaps/default/keymap.c       | 22 ++++++++++++++++++-
 .../vanguard65/keymaps/default/rules.mk       |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 12ee7241bfa2..901353c37aee 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -13,6 +13,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
+#include "analog.h"
+#include "string.h"
+
+uint8_t last_val = 0;
+uint8_t current_val = 0;
+extern MidiDevice midi_device;
 
 enum layers {
     _LAYER0,
@@ -43,4 +49,18 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_LAYER0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [_LAYER1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 };
-#endif
\ No newline at end of file
+#endif
+
+void slider(void) {
+    current_val = analogReadPin(SLIDER_PINA) >>3;
+
+    if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
+        midi_send_cc(&midi_device, 0, 90, current_val );
+    }
+
+    last_val = current_val;
+}
+
+void housekeeping_task_user(void) {
+    slider();
+}
diff --git a/keyboards/keebfront/vanguard65/keymaps/default/rules.mk b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
index a40474b4d5c7..ec24085279ca 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
+++ b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
@@ -1 +1,2 @@
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
+ENCODER_MAP_ENABLE = yes
+SRC += analog.c
\ No newline at end of file

From 56577a77bca9957aa6eb706a89725b5a90081cf2 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Thu, 24 Oct 2024 08:48:38 -0700
Subject: [PATCH 64/66] update readme

---
 keyboards/keebfront/vanguard65/readme.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/readme.md b/keyboards/keebfront/vanguard65/readme.md
index 2eb36c158f1a..d054271bb3c3 100644
--- a/keyboards/keebfront/vanguard65/readme.md
+++ b/keyboards/keebfront/vanguard65/readme.md
@@ -1,21 +1,21 @@
-# Keebfront Vanguard65
+# Vanguard65
 
 ![Vanguard65](https://i.imgur.com/1AnyRaEh.png)
-The following is the QMK Firmware for the Keebfront Vanguard65
 
+*A 65% keyboard with knob and slider by [Keebfront](https://keebfront.com/).*
 
-* Keyboard Maintainer: Keebfront
+* Keyboard Maintainer: [Keebfront](https://keebfront.com/)
 * Hardware Supported: Vanguard65
+* Hardware Availability: https://www.keebfront.com/product/vanguard65
 
 Make example for this keyboard (after setting up your build environment):
 
     make keebfront/vanguard65:default
- 
+
 Flashing example for this keyboard:
 
     make keebfront/vanguard65:default:flash
 
-
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
 ## Bootloader
@@ -26,4 +26,4 @@ Enter the bootloader in 2 ways:
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 
 ## Matrix Diagram
-![MatrixCoordinates](https://i.imgur.com/rQfEXyeh.jpeg)
+![MatrixCoordinates](https://i.imgur.com/rQfEXyeh.jpeg)
\ No newline at end of file

From 42409b2d01b7c4f8e647114a28bc84ad29cc0de5 Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Thu, 24 Oct 2024 09:42:16 -0700
Subject: [PATCH 65/66] Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>
---
 .../keebfront/vanguard65/keymaps/default/keymap.c     | 11 ++++-------
 .../keebfront/vanguard65/keymaps/default/rules.mk     |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
index 901353c37aee..3768ba89cc93 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
+++ b/keyboards/keebfront/vanguard65/keymaps/default/keymap.c
@@ -14,10 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 #include "analog.h"
-#include "string.h"
-
 uint8_t last_val = 0;
-uint8_t current_val = 0;
 extern MidiDevice midi_device;
 
 enum layers {
@@ -35,13 +32,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [_LAYER1] = LAYOUT_ansi_blocker_split_bs(
+    [_LAYER1] = LAYOUT_all(
         _______, QK_GESC, 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_END,
                  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,          _______,
                  _______, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-                 _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,
+                 _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU,
                  _______, _______, _______,                            _______,                   _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT
-    ),
+    )
 };
 
 #if defined(ENCODER_MAP_ENABLE)
@@ -52,7 +49,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 #endif
 
 void slider(void) {
-    current_val = analogReadPin(SLIDER_PINA) >>3;
+    uint8_t current_val = analogReadPin(SLIDER_PINA) >>3;
 
     if ( last_val - current_val < -1 || last_val - current_val > 1 ) { 
         midi_send_cc(&midi_device, 0, 90, current_val );
diff --git a/keyboards/keebfront/vanguard65/keymaps/default/rules.mk b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
index ec24085279ca..a0aef8b6e78b 100644
--- a/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
+++ b/keyboards/keebfront/vanguard65/keymaps/default/rules.mk
@@ -1,2 +1,2 @@
 ENCODER_MAP_ENABLE = yes
-SRC += analog.c
\ No newline at end of file
+ANALOG_DRIVER_REQUIRED = yes

From 868619c0fb00c4dd69d519fdea3ce7a9e6ad26db Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Thu, 24 Oct 2024 21:10:00 -0700
Subject: [PATCH 66/66] Update keyboards/keebfront/vanguard65/keyboard.json

Co-authored-by: jack <jack@pngu.org>
---
 keyboards/keebfront/vanguard65/keyboard.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/keebfront/vanguard65/keyboard.json b/keyboards/keebfront/vanguard65/keyboard.json
index d74dcea2e8f8..34d9eca4a57f 100644
--- a/keyboards/keebfront/vanguard65/keyboard.json
+++ b/keyboards/keebfront/vanguard65/keyboard.json
@@ -13,6 +13,7 @@
         ]
     },
     "features": {
+        "bootmagic": true,
         "extrakey": true,
         "midi": true,
         "rgblight": true,