diff --git a/usermods/Analog_Clock/Analog_Clock.h b/usermods/Analog_Clock/Analog_Clock.cpp
similarity index 99%
rename from usermods/Analog_Clock/Analog_Clock.h
rename to usermods/Analog_Clock/Analog_Clock.cpp
index 9d82f7670..8a4c048a8 100644
--- a/usermods/Analog_Clock/Analog_Clock.h
+++ b/usermods/Analog_Clock/Analog_Clock.cpp
@@ -254,3 +254,7 @@ public:
         return USERMOD_ID_ANALOG_CLOCK;
     }
 };
+
+
+static AnalogClockUsermod analog_clock;
+REGISTER_USERMOD(analog_clock);
\ No newline at end of file
diff --git a/usermods/Analog_Clock/library.json b/usermods/Analog_Clock/library.json
new file mode 100644
index 000000000..ddba3a76f
--- /dev/null
+++ b/usermods/Analog_Clock/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Analog_Clock",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Animated_Staircase/Animated_Staircase.h b/usermods/Animated_Staircase/Animated_Staircase.cpp
similarity index 99%
rename from usermods/Animated_Staircase/Animated_Staircase.h
rename to usermods/Animated_Staircase/Animated_Staircase.cpp
index 54a9b3331..43d9db6b4 100644
--- a/usermods/Animated_Staircase/Animated_Staircase.h
+++ b/usermods/Animated_Staircase/Animated_Staircase.cpp
@@ -562,3 +562,7 @@ const char Animated_Staircase::_bottomEcho_pin[]            PROGMEM = "bottomEch
 const char Animated_Staircase::_topEchoCm[]                 PROGMEM = "top-dist-cm";
 const char Animated_Staircase::_bottomEchoCm[]              PROGMEM = "bottom-dist-cm";
 const char Animated_Staircase::_togglePower[]               PROGMEM = "toggle-on-off";
+
+
+static Animated_Staircase animated_staircase;
+REGISTER_USERMOD(animated_staircase);
\ No newline at end of file
diff --git a/usermods/Animated_Staircase/library.json b/usermods/Animated_Staircase/library.json
new file mode 100644
index 000000000..e37df3114
--- /dev/null
+++ b/usermods/Animated_Staircase/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Animated_Staircase",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Battery/usermod_v2_Battery.h b/usermods/Battery/Battery.cpp
similarity index 99%
rename from usermods/Battery/usermod_v2_Battery.h
rename to usermods/Battery/Battery.cpp
index b36c5f4d6..4646a2384 100644
--- a/usermods/Battery/usermod_v2_Battery.h
+++ b/usermods/Battery/Battery.cpp
@@ -857,3 +857,7 @@ const char UsermodBattery::_preset[]        PROGMEM = "preset";
 const char UsermodBattery::_duration[]      PROGMEM = "duration";
 const char UsermodBattery::_init[]          PROGMEM = "init";
 const char UsermodBattery::_haDiscovery[]   PROGMEM = "HA-discovery";
+
+
+static UsermodBattery battery;
+REGISTER_USERMOD(battery);
\ No newline at end of file
diff --git a/usermods/Battery/library.json b/usermods/Battery/library.json
new file mode 100644
index 000000000..bc0d97a11
--- /dev/null
+++ b/usermods/Battery/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Battery",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Cronixie/usermod_cronixie.h b/usermods/Cronixie/Cronixie.cpp
similarity index 99%
rename from usermods/Cronixie/usermod_cronixie.h
rename to usermods/Cronixie/Cronixie.cpp
index 671c5d134..09e7e25ac 100644
--- a/usermods/Cronixie/usermod_cronixie.h
+++ b/usermods/Cronixie/Cronixie.cpp
@@ -299,4 +299,7 @@ class UsermodCronixie : public Usermod {
     {
       return USERMOD_ID_CRONIXIE;
     }
-};
\ No newline at end of file
+};
+
+static UsermodCronixie cronixie;
+REGISTER_USERMOD(cronixie);
\ No newline at end of file
diff --git a/usermods/Cronixie/library.json b/usermods/Cronixie/library.json
new file mode 100644
index 000000000..f0d39d001
--- /dev/null
+++ b/usermods/Cronixie/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Cronixie",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/DHT/usermod_dht.h b/usermods/DHT/DHT.cpp
similarity index 99%
rename from usermods/DHT/usermod_dht.h
rename to usermods/DHT/DHT.cpp
index 05a7267b5..fad6dad5c 100644
--- a/usermods/DHT/usermod_dht.h
+++ b/usermods/DHT/DHT.cpp
@@ -245,3 +245,7 @@ class UsermodDHT : public Usermod {
     }
 
 };
