diff --git a/assets/device/classes.json b/assets/device/classes.json
index 2f23c2b6..9026b105 100755
--- a/assets/device/classes.json
+++ b/assets/device/classes.json
@@ -23,5 +23,52 @@
   "thermostat",
   "tv",
   "vacuumcleaner",
-  "windowcoverings"
-]
\ No newline at end of file
+  "windowcoverings",
+  "airconditioning",
+  "bicycle",
+  "battery",
+  "car",
+  "boiler",
+  "dehumidifier",
+  "dishwasher",
+  "diffuser",
+  "evcharger",
+  "dryer",
+  "cooktop",
+  "faucet",
+  "fireplace",
+  "freezer",
+  "fridge_and_freezer",
+  "fridge",
+  "gameconsole",
+  "grill",
+  "heatpump",
+  "hood",
+  "humidifier",
+  "mediaplayer",
+  "airtreatment",
+  "lawnmower",
+  "mop",
+  "oven",
+  "multicooker",
+  "airpurifier",
+  "petfeeder",
+  "scooter",
+  "radiator",
+  "settopbox",
+  "shutterblinds",
+  "fryer",
+  "smokealarm",
+  "vehicle",
+  "washer",
+  "airfryer",
+  "washer_and_dryer",
+  "waterpurifier",
+  "waterheater",
+  "oven_and_microwave",
+  "microwave",
+  "watervalve",
+  "sprinkler",
+  "siren",
+  "networkrouter"
+]
diff --git a/assets/device/classes/airconditioning.json b/assets/device/classes/airconditioning.json
new file mode 100644
index 00000000..75a4a229
--- /dev/null
+++ b/assets/device/classes/airconditioning.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Airconditioning"
+  },
+  "description": {
+    "en": "Use this device class for airconditioners, either portable or split type units."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/airfryer.json b/assets/device/classes/airfryer.json
new file mode 100644
index 00000000..a9092034
--- /dev/null
+++ b/assets/device/classes/airfryer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Air Fryer"
+  },
+  "description": {
+    "en": "Use this device class for air fryers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/airpurifier.json b/assets/device/classes/airpurifier.json
new file mode 100644
index 00000000..d6faa0e2
--- /dev/null
+++ b/assets/device/classes/airpurifier.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Air Purifier"
+  },
+  "description": {
+    "en": "Use this device class for air purifiers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/airtreatment.json b/assets/device/classes/airtreatment.json
new file mode 100644
index 00000000..e3f54ec9
--- /dev/null
+++ b/assets/device/classes/airtreatment.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Air Treatment"
+  },
+  "description": {
+    "en": "Use this device class for any type of air treatment appliance, when the `dehumidifier`, `humidifier`, `diffuser` or `airpurifier` device class doesn't apply. Could be for combi units."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/battery.json b/assets/device/classes/battery.json
new file mode 100644
index 00000000..a44931cb
--- /dev/null
+++ b/assets/device/classes/battery.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Battery"
+  },
+  "description": {
+    "en": "Use this device for batteries, e.g. home battery storage."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/bicycle.json b/assets/device/classes/bicycle.json
new file mode 100644
index 00000000..9215a30e
--- /dev/null
+++ b/assets/device/classes/bicycle.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Bicycle"
+  },
+  "description": {
+    "en": "Use this device class for bicycles."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/boiler.json b/assets/device/classes/boiler.json
new file mode 100644
index 00000000..a61343ba
--- /dev/null
+++ b/assets/device/classes/boiler.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Boiler"
+  },
+  "description": {
+    "en": "Use this device class for any kind of boiler, e.g. heatpump boiler, gas boiler, hot water boiler, central heating boiler."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/car.json b/assets/device/classes/car.json
new file mode 100644
index 00000000..bbf7172a
--- /dev/null
+++ b/assets/device/classes/car.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Car"
+  },
+  "description": {
+    "en": "Use this device class for any kind of car."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/cooktop.json b/assets/device/classes/cooktop.json
new file mode 100644
index 00000000..04a734eb
--- /dev/null
+++ b/assets/device/classes/cooktop.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Cooktop"
+  },
+  "description": {
+    "en": "Use this device class for cooktops."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/dehumidifier.json b/assets/device/classes/dehumidifier.json
new file mode 100644
index 00000000..0d83c02d
--- /dev/null
+++ b/assets/device/classes/dehumidifier.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Dehumidifier"
+  },
+  "description": {
+    "en": "Use this device class for dehumidifiers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/diffuser.json b/assets/device/classes/diffuser.json
new file mode 100644
index 00000000..f51cd58c
--- /dev/null
+++ b/assets/device/classes/diffuser.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Diffuser"
+  },
+  "description": {
+    "en": "User this device class for diffusers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/dishwasher.json b/assets/device/classes/dishwasher.json
new file mode 100644
index 00000000..4bb58ba7
--- /dev/null
+++ b/assets/device/classes/dishwasher.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Dishwasher"
+  },
+  "description": {
+    "en": "Use this device class for dishwashers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/dryer.json b/assets/device/classes/dryer.json
new file mode 100644
index 00000000..f26d7a28
--- /dev/null
+++ b/assets/device/classes/dryer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Dryer"
+  },
+  "description": {
+    "en": "Use this device class for dryers, if it is a combination washer/dryer use 'washer_and_dryer'."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/evcharger.json b/assets/device/classes/evcharger.json
new file mode 100644
index 00000000..7bc7ef95
--- /dev/null
+++ b/assets/device/classes/evcharger.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "EV Charger"
+  },
+  "description": {
+    "en": "Use this device class for EV chargers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/faucet.json b/assets/device/classes/faucet.json
new file mode 100644
index 00000000..52f18314
--- /dev/null
+++ b/assets/device/classes/faucet.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Faucet"
+  },
+  "description": {
+    "en": "Use this device class for faucets."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/fireplace.json b/assets/device/classes/fireplace.json
new file mode 100644
index 00000000..60fb78f5
--- /dev/null
+++ b/assets/device/classes/fireplace.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Fireplace"
+  },
+  "description": {
+    "en": "Use this device class for fireplaces."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/freezer.json b/assets/device/classes/freezer.json
new file mode 100644
index 00000000..255d1876
--- /dev/null
+++ b/assets/device/classes/freezer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Freezer"
+  },
+  "description": {
+    "en": "Use this device class for any kind of freezer, if it is a frigde/freezer use 'fridge_and_freezer'."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/fridge.json b/assets/device/classes/fridge.json
new file mode 100644
index 00000000..5f949c6d
--- /dev/null
+++ b/assets/device/classes/fridge.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Fridge"
+  },
+  "description": {
+    "en": "Use this device class for any kind of fridge, if it is a fridge/freezer use 'fridge_and_freezer'."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/fridge_and_freezer.json b/assets/device/classes/fridge_and_freezer.json
new file mode 100644
index 00000000..42ee23d0
--- /dev/null
+++ b/assets/device/classes/fridge_and_freezer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Fridge & Freezer"
+  },
+  "description": {
+    "en": "Use this device class for any kind of refrigerator that also has a freezer."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/fryer.json b/assets/device/classes/fryer.json
new file mode 100644
index 00000000..1e2a7658
--- /dev/null
+++ b/assets/device/classes/fryer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Fryer"
+  },
+  "description": {
+    "en": "Use this device class for fryers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/gameconsole.json b/assets/device/classes/gameconsole.json
new file mode 100644
index 00000000..c0b16549
--- /dev/null
+++ b/assets/device/classes/gameconsole.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Game Console"
+  },
+  "description": {
+    "en": "Use this device class for any type of game console."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/grill.json b/assets/device/classes/grill.json
new file mode 100644
index 00000000..2dd053dc
--- /dev/null
+++ b/assets/device/classes/grill.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Grill"
+  },
+  "description": {
+    "en": "Use this device class for grills."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/heatpump.json b/assets/device/classes/heatpump.json
new file mode 100644
index 00000000..fc7bc9f1
--- /dev/null
+++ b/assets/device/classes/heatpump.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Heat Pump"
+  },
+  "description": {
+    "en": "Use this device class for heat pumps."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/hood.json b/assets/device/classes/hood.json
new file mode 100644
index 00000000..f9c34ad4
--- /dev/null
+++ b/assets/device/classes/hood.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Hood"
+  },
+  "description": {
+    "en": "User this device class for any kind of extractor hood."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/humidifier.json b/assets/device/classes/humidifier.json
new file mode 100644
index 00000000..aee2ac43
--- /dev/null
+++ b/assets/device/classes/humidifier.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Humidifier"
+  },
+  "description": {
+    "en": "Use this device class for humidifiers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/lawnmower.json b/assets/device/classes/lawnmower.json
new file mode 100644
index 00000000..740ce861
--- /dev/null
+++ b/assets/device/classes/lawnmower.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Lawn Mower"
+  },
+  "description": {
+    "en": "Use this device class for lawn mowers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/mediaplayer.json b/assets/device/classes/mediaplayer.json
new file mode 100644
index 00000000..1223f857
--- /dev/null
+++ b/assets/device/classes/mediaplayer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Media Player"
+  },
+  "description": {
+    "en": "Use this device class for media players, when the `Set-top box` device class doesn't apply."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/microwave.json b/assets/device/classes/microwave.json
new file mode 100644
index 00000000..2254e530
--- /dev/null
+++ b/assets/device/classes/microwave.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Microwave"
+  },
+  "description": {
+    "en": "Use this device class for any kind of microwave, if it is a combi unit use 'combi_microwave'."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/mop.json b/assets/device/classes/mop.json
new file mode 100644
index 00000000..b890b64d
--- /dev/null
+++ b/assets/device/classes/mop.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Mop"
+  },
+  "description": {
+    "en": "Use this device class for mops, e.g. a robot mop."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/multicooker.json b/assets/device/classes/multicooker.json
new file mode 100644
index 00000000..8636ffe9
--- /dev/null
+++ b/assets/device/classes/multicooker.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Multicooker"
+  },
+  "description": {
+    "en": "Use this device class for multicookers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/networkrouter.json b/assets/device/classes/networkrouter.json
new file mode 100644
index 00000000..e404ab62
--- /dev/null
+++ b/assets/device/classes/networkrouter.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Network Router"
+  },
+  "description": {
+    "en": "Use this device class for routers or modems."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/oven.json b/assets/device/classes/oven.json
new file mode 100644
index 00000000..dddc2626
--- /dev/null
+++ b/assets/device/classes/oven.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Oven"
+  },
+  "description": {
+    "en": "Use this device class for ovens."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/oven_and_microwave.json b/assets/device/classes/oven_and_microwave.json
new file mode 100644
index 00000000..47a14e85
--- /dev/null
+++ b/assets/device/classes/oven_and_microwave.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Combi Microwave Oven"
+  },
+  "description": {
+    "en": "Use this device class for combination microwave ovens."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/petfeeder.json b/assets/device/classes/petfeeder.json
new file mode 100644
index 00000000..d7103c3b
--- /dev/null
+++ b/assets/device/classes/petfeeder.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Pet Feeder"
+  },
+  "description": {
+    "en": "Use this device class for pet feeders."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/radiator.json b/assets/device/classes/radiator.json
new file mode 100644
index 00000000..882ba943
--- /dev/null
+++ b/assets/device/classes/radiator.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Radiator"
+  },
+  "description": {
+    "en": "Use this device class for radiators."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/scooter.json b/assets/device/classes/scooter.json
new file mode 100644
index 00000000..fa506593
--- /dev/null
+++ b/assets/device/classes/scooter.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Scooter"
+  },
+  "description": {
+    "en": "Use this device class for scooters."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/settopbox.json b/assets/device/classes/settopbox.json
new file mode 100644
index 00000000..8fdd3716
--- /dev/null
+++ b/assets/device/classes/settopbox.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Set-top Box"
+  },
+  "description": {
+    "en": "Use this device class for set-top boxes."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/shutterblinds.json b/assets/device/classes/shutterblinds.json
new file mode 100644
index 00000000..c5a91901
--- /dev/null
+++ b/assets/device/classes/shutterblinds.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Shutter Blinds"
+  },
+  "description": {
+    "en": "Use this device class for shutter blinds."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/siren.json b/assets/device/classes/siren.json
new file mode 100644
index 00000000..6950611c
--- /dev/null
+++ b/assets/device/classes/siren.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Siren"
+  },
+  "description": {
+    "en": "Use this device class for sirens."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/smokealarm.json b/assets/device/classes/smokealarm.json
new file mode 100644
index 00000000..99bf8e2a
--- /dev/null
+++ b/assets/device/classes/smokealarm.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Smoke Alarm"
+  },
+  "description": {
+    "en": "Use this device class for any smoke- or CO-alarm, could also be used for combo units."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/sprinkler.json b/assets/device/classes/sprinkler.json
new file mode 100644
index 00000000..185c773a
--- /dev/null
+++ b/assets/device/classes/sprinkler.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Sprinkler"
+  },
+  "description": {
+    "en": "Use this device class for sprinkler systems."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/vehicle.json b/assets/device/classes/vehicle.json
new file mode 100644
index 00000000..b70aea0e
--- /dev/null
+++ b/assets/device/classes/vehicle.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Vehicle"
+  },
+  "description": {
+    "en": "Use this device class for any type of vehicle, when the `car`, `bicycle` or `scooter` device class doesn't apply."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/washer.json b/assets/device/classes/washer.json
new file mode 100644
index 00000000..01091cf2
--- /dev/null
+++ b/assets/device/classes/washer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Washer"
+  },
+  "description": {
+    "en": "Use this device class for washing machines, if it is a combination washer/dryer use 'washer_and_dryer'."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/washer_and_dryer.json b/assets/device/classes/washer_and_dryer.json
new file mode 100644
index 00000000..869bc9ee
--- /dev/null
+++ b/assets/device/classes/washer_and_dryer.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Washer & Dryer"
+  },
+  "description": {
+    "en": "Use this device class for any kind of washer and dryer combination."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/waterheater.json b/assets/device/classes/waterheater.json
new file mode 100644
index 00000000..1c06f087
--- /dev/null
+++ b/assets/device/classes/waterheater.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Water Heater"
+  },
+  "description": {
+    "en": "Use this device class for water heaters."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/waterpurifier.json b/assets/device/classes/waterpurifier.json
new file mode 100644
index 00000000..c429023b
--- /dev/null
+++ b/assets/device/classes/waterpurifier.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Water Purifier"
+  },
+  "description": {
+    "en": "Use this device class for water purifiers."
+  }
+}
\ No newline at end of file
diff --git a/assets/device/classes/watervalve.json b/assets/device/classes/watervalve.json
new file mode 100644
index 00000000..f8dd8122
--- /dev/null
+++ b/assets/device/classes/watervalve.json
@@ -0,0 +1,8 @@
+{
+  "title": {
+    "en": "Water Valve"
+  },
+  "description": {
+    "en": "Use this device class for mechanical water valves."
+  }
+}
\ No newline at end of file
diff --git a/generated_locales/en.json b/generated_locales/en.json
index 9ea919dd..e86c7abc 100644
--- a/generated_locales/en.json
+++ b/generated_locales/en.json
@@ -363,43 +363,123 @@
   "./assets/capability/capabilities/windowcoverings_tilt_set.json@title": "Window coverings tilt set",
   "./assets/capability/capabilities/windowcoverings_tilt_set.json@units": "%",
   "./assets/capability/capabilities/windowcoverings_tilt_up.json@title": "Window coverings tilt up",
