diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6b5305e8..82f26e028 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,7 +28,6 @@ When writing new definitions, there are some important guidelines to follow:
 
 Additionally, be sure to adhere to the following style guidance:
 
-- Do not begin the file with three dashes (`---`); YAML directives are not supported.
 - Use two spaces for indenting.
 - Specify a device type's attributes before listing its components.
 - Avoid encapsulating YAML values in quotes unless necessary to avoid a syntax error.
diff --git a/device-types/Ubiquiti/ER-X-SFP.yaml b/device-types/Ubiquiti/ER-X-SFP.yaml
index 97f357387..c6a6b8ab8 100644
--- a/device-types/Ubiquiti/ER-X-SFP.yaml
+++ b/device-types/Ubiquiti/ER-X-SFP.yaml
@@ -1,14 +1,14 @@
 ---
 manufacturer: Ubiquiti
-model: EdgeRouter X SFP 6-Port
+model: ER-X-SFP
 slug: er-x-sfp
-part_number: ER‑X‑SFP
 u_height: 1
 is_full_depth: false
+comments: '[EdgeRouter X SFP - Advanced Gigabit Router with PoE and SFP](https://www.ui.com/edgemax/edgerouter-x-sfp/)'
 power-ports:
-  - name: 24V Power Supply
-    type: ita-g
-    maximum_draw: 50
+  - name: 24VDC
+    type: dc-terminal
+    maximum_draw: 5
 interfaces:
   - name: eth0
     type: 1000base-t
@@ -26,8 +26,5 @@ interfaces:
     type: 1000base-t
     mgmt_only: false
   - name: eth5
-    type: 1000base-t
-    mgmt_only: false
-  - name: switch0
-    type: virtual
+    type: 1000base-x-sfp
     mgmt_only: false
diff --git a/device-types/Ubiquiti/ER-X.yaml b/device-types/Ubiquiti/ER-X.yaml
index 174845eb4..43d7e4428 100644
--- a/device-types/Ubiquiti/ER-X.yaml
+++ b/device-types/Ubiquiti/ER-X.yaml
@@ -1,13 +1,13 @@
 ---
 manufacturer: Ubiquiti
-model: EdgeRouter X
+model: ER-X
 slug: er-x
-part_number: ER-X
 u_height: 1
 is_full_depth: false
+comments: '[EdgeRouter X - Advanced Gigabit Ethernet Router](https://www.ui.com/edgemax/edgeswitch-10x/)'
 power-ports:
-  - name: 12V Power Supply
-    type: ita-g
+  - name: 12VDC
+    type: dc-terminal
     maximum_draw: 5
 interfaces:
   - name: eth0
@@ -25,6 +25,3 @@ interfaces:
   - name: eth4
     type: 1000base-t
     mgmt_only: false