+
+
+static UsermodDHT dht;
+REGISTER_USERMOD(dht);
\ No newline at end of file
diff --git a/usermods/DHT/library.json b/usermods/DHT/library.json
new file mode 100644
index 000000000..bb6773615
--- /dev/null
+++ b/usermods/DHT/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "DHT",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/EleksTube_IPS/usermod_elekstube_ips.h b/usermods/EleksTube_IPS/EleksTube_IPS.cpp
similarity index 98%
rename from usermods/EleksTube_IPS/usermod_elekstube_ips.h
rename to usermods/EleksTube_IPS/EleksTube_IPS.cpp
index 0f7d92e7e..48fbb2b40 100644
--- a/usermods/EleksTube_IPS/usermod_elekstube_ips.h
+++ b/usermods/EleksTube_IPS/EleksTube_IPS.cpp
@@ -156,3 +156,7 @@ class ElekstubeIPSUsermod : public Usermod {
 const char ElekstubeIPSUsermod::_name[]         PROGMEM = "EleksTubeIPS";
 const char ElekstubeIPSUsermod::_tubeSeg[]      PROGMEM = "tubeSegment";
 const char ElekstubeIPSUsermod::_digitOffset[]  PROGMEM = "digitOffset";
+
+
+static ElekstubeIPSUsermod elekstube_ips;
+REGISTER_USERMOD(elekstube_ips);
\ No newline at end of file
diff --git a/usermods/EleksTube_IPS/library.json b/usermods/EleksTube_IPS/library.json
new file mode 100644
index 000000000..d025fc78a
--- /dev/null
+++ b/usermods/EleksTube_IPS/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "EleksTube_IPS",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/LDR_Dusk_Dawn_v2/usermod_LDR_Dusk_Dawn_v2.h b/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
similarity index 98%
rename from usermods/LDR_Dusk_Dawn_v2/usermod_LDR_Dusk_Dawn_v2.h
rename to usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
index 03f4c078a..6104fcab5 100644
--- a/usermods/LDR_Dusk_Dawn_v2/usermod_LDR_Dusk_Dawn_v2.h
+++ b/usermods/LDR_Dusk_Dawn_v2/LDR_Dusk_Dawn_v2.cpp
@@ -151,3 +151,7 @@ class LDR_Dusk_Dawn_v2 : public Usermod {
 };
 
 const char LDR_Dusk_Dawn_v2::_name[]    PROGMEM = "LDR_Dusk_Dawn_v2";
+
+
+static LDR_Dusk_Dawn_v2 ldr_dusk_dawn_v2;
+REGISTER_USERMOD(ldr_dusk_dawn_v2);
\ No newline at end of file
diff --git a/usermods/LDR_Dusk_Dawn_v2/library.json b/usermods/LDR_Dusk_Dawn_v2/library.json
new file mode 100644
index 000000000..6a08c9cca
--- /dev/null
+++ b/usermods/LDR_Dusk_Dawn_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "LDR_Dusk_Dawn_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h b/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
similarity index 96%
rename from usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
rename to usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
index 0deda181c..1cc31a08d 100644
--- a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
+++ b/usermods/PIR_sensor_switch/PIR_sensor_switch.cpp
@@ -571,3 +571,7 @@ bool PIRsensorSwitch::readFromConfig(JsonObject &root)
   // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
   return !(pins.isNull() || pins.size() != PIR_SENSOR_MAX_SENSORS);
 }
+
+
+static PIRsensorSwitch pir_sensor_switch;
+REGISTER_USERMOD(pir_sensor_switch);
\ No newline at end of file
diff --git a/usermods/PIR_sensor_switch/library.json b/usermods/PIR_sensor_switch/library.json
new file mode 100644
index 000000000..152946e4c
--- /dev/null
+++ b/usermods/PIR_sensor_switch/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "PIR_sensor_switch",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/PWM_fan/usermod_PWM_fan.h b/usermods/PWM_fan/PWM_fan.cpp
similarity index 99%
rename from usermods/PWM_fan/usermod_PWM_fan.h
rename to usermods/PWM_fan/PWM_fan.cpp
index c3ef24fe4..9df373045 100644
--- a/usermods/PWM_fan/usermod_PWM_fan.h
+++ b/usermods/PWM_fan/PWM_fan.cpp
@@ -397,3 +397,7 @@ const char PWMFanUsermod::_maxPWMValuePct[] PROGMEM = "max-PWM-percent";
 const char PWMFanUsermod::_IRQperRotation[] PROGMEM = "IRQs-per-rotation";
 const char PWMFanUsermod::_speed[]          PROGMEM = "speed";
 const char PWMFanUsermod::_lock[]           PROGMEM = "lock";