+  "./assets/device/classes/airconditioning.json@title": "Airconditioning",
+  "./assets/device/classes/airconditioning.json@description": "Use this device class for airconditioners, either portable or split type units.",
+  "./assets/device/classes/airfryer.json@title": "Air Fryer",
+  "./assets/device/classes/airfryer.json@description": "Use this device class for air fryers.",
+  "./assets/device/classes/airpurifier.json@title": "Air Purifier",
+  "./assets/device/classes/airpurifier.json@description": "Use this device class for air purifiers.",
+  "./assets/device/classes/airtreatment.json@title": "Air Treatment",
+  "./assets/device/classes/airtreatment.json@description": "Use this device class for any type of air treatment appliance, when the `dehumidifier`, `humidifier`, `diffuser` or `airpurifier` device class doesn't apply. Could be for combi units.",
   "./assets/device/classes/amplifier.json@title": "Amplifier",
   "./assets/device/classes/amplifier.json@description": "Use this device class for audio amplifier devices.",
+  "./assets/device/classes/battery.json@title": "Battery",
+  "./assets/device/classes/battery.json@description": "Use this device for batteries, e.g. home battery storage.",
+  "./assets/device/classes/bicycle.json@title": "Bicycle",
+  "./assets/device/classes/bicycle.json@description": "Use this device class for bicycles.",
   "./assets/device/classes/blinds.json@title": "Blinds",
   "./assets/device/classes/blinds.json@description": "Use this device class for blinds, both horizontal and vertical.",
