diff --git a/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg
index e05cfdfba9..70078b752f 100644
--- a/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg	
@@ -1,304 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FCParameters>
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
+        <FCParamGroup Name="Editor">
+          <FCUInt Name="Block comment" Value="2694882304"/>
+          <FCUInt Name="Bookmark" Value="16776960"/>
+          <FCUInt Name="Breakpoint" Value="4278190080"/>
+          <FCUInt Name="Character" Value="4278190080"/>
+          <FCUInt Name="Class name" Value="4289331200"/>
+          <FCUInt Name="Comment" Value="11141120"/>
+          <FCUInt Name="Current line highlight" Value="3772833792"/>
+          <FCUInt Name="Define name" Value="4289331200"/>
+          <FCUInt Name="Keyword" Value="65280"/>
+          <FCUInt Name="Number" Value="65280"/>
+          <FCUInt Name="Operator" Value="2694882304"/>
+          <FCUInt Name="Python error" Value="4278190080"/>
+          <FCUInt Name="Python output" Value="2863300352"/>
+          <FCUInt Name="String" Value="4278190080"/>
+          <FCUInt Name="Text" Value="809320704"/>
+        </FCParamGroup>
+        <FCParamGroup Name="MainWindow">
+          <FCText Name="OverlayActiveStyleSheet">Light Theme + Dark Background.qss</FCText>
+          <FCText Name="StyleSheet"/>
+          <FCText Name="Theme">FreeCAD Classic</FCText>
+        </FCParamGroup>
+        <FCParamGroup Name="Mod">
+          <FCParamGroup Name="Arch">
+            <FCUInt Name="ColorHelpers" Value="674321151"/>
+            <FCUInt Name="defaultSpaceColor" Value="4280090879"/>
+            <FCUInt Name="PanelColor" Value="3416289279"/>
+            <FCUInt Name="RebarColor" Value="3111475967"/>
+            <FCUInt Name="StructureColor" Value="2527705855"/>
+            <FCUInt Name="WallColor" Value="3604403967"/>
+            <FCUInt Name="WindowGlassColor" Value="1572326399"/>
+          </FCParamGroup>
+          <FCParamGroup Name="CAM">
+            <FCUInt Name="DefaultBBoxNormalColor" Value="4294967295"/>
+            <FCUInt Name="DefaultBBoxSelectionColor" Value="3372220415"/>
+            <FCUInt Name="DefaultHighlightPathColor" Value="4286382335"/>
+            <FCUInt Name="DefaultNormalPathColor" Value="11141375"/>
+            <FCUInt Name="DefaultPathMarkerColor" Value="1442775295"/>
+            <FCUInt Name="DefaultProbePathColor" Value="4294903295"/>
+            <FCUInt Name="DefaultRapidPathColor" Value="2852126975"/>
+          </FCParamGroup>
+          <FCParamGroup Name="Draft">
+            <FCInt Name="gridTransparency" Value="0"/>
+            <FCUInt Name="color" Value="3435980288"/>
+            <FCUInt Name="constructioncolor" Value="746455039"/>
+            <FCUInt Name="DefaultAnnoLineColor" Value="255"/>
+            <FCUInt Name="DefaultTextColor" Value="255"/>
+            <FCUInt Name="gridColor" Value="842157055"/>
+            <FCUInt Name="snapcolor" Value="4289396735"/>
+          </FCParamGroup>
+          <FCParamGroup Name="Measure">
+            <FCParamGroup Name="Appearance">
+              <FCUInt Name="DefaultLineColor" Value="4294967295"/>
+              <FCUInt Name="DefaultTextBackgroundColor" Value="255"/>
+              <FCUInt Name="DefaultTextColor" Value="4294967295"/>
+            </FCParamGroup>
+          </FCParamGroup>
+          <FCParamGroup Name="Mesh">
+            <FCUInt Name="BackfaceColor" Value="3435973887"/>
+            <FCUInt Name="LineColor" Value="255"/>
+            <FCUInt Name="MeshColor" Value="3435973887"/>
+          </FCParamGroup>
+          <FCParamGroup Name="Sketcher">
+            <FCParamGroup Name="General">
+              <FCUInt Name="GridDivLineColor" Value="2998055679"/>
+              <FCUInt Name="GridLineColor" Value="2998055679"/>
+            </FCParamGroup>
+          </FCParamGroup>
+          <FCParamGroup Name="Start">
+            <FCUInt Name="FileThumbnailBackgroundColor" Value="3554532863"/>
+            <FCUInt Name="FileThumbnailBorderColor" Value="1654713087"/>
+            <FCUInt Name="FileThumbnailSelectionColor" Value="648178175"/>
+          </FCParamGroup>
+          <FCParamGroup Name="TechDraw">
+            <FCParamGroup Name="Colors">
+              <FCBool Name="LightOnDark" Value="0"/>
+              <FCBool Name="Monochrome" Value="0"/>
+              <FCUInt Name="Background" Value="3553874943"/>
+              <FCUInt Name="CutSurfaceColor" Value="3553874943"/>
+              <FCUInt Name="FaceColor" Value="4294967295"/>
+              <FCUInt Name="GeomHatch" Value="255"/>
+              <FCUInt Name="gridColor" Value="255"/>
+              <FCUInt Name="Hatch" Value="255"/>
+              <FCUInt Name="HiddenColor" Value="255"/>
+              <FCUInt Name="LightTextColor" Value="4294967295"/>
+              <FCUInt Name="NormalColor" Value="255"/>
+              <FCUInt Name="PageColor" Value="4294967295"/>
+              <FCUInt Name="PreSelectColor" Value="4294902015"/>
+              <FCUInt Name="SelectColor" Value="16711935"/>
+              <FCUInt Name="TemplateUnderlineColor" Value="65535"/>
+            </FCParamGroup>
+            <FCParamGroup Name="Decorations">
+              <FCUInt Name="CenterColor" Value="255"/>
+              <FCUInt Name="HighlightColor" Value="255"/>
+              <FCUInt Name="SectionColor" Value="255"/>
+              <FCUInt Name="VertexColor" Value="255"/>
+            </FCParamGroup>
+            <FCParamGroup Name="Dimensions">
+              <FCUInt Name="Color" Value="255"/>
+            </FCParamGroup>
+            <FCParamGroup Name="Markups">
+              <FCUInt Name="Color" Value="255"/>
+            </FCParamGroup>
+          </FCParamGroup>
+        </FCParamGroup>
+        <FCParamGroup Name="NaviCube">
+          <FCUInt Name="BaseColor" Value="3806916480"/>
+        </FCParamGroup>
+        <FCParamGroup Name="OutputWindow">
+          <FCUInt Name="colorError" Value="4278190335"/>
+          <FCUInt Name="colorLogging" Value="65535"/>
+          <FCUInt Name="colorText" Value="809320959"/>
+          <FCUInt Name="colorWarning" Value="4289331455"/>
+        </FCParamGroup>
         <FCParamGroup Name="Themes">
           <FCUInt Name="ThemeAccentColor1" Value="1434171135"/>
           <FCUInt Name="ThemeAccentColor2" Value="1434171135"/>
           <FCUInt Name="ThemeAccentColor3" Value="1434171135"/>
         </FCParamGroup>
+        <FCParamGroup Name="TreeView">
+          <FCUInt Name="TreeActiveColor" Value="1016200447"/>
+          <FCUInt Name="TreeEditColor" Value="1588208639"/>
+        </FCParamGroup>
         <FCParamGroup Name="View">
-          <FCUInt Name="HighlightColor" Value="3789624575"/>
-          <FCUInt Name="SelectionColor" Value="481107199"/>
+          <FCBool Name="Gradient" Value="1"/>
+          <FCBool Name="RadialGradient" Value="0"/>
+          <FCBool Name="Simple" Value="0"/>
+          <FCBool Name="UseBackgroundColorMid" Value="0"/>
+          <FCUInt Name="AnnotationTextColor" Value="4294967295"/>
           <FCUInt Name="AxisLetterColor" Value="255"/>
-          <FCUInt Name="RotationCenterColor" Value="4278190131"/>
-          <FCText Name="NewDocumentCameraOrientation">Trimetric</FCText>
           <FCUInt Name="BackgroundColor" Value="336897023"/>
           <FCUInt Name="BackgroundColor2" Value="859006463"/>
           <FCUInt Name="BackgroundColor3" Value="2543299327"/>
           <FCUInt Name="BackgroundColor4" Value="1869583359"/>