+
+
+static PWMFanUsermod pwm_fan;
+REGISTER_USERMOD(pwm_fan);
\ No newline at end of file
diff --git a/usermods/PWM_fan/library.json b/usermods/PWM_fan/library.json
new file mode 100644
index 000000000..a6d5ea64f
--- /dev/null
+++ b/usermods/PWM_fan/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "PWM_fan",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/RTC/usermod_rtc.h b/usermods/RTC/RTC.cpp
similarity index 96%
rename from usermods/RTC/usermod_rtc.h
rename to usermods/RTC/RTC.cpp
index 42965e3af..f9dbe3cf2 100644
--- a/usermods/RTC/usermod_rtc.h
+++ b/usermods/RTC/RTC.cpp
@@ -48,4 +48,7 @@ class RTCUsermod : public Usermod {
     {
       return USERMOD_ID_RTC;
     }
-};
\ No newline at end of file
+};
+
+static RTCUsermod rtc;
+REGISTER_USERMOD(rtc);
\ No newline at end of file
diff --git a/usermods/RTC/library.json b/usermods/RTC/library.json
new file mode 100644
index 000000000..96aa095bb
--- /dev/null
+++ b/usermods/RTC/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "RTC",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/SN_Photoresistor/usermod_sn_photoresistor.h b/usermods/SN_Photoresistor/SN_Photoresistor.cpp
similarity index 98%
rename from usermods/SN_Photoresistor/usermod_sn_photoresistor.h
rename to usermods/SN_Photoresistor/SN_Photoresistor.cpp
index 45cdb66ad..5e50ab7a6 100644
--- a/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
+++ b/usermods/SN_Photoresistor/SN_Photoresistor.cpp
@@ -210,3 +210,7 @@ const char Usermod_SN_Photoresistor::_referenceVoltage[] PROGMEM = "supplied-vol
 const char Usermod_SN_Photoresistor::_resistorValue[] PROGMEM = "resistor-value";
 const char Usermod_SN_Photoresistor::_adcPrecision[] PROGMEM = "adc-precision";
 const char Usermod_SN_Photoresistor::_offset[] PROGMEM = "offset";
+
+
+static Usermod_SN_Photoresistor sn_photoresistor;
+REGISTER_USERMOD(sn_photoresistor);
\ No newline at end of file
diff --git a/usermods/SN_Photoresistor/library.json b/usermods/SN_Photoresistor/library.json
new file mode 100644
index 000000000..fe5173bed
--- /dev/null
+++ b/usermods/SN_Photoresistor/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "SN_Photoresistor",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/ST7789_display/ST7789_display.h b/usermods/ST7789_display/ST7789_display.cpp
similarity index 99%
rename from usermods/ST7789_display/ST7789_display.h
rename to usermods/ST7789_display/ST7789_display.cpp
index 65f4cae5d..e81c53ba5 100644
--- a/usermods/ST7789_display/ST7789_display.h
+++ b/usermods/ST7789_display/ST7789_display.cpp
@@ -410,4 +410,7 @@ class St7789DisplayUsermod : public Usermod {
 
    //More methods can be added in the future, this example will then be extended.
    //Your usermod will remain compatible as it does not need to implement all methods from the Usermod base class!
-};
\ No newline at end of file
+};
+
+static name. st7789_display;
+REGISTER_USERMOD(st7789_display);
\ No newline at end of file
diff --git a/usermods/ST7789_display/library.json b/usermods/ST7789_display/library.json
new file mode 100644
index 000000000..88f4efe78
--- /dev/null
+++ b/usermods/ST7789_display/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "ST7789_display",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Si7021_MQTT_HA/usermod_si7021_mqtt_ha.h b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
similarity index 99%
rename from usermods/Si7021_MQTT_HA/usermod_si7021_mqtt_ha.h
rename to usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
index 9f027382d..04f6d750d 100644
--- a/usermods/Si7021_MQTT_HA/usermod_si7021_mqtt_ha.h
+++ b/usermods/Si7021_MQTT_HA/Si7021_MQTT_HA.cpp
@@ -229,3 +229,7 @@ const char Si7021_MQTT_HA::_name[]                   PROGMEM = "Si7021 MQTT (Hom
 const char Si7021_MQTT_HA::_enabled[]                PROGMEM = "enabled";
 const char Si7021_MQTT_HA::_sendAdditionalSensors[]  PROGMEM = "Send Dew Point, Abs. Humidity and Heat Index";
 const char Si7021_MQTT_HA::_haAutoDiscovery[]        PROGMEM = "Home Assistant MQTT Auto-Discovery";
