diff --git a/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg
index e05cfdfba9..7cf4314992 100644
--- a/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Classic/FreeCAD Classic.cfg	
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FCParameters>
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
@@ -12,7 +13,6 @@
           <FCUInt Name="SelectionColor" Value="481107199"/>
           <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"/>
@@ -26,13 +26,11 @@
           <FCUInt Name="DefaultAmbientColor" Value="1431655935"/>
           <FCUInt Name="DefaultEmissiveColor" Value="255"/>
           <FCUInt Name="DefaultSpecularColor" Value="2290649343"/>
-          <FCBool Name="RandomColor" Value="0"/>
           <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="SketchEdgeColor" Value="4294967295"/>
           <FCUInt Name="SketchVertexColor" Value="4294967295"/>
@@ -70,7 +68,6 @@
           <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"/>
@@ -80,7 +77,6 @@
         </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"/>
@@ -96,7 +92,6 @@
           </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"/>
@@ -119,7 +114,6 @@
               <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"/>
@@ -128,102 +122,11 @@
               <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"/>
@@ -239,31 +142,13 @@
             <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"/>
diff --git a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg
index 20382651e8..05e9d96555 100644
--- a/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Dark/FreeCAD Dark.cfg	
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FCParameters>
-
   <FCParamGroup Name="Root">
     <FCParamGroup Name="BaseApp">
       <FCParamGroup Name="Preferences">
@@ -31,33 +30,17 @@
           <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"/>
@@ -79,7 +62,6 @@
           <FCUInt Name="Python output" Value="2863300352"/>
           <FCUInt Name="Python error" Value="4252787200"/>
           <FCUInt Name="Current line highlight" Value="524114944"/>
-          <FCInt Name="FontSize" Value="10"/>
         </FCParamGroup>
         <FCParamGroup Name="OutputWindow">
           <FCUInt Name="colorText" Value="3570717951"/>
@@ -87,12 +69,7 @@
           <FCUInt Name="colorWarning" Value="4252787455"/>
           <FCUInt Name="colorError" Value="4278190335"/>
         </FCParamGroup>
-        <FCParamGroup Name="OpenGL">
-          <FCBool Name="UseSoftwareOpenGL" Value="0"/>
-        </FCParamGroup>
         <FCParamGroup Name="Mod">
-          <FCParamGroup Name="Start">
-          </FCParamGroup>
           <FCParamGroup Name="Arch">
             <FCUInt Name="WallColor" Value="3604403967"/>
             <FCUInt Name="StructureColor" Value="2527705855"/>
@@ -105,9 +82,6 @@
           </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"/>
@@ -121,7 +95,6 @@
               <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"/>
@@ -133,7 +106,7 @@
               <FCUInt Name="FaceColor" Value="4059297279"/>
             </FCParamGroup>
           </FCParamGroup>
-          <FCParamGroup Name="Path">
+          <FCParamGroup Name="CAM">
             <FCUInt Name="DefaultNormalPathColor" Value="1086347263"/>
             <FCUInt Name="DefaultRapidPathColor" Value="4199699199"/>
             <FCUInt Name="DefaultPathMarkerColor" Value="1958221567"/>
@@ -142,11 +115,6 @@
             <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"/>
-          </FCParamGroup>
           <FCParamGroup Name="Draft">
             <FCInt Name="gridTransparency" Value="0"/>
             <FCUInt Name="constructioncolor" Value="746455039"/>
@@ -176,7 +144,6 @@
         </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>
@@ -184,5 +151,4 @@
       </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 85c4bd80cc..8962929fc1 100644
--- a/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
+++ b/src/Gui/PreferencePacks/FreeCAD Light/FreeCAD Light.cfg	
@@ -9,8 +9,6 @@
           <FCUInt Name="ThemeAccentColor3" Value="3353277951"/>
         </FCParamGroup>
         <FCParamGroup Name="Mod">
-          <FCParamGroup Name="Start">
-          </FCParamGroup>
           <FCParamGroup Name="Arch">
             <FCUInt Name="WallColor" Value="2914369023"/>
             <FCUInt Name="StructureColor" Value="2257491711"/>
@@ -55,7 +53,7 @@
               <FCUInt Name="Color" Value="556083711"/>
             </FCParamGroup>
           </FCParamGroup>
-          <FCParamGroup Name="Path">
+          <FCParamGroup Name="CAM">
             <FCUInt Name="DefaultNormalPathColor" Value="798901503"/>
             <FCUInt Name="DefaultRapidPathColor" Value="3761320447"/>
             <FCUInt Name="DefaultPathMarkerColor" Value="798901503"/>
@@ -64,17 +62,8 @@
             <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"/>
@@ -103,10 +92,6 @@
               <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>
@@ -143,7 +128,6 @@
           <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"/>
@@ -156,27 +140,17 @@
           <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="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"/>
@@ -198,7 +172,6 @@
         <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"/>