+  "./assets/device/classes/boiler.json@title": "Boiler",
+  "./assets/device/classes/boiler.json@description": "Use this device class for any kind of boiler, e.g. heatpump boiler, gas boiler, hot water boiler, central heating boiler.",
   "./assets/device/classes/button.json@title": "Button",
   "./assets/device/classes/button.json@description": "Use this device class for buttons, such as a remote.",
   "./assets/device/classes/camera.json@title": "Camera",
   "./assets/device/classes/camera.json@description": "Security camera",
+  "./assets/device/classes/car.json@title": "Car",
+  "./assets/device/classes/car.json@description": "Use this device class for any kind of car.",
   "./assets/device/classes/coffeemachine.json@title": "Coffee Machine",
   "./assets/device/classes/coffeemachine.json@description": "Use this device class for coffee machines.",
+  "./assets/device/classes/cooktop.json@title": "Cooktop",
+  "./assets/device/classes/cooktop.json@description": "Use this device class for cooktops.",
   "./assets/device/classes/curtain.json@title": "Curtains",
   "./assets/device/classes/curtain.json@description": "Use this device class for curtains.",
+  "./assets/device/classes/dehumidifier.json@title": "Dehumidifier",
+  "./assets/device/classes/dehumidifier.json@description": "Use this device class for dehumidifiers.",
+  "./assets/device/classes/diffuser.json@title": "Diffuser",
+  "./assets/device/classes/diffuser.json@description": "User this device class for diffusers.",
+  "./assets/device/classes/dishwasher.json@title": "Dishwasher",
+  "./assets/device/classes/dishwasher.json@description": "Use this device class for dishwashers.",
   "./assets/device/classes/doorbell.json@title": "Doorbell",
   "./assets/device/classes/doorbell.json@description": "Use this device class for doorbells, usually together with the `button` capability.",