-  - name: switch0
-    type: virtual
-    mgmt_only: false
diff --git a/device-types/Ubiquiti/ES-10X.yaml b/device-types/Ubiquiti/ES-10X.yaml
new file mode 100644
index 000000000..6b7083bf4
--- /dev/null
+++ b/device-types/Ubiquiti/ES-10X.yaml
@@ -0,0 +1,42 @@
+---
+manufacturer: Ubiquiti
+model: ES-10X
+slug: es-10x
+u_height: 1
+is_full_depth: false
+comments: '[EdgeSwitch 10X - Managed 10-Port Gigabit Switch with PoE Passthrough](https://www.ui.com/edgemax/edgeswitch-10x/)'
+power-ports:
+  - name: 24VDC
+    type: dc-terminal
+    maximum_draw: 8
+interfaces:
+  - name: gi1
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi2
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi3
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi4
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi5
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi6
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi7
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi8
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi9
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: gi10
+    type: 1000base-x-sfp
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/ES-10XP.yaml b/device-types/Ubiquiti/ES-10XP.yaml
new file mode 100644
index 000000000..3e4570376
--- /dev/null
+++ b/device-types/Ubiquiti/ES-10XP.yaml
@@ -0,0 +1,42 @@
+---
+manufacturer: Ubiquiti
+model: ES-10XP
+slug: es-10xp
+u_height: 1
+is_full_depth: false
+comments: '[EdgeSwitch 10XP - Managed 10-Port Gigabit Switch with PoE](https://www.ui.com/edgemax/edgeswitch-10xp/)'
+power-ports:
+  - name: 24VDC
+    type: dc-terminal
+    maximum_draw: 8
+interfaces:
+  - name: gi1
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi2
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi3
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi4
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi5
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi6
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi7
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi8
+    type: 1000base-t
+    mgmt_only: false
+  - name: gi9
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: gi10
+    type: 1000base-x-sfp
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/ES-12F.yaml b/device-types/Ubiquiti/ES-12F.yaml
new file mode 100644
index 000000000..df20ad0f8
--- /dev/null
+++ b/device-types/Ubiquiti/ES-12F.yaml
@@ -0,0 +1,67 @@
+---
+manufacturer: Ubiquiti
+model: ES-12F
+slug: es-12f
+u_height: 1
+is_full_depth: false
+comments: '[EdgeSwitch 12 Fiber - Managed Gigabit Fiber Switch](https://www.ui.com/edgemax/edgeswitch-12f/)'
+console-ports:
+  - name: console
+    type: rj-45
+power-ports:
+  - name: AC
+    type: iec-60320-c14
+    maximum_draw: 56
+    description: 100-240VAC/50-60 Hz
+  - name: 25VDC
+    type: dc-terminal
+    maximum_draw: 56
+interfaces:
+  - name: 0/1
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/2
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/3
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/4
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/5
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/6
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/7
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/8
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/9
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/10
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/11
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/12
+    type: 1000base-x-sfp
+    mgmt_only: false
+  - name: 0/13
+    type: 1000base-t
+    mgmt_only: false
+  - name: 0/14
+    type: 1000base-t
+    mgmt_only: false
+  - name: 0/15
+    type: 1000base-t
+    mgmt_only: false
+  - name: 0/16
+    type: 1000base-t
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/U6-Lite.yaml b/device-types/Ubiquiti/U6-Lite.yaml
new file mode 100644
index 000000000..b770fc2e4
--- /dev/null
+++ b/device-types/Ubiquiti/U6-Lite.yaml
@@ -0,0 +1,11 @@
+---
+manufacturer: Ubiquiti
+model: U6-Lite
+slug: u6-lite
+u_height: 0
+is_full_depth: false
+comments: '[UniFi 6 Lite Access Point](https://store.ui.com/products/unifi-ap-6-lite)'
+interfaces:
+  - name: lan0
+    type: 1000base-t
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/UAP-AC-Lite.yaml b/device-types/Ubiquiti/UAP-AC-Lite.yaml
index 26c675240..4c3d8e45b 100644
--- a/device-types/Ubiquiti/UAP-AC-Lite.yaml
+++ b/device-types/Ubiquiti/UAP-AC-Lite.yaml
@@ -1,8 +1,7 @@
 ---
 manufacturer: Ubiquiti
-model: UAP-AC-Lite
+model: UAP-AC-LITE
 slug: uap-ac-lite
-part_number: UAP AC Lite
 u_height: 0
 is_full_depth: false
 comments: '[Unifi AP AC Lite](https://www.ui.com/unifi/unifi-ap-ac-lite/)'
@@ -10,6 +9,3 @@ interfaces:
   - name: lan0
     type: 1000base-t
     mgmt_only: false
-  - name: lan1
-    type: 1000base-t
-    mgmt_only: false
diff --git a/device-types/Ubiquiti/UDM-Pro.yaml b/device-types/Ubiquiti/UDM-Pro.yaml
index 2b6762290..09aa58b05 100644
--- a/device-types/Ubiquiti/UDM-Pro.yaml
+++ b/device-types/Ubiquiti/UDM-Pro.yaml
@@ -1,38 +1,51 @@
 ---
 manufacturer: Ubiquiti
