diff --git a/keyboards/ciaanh/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawa/rev1/config.h
index 91a5f367b31..47f3b4be6e2 100644
--- a/keyboards/ciaanh/kanagawa/rev1/config.h
+++ b/keyboards/ciaanh/kanagawa/rev1/config.h
@@ -14,7 +14,6 @@
 
 #define MATRIX_ROW_PINS { B2, B3, B1, F7, F6, F5 }
 #define MATRIX_COL_PINS { B6, F0, F1, C7, D5, B7, B5, B4, E6, D7, C6, D4, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
@@ -41,6 +40,6 @@
 #define DEBOUNCE 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+// #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+// #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h
index 29d9056caed..159105caa7d 100644
--- a/keyboards/ciaanh/kanagawa2040/config.h
+++ b/keyboards/ciaanh/kanagawa2040/config.h
@@ -19,31 +19,42 @@
 #include "config_common.h"
 
 /* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 3
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 14
 
 /* Keyboard Matrix Assignments */
 // clang-format off
-#define DIRECT_PINS { \
-    { NO_PIN, NO_PIN, GP0  }, \
-    { GP1,    GP2,    GP3  }, \
-    { GP4,    GP5,    GP6  }, \
-    { GP7,    GP8,    GP9  }, \
-    { GP10,   GP11,   GP12 }  \
-}
+// #define DIRECT_PINS { \
+//     { NO_PIN, NO_PIN, GP0  }, \
+//     { GP1,    GP2,    GP3  }, \
+//     { GP4,    GP5,    GP6  }, \
+//     { GP7,    GP8,    GP9  }, \
+//     { GP10,   GP11,   GP12 }  \
+// }
+
+#define DIODE_DIRECTION COL2ROW
+#define MATRIX_ROW_PINS { GP27, GP26, GP21, GP20, GP19, GP18 }
+#define MATRIX_COL_PINS { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15 }
 // clang-format on
 
+#define DIODE_DIRECTION COL2ROW
+
 /* OLED SPI Defines */
-#define OLED_DISPLAY_128X32
+#ifdef OLED_ENABLE
+#   define OLED_DISPLAY_128X32
+#   define OLED_FONT_H "lib/oledfont.c"
+#   define OLED_FONT_END 255
+// #   define OLED_DISPLAY_ADDRESS 0x78
+#endif
 
 /* I2C Conf */
 #define I2C_DRIVER I2CD1
-#define I2C1_SDA_PIN GP12
-#define I2C1_SCL_PIN GP13
+#define I2C1_SDA_PIN GP16
+#define I2C1_SCL_PIN GP17
 
 /* Encoders */
-#define ENCODERS_PAD_A { GP18 }
-#define ENCODERS_PAD_B { GP17 }
+#define ENCODERS_PAD_A { GP1 }
+#define ENCODERS_PAD_B { GP0 }
 
 #define DEBOUNCE 5
 
@@ -60,9 +71,9 @@
 #ifdef RGB_MATRIX_ENABLE
 
      /* RGB Defines */
-#    define RGB_DI_PIN GP19
-#    define DRIVER_LED_TOTAL 12
-#    define RGBLED_NUM 12
+#    define RGB_DI_PIN GP28
+#    define DRIVER_LED_TOTAL 6
+#    define RGBLED_NUM 6
 
      /* Enable Framebuffer and keypress effects */
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c
index f124546f093..0cb1efe3498 100644
--- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c
+++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c
@@ -21,18 +21,24 @@
 #define NA NO_LED
 
 /* RGB Positioning */
