diff --git a/usermods/ADS1115_v2/ADS1115_v2.h b/usermods/ADS1115_v2/ADS1115_v2.cpp
similarity index 98%
rename from usermods/ADS1115_v2/ADS1115_v2.h
rename to usermods/ADS1115_v2/ADS1115_v2.cpp
index 5e2b4b270..48f917332 100644
--- a/usermods/ADS1115_v2/ADS1115_v2.h
+++ b/usermods/ADS1115_v2/ADS1115_v2.cpp
@@ -252,4 +252,7 @@ class ADS1115Usermod : public Usermod {
         int16_t results = ads.getLastConversionResults();
         readings[activeChannel] = ads.computeVolts(results);
     }
-};
\ No newline at end of file
+};
+
+static ADS1115Usermod ads1115_v2;
+REGISTER_USERMOD(ads1115_v2);
\ No newline at end of file
diff --git a/usermods/ADS1115_v2/library.json b/usermods/ADS1115_v2/library.json
new file mode 100644
index 000000000..e4b448a03
--- /dev/null
+++ b/usermods/ADS1115_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "ADS1115_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/AHT10_v2/AHT10_v2.h b/usermods/AHT10_v2/AHT10_v2.cpp
similarity index 98%
rename from usermods/AHT10_v2/AHT10_v2.h
rename to usermods/AHT10_v2/AHT10_v2.cpp
index b5dc1841d..171e15754 100644
--- a/usermods/AHT10_v2/AHT10_v2.h
+++ b/usermods/AHT10_v2/AHT10_v2.cpp
@@ -324,4 +324,7 @@ public:
   }
 };
 
-const char UsermodAHT10::_name[] PROGMEM = "AHTxx";
\ No newline at end of file
+const char UsermodAHT10::_name[] PROGMEM = "AHTxx";
+
+static UsermodAHT10 aht10_v2;
+REGISTER_USERMOD(aht10_v2);
\ No newline at end of file
diff --git a/usermods/AHT10_v2/library.json b/usermods/AHT10_v2/library.json
new file mode 100644
index 000000000..209e97af2
--- /dev/null
+++ b/usermods/AHT10_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "AHT10_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/BH1750_v2/BH1750_v2.h b/usermods/BH1750_v2/BH1750_v2.cpp
similarity index 99%
rename from usermods/BH1750_v2/BH1750_v2.h
rename to usermods/BH1750_v2/BH1750_v2.cpp
index 2a2bd4637..5bd476245 100644
--- a/usermods/BH1750_v2/BH1750_v2.h
+++ b/usermods/BH1750_v2/BH1750_v2.cpp
@@ -250,3 +250,7 @@ const char Usermod_BH1750::_maxReadInterval[] PROGMEM = "max-read-interval-ms";
 const char Usermod_BH1750::_minReadInterval[] PROGMEM = "min-read-interval-ms";
 const char Usermod_BH1750::_HomeAssistantDiscovery[] PROGMEM = "HomeAssistantDiscoveryLux";
 const char Usermod_BH1750::_offset[] PROGMEM = "offset-lx";
+
+
+static Usermod_BH1750 bh1750_v2;
+REGISTER_USERMOD(bh1750_v2);
\ No newline at end of file
diff --git a/usermods/BH1750_v2/library.json b/usermods/BH1750_v2/library.json
new file mode 100644
index 000000000..662ca3543
--- /dev/null
+++ b/usermods/BH1750_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "BH1750_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/BME280_v2/BME280_v2.h b/usermods/BME280_v2/BME280_v2.cpp
similarity index 99%
rename from usermods/BME280_v2/BME280_v2.h
rename to usermods/BME280_v2/BME280_v2.cpp
index 9168f4229..d29451eed 100644
--- a/usermods/BME280_v2/BME280_v2.h
+++ b/usermods/BME280_v2/BME280_v2.cpp
@@ -479,3 +479,7 @@ public:
 
 const char UsermodBME280::_name[]                      PROGMEM = "BME280/BMP280";
 const char UsermodBME280::_enabled[]                   PROGMEM = "enabled";