-          <FCBool Name="Simple" Value="0"/>
-          <FCBool Name="Gradient" Value="1"/>
-          <FCBool Name="RadialGradient" Value="0"/>
-          <FCBool Name="UseBackgroundColorMid" Value="0"/>
+          <FCUInt Name="BoundingBoxColor" Value="4294967295"/>
           <FCUInt Name="CbLabelColor" Value="4294967295"/>
-          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
+          <FCUInt Name="ConstrainedDimColor" Value="4280680703"/>
+          <FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
+          <FCUInt Name="ConstructionColor" Value="746455039"/>
+          <FCUInt Name="CreateLineColor" Value="2139062271"/>
+          <FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
+          <FCUInt Name="CursorTextColor" Value="65535"/>
+          <FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
           <FCUInt Name="DefaultAmbientColor" Value="1431655935"/>
           <FCUInt Name="DefaultEmissiveColor" Value="255"/>
-          <FCUInt Name="DefaultSpecularColor" Value="2290649343"/>
-          <FCBool Name="RandomColor" Value="0"/>
+          <FCUInt Name="DefaultShapeColor" Value="3435980543"/>
           <FCUInt Name="DefaultShapeLineColor" Value="421075455"/>
-          <FCInt Name="DefaultShapeLineWidth" Value="2"/>
           <FCUInt Name="DefaultShapeVertexColor" Value="421075455"/>
-          <FCInt Name="DefaultShapePointSize" Value="2"/>
-          <FCUInt Name="BoundingBoxColor" Value="4294967295"/>
-          <FCFloat Name="BoundingBoxFontSize" Value="10.000000000000"/>
-          <FCUInt Name="AnnotationTextColor" Value="4294967295"/>
+          <FCUInt Name="DefaultSpecularColor" Value="2290649343"/>
+          <FCUInt Name="EditedEdgeColor" Value="4294967295"/>
+          <FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
+          <FCUInt Name="ExternalColor" Value="3425924095"/>
+          <FCUInt Name="FullyConstrainedColor" Value="16711935"/>
+          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
+          <FCUInt Name="FullyConstraintElementColor" Value="2161156351"/>
+          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
+          <FCUInt Name="HighlightColor" Value="3789624575"/>
+          <FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
+          <FCUInt Name="InvalidSketchColor" Value="4285333759"/>
+          <FCUInt Name="NonDrivingConstrDimColor" Value="2555903"/>
+          <FCUInt Name="RotationCenterColor" Value="4278190131"/>
+          <FCUInt Name="SelectionColor" Value="481107199"/>
           <FCUInt Name="SketchEdgeColor" Value="4294967295"/>
           <FCUInt Name="SketchVertexColor" Value="4294967295"/>