-led_config_t g_led_config = { {
-    { NA,  NA, NA },
-    {  0,   1,  2 },
-    {  3,   4,  5 },
-    {  6,   7,  8 },
-    {  9,  10, 11 }
+led_config_t g_led_config = {  {
+    // Key Matrix to LED Index
+    { 12,  11, 10,  9,  8,      7,  6,  5,  4,  3,  2,      1,      0, NO_LED, NO_LED },
+    { 26,  25, 24, 23, 22,     21, 20, 19, 18, 17, 16,     15,     14,     13,     66 },
+    { 40,  39, 38, 37, 36,     35, 34, 33, 32, 31, 30,     29,     28,     27,     67 },
+    { 53,  52, 51, 50, 49,     48, 47, 46, 45, 44, 43,     42,     41, NO_LED,     68 },
+    { 65,  64, 63, 62, 61,     60, 59, 58, 57, 56, 55,     54, NO_LED,     70, NO_LED },
+    { 82,  81, 80, 79, 78, NO_LED, 77, 76, 75, 74, 73, NO_LED,     72,     71,     69 }
 }, {
-    { 0,  0 }, { 112,  0 }, { 224,  0},
-    { 0, 21 }, { 112, 21 }, { 224, 21},
-    { 0, 42 }, { 112, 42 }, { 224, 42},
-    { 0, 64 }, { 112, 64 }, { 224, 64}
+    // LED Index to Physical Position
+    { 0,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 112,  0 }, { 224,  0},
+    { 0, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 224, 21},
+    { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42},
+    { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42},
+    { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42},
+    { 0, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 224, 64}
 }, {
+    // LED Index to Flag
     4, 4, 4,
     4, 4, 4,
     4, 4, 4,
diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h
index 6e2e3524b7d..3358e7be547 100644
--- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h
+++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h
@@ -21,18 +21,21 @@
 #define ___ KC_NO
 
 // clang-format off
- #define LAYOUT(  \
-             K02, \
-   K10, K11, K12, \
-   K20, K21, K22, \
-   K30, K31, K32, \
-   K40, K41, K42  \
- ) \
- { \
-   { ___, ___, K02 }, \
-   { K10, K11, K12 }, \
-   { K20, K21, K22 }, \
-   { K30, K31, K32 }, \
-   { K40, K41, K42 }  \
- }
+#define LAYOUT_84_ansi( \
+    K00, K01,K02,K03,K04, K05,K06,K07,K08, K09,K010,K011,K012,          K013,   \
+                                                                                \
+    K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K110,K111,K112,  K113  ,    K313,   \
+    K20  ,K21,K22,K23,K24,K25,K26,K27,K28,K29,K210,K211,K212, K213 ,    K413,   \
+    K30   ,K31,K32,K33,K34,K35,K36,K37,K38,K39,K310,K311,   K312   ,    K513,   \
+    K40     ,K41,K42,K43,K44,K45,K46,K47,K48,K49,K410,   K411  , K412,          \
+    K50 ,K51,K52 , K53,K54    ,    K55,K56, K57 ,K58,K59 , K510, K511, K512     \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412, K413 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K510, K511, K512, K513 }  \
+}
 // clang-format on
diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c
index 34989ea0b60..69e3b515a3a 100644
--- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c
+++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c
@@ -1,114 +1,258 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #include QMK_KEYBOARD_H
+#include "keycodes.h"
 
+/* Keyboard layout
+        ,---------.   ,---------------------------------------.  ,---------------------------------------.  ,---------------------------------------.    ,---------.
+        |   ka0   |   |   ka1   |   ka2   |   ka3   |   ka4   |  |   ka5   |   ka6   |   ka7   |   ka8   |  |   ka9   |  ka10   |  ka11   |  ka12   |    |  sw99   |
+        `---------'   `---------+---------+---------+---------'  `---------+---------+---------+---------'  `---------+---------+---------+---------'    `---------'
+        ,-------------------------------------------------------------------------------------------------------------------------------------------.    ,---------.
+        |   kb0   |   kb1   |   kb2   |   kb3   |   kb4   |   kb5   |   kb6   |   kb7   |   kb8   |   kb9   |  kb10   |  kb11   |  kb12   |  kb13   |    |  kd13   |
+        |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|    |---------|
+        |   kc0   |   kc1   |   kc2   |   kc3   |   kc4   |   kc5   |   kc6   |   kc7   |   kc8   |   kc9   |  kc10   |  kc11   |  kc12   |  kc13   |    |  ke13   |
+        |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'    |---------|
+        |   kd0   |   kd1   |   kd2   |   kd3   |   kd4   |   kd5   |   kd6   |   kd7   |   kd8   |   kd9   |  kd10   |  kd11   |  kd12   |              |  kf13   |
+        |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'              `---------'
+        |   ke0   |   ke1   |   ke2   |   ke3   |   ke4   |   ke5   |   ke6   |   ke7   |   ke8   |   ke9   |  ke10   |  ke11   |            ,---------.
+        |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|            |  ke12   |
+        |   kf0   |   kf1   |   kf2   | ,-------------------.     ,-------------------. |   kf7   |   kf8   |   kf9   |            ,---------|---------|---------.
+        |---------+---------+---------+ |   kf3   |   kf4   |     |   kf5   |   kf6   | +---------+---------+---------'            |  kf10   |  kf11   |  kf12   |
+                                        `---------+---------'     `---------+---------'                                            `---------+---------+---------'
+*/
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-                    KC_MUTE,
-      KC_ENT, KC_0, KC_BSPC,
-      KC_7,   KC_8, KC_9,
-      KC_4,   KC_5, KC_6,
-      KC_1,   KC_2, KC_3
-  )
+
+/* Keymap: BASE
+*
+*   
+*   ,---------.   ,---------------------------------------.  ,---------------------------------------.  ,---------------------------------------.    ,---------.
+*   |   ESC   |   |   F1    |   F2    |   F3    |   F4    |  |   F5    |   F6    |   F7    |   F8    |  |   F9    |   F10   |   F11   |   F12   |    | ENCODER |
+*   `---------'   `---------+---------+---------+---------'  `---------+---------+---------+---------'  `---------+---------+---------+---------'    `---------'
+*   ,-------------------------------------------------------------------------------------------------------------------------------------------.    ,---------.
+*   |    `    |    1    |    2    |    3    |    4    |    5    |    6    |    7    |    8    |    9    |    0    |    -    |    =    |Backspace|    |  Delete |
+*   |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|    |---------|
+*   |   Tab   |    Q    |    W    |    E    |    R    |    T    |    Y    |    U    |    I    |    O    |    P    |    [    |    ]    |    \    |    |   HOME  |
+*   |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'    |---------|
+*   |  CapsL  |    A    |    S    |    D    |    F    |    G    |    H    |    J    |    K    |    L    |    ;    |    '    |  ENTER  |              |   END   |
+*   |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'              `---------'
+*   | LShift  |    Z    |    X    |    C    |    V    |    B    |    N    |    M    |    ,    |    .    |    /    | RShift  |            ,---------.
+*   |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|            |    UP   |
+*   |  LCtrl  |   LGUI  |   LAlt  | ,-------------------.     ,-------------------. |   RAlt  |   CODE  |  RCtrl  |            ,---------|---------|---------.
+*   |---------+---------+---------+ |  Lower  |  Space  |     |  Space  |  Upper  | +---------+---------+---------'            |  LEFT   |   DOWN  |  RIGHT  |
+*                                   `---------+---------'     `---------+---------'                                            `---------+---------+---------'
+*   
+*   
+*/
+    [_BASE] = LAYOUT_84_ansi( 
+          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,              ENCODER, /*KC_MPLY*/  \
+       
+          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_DEL,  \
+          KC_TAB,    KC_Q,       KC_W,       KC_E,       KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS,     KC_HOME,  \
+         KC_CAPS,    KC_A, LT(0,KC_S),       KC_D,       KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,               KC_END,  \
+         KC_LSFT,    KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V),    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,                KC_UP,           \
+         KC_LCTL, KC_LGUI,    KC_LALT,            L_DWN,  KC_SPC,        KC_SPC,    L_UP,       KC_RALT, TO_CODE, KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT   \
+    ),
+
+
+    [_CODE] = LAYOUT_84_ansi(
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,             XXXXXXX,  \
+
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,           \
+         XXXXXXX, XXXXXXX, XXXXXXX,       _______, XXXXXXX,       XXXXXXX, _______,       XXXXXXX, TO_BASE, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX   \
+    ),
+
+
+    [_LOWER] = LAYOUT_84_ansi(
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,             XXXXXXX,  \
+
+       _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,           \
+         XXXXXXX, XXXXXXX, XXXXXXX,       _______, XXXXXXX,       XXXXXXX, _______,       XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX   \
+    ),
+
+
+    [_UPPER] = LAYOUT_84_ansi(
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,             XXXXXXX,  \
+
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,  \
+         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX,           \
+         XXXXXXX, XXXXXXX, XXXXXXX,       _______, XXXXXXX,       XXXXXXX, _______,       XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX   \
+    )
+
+
+
 };
 
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-};
-#endif
 
 
+
+
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+
 #ifdef OLED_ENABLE
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe,
-    0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff,
-    0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff,
-    0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
+    // oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    //     return OLED_ROTATION_180;
+    // }
 
