diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h
index eaef787a22..20c99021fb 100644
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@@ -18,62 +18,32 @@
 
 #include "keycodes.h"
 
-#ifndef VIA_ENABLE
-#    ifndef RGB_MATRIX_TOGGLE
-#        define RGB_MATRIX_TOGGLE KC_F15
-#    endif
-#    ifndef RGB_MATRIX_MODE_INC
-#        define RGB_MATRIX_MODE_INC KC_F16
-#    endif
-#    ifndef RGB_MATRIX_MODE_DEC
-#        define RGB_MATRIX_MODE_DEC KC_F17
-#    endif
-#    ifndef RGB_MATRIX_HUE_INC
-#        define RGB_MATRIX_HUE_INC KC_F18
-#    endif
-#    ifndef RGB_MATRIX_HUE_DEC
-#        define RGB_MATRIX_HUE_DEC KC_F19
-#    endif
-#    ifndef RGB_MATRIX_SAT_INC
-#        define RGB_MATRIX_SAT_INC KC_F20
-#    endif
-#    ifndef RGB_MATRIX_SAT_DEC
-#        define RGB_MATRIX_SAT_DEC KC_F21
-#    endif
-#    ifndef RGB_MATRIX_VAL_INC
-#        define RGB_MATRIX_VAL_INC KC_F22
-#    endif
-#    ifndef RGB_MATRIX_VAL_DEC
-#        define RGB_MATRIX_VAL_DEC KC_F23
-#    endif
-#else
-#    ifndef RGB_MATRIX_TOGGLE
-#        define RGB_MATRIX_TOGGLE QK_KB_0
-#    endif
-#    ifndef RGB_MATRIX_MODE_INC
-#        define RGB_MATRIX_MODE_INC QK_KB_1
-#    endif
-#    ifndef RGB_MATRIX_MODE_DEC
-#        define RGB_MATRIX_MODE_DEC QK_KB_2
-#    endif
-#    ifndef RGB_MATRIX_HUE_INC
-#        define RGB_MATRIX_HUE_INC QK_KB_3
-#    endif
-#    ifndef RGB_MATRIX_HUE_DEC
-#        define RGB_MATRIX_HUE_DEC QK_KB_4
-#    endif
-#    ifndef RGB_MATRIX_SAT_INC
-#        define RGB_MATRIX_SAT_INC QK_KB_5
-#    endif
-#    ifndef RGB_MATRIX_SAT_DEC
-#        define RGB_MATRIX_SAT_DEC QK_KB_6
-#    endif
-#    ifndef RGB_MATRIX_VAL_INC
-#        define RGB_MATRIX_VAL_INC QK_KB_7
-#    endif
-#    ifndef RGB_MATRIX_VAL_DEC
-#        define RGB_MATRIX_VAL_DEC QK_KB_8
-#    endif
+#ifndef RGB_MATRIX_TOGGLE
+#    define RGB_MATRIX_TOGGLE QK_KB_0
+#endif
+#ifndef RGB_MATRIX_MODE_INC
+#    define RGB_MATRIX_MODE_INC QK_KB_1
+#endif
+#ifndef RGB_MATRIX_MODE_DEC
+#    define RGB_MATRIX_MODE_DEC QK_KB_2
+#endif
+#ifndef RGB_MATRIX_HUE_INC
+#    define RGB_MATRIX_HUE_INC QK_KB_3
+#endif
+#ifndef RGB_MATRIX_HUE_DEC
+#    define RGB_MATRIX_HUE_DEC QK_KB_4
+#endif
+#ifndef RGB_MATRIX_SAT_INC
+#    define RGB_MATRIX_SAT_INC QK_KB_5
+#endif
+#ifndef RGB_MATRIX_SAT_DEC
+#    define RGB_MATRIX_SAT_DEC QK_KB_6
+#endif
+#ifndef RGB_MATRIX_VAL_INC
+#    define RGB_MATRIX_VAL_INC QK_KB_7
+#endif
+#ifndef RGB_MATRIX_VAL_DEC
+#    define RGB_MATRIX_VAL_DEC QK_KB_8
 #endif
 
 #define R_M_TOG RGB_MATRIX_TOGGLE
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 2514a63dde..36dadf6d4e 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -23,5 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_MATRIX_LED_COUNT              49
 #define RGB_MATRIX_DISABLE_KEYCODES
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x1
diff --git a/keyboards/work_louder/work_board/keymaps/via/config.h b/keyboards/work_louder/work_board/keymaps/via/config.h
index 7aa3bebe9b..716aac11aa 100644
--- a/keyboards/work_louder/work_board/keymaps/via/config.h
+++ b/keyboards/work_louder/work_board/keymaps/via/config.h
@@ -1,6 +1,10 @@
 // Copyright 2023 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+
 #define NO_ACTION_ONESHOT
+
 #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x1
diff --git a/keyboards/work_louder/work_board/keymaps/via/keymap.c b/keyboards/work_louder/work_board/keymaps/via/keymap.c
index 255ee3ed78..9ba3dcda4c 100644
--- a/keyboards/work_louder/work_board/keymaps/via/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/via/keymap.c
@@ -214,3 +214,21 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
     }
     *command_id = id_unhandled;
 }
+
+bool via_layout_2u = false;
+
+void via_set_layout_options_kb(uint32_t value) {
+    via_layout_2u = (bool)value;
+}
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_user(void) {
+    if (via_layout_2u) {
+        rgb_matrix_set_color(5, 0, 0, 0);
+        rgb_matrix_set_color(7, 0, 0, 0);
+    } else {
+        rgb_matrix_set_color(6, 0, 0, 0);
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index ef36b3171f..b34f31df5c 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -67,27 +67,12 @@ bool oled_task_kb(void) {
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#    ifdef VIA_ENABLE
-bool via_layout_2u = false;
-
-void via_set_layout_options_kb(uint32_t value) { via_layout_2u = (bool)value; }
-#    endif  // VIA_ENABLE
-
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {
         return false;
     }
-#    ifdef VIA_ENABLE
-    if (via_layout_2u) {
-        rgb_matrix_set_color(5, 0, 0, 0);
-        rgb_matrix_set_color(7, 0, 0, 0);
-    } else {
-        rgb_matrix_set_color(6, 0, 0, 0);
-    }
-#    else
     rgb_matrix_set_color(5, 0, 0, 0);
     rgb_matrix_set_color(7, 0, 0, 0);
-#    endif
     return true;
 }