+  "./assets/device/classes/dryer.json@title": "Dryer",
+  "./assets/device/classes/dryer.json@description": "Use this device class for dryers, if it is a combination washer/dryer use 'washer_and_dryer'.",
+  "./assets/device/classes/evcharger.json@title": "EV Charger",
+  "./assets/device/classes/evcharger.json@description": "Use this device class for EV chargers.",
   "./assets/device/classes/fan.json@title": "Fan",
   "./assets/device/classes/fan.json@description": "Use this device class for fans that cool your home.",
+  "./assets/device/classes/faucet.json@title": "Faucet",
+  "./assets/device/classes/faucet.json@description": "Use this device class for faucets.",
+  "./assets/device/classes/fireplace.json@title": "Fireplace",
+  "./assets/device/classes/fireplace.json@description": "Use this device class for fireplaces.",
+  "./assets/device/classes/freezer.json@title": "Freezer",
+  "./assets/device/classes/freezer.json@description": "Use this device class for any kind of freezer, if it is a frigde/freezer use 'fridge_and_freezer'.",
+  "./assets/device/classes/fridge.json@title": "Fridge",
+  "./assets/device/classes/fridge.json@description": "Use this device class for any kind of fridge, if it is a fridge/freezer use 'fridge_and_freezer'.",
+  "./assets/device/classes/fridge_and_freezer.json@title": "Fridge & Freezer",
+  "./assets/device/classes/fridge_and_freezer.json@description": "Use this device class for any kind of refrigerator that also has a freezer.",
+  "./assets/device/classes/fryer.json@title": "Fryer",
+  "./assets/device/classes/fryer.json@description": "Use this device class for fryers.",
+  "./assets/device/classes/gameconsole.json@title": "Game Console",
+  "./assets/device/classes/gameconsole.json@description": "Use this device class for any type of game console.",
   "./assets/device/classes/garagedoor.json@title": "Garage Door",
   "./assets/device/classes/garagedoor.json@description": "Use this device class for garage doors, usually together with the `garagedoor_closed` capability.",