-          <FCUInt Name="EditedEdgeColor" Value="4294967295"/>
-          <FCUInt Name="ConstructionColor" Value="746455039"/>
-          <FCUInt Name="ExternalColor" Value="3425924095"/>
-          <FCUInt Name="InvalidSketchColor" Value="4285333759"/>
-          <FCUInt Name="FullyConstrainedColor" Value="16711935"/>
-          <FCUInt Name="InternalAlignedGeoColor" Value="2998042623"/>
-          <FCUInt Name="FullyConstraintElementColor" Value="2161156351"/>
-          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2410282495"/>
-          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="3739142399"/>
-          <FCUInt Name="ConstrainedIcoColor" Value="4280680703"/>
-          <FCUInt Name="NonDrivingConstrDimColor" Value="2555903"/>
-          <FCUInt Name="ConstrainedDimColor" Value="4280680703"/>
-          <FCUInt Name="ExprBasedConstrDimColor" Value="4286523135"/>
-          <FCUInt Name="DeactivatedConstrDimColor" Value="2139062271"/>
-          <FCUInt Name="CursorTextColor" Value="65535"/>
-          <FCUInt Name="CursorCrosshairColor" Value="4294967295"/>
-          <FCUInt Name="CreateLineColor" Value="2139062271"/>
-        </FCParamGroup>
-        <FCParamGroup Name="Editor">
-          <FCUInt Name="Text" Value="809320704"/>
-          <FCUInt Name="Bookmark" Value="16776960"/>
-          <FCUInt Name="Breakpoint" Value="4278190080"/>
-          <FCUInt Name="Keyword" Value="65280"/>
-          <FCUInt Name="Comment" Value="11141120"/>
-          <FCUInt Name="Block comment" Value="2694882304"/>
-          <FCUInt Name="Number" Value="65280"/>
-          <FCUInt Name="String" Value="4278190080"/>
-          <FCUInt Name="Character" Value="4278190080"/>
-          <FCUInt Name="Class name" Value="4289331200"/>
-          <FCUInt Name="Define name" Value="4289331200"/>
-          <FCUInt Name="Operator" Value="2694882304"/>
-          <FCUInt Name="Python output" Value="2863300352"/>
-          <FCUInt Name="Python error" Value="4278190080"/>
-          <FCUInt Name="Current line highlight" Value="3772833792"/>
-          <FCInt Name="FontSize" Value="10"/>
-        </FCParamGroup>
-        <FCParamGroup Name="OutputWindow">
-          <FCUInt Name="colorText" Value="809320959"/>
-          <FCUInt Name="colorLogging" Value="65535"/>
-          <FCUInt Name="colorWarning" Value="4289331455"/>
-          <FCUInt Name="colorError" Value="4278190335"/>
-        </FCParamGroup>
-        <FCParamGroup Name="Mod">
-          <FCParamGroup Name="Start">
-            <FCInt Name="FileThumbnailIconsSize" Value="128"/>
-            <FCUInt Name="FileThumbnailBorderColor" Value="1654713087"/>
-            <FCUInt Name="FileThumbnailBackgroundColor" Value="3554532863"/>
-            <FCUInt Name="FileThumbnailSelectionColor" Value="648178175"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Arch">
-            <FCUInt Name="ColorHelpers" Value="674321151"/>
-            <FCUInt Name="WallColor" Value="3604403967"/>
-            <FCUInt Name="StructureColor" Value="2527705855"/>
-            <FCUInt Name="RebarColor" Value="3111475967"/>
-            <FCUInt Name="WindowGlassColor" Value="1572326399"/>
-            <FCUInt Name="PanelColor" Value="3416289279"/>
-            <FCUInt Name="defaultSpaceColor" Value="4280090879"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Measure">
-            <FCParamGroup Name="Appearance">
-              <FCInt Name="DefaultFontSize" Value="18"/>
-              <FCUInt Name="DefaultTextColor" Value="4294967295"/>
-              <FCUInt Name="DefaultLineColor" Value="4294967295"/>
-              <FCUInt Name="DefaultTextBackgroundColor" Value="255"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="TechDraw">
-            <FCParamGroup Name="Decorations">
-              <FCUInt Name="SectionColor" Value="255"/>
-              <FCUInt Name="CenterColor" Value="255"/>
-              <FCUInt Name="VertexColor" Value="255"/>
-              <FCUInt Name="HighlightColor" Value="255"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Colors">
-              <FCUInt Name="Hatch" Value="255"/>
-              <FCUInt Name="Background" Value="3553874943"/>
-              <FCUInt Name="PreSelectColor" Value="4294902015"/>
-              <FCUInt Name="HiddenColor" Value="255"/>
-              <FCUInt Name="SelectColor" Value="16711935"/>
-              <FCUInt Name="NormalColor" Value="255"/>
-              <FCUInt Name="CutSurfaceColor" Value="3553874943"/>
-              <FCUInt Name="GeomHatch" Value="255"/>
-              <FCUInt Name="FaceColor" Value="4294967295"/>
-              <FCBool Name="ClearFace" Value="0"/>
-              <FCUInt Name="gridColor" Value="255"/>
-              <FCUInt Name="PageColor" Value="4294967295"/>
-              <FCBool Name="LightOnDark" Value="0"/>
-              <FCBool Name="Monochrome" Value="0"/>
-              <FCUInt Name="LightTextColor" Value="4294967295"/>
-              <FCUInt Name="TemplateUnderlineColor" Value="65535"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Dimensions">
-              <FCInt Name="StandardAndStyle" Value="0"/>
-              <FCBool Name="UseGlobalDecimals" Value="1"/>
-              <FCBool Name="ShowUnits" Value="0"/>
-              <FCInt Name="AltDecimals" Value="2"/>
-              <FCFloat Name="FontSize" Value="5.000000000000"/>
-              <FCFloat Name="TolSizeAdjust" Value="0.800000000000"/>
-              <FCText Name="DiameterSymbol">⌀</FCText>
-              <FCInt Name="ArrowStyle" Value="0"/>
-              <FCFloat Name="ArrowSize" Value="3.500000000000"/>
-              <FCText Name="formatSpec">%.2w</FCText>
-              <FCFloat Name="GapISO" Value="0.000000000000"/>
-              <FCFloat Name="GapASME" Value="0.000000000000"/>
-              <FCFloat Name="LineSpacingFactorISO" Value="2.000000000000"/>
-              <FCFloat Name="BalloonKink" Value="5.000000000000"/>
-              <FCUInt Name="Color" Value="255"/>
-              <FCBool Name="AutoCorrectRefs" Value="1"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Markups">
-              <FCUInt Name="Color" Value="255"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Labels">
-              <FCText Name="LabelFont">osifont</FCText>
-              <FCFloat Name="LabelSize" Value="5.000000000000"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Rez"/>
-            <FCParamGroup Name="Files">
-              <FCText Name="TemplateFile"></FCText>
-              <FCText Name="TemplateDir"></FCText>
-              <FCText Name="FileHatch"></FCText>
-              <FCText Name="LineGroupFile"></FCText>
-              <FCText Name="WeldingDir"></FCText>
-              <FCText Name="DirSymbol"></FCText>
-            </FCParamGroup>
-            <FCParamGroup Name="Standards">
-              <FCInt Name="LineStandard" Value="1"/>
-              <FCInt Name="SectionLineStandard" Value="0"/>
-            </FCParamGroup>
-            <FCParamGroup Name="dimensioning">
-              <FCBool Name="SingleDimensioningTool" Value="1"/>
-              <FCBool Name="SeparatedDimensioningTools" Value="0"/>
-              <FCBool Name="DimensioningDiameter" Value="1"/>
-              <FCBool Name="DimensioningRadius" Value="1"/>
-            </FCParamGroup>
-            <FCParamGroup Name="General">
-              <FCBool Name="GlobalUpdateDrawings" Value="1"/>
-              <FCBool Name="AllowPageOverride" Value="1"/>
-              <FCBool Name="KeepPagesUpToDate" Value="1"/>
-              <FCBool Name="AutoDist" Value="1"/>
-              <FCInt Name="ProjectionAngle" Value="0"/>
-              <FCBool Name="showGrid" Value="0"/>
-              <FCFloat Name="gridSpacing" Value="10.000000000000"/>
-              <FCBool Name="multiSelection" Value="0"/>
-              <FCBool Name="UseCameraDirection" Value="0"/>
-              <FCBool Name="AlwaysShowLabel" Value="0"/>
-              <FCFloat Name="DefaultScale" Value="1.000000000000"/>
-              <FCInt Name="DefaultScaleType" Value="0"/>
-              <FCFloat Name="DefaultViewScale" Value="1.000000000000"/>
-              <FCFloat Name="VertexScale" Value="5.000000000000"/>
-              <FCFloat Name="TemplateDotSize" Value="3.000000000000"/>
-              <FCInt Name="EdgeCapStyle" Value="0"/>
-              <FCBool Name="ShowDetailMatting" Value="1"/>
-              <FCBool Name="ShowDetailHighlight" Value="1"/>
-              <FCBool Name="HandleFaces" Value="1"/>
-              <FCBool Name="ShowSectionEdges" Value="1"/>
-              <FCBool Name="SectionFuseFirst" Value="0"/>
-              <FCFloat Name="EdgeFuzz" Value="10.000000000000"/>
-              <FCFloat Name="MarkFuzz" Value="5.000000000000"/>
-              <FCBool Name="ReportProgress" Value="0"/>
-              <FCBool Name="NewFaceFinder" Value="1"/>
-              <FCInt Name="ScrubCount" Value="1"/>
-            </FCParamGroup>
-            <FCParamGroup Name="PAT">
-              <FCText Name="FilePattern"></FCText>
-              <FCText Name="NamePattern">Diamond</FCText>
-              <FCInt Name="MaxSeg" Value="10000"/>
-            </FCParamGroup>
-            <FCParamGroup Name="LeaderLine">
-              <FCBool Name="AutoHorizontal" Value="1"/>
-            </FCParamGroup>
-            <FCParamGroup Name="HLR">
-              <FCBool Name="SeamViz" Value="0"/>
-              <FCBool Name="SmoothViz" Value="1"/>
-              <FCBool Name="HardViz" Value="1"/>
-              <FCBool Name="UsePolygon" Value="0"/>
-              <FCBool Name="IsoViz" Value="0"/>
-              <FCBool Name="SmoothHid" Value="0"/>
-              <FCBool Name="SeamHid" Value="0"/>
-              <FCBool Name="IsoHid" Value="0"/>
-              <FCInt Name="IsoCount" Value="0"/>
-              <FCBool Name="HardHid" Value="0"/>
-            </FCParamGroup>
-            <FCParamGroup Name="debug">
-              <FCBool Name="debugSection" Value="0"/>
-              <FCBool Name="debugDetail" Value="0"/>
-              <FCBool Name="allowCrazyEdge" Value="0"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="CAM">
-            <FCUInt Name="DefaultNormalPathColor" Value="11141375"/>
-            <FCUInt Name="DefaultRapidPathColor" Value="2852126975"/>
-            <FCInt Name="DefaultPathLineWidth" Value="1"/>
-            <FCUInt Name="DefaultPathMarkerColor" Value="1442775295"/>
-            <FCUInt Name="DefaultProbePathColor" Value="4294903295"/>
-            <FCUInt Name="DefaultHighlightPathColor" Value="4286382335"/>
-            <FCUInt Name="DefaultBBoxSelectionColor" Value="3372220415"/>
-            <FCUInt Name="DefaultBBoxNormalColor" Value="4294967295"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Draft">
-            <FCUInt Name="color" Value="3435980288"/>
-            <FCUInt Name="constructioncolor" Value="746455039"/>
-            <FCUInt Name="DefaultTextColor" Value="255"/>
-            <FCText Name="svgDashedLine">3,1</FCText>
-            <FCText Name="svgDashdotLine">3,1,0.2,1</FCText>
-            <FCText Name="svgDottedLine">0.5,1</FCText>
-            <FCFloat Name="HatchPatternSize" Value="0.030000000000"/>
-            <FCInt Name="gridTransparency" Value="0"/>
-            <FCUInt Name="gridColor" Value="842157055"/>
-            <FCUInt Name="snapcolor" Value="4289396735"/>
-            <FCInt Name="DefaultAnnoLineWidth" Value="2"/>
-            <FCUInt Name="DefaultAnnoLineColor" Value="255"/>
-          </FCParamGroup>
-          <FCParamGroup Name="OpenSCAD">
-            <FCInt Name="useMaxFN" Value="16"/>
-            <FCInt Name="exportConvexity" Value="10"/>
-            <FCFloat Name="exportFa" Value="12.000000000000"/>
-            <FCFloat Name="exportFs" Value="2.000000000000"/>
-            <FCFloat Name="meshdeflection" Value="0.000000000000"/>
-            <FCText Name="openscadexecutable"></FCText>
-            <FCText Name="transferdirectory"></FCText>
-            <FCInt Name="transfermechanism" Value="0"/>
-            <FCBool Name="printVerbose" Value="0"/>
-            <FCBool Name="useViewProviderTree" Value="0"/>
-            <FCBool Name="useMultmatrixFeature" Value="0"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Sketcher">
-            <FCParamGroup Name="Snap"/>
-            <FCParamGroup Name="General">
-              <FCUInt Name="GridLineColor" Value="2998055679"/>
-              <FCUInt Name="GridDivLineColor" Value="2998055679"/>
-              <FCInt Name="GridLineWidth" Value="1"/>
-              <FCInt Name="GridDivLineWidth" Value="2"/>
-            </FCParamGroup>
-            <FCParamGroup Name="View">
-              <FCInt Name="EdgeWidth" Value="2"/>
-              <FCInt Name="ConstructionWidth" Value="2"/>
-              <FCInt Name="InternalWidth" Value="2"/>
-              <FCInt Name="ExternalWidth" Value="2"/>
-              <FCInt Name="EdgePattern" Value="65535"/>
-              <FCInt Name="ConstructionPattern" Value="64764"/>
-              <FCInt Name="InternalPattern" Value="64764"/>
-              <FCInt Name="ExternalPattern" Value="58596"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="Mesh">
-            <FCUInt Name="MeshColor" Value="3435973887"/>
-            <FCUInt Name="LineColor" Value="255"/>
-            <FCUInt Name="BackfaceColor" Value="3435973887"/>
-          </FCParamGroup>
-        </FCParamGroup>
-        <FCParamGroup Name="MainWindow">
-          <FCText Name="Theme">FreeCAD Classic</FCText>
-          <FCText Name="OverlayActiveStyleSheet">Light Theme + Dark Background.qss</FCText>
-          <FCText Name="StyleSheet"/>
-        </FCParamGroup>
-        <FCParamGroup Name="TreeView">
-          <FCUInt Name="TreeEditColor" Value="1588208639"/>
-          <FCUInt Name="TreeActiveColor" Value="1016200447"/>
-        </FCParamGroup>
-        <FCParamGroup Name="NaviCube">
-          <FCUInt Name="BaseColor" Value="3806916480"/>
-          <FCInt Name="InactiveOpacity" Value="50"/>
         </FCParamGroup>
       </FCParamGroup>
     </FCParamGroup>
diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
index 20382651e8..746f1e353e 100644
--- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
@@ -1,151 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FCParameters>
-
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
-        <FCParamGroup Name="Themes">
-          <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
-          <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
-          <FCUInt Name="ThemeAccentColor3" Value="404564735"/>
-        </FCParamGroup>
-        <FCParamGroup Name="View">
-          <FCUInt Name="SketchEdgeColor" Value="4059297279"/>
-          <FCUInt Name="SketchVertexColor" Value="4059297279"/>
-          <FCUInt Name="EditedEdgeColor" Value="4059297279"/>
-          <FCUInt Name="EditedVertexColor" Value="4199699199"/>
-          <FCUInt Name="ConstructionColor" Value="865792255"/>
-          <FCUInt Name="ExternalColor" Value="3428706559"/>
-          <FCUInt Name="InvalidSketchColor" Value="4252898559"/>
-          <FCUInt Name="FullyConstrainedColor" Value="1958221567"/>
-          <FCUInt Name="InternalAlignedGeoColor" Value="865792255"/>
-          <FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
-          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2462511359"/>
-          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2462511359"/>
-          <FCUInt Name="FullyConstraintConstructionPointColor" Value="4205291519"/>
-          <FCUInt Name="ConstrainedIcoColor" Value="4199699199"/>
-          <FCUInt Name="NonDrivingConstrDimColor" Value="865792255"/>
-          <FCUInt Name="ConstrainedDimColor" Value="4199699199"/>
-          <FCUInt Name="ExprBasedConstrDimColor" Value="4252898559"/>
-          <FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
-          <FCUInt Name="CursorTextColor" Value="2914369023"/>
-          <FCUInt Name="CursorCrosshairColor" Value="4059297279"/>
-          <FCUInt Name="CreateLineColor" Value="4059297279"/>
-          <FCBool Name="ShowRotationCenter" Value="1"/>
-          <FCBool Name="ShowNaviCube" Value="1"/>
-          <FCBool Name="ShowSelectionBoundingBox" Value="0"/>
-          <FCBool Name="UseAutoRotation" Value="1"/>
-          <FCBool Name="UseVBO" Value="1"/>
-          <FCInt Name="AntiAliasing" Value="4"/>
-          <FCInt Name="RenderCache" Value="0"/>
-          <FCInt Name="SegmentsPerGeometry" Value="100"/>
-          <FCUInt Name="BoundingBoxColor" Value="4059297279"/>
-          <FCFloat Name="BoundingBoxFontSize" Value="10.000000000000"/>
-          <FCFloat Name="ViewScalingFactor" Value="1.000000000000"/>
-          <FCBool Name="EnableBacklight" Value="1"/>
-          <FCBool Name="Gradient" Value="0"/>
-          <FCBool Name="RadialGradient" Value="0"/>
-          <FCBool Name="RandomColor" Value="0"/>
-          <FCBool Name="Simple" Value="0"/>
-          <FCBool Name="UseBackgroundColorMid" Value="0"/>
-          <FCInt Name="BacklightIntensity" Value="70"/>
-          <FCInt Name="DefaultShapeTransparency" Value="0"/>
-          <FCBool Name="Simple" Value="1"/>
-          <FCUInt Name="AnnotationTextColor" Value="2914369023"/>
-          <FCUInt Name="BackgroundColor" Value="993737727"/>
-          <FCUInt Name="BackgroundColor2" Value="1482187775"/>
-          <FCUInt Name="BackgroundColor3" Value="741103615"/>
-          <FCUInt Name="BackgroundColor4" Value="623200767"/>
-          <FCUInt Name="BacklightColor" Value="4059297279"/>
-          <FCUInt Name="BoundingBoxColor" Value="4059297279"/>
-          <FCUInt Name="DefaultShapeColor" Value="1920565503"/>
-          <FCUInt Name="HighlightColor" Value="611232767"/>
-          <FCUInt Name="SelectionColor" Value="899696639"/>
-          <FCUInt Name="CbLabelColor" Value="2914369023"/>
-        </FCParamGroup>
         <FCParamGroup Name="Editor">
-          <FCUInt Name="Text" Value="3570717696"/>
+          <FCUInt Name="Block comment" Value="3465639936"/>
           <FCUInt Name="Bookmark" Value="16776960"/>
           <FCUInt Name="Breakpoint" Value="4278190080"/>
-          <FCUInt Name="Keyword" Value="1453118976"/>
-          <FCUInt Name="Comment" Value="1788433664"/>
-          <FCUInt Name="Block comment" Value="3465639936"/>
-          <FCUInt Name="Number" Value="3050219520"/>
-          <FCUInt Name="String" Value="3465639936"/>
           <FCUInt Name="Character" Value="4278190080"/>
           <FCUInt Name="Class name" Value="1321840640"/>
-          <FCUInt Name="Define name" Value="3705448960"/>
-          <FCUInt Name="Operator" Value="3570717696"/>
-          <FCUInt Name="Python output" Value="2863300352"/>
-          <FCUInt Name="Python error" Value="4252787200"/>
+          <FCUInt Name="Comment" Value="1788433664"/>
           <FCUInt Name="Current line highlight" Value="524114944"/>
-          <FCInt Name="FontSize" Value="10"/>
+          <FCUInt Name="Define name" Value="3705448960"/>
+          <FCUInt Name="Keyword" Value="1453118976"/>
+          <FCUInt Name="Number" Value="3050219520"/>
+          <FCUInt Name="Operator" Value="3570717696"/>
+          <FCUInt Name="Python error" Value="4252787200"/>
+          <FCUInt Name="Python output" Value="2863300352"/>
+          <FCUInt Name="String" Value="3465639936"/>
+          <FCUInt Name="Text" Value="3570717696"/>
         </FCParamGroup>
-        <FCParamGroup Name="OutputWindow">
-          <FCUInt Name="colorText" Value="3570717951"/>
-          <FCUInt Name="colorLogging" Value="1437270015"/>
-          <FCUInt Name="colorWarning" Value="4252787455"/>
-          <FCUInt Name="colorError" Value="4278190335"/>
-        </FCParamGroup>
-        <FCParamGroup Name="OpenGL">
-          <FCBool Name="UseSoftwareOpenGL" Value="0"/>
+        <FCParamGroup Name="MainWindow">
+          <FCText Name="OverlayActiveStyleSheet">Dark Theme + Dark Background.qss</FCText>
+          <FCText Name="QtStyle">Fusion</FCText>
+          <FCText Name="StyleSheet">FreeCAD Dark.qss</FCText>
+          <FCText Name="Theme">FreeCAD Dark</FCText>
         </FCParamGroup>
         <FCParamGroup Name="Mod">
