[Keymap] Userspace refactor, adding leader key functionality (#7790)

* Userspace refactor

* Fixed missed ifdef

* tapcode16, adjust layout

* glcdfont changes from #7745

* Modify Keymaps, add workman

* RGB & OLED update

1 files changed, 10 insertions, 4 deletions

diff --git a/users/curry/curry.h b/users/curry/curry.h
index a9de9ae51..ee4a73683 100644
--- a/users/curry/curry.h
+++ b/users/curry/curry.h
@@ -1,18 +1,23 @@
 #pragma once
 
 #include QMK_KEYBOARD_H
-
 #include "version.h"
 #include "eeprom.h"
 #include "wrappers.h"
 #include "process_records.h"
 
-#ifdef TAP_DANCE_ENABLE
+#if defined(TAP_DANCE_ENABLE)
 #    include "tap_dances.h"
 #endif  // TAP_DANCE_ENABLE
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#    include "rgb_stuff.h"
+
+#if defined(RGB_MATRIX_ENABLE)
+#   include "rgb_matrix_user.h"
 #endif
+
+#if defined(RGBLIGHT_ENABLE)
+#   include "rgb_lighting_user.h"
+#endif
+
 #if defined(KEYBOARD_lily58_rev1) & defined(PROTOCOL_LUFA)
 #    include "lufa.h"
 #    include "split_util.h"
@@ -23,6 +28,7 @@ enum userspace_layers {
     _QWERTY  = 0,
     _COLEMAK,
     _DVORAK,
+    _WORKMAN,
     _MODS,
     _LOWER,
     _RAISE,