diff --git a/tools/plotjuggler/layouts/thermal_debug.xml b/tools/plotjuggler/layouts/thermal_debug.xml
index fbb89ddcf4..cebda81753 100644
--- a/tools/plotjuggler/layouts/thermal_debug.xml
+++ b/tools/plotjuggler/layouts/thermal_debug.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <root>
- <tabbed_widget parent="main_window" name="Main Window">
-  <Tab tab_name="tab1" containers="1">
+ <tabbed_widget name="Main Window" parent="main_window">
+  <Tab containers="1" tab_name="tab1">
    <Container>
-    <DockSplitter sizes="0.200099;0.200099;0.199606;0.200099;0.200099" orientation="-" count="5">
+    <DockSplitter count="5" sizes="0.200198;0.199703;0.200198;0.199703;0.200198" orientation="-">
      <DockArea name="...">
-      <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-       <range left="0.000000" bottom="62.240001" right="1671.937015" top="81.559998"/>
+      <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+       <range bottom="63.929997" top="96.270000" right="2052.279275" left="0.000000"/>
        <limitY/>
        <curve color="#1f77b4" name="/deviceState/cpuTempC/0"/>
        <curve color="#d62728" name="/deviceState/cpuTempC/1"/>
@@ -19,8 +19,8 @@
       </plot>
      </DockArea>
      <DockArea name="...">
-      <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-       <range left="0.000000" bottom="56.440473" right="1671.937015" top="82.418528"/>
+      <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+       <range bottom="55.402226" top="98.526775" right="2052.279275" left="0.000000"/>
        <limitY/>
        <curve color="#1f77b4" name="/deviceState/pmicTempC/0"/>
        <curve color="#d62728" name="/deviceState/gpuTempC/0"/>
@@ -29,32 +29,39 @@
       </plot>
      </DockArea>
      <DockArea name="...">
-      <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-       <range left="0.000000" bottom="-0.025000" right="1671.937015" top="1.025000"/>
+      <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+       <range bottom="-0.050000" top="2.050000" right="2052.279275" left="0.000000"/>
        <limitY/>
        <curve color="#1f77b4" name="/deviceState/thermalStatus"/>
       </plot>
      </DockArea>
-     <DockSplitter sizes="0.500152;0.499848" orientation="|" count="2">
+     <DockSplitter count="3" sizes="0.333333;0.333333;0.333333" orientation="|">
       <DockArea name="...">
-       <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-        <range left="0.000000" bottom="4.185483" right="1671.937015" top="14.634767"/>
+       <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+        <range bottom="5.045103" top="12.507322" right="2052.279275" left="0.000000"/>
         <limitY/>
         <curve color="#ff7f0e" name="/deviceState/powerDrawW"/>
        </plot>
       </DockArea>
       <DockArea name="...">
-       <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-        <range left="0.000000" bottom="29.475000" right="1671.937015" top="51.525000"/>
-        <limitY/>
+       <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+        <range bottom="0.000000" top="100.000000" right="2052.279275" left="0.000000"/>
+        <limitY min="0" max="100"/>
         <curve color="#9467bd" name="/deviceState/fanSpeedPercentDesired"/>
        </plot>
       </DockArea>
+      <DockArea name="...">
+       <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+        <range bottom="2409.750000" top="5780.250000" right="2052.279275" left="0.000000"/>
+        <limitY/>
+        <curve color="#1f77b4" name="/peripheralState/fanSpeedRpm"/>
+       </plot>
+      </DockArea>
      </DockSplitter>
-     <DockSplitter sizes="0.500152;0.499848" orientation="|" count="2">
+     <DockSplitter count="2" sizes="0.502632;0.497368" orientation="|">
       <DockArea name="...">
-       <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-        <range left="0.000000" bottom="1.600000" right="1671.937015" top="102.400000"/>
+       <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+        <range bottom="-0.350000" top="98.350000" right="2052.279275" left="0.000000"/>
         <limitY/>
         <curve color="#1f77b4" name="/deviceState/cpuUsagePercent/0"/>
         <curve color="#d62728" name="/deviceState/cpuUsagePercent/1"/>
@@ -63,8 +70,8 @@
        </plot>
       </DockArea>
       <DockArea name="...">
-       <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false">
-        <range left="0.000000" bottom="-2.500000" right="1671.937015" top="102.500000"/>
+       <plot style="Lines" mode="TimeSeries" flip_x="false" flip_y="false">
+        <range bottom="-2.500000" top="102.500000" right="2052.279275" left="0.000000"/>
         <limitY/>
         <curve color="#f14cc1" name="/deviceState/cpuUsagePercent/4"/>
         <curve color="#9467bd" name="/deviceState/cpuUsagePercent/5"/>