-  oled_write_raw_P(qmk_logo, sizeof(qmk_logo));
-}
+    static void render_status(void) {
+        // 21 characters per line
+        // 16 cols / 8 rows
 
-bool oled_task_user(void) {
-  render_qmk_logo();
+        oled_write_P(PSTR("    Kanagawa rev 1.1   "), false);
+        //oled_write_ln("", false);
+
+        // Host Keyboard Layer Status
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state)) {
+            case _BASE:
+                oled_write_P(PSTR("_\n"), false);
+                break;
+            case _LOWER:
+                oled_write_P(PSTR("[Low]\n"), false);
+                break;
+            case _UPPER:
+                oled_write_P(PSTR("[Up]\n"), false);
+                break;
+            case _CODE:
+                oled_write_P(PSTR("[Code]\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined\n"), false);
+        }
+
+        // Host Keyboard LED Status
+        led_t led_state = host_keyboard_led_state();
+        oled_write_ln(led_state.caps_lock ? "CAPLOCK" : "       ", false);
+        // oled_write_P(PSTR("         "), false);
+        
+        // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+        // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+        // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+        oled_write_ln("", false);
+        oled_write_ln("", false);
+        oled_write_ln("", false);
+        oled_write_ln("", false);
+        oled_write_ln("", false);
+    }
+
+    // static void render_kanagawa_logo(void) {
+    //     static const char PROGMEM kanagawa_logo[] = {
+    //         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,192, 64, 96, 96, 48, 24, 24,  8, 12, 12, 12,  4,  4,  6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    //         0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192, 96, 48, 48, 24, 12,  4,  6,  3,  3,  0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15,  7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+    //         0,  0,128,192, 96, 96, 48, 24, 12,  6,  3,  3,  0,128,128,192,192,192,  0,  0,  0,  0,  0,  0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206,  7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 56,
+    //         56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15,  1,  0,  0,  0,  0,  0,  0,  3,  3,  1,  7,  1,  1,  1,  3, 31, 31, 27, 31, 31, 27,  3,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,
+    //         62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,224, 48,  0,  0,  0,  0,  0,128,192,192,  0,  0, 10,
+    //         31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15,  7,  3,  1,  0,128,224,224,  0,  0,  1,  1,  1,  3,  7, 63,127,239,238,124,224,  0,  0,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,224,224,224,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116,  9,  0,  0,  0,  0,  1, 
+    //         3,  0,  0,  0,  0,  3,  3,  2,  1, 11,204,207,  7, 12, 14, 13,  8, 96,244,247,227,225,225,193,  0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131,  7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63,  0, 96,  0,  0,  0,
+    //         32,224,112,224,192,128,  0,  0,  0,  0,  0,224,224,  0,  0,  0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167,  7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115,  3,  1,  1,  0,192,192,192,192,  0,
+    //     };
+    //     oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo));
+    // }
+    
+    // static void render_kanagawa_logo(void) {
+    //     //oled_set_cursor(0, 5);
+
+    //     static const char PROGMEM kanagawa_logo[] = {
+    //         0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+    //         0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+    //         0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    //     };
+
+    //     oled_write_P(kanagawa_logo, false);
+    // }
+
+    bool oled_task_user(void) {
+        // switch (get_highest_layer(layer_state)) {
+        //     case _UPPER:
+        //         render_kanagawa_logo();
+        //         break;
+        //     default:
+        //         render_status();
+        // }
+
+        render_status();
+
+        return false;
+    }
+#endif
+
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+/*****************************************************************************************************/
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case ENCODER:
+        if (record->event.pressed) {
+            if (get_mods() & MOD_MASK_SHIFT) {
+                tap_code16(G(A(KC_K)));
+            } else {
+                tap_code(KC_MPLY);
+            }
+        } 
+        break; 
+    case LT(0,KC_X):
+        if (!record->tap.count && record->event.pressed) {
+            tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X
+            return false;
+        }
+        return true;
+    case LT(0,KC_C):
+        if (!record->tap.count && record->event.pressed) {
+            tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C
+            return false;
+        }
+        return true;
+    case LT(0,KC_V):
+        if (!record->tap.count && record->event.pressed) {
+            tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V
+            return false;
+        }
+        return true;  
+    case LT(0,KC_S):
+        if (!record->tap.count && record->event.pressed) {
+            tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S
+            return false;
+        }
+        return true;  
+  }
   return true;
 }
 
