[Keyboard] Add Kimiko Rev2 (#21719)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Ex3c4Def <Joe_No@gmx.net>
Co-authored-by: Ben Roe <ben@MacBookzPro-M2.lan>
Co-authored-by: Ben Roe <ben@MacBook-Pro-von-Ben.local>

15 files changed, 664 insertions, 533 deletions

diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c b/keyboards/keycapsss/kimiko/glcdfont.c
index ff2f3bdcd5..ff2f3bdcd5 100644
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c
+++ b/keyboards/keycapsss/kimiko/glcdfont.c
diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/info.json
new file mode 100644
index 0000000000..a962104c56
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/info.json
@@ -0,0 +1,9 @@
+{
+    "features": {
+        "mousekey": true,
+        "extrakey": true
+    },
+    "split": {
+        "enabled": true
+    }
+}
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
deleted file mode 100644
index 2fd384b986..0000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2019 MechMerlin
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c"
-// #define OLED_FONT_WIDTH 5
-// #define OLED_FONT_HEIGHT 7
-
-
-#ifdef RGB_MATRIX_ENABLE
-
-// The pin connected to the data pin of the LEDs
-#define WS2812_DI_PIN D3
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 60
-#define RGBLED_NUM 60
-#define RGB_MATRIX_SPLIT {30,30}
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_TRANSPORT_MIRROR
-
-
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#   define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80 // limits maximum brightness of LEDs to 80 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
-
-
-
-//  ENABLES EFFECTS. See alls the effects -> https://github.com/samhocevar-forks/qmk-firmware/blob/master/docs/feature_rgb_matrix.md#rgb-matrix-effects
-#   define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-#   define ENABLE_RGB_MATRIX_BAND_SPLIT
-#   define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//#   define ENABLE_RGB_MATRIX_MULTISPLASH
-//#   define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#  define ENABLE_RGB_MATRIX_SPLASH
-#endif
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
deleted file mode 100644
index 243a7d013d..0000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* Copyright 2019 Leo Batyuk
- * Copyright 2020 Drashna Jaelre <@drashna>
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * ,--------------------------------------------.                    ,----------------------------------------------.
- * |   ESC   |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `        |
- * |---------+------+------+------+------+------|                    |------+------+------+------+------+-----------|
- * |   Tab   |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -        |
- * |---------+------+------+------+------+------|                    |------+------+------+------+------+-----------|
- * |  LShift |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '        |
- * |---------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+-----------|
- * |  LCTRL  |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift/Enter|
- * `-------------------------------------------|       /     \      \-----------------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
- [_QWERTY] = LAYOUT(
-    KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
-    KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
-    KC_LSFT, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LCTL, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
-                      KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_SPC,   KC_ENT,   RAISE,   KC_BSPC, KC_RGUI, KC_RALT
-),
-/* LOWER
- * ,-------------------------------------------.                    ,-----------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
- * |--------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |        |  1   |  2   |  3   |  4   |  5   |                    |  6   |  7   |  8   |  9   |   0  | F12  |
- * |--------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `    |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   ~  |
- * |--------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |        |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   \  |
- * `-------------------------------------------|       /     \      \-----------------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_LOWER] = LAYOUT(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_F12,
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
-    _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
-                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* RAISE
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
- * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
- * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                 | LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    KC_F1,  KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
-    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-                      _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______
-),
-/* ADJUST (Press LOWER and RAISE together)
- * ,-----------------------------------------.                    ,-----------------------------------------.
- * |QK_BOOT |      |      |      |      |      |                    |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |RGB ON| HUE+ | SAT+ | VAL+ |      |      |                    | PREV | PLAY | NEXT |      |      |      |
- * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * | MODE | HUE- | SAT- | VAL- |      |      |-------.    ,-------| VOL+ | MUTE | VOL- |      |      |      |
- * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
- * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
- * `-----------------------------------------/       /     \      \-----------------------------------------'
- *                 |LCTRL| LGUI | LALT |LOWER| Space /       \Enter \  |RAISE |BackSP| RGUI | RALT |
- *                 `----------------------------------'       '------------------------------------'
- */
-
-[_ADJUST] = LAYOUT(
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                   KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                   KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-                      _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______
-  )
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-    return state;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    } else {
-        return OLED_ROTATION_270;
-    }
-}
-
-void render_space(void) {
-    oled_write_P(PSTR("     "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
-    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
-    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
-    static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
-    static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
-    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
-    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
-    static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
-    static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_1, false);
-    } else {
-        oled_write_P(gui_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_1, false);
-    } else {
-        oled_write_P(alt_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(gui_on_2, false);
-    } else {
-        oled_write_P(gui_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_GUI) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_ALT) {
-        oled_write_P(alt_on_2, false);
-    } else {
-        oled_write_P(alt_off_2, false);
-    }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
-    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
-    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
-    static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
-    static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
-    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
-    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
-    static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
-    static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
-    // fillers between the modifier icons bleed into the icon frames
-    static const char PROGMEM off_off_1[] = {0xc5, 0};
-    static const char PROGMEM off_off_2[] = {0xc6, 0};
-    static const char PROGMEM on_off_1[] = {0xc7, 0};
-    static const char PROGMEM on_off_2[] = {0xc8, 0};
-    static const char PROGMEM off_on_1[] = {0xc9, 0};
-    static const char PROGMEM off_on_2[] = {0xca, 0};
-    static const char PROGMEM on_on_1[] = {0xcb, 0};
-    static const char PROGMEM on_on_2[] = {0xcc, 0};
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_1, false);
-    } else {
-        oled_write_P(ctrl_off_1, false);
-    }
-
-    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
-        oled_write_P(on_on_1, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_1, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_1, false);
-    } else {
-        oled_write_P(off_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_1, false);
-    } else {
-        oled_write_P(shift_off_1, false);
-    }
-
-    if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(ctrl_on_2, false);
-    } else {
-        oled_write_P(ctrl_off_2, false);
-    }
-
-    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
-        oled_write_P(on_on_2, false);
-    } else if(modifiers & MOD_MASK_CTRL) {
-        oled_write_P(on_off_2, false);
-    } else if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(off_on_2, false);
-    } else {
-        oled_write_P(off_off_2, false);
-    }
-
-    if(modifiers & MOD_MASK_SHIFT) {
-        oled_write_P(shift_on_2, false);
-    } else {
-        oled_write_P(shift_off_2, false);
-    }
-}
-
-void render_logo(void) {
-    static const char PROGMEM corne_logo[] = {
-        0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
-        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
-    oled_write_P(corne_logo, false);
-    // oled_write_P(PSTR("Kimiko"), false);
-}
-
-void render_layer_state(void) {
-    static const char PROGMEM default_layer[] = {
-        0x20, 0x94, 0x95, 0x96, 0x20,
-        0x20, 0xb4, 0xb5, 0xb6, 0x20,
-        0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
-    static const char PROGMEM raise_layer[] = {
-        0x20, 0x97, 0x98, 0x99, 0x20,
-        0x20, 0xb7, 0xb8, 0xb9, 0x20,
-        0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
-    static const char PROGMEM lower_layer[] = {
-        0x20, 0x9a, 0x9b, 0x9c, 0x20,
-        0x20, 0xba, 0xbb, 0xbc, 0x20,
-        0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
-    static const char PROGMEM adjust_layer[] = {
-        0x20, 0x9d, 0x9e, 0x9f, 0x20,
-        0x20, 0xbd, 0xbe, 0xbf, 0x20,
-        0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
-    if(layer_state_is(_ADJUST)) {
-        oled_write_P(adjust_layer, false);
-    } else if(layer_state_is(_LOWER)) {
-        oled_write_P(lower_layer, false);
-    } else if(layer_state_is(_RAISE)) {
-        oled_write_P(raise_layer, false);
-    } else {
-        oled_write_P(default_layer, false);
-    }
-}
-
-void render_status_main(void) {
-    render_space();
-    render_space();
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void render_status_secondary(void) {
-    render_space();
-    render_space();
-    render_logo();
-    render_space();
-}
-
-bool oled_task_user(void) {
-    if (is_keyboard_master()) {
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_status_secondary();
-    }
-    return false;
-}
-
-#endif
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    // Encoder on master side
-    if (index == 0) {
-        switch (get_highest_layer(layer_state)) {
-            // If the Default (QWERTY) layer is active
-            case _QWERTY:
-                // Arrow Up/Down
-                if (clockwise) {
-                    tap_code(KC_DOWN);
-                } else {
-                    tap_code(KC_UP);
-                }
-                break;
-
-            // If the RAISE layer is active
-            case _RAISE:
-                // Switch browser tabs
-                if (clockwise) {
-                    tap_code16(LCTL(KC_TAB));
-                } else {
-                    tap_code16(RCS(KC_TAB));
-                }
-                break;
-            // If the ADJUST layer is active
-            case _ADJUST:
-                // RGB brightness up/down
-                if (clockwise) {
-                    rgblight_decrease_val(); // tap_code(RGB_VAD);
-                } else {
-                    rgblight_increase_val(); // tap_code(RGB_VAI);
-                }
-                break;
-        }
-    }
-    // Encoder on slave side
-    else if (index == 1) {
-        switch (get_highest_layer(layer_state)) {
-            // If the Default (QWERTY) layer is active
-            case _QWERTY:
-                // Scroll by Word
-                if (clockwise) {
-                    tap_code16(LCTL(KC_RGHT));
-                } else {
-                    tap_code16(LCTL(KC_LEFT));
-                }
-                break;
-
-            // If the LOWER layer is active
-            case _LOWER:
-                // Volume up/down
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-
-            // If the ADJUST layer is active
-            case _ADJUST:
-                // RGB hue up/down
-                if (clockwise) {
-                    // tap_code(RGB_HUI);
-                    rgblight_increase_hue();
-                } else {
-                    // tap_code(RGB_HUD);
-                    rgblight_decrease_hue();
-                }
-                break;
-        }
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE
-
-
-
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
deleted file mode 100644
index 46cb8d8a94..0000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes       # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = no      # Disable keyboard RGB underglow
-
-# LTO: Link Time Optimizations.
-# Reduce compiled size, but will automatically disable the legacy TMK Macros and Functions features.
-# This does not affect QMK Macros and Layers
-LTO_ENABLE = yes
-
-#ENABLE RGB MATRIX WITH DRIVER WS2812
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
-
-#DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR
-SPLIT_KEYBOARD = yes
-
-#DEACTIVATED FOR MEMORY SAVING
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
index 041387ad53..c99a966603 100644
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ b/keyboards/keycapsss/kimiko/kimiko.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 @ben_roe (keycapsss.com)
+/* Copyright 2023 @BenRoe (keycapsss.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,8 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
 
+ #include "quantum.h"
+
+#ifdef KEYBOARD_keycapsss_kimiko_rev1
 #ifdef RGB_MATRIX_ENABLE
 
 //Thanks to Ben (keycapsss) for helpipng me to create g_led_config
@@ -75,4 +77,7 @@ led_config_t g_led_config = { {
     4, 4, 1, 1, 1, 1
 } };
 
-#endif // RGB_MATRIX_ENABLE
\ No newline at end of file
+#endif // RGB_MATRIX_ENABLE
+#endif // KEYBOARD_keycapsss_kimiko_rev1
+
+
diff --git a/keyboards/keycapsss/kimiko/post_config.h b/keyboards/keycapsss/kimiko/post_config.h
new file mode 100644
index 0000000000..31be5898cf
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/post_config.h
@@ -0,0 +1,25 @@
+/* Copyright 2019 MechMerlin
+ * Copyright 2023 @Ex3c4Def
+ * Copyright 2023 @BenRoe (keycapsss.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// OLED definitions
+#ifndef OLED_FONT_H
+#   define OLED_FONT_H "keyboards/keycapsss/kimiko/glcdfont.c"
+#endif
+
diff --git a/keyboards/keycapsss/kimiko/readme.md b/keyboards/keycapsss/kimiko/readme.md
index 0e2604079d..32c6401012 100644
--- a/keyboards/keycapsss/kimiko/readme.md
+++ b/keyboards/keycapsss/kimiko/readme.md
@@ -1,23 +1,59 @@
 # Kimiko
 
-<img src="https://keycapsss.com/media/image/7f/88/2b/kimiko-split-keyboard-1.jpg" width="800" />
+## Rev2
+
+A split keyboard with 4x6 vertically staggered keys and a Kyria style thumb thumb cluster.
+
+![Kimiko Rev2](https://i.imgur.com/TBP8Bcrh.jpg)
+
+- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
+- Hardware Supported: Pro Micro 5V/16Mhz and compatible
+- Hardware Availability: [Keycapsss.com](https://keycapsss.com)
+
+### Features (Rev2)
+
+- 62 Per key RGB led's (SK6812 Mini-E)
+  - RGB Matrix is enabled as default in rules.mk
+  - The effects can be configured in config.h
+- Support for 1 rotary encoder per side (two possible positions)
+- Support for 1 OLED display per side  
+  - 128x32 (SSD1306) or Nice!View are supported  
+  - With 1 OLED on each side, they have to be the same  
+  - Default configuration for 128x32 OLED  
+
+
+Make firmware .hex for this keyboard (after setting up your build environment):
+
+```bash
+qmk compile -kb keycapsss/kimiko/rev2 -km default
+```
+
+Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller.
+
+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).
+
+## Rev1
 
 A split keyboard with 4x6 vertically staggered keys and thumb keys.
 
+![Kimiko Rev1](https://i.imgur.com/md6V6Eoh.jpg)
+
+- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
+- Hardware Supported: Pro Micro 5V/16Mhz and compatible
+- Hardware Availability: [Keycapsss.com](https://keycapsss.com)
+
+### Features (Rev1)
+
 - Per key RGB led's (SK6812 Mini-E)
 - 6 underglow RGB led's per side (SK6812 Mini)
 - Support for 1 rotary encoder per side (two possible positions)
 
-* Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
-* Hardware Supported: Pro Micro 5V/16Mhz and compatible
-* Hardware Availability: [keycapsss.com](https://keycapsss.com)
-
 Make firmware .hex for this keyboard (after setting up your build environment):
 
-    make keycapsss/kimiko:default
-
-Example of flashing this keyboard (or use [QMK Toolbox](https://github.com/qmk/qmk_toolbox)):
+```bash
+qmk compile -kb keycapsss/kimiko/rev1 -km default
+```
 
-    make keycapsss/kimiko:default:flash
+Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller.
 
 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/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/info.json
new file mode 100644
index 0000000000..f595bd9cc4
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/info.json
@@ -0,0 +1,199 @@
+{
+    "manufacturer": "Keycapsss",
+    "keyboard_name": "Kimiko Rev2",
+    "maintainer": "BenRoe",
+    "build": {
+        "lto": true
+    },
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4"}
+        ]
+    },
+    "features": {
+        "encoder": true,
+        "nkro": true,
+        "oled": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "layout": [
+            { "matrix": [0, 5], "x": 66, "y": 5, "flags": 4 },
+            { "matrix": [0, 4], "x": 53, "y": 4, "flags": 4 },
+            { "matrix": [0, 3], "x": 40, "y": 0, "flags": 4 },
+            { "matrix": [0, 2], "x": 26, "y": 4, "flags": 4 },
+            { "matrix": [0, 1], "x": 13, "y": 11, "flags": 4 },
+            { "matrix": [0, 0], "x": 0, "y": 11, "flags": 4 },
+            { "matrix": [1, 0], "x": 0, "y": 23, "flags": 4 },
+            { "matrix": [1, 1], "x": 13, "y": 23, "flags": 4 },
+            { "matrix": [1, 2], "x": 26, "y": 15, "flags": 4 },
+            { "matrix": [1, 3], "x": 40, "y": 12, "flags": 4 },
+            { "matrix": [1, 4], "x": 53, "y": 15, "flags": 4 },
+            { "matrix": [1, 5], "x": 66, "y": 17, "flags": 4 },
+            { "matrix": [2, 5], "x": 66, "y": 29, "flags": 4 },
+            { "matrix": [2, 4], "x": 53, "y": 27, "flags": 4 },
+            { "matrix": [2, 3], "x": 40, "y": 24, "flags": 4 },
+            { "matrix": [2, 2], "x": 26, "y": 27, "flags": 4 },
+            { "matrix": [2, 1], "x": 13, "y": 35, "flags": 4 },
+            { "matrix": [2, 0], "x": 0, "y": 35, "flags": 1 },
+            { "matrix": [3, 0], "x": 0, "y": 47, "flags": 1 },
+            { "matrix": [3, 1], "x": 13, "y": 47, "flags": 4 },
+            { "matrix": [3, 2], "x": 26, "y": 39, "flags": 4 },
+            { "matrix": [3, 3], "x": 40, "y": 36, "flags": 4 },
+            { "matrix": [3, 4], "x": 53, "y": 39, "flags": 4 },
+            { "matrix": [3, 5], "x": 66, "y": 41, "flags": 4 },
+            { "matrix": [5, 5], "x": 80, "y": 48, "flags": 4 },
+            { "matrix": [4, 5], "x": 94, "y": 52, "flags": 4 },
+            { "matrix": [4, 4], "x": 87, "y": 64, "flags": 4 },
+            { "matrix": [4, 3], "x": 73, "y": 60, "flags": 1 },
+            { "matrix": [4, 2], "x": 53, "y": 51, "flags": 1 },
+            { "matrix": [4, 1], "x": 40, "y": 47, "flags": 1 },
+            { "matrix": [4, 0], "x": 26, "y": 51, "flags": 1 },
+            { "matrix": [6, 5], "x": 158, "y": 5, "flags": 4 },
+            { "matrix": [6, 4], "x": 171, "y": 4, "flags": 4 },
+            { "matrix": [6, 3], "x": 184, "y": 0, "flags": 4 },
+            { "matrix": [6, 2], "x": 198, "y": 4, "flags": 4 },
+            { "matrix": [6, 1], "x": 211, "y": 11, "flags": 4 },
+            { "matrix": [6, 0], "x": 224, "y": 11, "flags": 4 },
+            { "matrix": [7, 0], "x": 224, "y": 23, "flags": 4 },
+            { "matrix": [7, 1], "x": 211, "y": 23, "flags": 4 },
+            { "matrix": [7, 2], "x": 198, "y": 15, "flags": 4 },
+            { "matrix": [7, 3], "x": 184, "y": 12, "flags": 4 },
+            { "matrix": [7, 4], "x": 171, "y": 15, "flags": 4 },
+            { "matrix": [7, 5], "x": 158, "y": 17, "flags": 4 },
+            { "matrix": [8, 5], "x": 158, "y": 29, "flags": 4 },
+            { "matrix": [8, 4], "x": 171, "y": 27, "flags": 4 },
+            { "matrix": [8, 3], "x": 184, "y": 24, "flags": 4 },
+            { "matrix": [8, 2], "x": 198, "y": 27, "flags": 4 },
+            { "matrix": [8, 1], "x": 211, "y": 35, "flags": 4 },
+            { "matrix": [8, 0], "x": 224, "y": 35, "flags": 4 },
+            { "matrix": [9, 0], "x": 224, "y": 47, "flags": 1 },
+            { "matrix": [9, 1], "x": 211, "y": 47, "flags": 4 },
+            { "matrix": [9, 2], "x": 198, "y": 39, "flags": 4 },
+            { "matrix": [9, 3], "x": 184, "y": 36, "flags": 4 },
+            { "matrix": [9, 4], "x": 171, "y": 39, "flags": 4 },
+            { "matrix": [9, 5], "x": 158, "y": 41, "flags": 4 },
+            { "matrix": [11, 5], "x": 144, "y": 48, "flags": 4 },
+            { "matrix": [10, 5], "x": 130, "y": 52, "flags": 4 },
+            { "matrix": [10, 4], "x": 137, "y": 64, "flags": 4 },
+            { "matrix": [10, 3], "x": 151, "y": 60, "flags": 1 },
+            { "matrix": [10, 2], "x": 171, "y": 51, "flags": 4 },
+            { "matrix": [10, 1], "x": 184, "y": 47, "flags": 1 },
+            { "matrix": [10, 0], "x": 198, "y": 51, "flags": 1 }
+        ],
+        "led_count": 62,
+        "max_brightness": 80,
+        "split_count": [31, 31]
+    },
+    "rgblight": {
+        "led_count": 62,
+        "max_brightness": 80,
+        "split": true,
+        "split_count": [31, 31]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F5", "pin_b": "F4"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+                "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+            }
+        },
+        "soft_serial_pin": "D2"
+    },
+    "url": "https://keycapsss.com",
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x4B69",
+        "vid": "0x7983"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.96},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.96},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.31},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.31},
+                {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.46},
+                {"label": "R00", "matrix": [6, 5], "x": 12, "y": 0.45},
+                {"label": "R01", "matrix": [6, 4], "x": 13, "y": 0.31},
+                {"label": "R02", "matrix": [6, 3], "x": 14, "y": 0},
+                {"label": "R03", "matrix": [6, 2], "x": 15, "y": 0.31},
+                {"label": "R04", "matrix": [6, 1], "x": 16, "y": 0.96},
+                {"label": "R05", "matrix": [6, 0], "x": 17, "y": 0.96},
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.96},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.96},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.31},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.31},
+                {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.46},
+                {"label": "R10", "matrix": [7, 5], "x": 12, "y": 1.46},
+                {"label": "R11", "matrix": [7, 4], "x": 13, "y": 1.31},
+                {"label": "R12", "matrix": [7, 3], "x": 14, "y": 1},
+                {"label": "R13", "matrix": [7, 2], "x": 15, "y": 1.31},
+                {"label": "R14", "matrix": [7, 1], "x": 16, "y": 1.96},
+                {"label": "R15", "matrix": [7, 0], "x": 17, "y": 1.96},
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.96},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.96},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.31},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.31},
+                {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.46},
+                {"label": "R20", "matrix": [8, 5], "x": 12, "y": 2.46},
+                {"label": "R21", "matrix": [8, 4], "x": 13, "y": 2.31},
+                {"label": "R22", "matrix": [8, 3], "x": 14, "y": 2},
+                {"label": "R23", "matrix": [8, 2], "x": 15, "y": 2.31},
+                {"label": "R24", "matrix": [8, 1], "x": 16, "y": 2.96},
+                {"label": "R25", "matrix": [8, 0], "x": 17, "y": 2.96},
+                {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.96},
+                {"label": "L31", "matrix": [3, 1], "x": 1, "y": 4},
+                {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.31},
+                {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.31},
+                {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.46},
+                {"label": "L50", "matrix": [5, 5], "x": 5.75, "y": 4.51},
+                {"label": "L40", "matrix": [4, 5], "x": 6.75, "y": 5},
+                {"label": "R40", "matrix": [10, 5], "x": 10.25, "y": 5},
+                {"label": "R50", "matrix": [11, 5], "x": 11.25, "y": 4.5},
+                {"label": "R30", "matrix": [9, 5], "x": 12, "y": 3.46},
+                {"label": "R31", "matrix": [9, 4], "x": 13, "y": 3.31},
+                {"label": "R32", "matrix": [9, 3], "x": 14, "y": 3},
+                {"label": "R33", "matrix": [9, 2], "x": 15, "y": 3.31},
+                {"label": "R34", "matrix": [9, 1], "x": 16, "y": 3.96},
+                {"label": "R35", "matrix": [9, 0], "x": 17, "y": 3.96},
+                {"label": "L41", "matrix": [4, 0], "x": 2.5, "y": 4.5},
+                {"label": "L42", "matrix": [4, 1], "x": 3.5, "y": 4.5},
+                {"label": "L43", "matrix": [4, 2], "x": 4.5, "y": 4.95},
+                {"label": "L44", "matrix": [4, 3], "x": 5.5, "y": 5.5},
+                {"label": "L45", "matrix": [4, 4], "x": 6.5, "y": 6},
+                {"label": "R41", "matrix": [10, 4], "x": 10.5, "y": 6},
+                {"label": "R42", "matrix": [10, 3], "x": 11.5, "y": 5.5},
+                {"label": "R43", "matrix": [10, 2], "x": 12.5, "y": 4.75},
+                {"label": "R44", "matrix": [10, 1], "x": 13.5, "y": 4.5},
+                {"label": "R45", "matrix": [10, 0], "x": 14.5, "y": 4.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
new file mode 100644
index 0000000000..34c2708e86
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2019 MechMerlin
+ * Copyright 2020 @ben_roe (keycapsss.com)
+ * Copyright 2023 @Ex3c4Def
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MASTER_RIGHT
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS    // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
+
+// These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
+
+#define RGB_MATRIX_VAL_STEP 4
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_HUE 0   // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL 60  // RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 60  // Sets the default animation speed, if none has been set
+
+#if defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
+#    define POINTING_DEVICE_ROTATION_180 // may be used for trackball in 2nd position
+#endif
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f7e434c881
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2019 Leo Batyuk
+ * Copyright 2020 Drashna Jaelre <@drashna>
+ * Copyright 2020 @ben_roe (keycapsss.com)
+ * Copyright 2023 @Ex3c4Def
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* QWERTY
+ * ,--------------------------------------------.                                   ,----------------------------------------------.
+ * |   ESC   |   1  |   2  |   3  |   4  |   5  |                                   |   6  |   7  |   8  |   9  |   0  |  `        |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |   Tab   |   Q  |   W  |   E  |   R  |   T  |                                   |   Y  |   U  |   I  |   O  |   P  |  -        |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |  LShift |   A  |   S  |   D  |   F  |   G  |---------------.   ,---------------|   H  |   J  |   K  |   L  |   ;  |  '        |
+ * |---------+------+------+------+------+------|  (   |   [    |   |   ]   |   )   |------+------+------+------+------+-----------|
+ * |  LCTRL  |   Z  |   X  |   C  |   V  |   B  |------|--------|   |-------|-------|   N  |   M  |   ,  |  .  |   /  |RShift/Enter|
+ * `--------------------------------------------|               /    \              |----------------------------------------------'
+ *                         | LCTRL| LGUI |LALT  |LOWER | Space /      \Enter| RAISE |BackSP| RGUI | RALT |
+ *                         `----------------------------------'        '---------------------------------'
+ */
+ [_QWERTY] = LAYOUT(
+    KC_ESC,  KC_1,  KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+    KC_TAB,  KC_Q,  KC_W,    KC_E,    KC_R,    KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+    KC_LSFT, KC_A,  KC_S,    KC_D,    KC_F,    KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LCTL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_LPRN, KC_LBRC,  KC_RBRC, KC_RPRN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+                             KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC,   KC_ENT,  TL_UPPR, KC_BSPC, KC_RGUI, KC_RALT
+),
+/* LOWER
+* QWERTY
+ * ,--------------------------------------------.                                   ,----------------------------------------------.
+ * |         |  F1  |  F2  |  F3  | F4 |  F5  |                                   |  F6  |  F7  |  F8  |  F9  | F10  |  F11      |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |         |   1  |   2  |   3  |   4  |   5  |                                   |   6  |   7  |   8  |   9  |   0  |  F12      |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |    `    |   !  |   @  |   #  |   $  |   %  |---------------.   ,---------------|   ^  |   &  |   *  |   (  |   )  |  ~        |
+ * |---------+------+------+------+------+------|      |        |   |       |       |------+------+------+------+------+-----------|
+ * |         |      |      |      |      |      |------|--------|   |-------|-------|      |   _  |   +  |   {  |   }  |  \        |
+ * `--------------------------------------------|               /    \              |----------------------------------------------'
+ *                         | LCTRL| LGUI |LALT  |LOWER | Space /      \Enter| RAISE |BackSP| RGUI | RALT |
+ *                         `----------------------------------'        '---------------------------------'
+ */
+[_LOWER] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_F12,
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+    _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
+                               _______, _______, _______, _______,_______, _______, _______, _______, _______, _______
+),
+/* RAISE
+ * ,--------------------------------------------.                                   ,----------------------------------------------.
+ * |         |      |      |      |      |      |                                   |      |      |      |      |      |           |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |   `     |   1  |   2  |   3  |   4  |   5  |                                   |   6  |   7  |   8  |   9  |   0  |           |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * |  F1     |  F2  |  F3  | F4 |  F5  |  F6  |---------------.   ,---------------| Left | Down |  Up  |Right |   ;  |           |
+ * |---------+------+------+------+------+------|  [   |   [    |   |   [   |   [   |------+------+------+------+------+-----------|
+ * |  F7     |  F8  |  F9  | F10  | F11  | F12  |------|--------|   |-------|-------|   +  |   -  |   =  |  [  |   ]   |   \       |
+ * `--------------------------------------------|               /    \              |----------------------------------------------'
+ *                         | LCTRL| LGUI |LALT  |LOWER | Space /      \Enter| RAISE |BackSP| RGUI | RALT |
+ *                         `----------------------------------'        '---------------------------------'
+ */
+ [_RAISE] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+    KC_F1,  KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,                                          XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   _______, _______,  _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                               _______, _______, _______,  _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST (Press LOWER and RAISE together)
+ * ,--------------------------------------------.                                   ,----------------------------------------------.
+ * | QK_BOOT |      |      |      |     |       |                                   |      |      |      |      |      |           |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * | RGB ON  | HUE+ | SAT+ | VAL+ |      |      |                                   | PREV | PLAY | NEXT |      |      |           |
+ * |---------+------+------+------+------+------|                                   |------+------+------+------+------+-----------|
+ * | MODE    | HUE- | SAT- | VAL- |      |      |---------------.   ,---------------| VOL+ | MUTE | VOL- |      |      |           |
+ * |---------+------+------+------+------+------|      |        |   |       |       |------+------+------+------+------+-----------|
+ * |         |      |      |      |      |      |------|--------|   |-------|-------|      |      |      |      |       |           |
+ * `--------------------------------------------|               /    \              |----------------------------------------------'
+ *                         | LCTRL| LGUI |LALT  |LOWER | Space /      \Enter| RAISE |BackSP| RGUI | RALT |
+ *                         `----------------------------------'        '---------------------------------'
+ */
+[_ADJUST] = LAYOUT(
+    QK_BOOT,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                                     KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
+    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                                     KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                               _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+};
+
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP),          ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+    [_LOWER] =  { ENCODER_CCW_CW(RGB_HUI, KC_TAB),         ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_RAISE] =  { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),        ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
+    [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD),       ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk
new file mode 100644
index 0000000000..420f29d8f7
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk
@@ -0,0 +1,8 @@
+TRI_LAYER_ENABLE   = yes
+ENCODER_MAP_ENABLE = yes
+
+RGBLIGHT_ENABLE    = no    # Enable keyboard 'old' RGB lightning
+RGB_MATRIX_ENABLE  = yes   # Enable keyboard RGB Matrix lightning
+
+# POINTING_DEVICE_ENABLE = yes
+# POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
diff --git a/keyboards/keycapsss/kimiko/rev2/rev2.c b/keyboards/keycapsss/kimiko/rev2/rev2.c
new file mode 100644
index 0000000000..c5765812c0
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/rev2.c
@@ -0,0 +1,209 @@
+/* Copyright 2023 @BenRoe (keycapsss.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
+
+#    ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+void render_mod_status_gui_alt(uint8_t modifiers) {
+    static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
+    static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
+    static const char PROGMEM gui_on_1[]  = {0x8d, 0x8e, 0};
+    static const char PROGMEM gui_on_2[]  = {0xad, 0xae, 0};
+
+    static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
+    static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
+    static const char PROGMEM alt_on_1[]  = {0x8f, 0x90, 0};
+    static const char PROGMEM alt_on_2[]  = {0xaf, 0xb0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[]  = {0xc7, 0};
+    static const char PROGMEM on_off_2[]  = {0xc8, 0};
+    static const char PROGMEM off_on_1[]  = {0xc9, 0};
+    static const char PROGMEM off_on_2[]  = {0xca, 0};
+    static const char PROGMEM on_on_1[]   = {0xcb, 0};
+    static const char PROGMEM on_on_2[]   = {0xcc, 0};
+
+    if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_1, false);
+    } else {
+        oled_write_P(gui_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
+        oled_write_P(on_on_1, false);
+    } else if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_1, false);
+    } else if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_1, false);
+    } else {
+        oled_write_P(alt_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(gui_on_2, false);
+    } else {
+        oled_write_P(gui_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+        oled_write_P(on_on_2, false);
+    } else if (modifiers & MOD_MASK_GUI) {
+        oled_write_P(on_off_2, false);
+    } else if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_ALT) {
+        oled_write_P(alt_on_2, false);
+    } else {
+        oled_write_P(alt_off_2, false);
+    }
+}
+
+void render_mod_status_ctrl_shift(uint8_t modifiers) {
+    static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
+    static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
+    static const char PROGMEM ctrl_on_1[]  = {0x91, 0x92, 0};
+    static const char PROGMEM ctrl_on_2[]  = {0xb1, 0xb2, 0};
+
+    static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
+    static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
+    static const char PROGMEM shift_on_1[]  = {0xcd, 0xce, 0};
+    static const char PROGMEM shift_on_2[]  = {0xcf, 0xd0, 0};
+
+    // fillers between the modifier icons bleed into the icon frames
+    static const char PROGMEM off_off_1[] = {0xc5, 0};
+    static const char PROGMEM off_off_2[] = {0xc6, 0};
+    static const char PROGMEM on_off_1[]  = {0xc7, 0};
+    static const char PROGMEM on_off_2[]  = {0xc8, 0};
+    static const char PROGMEM off_on_1[]  = {0xc9, 0};
+    static const char PROGMEM off_on_2[]  = {0xca, 0};
+    static const char PROGMEM on_on_1[]   = {0xcb, 0};
+    static const char PROGMEM on_on_2[]   = {0xcc, 0};
+
+    if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_1, false);
+    } else {
+        oled_write_P(ctrl_off_1, false);
+    }
+
+    if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
+        oled_write_P(on_on_1, false);
+    } else if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_1, false);
+    } else if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_1, false);
+    } else {
+        oled_write_P(off_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_1, false);
+    } else {
+        oled_write_P(shift_off_1, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(ctrl_on_2, false);
+    } else {
+        oled_write_P(ctrl_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+        oled_write_P(on_on_2, false);
+    } else if (modifiers & MOD_MASK_CTRL) {
+        oled_write_P(on_off_2, false);
+    } else if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(off_on_2, false);
+    } else {
+        oled_write_P(off_off_2, false);
+    }
+
+    if (modifiers & MOD_MASK_SHIFT) {
+        oled_write_P(shift_on_2, false);
+    } else {
+        oled_write_P(shift_off_2, false);
+    }
+}
+
+void render_logo(void) {
+    static const char PROGMEM kimiko_logo[] = {0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
+    oled_advance_page(false);
+    oled_advance_page(false);
+    oled_write_P(kimiko_logo, false);
+    // oled_write_P(PSTR("Kimiko"), false);
+}
+
+void render_layer_state(void) {
+    static const char PROGMEM default_layer[] = {0x20, 0x94, 0x95, 0x96, 0x20, 0x20, 0xb4, 0xb5, 0xb6, 0x20, 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
+    static const char PROGMEM raise_layer[]   = {0x20, 0x97, 0x98, 0x99, 0x20, 0x20, 0xb7, 0xb8, 0xb9, 0x20, 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
+    static const char PROGMEM lower_layer[]   = {0x20, 0x9a, 0x9b, 0x9c, 0x20, 0x20, 0xba, 0xbb, 0xbc, 0x20, 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
+    static const char PROGMEM adjust_layer[]  = {0x20, 0x9d, 0x9e, 0x9f, 0x20, 0x20, 0xbd, 0xbe, 0xbf, 0x20, 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
+
+    if (layer_state_is(_ADJUST)) {
+        oled_write_P(adjust_layer, false);
+    } else if (layer_state_is(_LOWER)) {
+        oled_write_P(lower_layer, false);
+    } else if (layer_state_is(_RAISE)) {
+        oled_write_P(raise_layer, false);
+    } else {
+        oled_write_P(default_layer, false);
+    }
+}
+
+void render_status_main(void) {
+    render_logo();
+    oled_advance_page(false);
+    render_layer_state();
+    oled_advance_page(false);
+    render_mod_status_gui_alt(get_mods() | get_oneshot_mods());
+    render_mod_status_ctrl_shift(get_mods() | get_oneshot_mods());
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    if (is_keyboard_master()) {
+        render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    } else {
+        render_logo();
+    }
+
+    return true;
+}
+#    endif // OLED_ENABLE
diff --git a/keyboards/keycapsss/kimiko/rev2/rules.mk b/keyboards/keycapsss/kimiko/rev2/rules.mk
new file mode 100644
index 0000000000..7d895c7f4d
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/rules.mk
@@ -0,0 +1 @@
+# File is left intentionally blank
diff --git a/keyboards/keycapsss/kimiko/rules.mk b/keyboards/keycapsss/kimiko/rules.mk
index 7aeacb46d0..cb9f69d6bb 100644
--- a/keyboards/keycapsss/kimiko/rules.mk
+++ b/keyboards/keycapsss/kimiko/rules.mk
@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # 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 = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = keycapsss/kimiko/rev1
+DEFAULT_FOLDER = keycapsss/kimiko/rev2