diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index b9ecbad..c2b3579 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -20,6 +20,33 @@
                 "Type": "PCA9545Mux"
             },
             {
+                "Class": "temp",
+                "FFGainCoefficient": 0.0,
+                "FFOffCoefficient": 0.0,
+                "ICoefficient": -1.0,
+                "ILimitMax": 100,
+                "ILimitMin": 30,
+                "Inputs": [
+                    "Riser 1 Temp"
+                ],
+                "Name": "Riser 1 Temp",
+                "NegativeHysteresis": 5.0,
+                "OutLimitMax": 100,
+                "OutLimitMin": 30,
+                "Outputs": [],
+                "PCoefficient": -0.15,
+                "PositiveHysteresis": 0.0,
+                "SetPoint": 60.0,
+                "SlewNeg": -1,
+                "SlewPos": 0.0,
+                "Type": "Pid",
+                "Zones": [
+                    "Zone 1",
+                    "Zone 2",
+                    "Zone 3"
+                ]
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index bd6e3c1..38b7937 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -20,6 +20,33 @@
                 "Type": "PCA9545Mux"
             },
             {
+                "Class": "temp",
+                "FFGainCoefficient": 0.0,
+                "FFOffCoefficient": 0.0,
+                "ICoefficient": -1.0,
+                "ILimitMax": 100,
+                "ILimitMin": 30,
+                "Inputs": [
+                    "Riser 1 Temp"
+                ],
+                "Name": "Riser 1 Temp",
+                "NegativeHysteresis": 5.0,
+                "OutLimitMax": 100,
+                "OutLimitMin": 30,
+                "Outputs": [],
+                "PCoefficient": -0.15,
+                "PositiveHysteresis": 0.0,
+                "SetPoint": 60.0,
+                "SlewNeg": -1,
+                "SlewPos": 0.0,
+                "Type": "Pid",
+                "Zones": [
+                    "Zone 1",
+                    "Zone 2",
+                    "Zone 3"
+                ]
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
diff --git a/configurations/A2UL16RISER.json b/configurations/A2UL16RISER.json
index bbf03c0..389ded7 100644
--- a/configurations/A2UL16RISER.json
+++ b/configurations/A2UL16RISER.json
@@ -20,6 +20,33 @@
                 "Type": "PCA9544Mux"
             },
             {
+                "Class": "temp",
+                "FFGainCoefficient": 0.0,
+                "FFOffCoefficient": 0.0,
+                "ICoefficient": -1.0,
+                "ILimitMax": 100,
+                "ILimitMin": 30,
+                "Inputs": [
+                    "Riser 1 Temp"
+                ],
+                "Name": "Riser 1 Temp",
+                "NegativeHysteresis": 5.0,
+                "OutLimitMax": 100,
+                "OutLimitMin": 30,
+                "Outputs": [],
+                "PCoefficient": -0.15,
+                "PositiveHysteresis": 0.0,
+                "SetPoint": 60.0,
+                "SlewNeg": -1,
+                "SlewPos": 0.0,
+                "Type": "Pid",
+                "Zones": [
+                    "Zone 1",
+                    "Zone 2",
+                    "Zone 3"
+                ]
+            },
+            {
                 "Address": "0x48",
                 "Bus": "$bus",
                 "Name": "Riser1 Temp",
diff --git a/configurations/AHW1UM2RISER.json b/configurations/AHW1UM2RISER.json
index 82a3f14..d36c5db 100644
--- a/configurations/AHW1UM2RISER.json
+++ b/configurations/AHW1UM2RISER.json
@@ -20,6 +20,33 @@
                 "Type": "PCA9545Mux"
             },
             {
+                "Class": "temp",
+                "FFGainCoefficient": 0.0,
+                "FFOffCoefficient": 0.0,
+                "ICoefficient": -1.0,
+                "ILimitMax": 100,
+                "ILimitMin": 30,
+                "Inputs": [
+                    "Riser 1 Temp"
+                ],
+                "Name": "Riser 1 Temp",
+                "NegativeHysteresis": 5.0,
+                "OutLimitMax": 100,
+                "OutLimitMin": 30,
+                "Outputs": [],
+                "PCoefficient": -0.15,
+                "PositiveHysteresis": 0.0,
+                "SetPoint": 60.0,
+                "SlewNeg": -1,
+                "SlewPos": 0.0,
+                "Type": "Pid",
+                "Zones": [
+                    "Zone 1",
+                    "Zone 2",
+                    "Zone 3"
+                ]
+            },
+            {
                 "Address": "0x4e",
                 "Bus": "$bus",
                 "Name": "Riser 1 Temp",
diff --git a/configurations/AXX2PRTHDHD.json b/configurations/AXX2PRTHDHD.json
index b74465c..25e09c5 100644
--- a/configurations/AXX2PRTHDHD.json
+++ b/configurations/AXX2PRTHDHD.json
@@ -38,8 +38,12 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         },
         {
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 5bb9fc7..97191c6 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -296,6 +296,36 @@
             "Type": "FanRedundancy"
         },
         {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Exit Air Temp"
+            ],
+            "Name": "Exit Air Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
+            ]
+        },
+        {
             "Class": "fan",
             "FFGainCoefficient": 1.0,
             "FFOffCoefficient": 0.0,
@@ -319,7 +349,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 1"
             ]
         },
         {
@@ -346,7 +376,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 2"
             ]
         },
         {
@@ -373,7 +403,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 3"
             ]
         },
         {
@@ -400,7 +430,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 4"
             ]
         },
         {
@@ -427,7 +457,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 5"
             ]
         },
         {
@@ -454,45 +484,43 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
-            ]
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0.0,
-            "FFOffCoefficient": 0.0,
-            "ICoefficient": -1.0,
-            "ILimitMax": 100,
-            "ILimitMin": 30,
-            "Inputs": [
-                "Exit Air Temp"
-            ],
-            "Name": "Exit Air Temp",
-            "NegativeHysteresis": 5.0,
-            "OutLimitMax": 100,
-            "OutLimitMin": 30,
-            "Outputs": [],
-            "PCoefficient": -0.15,
-            "PositiveHysteresis": 0.0,
-            "SetPoint": 70.0,
-            "SlewNeg": -1,
-            "SlewPos": 0.0,
-            "Type": "Pid",
-            "Zones": [
-                "Left",
-                "Right"
+                "Zone 6"
             ]
         },
         {
             "FailSafePercent": 100,
             "MinThermalOutput": 30,
-            "Name": "Left",
+            "Name": "Zone 1",
             "Type": "Pid.Zone"
         },
         {
             "FailSafePercent": 100,
             "MinThermalOutput": 30,
-            "Name": "Right",
+            "Name": "Zone 2",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 3",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 4",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 5",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 6",
             "Type": "Pid.Zone"
         },
         {
@@ -543,8 +571,12 @@
             ],
             "Type": "Stepwise",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         },
         {
@@ -565,8 +597,12 @@
             ],
             "Type": "Stepwise",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         }
     ],
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 12b613d..6d62e9e 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -204,7 +204,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 1"
             ]
         },
         {
@@ -230,7 +230,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 2"
             ]
         },
         {
@@ -256,7 +256,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 3"
             ]
         },
         {
@@ -282,7 +282,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 4"
             ]
         },
         {
@@ -308,7 +308,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 5"
             ]
         },
         {
@@ -334,7 +334,7 @@
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 6"
             ]
         },
         {
@@ -354,25 +354,53 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 70.0,
+            "SetPoint": 60.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         },
         {
             "FailSafePercent": 100,
             "MinThermalOutput": 30,
-            "Name": "Left",
+            "Name": "Zone 1",
             "Type": "Pid.Zone"
         },
         {
             "FailSafePercent": 100,
             "MinThermalOutput": 30,
-            "Name": "Right",
+            "Name": "Zone 2",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 3",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 4",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 5",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 30,
+            "Name": "Zone 6",
             "Type": "Pid.Zone"
         },
         {
@@ -423,8 +451,12 @@
             ],
             "Type": "Stepwise",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         },
         {
@@ -445,8 +477,12 @@
             ],
             "Type": "Stepwise",
             "Zones": [
-                "Left",
-                "Right"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3",
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
             ]
         }
     ],
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 55cfb78..a3c3f8e 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1723,50 +1723,325 @@
             "Class": "temp",
             "FFGainCoefficient": 0.0,
             "FFOffCoefficient": 0.0,
