diff --git a/Templates.md b/Templates.md
index 2367948d..a0657523 100644
--- a/Templates.md
+++ b/Templates.md
@@ -215,30 +215,30 @@ The following table lists hard-coded device specific functionality. Notice that
 
 BASE | Module         | Description
 -----|----------------|----------------------------------------------
-   4 | Sonoff Dual    | Process relay and button via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps. Process buttons as single press only
-   9 | Sonoff Touch   | Invert ledstate 1 functionality
-  10 | Sonoff LED     | Set light type to 2 PWM channels disregarding SetOption15. Fix device specific LED instabilities by disabling GPIO04, GPIO5 and GPIO14
-  12 | 4 Channel      | See 4
-  13 | Motor C/AC     | Force all relays ON at Power On and disable command ``PowerOnState``
-  15 | EXS Relay(s)   | Enable pulse latching using even/odd numbered relay pairs
+   5 | Sonoff Dual    | Process relay and button via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps. Process buttons as single press only
+  10 | Sonoff Touch   | Invert ledstate 1 functionality
+  11 | Sonoff LED     | Set light type to 2 PWM channels disregarding SetOption15. Fix device specific LED instabilities by disabling GPIO04, GPIO5 and GPIO14
+  13 | 4 Channel      | See 4
+  14 | Motor C/AC     | Force all relays ON at Power On and disable command ``PowerOnState``
+  16 | EXS Relay(s)   | Enable pulse latching using even/odd numbered relay pairs
   18 | Generic        | Show Wemos specific pin information in GUI
-  19 | H801           | Change hardware UART Tx from GPIO01 to GPIO02
-  20 | Sonoff SC      | Enable and Process data via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps
-  21 | Sonoff BN-SZ   | Set light type to 1 PWM channel disregarding SetOption15
-  22 | Sonoff 4CH Pro | Button handling disregarding SetOption13 only allowing single press to enable RF learning while holding the button
-  24 | Sonoff Bridge  | Enable and Process data via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps. Process 16 buttons in web GUI. Enable EFM8BB1 firmware upload
-  25 | Sonoff B1      | Set light type to RGBWC using MY92x1
-  26 | AiLight        | Set light type to RGBW using MY92x1
-  27 | Sonoff T1 1CH  | See 9
-  28 | Sonoff T1 2CH  | See 9
-  29 | Sonoff T1 3CH  | See 9
-  38 | Sonoff Dual R2 | Process buttons as single press only
-  43 | Sonoff iFan02  | Enable command ``Fanspeed``. Disable Interlock and PulseTime. Tune status information, MQTT data and GUI. Sync with microcontroller. Process Domoticz Fan state
+  20 | H801           | Change hardware UART Tx from GPIO01 to GPIO02
+  21 | Sonoff SC      | Enable and Process data via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps
+  22 | Sonoff BN-SZ   | Set light type to 1 PWM channel disregarding SetOption15
+  23 | Sonoff 4CH Pro | Button handling disregarding SetOption13 only allowing single press to enable RF learning while holding the button
+  25 | Sonoff Bridge  | Enable and Process data via hardware serial interface using GPIO01 and GPIO03. Change baudrate to 19200 bps. Process 16 buttons in web GUI. Enable EFM8BB1 firmware upload
+  26 | Sonoff B1      | Set light type to RGBWC using MY92x1
+  27 | AiLight        | Set light type to RGBW using MY92x1
+  28 | Sonoff T1 1CH  | See 9
+  29 | Sonoff T1 2CH  | See 9
+  30 | Sonoff T1 3CH  | See 9
+  39 | Sonoff Dual R2 | Process buttons as single press only
+  44 | Sonoff iFan02  | Enable command ``Fanspeed``. Disable Interlock and PulseTime. Tune status information, MQTT data and GUI. Sync with microcontroller. Process Domoticz Fan state
   45 | BlitzWolf SHP  | Module specific power monitoring calibration
-  47 | Xiaomi Philips | Process Color Temperature using PWM2 and Intensity using PWM1
-  53 | Tuya Dimmer    | Enable and Process data via software or hardware serial interface using GPIO 148 and 149 or forced GPIO01 and GPIO03. Change baudrate to 9600 bps. Process all Buttons
-  55 | ARMTR Dimmer   | Enable and Process data via software or hardware serial interface using GPIO 148 and 149. Change baudrate to 115200 bps.
-  57 | PS-16-DZ       | Enable and Process data via software or hardware serial interface using GPIO 148 and 149. Change baudrate to 19200 bps.
-  61 | YTF IR Bridge  | Disable serial interface to stop loopback
-  65 | Mi Desk Lamp   | Process rotary and Button1 data specific to this device
+  48 | Xiaomi Philips | Process Color Temperature using PWM2 and Intensity using PWM1
+  54 | Tuya Dimmer    | Enable and Process data via software or hardware serial interface using GPIO 148 and 149 or forced GPIO01 and GPIO03. Change baudrate to 9600 bps. Process all Buttons
+  56 | ARMTR Dimmer   | Enable and Process data via software or hardware serial interface using GPIO 148 and 149. Change baudrate to 115200 bps.
+  58 | PS-16-DZ       | Enable and Process data via software or hardware serial interface using GPIO 148 and 149. Change baudrate to 19200 bps.
+  62 | YTF IR Bridge  | Disable serial interface to stop loopback
+  66 | Mi Desk Lamp   | Process rotary and Button1 data specific to this device