+
+
+static Si7021_MQTT_HA si7021_mqtt_ha;
+REGISTER_USERMOD(si7021_mqtt_ha);
\ No newline at end of file
diff --git a/usermods/Si7021_MQTT_HA/library.json b/usermods/Si7021_MQTT_HA/library.json
new file mode 100644
index 000000000..2c18375f2
--- /dev/null
+++ b/usermods/Si7021_MQTT_HA/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Si7021_MQTT_HA",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Temperature/usermod_temperature.h b/usermods/Temperature/Temperature.cpp
similarity index 99%
rename from usermods/Temperature/usermod_temperature.h
rename to usermods/Temperature/Temperature.cpp
index 178bc05a0..a17bd2d90 100644
--- a/usermods/Temperature/usermod_temperature.h
+++ b/usermods/Temperature/Temperature.cpp
@@ -471,3 +471,7 @@ static uint16_t mode_temperature() {
   SEGMENT.fill(SEGMENT.color_from_palette(i, false, false, 255));
   return FRAMETIME;
 }
+
+
+static UsermodTemperature temperature;
+REGISTER_USERMOD(temperature);
\ No newline at end of file
diff --git a/usermods/Temperature/library.json b/usermods/Temperature/library.json
new file mode 100644
index 000000000..56371db4e
--- /dev/null
+++ b/usermods/Temperature/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Temperature",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h b/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
similarity index 98%
rename from usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
rename to usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
index fe6b958f5..759c31c7c 100644
--- a/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
+++ b/usermods/VL53L0X_gestures/VL53L0X_gestures.cpp
@@ -126,4 +126,7 @@ class UsermodVL53L0XGestures : public Usermod {
     {
       return USERMOD_ID_VL53L0X;
     }
-};
\ No newline at end of file
+};
+
+static UsermodVL53L0XGestures vl53l0x_gestures;
+REGISTER_USERMOD(vl53l0x_gestures);
\ No newline at end of file
diff --git a/usermods/VL53L0X_gestures/library.json b/usermods/VL53L0X_gestures/library.json
new file mode 100644
index 000000000..77521d6f3
--- /dev/null
+++ b/usermods/VL53L0X_gestures/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "VL53L0X_gestures",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/boblight/boblight.h b/usermods/boblight/boblight.cpp
similarity index 99%
rename from usermods/boblight/boblight.h
rename to usermods/boblight/boblight.cpp
index b04b78fac..2a52fc156 100644
--- a/usermods/boblight/boblight.h
+++ b/usermods/boblight/boblight.cpp
@@ -457,3 +457,7 @@ void BobLightUsermod::pollBob() {
     }
   }
 }
+
+
+static BobLightUsermod boblight;
+REGISTER_USERMOD(boblight);
\ No newline at end of file
diff --git a/usermods/boblight/library.json b/usermods/boblight/library.json
new file mode 100644
index 000000000..0b63b2247
--- /dev/null
+++ b/usermods/boblight/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "boblight",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/buzzer/usermod_v2_buzzer.h b/usermods/buzzer/buzzer.cpp
similarity index 97%
rename from usermods/buzzer/usermod_v2_buzzer.h
rename to usermods/buzzer/buzzer.cpp
index ebd8dcb15..e421a2391 100644
--- a/usermods/buzzer/usermod_v2_buzzer.h
+++ b/usermods/buzzer/buzzer.cpp
@@ -78,4 +78,7 @@ class BuzzerUsermod : public Usermod {
     {
       return USERMOD_ID_BUZZER;
     }
-};
\ No newline at end of file
+};
+
+static BuzzerUsermod buzzer;
+REGISTER_USERMOD(buzzer);
\ No newline at end of file
diff --git a/usermods/buzzer/library.json b/usermods/buzzer/library.json
new file mode 100644
index 000000000..78ba4152f
--- /dev/null
+++ b/usermods/buzzer/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "buzzer",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/deep_sleep/usermod_deep_sleep.h b/usermods/deep_sleep/deep_sleep.cpp
similarity index 98%
rename from usermods/deep_sleep/usermod_deep_sleep.h
rename to usermods/deep_sleep/deep_sleep.cpp
index 7f4efd5ca..741b618fd 100644
--- a/usermods/deep_sleep/usermod_deep_sleep.h
+++ b/usermods/deep_sleep/deep_sleep.cpp
@@ -224,4 +224,7 @@ void addToConfig(JsonObject& root) override
 
 // add more strings here to reduce flash memory usage
 const char DeepSleepUsermod::_name[]    PROGMEM = "DeepSleep";
