diff --git a/KeyboardConfig.h b/KeyboardConfig.h
index 40ae0bb6..ef39eebf 100644
--- a/KeyboardConfig.h
+++ b/KeyboardConfig.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "WS2812.h"
 #include "generated/keymaps.h"
 
 #define EEPROM_KEYMAP_LOCATION 0
@@ -11,11 +10,11 @@
 #define LEFT_COLS 8
 #define LEFT_ROWS 4
 
-uint8_t left_colpins[]= {7,6,5,4,3,2,1,0};
-uint8_t left_rowpins[]= {8,9,10,11};
+static uint8_t left_colpins[]= {7,6,5,4,3,2,1,0};
+static uint8_t left_rowpins[]= {8,9,10,11};
 
-uint8_t right_colpins[]= {0,1,2,3,4,5,6,7};
-uint8_t right_rowpins[]= {8,9,10,11};
+static uint8_t right_colpins[]= {0,1,2,3,4,5,6,7};
+static uint8_t right_rowpins[]= {8,9,10,11};
 
 
 
@@ -25,3 +24,84 @@ uint8_t right_rowpins[]= {8,9,10,11};
 #define KEYMAPS 3
 #define NUMPAD_KEYMAP 2
 #define KEYMAP_LIST KEYMAP_QWERTY KEYMAP_GENERIC_FN2 KEYMAP_NUMPAD
+
+
+
+
+#define LED_DATA_PIN  4
+
+#define LED_COUNT 64
+
+static const uint8_t key_led_map[4][16] = {
+    {3,4,11,12,19,20,26,27,     36,37,43,44,51,52,59,60},
+    {2,5,10,13,18,21,31,28,     35,32,42,45,50,53,58,61},
+    {1,6,9,14, 17,22,25,29,     34,38,41,46,49,54,57,62},
+    {0,7,8,15,16,23,24,30,      33,39,40,47,48,55,56,63},
+};
+
+
+
+#define LED_PGDN 0
+#define LED_PGUP 1
+#define LED_BACKTICK 2
+#define LED_LED 3
+#define LED_1 4
+#define LED_Q 5
+#define LED_A 6
+#define LED_Z 7
+#define LED_X 8
+#define LED_S 9
+#define LED_W 10
+#define LED_2 11
+#define LED_3 12
+#define LED_E 13
+#define LED_D 14
+#define LED_C 15
+#define LED_V 16
+#define LED_F 17
+#define LED_R 18
+#define LED_4 19
+#define LED_5 20
+#define LED_T 21
+#define LED_REC_MACRO 22
+#define LED_B 23
+#define LED_ESC 24
+#define LED_TAB 25
+#define LED_REC 26
+#define LED_L_FN 27
+#define LED_L_CTRL 28
+#define LED_DEL 29
+#define LED_CMD 30
+#define LED_L_SHIFT 31
+#define LED_R_SHIFT 32
+#define LED_ALT 33
+#define LED_SPACE 34
+#define LED_CTRL 35
+#define LED_R_FN 36
+#define LED_ANY 37
+#define LED_RETURN 38
+#define LED_BUTTERFLY 39
+#define LED_N 40
+#define LED_H 41
+#define LED_Y 42
+#define LED_6 43
+#define LED_7 44
+#define LED_U 45
+#define LED_J 46
+#define LED_M 47
+#define LED_COMMA 48
+#define LED_K 49
+#define LED_I 50
+#define LED_8 51
+#define LED_9 52
+#define LED_O 53
+#define LED_L 54
+#define LED_PERIOD 55
+#define LED_SLASH 56
+#define LED_SEMICOLON 57
+#define LED_P 58
+#define LED_0 59
+#define LED_NUM 60
+#define LED_EQUALS 61
+#define LED_APOSTROPHE 62
+#define LED_MINUS 63
diff --git a/led_control.h b/led_control.h
index 8a7389c7..26f64d70 100644
--- a/led_control.h
+++ b/led_control.h
@@ -1,8 +1,8 @@
 
 #pragma once
-
-
 #include "WS2812.h"
+#include "KeyboardConfig.h"
+
 #define LED_MODES 7
 #define LED_MODE_OFF 0
 #define LED_MODE_STEADY 1
@@ -13,83 +13,6 @@
 #define LED_MODE_CHASE 6
 
 #define LED_SPECIAL_MODE_NUMLOCK 100
-#define LED_DATA_PIN  4
-
-#define LED_COUNT 64
-
-static const uint8_t key_led_map[4][16] = {
-    {3,4,11,12,19,20,26,27,     36,37,43,44,51,52,59,60},
-    {2,5,10,13,18,21,31,28,     35,32,42,45,50,53,58,61},
-    {1,6,9,14, 17,22,25,29,     34,38,41,46,49,54,57,62},
-    {0,7,8,15,16,23,24,30,      33,39,40,47,48,55,56,63},
-};
-
-
-
-#define LED_PGDN 0
-#define LED_PGUP 1
-#define LED_BACKTICK 2
-#define LED_LED 3
-#define LED_1 4
-#define LED_Q 5
-#define LED_A 6
-#define LED_Z 7
-#define LED_X 8
-#define LED_S 9
-#define LED_W 10
-#define LED_2 11
-#define LED_3 12
-#define LED_E 13
-#define LED_D 14
-#define LED_C 15
-#define LED_V 16
-#define LED_F 17
-#define LED_R 18
-#define LED_4 19
-#define LED_5 20
-#define LED_T 21
-#define LED_REC_MACRO 22
-#define LED_B 23
-#define LED_ESC 24
-#define LED_TAB 25
-#define LED_REC 26
-#define LED_L_FN 27
-#define LED_L_CTRL 28
-#define LED_DEL 29
-#define LED_CMD 30
-#define LED_L_SHIFT 31
-#define LED_R_SHIFT 32
-#define LED_ALT 33
-#define LED_SPACE 34
-#define LED_CTRL 35
-#define LED_R_FN 36
-#define LED_ANY 37
-#define LED_RETURN 38
-#define LED_BUTTERFLY 39
-#define LED_N 40
-#define LED_H 41
-#define LED_Y 42
-#define LED_6 43
-#define LED_7 44
-#define LED_U 45
-#define LED_J 46
-#define LED_M 47
-#define LED_COMMA 48
-#define LED_K 49
-#define LED_I 50
-#define LED_8 51
-#define LED_9 52
-#define LED_O 53
-#define LED_L 54
-#define LED_PERIOD 55
-#define LED_SLASH 56
-#define LED_SEMICOLON 57
-#define LED_P 58
-#define LED_0 59
-#define LED_NUM 60
-#define LED_EQUALS 61
-#define LED_APOSTROPHE 62
-#define LED_MINUS 63
 
 void setup_leds();
 void update_leds(uint8_t numlock_enabled);