diff --git a/Makefile b/Makefile
index 67fe937..638a801 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ QMK_HOME ?= ${HOME}/qmk_firmware
 # QMK keyboard information (author, keyboard, revision)
 QMK_KEYBOARD_AUTHOR := binarydiv
 QMK_KEYBOARD_NAME := eepyboard
-QMK_KEYBOARD_REV ?= rev1
+QMK_KEYBOARD_REV ?= rev2
 
 # Directory structure for QMK keyboard files
 QMK_KEYBOARD_AUTHOR_DIR := ${QMK_KEYBOARD_AUTHOR}
diff --git a/qmk_keyboards/binarydiv/eepyboard/rev2/README.md b/qmk_keyboards/binarydiv/eepyboard/rev2/README.md
new file mode 100644
index 0000000..4074d0b
--- /dev/null
+++ b/qmk_keyboards/binarydiv/eepyboard/rev2/README.md
@@ -0,0 +1,3 @@
+# eepyBoard v1.1 / rev2
+
+This is the firmware for hardware revision 2 of the eepyBoard (v1.1).
diff --git a/qmk_keyboards/binarydiv/eepyboard/rev2/config.h b/qmk_keyboards/binarydiv/eepyboard/rev2/config.h
new file mode 100644
index 0000000..ecd559c
--- /dev/null
+++ b/qmk_keyboards/binarydiv/eepyboard/rev2/config.h
@@ -0,0 +1,7 @@
+// Copyright 2024 binaryDiv (@binaryDiv)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Lock one-shot keys when tapping them twice
+#define ONESHOT_TAP_TOGGLE 2
diff --git a/qmk_keyboards/binarydiv/eepyboard/rev2/info.json b/qmk_keyboards/binarydiv/eepyboard/rev2/info.json
new file mode 100644
index 0000000..a4bbf33
--- /dev/null
+++ b/qmk_keyboards/binarydiv/eepyboard/rev2/info.json
@@ -0,0 +1,258 @@
+{
+    "keyboard_name": "eepyBoard v1.1",
+    "maintainer": "binaryDiv",
+    "manufacturer": "binaryDiv",
+    "url": "https://git.0xbd.space/binaryDiv/eepyBoard",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "usb": {
+        "device_version": "1.1.0",
+        "vid": "0x1337",
+        "pid": "0xBD32"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [
+          "GP27", "GP26", "GP25", "GP23", "GP22", "GP21", "GP20", "GP17",
+          "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6"
+        ],
+        "rows": ["GP28", "GP15", "GP18", "GP19", "GP14", "GP13"]
+    },
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "GP3",
+                "pin_b": "GP2",
+                "resolution": 4
+            },
+            {
+                "pin_a": "GP0",
+                "pin_b": "GP1",
+                "resolution": 4
+            }
+        ]
+    },
+    "layouts": {
+        "LAYOUT_separate_cursor_keys": {
+            "layout": [
+                {"matrix": [0,  0], "x":  0.25, "y": 0, "label": "Esc"},
+                {"matrix": [0,  1], "x":  1.75, "y": 0, "label": "F1"},
+                {"matrix": [0,  2], "x":  2.75, "y": 0, "label": "F2"},
+                {"matrix": [0,  3], "x":  3.75, "y": 0, "label": "F3"},
+                {"matrix": [0,  4], "x":  4.75, "y": 0, "label": "F4"},
+                {"matrix": [0,  5], "x":  6.25, "y": 0, "label": "F5"},
+                {"matrix": [0,  6], "x":  7.25, "y": 0, "label": "F6"},
+                {"matrix": [0,  8], "x":  8.25, "y": 0, "label": "F7"},
+                {"matrix": [0,  9], "x":  9.25, "y": 0, "label": "F8"},
+                {"matrix": [0, 10], "x": 10.75, "y": 0, "label": "F9"},
+                {"matrix": [0, 11], "x": 11.75, "y": 0, "label": "F10"},
+                {"matrix": [0, 12], "x": 12.75, "y": 0, "label": "F11"},
+                {"matrix": [0, 13], "x": 13.75, "y": 0, "label": "F12"},
+                {"matrix": [0, 14], "x": 15.25, "y": 0, "label": "VolCtrl", "encoder": 1},
+
+                {"matrix": [1,  0], "x":  0.0, "y": 1.62, "label": "L1"},
+                {"matrix": [1,  1], "x":  1.0, "y": 1.50, "label": "~"},
+                {"matrix": [1,  2], "x":  2.0, "y": 1.37, "label": "1"},
+                {"matrix": [1,  3], "x":  3.0, "y": 1.25, "label": "2"},
+                {"matrix": [1,  4], "x":  4.0, "y": 1.25, "label": "3"},
+                {"matrix": [1,  5], "x":  5.0, "y": 1.50, "label": "4"},
+                {"matrix": [1,  6], "x":  6.0, "y": 1.75, "label": "5"},
+                {"matrix": [1,  8], "x":  9.5, "y": 1.75, "label": "6"},
+                {"matrix": [1,  9], "x": 10.5, "y": 1.50, "label": "7"},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.25, "label": "8"},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.25, "label": "9"},
+                {"matrix": [1, 12], "x": 13.5, "y": 1.37, "label": "0"},
+                {"matrix": [1, 13], "x": 14.5, "y": 1.50, "label": "-"},
+                {"matrix": [1, 14], "x": 15.5, "y": 1.62, "label": "="},
+
+                {"matrix": [2,  0], "x":  0.0, "y": 2.62, "label": "L2"},
+                {"matrix": [2,  1], "x":  1.0, "y": 2.50, "label": "Tab"},
+                {"matrix": [2,  2], "x":  2.0, "y": 2.37, "label": "Q"},
+                {"matrix": [2,  3], "x":  3.0, "y": 2.25, "label": "W"},
+                {"matrix": [2,  4], "x":  4.0, "y": 2.25, "label": "E"},
+                {"matrix": [2,  5], "x":  5.0, "y": 2.50, "label": "R"},
+                {"matrix": [2,  6], "x":  6.0, "y": 2.75, "label": "T"},
+                {"matrix": [2,  8], "x":  9.5, "y": 2.75, "label": "Y"},
+                {"matrix": [2,  9], "x": 10.5, "y": 2.50, "label": "U"},
+                {"matrix": [2, 10], "x": 11.5, "y": 2.25, "label": "I"},
+                {"matrix": [2, 11], "x": 12.5, "y": 2.25, "label": "O"},
+                {"matrix": [2, 12], "x": 13.5, "y": 2.37, "label": "P"},
+                {"matrix": [2, 13], "x": 14.5, "y": 2.50, "label": "["},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.62, "label": "]"},
+
+                {"matrix": [3,  0], "x":  0.0, "y": 3.62, "label": "L3"},
+                {"matrix": [3,  1], "x":  1.0, "y": 3.50, "label": "Caps"},
+                {"matrix": [3,  2], "x":  2.0, "y": 3.37, "label": "A"},
+                {"matrix": [3,  3], "x":  3.0, "y": 3.25, "label": "S"},
+                {"matrix": [3,  4], "x":  4.0, "y": 3.25, "label": "D"},
+                {"matrix": [3,  5], "x":  5.0, "y": 3.50, "label": "F"},
+                {"matrix": [3,  6], "x":  6.0, "y": 3.75, "label": "G"},
+                {"matrix": [3,  8], "x":  9.5, "y": 3.75, "label": "H"},
+                {"matrix": [3,  9], "x": 10.5, "y": 3.50, "label": "J"},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25, "label": "K"},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25, "label": "L"},
+                {"matrix": [3, 12], "x": 13.5, "y": 3.37, "label": ";"},
+                {"matrix": [3, 13], "x": 14.5, "y": 3.50, "label": "'"},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.62, "label": "\\"},
+
+                {"matrix": [4,  0], "x":  0.0, "y": 4.62, "label": "L4"},
+                {"matrix": [4,  1], "x":  1.0, "y": 4.50, "label": "Shift"},
+                {"matrix": [4,  2], "x":  2.0, "y": 4.37, "label": "\\"},
+                {"matrix": [4,  3], "x":  3.0, "y": 4.25, "label": "Z"},
+                {"matrix": [4,  4], "x":  4.0, "y": 4.25, "label": "X"},
+                {"matrix": [4,  5], "x":  5.0, "y": 4.50, "label": "C"},
+                {"matrix": [4,  6], "x":  6.0, "y": 4.75, "label": "V"},
+                {"matrix": [4,  8], "x":  9.5, "y": 4.75, "label": "B"},
+                {"matrix": [4,  9], "x": 10.5, "y": 4.50, "label": "N"},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25, "label": "M"},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25, "label": ","},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.37, "label": "."},
+                {"matrix": [4, 13], "x": 14.5, "y": 4.50, "label": "/"},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.62, "label": "Shift"},
+
+                {"matrix": [5,  0], "x":  0.0, "y": 5.62, "label": "L5"},
+                {"matrix": [5,  1], "x":  1.0, "y": 5.50, "label": "L6"},
+                {"matrix": [5,  2], "x":  2.0, "y": 5.37, "label": "Ctrl"},
+                {"matrix": [5,  3], "x":  3.0, "y": 5.50, "label": "Super"},
+                {"matrix": [5,  4], "x":  4.0, "y": 5.62, "label": "Alt"},
+                {"matrix": [5,  5], "x":  5.0, "y": 5.75, "label": "Code"},
+                {"matrix": [5,  6], "x":  6.0, "y": 5.87, "label": "Space"},
+                {"matrix": [5,  8], "x":  9.5, "y": 5.87, "label": "Backspace"},
+                {"matrix": [5,  9], "x": 10.5, "y": 5.75, "label": "AltGr"},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.62, "label": "Ctrl"},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.50, "label": "Del"},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.37, "label": "Fn"},
+                {"matrix": [5, 13], "x": 14.5, "y": 5.50, "label": "R1"},
+                {"matrix": [5, 14], "x": 15.5, "y": 5.62, "label": "R2"},
+
+                {"matrix": [2, 7], "x": 7.75, "y": 3.25, "label": "Up"},
+                {"matrix": [3, 7], "x": 7.25, "y": 4.25, "label": "Left"},
+                {"matrix": [1, 7], "x": 8.25, "y": 4.25, "label": "Right"},
+                {"matrix": [4, 7], "x": 7.75, "y": 5.25, "label": "Down"},
+                {"matrix": [5, 7], "x": 7.50, "y": 6.25, "label": "Enter", "w": 1.5},
+                {"matrix": [0, 7], "x": 7.75, "y": 2.0, "label": "Scroll", "encoder": 0}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "default": {
+            "animation": "cycle_pinwheel",
+            "speed": 32
+        },
+        "animations": {
+            "cycle_pinwheel": true,
+            "typing_heatmap": true
+        },
+        "max_brightness": 127,
+        "sleep": true,
+        "center_point": [77, 31],
+        "layout": [
+            {"x":   2, "y": 0, "matrix": [0,  0], "flags": 4},
+            {"x":  17, "y": 0, "matrix": [0,  1], "flags": 4},
+            {"x":  27, "y": 0, "matrix": [0,  2], "flags": 4},
+            {"x":  37, "y": 0, "matrix": [0,  3], "flags": 4},
+            {"x":  47, "y": 0, "matrix": [0,  4], "flags": 4},
+            {"x":  62, "y": 0, "matrix": [0,  5], "flags": 4},
+            {"x":  72, "y": 0, "matrix": [0,  6], "flags": 4},
+            {"x":  82, "y": 0, "matrix": [0,  8], "flags": 4},
+            {"x":  92, "y": 0, "matrix": [0,  9], "flags": 4},
+            {"x": 107, "y": 0, "matrix": [0, 10], "flags": 4},
+            {"x": 117, "y": 0, "matrix": [0, 11], "flags": 4},
+            {"x": 127, "y": 0, "matrix": [0, 12], "flags": 4},
+            {"x": 137, "y": 0, "matrix": [0, 13], "flags": 4},
+
+            {"x": 155, "y": 16, "matrix": [1, 14], "flags": 4},
+            {"x": 145, "y": 15, "matrix": [1, 13], "flags": 4},
+            {"x": 135, "y": 14, "matrix": [1, 12], "flags": 4},
+            {"x": 125, "y": 12, "matrix": [1, 11], "flags": 4},
+            {"x": 115, "y": 12, "matrix": [1, 10], "flags": 4},
+            {"x": 105, "y": 15, "matrix": [1,  9], "flags": 4},
+            {"x":  95, "y": 17, "matrix": [1,  8], "flags": 4},
+            {"x":  60, "y": 17, "matrix": [1,  6], "flags": 4},
+            {"x":  50, "y": 15, "matrix": [1,  5], "flags": 4},
+            {"x":  40, "y": 12, "matrix": [1,  4], "flags": 4},
+            {"x":  30, "y": 12, "matrix": [1,  3], "flags": 4},
+            {"x":  20, "y": 14, "matrix": [1,  2], "flags": 4},
+            {"x":  10, "y": 15, "matrix": [1,  1], "flags": 4},
+            {"x":   0, "y": 16, "matrix": [1,  0], "flags": 4},
+
+            {"x":   0, "y": 26, "matrix": [2,  0], "flags": 4},
+            {"x":  10, "y": 25, "matrix": [2,  1], "flags": 4},
+            {"x":  20, "y": 24, "matrix": [2,  2], "flags": 4},
+            {"x":  30, "y": 22, "matrix": [2,  3], "flags": 4},
+            {"x":  40, "y": 22, "matrix": [2,  4], "flags": 4},
+            {"x":  50, "y": 25, "matrix": [2,  5], "flags": 4},
+            {"x":  60, "y": 27, "matrix": [2,  6], "flags": 4},
+            {"x":  78, "y": 32, "matrix": [2,  7], "flags": 4},
+            {"x":  95, "y": 27, "matrix": [2,  8], "flags": 4},
+            {"x": 105, "y": 25, "matrix": [2,  9], "flags": 4},
+            {"x": 115, "y": 22, "matrix": [2, 10], "flags": 4},
+            {"x": 125, "y": 22, "matrix": [2, 11], "flags": 4},
+            {"x": 135, "y": 24, "matrix": [2, 12], "flags": 4},
+            {"x": 145, "y": 25, "matrix": [2, 13], "flags": 4},
+            {"x": 155, "y": 26, "matrix": [2, 14], "flags": 4},
+
+            {"x": 155, "y": 36, "matrix": [3, 14], "flags": 4},
+            {"x": 145, "y": 35, "matrix": [3, 13], "flags": 4},
+            {"x": 135, "y": 34, "matrix": [3, 12], "flags": 4},
+            {"x": 125, "y": 32, "matrix": [3, 11], "flags": 4},
+            {"x": 115, "y": 32, "matrix": [3, 10], "flags": 4},
+            {"x": 105, "y": 35, "matrix": [3,  9], "flags": 4},
+            {"x":  95, "y": 37, "matrix": [3,  8], "flags": 4},
+            {"x":  82, "y": 42, "matrix": [1,  7], "flags": 4},
+            {"x":  72, "y": 42, "matrix": [3,  7], "flags": 4},
+            {"x":  60, "y": 37, "matrix": [3,  6], "flags": 4},
+            {"x":  50, "y": 35, "matrix": [3,  5], "flags": 4},
+            {"x":  40, "y": 32, "matrix": [3,  4], "flags": 4},
+            {"x":  30, "y": 32, "matrix": [3,  3], "flags": 4},
+            {"x":  20, "y": 34, "matrix": [3,  2], "flags": 4},
+            {"x":  10, "y": 35, "matrix": [3,  1], "flags": 4},
+            {"x":   0, "y": 36, "matrix": [3,  0], "flags": 4},
+
+            {"x":   0, "y": 46, "matrix": [4,  0], "flags": 4},
+            {"x":  10, "y": 45, "matrix": [4,  1], "flags": 4},
+            {"x":  20, "y": 44, "matrix": [4,  2], "flags": 4},
+            {"x":  30, "y": 42, "matrix": [4,  3], "flags": 4},
+            {"x":  40, "y": 42, "matrix": [4,  4], "flags": 4},
+            {"x":  50, "y": 45, "matrix": [4,  5], "flags": 4},
+            {"x":  60, "y": 47, "matrix": [4,  6], "flags": 4},
+            {"x":  78, "y": 52, "matrix": [4,  7], "flags": 4},
+            {"x":  95, "y": 47, "matrix": [4,  8], "flags": 4},
+            {"x": 105, "y": 45, "matrix": [4,  9], "flags": 4},
+            {"x": 115, "y": 42, "matrix": [4, 10], "flags": 4},
+            {"x": 125, "y": 42, "matrix": [4, 11], "flags": 4},
+            {"x": 135, "y": 44, "matrix": [4, 12], "flags": 4},
+            {"x": 145, "y": 45, "matrix": [4, 13], "flags": 4},
+            {"x": 155, "y": 46, "matrix": [4, 14], "flags": 4},
+
+            {"x": 155, "y": 56, "matrix": [5, 14], "flags": 4},
+            {"x": 145, "y": 55, "matrix": [5, 13], "flags": 4},
+            {"x": 135, "y": 54, "matrix": [5, 12], "flags": 4},
+            {"x": 125, "y": 55, "matrix": [5, 11], "flags": 4},
+            {"x": 115, "y": 56, "matrix": [5, 10], "flags": 4},
+            {"x": 105, "y": 57, "matrix": [5,  9], "flags": 4},
+            {"x":  95, "y": 59, "matrix": [5,  8], "flags": 4},
+            {"x":  78, "y": 62, "matrix": [5,  7], "flags": 4},
+            {"x":  60, "y": 59, "matrix": [5,  6], "flags": 4},
+            {"x":  50, "y": 57, "matrix": [5,  5], "flags": 4},
+            {"x":  40, "y": 56, "matrix": [5,  4], "flags": 4},
+            {"x":  30, "y": 55, "matrix": [5,  3], "flags": 4},
+            {"x":  20, "y": 54, "matrix": [5,  2], "flags": 4},
+            {"x":  10, "y": 55, "matrix": [5,  1], "flags": 4},
+            {"x":   0, "y": 56, "matrix": [5,  0], "flags": 4}
+        ]
+    },
+    "ws2812": {
+        "pin": "GP29"
+    }
+}
diff --git a/qmk_keyboards/binarydiv/eepyboard/rev2/keymaps/default/keymap.c b/qmk_keyboards/binarydiv/eepyboard/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000..a4db448
--- /dev/null
+++ b/qmk_keyboards/binarydiv/eepyboard/rev2/keymaps/default/keymap.c
@@ -0,0 +1,152 @@
+// Copyright 2024 binaryDiv (@binaryDiv)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Define layer names for better readability
+enum layer_names {
+    // Base layer
+    L_BASE,
+
+    // "Code" key: Moving the cursor around via WASD, F-keys on number keys, etc.
+    L_CODE,
+
+    // Fn / keyboard control layer: Used for keyboard configuration
+    L_FN,
+};
+
+// Custom keycodes
+enum custom_keycodes {
+    // Special characters that require more complicated input
+    MACRO_HEART = SAFE_RANGE,
+};
+
+// For keycodes, see QMK docs: https://docs.qmk.fm/keycodes
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // ------------------------------------
+    // Layout macro "LAYOUT_eepyboard_rev2"
+    // ------------------------------------
+    //
+    // - First 6 rows: All keys except center area
+    // - Last row: Up, Left, Right, Down, Enter, center rotary encoder
+    //
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐╭──╮
+    // │Es││F1││F2││F3││F4││F5││F6│          │F7││F8││F9││10││11││12│▲Vo▼
+    // └──┘└──┘└──┘└──┘└──┘└──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘╰──╯
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+    // │L1││~ ││1 ││2 ││3 ││4 ││5 │   (sc)   │6 ││7 ││8 ││9 ││0 ││- ││= │
+    // └──┘└──┘└──┘└──┘└──┘└──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘└──┘
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+    // │L2││Ta││Q ││W ││E ││R ││T │   (up)   │Y ││U ││I ││O ││P ││[ ││] │
+    // └──┘└──┘└──┘└──┘└──┘└──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘└──┘
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+    // │L3││Ca││A ││S ││D ││F ││G │ (le)(ri) │H ││J ││K ││L ││; ││' ││\ │
+    // └──┘└──┘└──┘└──┘└──┘└──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘└──┘
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+    // │L4││Sh││\ ││Z ││X ││C ││V │   (do)   │B ││N ││M ││, ││. ││/ ││Sh│
+    // └──┘└──┘└──┘└──┘└── └──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘└──┘
+    // ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐          ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+    // │L5││L6││Ct││Su││Al││Co││Sp│  (entr)  │Ba││AG││Ct││De││Fn││R1││R2│
+    // └──┘└──┘└──┘└──┘└──┘└──┘└──┘          └──┘└──┘└──┘└──┘└──┘└──┘└──┘
+    // ┌──┐┌──┐┌──┐┌──┐ ┌────┐ ╭──╮
+    // │Up││Le││Ri││Do│ │Entr│ ▲Sc▼
+    // └──┘└──┘└──┘└──┘ └────┘ ╰──╯
+
+    // Base layer
+    // TODO: Update/finalize KLE layout
+    [L_BASE] = LAYOUT_separate_cursor_keys(
+        ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// /////////////
+        //[Esc]       [F1]          [F2]          [F3]          [F4]          [F5]          [F6]          [F7]          [F8]          [F9]          [F10]         [F11]         [F12]         (Vol)
+        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,       _______,
+        //[...]       [`,Tab...]    [1,Q,A...]    [2,W,S,Z]     [3,E,D,X]     [4,R,F,C]     [5,T,G,V]     [6,Y,H,B]     [7,U,J,N]     [8,I,K,M]     [9,O,L...]    [0,P,;,.]     [-,[,',/]     [=,],\...]
+        _______,      KC_GRAVE,     KC_1,         KC_2,         KC_3,         KC_4,         KC_5,         KC_6,         KC_7,         KC_8,         KC_9,         KC_0,         KC_MINUS,     KC_EQUAL,
+        _______,      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,
+        _______,      OSL(L_CODE),  KC_A,         KC_S,         KC_D,         KC_F,         KC_G,         KC_H,         KC_J,         KC_K,         KC_L,         KC_SEMICOLON, KC_QUOTE,     KC_BACKSLASH,
+        _______,      KC_LSFT,      KC_ESC,       KC_Z,         KC_X,         KC_C,         KC_V,         KC_B,         KC_N,         KC_M,         KC_COMMA,     KC_DOT,       KC_SLASH,     KC_RSFT,
+        //[...]       [...]         [Ctrl]        [Super]       [Alt]         [Code]        [Space]       [Backspace]   [AltGr]       [RCtrl]       [Del]         [Fn]          [Menu]        [RCtrl]
+        _______,      KC_LCTL,      KC_LCTL,      KC_LGUI,      KC_LALT,      KC_LGUI,      KC_SPACE,     KC_BACKSPACE, KC_RALT,      KC_ENTER,     KC_DELETE,    MO(L_FN),     KC_APP,       KC_RCTL,
+        //[Up]        [Left]        [Right]       [Down]        [Enter]       (Scroll)
+        KC_UP,        KC_LEFT,      KC_RIGHT,     KC_DOWN,      KC_ENTER,     _______
+    ),
+
+    // "Code" key layer
+    [L_CODE] = LAYOUT_separate_cursor_keys(
+        ///////////// ///////////// /////////////  ///////////// /////////////   ///////////// ///////////// /////////////  ///////////// /////////////        /////////////         ///////////// /////////////    /////////////
+        //[Esc]       [F1]          [F2]           [F3]          [F4]            [F5]          [F6]          [F7]           [F8]          [F9]                 [F10]                 [F11]         [F12]            (Vol)
+        _______,      _______,      DM_PLY1,       DM_PLY2,      _______,        _______,      _______,      _______,       _______,      _______,             _______,              _______,      KC_PRINT_SCREEN, _______,
+        //[...]       [`,Tab...]    [1,Q,A...]     [2,W,S,Z]     [3,E,D,X]       [4,R,F,C]     [5,T,G,V]     [6,Y,H,B]      [7,U,J,N]     [8,I,K,M]            [9,O,L...]            [0,P,;,.]     [-,[,',/]        [=,],\...]
+        _______,      _______,      _______,       _______,      _______,        _______,      _______,      _______,       _______,      _______,             _______,              _______,      _______,         _______,
+        _______,      _______,      KC_HOME,       KC_UP,        KC_END,         KC_PGUP,      _______,      KC_UNDERSCORE, KC_EQUAL,     KC_LEFT_BRACKET,     KC_RIGHT_BRACKET,     _______,      _______,         _______,
+        _______,      _______,      KC_LEFT,       KC_DOWN,      KC_RIGHT,       KC_PGDN,      _______,      KC_MINUS,      KC_PLUS,      KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, _______,      _______,         _______,
+        _______,      _______,      LCTL(KC_LEFT), _______,      LCTL(KC_RIGHT), MACRO_HEART,  _______,      _______,       _______,      _______,             _______,              _______,      _______,         _______,
+        //[...]       [...]         [Ctrl]         [Super]       [Alt]           [Code]        [Space]       [Backspace]    [AltGr]       [RCtrl]              [Del]                 [Fn]          [Menu]           [RCtrl]
+        _______,      _______,      _______,       _______,      _______,        _______,      _______,      _______,       _______,      _______,             _______,              _______,      _______,         _______,
+        //[Up]        [Left]        [Right]        [Down]        [Enter]         (Scroll)
+        KC_PGUP,      KC_HOME,      KC_END,        KC_PGDN,      KC_INSERT,      _______
+    ),
+
+    // "Fn" key layer
+    [L_FN] = LAYOUT_separate_cursor_keys(
+        ///////////// ///////////// ///////////// ///////////// ///////////// /////////////    ///////////// ///////////// ///////////// ///////////// ///////////// ///////////// /////////////  /////////////
+        //[Esc]       [F1]          [F2]          [F3]          [F4]          [F5]             [F6]          [F7]          [F8]          [F9]          [F10]         [F11]         [F12]          (Vol)
+        DM_RSTP,      DM_REC1,      DM_REC2,      _______,      _______,      _______,         _______,      _______,      _______,      _______,      _______,      _______,      _______,       _______,
+        //[...]       [`,Tab...]    [1,Q,A...]    [2,W,S,Z]     [3,E,D,X]     [4,R,F,C]        [5,T,G,V]     [6,Y,H,B]     [7,U,J,N]     [8,I,K,M]     [9,O,L...]    [0,P,;,.]     [-,[,',/]      [=,],\...]
+        _______,      _______,      _______,      _______,      _______,      _______,         _______,      _______,      _______,      _______,      _______,      _______,      RGB_VAD,       RGB_VAI,
+        _______,      _______,      _______,      _______,      _______,      QK_REBOOT,       _______,      _______,      _______,      _______,      OS_TOGG,      _______,      RGB_SPD,       RGB_SPI,
+        _______,      _______,      _______,      _______,      _______,      _______,         _______,      _______,      _______,      _______,      _______,      _______,      RGB_MOD,       RGB_TOG,
+        _______,      _______,      _______,      _______,      _______,      QK_CLEAR_EEPROM, _______,      _______,      _______,      _______,      _______,      _______,      _______,       _______,
+        //[...]       [...]         [Ctrl]        [Super]       [Alt]         [Code]           [Space]       [Backspace]   [AltGr]       [RCtrl]       [Del]         [Fn]          [Menu]         [RCtrl]
+        _______,      _______,      _______,      _______,      _______,      _______,         _______,      _______,      _______,      _______,      _______,      _______,      QK_BOOTLOADER, _______,
+        //[Up]        [Left]        [Right]       [Down]        [Enter]       (Scroll)
+        _______,      _______,      _______,      _______,      _______,      _______
+    )
+};
+
+// Define mapping for rotary encoder
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    // Rotary encoder order:
+    // 0: Center
+    // 1: Top right
+
+    // Base layer
+    [L_BASE] = {
+        // 0: Center: Scroll up/down
+        ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN),
+        // 1: Top right: Volume control
+        ENCODER_CCW_CW(KC_KB_VOLUME_DOWN, KC_KB_VOLUME_UP)
+    },
+
+    // Code layer
+    [L_CODE] = {
+        // 0: Center: Scroll left/right
+        ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT),
+        // 1: Top right: Volume control
+        ENCODER_CCW_CW(KC_KB_VOLUME_DOWN, KC_KB_VOLUME_UP)
+    },
+
+    // Fn layer
+    [L_FN] = {
+        // 0: Center: RGB LED speed control
+        ENCODER_CCW_CW(RGB_SPD, RGB_SPI),
+        // 1: Top right: RGB LED brightness control
+        ENCODER_CCW_CW(RGB_VAD, RGB_VAI)
+    }
+};
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // Store the current modifier state in the variable for later reference
+    uint8_t mod_state = get_mods();
+
+    switch (keycode) {
+        case MACRO_HEART:
+            if (record->event.pressed) {
+                // Type a outlined heart via X11 Compose key (with custom mappings)
+                del_mods(MOD_MASK_SHIFT);
+                SEND_STRING(SS_TAP(X_APP) "c3");
+                set_mods(mod_state);
+            }
+    }
+    return true;
+}
diff --git a/qmk_keyboards/binarydiv/eepyboard/rev2/rules.mk b/qmk_keyboards/binarydiv/eepyboard/rev2/rules.mk
new file mode 100644
index 0000000..2c841ca
--- /dev/null
+++ b/qmk_keyboards/binarydiv/eepyboard/rev2/rules.mk
@@ -0,0 +1,9 @@
+# Enable support for rotary encoder
+ENCODER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+# Use RP2040-specific driver for WS2812 (PIO-based)
+WS2812_DRIVER = vendor
+
+# Enable support for dynamic macros
+DYNAMIC_MACRO_ENABLE = yes