+  "./assets/device/classes/grill.json@title": "Grill",
+  "./assets/device/classes/grill.json@description": "Use this device class for grills.",
   "./assets/device/classes/heater.json@title": "Heater",
   "./assets/device/classes/heater.json@description": "Use this device class for heaters, that warm your home.",
+  "./assets/device/classes/heatpump.json@title": "Heat Pump",
+  "./assets/device/classes/heatpump.json@description": "Use this device class for heat pumps.",
   "./assets/device/classes/homealarm.json@title": "Home Security",
   "./assets/device/classes/homealarm.json@description": "Use this device class for home alarm systems.",
+  "./assets/device/classes/hood.json@title": "Hood",
+  "./assets/device/classes/hood.json@description": "User this device class for any kind of extractor hood.",
+  "./assets/device/classes/humidifier.json@title": "Humidifier",
+  "./assets/device/classes/humidifier.json@description": "Use this device class for humidifiers.",
   "./assets/device/classes/kettle.json@title": "Kettle",
   "./assets/device/classes/kettle.json@description": "Use this device class for kettle devices, that can heat water.",
+  "./assets/device/classes/lawnmower.json@title": "Lawn Mower",
+  "./assets/device/classes/lawnmower.json@description": "Use this device class for lawn mowers.",
   "./assets/device/classes/light.json@title": "Light",
   "./assets/device/classes/light.json@description": "Use this device class for lights, usually together with the `onoff`, `dim` and `light_*` capabilities.",
   "./assets/device/classes/lock.json@title": "Lock",
   "./assets/device/classes/lock.json@description": "Use this device class for lock devices, usually together with the `locked` and `lock_mode` capabilities.",
