diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
index 126696f0d..824f123b0 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
@@ -2778,11 +2778,47 @@
             <type>splitter</type>
           </side0>
           <side1>
-            <classId>PFDGadget</classId>
-            <gadget>
-              <activeConfiguration>raw</activeConfiguration>
-            </gadget>
-            <type>uavGadget</type>
+            <side0>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Attitude</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Baro Altimeter</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side0>
+            <side1>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Compass</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Climbrate</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side1>
+            <splitterOrientation>1</splitterOrientation>
+            <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+            <type>splitter</type>
           </side1>
           <splitterOrientation>2</splitterOrientation>
           <splitterSizes>@Variant(AAAACQAAAAIAAAACAAABLwAAAAIAAAHf)</splitterSizes>
diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
index 4f4666e0c..89254f8d9 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml
@@ -2759,11 +2759,47 @@
             <type>splitter</type>
           </side0>
           <side1>
-            <classId>PFDGadget</classId>
-            <gadget>
-              <activeConfiguration>raw</activeConfiguration>
-            </gadget>
-            <type>uavGadget</type>
+            <side0>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Attitude</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Baro Altimeter</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side0>
+            <side1>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Compass</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Climbrate</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side1>
+            <splitterOrientation>1</splitterOrientation>
+            <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+            <type>splitter</type>
           </side1>
           <splitterOrientation>2</splitterOrientation>
           <splitterSizes>@Variant(AAAACQAAAAIAAAACAAABLwAAAAIAAAHf)</splitterSizes>
diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
index eaabdd8e5..a73874fef 100644
--- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
+++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
@@ -2761,11 +2761,47 @@
             <type>splitter</type>
           </side0>
           <side1>
-            <classId>PFDGadget</classId>
-            <gadget>
-              <activeConfiguration>raw</activeConfiguration>
-            </gadget>
-            <type>uavGadget</type>
+            <side0>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Attitude</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Baro Altimeter</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side0>
+            <side1>
+              <side0>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Compass</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side0>
+              <side1>
+                <classId>DialGadget</classId>
+                <gadget>
+                  <activeConfiguration>Deluxe Climbrate</activeConfiguration>
+                </gadget>
+                <type>uavGadget</type>
+              </side1>
+              <splitterOrientation>2</splitterOrientation>
+              <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+              <type>splitter</type>
+            </side1>
+            <splitterOrientation>1</splitterOrientation>
+            <splitterSizes>@Variant(AAAACQAAAAA=)</splitterSizes>
+            <type>splitter</type>
           </side1>
           <splitterOrientation>2</splitterOrientation>
           <splitterSizes>@Variant(AAAACQAAAAIAAAACAAABLwAAAAIAAAHf)</splitterSizes>
diff --git a/ground/openpilotgcs/share/openpilotgcs/dials/deluxe/attitude.svg b/ground/openpilotgcs/share/openpilotgcs/dials/deluxe/attitude.svg
index 9a1de6638..0740be27f 100644
--- a/ground/openpilotgcs/share/openpilotgcs/dials/deluxe/attitude.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/dials/deluxe/attitude.svg
@@ -12,7 +12,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    id="svg4745"
-   inkscape:version="0.48.0 r9654"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="attitude.svg"
    x="0px"
    y="0px"
@@ -1205,17 +1205,17 @@
    guidetolerance="10"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-width="1366"
-   inkscape:window-height="691"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
    id="namedview2585"
    showgrid="false"
    inkscape:zoom="1.3107546"
-   inkscape:cx="78.320852"
+   inkscape:cx="-40.694561"
    inkscape:cy="152.84311"
-   inkscape:window-x="0"
-   inkscape:window-y="24"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
    inkscape:window-maximized="1"
-   inkscape:current-layer="layer5" />
+   inkscape:current-layer="background-7" />
 
 
 
@@ -7558,7 +7558,12 @@
 	</g></g><g
        inkscape:label="#g3668"
        id="background-7"
-       transform="translate(0.86376266,-0.30754896)"><linearGradient
+       transform="translate(0.86376266,-0.30754896)"><path
+         style="fill:#666666;fill-opacity:1"
+         d="m -0.65625,-1.28125 0,315.84375 315.84375,0 0,-315.84375 -315.84375,0 z m 158.1875,8.6875 c 81.95231,0 148.40625,66.618251 148.40625,148.78125 0,82.163 -66.45394,148.75 -148.40625,148.75 -81.952311,0 -148.375,-66.587 -148.375,-148.75 0,-82.162999 66.422689,-148.78125 148.375,-148.78125 z"
+         transform="translate(-0.86376266,0.30754188)"
+         id="rect4658"
+         inkscape:connector-curvature="0" /><linearGradient
          gradientTransform="matrix(1,0,0,-1,8.48,-242.9702)"
          y2="-218.92889"
          x2="43.533401"
