diff --git a/coordinators.html b/coordinators.html
index 7934a8ed7..721cbc216 100644
--- a/coordinators.html
+++ b/coordinators.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "coordinator" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/covers.html b/covers.html
index 3b8b433ea..04053b070 100644
--- a/covers.html
+++ b/covers.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "cover" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/deconz.html b/deconz.html
index 507a2dcb9..27dcb182f 100644
--- a/deconz.html
+++ b/deconz.html
@@ -12,7 +12,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/dimmers.html b/dimmers.html
index b2002680e..235503bd2 100644
--- a/dimmers.html
+++ b/dimmers.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "dimmer" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/hvac.html b/hvac.html
index 8568cef25..f4a990515 100644
--- a/hvac.html
+++ b/hvac.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "hvac" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/iobroker.html b/iobroker.html
index f6b13ffaf..906053541 100644
--- a/iobroker.html
+++ b/iobroker.html
@@ -12,7 +12,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/lights.html b/lights.html
index ff1de4bac..248c618d8 100644
--- a/lights.html
+++ b/lights.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "light" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/locks.html b/locks.html
index 411331f67..435bae70e 100644
--- a/locks.html
+++ b/locks.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "lock" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/plugs.html b/plugs.html
index 8e001823c..882fca444 100644
--- a/plugs.html
+++ b/plugs.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "plug" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/remotes.html b/remotes.html
index 36a64b8f6..9abc1c2a6 100644
--- a/remotes.html
+++ b/remotes.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "remote" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/routers.html b/routers.html
index 8c809c01d..1f0a46733 100644
--- a/routers.html
+++ b/routers.html
@@ -9,7 +9,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "router" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/sensors.html b/sensors.html
index 5b6f8f6fa..c85eb5d77 100644
--- a/sensors.html
+++ b/sensors.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "sensor" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/switches.html b/switches.html
index ac3f07933..e3570852b 100644
--- a/switches.html
+++ b/switches.html
@@ -7,7 +7,7 @@ <h2>{{ page.title }}</h2>
 <!-- ######################################################################  -->
 {% assign categories = site.zigbee | where: "category", "switch" %}
 {% assign vendor = categories | group_by: 'vendor' %} 
-{% assign vendors = vendor | sort: 'name' %} 
+{% assign vendors = vendor | sort_natural: 'name' %} 
 <table>
     <tbody>
     {% for type in vendors %}
diff --git a/zha.html b/zha.html
index 143f13947..de34a977d 100644
--- a/zha.html
+++ b/zha.html
@@ -12,7 +12,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/zigate.html b/zigate.html
index ce07a3adf..54eefcf28 100644
--- a/zigate.html
+++ b/zigate.html
@@ -12,7 +12,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/zigbee2mqtt.html b/zigbee2mqtt.html
index 1f7f884fa..df52051d3 100644
--- a/zigbee2mqtt.html
+++ b/zigbee2mqtt.html
@@ -12,7 +12,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}
diff --git a/zigbee2tasmota.html b/zigbee2tasmota.html
index d9401c4e3..2b433f1c8 100644
--- a/zigbee2tasmota.html
+++ b/zigbee2tasmota.html
@@ -13,7 +13,7 @@ <h3> {{ type.name | capitalize }} </h3>
     <table>
         <tbody>
         {% assign vendor = type.items | group_by: 'vendor' %} 
-        {% assign vendors = vendor | sort: 'name' %} 
+        {% assign vendors = vendor | sort_natural: 'name' %} 
         {% for type in vendors %}
         {% assign type_sorted = type.items | sort_natural: 'title' %}     
         {% for template in type_sorted %}