+
+
+static UsermodBME280 bme280_v2;
+REGISTER_USERMOD(bme280_v2);
\ No newline at end of file
diff --git a/usermods/BME280_v2/library.json b/usermods/BME280_v2/library.json
new file mode 100644
index 000000000..57d41fb37
--- /dev/null
+++ b/usermods/BME280_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "BME280_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/BME68X_v2/BME68X_v2.h b/usermods/BME68X_v2/BME68X_v2.cpp
similarity index 99%
rename from usermods/BME68X_v2/BME68X_v2.h
rename to usermods/BME68X_v2/BME68X_v2.cpp
index aca24d0a2..5814506b3 100644
--- a/usermods/BME68X_v2/BME68X_v2.h
+++ b/usermods/BME68X_v2/BME68X_v2.cpp
@@ -1112,3 +1112,7 @@ void UsermodBME68X::saveState() {
 		if (WLED_MQTT_CONNECTED) mqtt->publish(charbuffer, 0, false, contbuffer);
 	}
 }
+
+
+static UsermodBME68X bme68x_v2;
+REGISTER_USERMOD(bme68x_v2);
\ No newline at end of file
diff --git a/usermods/BME68X_v2/library.json b/usermods/BME68X_v2/library.json
new file mode 100644
index 000000000..1a8a1f0ff
--- /dev/null
+++ b/usermods/BME68X_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "BME68X_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/INA226_v2/INA226_v2.h b/usermods/INA226_v2/INA226_v2.cpp
similarity index 99%
rename from usermods/INA226_v2/INA226_v2.h
rename to usermods/INA226_v2/INA226_v2.cpp
index 52bc3d83f..3c79f05bb 100644
--- a/usermods/INA226_v2/INA226_v2.h
+++ b/usermods/INA226_v2/INA226_v2.cpp
@@ -554,3 +554,7 @@ public:
 };
 
 const char UsermodINA226::_name[] PROGMEM = "INA226";
+
+
+static UsermodINA226 ina226_v2;
+REGISTER_USERMOD(ina226_v2);
\ No newline at end of file
diff --git a/usermods/INA226_v2/library.json b/usermods/INA226_v2/library.json
new file mode 100644
index 000000000..2596b86a5
--- /dev/null
+++ b/usermods/INA226_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "INA226_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/Internal_Temperature_v2/Internal_Temperature_v2.h b/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
similarity index 98%
rename from usermods/Internal_Temperature_v2/Internal_Temperature_v2.h
rename to usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
index 6d4d4577c..ab7f907ec 100644
--- a/usermods/Internal_Temperature_v2/Internal_Temperature_v2.h
+++ b/usermods/Internal_Temperature_v2/Internal_Temperature_v2.cpp
@@ -193,4 +193,7 @@ void InternalTemperatureUsermod::publishMqtt(const char *state, bool retain)
     mqtt->publish(subuf, 0, retain, state);
   }
 #endif
-}
\ No newline at end of file
+}
+
+static InternalTemperatureUsermod internal_temperature_v2;
+REGISTER_USERMOD(internal_temperature_v2);
\ No newline at end of file
diff --git a/usermods/Internal_Temperature_v2/library.json b/usermods/Internal_Temperature_v2/library.json
new file mode 100644
index 000000000..38b560da8
--- /dev/null
+++ b/usermods/Internal_Temperature_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "Internal_Temperature_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/LD2410_v2/LD2410_v2.h b/usermods/LD2410_v2/LD2410_v2.cpp
similarity index 99%
rename from usermods/LD2410_v2/LD2410_v2.h
rename to usermods/LD2410_v2/LD2410_v2.cpp
index 4d96b32ff..51c887fa4 100644
--- a/usermods/LD2410_v2/LD2410_v2.h
+++ b/usermods/LD2410_v2/LD2410_v2.cpp
@@ -235,3 +235,7 @@ void LD2410Usermod::publishMqtt(const char* topic, const char* state, bool retai
   }
 #endif
 }
+
+
+static LD2410Usermod ld2410_v2;
+REGISTER_USERMOD(ld2410_v2);
\ No newline at end of file
diff --git a/usermods/LD2410_v2/library.json b/usermods/LD2410_v2/library.json
new file mode 100644
index 000000000..3480cd798
--- /dev/null
+++ b/usermods/LD2410_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "LD2410_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/MAX17048_v2/MAX17048_v2.h b/usermods/MAX17048_v2/MAX17048_v2.cpp
similarity index 99%
rename from usermods/MAX17048_v2/MAX17048_v2.h
rename to usermods/MAX17048_v2/MAX17048_v2.cpp
index c3a2664ab..1a1108cf6 100644
--- a/usermods/MAX17048_v2/MAX17048_v2.h
+++ b/usermods/MAX17048_v2/MAX17048_v2.cpp
@@ -279,3 +279,7 @@ const char Usermod_MAX17048::_enabled[] PROGMEM = "enabled";
 const char Usermod_MAX17048::_maxReadInterval[] PROGMEM = "max-read-interval-ms";
 const char Usermod_MAX17048::_minReadInterval[] PROGMEM = "min-read-interval-ms";
 const char Usermod_MAX17048::_HomeAssistantDiscovery[] PROGMEM = "HomeAssistantDiscovery";
+
+
+static Usermod_MAX17048 max17048_v2;
+REGISTER_USERMOD(max17048_v2);
\ No newline at end of file
diff --git a/usermods/MAX17048_v2/library.json b/usermods/MAX17048_v2/library.json
new file mode 100644
index 000000000..72ac0e61f
--- /dev/null
+++ b/usermods/MAX17048_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "MAX17048_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/MY9291/MY9291.h b/usermods/MY9291/MY9291.cpp
similarity index 94%
rename from usermods/MY9291/MY9291.h
rename to usermods/MY9291/MY9291.cpp
index 66bbc34cb..ce8d0f001 100644
--- a/usermods/MY9291/MY9291.h
+++ b/usermods/MY9291/MY9291.cpp
@@ -42,4 +42,7 @@ class MY9291Usermod : public Usermod {
     uint16_t getId() {
       return USERMOD_ID_MY9291;
     }
-};
\ No newline at end of file
+};
+
+static MY9291Usermod my9291;
+REGISTER_USERMOD(my9291);
\ No newline at end of file
diff --git a/usermods/MY9291/library.json b/usermods/MY9291/library.json
new file mode 100644
index 000000000..d965f4c35
--- /dev/null
+++ b/usermods/MY9291/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "MY9291",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/TetrisAI_v2/TetrisAI_v2.h b/usermods/TetrisAI_v2/TetrisAI_v2.cpp
similarity index 99%
rename from usermods/TetrisAI_v2/TetrisAI_v2.h
rename to usermods/TetrisAI_v2/TetrisAI_v2.cpp
index 0f7039dac..78cdfd227 100644
--- a/usermods/TetrisAI_v2/TetrisAI_v2.h
+++ b/usermods/TetrisAI_v2/TetrisAI_v2.cpp
@@ -250,3 +250,7 @@ public:
     return USERMOD_ID_TETRISAI;
   }
 };
+
+
+static TetrisAIUsermod tetrisai_v2;
+REGISTER_USERMOD(tetrisai_v2);
\ No newline at end of file
diff --git a/usermods/TetrisAI_v2/library.json b/usermods/TetrisAI_v2/library.json
new file mode 100644
index 000000000..199e5c434
--- /dev/null
+++ b/usermods/TetrisAI_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "TetrisAI_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/mqtt_switch_v2/library.json b/usermods/mqtt_switch_v2/library.json
new file mode 100644
index 000000000..96695a9c7
--- /dev/null
+++ b/usermods/mqtt_switch_v2/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "mqtt_switch_v2",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/mqtt_switch_v2/mqtt_switch_v2.h b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
similarity index 98%
rename from usermods/mqtt_switch_v2/mqtt_switch_v2.h
rename to usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
index 67dfc9cc0..d4d823f32 100644
--- a/usermods/mqtt_switch_v2/mqtt_switch_v2.h
+++ b/usermods/mqtt_switch_v2/mqtt_switch_v2.cpp
@@ -157,3 +157,7 @@ inline void UsermodMqttSwitch::updateState(uint8_t pinNr)
         mqtt->publish(buf, 0, false, "OFF");
     }
 }