+#ifdef ENCODER_ENABLE
+    bool encoder_update_user(uint8_t index, bool clockwise) {
+        if (index == 0) {
+            switch (get_highest_layer(layer_state)) {
+                case _CODE:
+                    if (clockwise) {
+                        tap_code(KC_PGDN);
+                    } else {
+                        tap_code(KC_PGUP);
+                    }
+                    break;
+                default:
+                    if (clockwise) {
+                        tap_code(KC_VOLD);
+                    } else {
+                        tap_code(KC_VOLU);
+                    }
+                    break;
+            }
+        }
+        return true;
+    }
 #endif
-
diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk
index ee325681483..0838e25e098 100644
--- a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk
+++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk
@@ -1 +1,3 @@
-ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes
+
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c
deleted file mode 100644
index 6ef3d3e29dd..00000000000
--- a/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-                    KC_MUTE,
-      KC_ENT, KC_0, KC_BSPC,
-      KC_7,   KC_8, KC_9,
-      KC_4,   KC_5, KC_6,
-      KC_1,   KC_2, KC_3
-  ),
-  [1] = LAYOUT(
-                        _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______
-  ),
-  [2] = LAYOUT(
-                        _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______
-  ),
-  [3] = LAYOUT(
-                        _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______,
-      _______, _______, _______
-  ),
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-  [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-  [1] = { ENCODER_CCW_CW(_______, _______) },
-  [2] = { ENCODER_CCW_CW(_______, _______) },
-  [3] = { ENCODER_CCW_CW(_______, _______) }
-};
-#endif
-
-
-#ifdef OLED_ENABLE
-static void render_qmk_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
-    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe,
-    0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff,
-    0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff,
-    0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-    0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-
-  oled_write_raw_P(qmk_logo, sizeof(qmk_logo));
-}
-
-bool oled_task_user(void) {
-  render_qmk_logo();
-  return true;
-}
-
-#endif
-
diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk
deleted file mode 100644
index 715838ecc5d..00000000000
--- a/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_MAP_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/ciaanh/kanagawa2040/lib/oledfont.c b/keyboards/ciaanh/kanagawa2040/lib/oledfont.c
new file mode 100644
index 00000000000..153007ef1a3
--- /dev/null
+++ b/keyboards/ciaanh/kanagawa2040/lib/oledfont.c
@@ -0,0 +1,277 @@
+#include "progmem.h"
+
+
+
+const unsigned char font[] PROGMEM = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x00 000 =>
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,              // 0x01 001 => sad
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,              // 0x02 002 => smile
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,              // 0x03 003 => heart
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,              // 0x04 004 => diamond
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,              // 0x05 005 => clover
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,              // 0x06 006 => spade
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,              // 0x07 007 =>
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,              // 0x08 008 =>
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,              // 0x09 009 =>
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,              // 0x0A 010 =>
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,              // 0x0B 011 => male symbol
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,              // 0x0C 012 => female symbol
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,              // 0x0D 013 =>
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,              // 0x0E 014 =>
+    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,              // 0x0F 015 =>
+
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,              // 0x10 016 => right
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,              // 0x11 017 => left
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,              // 0x12 018 =>
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,              // 0x13 019 => !!
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,              // 0x14 020 =>
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,              // 0x15 021 =>
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,              // 0x16 022 =>
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,              // 0x17 023 =>
+    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,              // 0x18 024 =>
+    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,              // 0x19 025 =>
+    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,              // 0x1A 026 =>
+    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,              // 0x1B 027 =>
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,              // 0x1C 028 =>
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,              // 0x1D 029 =>
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,              // 0x1E 030 =>
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,              // 0x1F 031 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x20 032 => sp
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,              // 0x21 033 => !
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,              // 0x22 034 => "
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,              // 0x23 035 => #
+    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,              // 0x24 036 => $
+    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,              // 0x25 037 => %
+    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,              // 0x26 038 => &
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,              // 0x27 039 => '
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,              // 0x28 040 => (
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,              // 0x29 041 => )
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,              // 0x2A 042 => *
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,              // 0x2B 043 => +
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,              // 0x2C 044 => ,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,              // 0x2D 045 => -
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,              // 0x2E 046 => .
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,              // 0x2F 047 => /
+
+    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,              // 0x30 048 => 0
+    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,              // 0x31 049 => 1
+    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,              // 0x32 050 => 2
+    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,              // 0x33 051 => 3
+    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,              // 0x34 052 => 4
+    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,              // 0x35 053 => 5
+    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,              // 0x36 054 => 6
+    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,              // 0x37 055 => 7
+    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,              // 0x38 056 => 8
+    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,              // 0x39 057 => 9
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,              // 0x3A 058 => :
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,              // 0x3B 059 => ;
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,              // 0x3C 060 => <
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,              // 0x3D 061 => =
+    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,              // 0x3E 062 => >
+    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,              // 0x3F 063 => ?
+
+    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,              // 0x40 064 => @
+    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,              // 0x41 065 => A
+    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,              // 0x42 066 => B
+    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,              // 0x43 067 => C
+    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,              // 0x44 068 => D
+    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,              // 0x45 069 => E
+    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,              // 0x46 070 => F
+    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,              // 0x47 071 => G
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,              // 0x48 072 => H
+    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,              // 0x49 073 => I
+    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,              // 0x4A 074 => J
+    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,              // 0x4B 075 => K
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,              // 0x4C 076 => L
+    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,              // 0x4D 077 => M
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,              // 0x4E 078 => N
+    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,              // 0x4F 079 => O
+
+    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,              // 0x50 080 => P
+    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,              // 0x51 081 => Q
+    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,              // 0x52 082 => R
+    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,              // 0x53 083 => S
+    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,              // 0x54 084 => T
+    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,              // 0x55 085 => U
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,              // 0x56 086 => V
+    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,              // 0x57 087 => W
+    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,              // 0x58 088 => X
+    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,              // 0x59 089 => Y
+    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,              // 0x5A 090 => Z
+    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,              // 0x5B 091 => [
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,              // 0x5C 092 => '\'
+    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,              // 0x5D 093 => ]
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,              // 0x5E 094 => ^
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,              // 0x5F 095 => _
+
+    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,              // 0x60 096 => `
+    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,              // 0x61 097 => a
+    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,              // 0x62 098 => b
+    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,              // 0x63 099 => c
+    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,              // 0x64 100 => d
+    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,              // 0x65 101 => e
+    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,              // 0x66 102 => f
+    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,              // 0x67 103 => g
+    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,              // 0x68 104 => h
+    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,              // 0x69 105 => i
+    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,              // 0x6A 106 => j
+    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,              // 0x6B 107 => k
+    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,              // 0x6C 108 => l
+    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,              // 0x6D 109 => m
+    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,              // 0x6E 110 => n
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,              // 0x6F 111 => o
+
+    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,              // 0x70 112 => p
+    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,              // 0x71 113 => q
+    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,              // 0x72 114 => r
+    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,              // 0x73 115 => s
+    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,              // 0x74 116 => t
+    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,              // 0x75 117 => u
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,              // 0x76 118 => v
+    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,              // 0x77 119 => w
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,              // 0x78 120 => x
+    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,              // 0x79 121 => y
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,              // 0x7A 122 => z
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,              // 0x7B 123 => {
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,              // 0x7C 124 => |
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,              // 0x7D 125 => }
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,              // 0x7E 126 => ~
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,              // 0x7F 127 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x80 128 =>               ============================= LOGOS ===============================
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x81 129 =>
+    0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0,              // 0x82 130 =>
+    0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF,              // 0x83 131 =>
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC,              // 0x84 132 =>
+    0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00,              // 0x85 133 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x86 134 =>
+    0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0,              // 0x87 135 =>
+    0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00,              // 0x88 136 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x89 137 =>
+    0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0,              // 0x8A 138 =>
+    0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0,              // 0x8B 139 =>
+    0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00,              // 0x8C 140 =>
+    0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0,              // 0x8D 141 =>
+    0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00,              // 0x8E 142 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x80,              // 0x8F 143 =>
+
+    0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0,              // 0x90 144 =>
+    0x40, 0x00, 0x00, 0x00, 0x80, 0x80,              // 0x91 145 =>
+    0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0,              // 0x92 146 =>
+    0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00,              // 0x93 147 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x94 148 =>
+    0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,              // 0x95 149 =>
+    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,              // 0x96 150 =>
+    0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,              // 0x97 151 =>
+    0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,              // 0x98 152 =>
+    0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,              // 0x99 153 =>
+    0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,              // 0x9A 154 =>
+    0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,              // 0x9B 155 =>
+    0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,              // 0x9C 156 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x9D 157 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x9E 158 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0x9F 159 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xA0 160 =>
+    0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF,              // 0xA1 161 =>
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xA2 162 =>
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xA3 163 =>
+    0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xA4 164 =>
+    0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00,              // 0xA5 165 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xA6 166 =>
+    0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xA7 167 =>
+    0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E,              // 0xA8 168 =>
+    0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC,              // 0xA9 169 =>
+    0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF,              // 0xAA 170 =>
+    0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF,              // 0xAB 171 =>
+    0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00,              // 0xAC 172 =>
+    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xAD 173 =>
+    0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,              // 0xAE 174 =>
+    0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF,              // 0xAF 175 =>
+
+    0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF,              // 0xB0 176 =>
+    0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F,              // 0xB1 177 =>
+    0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF,              // 0xB2 178 =>
+    0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0,              // 0xB3 179 =>
+    0x80, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xB4 180 =>
+    0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,              // 0xB5 181 =>
+    0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,              // 0xB6 182 =>
+    0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,              // 0xB7 183 =>
+    0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,              // 0xB8 184 =>
+    0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,              // 0xB9 185 =>
+    0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,              // 0xBA 186 =>
+    0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,              // 0xBB 187 =>
+    0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,              // 0xBC 188 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xBD 189 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xBE 190 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xBF 191 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xC0 192 =>
+    0x00, 0x00, 0x00, 0x01, 0x03, 0x0F,              // 0xC1 193 =>
+    0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF,              // 0xC2 194 =>
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,              // 0xC3 195 =>
+    0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C,              // 0xC4 196 =>
+    0x10, 0x10, 0x00, 0x00, 0x00, 0x00,              // 0xC5 197 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xC6 198 =>
+    0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F,              // 0xC7 199 =>
+    0x1F, 0x03, 0x01, 0x00, 0x00, 0x00,              // 0xC8 200 =>
+    0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F,              // 0xC9 201 =>
+    0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F,              // 0xCA 202 =>
+    0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F,              // 0xCB 203 =>
+    0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F,              // 0xCC 204 =>
+    0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F,              // 0xCD 205 =>
+    0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F,              // 0xCE 206 =>
+    0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F,              // 0xCF 207 =>
+
+    0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F,              // 0xD0 208 =>
+    0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E,              // 0xD1 209 =>
+    0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F,              // 0xD2 210 =>
+    0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03,              // 0xD3 211 =>
+    0x03, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD4 212 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD5 213 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD6 214 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD7 215 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD8 216 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xD9 217 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDA 218 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDB 219 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDC 220 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDD 221 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDE 222 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xDF 223 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE0 224 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE1 225 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE2 226 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE3 227 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE4 228 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE5 229 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE6 230 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE7 231 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE8 232 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xE9 233 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xEA 234 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xEB 235 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xEC 236 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xED 237 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xEE 238 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xEF 239 =>
+
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF0 240 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF1 241 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF2 242 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF3 243 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF4 244 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF5 245 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF6 246 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF7 247 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF8 248 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xF9 249 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xFA 250 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xFB 251 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xFC 252 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xFD 253 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,              // 0xFE 254 =>
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00               // 0xFF 255 =>
+};
diff --git a/keyboards/ciaanh/kanagawa2040/readme.md b/keyboards/ciaanh/kanagawa2040/readme.md
index 46b3f5ddb72..f4c50935169 100644
--- a/keyboards/ciaanh/kanagawa2040/readme.md
+++ b/keyboards/ciaanh/kanagawa2040/readme.md
@@ -2,35 +2,30 @@ https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropa
 
 qmk compile -kb ciaanh/kanagawa2040 -km default
 