@@ -7676,9 +7681,9 @@
                    id="stop31876" /></linearGradient><polygon
                  style="fill:url(#linearGradient32725)"
                  id="polygon5292-4"
-                 points="18.698,19.935 15.317,19.935 13.626,17.006 15.317,14.078 18.698,14.078 20.389,17.006 " /><polygon
+                 points="13.626,17.006 15.317,14.078 18.698,14.078 20.389,17.006 18.698,19.935 15.317,19.935 " /><polygon
                  id="polygon5294-9"
-                 points="18.563,19.701 15.452,19.701 13.897,17.006 15.452,14.312 18.563,14.312 20.119,17.006 " /></g></g></g><g
+                 points="13.897,17.006 15.452,14.312 18.563,14.312 20.119,17.006 18.563,19.701 15.452,19.701 " /></g></g></g><g
            id="g5296-3"><g
              id="g5300-1"><g
                id="g5302-5"><g
@@ -7756,9 +7761,9 @@
                    id="stop31904" /></linearGradient><polygon
                  style="fill:url(#linearGradient32731)"
                  id="polygon5329-5"
-                 points="296.494,19.935 293.112,19.935 291.422,17.006 293.112,14.078 296.494,14.078 298.186,17.006 " /><polygon
+                 points="291.422,17.006 293.112,14.078 296.494,14.078 298.186,17.006 296.494,19.935 293.112,19.935 " /><polygon
                  id="polygon5331-8"
-                 points="296.358,19.701 293.248,19.701 291.692,17.006 293.248,14.312 296.358,14.312 297.914,17.006 " /></g></g></g><g
+                 points="291.692,17.006 293.248,14.312 296.358,14.312 297.914,17.006 296.358,19.701 293.248,19.701 " /></g></g></g><g
            id="g5333-3"><g
              id="g5337-8"><g
                id="g5339-4"><g
@@ -7836,9 +7841,9 @@
                    id="stop31932" /></linearGradient><polygon
                  style="fill:url(#linearGradient32737)"
                  id="polygon5366-5"
-                 points="296.493,297.73 293.112,297.73 291.421,294.803 293.112,291.874 296.493,291.874 298.185,294.803 " /><polygon
+                 points="291.421,294.803 293.112,291.874 296.493,291.874 298.185,294.803 296.493,297.73 293.112,297.73 " /><polygon
                  id="polygon5368-1"
-                 points="296.358,297.496 293.247,297.496 291.692,294.803 293.247,292.107 296.358,292.107 297.913,294.803 " /></g></g></g><g
+                 points="291.692,294.803 293.247,292.107 296.358,292.107 297.913,294.803 296.358,297.496 293.247,297.496 " /></g></g></g><g
            id="g5370-2"><g
              id="g5374-6"><g
                id="g5376-0"><g
@@ -7916,9 +7921,9 @@
                    id="stop31960" /></linearGradient><polygon
                  style="fill:url(#linearGradient32743)"
                  id="polygon5403-5"
-                 points="18.699,297.73 15.318,297.73 13.626,294.803 15.318,291.874 18.699,291.874 20.39,294.803 " /><polygon
+                 points="13.626,294.803 15.318,291.874 18.699,291.874 20.39,294.803 18.699,297.73 15.318,297.73 " /><polygon
                  id="polygon5405-8"
-                 points="18.564,297.496 15.453,297.496 13.898,294.803 15.453,292.107 18.564,292.107 20.119,294.803 " /></g></g></g><path
+                 points="13.898,294.803 15.453,292.107 18.564,292.107 20.119,294.803 18.564,297.496 15.453,297.496 " /></g></g></g><path
            style="fill:url(#linearGradient32745)"
            d="m 155.90562,5.680375 c -82.97305,0 -150.25,67.276952 -150.25,150.249995 0,82.97304 67.27695,150.21875 150.25,150.21875 82.97304,0 150.25,-67.24571 150.25,-150.21875 0,-82.973043 -67.27696,-150.249995 -150.25,-150.249995 z m 0,5.6875 c 79.84215,0 144.5625,64.720349 144.5625,144.562495 0,79.84215 -64.72035,144.5625 -144.5625,144.5625 -79.84215,0 -144.5625,-64.72035 -144.5625,-144.5625 0,-79.842146 64.72035,-144.562495 144.5625,-144.562495 z"
            id="circle5418-9"