diff --git a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini
index 37f9d42f5..c9a898c34 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini
+++ b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.ini
@@ -1,5 +1,5 @@
 [General]
-ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5\xa0\0\0\x3/\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
+ViewGroup_Default=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5V\0\0\x2\x9a\0\0\0\x4\0\0\0\x4\0\0\0\x1\0\0\0\b\xfc\0\0\0\0)
 
 [Workspace]
 NumberOfWorkspaces=6
@@ -42,19 +42,127 @@ Mode1\splitter\side0\side0\type=splitter
 Mode1\splitter\side0\side0\splitterOrientation=1
 Mode1\splitter\side0\side0\splitterSizes=144, 608
 Mode1\splitter\side0\side0\side0\type=splitter
+Mode1\splitter\side0\side0\side0\splitterOrientation=2
+Mode1\splitter\side0\side0\side0\splitterSizes=215, 237
+Mode1\splitter\side0\side0\side0\side0\type=splitter
+Mode1\splitter\side0\side0\side0\side0\splitterOrientation=2
+Mode1\splitter\side0\side0\side0\side0\splitterSizes=@Invalid()
+Mode1\splitter\side0\side0\side0\side0\side0\type=uavGadget
+Mode1\splitter\side0\side0\side0\side0\side0\classId=LineardialGadget
+Mode1\splitter\side0\side0\side0\side0\side0\gadget\activeConfiguration=Flight Time
+Mode1\splitter\side0\side0\side0\side0\side1\type=uavGadget
+Mode1\splitter\side0\side0\side0\side0\side1\classId=LineardialGadget
+Mode1\splitter\side0\side0\side0\side0\side1\gadget\activeConfiguration=GPS Sats
+Mode1\splitter\side0\side0\side0\side1\type=splitter
+Mode1\splitter\side0\side0\side0\side1\splitterOrientation=2
+Mode1\splitter\side0\side0\side0\side1\splitterSizes=@Invalid()
+Mode1\splitter\side0\side0\side0\side1\side0\type=uavGadget
+Mode1\splitter\side0\side0\side0\side1\side0\classId=LineardialGadget
+Mode1\splitter\side0\side0\side0\side1\side0\gadget\activeConfiguration=Flight mode
+Mode1\splitter\side0\side0\side0\side1\side1\type=uavGadget
+Mode1\splitter\side0\side0\side0\side1\side1\classId=LineardialGadget
+Mode1\splitter\side0\side0\side0\side1\side1\gadget\activeConfiguration=Arm Status
 Mode1\splitter\side0\side0\side1\type=uavGadget
+Mode1\splitter\side0\side0\side1\classId=PFDGadget
+Mode1\splitter\side0\side0\side1\gadget\activeConfiguration=raw
 Mode1\splitter\side0\side1\type=splitter
+Mode1\splitter\side0\side1\splitterOrientation=1
+Mode1\splitter\side0\side1\splitterSizes=304, 433
+Mode1\splitter\side0\side1\side0\type=uavGadget
+Mode1\splitter\side0\side1\side0\classId=ModelViewGadget
+Mode1\splitter\side0\side1\side0\gadget\activeConfiguration=Test Quad X
+Mode1\splitter\side0\side1\side1\type=splitter
+Mode1\splitter\side0\side1\side1\splitterOrientation=2
+Mode1\splitter\side0\side1\side1\splitterSizes=293, 64
+Mode1\splitter\side0\side1\side1\side0\type=splitter
+Mode1\splitter\side0\side1\side1\side0\splitterOrientation=1
+Mode1\splitter\side0\side1\side1\side0\splitterSizes=291, 141
+Mode1\splitter\side0\side1\side1\side0\side0\type=uavGadget
+Mode1\splitter\side0\side1\side1\side0\side0\classId=SystemHealthGadget
+Mode1\splitter\side0\side1\side1\side0\side0\gadget\activeConfiguration=default
+Mode1\splitter\side0\side1\side1\side0\side1\type=splitter
+Mode1\splitter\side0\side1\side1\side0\side1\splitterOrientation=1
+Mode1\splitter\side0\side1\side1\side0\side1\splitterSizes=64, 64
+Mode1\splitter\side0\side1\side1\side0\side1\side0\type=uavGadget
+Mode1\splitter\side0\side1\side1\side0\side1\side0\classId=LineardialGadget
+Mode1\splitter\side0\side1\side1\side0\side1\side0\gadget\activeConfiguration=Mainboard CPU
+Mode1\splitter\side0\side1\side1\side0\side1\side1\type=uavGadget
+Mode1\splitter\side0\side1\side1\side0\side1\side1\classId=LineardialGadget
+Mode1\splitter\side0\side1\side1\side0\side1\side1\gadget\activeConfiguration=AHRS CPU
+Mode1\splitter\side0\side1\side1\side1\type=splitter
+Mode1\splitter\side0\side1\side1\side1\splitterOrientation=1
+Mode1\splitter\side0\side1\side1\side1\splitterSizes=@Invalid()
+Mode1\splitter\side0\side1\side1\side1\side0\type=uavGadget
+Mode1\splitter\side0\side1\side1\side1\side0\classId=LineardialGadget
+Mode1\splitter\side0\side1\side1\side1\side0\gadget\activeConfiguration=Telemetry RX Rate Horizontal
+Mode1\splitter\side0\side1\side1\side1\side1\type=uavGadget
+Mode1\splitter\side0\side1\side1\side1\side1\classId=LineardialGadget
+Mode1\splitter\side0\side1\side1\side1\side1\gadget\activeConfiguration=Telemetry TX Rate Horizontal
 Mode1\splitter\side1\type=splitter
 Mode1\splitter\side1\splitterOrientation=2
 Mode1\splitter\side1\splitterSizes=492, 288
 Mode1\splitter\side1\side0\type=uavGadget
+Mode1\splitter\side1\side0\classId=OPMapGadget
+Mode1\splitter\side1\side0\gadget\activeConfiguration=Google Sat
 Mode1\splitter\side1\side1\type=splitter
 Mode1\splitter\side1\side1\splitterOrientation=1
 Mode1\splitter\side1\side1\splitterSizes=441, 259
 Mode1\splitter\side1\side1\side0\type=splitter
+Mode1\splitter\side1\side1\side0\splitterOrientation=1
+Mode1\splitter\side1\side1\side0\splitterSizes=277, 135
+Mode1\splitter\side1\side1\side0\side0\type=splitter
+Mode1\splitter\side1\side1\side0\side0\splitterOrientation=1
+Mode1\splitter\side1\side1\side0\side0\splitterSizes=131, 138
+Mode1\splitter\side1\side1\side0\side0\side0\type=splitter
+Mode1\splitter\side1\side1\side0\side0\side0\splitterOrientation=2
+Mode1\splitter\side1\side1\side0\side0\side0\splitterSizes=@Invalid()
+Mode1\splitter\side1\side1\side0\side0\side0\side0\type=uavGadget
+Mode1\splitter\side1\side1\side0\side0\side0\side0\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side0\side0\side0\gadget\activeConfiguration=Deluxe Groundspeed kph
+Mode1\splitter\side1\side1\side0\side0\side0\side1\type=uavGadget
+Mode1\splitter\side1\side1\side0\side0\side0\side1\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side0\side0\side1\gadget\activeConfiguration=Deluxe Barometer
+Mode1\splitter\side1\side1\side0\side0\side1\type=splitter
+Mode1\splitter\side1\side1\side0\side0\side1\splitterOrientation=2
+Mode1\splitter\side1\side1\side0\side0\side1\splitterSizes=@Invalid()
+Mode1\splitter\side1\side1\side0\side0\side1\side0\type=uavGadget
+Mode1\splitter\side1\side1\side0\side0\side1\side0\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side0\side1\side0\gadget\activeConfiguration=Deluxe Attitude
+Mode1\splitter\side1\side1\side0\side0\side1\side1\type=uavGadget
+Mode1\splitter\side1\side1\side0\side0\side1\side1\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side0\side1\side1\gadget\activeConfiguration=Deluxe Compass
+Mode1\splitter\side1\side1\side0\side1\type=splitter
+Mode1\splitter\side1\side1\side0\side1\splitterOrientation=2
+Mode1\splitter\side1\side1\side0\side1\splitterSizes=@Invalid()
+Mode1\splitter\side1\side1\side0\side1\side0\type=uavGadget
+Mode1\splitter\side1\side1\side0\side1\side0\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side1\side0\gadget\activeConfiguration=Deluxe Baro Altimeter
+Mode1\splitter\side1\side1\side0\side1\side1\type=uavGadget
+Mode1\splitter\side1\side1\side0\side1\side1\classId=DialGadget
+Mode1\splitter\side1\side1\side0\side1\side1\gadget\activeConfiguration=Deluxe Climbrate
 Mode1\splitter\side1\side1\side1\type=splitter
+Mode1\splitter\side1\side1\side1\splitterOrientation=1
+Mode1\splitter\side1\side1\side1\splitterSizes=64, 441
+Mode1\splitter\side1\side1\side1\side0\type=uavGadget
+Mode1\splitter\side1\side1\side1\side0\classId=LineardialGadget
+Mode1\splitter\side1\side1\side1\side0\gadget\activeConfiguration=Throttle
+Mode1\splitter\side1\side1\side1\side1\type=splitter
+Mode1\splitter\side1\side1\side1\side1\splitterOrientation=1
+Mode1\splitter\side1\side1\side1\side1\splitterSizes=64, 376
+Mode1\splitter\side1\side1\side1\side1\side0\type=uavGadget
+Mode1\splitter\side1\side1\side1\side1\side0\classId=LineardialGadget
+Mode1\splitter\side1\side1\side1\side1\side0\gadget\activeConfiguration=Roll
+Mode1\splitter\side1\side1\side1\side1\side1\type=splitter
+Mode1\splitter\side1\side1\side1\side1\side1\splitterOrientation=1
+Mode1\splitter\side1\side1\side1\side1\side1\splitterSizes=64, 311
+Mode1\splitter\side1\side1\side1\side1\side1\side0\type=uavGadget
+Mode1\splitter\side1\side1\side1\side1\side1\side0\classId=LineardialGadget
+Mode1\splitter\side1\side1\side1\side1\side1\side0\gadget\activeConfiguration=Pitch
+Mode1\splitter\side1\side1\side1\side1\side1\side1\type=uavGadget
+Mode1\splitter\side1\side1\side1\side1\side1\side1\classId=LineardialGadget
+Mode1\splitter\side1\side1\side1\side1\side1\side1\gadget\activeConfiguration=Yaw
 Mode2\version=UAVGadgetManagerV1
-Mode2\showToolbars=false
+Mode2\showToolbars=true
 Mode2\splitter\type=splitter
 Mode2\splitter\splitterOrientation=1
 Mode2\splitter\splitterSizes=734, 631
@@ -111,11 +219,28 @@ Mode4\splitter\type=splitter
 Mode4\splitter\splitterOrientation=1
 Mode4\splitter\splitterSizes=653, 660
 Mode4\splitter\side0\type=splitter
+Mode4\splitter\side0\splitterOrientation=2
+Mode4\splitter\side0\splitterSizes=@Invalid()
+Mode4\splitter\side0\side0\type=uavGadget
+Mode4\splitter\side0\side0\classId=ScopeGadget
+Mode4\splitter\side0\side0\gadget\activeConfiguration=Accel
+Mode4\splitter\side0\side1\type=uavGadget
+Mode4\splitter\side0\side1\classId=ScopeGadget
+Mode4\splitter\side0\side1\gadget\activeConfiguration=Raw Gyros
 Mode4\splitter\side1\type=splitter
 Mode4\splitter\side1\splitterOrientation=2
 Mode4\splitter\side1\splitterSizes=661, 119
 Mode4\splitter\side1\side0\type=splitter
+Mode4\splitter\side1\side0\splitterOrientation=2
+Mode4\splitter\side1\side0\splitterSizes=390, 270
+Mode4\splitter\side1\side0\side0\type=uavGadget
+Mode4\splitter\side1\side0\side0\classId=ScopeGadget
+Mode4\splitter\side1\side0\side0\gadget\activeConfiguration=Attitude
+Mode4\splitter\side1\side0\side1\type=uavGadget
+Mode4\splitter\side1\side0\side1\classId=ScopeGadget
+Mode4\splitter\side1\side0\side1\gadget\activeConfiguration=Uptimes
 Mode4\splitter\side1\side1\type=uavGadget
+Mode4\splitter\side1\side1\classId=LoggingGadget
 Mode5\version=UAVGadgetManagerV1
 Mode5\showToolbars=false
 Mode5\splitter\type=splitter
@@ -147,138 +272,13 @@ Mode5\splitter\side0\side1\side1\side0\side1\classId=LineardialGadget
 Mode5\splitter\side0\side1\side1\side0\side1\gadget\activeConfiguration=PitchActual
 Mode5\splitter\side0\side1\side1\side1\type=uavGadget
 Mode5\splitter\side0\side1\side1\side1\classId=LineardialGadget
-Mode5\splitter\side0\side1\side1\side1\gadget\activeConfiguration=PitchCommand
+Mode5\splitter\side0\side1\side1\side1\gadget\activeConfiguration=Pitch
 Mode5\splitter\side1\type=uavGadget
 Mode5\splitter\side1\classId=UAVObjectBrowser
 Mode5\splitter\side1\gadget\activeConfiguration=default
-Mode1\splitter\side0\side0\side0\splitterOrientation=2
-Mode1\splitter\side0\side0\side0\splitterSizes=215, 237
-Mode1\splitter\side0\side0\side0\side0\type=splitter
-Mode1\splitter\side0\side0\side0\side1\type=splitter
-Mode1\splitter\side0\side0\side0\side1\splitterOrientation=2
-Mode1\splitter\side0\side0\side0\side1\splitterSizes=@Invalid()
-Mode1\splitter\side0\side0\side0\side1\side0\type=uavGadget
-Mode1\splitter\side0\side0\side0\side1\side0\classId=LineardialGadget
-Mode1\splitter\side0\side0\side0\side1\side0\gadget\activeConfiguration=Flight mode
-Mode1\splitter\side0\side0\side0\side1\side1\type=uavGadget
-Mode1\splitter\side0\side0\side0\side1\side1\classId=LineardialGadget
-Mode1\splitter\side0\side0\side0\side1\side1\gadget\activeConfiguration=Arm Status
-Mode1\splitter\side1\side0\classId=OPMapGadget
-Mode1\splitter\side1\side0\gadget\activeConfiguration=Google Sat
-Mode1\splitter\side1\side1\side0\splitterOrientation=1
-Mode1\splitter\side1\side1\side0\splitterSizes=277, 135
-Mode1\splitter\side1\side1\side0\side0\type=splitter
-Mode1\splitter\side1\side1\side0\side1\type=splitter
-Mode1\splitter\side0\side1\splitterOrientation=1
-Mode1\splitter\side0\side1\splitterSizes=304, 433
-Mode1\splitter\side0\side1\side0\type=uavGadget
-Mode1\splitter\side0\side1\side1\type=splitter
-Mode1\splitter\side0\side1\side1\splitterOrientation=2
-Mode1\splitter\side0\side1\side1\splitterSizes=293, 64
-Mode1\splitter\side0\side1\side1\side0\type=splitter
-Mode1\splitter\side0\side1\side1\side1\type=splitter
-Mode1\splitter\side1\side1\side0\side0\splitterOrientation=1
-Mode1\splitter\side1\side1\side0\side0\splitterSizes=131, 138
-Mode1\splitter\side1\side1\side0\side0\side0\type=splitter
-Mode1\splitter\side1\side1\side0\side0\side1\type=splitter
-Mode1\splitter\side0\side1\side0\classId=ModelViewGadget
-Mode1\splitter\side0\side1\side0\gadget\activeConfiguration=Test Quad X
-Mode1\splitter\side0\side1\side1\side0\splitterOrientation=1
-Mode1\splitter\side0\side1\side1\side0\splitterSizes=291, 141
-Mode1\splitter\side0\side1\side1\side0\side0\type=uavGadget
-Mode1\splitter\side0\side1\side1\side0\side0\classId=SystemHealthGadget
-Mode1\splitter\side0\side1\side1\side0\side0\gadget\activeConfiguration=default
-Mode1\splitter\side0\side1\side1\side0\side1\type=splitter
-Mode1\splitter\side0\side1\side1\side1\splitterOrientation=1
-Mode1\splitter\side0\side1\side1\side1\splitterSizes=@Invalid()
-Mode1\splitter\side0\side1\side1\side1\side0\type=uavGadget
-Mode1\splitter\side0\side1\side1\side1\side0\classId=LineardialGadget
-Mode1\splitter\side0\side1\side1\side1\side0\gadget\activeConfiguration=Telemetry RX Rate Horizontal
-Mode1\splitter\side0\side1\side1\side1\side1\type=uavGadget
-Mode1\splitter\side0\side1\side1\side1\side1\classId=LineardialGadget
-Mode1\splitter\side0\side1\side1\side1\side1\gadget\activeConfiguration=Telemetry TX Rate Horizontal
-Mode1\splitter\side0\side1\side1\side0\side1\splitterOrientation=1
-Mode1\splitter\side0\side1\side1\side0\side1\splitterSizes=64, 64
-Mode1\splitter\side0\side1\side1\side0\side1\side0\type=uavGadget
-Mode1\splitter\side0\side1\side1\side0\side1\side0\classId=LineardialGadget
-Mode1\splitter\side0\side1\side1\side0\side1\side0\gadget\activeConfiguration=Mainboard CPU
-Mode1\splitter\side0\side1\side1\side0\side1\side1\type=uavGadget
-Mode1\splitter\side0\side1\side1\side0\side1\side1\classId=LineardialGadget
-Mode1\splitter\side0\side1\side1\side0\side1\side1\gadget\activeConfiguration=AHRS CPU
-Mode1\splitter\side1\side1\side0\side0\side0\splitterOrientation=2
-Mode1\splitter\side1\side1\side0\side0\side0\splitterSizes=@Invalid()
-Mode1\splitter\side1\side1\side0\side0\side0\side0\type=uavGadget
-Mode1\splitter\side1\side1\side0\side0\side0\side0\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side0\side0\side0\gadget\activeConfiguration=Deluxe Groundspeed kph
-Mode1\splitter\side1\side1\side0\side0\side0\side1\type=uavGadget
-Mode1\splitter\side1\side1\side0\side0\side0\side1\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side0\side0\side1\gadget\activeConfiguration=Deluxe Barometer
-Mode1\splitter\side1\side1\side0\side0\side1\splitterOrientation=2
-Mode1\splitter\side1\side1\side0\side0\side1\splitterSizes=@Invalid()
-Mode1\splitter\side1\side1\side0\side0\side1\side0\type=uavGadget
-Mode1\splitter\side1\side1\side0\side0\side1\side0\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side0\side1\side0\gadget\activeConfiguration=Deluxe Attitude
-Mode1\splitter\side1\side1\side0\side0\side1\side1\type=uavGadget
-Mode1\splitter\side1\side1\side0\side0\side1\side1\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side0\side1\side1\gadget\activeConfiguration=Deluxe Compass
-Mode1\splitter\side1\side1\side0\side1\splitterOrientation=2
-Mode1\splitter\side1\side1\side0\side1\splitterSizes=@Invalid()
-Mode1\splitter\side1\side1\side0\side1\side0\type=uavGadget
-Mode1\splitter\side1\side1\side0\side1\side0\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side1\side0\gadget\activeConfiguration=Deluxe Baro Altimeter
-Mode1\splitter\side1\side1\side0\side1\side1\type=uavGadget
-Mode1\splitter\side1\side1\side0\side1\side1\classId=DialGadget
-Mode1\splitter\side1\side1\side0\side1\side1\gadget\activeConfiguration=Deluxe Climbrate
-Mode1\splitter\side0\side0\side0\side0\splitterOrientation=2
-Mode1\splitter\side0\side0\side0\side0\splitterSizes=@Invalid()
-Mode1\splitter\side0\side0\side0\side0\side0\type=uavGadget
-Mode1\splitter\side0\side0\side0\side0\side0\classId=LineardialGadget
-Mode1\splitter\side0\side0\side0\side0\side0\gadget\activeConfiguration=Flight Time
-Mode1\splitter\side0\side0\side0\side0\side1\type=uavGadget
-Mode1\splitter\side0\side0\side0\side0\side1\classId=LineardialGadget
-Mode1\splitter\side0\side0\side0\side0\side1\gadget\activeConfiguration=GPS Sats
-Mode1\splitter\side0\side0\side1\classId=PFDGadget
-Mode1\splitter\side0\side0\side1\gadget\activeConfiguration=raw
-Mode1\splitter\side1\side1\side1\splitterOrientation=1
-Mode1\splitter\side1\side1\side1\splitterSizes=64, 441
-Mode1\splitter\side1\side1\side1\side0\type=uavGadget
-Mode1\splitter\side1\side1\side1\side0\classId=LineardialGadget
-Mode1\splitter\side1\side1\side1\side0\gadget\activeConfiguration=Throttle
-Mode1\splitter\side1\side1\side1\side1\type=splitter
-Mode1\splitter\side1\side1\side1\side1\splitterOrientation=1
-Mode1\splitter\side1\side1\side1\side1\splitterSizes=64, 376
-Mode1\splitter\side1\side1\side1\side1\side0\type=uavGadget
-Mode1\splitter\side1\side1\side1\side1\side0\classId=LineardialGadget
-Mode1\splitter\side1\side1\side1\side1\side0\gadget\activeConfiguration=Roll
-Mode1\splitter\side1\side1\side1\side1\side1\type=splitter
-Mode1\splitter\side1\side1\side1\side1\side1\splitterOrientation=1
-Mode1\splitter\side1\side1\side1\side1\side1\splitterSizes=64, 311
-Mode1\splitter\side1\side1\side1\side1\side1\side0\type=uavGadget
-Mode1\splitter\side1\side1\side1\side1\side1\side0\classId=LineardialGadget
-Mode1\splitter\side1\side1\side1\side1\side1\side0\gadget\activeConfiguration=PitchActual
-Mode1\splitter\side1\side1\side1\side1\side1\side1\type=uavGadget
-Mode1\splitter\side1\side1\side1\side1\side1\side1\classId=LineardialGadget
-Mode1\splitter\side1\side1\side1\side1\side1\side1\gadget\activeConfiguration=Yaw
 Mode6\version=UAVGadgetManagerV1
 Mode6\showToolbars=false
 Mode6\splitter\type=splitter
-Mode4\splitter\side0\splitterOrientation=2
-Mode4\splitter\side0\splitterSizes=@Invalid()
-Mode4\splitter\side0\side0\type=uavGadget
-Mode4\splitter\side0\side0\classId=ScopeGadget
-Mode4\splitter\side0\side0\gadget\activeConfiguration=Accel
-Mode4\splitter\side0\side1\type=uavGadget
-Mode4\splitter\side0\side1\classId=ScopeGadget
-Mode4\splitter\side0\side1\gadget\activeConfiguration=Raw Gyros
-Mode4\splitter\side1\side0\splitterOrientation=2
-Mode4\splitter\side1\side0\splitterSizes=390, 270
-Mode4\splitter\side1\side0\side0\type=uavGadget
-Mode4\splitter\side1\side0\side0\classId=ScopeGadget
-Mode4\splitter\side1\side0\side0\gadget\activeConfiguration=Attitude
-Mode4\splitter\side1\side0\side1\type=uavGadget
-Mode4\splitter\side1\side0\side1\classId=ScopeGadget
-Mode4\splitter\side1\side0\side1\gadget\activeConfiguration=Uptimes
-Mode4\splitter\side1\side1\classId=LoggingGadget
 Mode6\splitter\splitterOrientation=1
 Mode6\splitter\splitterSizes=@Invalid()
 Mode6\splitter\side0\type=uavGadget
@@ -288,9 +288,6 @@ Mode6\splitter\side1\type=splitter
 Mode6\splitter\side1\splitterOrientation=2
 Mode6\splitter\side1\splitterSizes=274, 506
 Mode6\splitter\side1\side0\type=splitter
-Mode6\splitter\side1\side1\type=uavGadget
-Mode6\splitter\side1\side1\classId=ScopeGadget
-Mode6\splitter\side1\side1\gadget\activeConfiguration=Uptimes
 Mode6\splitter\side1\side0\splitterOrientation=1
 Mode6\splitter\side1\side0\splitterSizes=322, 396
 Mode6\splitter\side1\side0\side0\type=uavGadget
@@ -299,17 +296,20 @@ Mode6\splitter\side1\side0\side0\gadget\activeConfiguration=default
 Mode6\splitter\side1\side0\side1\type=uavGadget
 Mode6\splitter\side1\side0\side1\classId=PFDGadget
 Mode6\splitter\side1\side0\side1\gadget\activeConfiguration=raw
+Mode6\splitter\side1\side1\type=uavGadget
+Mode6\splitter\side1\side1\classId=ScopeGadget
+Mode6\splitter\side1\side1\gadget\activeConfiguration=Uptimes
 
 [KeyBindings]
 size=0
 
 [%General]
 SaveSettingsOnExit=true
-LastPreferenceCategory=OPMapGadget
-LastPreferencePage=default
-SettingsWindowWidth=697
-SettingsWindowHeight=476
-OverrideLanguage=en_AU
+TerminalEmulator=xterm -e
+LastPreferenceCategory=LineardialGadget
+LastPreferencePage=PitchCommand
+SettingsWindowWidth=780
+SettingsWindowHeight=534
 
 [UAVGadgetConfigurations]
 configInfo\version=1.2.0
@@ -340,7 +340,7 @@ DialGadget\Attitude\data\needle3Factor=-1
 DialGadget\Attitude\data\needle1Move=Rotate
 DialGadget\Attitude\data\needle2Move=Vertical
 DialGadget\Attitude\data\needle3Move=Rotate
-DialGadget\Attitude\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Attitude\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Attitude\data\useOpenGLFlag=false
 DialGadget\Attitude\data\beSmooth=false
 DialGadget\Attitude\configInfo\version=0.0.0
@@ -369,7 +369,7 @@ DialGadget\Baro%20Altimeter\data\needle3Factor=1
 DialGadget\Baro%20Altimeter\data\needle1Move=Rotate
 DialGadget\Baro%20Altimeter\data\needle2Move=Rotate
 DialGadget\Baro%20Altimeter\data\needle3Move=Rotate
-DialGadget\Baro%20Altimeter\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Baro%20Altimeter\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Baro%20Altimeter\data\useOpenGLFlag=false
 DialGadget\Baro%20Altimeter\data\beSmooth=false
 DialGadget\Baro%20Altimeter\configInfo\version=0.0.0
@@ -398,7 +398,7 @@ DialGadget\Barometer\data\needle3Factor=1
 DialGadget\Barometer\data\needle1Move=Rotate
 DialGadget\Barometer\data\needle2Move=Rotate
 DialGadget\Barometer\data\needle3Move=Rotate
-DialGadget\Barometer\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Barometer\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Barometer\data\useOpenGLFlag=false
 DialGadget\Barometer\data\beSmooth=false
 DialGadget\Barometer\configInfo\version=0.0.0
@@ -427,7 +427,7 @@ DialGadget\Climbrate\data\needle3Factor=1
 DialGadget\Climbrate\data\needle1Move=Rotate
 DialGadget\Climbrate\data\needle2Move=Rotate
 DialGadget\Climbrate\data\needle3Move=Rotate
-DialGadget\Climbrate\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Climbrate\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Climbrate\data\useOpenGLFlag=false
 DialGadget\Climbrate\data\beSmooth=false
 DialGadget\Climbrate\configInfo\version=0.0.0
@@ -456,7 +456,7 @@ DialGadget\Compass\data\needle3Factor=1
 DialGadget\Compass\data\needle1Move=Rotate
 DialGadget\Compass\data\needle2Move=Rotate
 DialGadget\Compass\data\needle3Move=Rotate
-DialGadget\Compass\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Compass\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Compass\data\useOpenGLFlag=false
 DialGadget\Compass\data\beSmooth=false
 DialGadget\Compass\configInfo\version=0.0.0
@@ -485,7 +485,7 @@ DialGadget\Deluxe%20Attitude\data\needle3Factor=-1
 DialGadget\Deluxe%20Attitude\data\needle1Move=Rotate
 DialGadget\Deluxe%20Attitude\data\needle2Move=Vertical
 DialGadget\Deluxe%20Attitude\data\needle3Move=Rotate
-DialGadget\Deluxe%20Attitude\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Attitude\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Attitude\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Attitude\data\beSmooth=false
 DialGadget\Deluxe%20Attitude\configInfo\version=0.0.0
@@ -514,7 +514,7 @@ DialGadget\Deluxe%20Baro%20Altimeter\data\needle3Factor=1
 DialGadget\Deluxe%20Baro%20Altimeter\data\needle1Move=Rotate
 DialGadget\Deluxe%20Baro%20Altimeter\data\needle2Move=Rotate
 DialGadget\Deluxe%20Baro%20Altimeter\data\needle3Move=Rotate
-DialGadget\Deluxe%20Baro%20Altimeter\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Baro%20Altimeter\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Baro%20Altimeter\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Baro%20Altimeter\data\beSmooth=false
 DialGadget\Deluxe%20Baro%20Altimeter\configInfo\version=0.0.0
@@ -543,7 +543,7 @@ DialGadget\Deluxe%20Barometer\data\needle3Factor=1
 DialGadget\Deluxe%20Barometer\data\needle1Move=Rotate
 DialGadget\Deluxe%20Barometer\data\needle2Move=Rotate
 DialGadget\Deluxe%20Barometer\data\needle3Move=Rotate
-DialGadget\Deluxe%20Barometer\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Barometer\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Barometer\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Barometer\data\beSmooth=false
 DialGadget\Deluxe%20Barometer\configInfo\version=0.0.0
@@ -572,7 +572,7 @@ DialGadget\Deluxe%20Climbrate\data\needle3Factor=1
 DialGadget\Deluxe%20Climbrate\data\needle1Move=Rotate
 DialGadget\Deluxe%20Climbrate\data\needle2Move=Rotate
 DialGadget\Deluxe%20Climbrate\data\needle3Move=Rotate
-DialGadget\Deluxe%20Climbrate\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Climbrate\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Climbrate\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Climbrate\data\beSmooth=false
 DialGadget\Deluxe%20Climbrate\configInfo\version=0.0.0
@@ -601,7 +601,7 @@ DialGadget\Deluxe%20Compass\data\needle3Factor=1
 DialGadget\Deluxe%20Compass\data\needle1Move=Rotate
 DialGadget\Deluxe%20Compass\data\needle2Move=Rotate
 DialGadget\Deluxe%20Compass\data\needle3Move=Rotate
-DialGadget\Deluxe%20Compass\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Compass\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Compass\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Compass\data\beSmooth=false
 DialGadget\Deluxe%20Compass\configInfo\version=0.0.0
@@ -630,7 +630,7 @@ DialGadget\Deluxe%20Groundspeed%20kph\data\needle3Factor=1
 DialGadget\Deluxe%20Groundspeed%20kph\data\needle1Move=Rotate
 DialGadget\Deluxe%20Groundspeed%20kph\data\needle2Move=Rotate
 DialGadget\Deluxe%20Groundspeed%20kph\data\needle3Move=Rotate
-DialGadget\Deluxe%20Groundspeed%20kph\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Groundspeed%20kph\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Groundspeed%20kph\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Groundspeed%20kph\data\beSmooth=false
 DialGadget\Deluxe%20Groundspeed%20kph\configInfo\version=0.0.0
@@ -659,7 +659,7 @@ DialGadget\Deluxe%20Temperature\data\needle3Factor=1
 DialGadget\Deluxe%20Temperature\data\needle1Move=Rotate
 DialGadget\Deluxe%20Temperature\data\needle2Move=Rotate
 DialGadget\Deluxe%20Temperature\data\needle3Move=Rotate
-DialGadget\Deluxe%20Temperature\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Temperature\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Temperature\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Temperature\data\beSmooth=false
 DialGadget\Deluxe%20Temperature\configInfo\version=0.0.0
@@ -688,7 +688,7 @@ DialGadget\Deluxe%20Turn%20Coordinator\data\needle3Factor=-1
 DialGadget\Deluxe%20Turn%20Coordinator\data\needle1Move=Rotate
 DialGadget\Deluxe%20Turn%20Coordinator\data\needle2Move=Horizontal
 DialGadget\Deluxe%20Turn%20Coordinator\data\needle3Move=Rotate
-DialGadget\Deluxe%20Turn%20Coordinator\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Deluxe%20Turn%20Coordinator\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Deluxe%20Turn%20Coordinator\data\useOpenGLFlag=false
 DialGadget\Deluxe%20Turn%20Coordinator\data\beSmooth=false
 DialGadget\Deluxe%20Turn%20Coordinator\configInfo\version=0.0.0
@@ -717,7 +717,7 @@ DialGadget\Groundspeed%20kph\data\needle3Factor=1
 DialGadget\Groundspeed%20kph\data\needle1Move=Rotate
 DialGadget\Groundspeed%20kph\data\needle2Move=Rotate
 DialGadget\Groundspeed%20kph\data\needle3Move=Rotate
-DialGadget\Groundspeed%20kph\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Groundspeed%20kph\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Groundspeed%20kph\data\useOpenGLFlag=false
 DialGadget\Groundspeed%20kph\data\beSmooth=false
 DialGadget\Groundspeed%20kph\configInfo\version=0.0.0
@@ -746,7 +746,7 @@ DialGadget\HiContrast%20Attitude\data\needle3Factor=-1
 DialGadget\HiContrast%20Attitude\data\needle1Move=Rotate
 DialGadget\HiContrast%20Attitude\data\needle2Move=Vertical
 DialGadget\HiContrast%20Attitude\data\needle3Move=Rotate
-DialGadget\HiContrast%20Attitude\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Attitude\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Attitude\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Attitude\data\beSmooth=false
 DialGadget\HiContrast%20Attitude\configInfo\version=0.0.0
@@ -775,7 +775,7 @@ DialGadget\HiContrast%20Baro%20Altimeter\data\needle3Factor=1
 DialGadget\HiContrast%20Baro%20Altimeter\data\needle1Move=Rotate
 DialGadget\HiContrast%20Baro%20Altimeter\data\needle2Move=Rotate
 DialGadget\HiContrast%20Baro%20Altimeter\data\needle3Move=Rotate
-DialGadget\HiContrast%20Baro%20Altimeter\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Baro%20Altimeter\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Baro%20Altimeter\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Baro%20Altimeter\data\beSmooth=false
 DialGadget\HiContrast%20Baro%20Altimeter\configInfo\version=0.0.0
@@ -804,7 +804,7 @@ DialGadget\HiContrast%20Barometer\data\needle3Factor=1
 DialGadget\HiContrast%20Barometer\data\needle1Move=Rotate
 DialGadget\HiContrast%20Barometer\data\needle2Move=Rotate
 DialGadget\HiContrast%20Barometer\data\needle3Move=Rotate
-DialGadget\HiContrast%20Barometer\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Barometer\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Barometer\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Barometer\data\beSmooth=false
 DialGadget\HiContrast%20Barometer\configInfo\version=0.0.0
@@ -833,7 +833,7 @@ DialGadget\HiContrast%20Climbrate\data\needle3Factor=1
 DialGadget\HiContrast%20Climbrate\data\needle1Move=Rotate
 DialGadget\HiContrast%20Climbrate\data\needle2Move=Rotate
 DialGadget\HiContrast%20Climbrate\data\needle3Move=Rotate
-DialGadget\HiContrast%20Climbrate\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Climbrate\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Climbrate\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Climbrate\data\beSmooth=false
 DialGadget\HiContrast%20Climbrate\configInfo\version=0.0.0
@@ -862,7 +862,7 @@ DialGadget\HiContrast%20Compass\data\needle3Factor=1
 DialGadget\HiContrast%20Compass\data\needle1Move=Rotate
 DialGadget\HiContrast%20Compass\data\needle2Move=Rotate
 DialGadget\HiContrast%20Compass\data\needle3Move=Rotate
-DialGadget\HiContrast%20Compass\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Compass\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Compass\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Compass\data\beSmooth=false
 DialGadget\HiContrast%20Compass\configInfo\version=0.0.0
@@ -891,7 +891,7 @@ DialGadget\HiContrast%20Groundspeed%20kph\data\needle3Factor=1
 DialGadget\HiContrast%20Groundspeed%20kph\data\needle1Move=Rotate
 DialGadget\HiContrast%20Groundspeed%20kph\data\needle2Move=Rotate
 DialGadget\HiContrast%20Groundspeed%20kph\data\needle3Move=Rotate
-DialGadget\HiContrast%20Groundspeed%20kph\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Groundspeed%20kph\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Groundspeed%20kph\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Groundspeed%20kph\data\beSmooth=false
 DialGadget\HiContrast%20Groundspeed%20kph\configInfo\version=0.0.0
@@ -920,7 +920,7 @@ DialGadget\HiContrast%20Temperature\data\needle3Factor=1
 DialGadget\HiContrast%20Temperature\data\needle1Move=Rotate
 DialGadget\HiContrast%20Temperature\data\needle2Move=Rotate
 DialGadget\HiContrast%20Temperature\data\needle3Move=Rotate
-DialGadget\HiContrast%20Temperature\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\HiContrast%20Temperature\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\HiContrast%20Temperature\data\useOpenGLFlag=false
 DialGadget\HiContrast%20Temperature\data\beSmooth=false
 DialGadget\HiContrast%20Temperature\configInfo\version=0.0.0
@@ -949,7 +949,7 @@ DialGadget\Servo%20Channel%201\data\needle3Factor=1
 DialGadget\Servo%20Channel%201\data\needle1Move=Rotate
 DialGadget\Servo%20Channel%201\data\needle2Move=Rotate
 DialGadget\Servo%20Channel%201\data\needle3Move=Rotate
-DialGadget\Servo%20Channel%201\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Servo%20Channel%201\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Servo%20Channel%201\data\useOpenGLFlag=false
 DialGadget\Servo%20Channel%201\data\beSmooth=false
 DialGadget\Servo%20Channel%201\configInfo\version=0.0.0
@@ -978,7 +978,7 @@ DialGadget\Temperature\data\needle3Factor=1
 DialGadget\Temperature\data\needle1Move=Rotate
 DialGadget\Temperature\data\needle2Move=Rotate
 DialGadget\Temperature\data\needle3Move=Rotate
-DialGadget\Temperature\data\font="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"
+DialGadget\Temperature\data\font="Ubuntu,11,-1,5,50,0,0,0,0,0"
 DialGadget\Temperature\data\useOpenGLFlag=false
 DialGadget\Temperature\data\beSmooth=false
 DialGadget\Temperature\configInfo\version=0.0.0
@@ -1027,7 +1027,7 @@ GpsDisplayGadget\Flight%20GPS\data\defaultDataBits=3
 GpsDisplayGadget\Flight%20GPS\data\defaultFlow=0
 GpsDisplayGadget\Flight%20GPS\data\defaultParity=0
 GpsDisplayGadget\Flight%20GPS\data\defaultStopBits=0
-GpsDisplayGadget\Flight%20GPS\data\defaultPort=Communications Port (COM1)
+GpsDisplayGadget\Flight%20GPS\data\defaultPort=Serial port 0
 GpsDisplayGadget\Flight%20GPS\data\connectionMode=Telemetry
 GpsDisplayGadget\Flight%20GPS\configInfo\version=0.0.0
 GpsDisplayGadget\Flight%20GPS\configInfo\locked=false
@@ -1036,7 +1036,7 @@ GpsDisplayGadget\GPS%20Mouse\data\defaultDataBits=3
 GpsDisplayGadget\GPS%20Mouse\data\defaultFlow=0
 GpsDisplayGadget\GPS%20Mouse\data\defaultParity=0
 GpsDisplayGadget\GPS%20Mouse\data\defaultStopBits=0
-GpsDisplayGadget\GPS%20Mouse\data\defaultPort=Communications Port (COM1)
+GpsDisplayGadget\GPS%20Mouse\data\defaultPort=Serial port 0
 GpsDisplayGadget\GPS%20Mouse\data\connectionMode=Serial
 GpsDisplayGadget\GPS%20Mouse\configInfo\version=0.0.0
 GpsDisplayGadget\GPS%20Mouse\configInfo\locked=false
@@ -1256,23 +1256,6 @@ LineardialGadget\PitchActual\data\factor=1
 LineardialGadget\PitchActual\data\useOpenGLFlag=false
 LineardialGadget\PitchActual\configInfo\version=0.0.0
 LineardialGadget\PitchActual\configInfo\locked=false
-LineardialGadget\PitchCommand\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
-LineardialGadget\PitchCommand\data\sourceDataObject=ManualControlCommand
-LineardialGadget\PitchCommand\data\sourceObjectField=Pitch
-LineardialGadget\PitchCommand\data\minValue=-1
-LineardialGadget\PitchCommand\data\maxValue=1
-LineardialGadget\PitchCommand\data\redMin=0
-LineardialGadget\PitchCommand\data\redMax=1
-LineardialGadget\PitchCommand\data\yellowMin=0.1
-LineardialGadget\PitchCommand\data\yellowMax=0.9
-LineardialGadget\PitchCommand\data\greenMin=0.3
-LineardialGadget\PitchCommand\data\greenMax=0.8
-LineardialGadget\PitchCommand\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
-LineardialGadget\PitchCommand\data\decimalPlaces=2
-LineardialGadget\PitchCommand\data\factor=1
-LineardialGadget\PitchCommand\data\useOpenGLFlag=false
-LineardialGadget\PitchCommand\configInfo\version=0.0.0
-LineardialGadget\PitchCommand\configInfo\locked=false
 LineardialGadget\PitchDesired\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
 LineardialGadget\PitchDesired\data\sourceDataObject=ActuatorDesired
 LineardialGadget\PitchDesired\data\sourceObjectField=Pitch
@@ -1293,14 +1276,14 @@ LineardialGadget\PitchDesired\configInfo\locked=false
 LineardialGadget\Roll\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
 LineardialGadget\Roll\data\sourceDataObject=ManualControlCommand
 LineardialGadget\Roll\data\sourceObjectField=Roll
-LineardialGadget\Roll\data\minValue=0
+LineardialGadget\Roll\data\minValue=-1
 LineardialGadget\Roll\data\maxValue=1
-LineardialGadget\Roll\data\redMin=0
+LineardialGadget\Roll\data\redMin=-1
 LineardialGadget\Roll\data\redMax=1
-LineardialGadget\Roll\data\yellowMin=0.1
-LineardialGadget\Roll\data\yellowMax=0.9
-LineardialGadget\Roll\data\greenMin=0.3
-LineardialGadget\Roll\data\greenMax=0.8
+LineardialGadget\Roll\data\yellowMin=-0.8
+LineardialGadget\Roll\data\yellowMax=0.8
+LineardialGadget\Roll\data\greenMin=-0.5
+LineardialGadget\Roll\data\greenMax=0.5
 LineardialGadget\Roll\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
 LineardialGadget\Roll\data\decimalPlaces=2
 LineardialGadget\Roll\data\factor=1
@@ -1346,12 +1329,12 @@ LineardialGadget\Throttle\data\sourceDataObject=ManualControlCommand
 LineardialGadget\Throttle\data\sourceObjectField=Throttle
 LineardialGadget\Throttle\data\minValue=0
 LineardialGadget\Throttle\data\maxValue=1
-LineardialGadget\Throttle\data\redMin=0
+LineardialGadget\Throttle\data\redMin=0.75
 LineardialGadget\Throttle\data\redMax=1
-LineardialGadget\Throttle\data\yellowMin=0.1
-LineardialGadget\Throttle\data\yellowMax=0.9
-LineardialGadget\Throttle\data\greenMin=0.3
-LineardialGadget\Throttle\data\greenMax=0.8
+LineardialGadget\Throttle\data\yellowMin=0.5
+LineardialGadget\Throttle\data\yellowMax=0.75
+LineardialGadget\Throttle\data\greenMin=0
+LineardialGadget\Throttle\data\greenMax=0.5
 LineardialGadget\Throttle\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
 LineardialGadget\Throttle\data\decimalPlaces=2
 LineardialGadget\Throttle\data\factor=1
@@ -1361,14 +1344,14 @@ LineardialGadget\Throttle\configInfo\locked=false
 LineardialGadget\Yaw\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
 LineardialGadget\Yaw\data\sourceDataObject=ManualControlCommand
 LineardialGadget\Yaw\data\sourceObjectField=Yaw
-LineardialGadget\Yaw\data\minValue=0
+LineardialGadget\Yaw\data\minValue=-1
 LineardialGadget\Yaw\data\maxValue=1
-LineardialGadget\Yaw\data\redMin=0
+LineardialGadget\Yaw\data\redMin=-1
 LineardialGadget\Yaw\data\redMax=1
-LineardialGadget\Yaw\data\yellowMin=0.1
-LineardialGadget\Yaw\data\yellowMax=0.9
-LineardialGadget\Yaw\data\greenMin=0.3
-LineardialGadget\Yaw\data\greenMax=0.8
+LineardialGadget\Yaw\data\yellowMin=-0.8
+LineardialGadget\Yaw\data\yellowMax=0.8
+LineardialGadget\Yaw\data\greenMin=-0.5
+LineardialGadget\Yaw\data\greenMax=0.5
 LineardialGadget\Yaw\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
 LineardialGadget\Yaw\data\decimalPlaces=2
 LineardialGadget\Yaw\data\factor=1
@@ -1439,24 +1422,41 @@ OPMapGadget\Google%20Sat\data\mapProvider=GoogleSatellite
 OPMapGadget\Google%20Sat\data\defaultZoom=2
 OPMapGadget\Google%20Sat\data\defaultLatitude=0
 OPMapGadget\Google%20Sat\data\defaultLongitude=0
-OPMapGadget\Google%20Sat\data\useOpenGL=true
+OPMapGadget\Google%20Sat\data\useOpenGL=false
 OPMapGadget\Google%20Sat\data\showTileGridLines=false
 OPMapGadget\Google%20Sat\data\accessMode=ServerAndCache
 OPMapGadget\Google%20Sat\data\useMemoryCache=true
 OPMapGadget\Google%20Sat\data\uavSymbol=mapquad.png
-OPMapGadget\Google%20Sat\data\cacheLocation=
+LineardialGadget\Pitch\data\dFile=%%DATAPATH%%dials/default/lineardial-vertical.svg
+LineardialGadget\Pitch\data\sourceDataObject=ManualControlCommand
+LineardialGadget\Pitch\data\sourceObjectField=Pitch
+LineardialGadget\Pitch\data\minValue=-1
+LineardialGadget\Pitch\data\maxValue=1
+LineardialGadget\Pitch\data\redMin=-1
+LineardialGadget\Pitch\data\redMax=1
+LineardialGadget\Pitch\data\yellowMin=-0.8
+LineardialGadget\Pitch\data\yellowMax=0.8
+LineardialGadget\Pitch\data\greenMin=-0.5
+LineardialGadget\Pitch\data\greenMax=0.5
+LineardialGadget\Pitch\data\font="Andale Mono,12,-1,5,75,0,0,0,0,0"
+LineardialGadget\Pitch\data\decimalPlaces=2
+LineardialGadget\Pitch\data\factor=1
+LineardialGadget\Pitch\data\useOpenGLFlag=false
+LineardialGadget\Pitch\configInfo\version=0.0.0
+LineardialGadget\Pitch\configInfo\locked=false
+OPMapGadget\Google%20Sat\data\cacheLocation=%%STOREPATH%%mapscache/
 OPMapGadget\Google%20Sat\configInfo\version=0.0.0
 OPMapGadget\Google%20Sat\configInfo\locked=false
 OPMapGadget\Memory%20Only\data\mapProvider=GoogleMap
 OPMapGadget\Memory%20Only\data\defaultZoom=2
 OPMapGadget\Memory%20Only\data\defaultLatitude=0
 OPMapGadget\Memory%20Only\data\defaultLongitude=0
-OPMapGadget\Memory%20Only\data\useOpenGL=true
+OPMapGadget\Memory%20Only\data\useOpenGL=false
 OPMapGadget\Memory%20Only\data\showTileGridLines=false
 OPMapGadget\Memory%20Only\data\accessMode=CacheOnly
 OPMapGadget\Memory%20Only\data\useMemoryCache=true
 OPMapGadget\Memory%20Only\data\uavSymbol=airplanepip.png
-OPMapGadget\Memory%20Only\data\cacheLocation=
+OPMapGadget\Memory%20Only\data\cacheLocation=%%STOREPATH%%mapscache/
 OPMapGadget\Memory%20Only\configInfo\version=0.0.0
 OPMapGadget\Memory%20Only\configInfo\locked=false
 OPMapGadget\default\data\mapProvider=GoogleMap
@@ -1468,7 +1468,7 @@ OPMapGadget\default\data\showTileGridLines=false
 OPMapGadget\default\data\accessMode=ServerAndCache
 OPMapGadget\default\data\useMemoryCache=true
 OPMapGadget\default\data\uavSymbol=mapquad.png
-OPMapGadget\default\data\cacheLocation=
+OPMapGadget\default\data\cacheLocation=%%STOREPATH%%mapscache/
 OPMapGadget\default\configInfo\version=0.0.0
 OPMapGadget\default\configInfo\locked=false
 PFDGadget\raw\data\dialFile=%%DATAPATH%%pfd/default/pfd.svg
diff --git a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp
index 287479d8d..d266ec18b 100644
--- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp
@@ -73,8 +73,10 @@ GCSControlGadgetWidget::GCSControlGadgetWidget(QWidget *parent) : QLabel(parent)
     rightX = 0;
     rightY = 0;
 
-	m_gcscontrol->widgetLeftStick->enableOpenGL(true);
-	m_gcscontrol->widgetRightStick->enableOpenGL(true);
+    // No point enabling OpenGL for the joysticks, and causes
+    // issues on some computers:
+//    m_gcscontrol->widgetLeftStick->enableOpenGL(true);
+//    m_gcscontrol->widgetRightStick->enableOpenGL(true);
 }
 
 GCSControlGadgetWidget::~GCSControlGadgetWidget()