-# Adafruit MacroPad RP2040
+# Ciaanh Kanagawa2040
 
-![AdafruitMacropad](https://i.imgur.com/dSBSwcJh.jpeg)
-
-A RP2040-powered Macropad with a 3x4 layout.
-
-- Keyboard Maintainer: [Jpe230](https://github.com/jpe230/) 
-- Hardware Supported: Adafruit MacroPad RP2040
-- Hardware Availability: [Barebones kit](https://www.adafruit.com/product/5100) [Starter Kit](https://www.adafruit.com/product/5128)
-
-Make example for this board (after setting up your build environment):
 
 ```sh
-qmk compile -kb adafruit/macropad -km default
+qmk compile -kb ciaanh/kanagawa2040 -km default
 ```
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+# Kanagawa
 
-## Features
+A 75% keyboard with oled and rotary encoder for Elite-C
+
+    Keyboard Maintainer : Ciaanh
+
+    Hardware Supported : Kanagawa PCB  
+
+    Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb ciaanh/kanagawa -km default
+
+Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader
 
-- Raspberry Pi RP2040 Chip + 8MB Flash memory - Dual-core Cortex M0+ at ~130MHz with 264KB of RAM.
-- 3x4 Mechanical key switch sockets - accepts any Cherry MX-compatible switches. Individually tied to GPIO pins (not matrix wired)
-- One NeoPixel RGB LED per switch, on north side.
-- Rotary encoder, 20 detents per rotation, with push-switch on GPIO pin. Push switch is also used for entering bootloader mode when held down on power-up or reset.
-- 128x64 SH1106 Monochrome OLED display - On high-speed hardware SPI port for quick updates.
-- 8mm Speaker/Buzzer - With Class D amplifier and RC filter, can be used to make simple beeps and sounds effects. (Unsupported for now)
-- STEMMA QT Connector - Allows adding any I2C sensors/displays/devices with plug-and-play cables.
-- Reset button - On the side, for quick restarting, press it twice to enter bootloader.
-- Four M3 mounting bosses - Make custom enclosures easily.
 
 ## Bootloader
 
diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk
index 6f054586b6e..f84186e6564 100644
--- a/keyboards/ciaanh/kanagawa2040/rules.mk
+++ b/keyboards/ciaanh/kanagawa2040/rules.mk
@@ -15,6 +15,7 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes