diff --git a/Supported-devices.md b/Supported-devices.md
index d84d279c..8c7b622e 100644
--- a/Supported-devices.md
+++ b/Supported-devices.md
@@ -1,46 +1,53 @@
-## Devices officially supported in firmware:
+## Device specific flashing guides
 <img src="https://user-images.githubusercontent.com/5904370/53279262-400ad680-370f-11e9-8449-742fbfac5908.png" align="right" />
 
-- [**Sonoff 4CH / 4CH Pro**](Sonoff-4CH-and-4CH-Pro)
+- [**Sonoff 4CH**](https://blakadder.github.io/templates/sonoff_4CH.html)
+- [**Sonoff 4CH Pro**](https://blakadder.github.io/templates/sonoff_4CH_Pro.html)
 - [**Sonoff 4CH DIY**](Sonoff-4CH-DIY)
 - [**Sonoff / Geekcreit 2CH**](Geekcreit-Sonoff-2-Channel-Relay-(AC-85V-250V))
-- [**Sonoff B1 / B1 R2**](Sonoff-B1-and-B1-R2)
-- [**Sonoff Basic (R2)**](Sonoff-Basic)
-- [**Sonoff Dual / Dual R2**](Sonoff-Dual-and-Dual-R2)
-- [**Sonoff iFan02**](Sonoff-iFan02)
-- [**Sonoff Pow / Pow R2**](Sonoff-Pow-and-Pow-R2)
+- [**Sonoff B1 / B1 R2**](https://blakadder.github.io/templates/sonoff_B1.html)
+- [**Sonoff Basic (R2)**](https://blakadder.github.io/templates/sonoff_basic.html)
+- [**Sonoff Dual**](https://blakadder.github.io/templates/sonoff_dual.html)
+- [**Sonoff Dual R2**](https://blakadder.github.io/templates/sonoff_dual_R2.html)
+- [**Sonoff iFan02**](https://blakadder.github.io/templates/sonoff_ifan02.html)
+- [**Sonoff Pow**](https://blakadder.github.io/templates/sonoff_Pow.html)
+- [**Sonoff Pow R2**](https://blakadder.github.io/templates/sonoff_Pow_R2.html)
 - [**Sonoff PSA**](Sonoff-PSA)
-- [**Sonoff RF and Slampher**](Sonoff-RF)
-- [**Sonoff RF Bridge 433**](Sonoff-RF-Bridge-433)
-- [**Sonoff S20 Smart Socket**](Sonoff-S20-Smart-Socket)<img src="https://user-images.githubusercontent.com/5904370/53279217-8c561680-370f-11e9-8150-59acedcb8f37.png" align="right"/> 
-- [**Sonoff S26 Smart Socket**](Sonoff-S26-Smart-Socket)
-- [**Sonoff S31**](Sonoff-S31)
-- [**Sonoff SC**](Sonoff-SC)
-- [**Sonoff SV**](Sonoff-SV)
-- [**Sonoff T1**](Sonoff-T1-UK,-EU,-and-US)
-- [**Sonoff Touch**](Sonoff-Touch)
-- [**Sonoff TH**](Sonoff-Th)
+- [**Sonoff RF and Slampher**](https://blakadder.github.io/templates/sonoff_RF.html)
+- [**Sonoff RF Bridge 433**](https://blakadder.github.io/templates/sonoff_RF_bridge.html)
+- [**Sonoff S20 Smart Socket**](https://blakadder.github.io/templates/sonoff_S20.html)<img src="https://user-images.githubusercontent.com/5904370/53279217-8c561680-370f-11e9-8150-59acedcb8f37.png" align="right"/> 
+- [**Sonoff S26 Smart Socket**](https://blakadder.github.io/templates/sonoff_S26.html)
+- [**Sonoff S31**](https://blakadder.github.io/templates/sonoff_S31.html)
+- [**Sonoff SC**](https://blakadder.github.io/templates/sonoff_SC.html)
+- [**Sonoff SV**](https://blakadder.github.io/templates/sonoff_SV.html)
+- [**Sonoff T1**](Sonoff-T1)
+- [**Sonoff Touch EU**](https://blakadder.github.io/templates/sonoff_touch_eu.html)
+- [**Sonoff Touch US**](https://blakadder.github.io/templates/sonoff_touch_us.html)
+- [**Sonoff TH**](https://blakadder.github.io/templates/sonoff_TH.html)
 - [**Arilux LC02**](Arilux-LC02)
 - [**Armtronix Dimmers**](Armtronix-Dimmers)
-- [**Blitzwolf BW-SHP2**](BlitzWolf-SHP2)
-- [**Blitzwolf BW-SHP4**](BlitzWolf-BW-SHP4-(UK-Version))
-- [**Blitzwolf BW-SHP6**](BlitzWolf-SHP6)
+- [**Blitzwolf BW-SHP2**](https://blakadder.github.io/templates/blitzwolf_SHP2.html)
+- [**Blitzwolf BW-SHP4**](https://blakadder.github.io/templates/blitzwolf_SHP4.html)
+- [**Blitzwolf BW-SHP6**](https://blakadder.github.io/templates/blitzwolf_SHP6.html)
 - [**Digoo DG-SP202**](https://github.com/arendst/Sonoff-Tasmota/pull/4891)
 - [**Gosund SP1**](Gosund-SP1)<img src="https://user-images.githubusercontent.com/5904370/53279089-f968ac80-370d-11e9-8464-ce9d1c9c679c.jpg" width="250" align="right" />
-- [**H801 LED Controller**](H801)
-- [**HuaFan Smart Socket**](HuaFan-Smart-Socket)
-- [**Luminea LED Controller**](Luminea-ZX-2844-675-(RGBW-LED-Controller))
+- [**H801 LED Controller**](https://blakadder.github.io/templates/h801.html)
+- [**HuaFan Smart Socket**](https://blakadder.github.io/templates/huafan_qinlu.html)
+- [**Luminea LED Controller**](https://blakadder.github.io/templates/luminea_zx-2844.html)
 - [**MagicHome LED Controller**](MagicHome-LED-strip-controller)
 - [**Mi Desk Lamp**](Xiaomi-Mi-Desk-Lamp)
-- [**PS-16-DZ Dimmer**](PS-16-DZ-Dimmer)
+- [**PS-16-DZ Dimmer**](https://blakadder.github.io/templates/PS-16-DZ.html)
 - [**Tuya Dimmer**](Tuya-Dimmer)
-- [**OBI Socket**](OBI-Wifi-Socket)
-- [**OBI Socket 2**](OBI-Socket-2)
-- [**OBI Socket IP44 (Black)**](OBI-Wifi-Socket-IP44)
-- [**Shelly 1 and 2**](Shelly-1-and-2)<img src="https://shelly.cloud/wp-content/uploads/2018/11/shelly1_thumb.png" width="250" align="right" />
-- [**SK03 Outdoor Smart Plug**](SK03-Outdoor-Smart-Plug)
+- [**OBI Socket**](https://blakadder.github.io/templates/obi_stecker.html)
+- [**OBI Socket 2**](https://blakadder.github.io/templates/obi_stecker_2.html)
+- [**OBI Socket IP44 (Black)**](https://blakadder.github.io/templates/obi_stecker_black.html)
+- [**Shelly 1**](https://blakadder.github.io/templates/shelly_1.html)<img src="https://shelly.cloud/wp-content/uploads/2018/11/shelly1_thumb.png" width="250" align="right" />
+- [**Shelly 1PM**](https://blakadder.github.io/templates/shelly_1PM.html)
+- [**Shelly 2**](https://blakadder.github.io/templates/shelly_2.html)
+- [**Shelly 2.5**](https://blakadder.github.io/templates/shelly_25.html)
+- [**SK03 Outdoor Smart Plug**](https://blakadder.github.io/templates/SK03_outdoor.html)
 - [**Teckin SP10 Smart Socket**](Teckin-sp10)
-- [**YTF IR Bridge**](YTF-IR-Bridge)
+- [**YTF IR Bridge**](https://blakadder.github.io/templates/ytf_ir_bridge.html)
      - [**IR Codes Remotes**](https://github.com/arendst/Sonoff-Tasmota/wiki/Codes-for-IR-Remotes-(for-YTF-IR-Bridge))
 - [**WT003-EU 4 AC + 4 USB Outlet Tuya Power Strip EU**](https://github.com/arendst/Sonoff-Tasmota/pull/4590)
 - [**Wemos D1 R1 & R2**](Wemos-D1-R1-&-R2)
@@ -49,5 +56,4 @@
     - [**Configuration**](Wemos-D1-Mini#generic-module)
     - [**Usable Pins**](Expanding-Sonoffs#usable-pins)
 
-### [**Community Contributed Module Configurations**](Other-Devices) 
-Devices known to work with existing modules before Template feature was introduced
+