diff --git a/Gemfile.lock b/Gemfile.lock
index be985fb8b..c96d0fb77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,16 +7,88 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
     colorator (1.1.0)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
+    dnsruby (1.61.3)
+      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     eventmachine (1.2.7-x64-mingw32)
+    execjs (2.7.0)
+    faraday (0.17.1)
+      multipart-post (>= 1.2, < 3)
     ffi (1.11.3-x64-mingw32)
     forwardable-extended (2.6.0)
+    gemoji (3.0.1)
+    github-pages (203)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.8.5)
+      jekyll-avatar (= 0.7.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.6)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.13.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.12.1)
+      jekyll-mentions (= 1.5.1)
+      jekyll-optional-front-matter (= 0.3.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.15.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.1)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.6.1)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-leap-day (= 0.1.1)
+      jekyll-theme-merlot (= 0.1.1)
+      jekyll-theme-midnight (= 0.1.1)
+      jekyll-theme-minimal (= 0.1.1)
+      jekyll-theme-modernist (= 0.1.1)
+      jekyll-theme-primer (= 0.5.4)
+      jekyll-theme-slate (= 0.1.1)
+      jekyll-theme-tactile (= 0.1.1)
+      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-titles-from-headings (= 0.5.3)
+      jemoji (= 0.11.1)
+      kramdown (= 1.17.0)
+      liquid (= 4.0.3)
+      mercenary (~> 0.3)
+      minima (= 2.5.1)
+      nokogiri (>= 1.10.4, < 2.0)
+      rouge (= 3.13.0)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.16.1)
+      addressable (~> 2.3)
+      dnsruby (~> 1.60)
+      octokit (~> 4.0)
+      public_suffix (~> 3.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.12.2)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -33,18 +105,115 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+    jekyll-avatar (0.7.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.3.1)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-commonmark-ghpages (0.1.6)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1.2)
+      rouge (>= 2.0, < 4.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.13.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.12.1)
+      jekyll (~> 3.4)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.5.1)
+      html-pipeline (~> 2.3)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-optional-front-matter (0.3.2)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.3.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.1)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      rubyzip (>= 1.3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-swiss (1.0.0)
+    jekyll-theme-architect (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.5.4)
+      jekyll (> 3.5, < 5.0)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.3)
+      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    jemoji (0.11.1)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0, < 5.0)
     kramdown (1.17.0)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