-const char DeepSleepUsermod::_enabled[] PROGMEM = "enabled";
\ No newline at end of file
+const char DeepSleepUsermod::_enabled[] PROGMEM = "enabled";
+
+static DeepSleepUsermod deep_sleep;
+REGISTER_USERMOD(deep_sleep);
\ No newline at end of file
diff --git a/usermods/deep_sleep/library.json b/usermods/deep_sleep/library.json
new file mode 100644
index 000000000..c15e8d577
--- /dev/null
+++ b/usermods/deep_sleep/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "deep_sleep",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/mpu6050_imu/library.json b/usermods/mpu6050_imu/library.json
new file mode 100644
index 000000000..bf86aed62
--- /dev/null
+++ b/usermods/mpu6050_imu/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "mpu6050_imu",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/mpu6050_imu/usermod_mpu6050_imu.h b/usermods/mpu6050_imu/mpu6050_imu.cpp
similarity index 99%
rename from usermods/mpu6050_imu/usermod_mpu6050_imu.h
rename to usermods/mpu6050_imu/mpu6050_imu.cpp
index f04578fe3..2f8166cdd 100644
--- a/usermods/mpu6050_imu/usermod_mpu6050_imu.h
+++ b/usermods/mpu6050_imu/mpu6050_imu.cpp
@@ -446,3 +446,7 @@ const char MPU6050Driver::_z_acc_bias[] PROGMEM = "z_acc_bias";
 const char MPU6050Driver::_x_gyro_bias[] PROGMEM = "x_gyro_bias";
 const char MPU6050Driver::_y_gyro_bias[] PROGMEM = "y_gyro_bias";
 const char MPU6050Driver::_z_gyro_bias[] PROGMEM = "z_gyro_bias";
+
+
+static MPU6050Driver mpu6050_imu;
+REGISTER_USERMOD(mpu6050_imu);
\ No newline at end of file
diff --git a/usermods/multi_relay/library.json b/usermods/multi_relay/library.json
new file mode 100644
index 000000000..47505d0b4
--- /dev/null
+++ b/usermods/multi_relay/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "multi_relay",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/multi_relay/usermod_multi_relay.h b/usermods/multi_relay/multi_relay.cpp
similarity index 99%
rename from usermods/multi_relay/usermod_multi_relay.h
rename to usermods/multi_relay/multi_relay.cpp
index c4446c7a2..ea07e281e 100644
--- a/usermods/multi_relay/usermod_multi_relay.h
+++ b/usermods/multi_relay/multi_relay.cpp
@@ -842,3 +842,7 @@ const char MultiRelay::_pcfAddress[]      PROGMEM = "PCF8574-address";
 const char MultiRelay::_switch[]          PROGMEM = "switch";
 const char MultiRelay::_toggle[]          PROGMEM = "toggle";
 const char MultiRelay::_Command[]         PROGMEM = "/command";
+
+
+static MultiRelay multi_relay;
+REGISTER_USERMOD(multi_relay);
\ No newline at end of file
diff --git a/usermods/pixels_dice_tray/library.json b/usermods/pixels_dice_tray/library.json
new file mode 100644
index 000000000..01776ffe2
--- /dev/null
+++ b/usermods/pixels_dice_tray/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "pixels_dice_tray",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/pixels_dice_tray/pixels_dice_tray.h b/usermods/pixels_dice_tray/pixels_dice_tray.cpp
similarity index 99%
rename from usermods/pixels_dice_tray/pixels_dice_tray.h
rename to usermods/pixels_dice_tray/pixels_dice_tray.cpp
index 61348ebb8..07fd3d596 100644
--- a/usermods/pixels_dice_tray/pixels_dice_tray.h
+++ b/usermods/pixels_dice_tray/pixels_dice_tray.cpp
@@ -533,3 +533,7 @@ class PixelsDiceTrayUsermod : public Usermod {
   // extended. Your usermod will remain compatible as it does not need to
   // implement all methods from the Usermod base class!
 };
+
+
+static PixelsDiceTrayUsermod pixels_dice_tray;
+REGISTER_USERMOD(pixels_dice_tray);
\ No newline at end of file
diff --git a/usermods/pov_display/library.json b/usermods/pov_display/library.json
new file mode 100644
index 000000000..5998377b9
--- /dev/null
+++ b/usermods/pov_display/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "pov_display",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/pov_display/usermod_pov_display.h b/usermods/pov_display/pov_display.cpp
similarity index 96%
rename from usermods/pov_display/usermod_pov_display.h
rename to usermods/pov_display/pov_display.cpp
index b1fc0dba6..c1bd143a0 100644
--- a/usermods/pov_display/usermod_pov_display.h
+++ b/usermods/pov_display/pov_display.cpp
@@ -83,3 +83,7 @@ class PovDisplayUsermod : public Usermod
 
     void connected() {}
 };
+
+
+static PovDisplayUsermod pov_display;
+REGISTER_USERMOD(pov_display);
\ No newline at end of file
diff --git a/usermods/pwm_outputs/library.json b/usermods/pwm_outputs/library.json
new file mode 100644
index 000000000..18ce7d883
--- /dev/null
+++ b/usermods/pwm_outputs/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "pwm_outputs",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/pwm_outputs/usermod_pwm_outputs.h b/usermods/pwm_outputs/pwm_outputs.cpp
similarity index 98%
rename from usermods/pwm_outputs/usermod_pwm_outputs.h
rename to usermods/pwm_outputs/pwm_outputs.cpp
index 09232f043..72a78475c 100644
--- a/usermods/pwm_outputs/usermod_pwm_outputs.h
+++ b/usermods/pwm_outputs/pwm_outputs.cpp
@@ -219,3 +219,7 @@ class PwmOutputsUsermod : public Usermod {
 
 const char PwmOutputsUsermod::USERMOD_NAME[] PROGMEM = "PwmOutputs";
 const char PwmOutputsUsermod::PWM_STATE_NAME[] PROGMEM = "pwm";
+
+
+static PwmOutputsUsermod pwm_outputs;
+REGISTER_USERMOD(pwm_outputs);
\ No newline at end of file
diff --git a/usermods/quinled-an-penta/library.json b/usermods/quinled-an-penta/library.json
new file mode 100644
index 000000000..274020d94
--- /dev/null
+++ b/usermods/quinled-an-penta/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "quinled-an-penta",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/quinled-an-penta/quinled-an-penta.h b/usermods/quinled-an-penta/quinled-an-penta.cpp
similarity index 99%
rename from usermods/quinled-an-penta/quinled-an-penta.h
rename to usermods/quinled-an-penta/quinled-an-penta.cpp
index e44672039..612ade03b 100644
--- a/usermods/quinled-an-penta/quinled-an-penta.h
+++ b/usermods/quinled-an-penta/quinled-an-penta.cpp
@@ -752,4 +752,7 @@ const unsigned char QuinLEDAnPentaUsermod::quinLedLogo[] PROGMEM = {
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-};
\ No newline at end of file
+};
+
+static QuinLEDAnPentaUsermod quinled-an-penta;
+REGISTER_USERMOD(quinled-an-penta);
\ No newline at end of file
diff --git a/usermods/rgb-rotary-encoder/library.json b/usermods/rgb-rotary-encoder/library.json
new file mode 100644
index 000000000..c23606c0a
--- /dev/null
+++ b/usermods/rgb-rotary-encoder/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "rgb-rotary-encoder",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
similarity index 99%
rename from usermods/rgb-rotary-encoder/rgb-rotary-encoder.h
rename to usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
index 00fc22725..3e7b96bb2 100644
--- a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h
+++ b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.cpp
@@ -340,4 +340,7 @@ const char RgbRotaryEncoderUsermod::_ebIo[]              PROGMEM = "eb-pin";
 const char RgbRotaryEncoderUsermod::_ledMode[]           PROGMEM = "LED-Mode";
 const char RgbRotaryEncoderUsermod::_ledBrightness[]     PROGMEM = "LED-Brightness";
 const char RgbRotaryEncoderUsermod::_stepsPerClick[]     PROGMEM = "Steps-per-Click";
-const char RgbRotaryEncoderUsermod::_incrementPerClick[] PROGMEM = "Increment-per-Click";
\ No newline at end of file
+const char RgbRotaryEncoderUsermod::_incrementPerClick[] PROGMEM = "Increment-per-Click";
+
+static RgbRotaryEncoderUsermod rgb-rotary-encoder;
+REGISTER_USERMOD(rgb-rotary-encoder);
\ No newline at end of file
diff --git a/usermods/sd_card/library.json b/usermods/sd_card/library.json
new file mode 100644
index 000000000..777c6264f
--- /dev/null
+++ b/usermods/sd_card/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "sd_card",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/sd_card/usermod_sd_card.h b/usermods/sd_card/sd_card.cpp
similarity index 99%
rename from usermods/sd_card/usermod_sd_card.h
rename to usermods/sd_card/sd_card.cpp
index da1999d9b..e33a643fe 100644
--- a/usermods/sd_card/usermod_sd_card.h
+++ b/usermods/sd_card/sd_card.cpp
@@ -240,4 +240,7 @@ void listDir( const char * dirname, uint8_t levels){
     }
 }
 
-#endif
\ No newline at end of file
+#endif
+
+static UsermodSdCard sd_card;
+REGISTER_USERMOD(sd_card);
\ No newline at end of file
diff --git a/usermods/seven_segment_display/library.json b/usermods/seven_segment_display/library.json
new file mode 100644
index 000000000..c10bd084c
--- /dev/null
+++ b/usermods/seven_segment_display/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "seven_segment_display",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/seven_segment_display/usermod_v2_seven_segment_display.h b/usermods/seven_segment_display/seven_segment_display.cpp
similarity index 99%
rename from usermods/seven_segment_display/usermod_v2_seven_segment_display.h
rename to usermods/seven_segment_display/seven_segment_display.cpp
index 20fef15df..d3aa57378 100644
--- a/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
+++ b/usermods/seven_segment_display/seven_segment_display.cpp
@@ -498,4 +498,7 @@ const char SevenSegmentDisplay::_str_timeEnabled[] PROGMEM = "timeEnabled";
 const char SevenSegmentDisplay::_str_scrollSpd[] PROGMEM = "scrollSpd";
 const char SevenSegmentDisplay::_str_displayMask[] PROGMEM = "displayMask";
 const char SevenSegmentDisplay::_str_displayMsg[] PROGMEM = "displayMsg";