-            "ICoefficient": -0.1,
+            "ICoefficient": -1.0,
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Core \\d+ CPU1"
+                "BMC Temp"
             ],
-            "Name": "CPU1",
+            "Name": "BMC Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 45.0,
+            "SetPoint": 60.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Left"
+                "Zone 1",
+                "Zone 2",
+                "Zone 3"
             ]
         },
         {
             "Class": "temp",
             "FFGainCoefficient": 0.0,
             "FFOffCoefficient": 0.0,
-            "ICoefficient": -0.1,
+            "ICoefficient": -1.0,
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "Core \\d+ CPU2"
+                "DIMM [ABC]\\d+ CPU1"
             ],
-            "Name": "CPU2",
+            "Name": "CPU1 DIMM ABC",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 45.0,
+            "SetPoint": 60.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
             "Zones": [
-                "Right"
+                "Zone 2",
+                "Zone 3",
+                "Zone 4"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "DIMM [DEF]\\d+ CPU1"
+            ],
+            "Name": "CPU1 DIMM DEF",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 1",
+                "Zone 2"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "DIMM [ABC]\\d+ CPU2"
+            ],
+            "Name": "CPU2 DIMM ABC",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 5",
+                "Zone 6",
+                "PSU"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "DIMM [DEF]\\d+ CPU2"
+            ],
+            "Name": "CPU2 DIMM DEF",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 3",
+                "Zone 4",
+                "Zone 5"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "DTS CPU1"
+            ],
+            "Name": "DTS CPU1",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 1",
+                "Zone 2",
+                "Zone 3"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "DTS CPU2"
+            ],
+            "Name": "DTS CPU2",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 4",
+                "Zone 5",
+                "Zone 6",
+                "PSU"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Left Rear Temp"
+            ],
+            "Name": "Left Rear Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 4",
+                "Zone 5",
+                "Zone 6"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Right Rear Board"
+            ],
+            "Name": "Right Rear Board",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 1",
+                "Zone 2",
+                "Zone 3"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "SSB Temp"
+            ],
+            "Name": "SSB Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 2",
+                "Zone 3",
+                "Zone 4"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Voltage Regulator 1 Temp"
+            ],
+            "Name": "Voltage Regulator 1 Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 1",
+                "Zone 2",
+                "Zone 3"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": -1.0,
+            "ILimitMax": 100,
+            "ILimitMin": 30,
+            "Inputs": [
+                "Voltage Regulator 2 Temp"
+            ],
+            "Name": "Voltage Regulator 2 Temp",
+            "NegativeHysteresis": 5.0,
+            "OutLimitMax": 100,
+            "OutLimitMin": 30,
+            "Outputs": [],
+            "PCoefficient": -0.15,
+            "PositiveHysteresis": 0.0,
+            "SetPoint": 60.0,
+            "SlewNeg": -1,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "Zone 4",
+                "Zone 5",
+                "Zone 6",
+                "PSU"
             ]
         },
         {