+  "./assets/device/classes/mediaplayer.json@title": "Media Player",
+  "./assets/device/classes/mediaplayer.json@description": "Use this device class for media players, when the `Set-top box` device class doesn't apply.",
+  "./assets/device/classes/microwave.json@title": "Microwave",
+  "./assets/device/classes/microwave.json@description": "Use this device class for any kind of microwave, if it is a combi unit use 'combi_microwave'.",
+  "./assets/device/classes/mop.json@title": "Mop",
+  "./assets/device/classes/mop.json@description": "Use this device class for mops, e.g. a robot mop.",
+  "./assets/device/classes/multicooker.json@title": "Multicooker",
+  "./assets/device/classes/multicooker.json@description": "Use this device class for multicookers.",
+  "./assets/device/classes/networkrouter.json@title": "Network Router",
+  "./assets/device/classes/networkrouter.json@description": "Use this device class for routers or modems.",
   "./assets/device/classes/other.json@title": "Other",
   "./assets/device/classes/other.json@description": "Use this device class for devices that do not fit any other device class.",
+  "./assets/device/classes/oven.json@title": "Oven",
+  "./assets/device/classes/oven.json@description": "Use this device class for ovens.",
+  "./assets/device/classes/oven_and_microwave.json@title": "Combi Microwave Oven",
+  "./assets/device/classes/oven_and_microwave.json@description": "Use this device class for combination microwave ovens.",
+  "./assets/device/classes/petfeeder.json@title": "Pet Feeder",
+  "./assets/device/classes/petfeeder.json@description": "Use this device class for pet feeders.",
+  "./assets/device/classes/radiator.json@title": "Radiator",
+  "./assets/device/classes/radiator.json@description": "Use this device class for radiators.",
   "./assets/device/classes/relay.json@title": "Relay",
   "./assets/device/classes/relay.json@description": "Use this device class for relays, which are connected to another device.",
   "./assets/device/classes/relay.json@virtualTitle": "What's connected?",
   "./assets/device/classes/remote.json@title": "Remote",
   "./assets/device/classes/remote.json@description": "Use this device class for (TV/Sunblind/Keyfob etc.) remotes.",
