diff --git a/keyboards/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json
index 07a76e578cc8..d368ceb9c3cd 100644
--- a/keyboards/ryanbaekr/rb1/info.json
+++ b/keyboards/ryanbaekr/rb1/info.json
@@ -3,6 +3,8 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0001",
diff --git a/keyboards/ryanbaekr/rb1/keymaps/default/readme.md b/keyboards/ryanbaekr/rb1/keymaps/default/readme.md
deleted file mode 100644
index 30225e7aadf1..000000000000
--- a/keyboards/ryanbaekr/rb1/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for rb1
diff --git a/keyboards/ryanbaekr/rb1/readme.md b/keyboards/ryanbaekr/rb1/readme.md
index ce46a83f6994..c1af68067690 100644
--- a/keyboards/ryanbaekr/rb1/readme.md
+++ b/keyboards/ryanbaekr/rb1/readme.md
@@ -10,6 +10,10 @@ Make example for this keyboard (after setting up your build environment):
make ryanbaekr/rb1:default
+Flashing example for this keyboard:
+
+ make ryanbaekr/rb1:default:flash
+
To boot into the bootloader, hold the reset button on the SparkFun Qwiic Pro Micro - USB-C on plug in
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/ryanbaekr/rb1/rules.mk b/keyboards/ryanbaekr/rb1/rules.mk
index 515ca5621f8f..ab2c49da70e7 100644
--- a/keyboards/ryanbaekr/rb1/rules.mk
+++ b/keyboards/ryanbaekr/rb1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 1df607db437b..eac923b4de97 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index ba8f2955c1a0..09bdc0c47e66 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -3,6 +3,8 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0018",
diff --git a/keyboards/ryanbaekr/rb18/keymaps/default/readme.md b/keyboards/ryanbaekr/rb18/keymaps/default/readme.md
deleted file mode 100644
index 87dbe30e5fa1..000000000000
--- a/keyboards/ryanbaekr/rb18/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for rb18
diff --git a/keyboards/ryanbaekr/rb18/readme.md b/keyboards/ryanbaekr/rb18/readme.md
index f670ef9808a5..81f3cb5e5e96 100644
--- a/keyboards/ryanbaekr/rb18/readme.md
+++ b/keyboards/ryanbaekr/rb18/readme.md
@@ -10,6 +10,10 @@ Make example for this keyboard (after setting up your build environment):
make ryanbaekr/rb18:default
+Flashing example for this keyboard:
+
+ make ryanbaekr/rb18:default:flash
+
To boot into the bootloader, hold the reset button on the Elite-C on plug in
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/ryanbaekr/rb18/rules.mk b/keyboards/ryanbaekr/rb18/rules.mk
index ebbb7bc613c7..951dd07d6e0b 100644
--- a/keyboards/ryanbaekr/rb18/rules.mk
+++ b/keyboards/ryanbaekr/rb18/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 447d2ca05a95..ba3eed38b968 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
index 03b20547122f..fdee9e51004f 100644
--- a/keyboards/ryanbaekr/rb69/info.json
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -3,6 +3,8 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0069",
diff --git a/keyboards/ryanbaekr/rb69/keymaps/default/readme.md b/keyboards/ryanbaekr/rb69/keymaps/default/readme.md
deleted file mode 100644
index 35d623b10eea..000000000000
--- a/keyboards/ryanbaekr/rb69/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for rb69
diff --git a/keyboards/ryanbaekr/rb69/readme.md b/keyboards/ryanbaekr/rb69/readme.md
index d90c973a8966..3d0dbac4f2c9 100644
--- a/keyboards/ryanbaekr/rb69/readme.md
+++ b/keyboards/ryanbaekr/rb69/readme.md
@@ -10,6 +10,10 @@ Make example for this keyboard (after setting up your build environment):
make ryanbaekr/rb69:default
+Flashing example for this keyboard:
+
+ make ryanbaekr/rb69:default:flash
+
To boot into the bootloader, hold the reset button on the Elite-C on plug in
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/ryanbaekr/rb69/rules.mk b/keyboards/ryanbaekr/rb69/rules.mk
index ebbb7bc613c7..951dd07d6e0b 100644
--- a/keyboards/ryanbaekr/rb69/rules.mk
+++ b/keyboards/ryanbaekr/rb69/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h
index e2541efe2b6b..a8ec6262a2a1 100644
--- a/keyboards/ryanbaekr/rb86/config.h
+++ b/keyboards/ryanbaekr/rb86/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 17
-
/*
* Keyboard Matrix Assignments
*
diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json
index 65806aef95dd..30f05e836109 100644
--- a/keyboards/ryanbaekr/rb86/info.json
+++ b/keyboards/ryanbaekr/rb86/info.json
@@ -3,6 +3,8 @@
"manufacturer": "ryanbaekr",
"url": "",
"maintainer": "ryanbaekr",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"usb": {
"vid": "0x7262",
"pid": "0x0086",
diff --git a/keyboards/ryanbaekr/rb86/keymaps/default/readme.md b/keyboards/ryanbaekr/rb86/keymaps/default/readme.md
deleted file mode 100644
index 81c91e2296d7..000000000000
--- a/keyboards/ryanbaekr/rb86/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for rb86
diff --git a/keyboards/ryanbaekr/rb86/readme.md b/keyboards/ryanbaekr/rb86/readme.md
index 36a8c6318341..dc9e55c52353 100644
--- a/keyboards/ryanbaekr/rb86/readme.md
+++ b/keyboards/ryanbaekr/rb86/readme.md
@@ -10,6 +10,10 @@ Make example for this keyboard (after setting up your build environment):
make ryanbaekr/rb86:default
+Flashing example for this keyboard:
+
+ make ryanbaekr/rb86:default:flash
+
To boot into the bootloader, hold the reset button on the Elite-C on plug in
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/ryanbaekr/rb86/rules.mk b/keyboards/ryanbaekr/rb86/rules.mk
index 33d28b3a89f2..309e55c9f4c8 100644
--- a/keyboards/ryanbaekr/rb86/rules.mk
+++ b/keyboards/ryanbaekr/rb86/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/ryanbaekr/rb87/config.h b/keyboards/ryanbaekr/rb87/config.h
new file mode 100644
index 000000000000..6d153b405ba7
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/config.h
@@ -0,0 +1,102 @@
+/*
+Copyright 2022 ryanbaekr
+
+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 .
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * 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)
+ *
+ */
+#define MATRIX_ROW_PINS { D2, D7, C6, D4, D0, D1 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, C7, E6, B4, B5, B7, D5, D3 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+
+
+/* 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
+
+/* number of backlight levels */
+#define BACKLIGHT_LEVELS 10
+
+/* Underglow options */
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#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 RGBLED_NUM 15
+#define RGBLED_HUE_STEP 8
+#define RGBLED_SAT_STEP 8
+#define RGBLED_VAL_STEP 8
+#endif
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * 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
diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json
new file mode 100644
index 000000000000..f9401bac657b
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/info.json
@@ -0,0 +1,18 @@
+{
+ "keyboard_name": "rb87",
+ "manufacturer": "ryanbaekr",
+ "url": "",
+ "maintainer": "ryanbaekr",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "usb": {
+ "vid": "0x7262",
+ "pid": "0x0087",
+ "device_version": "0.0.3"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25, "w":2}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":16.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":2.75}, {"x":15.25, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":12.75, "y":5.25, "w":1.25}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}]
+ }
+ }
+}
diff --git a/keyboards/ryanbaekr/rb87/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb87/keymaps/default/keymap.c
new file mode 100644
index 000000000000..37483d80b553
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 ryanbaekr
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, 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_DEL, 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_PGUP, KC_PGDN,
+ 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, TG(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/ryanbaekr/rb87/keymaps/via/keymap.c b/keyboards/ryanbaekr/rb87/keymaps/via/keymap.c
new file mode 100644
index 000000000000..5e2b543f7a9e
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 ryanbaekr
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, 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_DEL, 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_PGUP, KC_PGDN,
+ 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, TG(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/ryanbaekr/rb87/keymaps/via/rules.mk b/keyboards/ryanbaekr/rb87/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ryanbaekr/rb87/rb87.c b/keyboards/ryanbaekr/rb87/rb87.c
new file mode 100644
index 000000000000..4fd8a3decdb6
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/rb87.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 ryanbaekr
+ *
+ * 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 .
+ */
+
+#include "rb87.h"
diff --git a/keyboards/ryanbaekr/rb87/rb87.h b/keyboards/ryanbaekr/rb87/rb87.h
new file mode 100644
index 000000000000..b5fc15bfe2db
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/rb87.h
@@ -0,0 +1,37 @@
+/* Copyright 2022 ryanbaekr
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+#define LAYOUT( \
+ k00, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \
+ k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+ k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3f, k3g, \
+ k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4f, \
+ k50, k52, k53, k57, k5a, k5c, k5d, k5e, k5f, k5g \
+){ \
+ { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \
+ { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+ { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, k3f, k3g }, \
+ { ___, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, ___, k4d, ___, k4f, ___ }, \
+ { k50, ___, k52, k53, ___, ___, ___, k57, ___, ___, k5a, ___, k5c, k5d, k5e, k5f, k5g } \
+}
diff --git a/keyboards/ryanbaekr/rb87/readme.md b/keyboards/ryanbaekr/rb87/readme.md
new file mode 100644
index 000000000000..f38974b1fc86
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/readme.md
@@ -0,0 +1,19 @@
+# rb87
+
+A diy stacked acrylic 80% keyboard.
+
+* Keyboard Maintainer: [ryanbaekr](https://github.com/ryanbaekr)
+* Hardware Supported: rb87 with Elite-C
+* Hardware Availability: 2022/12/30
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ryanbaekr/rb87:default
+
+Flashing example for this keyboard:
+
+ make ryanbaekr/rb87:default:flash
+
+To boot into the bootloader, hold the reset button on the Elite-C on plug in
+
+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/ryanbaekr/rb87/rules.mk b/keyboards/ryanbaekr/rb87/rules.mk
new file mode 100644
index 000000000000..951dd07d6e0b
--- /dev/null
+++ b/keyboards/ryanbaekr/rb87/rules.mk
@@ -0,0 +1,12 @@
+# Build Options
+# change yes to no to disable
+#
+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 = no # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output