diff --git a/device-types/Fortinet/FG-100E.yaml b/device-types/Fortinet/FG-100E.yaml
index 67d64d243..e2625c4ea 100644
--- a/device-types/Fortinet/FG-100E.yaml
+++ b/device-types/Fortinet/FG-100E.yaml
@@ -48,10 +48,10 @@ interfaces:
     type: 1000base-t
   - name: port15
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: port16
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports with this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
 console-ports:
   - name: Console
     type: rj-45
@@ -60,3 +60,7 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 29
     allocated_draw: 23
+  - name: DC Input for RPS
+    type: dc-terminal
+    maximum_draw: 29
+    allocated_draw: 23
diff --git a/device-types/Fortinet/FG-100F.yaml b/device-types/Fortinet/FG-100F.yaml
index 24f7372c8..0ff63b814 100644
--- a/device-types/Fortinet/FG-100F.yaml
+++ b/device-types/Fortinet/FG-100F.yaml
@@ -23,7 +23,6 @@ interfaces:
     type: 1000base-t
   - name: mgmt
     type: 1000base-t
-    mgmt_only: true
   - name: wan1
     type: 1000base-t
   - name: wan2
@@ -70,13 +69,13 @@ interfaces:
     type: 1000base-x-sfp
   - name: port17
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: port18
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: port19
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: port20
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
diff --git a/device-types/Fortinet/FG-140E-POE.yaml b/device-types/Fortinet/FG-140E-POE.yaml
index 3161bb712..98d604965 100644
--- a/device-types/Fortinet/FG-140E-POE.yaml
+++ b/device-types/Fortinet/FG-140E-POE.yaml
@@ -13,7 +13,7 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 500
     allocated_draw: 477
-  - name: FortiNet RPS connector for PSU failover
+  - name: RPScon
     type: dc-terminal
     maximum_draw: 500
     allocated_draw: 477
@@ -56,76 +56,100 @@ interfaces:
     type: 1000base-t
   - name: port15
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port16
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port17
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port18
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port19
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port20
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port21
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port22
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port23
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port24
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port25
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port26
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port27
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port28
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port29
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port30
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port31
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port32
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port33
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port34
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port35
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port36
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port37
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port38
     type: 1000base-t
-    description: PoE (802.3at)
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: dmz1
     type: 1000base-x-sfp
   - name: dmz2
diff --git a/device-types/Fortinet/FG-200E.yaml b/device-types/Fortinet/FG-200E.yaml
index 61d7e8d36..1ea738a0e 100644
--- a/device-types/Fortinet/FG-200E.yaml
+++ b/device-types/Fortinet/FG-200E.yaml
@@ -14,12 +14,15 @@ power-ports:
     type: iec-60320-c14
     maximum_draw: 110
     allocated_draw: 71
+  - name: DC Input for RPS
+    type: dc-terminal
+    maximum_draw: 110
+    allocated_draw: 71
 interfaces:
   - name: ha
     type: 1000base-t
   - name: mgmt
     type: 1000base-t
-    mgmt_only: true
   - name: wan1
     type: 1000base-t
   - name: wan2
diff --git a/device-types/Fortinet/FG-200F.yaml b/device-types/Fortinet/FG-200F.yaml
index ab2250931..41b92eeec 100644
--- a/device-types/Fortinet/FG-200F.yaml
+++ b/device-types/Fortinet/FG-200F.yaml
@@ -22,7 +22,6 @@ interfaces:
     type: 1000base-t
   - name: mgmt
     type: 1000base-t
-    mgmt_only: true
   - name: port1
     type: 1000base-t
   - name: port2
diff --git a/device-types/Fortinet/FG-60F.yaml b/device-types/Fortinet/FG-60F.yaml
index 5b884a4d7..631313dbd 100644
--- a/device-types/Fortinet/FG-60F.yaml
+++ b/device-types/Fortinet/FG-60F.yaml
@@ -10,7 +10,7 @@ console-ports:
     type: rj-45
 power-ports:
   - name: PS1
-    type: nema-5-15p
+    type: dc-terminal
     maximum_draw: 19
     allocated_draw: 17
 interfaces:
diff --git a/device-types/Fortinet/FG-80E-POE.yaml b/device-types/Fortinet/FG-80E-POE.yaml
index 116ae5e22..9d8c05992 100644
--- a/device-types/Fortinet/FG-80E-POE.yaml
+++ b/device-types/Fortinet/FG-80E-POE.yaml
@@ -11,53 +11,65 @@ console-ports:
     type: rj-45
 power-ports:
   - name: PS1
-    type: nema-5-15p
+    type: dc-terminal
     maximum_draw: 137
     allocated_draw: 20
 interfaces:
   - name: port1
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port2
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port3
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port4
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port5
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port6
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port7
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port8
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port9
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port10
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port11
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port12
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: dmz
     type: 1000base-t
   - name: ha
     type: 1000base-t
   - name: wan1
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: wan2
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
diff --git a/device-types/Fortinet/FG-80E.yaml b/device-types/Fortinet/FG-80E.yaml
index 6327f44e1..e00a75fc8 100644
--- a/device-types/Fortinet/FG-80E.yaml
+++ b/device-types/Fortinet/FG-80E.yaml
@@ -11,7 +11,7 @@ console-ports:
     type: rj-45
 power-ports:
   - name: PS1
-    type: nema-5-15p
+    type: dc-terminal
     maximum_draw: 25
     allocated_draw: 18
 interfaces:
@@ -45,7 +45,7 @@ interfaces:
     type: 1000base-t
   - name: wan1
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
   - name: wan2
     type: 1000base-x-sfp
-    # comments: shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
+    description: Shared media (You can use 1 of the 2 ports **WITH** this name. 1 is 1000base-x-sfp & the other is 1000base-t.)
diff --git a/device-types/Fortinet/FG-81E-POE.yaml b/device-types/Fortinet/FG-81E-POE.yaml
index 868f08d2f..1ecb5132b 100644
--- a/device-types/Fortinet/FG-81E-POE.yaml
+++ b/device-types/Fortinet/FG-81E-POE.yaml
@@ -17,40 +17,52 @@ power-ports:
 interfaces:
   - name: port1
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port2
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port3
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port4
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port5
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port6
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port7
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port8
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port9
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port10
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port11
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: port12
     type: 1000base-t
-    # poe: 802.3at
+    poe_mode: pse
+    poe_type: type2-ieee802.3at
   - name: dmz
     type: 1000base-t
   - name: ha