-model: UniFi Dream Machine Pro
-slug: unifi-dream-machine-pro
-part_number: UDM-PRO
+model: UDMP-PRO
+slug: udm-pro
 comments: |
+  [UniFi Dream Machine Pro](https://store.ui.com/products/udm-pro)
+
   Enterprise Security Gateway and Network Appliance with 10G SFP+, (8) 1G LAN, (1) 1G WAN, (1) 1/10G SFP+ LAN, (1) 1/10G SFP+ WAN
 
   Dimensions: 442.4 x 43.7 x 285.6 mm (17.42 x 1.72 x 11.24")
 u_height: 1
 is_full_depth: true
 interfaces:
-  - name: LAN 1
+  - name: eth0
     type: 1000base-t
-  - name: LAN 2
+    label: 'Port 1 - LAN'
+  - name: eth1
     type: 1000base-t
-  - name: LAN 3
+    label: 'Port 2 - LAN'
+  - name: eth2
     type: 1000base-t
-  - name: LAN 4
+    label: 'Port 3 - LAN'
+  - name: eth3
     type: 1000base-t
-  - name: LAN 5
+    label: 'Port 4 - LAN'
+  - name: eth4
     type: 1000base-t
-  - name: LAN 6
+    label: 'Port 5 - LAN'
+  - name: eth5
     type: 1000base-t
-  - name: LAN 7
+    label: 'Port 6 - LAN'
+  - name: eth6
     type: 1000base-t
-  - name: LAN 8
+    label: 'Port 7 - LAN'
+  - name: eth7
     type: 1000base-t
-  - name: WAN 9
+    label: 'Port 8 - LAN'
+  - name: eth8
     type: 1000base-t
-  - name: SFP+ 10 (LAN)
+    label: 'Port 9 - WAN 1'
+  - name: eth9
     type: 10gbase-x-sfpp
-  - name: SFP+ 11 (WAN)
+    label: 'Port 10 - SFP+ WAN 2'
+  - name: eth10
     type: 10gbase-x-sfpp
+    label: 'Port 11 - SFP+ LAN'
 power-ports:
   - name: Supply
     type: iec-60320-c14
     maximum_draw: 33
+    description: 100-240VAC/50-60 Hz
diff --git a/device-types/Ubiquiti/US-8-150W.yaml b/device-types/Ubiquiti/US-8-150W.yaml
index 5f4a82c5c..9d0398c3f 100644
--- a/device-types/Ubiquiti/US-8-150W.yaml
+++ b/device-types/Ubiquiti/US-8-150W.yaml
@@ -1,10 +1,9 @@
 ---
 manufacturer: Ubiquiti
-model: UniFi Switch 8 PoE 150W Gen1
-slug: unifi-switch-8-poe-150w-gen1
-part_number: US-8-150W
+model: US-8-150W
+slug: us-8-150w
 comments: |
-  UniFi Switch 8 PoE 150W (20W + max. 130W PoE), Gen1, (8) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
+  [UniFi Switch PoE 8 (150W)](https://store.ui.com/collections/unifi-network-switching/products/unifi-switch-8-150w) (20W + max. 130W PoE), Gen1, (8) Gigabit PoE+ IEEE 802.3af/at and 24V Passive PoE, (2) SFP
 
   Dimensions: 235 x 43 x 204 mm (9.25 x 1.69 x 8.03")
 u_height: 0
diff --git a/device-types/Ubiquiti/USG.yaml b/device-types/Ubiquiti/USG.yaml
index 3fdfda490..bee6b4964 100644
--- a/device-types/Ubiquiti/USG.yaml
+++ b/device-types/Ubiquiti/USG.yaml
@@ -1,26 +1,27 @@
 ---
 manufacturer: Ubiquiti
-model: UniFi Security Gateway 3P
-slug: unifi-security-gateway-3p
-part_number: USG
-comments: |
-  UniFi Security Gateway 3P, Fanless, external PSU, (3) Gigabit
-
-  Dimensions: 484 x 44 x 164 mm (19.06 x 1.73 x 6.46")
-u_height: 0
+model: USG
+slug: usg
+u_height: 1
 is_full_depth: false
-interfaces:
-  - name: eth0 (WAN 1)
-    type: 1000base-t
-  - name: eth1 (LAN 1)
-    type: 1000base-t
-  - name: eth2 (WAN 2/LAN 2)
-    type: 1000base-t
-console-ports:
-  - name: Console
-    type: rj-45
+comments: '[UniFi Security Gateway - Enterprise Gateway Router with Gigabit Ethernet](https://www.ui.com/unifi-routing/usg/)'
 power-ports:
-  - name: 12VDC (external)
-    # TODO: There is no proper plug connection type defined
-    type: iec-60320-c20
+  - name: 12VDC
+    type: dc-terminal
     maximum_draw: 7
+console-ports:
+  - name: console
+    type: rj-45
+interfaces:
+  - name: eth0
+    label: WAN 1
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth1
+    label: LAN 1
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth2
+    label: WAN 2/LAN 2
+    type: 1000base-t
+    mgmt_only: false
diff --git a/device-types/Ubiquiti/USW-Pro-24.yaml b/device-types/Ubiquiti/USW-Pro-24.yaml
new file mode 100644
index 000000000..bb16e538c
--- /dev/null
+++ b/device-types/Ubiquiti/USW-Pro-24.yaml
@@ -0,0 +1,69 @@
+---
+manufacturer: Ubiquiti
+model: USW-PRO-24
+slug: usw-pro-24
+comments: |
+  [UniFi Switch Pro 24](https://store.ui.com/collections/unifi-network-switching/products/usw-pro-24)
+
+  24-port switch with (24) Gigabit RJ45 ports and (2) 10G SFP+ ports. Powerful second-generation UniFi switching
+
+  Dimensions: 442.4 x 285.4 x 43.7 mm (17.42 x 11.24 x 1.72")
+u_height: 1
+is_full_depth: true
+interfaces:
+  - name: Port 1
+    type: 1000base-t
+  - name: Port 2
+    type: 1000base-t
+  - name: Port 3
+    type: 1000base-t
+  - name: Port 4
+    type: 1000base-t
+  - name: Port 5
+    type: 1000base-t
+  - name: Port 6
+    type: 1000base-t
+  - name: Port 7
+    type: 1000base-t
+  - name: Port 8
+    type: 1000base-t
+  - name: Port 9
+    type: 1000base-t
+  - name: Port 10
+    type: 1000base-t
+  - name: Port 11
+    type: 1000base-t
+  - name: Port 12
+    type: 1000base-t
+  - name: Port 13
+    type: 1000base-t
+  - name: Port 14
+    type: 1000base-t
+  - name: Port 15
+    type: 1000base-t
+  - name: Port 16
+    type: 1000base-t
+  - name: Port 17
+    type: 1000base-t
+  - name: Port 18
+    type: 1000base-t
+  - name: Port 19
+    type: 1000base-t
+  - name: Port 20
+    type: 1000base-t
+  - name: Port 21
+    type: 1000base-t
+  - name: Port 22
+    type: 1000base-t
+  - name: Port 23
+    type: 1000base-t
+  - name: Port 24
+    type: 1000base-t
+  - name: Port 25 - SFP+
+    type: 10gbase-x-sfpp
+  - name: Port 26 - SFP+
+    type: 10gbase-x-sfpp
+power-ports:
+  - name: Input
+    type: iec-60320-c14
+    maximum_draw: 450
diff --git a/tests/schema.json b/tests/schema.json
index 2d2b9ee60..dddbf2c76 100644
--- a/tests/schema.json
+++ b/tests/schema.json
@@ -228,7 +228,8 @@
                         "usb-micro-a",
                         "usb-micro-b",
                         "usb-3-b",
-                        "usb-3-micro-b"
+                        "usb-3-micro-b",
+                        "dc-terminal"
                     ]
                 },
                 "maximum_draw": {