-const char SevenSegmentDisplay::_str_sevenSeg[] PROGMEM = "sevenSeg";
\ No newline at end of file
+const char SevenSegmentDisplay::_str_sevenSeg[] PROGMEM = "sevenSeg";
+
+static SevenSegmentDisplay seven_segment_display;
+REGISTER_USERMOD(seven_segment_display);
\ No newline at end of file
diff --git a/usermods/sht/library.json b/usermods/sht/library.json
new file mode 100644
index 000000000..2cb0003ac
--- /dev/null
+++ b/usermods/sht/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "sht",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/sht/usermod_sht.h b/usermods/sht/sht.cpp
similarity index 99%
rename from usermods/sht/usermod_sht.h
rename to usermods/sht/sht.cpp
index f10c78a25..7641bbc2e 100644
--- a/usermods/sht/usermod_sht.h
+++ b/usermods/sht/sht.cpp
@@ -477,4 +477,7 @@ float ShtUsermod::getTemperature() {
  */
 const char* ShtUsermod::getUnitString() {
   return unitOfTemp ? "°F" : "°C";
-}
\ No newline at end of file
+}
+
+static ShtUsermod sht;
+REGISTER_USERMOD(sht);
\ No newline at end of file
diff --git a/usermods/smartnest/library.json b/usermods/smartnest/library.json
new file mode 100644
index 000000000..4e776ad76
--- /dev/null
+++ b/usermods/smartnest/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "smartnest",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/smartnest/usermod_smartnest.h b/usermods/smartnest/smartnest.cpp
similarity index 98%
rename from usermods/smartnest/usermod_smartnest.h
rename to usermods/smartnest/smartnest.cpp
index 9d21ef2e7..be7710abc 100644
--- a/usermods/smartnest/usermod_smartnest.h
+++ b/usermods/smartnest/smartnest.cpp
@@ -203,3 +203,7 @@ public:
     }
   }
 };
+
+
+static Smartnest smartnest;
+REGISTER_USERMOD(smartnest);
\ No newline at end of file
diff --git a/usermods/usermod_rotary_brightness_color/library.json b/usermods/usermod_rotary_brightness_color/library.json
new file mode 100644
index 000000000..8d368082b
--- /dev/null
+++ b/usermods/usermod_rotary_brightness_color/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_rotary_brightness_color",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
similarity index 98%
rename from usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h
rename to usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
index 85a9a1605..076e91f73 100644
--- a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h
+++ b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.cpp
@@ -187,3 +187,7 @@ public:
     return configComplete;
   }
 };
+
+
+static RotaryEncoderBrightnessColor usermod_rotary_brightness_color;
+REGISTER_USERMOD(usermod_rotary_brightness_color);
\ No newline at end of file
diff --git a/usermods/usermod_v2_HttpPullLightControl/library.json b/usermods/usermod_v2_HttpPullLightControl/library.json
new file mode 100644
index 000000000..68b937081
--- /dev/null
+++ b/usermods/usermod_v2_HttpPullLightControl/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_HttpPullLightControl",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_four_line_display_ALT/library.json b/usermods/usermod_v2_four_line_display_ALT/library.json
new file mode 100644
index 000000000..6dccb4a98
--- /dev/null
+++ b/usermods/usermod_v2_four_line_display_ALT/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_four_line_display_ALT",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
similarity index 99%
rename from usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
rename to usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
index 684dd86e4..851e378e1 100644
--- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
+++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.cpp
@@ -1386,3 +1386,7 @@ bool FourLineDisplayUsermod::readFromConfig(JsonObject& root) {
   // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
   return !top[FPSTR(_contrastFix)].isNull();
 }
+
+
+static FourLineDisplayUsermod usermod_v2_four_line_display_alt;
+REGISTER_USERMOD(usermod_v2_four_line_display_alt);
\ No newline at end of file
diff --git a/usermods/usermod_v2_klipper_percentage/library.json b/usermods/usermod_v2_klipper_percentage/library.json
new file mode 100644
index 000000000..afd961631
--- /dev/null
+++ b/usermods/usermod_v2_klipper_percentage/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_klipper_percentage",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
similarity index 97%
rename from usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h
rename to usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
index bd4170dd2..55132b84d 100644
--- a/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h
+++ b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.cpp
@@ -219,4 +219,7 @@ public:
   }
 };
 const char klipper_percentage::_name[] PROGMEM = "Klipper_Percentage";