-          <FCParamGroup Name="Start">
-          </FCParamGroup>
           <FCParamGroup Name="Arch">
-            <FCUInt Name="WallColor" Value="3604403967"/>
-            <FCUInt Name="StructureColor" Value="2527705855"/>
-            <FCUInt Name="RebarColor" Value="3111475967"/>
-            <FCUInt Name="WindowColor" Value="556614399"/>
-            <FCUInt Name="WindowGlassColor" Value="1572326399"/>
-            <FCUInt Name="PanelColor" Value="3416289279"/>
             <FCUInt Name="ColorHelpers" Value="1347440895"/>
             <FCUInt Name="defaultSpaceColor" Value="4280090879"/>
+            <FCUInt Name="PanelColor" Value="3416289279"/>
+            <FCUInt Name="RebarColor" Value="3111475967"/>
+            <FCUInt Name="StructureColor" Value="2527705855"/>
+            <FCUInt Name="WallColor" Value="3604403967"/>
+            <FCUInt Name="WindowColor" Value="556614399"/>
+            <FCUInt Name="WindowGlassColor" Value="1572326399"/>
           </FCParamGroup>
-          <FCParamGroup Name="Measure">
-            <FCParamGroup Name="Appearance">
-              <FCBool Name="DefaultMirror" Value="0"/>
-              <FCFloat Name="DefaultDistFactor" Value="1.000000000000"/>
-              <FCInt Name="DefaultFontSize" Value="18"/>
-              <FCUInt Name="DefaultTextColor" Value="4177132287"/>
-              <FCUInt Name="DefaultLineColor" Value="4177132287"/>
-              <FCUInt Name="DefaultTextBackgroundColor" Value="556083711"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="TechDraw">
-            <FCParamGroup Name="Decorations">
-              <FCUInt Name="SectionColor" Value="255"/>
-              <FCUInt Name="CenterColor" Value="255"/>
-              <FCUInt Name="VertexColor" Value="255"/>
-              <FCUInt Name="HighlightColor" Value="255"/>
-            </FCParamGroup>
-            <FCParamGroup Name="Colors">
-              <FCBool Name="ClearFace" Value="1"/>
-              <FCUInt Name="Hatch" Value="255"/>
-              <FCUInt Name="Background" Value="556083711"/>
-              <FCUInt Name="PreSelectColor" Value="4240710143"/>
-              <FCUInt Name="HiddenColor" Value="255"/>
-              <FCUInt Name="SelectColor" Value="1958221567"/>
-              <FCUInt Name="NormalColor" Value="255"/>
-              <FCUInt Name="CutSurfaceColor" Value="3470056191"/>
-              <FCUInt Name="GeomHatch" Value="255"/>
-              <FCUInt Name="FaceColor" Value="4059297279"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="Path">
+          <FCParamGroup Name="CAM">
+            <FCUInt Name="DefaultBBoxNormalColor" Value="4059297279"/>
+            <FCUInt Name="DefaultBBoxSelectionColor" Value="582537215"/>
+            <FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
             <FCUInt Name="DefaultNormalPathColor" Value="1086347263"/>
-            <FCUInt Name="DefaultRapidPathColor" Value="4199699199"/>
             <FCUInt Name="DefaultPathMarkerColor" Value="1958221567"/>
             <FCUInt Name="DefaultProbePathColor" Value="4240710143"/>
-            <FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
-            <FCUInt Name="DefaultBBoxSelectionColor" Value="582537215"/>
-            <FCUInt Name="DefaultBBoxNormalColor" Value="4059297279"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Part">
-            <FCUInt Name="Dimensions3dColor" Value="4199699199"/>
-            <FCUInt Name="DimensionsAngularColor" Value="865792255"/>
-            <FCUInt Name="DimensionsDeltaColor" Value="314085375"/>
+            <FCUInt Name="DefaultRapidPathColor" Value="4199699199"/>
           </FCParamGroup>
           <FCParamGroup Name="Draft">
             <FCInt Name="gridTransparency" Value="0"/>
@@ -153,36 +52,100 @@
             <FCUInt Name="gridColor" Value="1230002175"/>
             <FCUInt Name="snapcolor" Value="4294967295"/>
           </FCParamGroup>
-          <FCParamGroup Name="Spreadsheet">
-            <FCText Name="AliasedCellBackgroundColor">#1864ab</FCText>
-            <FCText Name="TextColor">#f8f9fa</FCText>
-            <FCText Name="PositiveNumberColor">#f8f9fa</FCText>
-            <FCText Name="NegativeNumberColor">#f8f9fa</FCText>
+          <FCParamGroup Name="Measure">
+            <FCParamGroup Name="Appearance">
+              <FCUInt Name="DefaultLineColor" Value="4177132287"/>
+              <FCUInt Name="DefaultTextBackgroundColor" Value="556083711"/>
+              <FCUInt Name="DefaultTextColor" Value="4177132287"/>
+            </FCParamGroup>
           </FCParamGroup>
           <FCParamGroup Name="Sketcher">
             <FCParamGroup Name="General">
-              <FCUInt Name="GridLineColor" Value="1230002175"/>
               <FCUInt Name="GridDivLineColor" Value="1230002175"/>
-              <FCInt Name="GridDivLinePattern" Value="65535"/>
-              <FCInt Name="GridLinePattern" Value="43690"/>
+              <FCUInt Name="GridLineColor" Value="1230002175"/>
+            </FCParamGroup>
+          </FCParamGroup>
+          <FCParamGroup Name="Spreadsheet">
+            <FCText Name="AliasedCellBackgroundColor">#1864ab</FCText>
+            <FCText Name="NegativeNumberColor">#f8f9fa</FCText>
+            <FCText Name="PositiveNumberColor">#f8f9fa</FCText>
+            <FCText Name="TextColor">#f8f9fa</FCText>
+          </FCParamGroup>
+          <FCParamGroup Name="TechDraw">
+            <FCParamGroup Name="Colors">
+              <FCUInt Name="Background" Value="556083711"/>
+              <FCUInt Name="CutSurfaceColor" Value="3470056191"/>
+              <FCUInt Name="FaceColor" Value="4059297279"/>
+              <FCUInt Name="GeomHatch" Value="255"/>
+              <FCUInt Name="Hatch" Value="255"/>
+              <FCUInt Name="HiddenColor" Value="255"/>
+              <FCUInt Name="NormalColor" Value="255"/>
+              <FCUInt Name="PreSelectColor" Value="4240710143"/>
+              <FCUInt Name="SelectColor" Value="1958221567"/>
+            </FCParamGroup>
+            <FCParamGroup Name="Decorations">
+              <FCUInt Name="CenterColor" Value="255"/>
+              <FCUInt Name="HighlightColor" Value="255"/>
+              <FCUInt Name="SectionColor" Value="255"/>
+              <FCUInt Name="VertexColor" Value="255"/>
             </FCParamGroup>
           </FCParamGroup>
         </FCParamGroup>
-        <FCParamGroup Name="TreeView">
-          <FCUInt Name="TreeEditColor" Value="1434171135"/>
-          <FCUInt Name="TreeActiveColor" Value="556083711"/>
-          <FCInt Name="ItemBackgroundPadding" Value="11"/>
-          <FCInt Name="FontSize" Value="11"/>
+        <FCParamGroup Name="OutputWindow">
+          <FCUInt Name="colorError" Value="4278190335"/>
+          <FCUInt Name="colorLogging" Value="1437270015"/>
+          <FCUInt Name="colorText" Value="3570717951"/>
+          <FCUInt Name="colorWarning" Value="4252787455"/>
         </FCParamGroup>
-        <FCParamGroup Name="MainWindow">
-          <FCText Name="QtStyle">Fusion</FCText>
-          <FCBool Name="TiledBackground" Value="0"/>
-          <FCText Name="Theme">FreeCAD Dark</FCText>
-          <FCText Name="StyleSheet">FreeCAD Dark.qss</FCText>
-          <FCText Name="OverlayActiveStyleSheet">Dark Theme + Dark Background.qss</FCText>
+        <FCParamGroup Name="Themes">
+          <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
+          <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
+          <FCUInt Name="ThemeAccentColor3" Value="404564735"/>
+        </FCParamGroup>
+        <FCParamGroup Name="TreeView">
+          <FCInt Name="FontSize" Value="11"/>
+          <FCInt Name="ItemBackgroundPadding" Value="11"/>
+          <FCUInt Name="TreeActiveColor" Value="556083711"/>
+          <FCUInt Name="TreeEditColor" Value="1434171135"/>
+        </FCParamGroup>
+        <FCParamGroup Name="View">
+          <FCBool Name="Gradient" Value="0"/>
+          <FCBool Name="RadialGradient" Value="0"/>
+          <FCBool Name="Simple" Value="1"/>
+          <FCBool Name="UseBackgroundColorMid" Value="0"/>
+          <FCUInt Name="AnnotationTextColor" Value="2914369023"/>
+          <FCUInt Name="BackgroundColor" Value="993737727"/>
+          <FCUInt Name="BackgroundColor2" Value="1482187775"/>
+          <FCUInt Name="BackgroundColor3" Value="741103615"/>
+          <FCUInt Name="BackgroundColor4" Value="623200767"/>
+          <FCUInt Name="BoundingBoxColor" Value="4059297279"/>
+          <FCUInt Name="CbLabelColor" Value="2914369023"/>
+          <FCUInt Name="ConstrainedDimColor" Value="4199699199"/>
+          <FCUInt Name="ConstrainedIcoColor" Value="4199699199"/>
+          <FCUInt Name="ConstructionColor" Value="865792255"/>
+          <FCUInt Name="CreateLineColor" Value="4059297279"/>
+          <FCUInt Name="CursorCrosshairColor" Value="4059297279"/>
+          <FCUInt Name="CursorTextColor" Value="2914369023"/>
+          <FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
+          <FCUInt Name="DefaultShapeColor" Value="1920565503"/>
+          <FCUInt Name="EditedEdgeColor" Value="4059297279"/>
+          <FCUInt Name="EditedVertexColor" Value="4199699199"/>
+          <FCUInt Name="ExprBasedConstrDimColor" Value="4252898559"/>
+          <FCUInt Name="ExternalColor" Value="3428706559"/>
+          <FCUInt Name="FullyConstrainedColor" Value="1958221567"/>
+          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2462511359"/>
+          <FCUInt Name="FullyConstraintConstructionPointColor" Value="4205291519"/>
+          <FCUInt Name="FullyConstraintElementColor" Value="11173887"/>
+          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2462511359"/>
+          <FCUInt Name="HighlightColor" Value="611232767"/>
+          <FCUInt Name="InternalAlignedGeoColor" Value="865792255"/>
+          <FCUInt Name="InvalidSketchColor" Value="4252898559"/>
+          <FCUInt Name="NonDrivingConstrDimColor" Value="865792255"/>
+          <FCUInt Name="SelectionColor" Value="899696639"/>
+          <FCUInt Name="SketchEdgeColor" Value="4059297279"/>
+          <FCUInt Name="SketchVertexColor" Value="4059297279"/>
         </FCParamGroup>
       </FCParamGroup>
     </FCParamGroup>
   </FCParamGroup>
-
 </FCParameters>
diff --git a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg
index 6e7f9755a6..e824875c38 100644
--- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
@@ -3,51 +3,101 @@
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
-        <FCParamGroup Name="Themes">
-          <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
-          <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
-          <FCUInt Name="ThemeAccentColor3" Value="3353277951"/>
+        <FCParamGroup Name="Editor">
+          <FCUInt Name="Block comment" Value="730480128"/>
+          <FCUInt Name="Bookmark" Value="192054528"/>
+          <FCUInt Name="Breakpoint" Value="3374983680"/>
+          <FCUInt Name="Character" Value="3374983680"/>
+          <FCUInt Name="Class name" Value="2251201536"/>
+          <FCUInt Name="Comment" Value="730480128"/>
+          <FCUInt Name="Current line highlight" Value="3505127168"/>
+          <FCUInt Name="Define name" Value="2251201536"/>
+          <FCUInt Name="Keyword" Value="911197952"/>
+          <FCUInt Name="Number" Value="1230001920"/>
+          <FCUInt Name="Operator" Value="1230001920"/>
+          <FCUInt Name="Python error" Value="2787003648"/>
+          <FCUInt Name="Python output" Value="3645378304"/>
+          <FCUInt Name="String" Value="730480128"/>
+          <FCUInt Name="Text" Value="556083456"/>
+        </FCParamGroup>
+        <FCParamGroup Name="MainWindow">
+          <FCText Name="OverlayActiveStyleSheet">Light Theme + Light Background.qss</FCText>
+          <FCText Name="QtStyle">Fusion</FCText>
+          <FCText Name="StyleSheet">FreeCAD Light.qss</FCText>
+          <FCText Name="Theme">FreeCAD Light</FCText>
         </FCParamGroup>
         <FCParamGroup Name="Mod">
-          <FCParamGroup Name="Start">
-          </FCParamGroup>
           <FCParamGroup Name="Arch">
-            <FCUInt Name="WallColor" Value="2914369023"/>
-            <FCUInt Name="StructureColor" Value="2257491711"/>
-            <FCUInt Name="RebarColor" Value="4252898559"/>
-            <FCUInt Name="WindowColor" Value="876232959"/>
-            <FCUInt Name="WindowGlassColor" Value="363511807"/>
-            <FCUInt Name="PanelColor" Value="4120838399"/>
             <FCUInt Name="ColorHelpers" Value="1230002175"/>
             <FCUInt Name="defaultSpaceColor" Value="3761320447"/>
+            <FCUInt Name="PanelColor" Value="4120838399"/>
+            <FCUInt Name="RebarColor" Value="4252898559"/>
+            <FCUInt Name="StructureColor" Value="2257491711"/>
+            <FCUInt Name="WallColor" Value="2914369023"/>
+            <FCUInt Name="WindowColor" Value="876232959"/>
+            <FCUInt Name="WindowGlassColor" Value="363511807"/>
+          </FCParamGroup>
+          <FCParamGroup Name="CAM">
+            <FCUInt Name="DefaultBBoxNormalColor" Value="1230002175"/>
+            <FCUInt Name="DefaultBBoxSelectionColor" Value="210082303"/>
+            <FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
+            <FCUInt Name="DefaultNormalPathColor" Value="798901503"/>
+            <FCUInt Name="DefaultPathMarkerColor" Value="798901503"/>
+            <FCUInt Name="DefaultProbePathColor" Value="4205839871"/>
+            <FCUInt Name="DefaultRapidPathColor" Value="3761320447"/>
           </FCParamGroup>
           <FCParamGroup Name="Draft">
+            <FCInt Name="gridTransparency" Value="0"/>
+            <FCUInt Name="color" Value="1920565248"/>
             <FCUInt Name="constructioncolor" Value="746455039"/>
+            <FCUInt Name="DefaultAnnoLineColor" Value="556083711"/>
             <FCUInt Name="gridColor" Value="2914369023"/>
             <FCUInt Name="snapcolor" Value="556083711"/>
-            <FCUInt Name="color" Value="1920565248"/>
-            <FCUInt Name="DefaultAnnoLineColor" Value="556083711"/>
+          </FCParamGroup>
+          <FCParamGroup Name="Measure">
+            <FCParamGroup Name="Appearance">
+              <FCUInt Name="DefaultLineColor" Value="556083711"/>
+              <FCUInt Name="DefaultTextBackgroundColor" Value="4177132287"/>
+              <FCUInt Name="DefaultTextColor" Value="556083711"/>
+            </FCParamGroup>
+          </FCParamGroup>
+          <FCParamGroup Name="Mesh">
+            <FCUInt Name="BackfaceColor" Value="2914369023"/>
+            <FCUInt Name="LineColor" Value="255"/>
+            <FCUInt Name="MeshColor" Value="2914369023"/>
+          </FCParamGroup>
+          <FCParamGroup Name="Sketcher">
+            <FCParamGroup Name="General">
+              <FCUInt Name="GridDivLineColor" Value="3082800383"/>
+              <FCUInt Name="GridLineColor" Value="3082800383"/>
+            </FCParamGroup>
+          </FCParamGroup>
+          <FCParamGroup Name="Spreadsheet">
+            <FCText Name="AliasedCellBackgroundColor">#bac8ff</FCText>
+            <FCText Name="NegativeNumberColor">#212529</FCText>
+            <FCText Name="PositiveNumberColor">#212529</FCText>
+            <FCText Name="TextColor">#212529</FCText>
           </FCParamGroup>
           <FCParamGroup Name="TechDraw">
-            <FCParamGroup Name="Decorations">
-              <FCUInt Name="SectionColor" Value="556083711"/>
-              <FCUInt Name="CenterColor" Value="556083711"/>
-              <FCUInt Name="VertexColor" Value="556083711"/>
-              <FCUInt Name="HighlightColor" Value="556083711"/>
-            </FCParamGroup>
             <FCParamGroup Name="Colors">
               <FCUInt Name="Background" Value="3553874943"/>
-              <FCUInt Name="PreSelectColor" Value="4120838399"/>
-              <FCUInt Name="HiddenColor" Value="556083711"/>
-              <FCUInt Name="SelectColor" Value="1722290175"/>
-              <FCUInt Name="NormalColor" Value="556083711"/>
               <FCUInt Name="CutSurfaceColor" Value="3470056191"/>
               <FCUInt Name="FaceColor" Value="4059297279"/>
               <FCUInt Name="gridColor" Value="556083711"/>
-              <FCUInt Name="PageColor" Value="4059297279"/>
+              <FCUInt Name="HiddenColor" Value="556083711"/>
               <FCUInt Name="LightTextColor" Value="1230002175"/>
+              <FCUInt Name="NormalColor" Value="556083711"/>
+              <FCUInt Name="PageColor" Value="4059297279"/>
+              <FCUInt Name="PreSelectColor" Value="4120838399"/>
+              <FCUInt Name="SelectColor" Value="1722290175"/>
               <FCUInt Name="TemplateUnderlineColor" Value="995875839"/>
             </FCParamGroup>
+            <FCParamGroup Name="Decorations">
+              <FCUInt Name="CenterColor" Value="556083711"/>
+              <FCUInt Name="HighlightColor" Value="556083711"/>
+              <FCUInt Name="SectionColor" Value="556083711"/>
+              <FCUInt Name="VertexColor" Value="556083711"/>
+            </FCParamGroup>
             <FCParamGroup Name="Dimensions">
               <FCUInt Name="Color" Value="556083711"/>
             </FCParamGroup>
@@ -55,160 +105,68 @@
               <FCUInt Name="Color" Value="556083711"/>
             </FCParamGroup>
           </FCParamGroup>
-          <FCParamGroup Name="Path">
-            <FCUInt Name="DefaultNormalPathColor" Value="798901503"/>
-            <FCUInt Name="DefaultRapidPathColor" Value="3761320447"/>
-            <FCUInt Name="DefaultPathMarkerColor" Value="798901503"/>
-            <FCUInt Name="DefaultProbePathColor" Value="4205839871"/>
-            <FCUInt Name="DefaultHighlightPathColor" Value="4252898303"/>
-            <FCUInt Name="DefaultBBoxSelectionColor" Value="210082303"/>
-            <FCUInt Name="DefaultBBoxNormalColor" Value="1230002175"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Part">
-            <FCUInt Name="Dimensions3dColor" Value="3761320447"/>
-            <FCUInt Name="DimensionsAngularColor" Value="426885887"/>
-            <FCUInt Name="DimensionsDeltaColor" Value="210082303"/>
-            <FCFloat Name="MeshAngularDeflection" Value="6.400000000000"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Measure">
-            <FCParamGroup Name="Appearance">
-              <FCBool Name="DefaultMirror" Value="0"/>
-              <FCFloat Name="DefaultDistFactor" Value="1.000000000000"/>
-              <FCInt Name="DefaultFontSize" Value="18"/>
-              <FCUInt Name="DefaultTextColor" Value="556083711"/>
-              <FCUInt Name="DefaultLineColor" Value="556083711"/>
-              <FCUInt Name="DefaultTextBackgroundColor" Value="4177132287"/>
-            </FCParamGroup>
-          </FCParamGroup>
-          <FCParamGroup Name="Mesh">
-            <FCUInt Name="MeshColor" Value="2914369023"/>
-            <FCUInt Name="LineColor" Value="255"/>
-            <FCUInt Name="BackfaceColor" Value="2914369023"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Sketcher">
-            <FCParamGroup Name="General">
-              <FCUInt Name="GridLineColor" Value="3082800383"/>
-              <FCUInt Name="GridDivLineColor" Value="3082800383"/>
-              <FCInt Name="GridDivLinePattern" Value="65535"/>
-              <FCInt Name="GridLinePattern" Value="43690"/>
-            </FCParamGroup>
-            <FCParamGroup Name="View">
-              <FCInt Name="EdgeWidth" Value="3"/>
-              <FCInt Name="ConstructionWidth" Value="2"/>
-              <FCInt Name="InternalWidth" Value="2"/>
-              <FCInt Name="ExternalWidth" Value="2"/>
-              <FCInt Name="EdgePattern" Value="65535"/>
-              <FCInt Name="ConstructionPattern" Value="64764"/>
-              <FCInt Name="InternalPattern" Value="61166"/>
-              <FCInt Name="ExternalPattern" Value="58596"/>
-              <FCUInt Name="BoundingBoxColor" Value="556083711"/>
-            </FCParamGroup>
-            <FCBool Name="AutoRemoveRedundants" Value="1"/>
-          </FCParamGroup>
-          <FCParamGroup Name="PartDesign">
-            <FCBool Name="RefineModel" Value="1"/>
-          </FCParamGroup>
-          <FCParamGroup Name="Spreadsheet">
-            <FCText Name="AliasedCellBackgroundColor">#bac8ff</FCText>
-            <FCText Name="TextColor">#212529</FCText>
-            <FCText Name="PositiveNumberColor">#212529</FCText>
-            <FCText Name="NegativeNumberColor">#212529</FCText>
-          </FCParamGroup>
-        </FCParamGroup>
-        <FCParamGroup Name="View">
-          <FCUInt Name="SketchEdgeColor" Value="556083711"/>
-          <FCUInt Name="SketchVertexColor" Value="556083711"/>
-          <FCUInt Name="EditedEdgeColor" Value="1230002175"/>
-          <FCUInt Name="EditedVertexColor" Value="556083711"/>
-          <FCUInt Name="ConstructionColor" Value="995875839"/>
-          <FCUInt Name="ExternalColor" Value="2923350527"/>
-          <FCUInt Name="InvalidSketchColor" Value="4252898559"/>
-          <FCUInt Name="FullyConstrainedColor" Value="798901503"/>
-          <FCUInt Name="InternalAlignedGeoColor" Value="995875839"/>
-          <FCUInt Name="FullyConstraintElementColor" Value="798901503"/>
-          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2443706367"/>
-          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2443706367"/>
-          <FCUInt Name="FullyConstraintConstructionPointColor" Value="730480383"/>
-          <FCUInt Name="ConstrainedIcoColor" Value="3761320447"/>
-          <FCUInt Name="NonDrivingConstrDimColor" Value="2257491711"/>
-          <FCUInt Name="ConstrainedDimColor" Value="3761320447"/>
-          <FCUInt Name="ExprBasedConstrDimColor" Value="3761320447"/>
-          <FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
-          <FCUInt Name="CursorTextColor" Value="556083711"/>
-          <FCUInt Name="CursorCrosshairColor" Value="556083711"/>
-          <FCUInt Name="CreateLineColor" Value="556083711"/>
-          <FCUInt Name="AnnotationTextColor" Value="876232959"/>
-          <FCBool Name="UseBackgroundColorMid" Value="0"/>
-          <FCUInt Name="BackgroundColor" Value="4294967295"/>
-          <FCUInt Name="BackgroundColor2" Value="3671783167"/>
-          <FCUInt Name="BackgroundColor3" Value="791639295"/>
-          <FCUInt Name="BackgroundColor4" Value="3470056191"/>
-          <FCUInt Name="BacklightColor" Value="4059297279"/>
-          <FCUInt Name="BoundingBoxColor" Value="1230002175"/>
-          <FCUInt Name="DefaultShapeColor" Value="2914369023"/>
-          <FCUInt Name="HighlightColor" Value="2025779455"/>
-          <FCUInt Name="SelectionColor" Value="1114146303"/>
-          <FCUInt Name="CbLabelColor" Value="556083711"/>
-          <FCUInt Name="DefaultShapeLineColor" Value="421075455"/>
-          <FCUInt Name="DefaultShapeVertexColor" Value="421075455"/>
-          <FCUInt Name="HeadlightColor" Value="4059297279"/>
-          <FCUInt Name="ShadowLightColor" Value="4043177728"/>
-          <FCUInt Name="ShadowGroundColor" Value="2105376000"/>
-          <FCUInt Name="HiddenLineFaceColor" Value="4294967040"/>
-          <FCUInt Name="HiddenLineBackground" Value="4294967040"/>
-          <FCBool Name="EnablePreselection" Value="1"/>
-          <FCBool Name="EnableSelection" Value="1"/>
-          <FCInt Name="AntiAliasing" Value="4"/>
-          <FCInt Name="TransparentObjectRenderType" Value="1"/>
-          <FCInt Name="MarkerSize" Value="7"/>
-          <FCBool Name="UseVBO" Value="1"/>
-          <FCBool Name="EnableBacklight" Value="1"/>
-          <FCBool Name="Simple" Value="1"/>
-          <FCBool Name="Gradient" Value="0"/>
-          <FCBool Name="RadialGradient" Value="0"/>
-          <FCInt Name="DefaultShapePointSize" Value="3"/>
-          <FCBool Name="CanAbortRecompute" Value="1"/>
-          <FCInt Name="SegmentsPerGeometry" Value="100"/>
-          <FCFloat Name="PickRadius" Value="16.000000000000"/>
-          <FCFloat Name="ViewScalingFactor" Value="0.640000000000"/>
-        </FCParamGroup>
-        <FCParamGroup Name="OutputWindow">
-          <FCUInt Name="colorText" Value="556083711"/>
-          <FCUInt Name="colorLogging" Value="1437270015"/>
-          <FCUInt Name="colorWarning" Value="4252787455"/>
-          <FCUInt Name="colorError" Value="4278190335"/>
-          <FCBool Name="checkShowReportViewOnError" Value="0"/>
-        </FCParamGroup>
-        <FCParamGroup Name="Editor">
-          <FCUInt Name="Text" Value="556083456"/>
-          <FCUInt Name="Bookmark" Value="192054528"/>
-          <FCUInt Name="Breakpoint" Value="3374983680"/>
-          <FCUInt Name="Keyword" Value="911197952"/>
-          <FCUInt Name="Comment" Value="730480128"/>
-          <FCUInt Name="Block comment" Value="730480128"/>
-          <FCUInt Name="Number" Value="1230001920"/>
-          <FCUInt Name="String" Value="730480128"/>
-          <FCUInt Name="Character" Value="3374983680"/>
-          <FCUInt Name="Class name" Value="2251201536"/>
-          <FCUInt Name="Define name" Value="2251201536"/>
-          <FCUInt Name="Operator" Value="1230001920"/>
-          <FCUInt Name="Python output" Value="3645378304"/>
-          <FCUInt Name="Python error" Value="2787003648"/>
-          <FCUInt Name="Current line highlight" Value="3505127168"/>
-        </FCParamGroup>
-        <FCParamGroup Name="TreeView">
-          <FCUInt Name="TreeEditColor" Value="563609599"/>
-          <FCUInt Name="TreeActiveColor" Value="1538528255"/>
-          <FCBool Name="PreSelection" Value="1"/>
         </FCParamGroup>
         <FCParamGroup Name="NaviCube">
           <FCUInt Name="BaseColor" Value="3505127423"/>
         </FCParamGroup>