+
+
+static UsermodMqttSwitc mqtt_switch_v2;
+REGISTER_USERMOD(mqtt_switch_v2);
\ No newline at end of file
diff --git a/usermods/sensors_to_mqtt/library.json b/usermods/sensors_to_mqtt/library.json
new file mode 100644
index 000000000..dd9a4f3a2
--- /dev/null
+++ b/usermods/sensors_to_mqtt/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "sensors_to_mqtt",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/sensors_to_mqtt/sensors_to_mqtt.h b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
similarity index 98%
rename from usermods/sensors_to_mqtt/sensors_to_mqtt.h
rename to usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
index 9b5bd8c88..02f8e8d27 100644
--- a/usermods/sensors_to_mqtt/sensors_to_mqtt.h
+++ b/usermods/sensors_to_mqtt/sensors_to_mqtt.cpp
@@ -276,3 +276,7 @@ public:
     }
   }
 };
+
+
+static UserMod_SensorsToMQTT sensors_to_mqtt;
+REGISTER_USERMOD(sensors_to_mqtt);
\ No newline at end of file
diff --git a/usermods/seven_segment_display_reloaded/library.json b/usermods/seven_segment_display_reloaded/library.json
new file mode 100644
index 000000000..485aa4fd8
--- /dev/null
+++ b/usermods/seven_segment_display_reloaded/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "seven_segment_display_reloaded",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.h b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
similarity index 99%
rename from usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.h
rename to usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
index 1436f8fc4..812065d86 100644
--- a/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.h
+++ b/usermods/seven_segment_display_reloaded/seven_segment_display_reloaded.cpp
@@ -571,3 +571,7 @@ const char UsermodSSDR::_str_years[]       PROGMEM = "LED-Numbers-Year";
 const char UsermodSSDR::_str_ldrEnabled[]  PROGMEM = "enable-auto-brightness";
 const char UsermodSSDR::_str_minBrightness[]  PROGMEM = "auto-brightness-min";
 const char UsermodSSDR::_str_maxBrightness[]  PROGMEM = "auto-brightness-max";
+
+
+static UsermodSSDR seven_segment_display_reloaded;
+REGISTER_USERMOD(seven_segment_display_reloaded);
\ No newline at end of file
diff --git a/usermods/stairway_wipe_basic/library.json b/usermods/stairway_wipe_basic/library.json
new file mode 100644
index 000000000..6b3a52368
--- /dev/null
+++ b/usermods/stairway_wipe_basic/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "stairway_wipe_basic",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/stairway_wipe_basic/stairway_wipe_basic.h b/usermods/stairway_wipe_basic/stairway_wipe_basic.cpp
similarity index 97%
rename from usermods/stairway_wipe_basic/stairway_wipe_basic.h
rename to usermods/stairway_wipe_basic/stairway_wipe_basic.cpp
index 707479df1..cdb7cd662 100644
--- a/usermods/stairway_wipe_basic/stairway_wipe_basic.h
+++ b/usermods/stairway_wipe_basic/stairway_wipe_basic.cpp
@@ -126,3 +126,7 @@ void setup() {
    //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!
 };
+
+
+static StairwayWipeUsermod stairway_wipe_basic;
+REGISTER_USERMOD(stairway_wipe_basic);
\ No newline at end of file
diff --git a/usermods/word-clock-matrix/library.json b/usermods/word-clock-matrix/library.json
new file mode 100644
index 000000000..ed29ae088
--- /dev/null
+++ b/usermods/word-clock-matrix/library.json
@@ -0,0 +1,9 @@
+{
+  "name:": "word-clock-matrix",
+  "build": {
+    "srcDir": ".",
+    "includeDir": "../../wled00",
+    "libLDFMode": "chain+",
+    "libArchive": false
+  }
+}
\ No newline at end of file
diff --git a/usermods/word-clock-matrix/word-clock-matrix.h b/usermods/word-clock-matrix/word-clock-matrix.cpp
similarity index 99%
rename from usermods/word-clock-matrix/word-clock-matrix.h
rename to usermods/word-clock-matrix/word-clock-matrix.cpp
index 82499c0ce..c8606003d 100644
--- a/usermods/word-clock-matrix/word-clock-matrix.h
+++ b/usermods/word-clock-matrix/word-clock-matrix.cpp
@@ -336,3 +336,7 @@ public:
 
 
 };
+
+
+static WordClockMatrix word-clock-matrix;
+REGISTER_USERMOD(word-clock-matrix);
\ No newline at end of file