diff --git a/keyboards/hlb/poorkoi/keyboard.json b/keyboards/hlb/poorkoi/keyboard.json
index f8fbd2df4e..f1dc15b89e 100644
--- a/keyboards/hlb/poorkoi/keyboard.json
+++ b/keyboards/hlb/poorkoi/keyboard.json
@@ -1,7 +1,7 @@
 {
     "manufacturer": "HLB",
     "keyboard_name": "PoorKoi",
-    "maintainer": "HLB",
+    "maintainer": "H3lli0n",
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "encoder": {
@@ -38,7 +38,8 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "led_count": 17
+        "led_count": 17,
+        "driver": "ws2812"
     },
     "usb": {
         "device_version": "0.0.5",
diff --git a/keyboards/hlb/poorkoi/keymaps/default/keymap.c b/keyboards/hlb/poorkoi/keymaps/default/keymap.c
index 0845c53387..6786867f99 100644
--- a/keyboards/hlb/poorkoi/keymaps/default/keymap.c
+++ b/keyboards/hlb/poorkoi/keymaps/default/keymap.c
@@ -32,9 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
 };
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
-};
-#endif
diff --git a/keyboards/hlb/poorkoi/keymaps/default/rules.mk b/keyboards/hlb/poorkoi/keymaps/default/rules.mk
deleted file mode 100644
index ee32568148..0000000000
--- a/keyboards/hlb/poorkoi/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/hlb/poorkoi/keymaps/via/keymap.c b/keyboards/hlb/poorkoi/keymaps/via/keymap.c
deleted file mode 100644
index 0845c53387..0000000000
--- a/keyboards/hlb/poorkoi/keymaps/via/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2024 HLB
-
-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] = {
-// main layer
-[0] = LAYOUT_all(
-  KC_ESC,   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_BSLS, KC_BSPC,
-  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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,       KC_H,      KC_J,      KC_K,      KC_L,       KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-  KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
-// basic function layer
-[1] = LAYOUT_all(
-  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,      KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-  KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
-  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS)
-};
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
-};
-#endif
diff --git a/keyboards/hlb/poorkoi/keymaps/via/rules.mk b/keyboards/hlb/poorkoi/keymaps/via/rules.mk
deleted file mode 100644
index f1adcab005..0000000000
--- a/keyboards/hlb/poorkoi/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/hlb/poorkoi/keymaps/vial/config.h b/keyboards/hlb/poorkoi/keymaps/vial/config.h
index 0438009f45..1bf8e1a245 100644
--- a/keyboards/hlb/poorkoi/keymaps/vial/config.h
+++ b/keyboards/hlb/poorkoi/keymaps/vial/config.h
@@ -12,9 +12,6 @@
 #define VIAL_COMBO_ENTRIES 15
 #define VIAL_KEY_OVERRIDE_ENTRIES 10
 
-#undef RGBLIGHT_LED_COUNT
-#define RGBLIGHT_LED_COUNT 17
-
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_CHRISTMAS
diff --git a/keyboards/hlb/poorkoi/keymaps/vial/keymap.c b/keyboards/hlb/poorkoi/keymaps/vial/keymap.c
index be20b83fe2..7af5767c7c 100644
--- a/keyboards/hlb/poorkoi/keymaps/vial/keymap.c
+++ b/keyboards/hlb/poorkoi/keymaps/vial/keymap.c
@@ -58,11 +58,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
   KC_TRNS,  KC_LALT,  KC_LGUI,            KC_TRNS,              KC_TRNS,              KC_TRNS,               KC_TRNS, KC_RGUI,  KC_RALT, KC_TRNS)
 };
-
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [1] = { ENCODER_CCW_CW(KC_BRID, KC_BRIU) }
-};
-#endif
diff --git a/keyboards/hlb/poorkoi/keymaps/vial/rules.mk b/keyboards/hlb/poorkoi/keymaps/vial/rules.mk
index fb7c333713..4f7618e9b2 100644
--- a/keyboards/hlb/poorkoi/keymaps/vial/rules.mk
+++ b/keyboards/hlb/poorkoi/keymaps/vial/rules.mk
@@ -1,6 +1,2 @@
-ENCODER_MAP_ENABLE = no
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-RGBLIGHT_DRIVER = ws2812
-NKRO_ENABLE = yes
diff --git a/keyboards/hlb/poorkoi/keymaps/vial/vial.json b/keyboards/hlb/poorkoi/keymaps/vial/vial.json
index c6b5882744..e0952b04ea 100644
--- a/keyboards/hlb/poorkoi/keymaps/vial/vial.json
+++ b/keyboards/hlb/poorkoi/keymaps/vial/vial.json
@@ -1,5 +1,4 @@
 {
-  "name": "PoorKoi",
   "lighting": "qmk_rgblight",
   "customKeycodes": [
 	{"name": "LAY_INDIC_RGB",
diff --git a/keyboards/hlb/poorkoi/readme.md b/keyboards/hlb/poorkoi/readme.md
index f36faf9c3f..f2ee797301 100644
--- a/keyboards/hlb/poorkoi/readme.md
+++ b/keyboards/hlb/poorkoi/readme.md
@@ -1,7 +1,16 @@
-# PoorKoi
+# HLB PoorKoi
 
-A 60% PCB for HLB PoorKoi based on 4pplet/waffling60/rev_e (https://github.com/4pplet/waffling60).
-PCB features tsangan layout with ansi/iso layouts as well as split spacebar, split left/right shift, stepped capslock.
+60% HLB PoorKoi's pcb is based on 4pplet/waffling60/rev_e (https://github.com/4pplet/waffling60).
+* PCB features tsangan layout with ansi/iso layouts as well as split spacebar, split left/right shift, stepped capslock.
+* PCB feature dedicated graphic art and flex cut were removed.
+
+Regarding source code we added extra features with dedicated custom keycode **L_INDIC**: 
+
+* LED indicator and capslock indicator are managed through lightning layers
+* Layer indicator is shown even if rgb underglow is off
+* Added a led indicator when custom keycode L_INDIC is on/off
+  * Blink on top when off
+  * Blink on bottom when on
 
 Make example for this keyboard (after setting up your build environment):