diff --git a/device-types/D-Link/DGS-3130-30TS.yaml b/device-types/D-Link/DGS-3130-30TS.yaml
new file mode 100644
index 000000000..995f96378
--- /dev/null
+++ b/device-types/D-Link/DGS-3130-30TS.yaml
@@ -0,0 +1,84 @@
+---
+manufacturer: D-Link
+model: DGS-3130-30TS
+slug: d-link-dgs-3130-30ts
+part_number: DGS-3130-30TS
+comments: '[DGS-3130-30TS](https://www.dlink.com/de/de/products/dgs-3130-gigabit-layer-3-stackable-managed-switches)'
+is_full_depth: false
+airflow: side-to-rear
+weight: 3.2
+weight_unit: kg
+u_height: 1
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb
+    type: usb-a
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 31
+interfaces:
+  - name: Management
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1/0/1
+    type: 1000base-t
+  - name: Ethernet1/0/2
+    type: 1000base-t
+  - name: Ethernet1/0/3
+    type: 1000base-t
+  - name: Ethernet1/0/4
+    type: 1000base-t
+  - name: Ethernet1/0/5
+    type: 1000base-t
+  - name: Ethernet1/0/6
+    type: 1000base-t
+  - name: Ethernet1/0/7
+    type: 1000base-t
+  - name: Ethernet1/0/8
+    type: 1000base-t
+  - name: Ethernet1/0/9
+    type: 1000base-t
+  - name: Ethernet1/0/10
+    type: 1000base-t
+  - name: Ethernet1/0/11
+    type: 1000base-t
+  - name: Ethernet1/0/12
+    type: 1000base-t
+  - name: Ethernet1/0/13
+    type: 1000base-t
+  - name: Ethernet1/0/14
+    type: 1000base-t
+  - name: Ethernet1/0/15
+    type: 1000base-t
+  - name: Ethernet1/0/16
+    type: 1000base-t
+  - name: Ethernet1/0/17
+    type: 1000base-t
+  - name: Ethernet1/0/18
+    type: 1000base-t
+  - name: Ethernet1/0/19
+    type: 1000base-t
+  - name: Ethernet1/0/20
+    type: 1000base-t
+  - name: Ethernet1/0/21
+    type: 1000base-t
+  - name: Ethernet1/0/22
+    type: 1000base-t
+  - name: Ethernet1/0/23
+    type: 1000base-t
+  - name: Ethernet1/0/24
+    type: 1000base-t
+  - name: Ethernet1/0/25
+    type: 10gbase-t
+  - name: Ethernet1/0/26
+    type: 10gbase-t
+  - name: Ethernet1/0/27
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/28
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/29
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/30
+    type: 10gbase-x-sfpp
diff --git a/device-types/D-Link/DGS-3130-54PS.yaml b/device-types/D-Link/DGS-3130-54PS.yaml
new file mode 100644
index 000000000..a6cb0a3b5
--- /dev/null
+++ b/device-types/D-Link/DGS-3130-54PS.yaml
@@ -0,0 +1,228 @@
+---
+manufacturer: D-Link
+model: DGS-3130-54PS
+slug: d-link-dgs-3130-54ps
+part_number: DGS-3130-54PS
+comments: '[DGS-3130-54PS](https://eu.dlink.com/de/de/products/dgs-3130-gigabit-layer-3-stackable-managed-switches)'
+is_full_depth: false
+airflow: side-to-rear
+weight: 6.2
+weight_unit: kg
+u_height: 1
+console-ports:
+  - name: console
+    type: rj-45
+  - name: usb
+    type: usb-a
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+    maximum_draw: 475
+interfaces:
+  - name: Management
+    type: 1000base-t
+    mgmt_only: true
+  - name: Ethernet1/0/1
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/2
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/3
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/4
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/5
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/6
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/7
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/8
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/9
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/10
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/11
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/12
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/13
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/14
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/15
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/16
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/17
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/18
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/19
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/20
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/21
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/22
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/23
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/24
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/25
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/26
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/27
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/28
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/29
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/30
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/31
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/32
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/33
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/34
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/35
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/36
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/37
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/38
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/39
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/40
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/41
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/42
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/43
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/44
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/45
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/46
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/47
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/48
+    type: 1000base-t
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
+  - name: Ethernet1/0/49
+    type: 10gbase-t
+  - name: Ethernet1/0/50
+    type: 10gbase-t
+  - name: Ethernet1/0/51
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/52
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/53
+    type: 10gbase-x-sfpp
+  - name: Ethernet1/0/54
+    type: 10gbase-x-sfpp
diff --git a/device-types/D-Link/DGS-3130-54TS.yaml b/device-types/D-Link/DGS-3130-54TS.yaml
index c1ff8b59b..c1e6af477 100644
--- a/device-types/D-Link/DGS-3130-54TS.yaml
+++ b/device-types/D-Link/DGS-3130-54TS.yaml
@@ -3,7 +3,7 @@ manufacturer: D-Link
 model: DGS-3130-54TS
 slug: d-link-dgs-3130-54ts
 part_number: DGS-3130-54TS
-comments: '[DGS-3130-54TS](https://eu.dlink.com/it/it/products/dgs-3130-gigabit-layer-3-stackable-managed-switches)'
+comments: '[DGS-3130-54TS](https://eu.dlink.com/de/de/products/dgs-3130-gigabit-layer-3-stackable-managed-switches)'
 is_full_depth: false
 airflow: side-to-rear
 weight: 4.2
@@ -19,114 +19,114 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 46
 interfaces:
-  - name: GigabitEthernet0/1
+  - name: Management
     type: 1000base-t
     mgmt_only: true