+    mini_portile2 (2.4.0)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.13.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.7-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
@@ -53,19 +222,35 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (3.13.0)
+    ruby-enum (0.7.2)
+      i18n
+    rubyzip (2.0.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
     wdm (0.1.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
   bundler (~> 1.12)
+  github-pages
   jekyll-seo-tag
   millidocs!
   rake (~> 10.0)
diff --git a/README.md b/README.md
index 883733356..23789e6b7 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ This is an official repository of templates for devices that are flashable with
 All the devices are submitted by the awesome community built around Tasmota and [Tuya-Convert](https://github.com/ct-Open-Source/tuya-convert).
 
 ### Contributing
-[Add your device](https://blakadder.github.io/templates/new.html) with a simple Google form.
+[Add your device](https://templates.blakadder.com/new.html) with a simple Google form.
 
 If you've spotted an error or have additional information for a device click on **EDIT ON GITHUB** box to add. 
 If it's your first time refer to "[Editing Articles](https://tasmota.github.io/docs/#/Contributing?id=editing-articles)" for a tutorial. 
diff --git a/_layouts/templates.html b/_layouts/templates.html
index d96f59c49..ad0051ad1 100644
--- a/_layouts/templates.html
+++ b/_layouts/templates.html
@@ -26,6 +26,10 @@
     {{ link | append: "?tag=blakaddertemp-20" }}
   {% elsif link contains "amazon.ca" %}
     {{ link | append: "?tag=tasmotatemp03-20" }}
+  {% elsif link contains "amazon.fr" %}
+    {{ link | append: "?tag=blakaddertemp-21" }}
+  {% elsif link contains "amazon.es" %}
+    {{ link | append: "?tag=blakadderte02-21" }}
  {% else %}
     {{ link }}
   {% endif %}
@@ -45,6 +49,10 @@
     {{ link | append: "?tag=blakaddertemp-20" }}
   {% elsif link contains "amazon.ca" %}
     {{ link | append: "?tag=tasmotatemp03-20" }}
+  {% elsif link contains "amazon.fr" %}
+    {{ link | append: "?tag=blakaddertemp-21" }}
+  {% elsif link contains "amazon.es" %}
+    {{ link | append: "?tag=blakadderte02-21" }}
   {% else %}
     {{ link }}
   {% endif %}
diff --git a/_templates/YT-E003 b/_templates/YT-E003
index 58afbcbf3..97449fe7d 100644
--- a/_templates/YT-E003
+++ b/_templates/YT-E003
@@ -10,7 +10,7 @@ template: '{"NAME":"YT-E003-SP202","GPIO":[17,0,0,0,134,132,0,0,131,52,22,21,91]
 link2: https://www.aliexpress.com/i/4000134411073.html
 ---
 
-Seems to work with Template from https://blakadder.github.io/templates/digoo_NX-SP202.html
+Seems to work with Template from digoo_NX-SP202.html
 
 ![product box](https://ae01.alicdn.com/kf/H097d91b25b034c7b95ef4f4c3695c452N.jpg)
 
diff --git a/_templates/anoopsyche_AWP08L b/_templates/anoopsyche_AWP08L
index f6f89f063..62f1a454e 100644
--- a/_templates/anoopsyche_AWP08L
+++ b/_templates/anoopsyche_AWP08L
@@ -10,7 +10,7 @@ template: '{"NAME":"AWP08L-Annopsy","GPIO":[0,0,0,0,17,56,0,0,21,0,0,0,0],"FLAG"
 link2: 
 ---
 
-This device from Anoopsyche is different than the AWP08L seen at https://blakadder.github.io/templates/AWP08L.html.
+This device from Anoopsyche is different than the AWP08L seen at AWP08L.html.
 
 For this one the layout is:   
 GPIO 04: Button1   
diff --git a/_templates/asakuki b/_templates/asakuki
index 7130ea1a7..8778bed91 100644
--- a/_templates/asakuki
+++ b/_templates/asakuki
@@ -4,7 +4,7 @@ title: Asakuki 500ml
 category: misc
 type: Aromatherapy Diffuser
 standard: us
-link: https://www.amazon.ca/ASAKUKI-Humidifier-Compatible-Ultrasonic-Aromatherapy/dp/B07KXF76MJ/ref=sr_1_1_sspa?keywords=humidifier+wifi&qid=1566207577&s=gateway&sr=8-1-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEyMlJLQ1FSRDdKS0wzJmVuY3J5cHRlZElkPUEwMzgwNTYzM0VVSVUxWjFVNEs2RyZlbmNyeXB0ZWRBZElkPUEwNTIzOTIyU0Y3QlRFVE5aWU1MJndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ==
+link: https://www.amazon.ca/ASAKUKI-Humidifier-Compatible-Ultrasonic-Aromatherapy/dp/B07KXF76MJ/
 image: https://images-na.ssl-images-amazon.com/images/I/61cQ91J%2BBXL._SL1500_.jpg
 template: '{"NAME":"Oil Diffuser","GPIO":[255,255,255,255,255,255,0,0,255,255,255,21,22],"FLAG":0,"BASE":18}' 
 link2: 
diff --git a/_templates/blitzwolf_BW-SS1 b/_templates/blitzwolf_BW-SS1
index 644330465..628034ad7 100644
--- a/_templates/blitzwolf_BW-SS1
+++ b/_templates/blitzwolf_BW-SS1
@@ -11,7 +11,7 @@ link2:
 link3: https://www.blitzwolf.com/BlitzWolf-BW-SS1-WiFi-Smart-Switch-Controller-15A3300W-Maximum-Load-with-Remote-Control,-Timer,-Voice-Control,-State-Feedback-and-Device-Sharing-p-359.html
 ---
 
-ESP module serial and IO0 same as https://blakadder.github.io/templates/blitzwolf_SHP2.html
+ESP module serial and IO0 same as blitzwolf_SHP2.html
 
 
 
diff --git a/_templates/blitzwolf_SHP2 b/_templates/blitzwolf_SHP2
index f32145d20..e19f4d1de 100644
--- a/_templates/blitzwolf_SHP2
+++ b/_templates/blitzwolf_SHP2
@@ -10,7 +10,7 @@ link2: https://www.aliexpress.com/item/32871562977.html
 link3: https://www.blitzwolf.com/3840W-EU-WIFI-Smart-Socket-p-244.html
 ---
 ## Attention
-There is a [newer hardware revision (v2.3)](https://github.com/arendst/Tasmota/issues/4303) which is supported too. It needs to be configured as [Gosund SP1 v23 (55)](https://blakadder.github.io/templates/gosund_SP1.html).
+There is a [newer hardware revision (v2.3)](https://github.com/arendst/Tasmota/issues/4303) which is supported too. It needs to be configured as [Gosund SP1 v23 (55)](gosund_SP1.html).
 
 ## OTA Flashing 
 Since SHP2 is one of those Tuya based devices this OTA Tasmota installation method works just fine:
diff --git a/_templates/cleverio_smart_filament b/_templates/cleverio_smart_filament
index b491250b5..6d63c0903 100644
--- a/_templates/cleverio_smart_filament
+++ b/_templates/cleverio_smart_filament
@@ -11,4 +11,4 @@ category: bulb
 type: Filament
 standard: e27
 ---
-Seems to be the same OEM product as [Merkury Innovations A19 Edison Bulb](https://blakadder.github.io/templates/merkury_innovations_A19_edison.html)
+Seems to be the same OEM product as [Merkury Innovations A19 Edison Bulb](merkury_innovations_A19_edison.html)
diff --git a/_templates/koogeek_kloe4 b/_templates/koogeek_kloe4
index 07c90a931..062d4bd9f 100644
--- a/_templates/koogeek_kloe4
+++ b/_templates/koogeek_kloe4
@@ -10,7 +10,7 @@ template: '{"NAME":"Koogeek KLOE4","GPIO":[0,56,0,17,22,21,0,0,23,24,25,0,0],"FL
 link2: 
 ---
 
-Seems to be identical to [https://blakadder.github.io/templates/geekbes4socket.html](https://blakadder.github.io/templates/geekbes4socket.html)
+Seems to be identical to [geekbes4socket.html](geekbes4socket.html)
 
 
 
diff --git a/_templates/moes-DS01-1 b/_templates/moes-DS01-1
index cd61126a2..40dbf2d08 100644
--- a/_templates/moes-DS01-1
+++ b/_templates/moes-DS01-1
@@ -62,7 +62,7 @@ Attach the GPIO0 wire to ground during initial boot to flash.  A 3-pin header br
 Product Links:
 
 - [Oittm](https://www.amazon.com/gp/product/B07D127YL5)
-- [Moes DS01](https://www.amazon.com/gp/product/B07DRG19S6) ([Template](https://blakadder.github.io/templates/moes_DS01.html))
+- [Moes DS01](https://www.amazon.com/gp/product/B07DRG19S6) ([Template](moes_DS01.html))
 - [Konesky](https://www.amazon.fr/gp/product/B07L3LNVG1/)
 - [Heygo](https://www.amazon.com/gp/product/B07JG6T1G8/)
 
diff --git a/_templates/sonoff_Pow b/_templates/sonoff_Pow
index 4ad8a9dee..190a239bd 100644
--- a/_templates/sonoff_Pow
+++ b/_templates/sonoff_Pow
@@ -8,7 +8,7 @@ image: https://user-images.githubusercontent.com/5904370/57881237-139fbb80-7821-
 template: '{"NAME":"Sonoff Pow","GPIO":[17,0,0,0,0,130,0,0,21,132,133,52,0],"FLAG":0,"BASE":6}' 
 link: https://www.banggood.com/SONOFF-POW-DIY-WIFI-Long-Distance-Power-Monitor-Current-Tester-Remote-Control-Switch-Socket-For-Smart-Home-p-1186730.html
 ---
-Sonoff Pow has been obsoleted with [Sonoff Pow R2](https://blakadder.github.io/templates/sonoff_Pow_R2.html). Before configuring your device check which revision you have.
+Sonoff Pow has been obsoleted with [Sonoff Pow R2](sonoff_Pow_R2.html). Before configuring your device check which revision you have.
 
 ## ⚠️️Special Attention   ⚠️️
 
diff --git a/_templates/sonoff_dual b/_templates/sonoff_dual
index 8993362a4..c9d518e7a 100644
--- a/_templates/sonoff_dual
+++ b/_templates/sonoff_dual
@@ -9,7 +9,7 @@ template: '{"NAME":"Sonoff Dual","GPIO":[0,148,0,149,255,0,0,0,0,56,255,0,0],"FL
 link: 
 link2: 
 ---
-Sonoff Dual has been obsoleted by [Sonoff Dual R2](https://blakadder.github.io/templates/sonoff_dual_R2.html). Before configuring your device check which revision you have since there are significant differences in how they operate.
+Sonoff Dual has been obsoleted by [Sonoff Dual R2](sonoff_dual_R2.html). Before configuring your device check which revision you have since there are significant differences in how they operate.
 
 ## Serial Flashing
 Please see the [Hardware Preparation](https://tasmota.github.io/docs/#/installation/Hardware-Preparation) page for general instructions.
diff --git a/_templates/teckin-sp20 b/_templates/teckin-sp20
index 47e1436f2..f019aee05 100644
--- a/_templates/teckin-sp20
+++ b/_templates/teckin-sp20
@@ -14,7 +14,7 @@ Alternative template
 
 `{"NAME":"Teckin SP20","GPIO":[57,0,0,131,0,134,0,0,21,17,132,56,0],"FLAG":0,"BASE":18}`
 
-There is already a template loaded into the sonoff-basic firmware for the Teckin SP20. That firmware was causing my outlet to turn on and off. I also realized that my device looked slightly different that the one pictured on the Amazon page and in this db. I took this to mean the pin assignments were for a different version of the SP20. I went to blakadder's tasmota template db and located a identical looking model made by Waga Life https://blakadder.github.io/templates/waga_CHCZ02MB.html. The template worked perfectly for my device and wanted to share it in case anyone else has the same issue. 
+There is already a template loaded into the sonoff-basic firmware for the Teckin SP20. That firmware was causing my outlet to turn on and off. I also realized that my device looked slightly different that the one pictured on the Amazon page and in this db. I took this to mean the pin assignments were for a different version of the SP20. I went to blakadder's tasmota template db and located a identical looking model made by Waga Life waga_CHCZ02MB.html. The template worked perfectly for my device and wanted to share it in case anyone else has the same issue. 
 
 I can share photos of my device or more information if needed. Feel free to contact me on Discord @Joshin#4762
 
diff --git a/_templates/tellur_TLL331031 b/_templates/tellur_TLL331031
index 8dc355981..34ad8bfed 100644
--- a/_templates/tellur_TLL331031
+++ b/_templates/tellur_TLL331031
@@ -10,7 +10,7 @@ template: '{"NAME":"Tellur","GPIO":[0,56,0,17,22,21,0,0,0,23,24,0,0],"FLAG":1,"B
 link2: https://www.tellur.com/product/wifi-power-strip-3-outlets-4usb-4a-2200w-10a-1-8m/#prettyPhoto
 ---
 
-Identical in appearance and template to [https://blakadder.github.io/templates/aofo_3AC4USB.html](https://blakadder.github.io/templates/aofo_3AC4USB.html) and [https://blakadder.github.io/templates/nedis_WIFIP310FWT.html](https://blakadder.github.io/templates/nedis_WIFIP310FWT.htm)
+Identical in appearance and template to [aofo_3AC4USB.html](aofo_3AC4USB.html) and [nedis_WIFIP310FWT.html](nedis_WIFIP310FWT.htm)
 
 Flashed using kueblc's enhance-api branch according to [https://github.com/ct-Open-Source/tuya-convert/issues/201](https://github.com/ct-Open-Source/tuya-convert/issues/201)
 
diff --git a/_templates/woox_R4028 b/_templates/woox_R4028
index 0de3bbac8..6382bd676 100644
--- a/_templates/woox_R4028
+++ b/_templates/woox_R4028
@@ -10,7 +10,7 @@ template: '{"NAME":"Woox R4028","GPIO":[0,56,0,17,23,22,0,0,0,24,21,0,0],"FLAG":
 link2: 
 ---
 
-Seems to be identical to: https://blakadder.github.io/templates/geekbes_4socket.html
+Seems to be identical to: geekbes_4socket.html
 
 Button controls single relay only. Rule to emulate original button behaviour (make sure to have all relays set to off before adding the rule,  from then on it should work correctly across restarts):
 ```