+  "./assets/device/classes/scooter.json@title": "Scooter",
+  "./assets/device/classes/scooter.json@description": "Use this device class for scooters.",
   "./assets/device/classes/sensor.json@title": "Sensor",
   "./assets/device/classes/sensor.json@description": "Use this device class for sensors, e.g. a contact or motion sensor.",
+  "./assets/device/classes/settopbox.json@title": "Set-top Box",
+  "./assets/device/classes/settopbox.json@description": "Use this device class for set-top boxes.",
+  "./assets/device/classes/shutterblinds.json@title": "Shutter Blinds",
+  "./assets/device/classes/shutterblinds.json@description": "Use this device class for shutter blinds.",
+  "./assets/device/classes/siren.json@title": "Siren",
+  "./assets/device/classes/siren.json@description": "Use this device class for sirens.",
+  "./assets/device/classes/smokealarm.json@title": "Smoke Alarm",
+  "./assets/device/classes/smokealarm.json@description": "Use this device class for any smoke- or CO-alarm, could also be used for combo units.",
   "./assets/device/classes/socket.json@title": "Wall Plug",
   "./assets/device/classes/socket.json@description": "Use this device class for sockets (built-in or plug-in socket switches). When adding the `choose_slave` pair template, the user is presented a `What's plugged in?` question.",
   "./assets/device/classes/socket.json@virtualTitle": "Plugged in",
@@ -407,6 +487,8 @@
   "./assets/device/classes/solarpanel.json@description": "Use this device class for solar panels.",
   "./assets/device/classes/speaker.json@title": "Speaker",
   "./assets/device/classes/speaker.json@description": "Use this device class for devices that can play music, usually together with the `speaker_*` capabilities.",
+  "./assets/device/classes/sprinkler.json@title": "Sprinkler",
+  "./assets/device/classes/sprinkler.json@description": "Use this device class for sprinkler systems.",
   "./assets/device/classes/sunshade.json@title": "Sunshade",
   "./assets/device/classes/sunshade.json@description": "Use this device class for sunshades (window coverings against the sun).",
   "./assets/device/classes/thermostat.json@title": "Thermostat",
@@ -415,6 +497,18 @@
   "./assets/device/classes/tv.json@description": "Use this device class for TVs.",
   "./assets/device/classes/vacuumcleaner.json@title": "Vacuum Cleaner",
   "./assets/device/classes/vacuumcleaner.json@description": "Use this device class for vacuum cleaners, usually together with the `vacuumcleaner_state` capability.",
+  "./assets/device/classes/vehicle.json@title": "Vehicle",
+  "./assets/device/classes/vehicle.json@description": "Use this device class for any type of vehicle, when the `car`, `bicycle` or `scooter` device class doesn't apply.",
+  "./assets/device/classes/washer.json@title": "Washer",
+  "./assets/device/classes/washer.json@description": "Use this device class for washing machines, if it is a combination washer/dryer use 'washer_and_dryer'.",
+  "./assets/device/classes/washer_and_dryer.json@title": "Washer & Dryer",
+  "./assets/device/classes/washer_and_dryer.json@description": "Use this device class for any kind of washer and dryer combination.",
+  "./assets/device/classes/waterheater.json@title": "Water Heater",
+  "./assets/device/classes/waterheater.json@description": "Use this device class for water heaters.",
+  "./assets/device/classes/waterpurifier.json@title": "Water Purifier",
+  "./assets/device/classes/waterpurifier.json@description": "Use this device class for water purifiers.",
+  "./assets/device/classes/watervalve.json@title": "Water Valve",
+  "./assets/device/classes/watervalve.json@description": "Use this device class for mechanical water valves.",
   "./assets/device/classes/windowcoverings.json@title": "Window Coverings",
   "./assets/device/classes/windowcoverings.json@description": "Use this device class for window coverings, when the `curtains`, `blinds` or `sunshade` device class doesn't apply.",
   "./assets/device/classes/windowcoverings.json@virtualTitle": "What's the type?"