-const char klipper_percentage::_enabled[] PROGMEM = "enabled";
\ No newline at end of file
+const char klipper_percentage::_enabled[] PROGMEM = "enabled";
+
+static klipper_percentage usermod_v2_klipper_percentage;
+REGISTER_USERMOD(usermod_v2_klipper_percentage);
\ No newline at end of file
diff --git a/usermods/usermod_v2_ping_pong_clock/library.json b/usermods/usermod_v2_ping_pong_clock/library.json
new file mode 100644
index 000000000..197086113
--- /dev/null
+++ b/usermods/usermod_v2_ping_pong_clock/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_ping_pong_clock",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
similarity index 97%
rename from usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h
rename to usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
index 40ff675c0..8212947a6 100644
--- a/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h
+++ b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.cpp
@@ -117,3 +117,7 @@ public:
   }
 
 };
+
+
+static PingPongClockUsermod usermod_v2_ping_pong_clock;
+REGISTER_USERMOD(usermod_v2_ping_pong_clock);
\ No newline at end of file
diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/library.json b/usermods/usermod_v2_rotary_encoder_ui_ALT/library.json
new file mode 100644
index 000000000..f7c60ecdd
--- /dev/null
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_rotary_encoder_ui_ALT",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
similarity index 99%
rename from usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
rename to usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
index 383c1193e..ac2cc3c4e 100644
--- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp
@@ -1175,3 +1175,7 @@ const char RotaryEncoderUIUsermod::_applyToAll[] PROGMEM = "apply-2-all-seg";
 const char RotaryEncoderUIUsermod::_pcf8574[]    PROGMEM = "use-PCF8574";
 const char RotaryEncoderUIUsermod::_pcfAddress[] PROGMEM = "PCF8574-address";
 const char RotaryEncoderUIUsermod::_pcfINTpin[]  PROGMEM = "PCF8574-INT-pin";
+
+
+static RotaryEncoderUIUsermod usermod_v2_rotary_encoder_ui_alt;
+REGISTER_USERMOD(usermod_v2_rotary_encoder_ui_alt);
\ No newline at end of file
diff --git a/usermods/usermod_v2_word_clock/library.json b/usermods/usermod_v2_word_clock/library.json
new file mode 100644
index 000000000..74a3d9035
--- /dev/null
+++ b/usermods/usermod_v2_word_clock/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "usermod_v2_word_clock",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/usermod_v2_word_clock/usermod_v2_word_clock.h b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
similarity index 99%
rename from usermods/usermod_v2_word_clock/usermod_v2_word_clock.h
rename to usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
index 7ecec08e5..781dd7d81 100644
--- a/usermods/usermod_v2_word_clock/usermod_v2_word_clock.h
+++ b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.cpp
@@ -504,4 +504,7 @@ class WordClockUsermod : public Usermod
 
    //More methods can be added in the future, this example will then be extended.
    //Your usermod will remain compatible as it does not need to implement all methods from the Usermod base class!
-};
\ No newline at end of file
+};
+
+static WordClockUsermod usermod_v2_word_clock;
+REGISTER_USERMOD(usermod_v2_word_clock);
\ No newline at end of file
diff --git a/usermods/wireguard/library.json b/usermods/wireguard/library.json
new file mode 100644
index 000000000..290f2794b
--- /dev/null
+++ b/usermods/wireguard/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "wireguard",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/wireguard/wireguard.h b/usermods/wireguard/wireguard.cpp
similarity index 98%
rename from usermods/wireguard/wireguard.h
rename to usermods/wireguard/wireguard.cpp
index 8656a704a..77cc952fc 100644
--- a/usermods/wireguard/wireguard.h
+++ b/usermods/wireguard/wireguard.cpp
@@ -124,4 +124,7 @@ class WireguardUsermod : public Usermod {
     int endpoint_port = 0;
     bool is_enabled = false;
     unsigned long lastTime = 0;
-};
\ No newline at end of file
+};
+
+static WireguardUsermod wireguard;
+REGISTER_USERMOD(wireguard);
\ No newline at end of file
diff --git a/usermods/wizlights/library.json b/usermods/wizlights/library.json
new file mode 100644
index 000000000..a82dd7fcb
--- /dev/null
+++ b/usermods/wizlights/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "wizlights",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/wizlights/wizlights.h b/usermods/wizlights/wizlights.cpp
similarity index 98%
rename from usermods/wizlights/wizlights.h
rename to usermods/wizlights/wizlights.cpp
index 08d204934..67c0effdb 100644
--- a/usermods/wizlights/wizlights.h
+++ b/usermods/wizlights/wizlights.cpp
@@ -156,3 +156,7 @@ class WizLightsUsermod : public Usermod {
         
     uint16_t getId(){return USERMOD_ID_WIZLIGHTS;}
 };
+
+
+static WizLightsUsermod wizlights;
+REGISTER_USERMOD(wizlights);
\ No newline at end of file