-        <FCParamGroup Name="MainWindow">
-          <FCText Name="QtStyle">Fusion</FCText>
-          <FCText Name="Theme">FreeCAD Light</FCText>
-          <FCText Name="StyleSheet">FreeCAD Light.qss</FCText>
-          <FCText Name="OverlayActiveStyleSheet">Light Theme + Light Background.qss</FCText>
+        <FCParamGroup Name="OutputWindow">
+          <FCUInt Name="colorError" Value="4278190335"/>
+          <FCUInt Name="colorLogging" Value="1437270015"/>
+          <FCUInt Name="colorText" Value="556083711"/>
+          <FCUInt Name="colorWarning" Value="4252787455"/>
+        </FCParamGroup>
+        <FCParamGroup Name="Themes">
+          <FCUInt Name="ThemeAccentColor1" Value="1252392959"/>
+          <FCUInt Name="ThemeAccentColor2" Value="3027763199"/>
+          <FCUInt Name="ThemeAccentColor3" Value="3353277951"/>
+        </FCParamGroup>
+        <FCParamGroup Name="TreeView">
+          <FCUInt Name="TreeActiveColor" Value="1538528255"/>
+          <FCUInt Name="TreeEditColor" Value="563609599"/>
+        </FCParamGroup>
+        <FCParamGroup Name="View">
+          <FCBool Name="Gradient" Value="0"/>
+          <FCBool Name="RadialGradient" Value="0"/>
+          <FCBool Name="Simple" Value="1"/>
+          <FCBool Name="UseBackgroundColorMid" Value="0"/>
+          <FCUInt Name="AnnotationTextColor" Value="876232959"/>
+          <FCUInt Name="BackgroundColor" Value="4294967295"/>
+          <FCUInt Name="BackgroundColor2" Value="3671783167"/>
+          <FCUInt Name="BackgroundColor3" Value="791639295"/>
+          <FCUInt Name="BackgroundColor4" Value="3470056191"/>
+          <FCUInt Name="BoundingBoxColor" Value="1230002175"/>
+          <FCUInt Name="CbLabelColor" Value="556083711"/>
+          <FCUInt Name="ConstrainedDimColor" Value="3761320447"/>
+          <FCUInt Name="ConstrainedIcoColor" Value="3761320447"/>
+          <FCUInt Name="ConstructionColor" Value="995875839"/>
+          <FCUInt Name="CreateLineColor" Value="556083711"/>
+          <FCUInt Name="CursorCrosshairColor" Value="556083711"/>
+          <FCUInt Name="CursorTextColor" Value="556083711"/>
+          <FCUInt Name="DeactivatedConstrDimColor" Value="2257491711"/>
+          <FCUInt Name="DefaultShapeColor" Value="2914369023"/>
+          <FCUInt Name="DefaultShapeLineColor" Value="421075455"/>
+          <FCUInt Name="DefaultShapeVertexColor" Value="421075455"/>
+          <FCUInt Name="EditedEdgeColor" Value="1230002175"/>
+          <FCUInt Name="EditedVertexColor" Value="556083711"/>
+          <FCUInt Name="ExprBasedConstrDimColor" Value="3761320447"/>
+          <FCUInt Name="ExternalColor" Value="2923350527"/>
+          <FCUInt Name="FullyConstrainedColor" Value="798901503"/>
+          <FCUInt Name="FullyConstraintConstructionElementColor" Value="2443706367"/>
+          <FCUInt Name="FullyConstraintConstructionPointColor" Value="730480383"/>
+          <FCUInt Name="FullyConstraintElementColor" Value="798901503"/>
+          <FCUInt Name="FullyConstraintInternalAlignmentColor" Value="2443706367"/>
+          <FCUInt Name="HeadlightColor" Value="4059297279"/>
+          <FCUInt Name="HiddenLineBackground" Value="4294967040"/>
+          <FCUInt Name="HiddenLineFaceColor" Value="4294967040"/>
+          <FCUInt Name="HighlightColor" Value="2025779455"/>
+          <FCUInt Name="InternalAlignedGeoColor" Value="995875839"/>
+          <FCUInt Name="InvalidSketchColor" Value="4252898559"/>
+          <FCUInt Name="NonDrivingConstrDimColor" Value="2257491711"/>
+          <FCUInt Name="SelectionColor" Value="1114146303"/>
+          <FCUInt Name="ShadowGroundColor" Value="2105376000"/>
+          <FCUInt Name="ShadowLightColor" Value="4043177728"/>
+          <FCUInt Name="SketchEdgeColor" Value="556083711"/>
+          <FCUInt Name="SketchVertexColor" Value="556083711"/>
         </FCParamGroup>
       </FCParamGroup>
     </FCParamGroup>