-  - name: GigabitEthernet1/0/1
+  - name: Ethernet1/0/1
+    type: 1000base-t
+  - name: Ethernet1/0/2
+    type: 1000base-t
+  - name: Ethernet1/0/3
+    type: 1000base-t
+  - name: Ethernet1/0/4
+    type: 1000base-t
+  - name: Ethernet1/0/5
+    type: 1000base-t
+  - name: Ethernet1/0/6
+    type: 1000base-t
+  - name: Ethernet1/0/7
+    type: 1000base-t
+  - name: Ethernet1/0/8
+    type: 1000base-t
+  - name: Ethernet1/0/9
+    type: 1000base-t
+  - name: Ethernet1/0/10
+    type: 1000base-t
+  - name: Ethernet1/0/11
+    type: 1000base-t
+  - name: Ethernet1/0/12
+    type: 1000base-t
+  - name: Ethernet1/0/13
+    type: 1000base-t
+  - name: Ethernet1/0/14
+    type: 1000base-t
+  - name: Ethernet1/0/15
+    type: 1000base-t
+  - name: Ethernet1/0/16
+    type: 1000base-t
+  - name: Ethernet1/0/17
+    type: 1000base-t
+  - name: Ethernet1/0/18
+    type: 1000base-t
+  - name: Ethernet1/0/19
+    type: 1000base-t
+  - name: Ethernet1/0/20
+    type: 1000base-t
+  - name: Ethernet1/0/21
+    type: 1000base-t
+  - name: Ethernet1/0/22
+    type: 1000base-t
+  - name: Ethernet1/0/23
+    type: 1000base-t
+  - name: Ethernet1/0/24
+    type: 1000base-t
+  - name: Ethernet1/0/25
+    type: 1000base-t
+  - name: Ethernet1/0/26
+    type: 1000base-t
+  - name: Ethernet1/0/27
+    type: 1000base-t
+  - name: Ethernet1/0/28
+    type: 1000base-t
+  - name: Ethernet1/0/29
+    type: 1000base-t
+  - name: Ethernet1/0/30
+    type: 1000base-t
+  - name: Ethernet1/0/31
+    type: 1000base-t
+  - name: Ethernet1/0/32
+    type: 1000base-t
+  - name: Ethernet1/0/33
+    type: 1000base-t
+  - name: Ethernet1/0/34
+    type: 1000base-t
+  - name: Ethernet1/0/35
+    type: 1000base-t
+  - name: Ethernet1/0/36
+    type: 1000base-t
+  - name: Ethernet1/0/37
+    type: 1000base-t
+  - name: Ethernet1/0/38
+    type: 1000base-t
+  - name: Ethernet1/0/39
+    type: 1000base-t
+  - name: Ethernet1/0/40
+    type: 1000base-t
+  - name: Ethernet1/0/41
+    type: 1000base-t
+  - name: Ethernet1/0/42
+    type: 1000base-t
+  - name: Ethernet1/0/43
+    type: 1000base-t
+  - name: Ethernet1/0/44
+    type: 1000base-t
+  - name: Ethernet1/0/45
+    type: 1000base-t
+  - name: Ethernet1/0/46
+    type: 1000base-t
+  - name: Ethernet1/0/47
+    type: 1000base-t
+  - name: Ethernet1/0/48
+    type: 1000base-t
+  - name: Ethernet1/0/49
     type: 10gbase-t
-  - name: GigabitEthernet1/0/2
+  - name: Ethernet1/0/50
     type: 10gbase-t
-  - name: GigabitEthernet1/0/3
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/4
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/5
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/6
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/7
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/8
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/9
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/10
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/11
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/12
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/13
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/14
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/15
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/16
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/17
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/18
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/19
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/20
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/21
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/22
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/23
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/24
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/25
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/26
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/27
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/28
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/29
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/30
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/31
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/32
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/33
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/34
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/35
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/36
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/37
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/38
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/39
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/40
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/41
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/42
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/43
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/44
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/45
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/46
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/47
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/48
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/49
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/50
-    type: 10gbase-t
-  - name: GigabitEthernet1/0/51
+  - name: Ethernet1/0/51
     type: 10gbase-x-sfpp
-  - name: GigabitEthernet1/0/52
+  - name: Ethernet1/0/52
     type: 10gbase-x-sfpp
-  - name: GigabitEthernet1/0/53
+  - name: Ethernet1/0/53
     type: 10gbase-x-sfpp
-  - name: GigabitEthernet1/0/54
+  - name: Ethernet1/0/54
     type: 10gbase-x-sfpp
diff --git a/elevation-images/D-Link/d-link-dgs-3130-30ts.front.png b/elevation-images/D-Link/d-link-dgs-3130-30ts.front.png
new file mode 100644
index 000000000..0b51a4e89
Binary files /dev/null and b/elevation-images/D-Link/d-link-dgs-3130-30ts.front.png differ
diff --git a/elevation-images/D-Link/d-link-dgs-3130-30ts.rear.png b/elevation-images/D-Link/d-link-dgs-3130-30ts.rear.png
new file mode 100644
index 000000000..277b00275
Binary files /dev/null and b/elevation-images/D-Link/d-link-dgs-3130-30ts.rear.png differ
diff --git a/elevation-images/D-Link/d-link-dgs-3130-54ps.front.png b/elevation-images/D-Link/d-link-dgs-3130-54ps.front.png
new file mode 100644
index 000000000..d2f27d0ea
Binary files /dev/null and b/elevation-images/D-Link/d-link-dgs-3130-54ps.front.png differ
diff --git a/elevation-images/D-Link/d-link-dgs-3130-54ps.rear.png b/elevation-images/D-Link/d-link-dgs-3130-54ps.rear.png
new file mode 100644
index 000000000..c99578771
Binary files /dev/null and b/elevation-images/D-Link/d-link-dgs-3130-54ps.rear.png differ