Merge remote-tracking branch 'origin/master' into develop

19 files changed, 1381 insertions, 0 deletions

diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
new file mode 100644
index 0000000000..72e0d5c92a
--- /dev/null
+++ b/keyboards/junco/info.json
@@ -0,0 +1,107 @@
+{
+    "manufacturer": "Dane Skalski",
+    "keyboard_name": "Junco",
+    "url": "https://github.com/Daneski13/Junco",
+    "maintainer": "Daneski13",
+    "usb": {
+        "vid": "0x4413",
+        "pid": "0x4A13",
+        "device_version": "1.0.0"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "layouts": {
+        "LAYOUT_split4x6_r1": {
+            "layout": [
+                { "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
+                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
+                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
+                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0.3 },
+                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0.45 },
+                { "label": "6", "matrix": [5, 5], "x": 9, "y": 0.45 },
+                { "label": "7", "matrix": [5, 4], "x": 10, "y": 0.3 },
+                { "label": "8", "matrix": [5, 3], "x": 11, "y": 0 },
+                { "label": "9", "matrix": [5, 2], "x": 12, "y": 0.3 },
+                { "label": "0", "matrix": [5, 1], "x": 13, "y": 0.7 },
+                { "label": "-", "matrix": [5, 0], "x": 14, "y": 0.7 },
+
+                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7 },
+                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7 },
+                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.3 },
+                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.3 },
+                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.45 },
+                { "label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45 },
+                { "label": "U", "matrix": [6, 4], "x": 10, "y": 1.3 },
+                { "label": "I", "matrix": [6, 3], "x": 11, "y": 1 },
+                { "label": "O", "matrix": [6, 2], "x": 12, "y": 1.3 },
+                { "label": "P", "matrix": [6, 1], "x": 13, "y": 1.7 },
+                { "label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7 },
+
+                { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7 },
+                { "label": "A", "matrix": [2, 1], "x": 1, "y": 2.7 },
+                { "label": "S", "matrix": [2, 2], "x": 2, "y": 2.3 },
+                { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4, "y": 2.3 },
+                { "label": "G", "matrix": [2, 5], "x": 5, "y": 2.45 },
+                { "label": "H", "matrix": [7, 5], "x": 9, "y": 2.45 },
+                { "label": "J", "matrix": [7, 4], "x": 10, "y": 2.3 },
+                { "label": "K", "matrix": [7, 3], "x": 11, "y": 2 },
+                { "label": "L", "matrix": [7, 2], "x": 12, "y": 2.3 },
+                { "label": ";", "matrix": [7, 1], "x": 13, "y": 2.7 },
+                { "label": "'", "matrix": [7, 0], "x": 14, "y": 2.7 },
+
+                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7 },
+                { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7 },
+                { "label": "X", "matrix": [3, 2], "x": 2, "y": 3.3 },
+                { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "V", "matrix": [3, 4], "x": 4, "y": 3.3 },
+                { "label": "B", "matrix": [3, 5], "x": 5, "y": 3.45 },
+                { "label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45 },
+                { "label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45 },
+                { "label": "N", "matrix": [8, 5], "x": 9, "y": 3.45 },
+                { "label": "M", "matrix": [8, 4], "x": 10, "y": 3.3 },
+                { "label": ",", "matrix": [8, 3], "x": 11, "y": 3 },
+                { "label": ".", "matrix": [8, 2], "x": 12, "y": 3.3 },
+                { "label": "/", "matrix": [8, 1], "x": 13, "y": 3.7 },
+                { "label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7 },
+
+                { "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
+                { "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
+                {
+                    "label": "Del",
+                    "matrix": [4, 3],
+                    "x": 5.1,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Spc",
+                    "matrix": [4, 4],
+                    "x": 6.1,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Shift",
+                    "matrix": [9, 3],
+                    "x": 7.9,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Bspc",
+                    "matrix": [9, 4],
+                    "x": 8.9,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                { "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
+                { "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
+                { "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/junco/keymaps/default/config.h b/keyboards/junco/keymaps/default/config.h
new file mode 100644
index 0000000000..43c47b9122
--- /dev/null
+++ b/keyboards/junco/keymaps/default/config.h
@@ -0,0 +1,38 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* - Encoder settings - */
+#ifdef ENCODER_ENABLE
+#    define ENCODER_RESOLUTION 4
+#endif
+#ifdef ENCODER_MAP_ENABLE
+// Key delay for encoders (necessary for some keycodes)
+#    define ENCODER_MAP_KEY_DELAY 10
+#endif
+
+/*
+    - RGB Stuff -
+    All effects can be found in the QMK docs:
+    https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+*/
+#ifdef RGB_MATRIX_ENABLE
+
+// Default effect when EEPROM cleared
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+
+// Turns off RGB effects when there is no longer a USB connection
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// Key press reactive animations
+#    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
+#    define RGB_MATRIX_KEYPRESSES  // Enables key press effects
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+
+// Normal effects
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#endif
diff --git a/keyboards/junco/keymaps/default/keymap.c b/keyboards/junco/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dc607477e2
--- /dev/null
+++ b/keyboards/junco/keymaps/default/keymap.c
@@ -0,0 +1,161 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// Layers enum
+enum junco_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    /*
+        Traditional QWERTY
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ E │ R │ T │               │ Y │ U │ I │ O │ P │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ S │ D │ F │ G │               │ H │ J │ K │ L │ ; │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ V │ B │Mut│       │XXX│ N │ M │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI (cmd) and Alt (opt) swapped
+    */
+    [_QWERTY] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_E,    KC_R,    KC_T,                                KC_Y,               KC_U,    KC_I,    KC_O,   KC_P,         KC_ENTER,
+        KC_ESC,   KC_A, KC_S,    KC_D,    KC_F,    KC_G,                                KC_H,               KC_J,    KC_K,    KC_L,   KC_SEMICOLON, KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_V,    KC_B,             KC_MUTE,  KC_NO,   KC_N,               KC_M,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Colemak-DH
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ F │ P │ B │               │ J │ L │ U │ Y │ ; │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ R │ S │ T │ G │               │ M │ N │ E │ I │ O │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ D │ V │Mut│       │XXX│ K │ H │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI (cmd) and Alt (opt) swapped
+    */
+    [_COLEMAK_DH] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_F,    KC_P,    KC_B,                                KC_J,               KC_L,    KC_U,    KC_Y,   KC_SEMICOLON, KC_ENTER,
+        KC_ESC,   KC_A, KC_R,    KC_S,    KC_T,    KC_G,                                KC_M,               KC_N,    KC_E,    KC_I,   KC_O,         KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_D,    KC_V,             KC_MUTE,  KC_NO,   KC_K,               KC_H,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Symbols/Numpad Layer
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │F1 │F2 │F3 │F4 │F5 │F6 │               │F7 │F8 │F9 │F10│F11│F12│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ ! │ @ │ # │ $ │ % │               │ * │ 7 │ 8 │ 9 │ + │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │ \ │ _ │ [ │ { │ ( │ ^ │               │ = │ 4 │ 5 │ 6 │ 0 │NUM│
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │___│ | │ ] │ } │ ) │ & │___│       │___│ / │ 1 │ 2 │ 3 │ - │___│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │___│___│___│___│___│       │___│___│___│___│___│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_SYMB] = LAYOUT_split4x6_r1(
+        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_TAB,   KC_EXLM,  KC_AT,   KC_HASH,    KC_DLR,   KC_PERC,                         KC_PAST,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_ENTER,
+        KC_BSLS,  KC_UNDS,  KC_LBRC, KC_LCBR,    KC_LPRN,  KC_CIRC,                         KC_PEQL,  KC_P4,    KC_P5,    KC_P6,    KC_P0,    KC_NUM,
+        _______,  KC_PIPE,  KC_RBRC, KC_RCBR,    KC_RPRN,  KC_AMPR,     _______,  _______,  KC_PSLS,  KC_P1,    KC_P2,    KC_P3,    KC_PMNS,  _______,
+                            _______, _______,    _______,  MO(_ADJUST), _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /*
+        Extension/Function Layer
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │               │ F7 │ F8 │ F9 │ F10│ F11│ F12│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │ ⇤  │PGUP│End │ ↑  │Home│    │               │BRIU│ F7 │ F8 │ F9 │ F10│____│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │Cps │PGDN│ ←  │ ↓  │ →  │    │               │BRID│ F4 │ F5 │ F6 │ F11│____│
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │____│    │    │    │    │    │____│     │ ▶⏸ │    │ F1 │ F2 │ F3 │ F12│____│
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                      ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                      │___│___│___│___│___│       │___│___│___│___│___│
+                      └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_EXT] = LAYOUT_split4x6_r1(
+        KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,       KC_F6,                       KC_F7,       KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,
+        S(KC_TAB), KC_PGUP,    KC_END,     KC_UP,      KC_HOME,     _______,                     KC_BRIU,     KC_F7,    KC_F8,   KC_F9,   KC_F10,   _______,
+        KC_CAPS,   KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,                     KC_BRID,     KC_F4,    KC_F5,   KC_F6,   KC_F11,   _______,
+        _______,   _______,    _______,    _______,    _______,     _______, _______,  KC_MPLY,  _______,     KC_F1,    KC_F2,   KC_F3,   KC_F12,   _______,
+                               _______,    _______,    _______,     _______, _______,  _______,  MO(_ADJUST), _______,  _______, _______
+    ),
+
+    /*
+        Adjust Layer, Keyboard Settings
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │    │    │    │    │    │    │               │    │    │    │    │    │    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdU│HueU│SatU│ValU│Rnxt│    │               │    │EClr│Rbt │DBUG│BOOT│    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdD│HueD│SatD│ValD│Rprv│RTgl│               │    │QWRT│COLE│    │    │    │
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │    │    │    │    │    │    │    │     │    │    │    │    │    │    │    │
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                       ┌───┬───┬───┬───┬───┐     ┌───┬───┬───┬───┬───┐
+                       │___│___│___│___│___│     │___│___│___│___│___│
+                       └───┴───┴───┴───┴───┘     └───┴───┴───┴───┴───┘
+    */
+    [_ADJUST] = LAYOUT_split4x6_r1(
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                       KC_NO,       KC_NO,         KC_NO,           KC_NO,   KC_NO,    KC_NO,
+        RGB_SPI,   RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_MOD,    KC_NO,                       KC_NO,       EE_CLR,        QK_RBT,          DB_TOGG, QK_BOOT,  KC_NO,
+        RGB_SPD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_RMOD,   RGB_TOG,                     KC_NO,       DF(_QWERTY),   DF(_COLEMAK_DH), KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,    KC_NO,    KC_NO,       KC_NO,         KC_NO,           KC_NO,   KC_NO,    KC_NO,
+                               _______,    _______,    _______,    _______, _______,  _______,  _______,     _______,       _______,         _______
+    )
+    // clang-format on
+};
+
+/*
+    --- Rotary Encoder Mappings ---
+
+    Encoder mappings go from leftmost encoder to rightmost encoder on the physical board.
+    index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder
+    on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the
+    thumb keys), and index 3 is the optional rightmost encoder on the right half.
+
+    If you are only using the 2 required encoders by the thumb keys, you only need to worry about
+    index 1 and index 2.
+
+    Note that the keycode for counter-clockwise rotation (CCW) goes first and then the key for
+    clockwise (CW) within ENCODER_CCW_CW.
+*/
+#ifdef ENCODER_MAP_ENABLE
+// clang-format off
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    // Base layer encoder mappings:
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+
+    // Passes through to base layers
+    [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // On the extension layer, the right side's left encoder by the thumb keys (mouse wheel up/down) is traded for media previous/next
+    [_EXT] =        { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // Passes through
+    [_ADJUST] =     { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // clang-format on
+};
+
+#endif
diff --git a/keyboards/junco/keymaps/default/readme.md b/keyboards/junco/keymaps/default/readme.md
new file mode 100644
index 0000000000..e37bf97ac7
--- /dev/null
+++ b/keyboards/junco/keymaps/default/readme.md
@@ -0,0 +1,57 @@
+# Default Junco Keymap
+
+This is the default layout for Junco. For the most part it's a normal QWERTY layout. The exceptions being the thumb keys, rotary encoders, and lack of caps lock (which is replaced by escape).
+
+One of the biggest features of QMK is it brings layers into the mix which can give you access to even more keys. There are 4 layers: the default/base layer (QWERTY), a symbol layer, an extension layer, and an adjust layer.
+
+Layers are very similar to Shift on a normal keyboard, where "a" becomes "A" when holding down shift. With a custom layer, you can have "j" become "4" for example and make an entire side of the keyboard become a number pad.
+
+The [symbol layer](#symbol-layer) is accessed by holding down backspace, the [extension layer](#extension-layer) is accessed by holding down delete, and the [adjust layer](#adjust-layer) is accessed by holding down both delete and backspace.
+
+## Default Base Layer (QWERTY)
+
+Grey keys are rotary encoders (the ones on far left and far right are optional). Middle legend is pressing down the encoder, bottom left legend is counter-clockwise turn, and bottom right legend is clockwise turn of the encoder.
+
+Those arrows for the bottom legends on the encoders are mouse scroll directions.
+
+Red legends are the layer activated by holding down a key.
+
+![Junco's QWERTY Layout](https://i.imgur.com/fXGt5Jh.png)
+
+## Symbol Layer
+
+This layer is accessed by holding down backspace on the base layer, thus that key is blacked out.
+
+On the symbol layer, the right side is a number pad, and the left side contains all the typical symbols (geared for programming).
+
+Holding down delete within the symbol layer will take you to the adjust layer.
+
+![Junco's Symbol Layer](https://i.imgur.com/6F35Z4Wh.png)
+
+## Extension Layer
+
+This layer's theme is navigation/extras, its accessed by holding down delete on the base layer, thus that key is blacked out.
+
+On the extension layer, the right side is the function keys in a number-pad-esque layout with screen brightness up/down, and the left side has navigation keys and caps lock. Also, the rotary on the right side encoder becomes media controls.
+
+Holding down backspace within the extension layer will take you to the adjust layer.
+
+![Junco's Extension Layer](https://i.imgur.com/FETcqkCh.png)
+
+## Adjust Layer
+
+This layer's theme is adjusting the keyboard's settings, it's accessed by holding down both delete and backspace on the base layer.
+
+On the adjust layer, the right side is the keyboard's settings: clear data, reboot, toggle debug mode, enter the bootloader, and change the base layer between QWERTY and [Colemak-DH](#colemak-dh). The left side adjusts the RGB lighting.
+
+![Junco's Adjust Layer](https://i.imgur.com/fRsdlt3h.png)
+
+## Colemak-DH
+
+This keymap offers Colemak-DH as an alternative base layer to QWERTY.
+
+QWERTY is default when flashing your keyboard, but you can change it to Colemak-DH by selecting it's key on the adjust layer.
+
+If you've never heard of it, Colemak is a keyboard layout that was designed to be a more ergonomic, modern, efficient, and comfortable replacement to QWERTY. Colemak was designed to place the most common letters in english on the home row along with many of the most common bigrams together (two letters typed in a row). Colemak-DH is a variant of Colemak that moves D and H to beneath the index fingers rather than the home row since most people find it easier and faster to reach the keys that way rather than the middle of the home row.
+
+![Junco's Colemak-DH Layout](https://i.imgur.com/8biZfn2h.png)
diff --git a/keyboards/junco/keymaps/default/rules.mk b/keyboards/junco/keymaps/default/rules.mk
new file mode 100644
index 0000000000..2304032cba
--- /dev/null
+++ b/keyboards/junco/keymaps/default/rules.mk
@@ -0,0 +1,16 @@
+# Change from yes to no to disable features
+
+# Enables Audio control and System control Keycodes
+EXTRAKEY_ENABLE = yes
+# Enables Mousekeys
+MOUSEKEY_ENABLE = yes
+# Encoder Support
+ENCODER_ENABLE = yes
+# Use Enocoder Mapping
+ENCODER_MAP_ENABLE = yes
+
+# Enables RGB Lighting Effects
+RGB_MATRIX_ENABLE = yes
+
+# Allows use of `qmk console` for debugging
+CONSOLE_ENABLE = yes
diff --git a/keyboards/junco/keymaps/deluxe/config.h b/keyboards/junco/keymaps/deluxe/config.h
new file mode 100644
index 0000000000..bec55fbd4c
--- /dev/null
+++ b/keyboards/junco/keymaps/deluxe/config.h
@@ -0,0 +1,58 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Indicator LEDs */
+// LED index for caps lock key on the extension layer
+#define CAPS_LOCK_LED_INDEX 25
+// LED index for num lock key on the symbol layer
+#define NUM_LOCK_LED_INDEX 62
+// LED index for key that sticks the adjust layer
+#define ADJST_LED_INDEX 19
+
+// Number of Layers that can be used by VIA.
+// Change this if you want more layers
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* - Encoder settings - */
+#ifdef ENCODER_ENABLE
+#    define ENCODER_RESOLUTION 4
+#endif
+#ifdef ENCODER_MAP_ENABLE
+// Key delay for encoders (necessary for some keycodes)
+#    define ENCODER_MAP_KEY_DELAY 10
+#endif
+
+/*
+    - RGB Stuff -
+    All effects can be found in the QMK docs:
+    https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+*/
+#ifdef RGB_MATRIX_ENABLE
+
+// Allows the indicator LEDs to work
+#    define SPLIT_LED_STATE_ENABLE
+#    define SPLIT_LAYER_STATE_ENABLE
+
+// Default effect when EEPROM cleared
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+
+// Turns off RGB effects when there is no longer a USB connection
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// Throttling of RGB to increase keyboard responsiveness, set to 1.5x the default limits
+#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 6 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 24                               // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms), the default, is equivalent to limiting to 60fps
+
+// Key press reactive animations
+#    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
+#    define RGB_MATRIX_KEYPRESSES  // Enables key press effects
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+
+// Normal effects
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#endif
diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
new file mode 100644
index 0000000000..e4dcb97fae
--- /dev/null
+++ b/keyboards/junco/keymaps/deluxe/keymap.c
@@ -0,0 +1,329 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Layers enum
+enum junco_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST };
+
+// Custom keycodes
+enum custom_keycodes {
+    // Keycode for toggling between macOS and Windows key mappings
+    // Actually just an alias to the GUI and Alt swap Magic keycode
+    KC_OS = MAGIC_TOGGLE_ALT_GUI,
+    // Keycode for swapping the base layer between QWERTY and Colemak-DH
+    KC_TOGGLE_BASE = SAFE_RANGE,
+    // Keycode for redo action (Ctrl + Y on windows, Ctrl + Shift + Z on macOS)
+    KC_REDO,
+    // Keycodes for next/previous word
+    KC_WNXT,
+    KC_WPRV,
+    // Keycode for sticking/unsticking the adjust layer
+    KC_ADJST
+};
+
+/* LED indicators */
+bool is_caps_lock_enabled(void) { // Caps lock
+    return (host_keyboard_led_state().caps_lock);
+}
+bool is_num_lock_enabled(void) { // Num lock
+    return (host_keyboard_led_state().num_lock);
+}
+bool is_adjust_layer_sticky(layer_state_t state) { // Adjust layer sticky
+    // Checks if the state is equal to just the adjust layer being active.
+    // Doing it this way can leverage SPLIT_LAYER_STATE_ENABLE
+    return (state == (1UL << _ADJUST)) ? true : false;
+}
+// Indicator color based on the RGB Matrix mode
+RGB indicator_color(void) {
+    RGB rgb;
+    // Normally the indicator color is white to stand out in the RGB rainbow.
+    // When using the custom RGB mode that already is white, the indicator color
+    // is green to stand out.
+    if (rgb_matrix_config.mode == RGB_MATRIX_CUSTOM_WHITE_UNDERGLOW_CYCLE) {
+        // Green
+        rgb.r = 0;
+        rgb.g = 255;
+        rgb.b = 0;
+    } else {
+        // White
+        rgb.r = 255;
+        rgb.g = 255;
+        rgb.b = 255;
+    }
+    return rgb;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    /*
+        Traditional QWERTY
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ E │ R │ T │               │ Y │ U │ I │ O │ P │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ S │ D │ F │ G │               │ H │ J │ K │ L │ ; │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ V │ B │Mut│       │▶⏸ │ N │ M │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI (cmd) and Alt (opt) swapped
+    */
+    [_QWERTY] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_E,    KC_R,    KC_T,                                KC_Y,               KC_U,    KC_I,    KC_O,   KC_P,         KC_ENTER,
+        KC_ESC,   KC_A, KC_S,    KC_D,    KC_F,    KC_G,                                KC_H,               KC_J,    KC_K,    KC_L,   KC_SEMICOLON, KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_V,    KC_B,             KC_MUTE,  KC_MPLY, KC_N,               KC_M,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Colemak-DH
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ F │ P │ B │               │ J │ L │ U │ Y │ ; │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ R │ S │ T │ G │               │ M │ N │ E │ I │ O │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ D │ V │Mut│       │▶⏸ │ K │ H │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI/Win (cmd) and Alt (opt) swapped
+    */
+    [_COLEMAK_DH] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_F,    KC_P,    KC_B,                                KC_J,               KC_L,    KC_U,    KC_Y,   KC_SEMICOLON, KC_ENTER,
+        KC_ESC,   KC_A, KC_R,    KC_S,    KC_T,    KC_G,                                KC_M,               KC_N,    KC_E,    KC_I,   KC_O,         KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_D,    KC_V,             KC_MUTE,  KC_MPLY, KC_K,               KC_H,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Symbols/Numpad Layer
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │F1 │F2 │F3 │F4 │F5 │F6 │               │F7 │F8 │F9 │F10│F11│F12│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ ! │ @ │ # │ $ │ % │               │ * │ 7 │ 8 │ 9 │ + │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │ \ │ _ │ [ │ { │ ( │ ^ │               │ = │ 4 │ 5 │ 6 │ 0 │NUM│
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │___│ | │ ] │ } │ ) │ & │___│       │___│ / │ 1 │ 2 │ 3 │ - │___│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │___│___│___│___│___│       │___│___│___│___│___│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_SYMB] = LAYOUT_split4x6_r1(
+        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_TAB,   KC_EXLM,  KC_AT,   KC_HASH,    KC_DLR,   KC_PERC,                     KC_PAST,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_ENTER,
+        KC_BSLS,  KC_UNDS,  KC_LBRC, KC_LCBR,    KC_LPRN,  KC_CIRC,                     KC_PEQL,  KC_P4,    KC_P5,    KC_P6,    KC_P0,    KC_NUM,
+        _______,  KC_PIPE,  KC_RBRC, KC_RCBR,    KC_RPRN,  KC_AMPR, _______,  _______,  KC_PSLS,  KC_P1,    KC_P2,    KC_P3,    KC_PMNS,  _______,
+                            _______, _______,    _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /*
+        Extension/Function Layer
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │               │ F7 │ F8 │ F9 │ F10│ F11│ F12│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │ ⇤  │PGUP│End │ ↑  │Home│    │               │BRIU│ F7 │ F8 │ F9 │ F10│____│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │Cps │PGDN│ ←  │ ↓  │ →  │    │               │BRID│ F4 │ F5 │ F6 │ F11│____│
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │____│    │    │    │    │    │____│     │____│    │ F1 │ F2 │ F3 │ F12│____│
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                      ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                      │___│___│___│___│___│       │___│___│___│___│___│
+                      └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_EXT] = LAYOUT_split4x6_r1(
+        KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,       KC_F6,                       KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,
+        S(KC_TAB), KC_PGUP,    KC_END,     KC_UP,      KC_HOME,     _______,                     KC_BRIU, KC_F7,    KC_F8,   KC_F9,   KC_F10,   _______,
+        KC_CAPS,   KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,                     KC_BRID, KC_F4,    KC_F5,   KC_F6,   KC_F11,   _______,
+        _______,   _______,    _______,    _______,    _______,     _______, _______,  _______,  _______, KC_F1,    KC_F2,   KC_F3,   KC_F12,   _______,
+                               _______,    _______,    _______,     _______, _______,  _______,  _______, _______,  _______, _______
+    ),
+
+    /*
+        Adjust Layer, Keyboard Settings
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │    │    │    │    │    │    │               │    │    │    │    │    │    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdU│HueU│SatU│ValU│Rnxt│Stck│               │    │EClr│Rbt │DBUG│BOOT│    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdD│HueD│SatD│ValD│Rprv│RTgl│               │    │LOUT│ OS │    │    │    │
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │    │    │    │    │    │    │RTgl│     │    │    │    │    │    │    │    │
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                       ┌───┬───┬───┬───┬───┐     ┌───┬───┬───┬───┬───┐
+                       │___│___│___│___│___│     │___│___│___│___│___│
+                       └───┴───┴───┴───┴───┘     └───┴───┴───┴───┴───┘
+    */
+    [_ADJUST] = LAYOUT_split4x6_r1(
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                       KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
+        RGB_SPI,   RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_MOD,    KC_ADJST,                    KC_NO,       EE_CLR,         QK_RBT,  DB_TOGG,    QK_BOOT,  KC_NO,
+        RGB_SPD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_RMOD,   RGB_TOG,                     KC_NO,       KC_TOGGLE_BASE, KC_OS,   KC_NO,      KC_NO, KC_NO,
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   RGB_TOG,  KC_NO,    KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
+                               _______,    _______,    _______,    _______, _______,  _______,  _______,     _______,        _______, _______
+    )
+    // clang-format on
+};
+
+/*
+    --- Rotary Encoder Mappings ---
+
+    Encoder mappings go from leftmost encoder to rightmost encoder on the physical board.
+    index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder
+    on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the
+    thumb keys), and index 3 is the optional rightmost encoder on the right half.
+
+    If you are only using the 2 required encoders by the thumb keys, you only need to worry about
+    index 1 and index 2.
+
+    Note that the key to be sent for counter-clockwise rotation (CCW) goes first and then the key for
+    clockwise (CW) within ENCODER_CCW_CW.
+*/
+#ifdef ENCODER_MAP_ENABLE
+// clang-format off
+
+// Base layer encoder mappings:
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    // Base layers
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+
+    // Passes through to base layer
+    [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    //                                                                                    undo/redo                         previous word/next word
+    [_EXT] =        { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_UNDO, KC_REDO), ENCODER_CCW_CW(KC_WPRV, KC_WNXT) },
+    //                RGB Speed down/up                 RGB previous mode/next mode        RGB brightness down/up
+    [_ADJUST] =     { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // clang-format on
+};
+
+#endif
+
+// Called whenever a layer is changed
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // Make sure the adjust layer isn't sticky
+    if (is_adjust_layer_sticky(state)) return state;
+
+    // When both the symbol and extension layer keys are held, the Adjust layer is active.
+    return update_tri_layer_state(state, _SYMB, _EXT, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        // Toggle base layer
+        case KC_TOGGLE_BASE:
+            if (record->event.pressed) {
+                // Toggle swapping base layers between Colemak-DH and QWERTY.
+                // When base layer is QWERTY, swap to Colemak-DH and vice-versa
+                if (get_highest_layer(default_layer_state) == _QWERTY) {
+                    default_layer_set(1UL << _COLEMAK_DH);
+                } else {
+                    default_layer_set(1UL << _QWERTY);
+                }
+            }
+            return false;
+
+        // Override undo in favor of the more modern undo action
+        case KC_UNDO:
+            if (record->event.pressed) {
+                // Use the correct modifier for macOS or Windows
+                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LGUI : KC_LCTL;
+                // Send Ctrl+Z/Cmd+Z
+                register_code(mod);
+                tap_code_delay(KC_Z, 10);
+                unregister_code(mod);
+            }
+            return false;
+
+        //  Redo action
+        case KC_REDO:
+            if (record->event.pressed) {
+                // Whether or not macOS mapping is enabled
+                if (keymap_config.swap_lalt_lgui) {
+                    // macOS - Send Cmd+Shift+Z
+                    register_code(KC_LGUI);
+                    register_code(KC_LSFT);
+                    tap_code_delay(KC_Z, 10);
+                    unregister_code(KC_LSFT);
+                    unregister_code(KC_LGUI);
+                } else {
+                    // Windows - Send Ctrl+Y
+                    register_code(KC_LCTL);
+                    tap_code_delay(KC_Y, 10);
+                    unregister_code(KC_LCTL);
+                }
+            }
+            return false;
+
+        // Next word
+        case KC_WNXT:
+            if (record->event.pressed) {
+                // Use the correct modifier for macOS or Windows
+                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
+                // Send Ctrl+Right/Option+Right
+                register_code(mod);
+                tap_code_delay(KC_RGHT, 10);
+                unregister_code(mod);
+            }
+            return false;
+
+        // Previous word
+        case KC_WPRV:
+            if (record->event.pressed) {
+                // Use the correct modifier for macOS or Windows
+                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
+                // Send Ctrl+Left/Option+Left
+                register_code(mod);
+                tap_code_delay(KC_LEFT, 10);
+                unregister_code(mod);
+            }
+            return false;
+
+        // Stick / Unstick the adjust layer
+        case KC_ADJST:
+            if (record->event.pressed) {
+                // If currently not sticky, we want only the adjust layer to be active to make it stick.
+                // Otherwise we want the default layer, un-stick.
+                is_adjust_layer_sticky(layer_state) ? layer_state_set(default_layer_state) : layer_move(_ADJUST);
+                dprintf("Adjust layer is now %s\n", is_adjust_layer_sticky(layer_state) ? "stuck" : "un-stuck");
+            }
+            return false;
+        default:
+            return true;
+    }
+}
+
+/* Indicators (Caps Lock / Num Lock / Adjust Layer Sticky) */
+bool rgb_matrix_indicators_user(void) {
+    layer_state_t curr_layer_state = layer_state;
+    layer_state_t layer            = get_highest_layer(curr_layer_state);
+    RGB           rgb              = indicator_color();
+
+    /* Only show the indicator on their respective layers */
+    // Caps Lock is only on the extension layer
+    if (is_caps_lock_enabled() && layer == _EXT) {
+        rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
+    }
+
+    // Num Lock is only on the symbol layer
+    if (is_num_lock_enabled() && layer == _SYMB) {
+        rgb_matrix_set_color(NUM_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
+    }
+
+    // If the adjust layer is stuck/sticky, light it up. Don't need to care about
+    // checking the layer since it can only be active on the adjust layer anyway
+    if (is_adjust_layer_sticky(curr_layer_state)) rgb_matrix_set_color(ADJST_LED_INDEX, rgb.r, rgb.g, rgb.b);
+
+    return false;
+}
diff --git a/keyboards/junco/keymaps/deluxe/readme.md b/keyboards/junco/keymaps/deluxe/readme.md
new file mode 100644
index 0000000000..d52d315f7d
--- /dev/null
+++ b/keyboards/junco/keymaps/deluxe/readme.md
@@ -0,0 +1,43 @@
+# Deluxe Junco Keymap
+
+This is my personal keymap for Junco at time of writing. It departs from the [default layout](../default/README.md) with the encoder mappings and some extra keycodes. This keymap also adds indicators when caps lock and num lock are enabled. When enabled, that key will become a static white (green on the white backlight mode) but only when the layer that respective key is on is active.
+
+I wanted that classic rainbow barf RGB effect for the underglow even if the per-key lighting is something else, so I added 2 custom RGB matrix animations: white per-key lighting with rainbow underglow and pixel rain with rainbow underglow.
+
+Here are some gifs of the animations:
+
+![White + Underglow Animation](https://i.imgur.com/2vCiZz0.gif)
+
+![Pixel Rain + Underglow Animation](https://i.imgur.com/f6t0OfD.gif)
+
+## Base Layers
+
+The base layers are the same as the default layout, except the right side's left encoder (by the thumb keys) is now media controls. Since I am using all 4 encoders it doesn't make sense to have 2 mouse scroll up/down, but for someone with just 2 encoders it may make sense to have media controls on a layer.
+
+QWERTY:
+
+![QWERTY Layer](https://i.imgur.com/vkS9Tceh.png)
+
+Colemak-DH:
+
+![Colemak-DH Layer](https://i.imgur.com/5YYgaUAh.png)
+
+## Symbol Layer
+
+Symbol layer is identical to the default layout.
+
+![Symbol Layer](https://i.imgur.com/6F35Z4Wh.png)
+
+## Extension Layer
+
+Encoders on the right side become undo/redo and scrolling horizontally by word.
+
+![Extension Layer](https://i.imgur.com/0VCStS8h.png)
+
+## Adjust Layer
+
+Pressing "Stick Adj Layer" will "stick" the adjust layer so you can use the rotary encoders for RGB settings rather than holding down both backspace and delete. To go back to the default layer, press that stick key again or press and release either Del or Backspace. When the adjust layer is currently "sticky" the sticky key will become the indicator color mentioned earlier.
+
+"Toggle Base" will toggle between QWERTY and Colemak-DH and toggle OS will toggle between macOS and Windows key-mappings (swapping WIN/Command with Alt/Option by the thumb keys and properly mapping redo/word scrolling).
+
+![Adjust layer](https://i.imgur.com/71ftNoNh.png)
diff --git a/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc b/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
new file mode 100644
index 0000000000..3efe506749
--- /dev/null
+++ b/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
@@ -0,0 +1,48 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+RGB_MATRIX_EFFECT(WHITE_UNDERGLOW_CYCLE)
+RGB_MATRIX_EFFECT(PIXEL_RAIN_UNDERGLOW_CYCLE)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+// This is a modified version of the effect_runner_dx_dy_dist function from rgb_matrix
+// that only applies the effect to the underglow LEDs of this keyboard
+static bool underglow_effect_runner(effect_params_t* params, dx_dy_dist_f underglow_effect_func, bool backlight_white) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV hsv = rgb_matrix_config.hsv;
+    HSV white = {0, 0, hsv.v};
+    RGB rgb = rgb_matrix_hsv_to_rgb(white);
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        // Underglow LEDs are indicies 0 - 7 and 37 - 44
+        if ((i <= 7) || (37 <= i && i <= 44)) {
+            // Apply the maths and colors to the underglow LEDs
+            RGB_MATRIX_TEST_LED_FLAGS();
+            int16_t dx   = g_led_config.point[i].x - k_rgb_matrix_center.x;
+            int16_t dy   = g_led_config.point[i].y - k_rgb_matrix_center.y;
+            uint8_t dist = sqrt16(dx * dx + dy * dy);
+            RGB     rgb  = rgb_matrix_hsv_to_rgb(underglow_effect_func(hsv, dx, dy, dist, time));
+            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        } else {
+            // Set the backlight to white if needed
+            if (!backlight_white) continue;
+            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        }
+    }
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+// Solid white but the underglow is a rainbow spiral
+static bool WHITE_UNDERGLOW_CYCLE(effect_params_t* params) {
+    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, true);
+}
+
+// Pixel rain effect but the underglow is a rainbow spiral
+static bool PIXEL_RAIN_UNDERGLOW_CYCLE(effect_params_t* params) {
+    PIXEL_RAIN(params);
+    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, false);
+}
+
+#endif
diff --git a/keyboards/junco/keymaps/deluxe/rules.mk b/keyboards/junco/keymaps/deluxe/rules.mk
new file mode 100644
index 0000000000..b788c6155b
--- /dev/null
+++ b/keyboards/junco/keymaps/deluxe/rules.mk
@@ -0,0 +1,20 @@
+# Enables Audio control and System control Keycodes
+EXTRAKEY_ENABLE = yes
+# Enables Mousekeys
+MOUSEKEY_ENABLE = yes
+# Encoder Support
+ENCODER_ENABLE = yes
+# Use Enocoder Mapping
+ENCODER_MAP_ENABLE = yes
+
+# Enables RGB Lighting Effects
+RGB_MATRIX_ENABLE = yes
+
+# Allows use of `qmk console` for debugging
+CONSOLE_ENABLE = yes
+
+# Enables VIA
+VIA_ENABLE = yes
+
+# Custom RGB Matrix Effect
+RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/junco/keymaps/via/config.h b/keyboards/junco/keymaps/via/config.h
new file mode 100644
index 0000000000..c4ce821594
--- /dev/null
+++ b/keyboards/junco/keymaps/via/config.h
@@ -0,0 +1,87 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Number of Layers that can be used by VIA.
+// Change this if you want more layers
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* - Encoder settings - */
+#ifdef ENCODER_ENABLE
+#    define ENCODER_RESOLUTION 4
+#endif
+#ifdef ENCODER_MAP_ENABLE
+// Key delay for encoders (necessary for some keycodes)
+#    define ENCODER_MAP_KEY_DELAY 10
+#endif
+
+/*
+    - RGB -
+    Defines all effects so VIA can properly select them via index
+*/
+#ifdef RGB_MATRIX_ENABLE
+
+// Default effect when EEPROM cleared
+#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+
+// Turns off RGB effects when there is no longer a USB connection
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// Allow keypress reactive animations
+#    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations on a split
+#    define RGB_MATRIX_KEYPRESSES  // Enables key press effects
+
+// Allow frame buffer effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Enables frame buffer effects
+
+// All effect definitions
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS            // Enables RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN       // Enables RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT    // Enables RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING              // Enables RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT               // Enables RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL               // Enables RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT      // Enables RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL      // Enables RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT        // Enables RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL        // Enables RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL              // Enables RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT       // Enables RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN          // Enables RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Enables RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN           // Enables RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL      // Enables RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL         // Enables RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL           // Enables RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON            // Enables RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON         // Enables RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS      // Enables RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS              // Enables RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS    // Enables RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING          // Enables RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM           // Enables RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE               // Enables RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL          // Enables RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW             // Enables RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN             // Enables RGB_MATRIX_PIXEL_RAIN
+
+// Following need RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP // Enables RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN   // Enables RGB_MATRIX_DIGITAL_RAIN
+
+// Following need RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Enables RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Enables RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Enables RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Enables RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Enables RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Enables RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Enables RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Enables RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH                    // Enables RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH               // Enables RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Enables RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Enables RGB_MATRIX_SOLID_MULTISPLASH
+
+#endif
diff --git a/keyboards/junco/keymaps/via/keymap.c b/keyboards/junco/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b50332be28
--- /dev/null
+++ b/keyboards/junco/keymaps/via/keymap.c
@@ -0,0 +1,161 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+// Layers enum
+enum junco_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    /*
+        Traditional QWERTY
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ E │ R │ T │               │ Y │ U │ I │ O │ P │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ S │ D │ F │ G │               │ H │ J │ K │ L │ ; │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ V │ B │Mut│       │XXX│ N │ M │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI (cmd) and Alt (opt) swapped
+    */
+    [_QWERTY] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_E,    KC_R,    KC_T,                                KC_Y,               KC_U,    KC_I,    KC_O,   KC_P,         KC_ENTER,
+        KC_ESC,   KC_A, KC_S,    KC_D,    KC_F,    KC_G,                                KC_H,               KC_J,    KC_K,    KC_L,   KC_SEMICOLON, KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_V,    KC_B,             KC_MUTE,  KC_NO,   KC_N,               KC_M,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Colemak-DH
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ Q │ W │ F │ P │ B │               │ J │ L │ U │ Y │ ; │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Esc│ A │ R │ S │ T │ G │               │ M │ N │ E │ I │ O │ ' │
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │Sft│ Z │ X │ C │ D │ V │Mut│       │XXX│ K │ H │ , │ . │ / │Sft│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+                For macOS - GUI (cmd) and Alt (opt) swapped
+    */
+    [_COLEMAK_DH] = LAYOUT_split4x6_r1(
+        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
+        KC_TAB,   KC_Q, KC_W,    KC_F,    KC_P,    KC_B,                                KC_J,               KC_L,    KC_U,    KC_Y,   KC_SEMICOLON, KC_ENTER,
+        KC_ESC,   KC_A, KC_R,    KC_S,    KC_T,    KC_G,                                KC_M,               KC_N,    KC_E,    KC_I,   KC_O,         KC_QUOTE,
+        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_D,    KC_V,             KC_MUTE,  KC_NO,   KC_K,               KC_H,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
+                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    /*
+        Symbols/Numpad Layer
+        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
+        │F1 │F2 │F3 │F4 │F5 │F6 │               │F7 │F8 │F9 │F10│F11│F12│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │Tab│ ! │ @ │ # │ $ │ % │               │ * │ 7 │ 8 │ 9 │ + │Ent│
+        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
+        │ \ │ _ │ [ │ { │ ( │ ^ │               │ = │ 4 │ 5 │ 6 │ 0 │NUM│
+        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
+        │___│ | │ ] │ } │ ) │ & │___│       │___│ / │ 1 │ 2 │ 3 │ - │___│
+        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
+                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                │___│___│___│___│___│       │___│___│___│___│___│
+                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_SYMB] = LAYOUT_split4x6_r1(
+        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_TAB,   KC_EXLM,  KC_AT,   KC_HASH,    KC_DLR,   KC_PERC,                         KC_PAST,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_ENTER,
+        KC_BSLS,  KC_UNDS,  KC_LBRC, KC_LCBR,    KC_LPRN,  KC_CIRC,                         KC_PEQL,  KC_P4,    KC_P5,    KC_P6,    KC_P0,    KC_NUM,
+        _______,  KC_PIPE,  KC_RBRC, KC_RCBR,    KC_RPRN,  KC_AMPR,     _______,  _______,  KC_PSLS,  KC_P1,    KC_P2,    KC_P3,    KC_PMNS,  _______,
+                            _______, _______,    _______,  MO(_ADJUST), _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /*
+        Extension/Function Layer
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │               │ F7 │ F8 │ F9 │ F10│ F11│ F12│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │ ⇤  │PGUP│End │ ↑  │Home│    │               │BRIU│ F7 │ F8 │ F9 │ F10│____│
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │Cps │PGDN│ ←  │ ↓  │ →  │    │               │BRID│ F4 │ F5 │ F6 │ F11│____│
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │____│    │    │    │    │    │____│     │ ▶⏸ │    │ F1 │ F2 │ F3 │ F12│____│
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                      ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+                      │___│___│___│___│___│       │___│___│___│___│___│
+                      └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+    */
+    [_EXT] = LAYOUT_split4x6_r1(
+        KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,       KC_F6,                       KC_F7,       KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,
+        S(KC_TAB), KC_PGUP,    KC_END,     KC_UP,      KC_HOME,     _______,                     KC_BRIU,     KC_F7,    KC_F8,   KC_F9,   KC_F10,   _______,
+        KC_CAPS,   KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,                     KC_BRID,     KC_F4,    KC_F5,   KC_F6,   KC_F11,   _______,
+        _______,   _______,    _______,    _______,    _______,     _______, _______,  KC_MPLY,  _______,     KC_F1,    KC_F2,   KC_F3,   KC_F12,   _______,
+                               _______,    _______,    _______,     _______, _______,  _______,  MO(_ADJUST), _______,  _______, _______
+    ),
+
+    /*
+        Adjust Layer, Keyboard Settings
+        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
+        │    │    │    │    │    │    │               │    │    │    │    │    │    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdU│HueU│SatU│ValU│Rnxt│    │               │    │EClr│Rbt │DBUG│BOOT│    │
+        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
+        │SpdD│HueD│SatD│ValD│Rprv│RTgl│               │    │QWRT│COLE│    │    │    │
+        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
+        │    │    │    │    │    │    │    │     │    │    │    │    │    │    │    │
+        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
+                       ┌───┬───┬───┬───┬───┐     ┌───┬───┬───┬───┬───┐
+                       │___│___│___│___│___│     │___│___│___│___│___│
+                       └───┴───┴───┴───┴───┘     └───┴───┴───┴───┴───┘
+    */
+    [_ADJUST] = LAYOUT_split4x6_r1(
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                       KC_NO,       KC_NO,         KC_NO,           KC_NO,   KC_NO,    KC_NO,
+        RGB_SPI,   RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_MOD,    KC_NO,                       KC_NO,       EE_CLR,        QK_RBT,          DB_TOGG, QK_BOOT,  KC_NO,
+        RGB_SPD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_RMOD,   RGB_TOG,                     KC_NO,       DF(_QWERTY),   DF(_COLEMAK_DH), KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   KC_NO,    KC_NO,    KC_NO,       KC_NO,         KC_NO,           KC_NO,   KC_NO,    KC_NO,
+                               _______,    _______,    _______,    _______, _______,  _______,  _______,     _______,       _______,         _______
+    )
+    // clang-format on
+};
+
+/*
+    --- Rotary Encoder Mappings ---
+
+    Encoder mappings go from leftmost encoder to rightmost encoder on the physical board.
+    index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder
+    on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the
+    thumb keys), and index 3 is the optional rightmost encoder on the right half.
+
+    If you are only using the 2 required encoders by the thumb keys, you only need to worry about
+    index 1 and index 2.
+
+    Note that the key to be sent for counter-clockwise rotation (CCW) goes first and then the key for
+    clockwise (CW) within ENCODER_CCW_CW.
+*/
+#ifdef ENCODER_MAP_ENABLE
+// clang-format off
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    // Base layer encoder mappings:
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+
+    // Passes through to base layers
+    [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // On the extension layer, the right side's left encoder by the thumb keys (mouse wheel up/down) is traded for media previous/next
+    [_EXT] =        { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // Passes through
+    [_ADJUST] =     { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    // clang-format on
+};
+
+#endif
diff --git a/keyboards/junco/keymaps/via/rules.mk b/keyboards/junco/keymaps/via/rules.mk
new file mode 100644
index 0000000000..fd9cd98bcb
--- /dev/null
+++ b/keyboards/junco/keymaps/via/rules.mk
@@ -0,0 +1,19 @@
+# Change from yes to no to disable features
+
+# Enables Audio control and System control Keycodes
+EXTRAKEY_ENABLE = yes
+# Enables Mousekeys
+MOUSEKEY_ENABLE = yes
+# Encoder Support
+ENCODER_ENABLE = yes
+# Use Enocoder Mapping
+ENCODER_MAP_ENABLE = yes
+
+# Enables RGB Matrix
+RGB_MATRIX_ENABLE = yes
+
+# Allows use of `qmk console` for debugging
+# CONSOLE_ENABLE = yes
+
+# Enables VIA
+VIA_ENABLE = yes
diff --git a/keyboards/junco/readme.md b/keyboards/junco/readme.md
new file mode 100644
index 0000000000..b5817ff7e7
--- /dev/null
+++ b/keyboards/junco/readme.md
@@ -0,0 +1,41 @@
+# Junco <!-- omit from toc -->
+
+![Junco](https://i.imgur.com/WzZaIgQh.jpg)
+
+Junco is a 60% Raspberry Pi Pico powered split keyboard boasting a 4x6 layout with an aggressive columnar stagger. It has 5 "thumb" keys on either side, support for 2-4 rotary encoders, and per-key RGB lighting.
+
+- Keyboard Maintainer: [Dane Skalski](https://github.com/Daneski13)
+- Hardware Supported: Junco PCB, Raspberry Pi Pico
+- Hardware Availability: [PCB, Case, Parts List](https://github.com/Daneski13/Junco)
+
+Remember you have to flash both halves of the keyboard for it to work!
+
+Make example for this keyboard (after setting up your build environment):
+
+    make junco:default
+
+Flashing example for this keyboard:
+
+```bash
+# For flashing the left half...
+make junco:default:uf2-split-left
+# or the qmk cli equivalent:
+qmk flash -kb junco --keymap default -bl uf2-split-left
+
+# For flashing the right half...
+make junco:default:uf2-split-right
+# or the qmk cli equivalent:
+qmk flash -kb junco --keymap default -bl uf2-split-right
+```
+
+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 <!-- omit from toc -->
+
+Enter the bootloader in 3 ways:
+
+- **Bootmagic reset** (works after you have flashed once): Hold down the top far corner key while plugging in the keyboard (`~` left half, `-` right half). This will also clear the EEPROM.
+- **Physical reset button**: Hold the `BOOT` button on the Pico and press the `RST` button on the Pico, release the the `RST` button before the `BOOT` button.
+- **Keycode in layout**: In the default layout, the `Bootloader` keycode is above home row pinky on the right side's adjust layer.
+
+Once you enter the bootloader, the keyboard will show up as a USB device on your computer, you could drag and drop a firmware file to flash it, but I recommend using the flash commands for the respective side.
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
new file mode 100644
index 0000000000..d9c0556cdf
--- /dev/null
+++ b/keyboards/junco/rev1/config.h
@@ -0,0 +1,43 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Electrical Wiring Stuff
+#define MATRIX_ROW_PINS \
+    { GP8, GP9, GP10, GP11, GP12 }
+#define MATRIX_COL_PINS \
+    { GP2, GP3, GP4, GP5, GP6, GP7 }
+#define DIODE_DIRECTION COL2ROW
+
+// Split Keyboard Stuff
+#define EE_HANDS                 // Sets the keyboard’s handedness using EEPROM
+#define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS)
+#define SERIAL_USART_TX_PIN GP0  // USART TX pin
+#define SERIAL_USART_RX_PIN GP1  // USART RX pin
+
+/* RGB Stuff */
+#ifdef RGB_MATRIX_ENABLE
+
+#    define RGB_DI_PIN GP15 // Pin for RGB logic
+#    define RGB_MATRIX_LED_COUNT 74
+#    define RGB_MATRIX_SPLIT \
+        { 37, 37 } // 37 LEDs on each side
+
+#endif
+
+/* Rotary Encoders Definition */
+// Indexing goes from physical leftmost to rightmost
+// 0: left-half left | 1: left-half right | 2: right-half left | 3: right-half right
+#ifdef ENCODER_ENABLE
+
+#    define ENCODERS_PAD_A \
+        { GP16, GP14 }
+#    define ENCODERS_PAD_B \
+        { GP17, GP13 }
+#    define ENCODERS_PAD_A_RIGHT \
+        { GP14, GP16 }
+#    define ENCODERS_PAD_B_RIGHT \
+        { GP13, GP17 }
+
+#endif
diff --git a/keyboards/junco/rev1/post_config.h b/keyboards/junco/rev1/post_config.h
new file mode 100644
index 0000000000..bcc15a941a
--- /dev/null
+++ b/keyboards/junco/rev1/post_config.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Default Bootmagic lite */
+// Top left for left side is default in core
+
+// Top right for right side
+#ifndef BOOTMAGIC_LITE_ROW_RIGHT
+#    define BOOTMAGIC_LITE_ROW_RIGHT 5
+#endif
+#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
+#    define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+#endif
diff --git a/keyboards/junco/rev1/rev1.c b/keyboards/junco/rev1/rev1.c
new file mode 100644
index 0000000000..d1346b82e2
--- /dev/null
+++ b/keyboards/junco/rev1/rev1.c
@@ -0,0 +1,126 @@
+// Copyright 2022 Dane Skalski (@Daneski13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+// Hand swap
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    // Left
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}},
+    {{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}, {6, 8}},
+    {{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}, {6, 9}},
+    // Right
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}}
+};
+#endif
+
+/* RGB LED matrix */
+#ifdef RGB_MATRIX_ENABLE
+/*
+    Key Matrix Physical
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,
+    L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35,
+              L40, L41, L42, L43, L44, R42, R41, R43, R44, R45
+
+    Key Electrical
+    Left:
+    { L00, L01, L02, L03, L04, L05 },
+    { L10, L11, L12, L13, L14, L15 },
+    { L20, L21, L22, L23, L24, L25 },
+    { L30, L31, L32, L33, L34, L35 },
+    { L40, L41, L42, L43, L44, L45 },
+    Right:
+    { R05, R04, R03, R02, R01, R00 },
+    { R15, R14, R13, R12, R11, R10 },
+    { R25, R24, R23, R22, R21, R20 },
+    { R35, R34, R33, R32, R31, R30 },
+    { R45, R44, R43, R42, R41, R40 }
+
+    Key matrix physical filled with LED electrical indexes, count starting at 1
+
+    Col
+    0  1  2  3  4  5  6     7  8  9  10 11 12 13    Row
+
+    14 13 12 11 10 9           46 47 48 49 50 51    0
+      6      7     8           45    44      43
+    15 16 17 18 19 20          57 56 55 54 53 52    1
+
+    26 25 24 23 22 21          58 59 60 61 62 63    2
+      5      4     3           40    41      42
+    27 28 29 30 31 32 NO    NO 69 68 67 66 65 64    3
+
+          37 36 35 34 33    70 71 72 73 74          4
+             2       1        38     39
+*/
+
+// clang-format off
+led_config_t g_led_config = {
+    {	// Key Electrical Matrix to LED Index (count start at 0, so 8 is the first non-underglow key)
+
+        // Left Half
+        { 13, 12, 11, 10,  9,      8 },
+        { 14, 15, 16, 17, 18,     19 },
+        { 25, 24, 23, 22, 21,     20 },
+        { 26, 27, 28, 29, 30,     31 },
+        { 36, 35, 34, 33, 32, NO_LED },
+
+        // Right Half
+        { 50, 49, 48, 47, 46,     45 },
+        { 51, 52, 53, 54, 55,     56 },
+        { 62, 61, 60, 59, 58,     57 },
+        { 63, 64, 65, 66, 67,     68 },
+        { 73, 72, 71, 70, 69, NO_LED }
+    },
+    {	// LED Index to LED Physical Position (mirrored on right half)
+
+        // Left Underglow (indicies 1 - 8)
+        { 95, 72 }, { 52, 72 }, { 86, 40 }, { 52, 40 }, { 9, 40 }, { 9, 8 }, { 52, 8 }, { 86, 8 },
+        // Left Matrix (indicies 9 - 37)
+        { 86,  0 }, { 69,  0 }, {  52,  0 }, { 34,  0 }, { 17,  0 }, {  0,  0 },
+        {  0, 16 }, { 17, 16 }, {  34, 16 }, { 52, 16 }, { 69, 16 }, { 86, 16 },
+        { 86, 32 }, { 69, 32 }, {  52, 32 }, { 34, 32 }, { 17, 32 }, {  0, 32 },
+        {  0, 48 }, { 17, 48 }, {  34, 48 }, { 52, 48 }, { 69, 48 }, { 86, 48 }, /* No Led */
+                                { 103, 64 }, { 86, 64 }, { 69, 64 }, { 52, 64 }, { 34, 64 },
+
+        // Right Underglow (indicies 38 - 45)
+        { 129, 72 }, { 172, 72 }, { 138, 40 }, { 172, 40 }, { 215, 40 }, { 215, 8 }, { 172, 8 }, { 138, 8 },
+        // Right Matrix (indicies 46 - 74)
+                     { 138,  0 }, { 155,  0 }, { 172,  0 }, { 190,  0 }, { 207,  0 }, { 224,  0 },
+                     { 224, 16 }, { 207, 16 }, { 190, 16 }, { 172, 16 }, { 155, 16 }, { 138, 16 },
+                     { 138, 32 }, { 155, 32 }, { 172, 32 }, { 190, 32 }, { 207, 32 }, { 224, 32 },
+        /* No Led */ { 224, 48 }, { 207, 48 }, { 190, 48 }, { 172, 48 }, { 155, 48 }, { 138, 48 },
+        { 121, 64 }, { 138, 64 }, { 155, 64 }, { 172, 64 }, { 190, 64 }
+    },
+    {	// LED Index to Flag (2 - Underglow, 4 - Key Backlight)
+
+        // Left Underglow
+        2, 2, 2, 2, 2, 2, 2, 2,
+        // Left Matrix
+        4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4,
+              4, 4, 4, 4, 4,
+
+        // Right Underglow
+        2, 2, 2, 2, 2, 2, 2, 2,
+        // Right Matrix
+           4, 4, 4, 4, 4, 4,
+           4, 4, 4, 4, 4, 4,
+           4, 4, 4, 4, 4, 4,
+           4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4
+    }
+};
+
+#endif
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
new file mode 100644
index 0000000000..feb836dbe1
--- /dev/null
+++ b/keyboards/junco/rev1/rules.mk
@@ -0,0 +1,3 @@
+# RGB Stuff
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = vendor
diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk
new file mode 100644
index 0000000000..a04c7822f9
--- /dev/null
+++ b/keyboards/junco/rules.mk
@@ -0,0 +1,9 @@
+# Split Keyboard Stuff
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = vendor
+
+# Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes
+
+# Default Folder
+DEFAULT_FOLDER = junco/rev1