diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp
index 8bd9dfca76..a280f33d22 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.cpp
+++ b/src/Mod/TechDraw/App/DrawViewPart.cpp
@@ -626,8 +626,8 @@ gp_Pln DrawViewPart::getProjPlane() const
 void DrawViewPart::getRunControl()
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
-        .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/RunControl");
-    m_sectionEdges = hGrp->GetBool("ShowSectionEdges", 1l);
+        .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General");
+    m_sectionEdges = hGrp->GetBool("ShowSectionEdges", 0l);
     m_handleFaces = hGrp->GetBool("HandleFaces", 1l);
     //Base::Console().Message("TRACE - DVP::getRunControl - handleFaces: %d\n",m_handleFaces);
 }
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
index 32ba4f5814..f270f9b239 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -7,525 +7,640 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>610</height>
+    <height>648</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>TechDraw 1</string>
   </property>
-  <widget class="QGroupBox" name="gb_Templates">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>450</y>
-     <width>531</width>
-     <height>151</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Files</string>
-   </property>
-   <widget class="QWidget" name="gridLayoutWidget_3">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>30</y>
-      <width>491</width>
-      <height>118</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Template Directory</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Default Template</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
-       <property name="mode">
-        <enum>Gui::FileChooser::Directory</enum>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>TemplateDir</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Files</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="lbl_Hatch">
-       <property name="text">
-        <string>Default Pattern File</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
-       <property name="prefEntry" stdset="0">
-        <cstring>TemplateFile</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Files</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
-       <property name="prefEntry" stdset="0">
-        <cstring>FileHatch</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Files</cstring>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QGroupBox" name="gb_Font">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>330</y>
-     <width>541</width>
-     <height>121</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="title">
-    <string>Labels</string>
-   </property>
-   <widget class="QWidget" name="gridLayoutWidget_2">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>30</y>
-      <width>491</width>
-      <height>71</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
-     <item row="1" column="2">
-      <widget class="Gui::PrefDoubleSpinBox" name="dsb_LabelSize">
-       <property name="minimum">
-        <double>0.100000000000000</double>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>LabelSize</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Labels</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="lbl_LabelFont">
-       <property name="text">
-        <string>Label Font</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="0" column="2">
-      <widget class="Gui::PrefLineEdit" name="le_LabelFont">
-       <property name="text">
-        <string>osifont</string>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>LabelFont</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>Mod/TechDraw/Labels</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Label Size</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QGroupBox" name="gbMisc">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>521</width>
-     <height>141</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>General</string>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_Angle">
-        <property name="text">
-         <string>Projection Angle</string>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="gbMisc">
+     <property name="title">
+      <string>General</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
         </property>
-       </widget>
+        <item row="0" column="0">
+         <widget class="QLabel" name="lbl_Angle">
+          <property name="text">
+           <string>Projection Angle</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="Gui::PrefComboBox" name="cb_Angle">
+          <property name="prefEntry" stdset="0">
+           <cstring>ProjectionAngle</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>First</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Third</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="lbl_HidLine">
+          <property name="text">
+           <string>Hidden Line</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="Gui::PrefComboBox" name="cb_HidLine">
+          <property name="currentIndex">
+           <number>1</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>HiddenLine</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/General</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>NeverShow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Solid</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dash</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDotDot</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="Gui::PrefCheckBox" name="cb_Faces">
+          <property name="text">
+           <string>Detect Faces</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>HandleFaces</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="Gui::PrefCheckBox" name="cb_SectionEdges">
+          <property name="text">
+           <string>Show Section Edges</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>ShowSectionEdges</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="0" column="1">
-       <widget class="Gui::PrefComboBox" name="cb_Angle">
-        <property name="prefEntry" stdset="0">
-         <cstring>ProjectionAngle</cstring>
+      <item>
+       <spacer name="verticalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-        <property name="prefPath" stdset="0">
-         <cstring>/Mod/TechDraw/General</cstring>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-        <item>
-         <property name="text">
-          <string>First</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Third</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_HidLine">
-        <property name="text">
-         <string>Hidden Line</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="Gui::PrefComboBox" name="cb_HidLine">
-        <property name="currentIndex">
-         <number>1</number>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>HiddenLine</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/General</cstring>
-        </property>
-        <item>
-         <property name="text">
-          <string>NeverShow</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Solid</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Dash</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Dot</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>DashDot</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>DashDotDot</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="Gui::PrefCheckBox" name="cb_Faces">
-        <property name="text">
-         <string>Detect Faces</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>HandleFaces</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>/Mod/TechDraw/General</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="Gui::PrefCheckBox" name="cb_SectionEdges">
-        <property name="text">
-         <string>Show Section Edges</string>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>ShowSectionEdges</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>/Mod/TechDraw/General</cstring>
-        </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QGroupBox" name="gb_Colors">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>160</y>
-     <width>521</width>
-     <height>164</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Colors</string>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="4">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Section Hatch</string>
-        </property>
-       </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="gb_Colors">
+     <property name="title">
+      <string>Colors</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="2" column="4">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Section Hatch</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Section Face</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefColorButton" name="pcb_Background">
+          <property name="color">
+           <color>
+            <red>80</red>
+            <green>80</green>
+            <blue>80</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>Background</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="Gui::PrefColorButton" name="pcb_PreSelect">
+          <property name="color">
+           <color>
+            <red>255</red>
+            <green>255</green>
+            <blue>20</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>PreSelectColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="lbl_Normal">
+          <property name="text">
+           <string>Normal</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="6">
+         <widget class="Gui::PrefColorButton" name="pcb_Hidden">
+          <property name="prefEntry" stdset="0">
+           <cstring>HiddenColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefColorButton" name="pcb_Select">
+          <property name="color">
+           <color>
+            <red>28</red>
+            <green>173</green>
+            <blue>28</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>SelectColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="5">
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="2">
+         <widget class="Gui::PrefColorButton" name="pcb_Normal">
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>NormalColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="lbl_PreSelect">
+          <property name="text">
+           <string>PreSelected</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4">
+         <widget class="QLabel" name="lbl_Hidden">
+          <property name="text">
+           <string>Hidden Line</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="6">
+         <widget class="Gui::PrefColorButton" name="pcb_Surface">
+          <property name="color">
+           <color>
+            <red>225</red>
+            <green>225</green>
+            <blue>225</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>CutSurfaceColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="lbl_Select">
+          <property name="text">
+           <string>Selected</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="6">
+         <widget class="Gui::PrefColorButton" name="pcb_Hatch">
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>Hatch</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Background</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="4">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>Geom Hatch</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="6">
+         <widget class="Gui::PrefColorButton" name="colorButton">
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>GeomHatch</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Colors</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="4">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Section Face</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="Gui::PrefColorButton" name="pcb_Background">
-        <property name="color">
-         <color>
-          <red>80</red>
-          <green>80</green>
-          <blue>80</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>Background</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>/Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="Gui::PrefColorButton" name="pcb_PreSelect">
-        <property name="color">
-         <color>
-          <red>255</red>
-          <green>255</green>
-          <blue>20</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>PreSelectColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_Normal">
-        <property name="text">
-         <string>Normal</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="6">
-       <widget class="Gui::PrefColorButton" name="pcb_Hidden">
-        <property name="prefEntry" stdset="0">
-         <cstring>HiddenColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <spacer name="horizontalSpacer">
+      <item>
+       <spacer name="verticalSpacer_3">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
-          <height>20</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="2" column="2">
-       <widget class="Gui::PrefColorButton" name="pcb_Select">
-        <property name="color">
-         <color>
-          <red>28</red>
-          <green>173</green>
-          <blue>28</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>SelectColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5">
-       <spacer name="horizontalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="2">
-       <widget class="Gui::PrefColorButton" name="pcb_Normal">
-        <property name="color">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>NormalColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_PreSelect">
-        <property name="text">
-         <string>PreSelected</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4">
-       <widget class="QLabel" name="lbl_Hidden">
-        <property name="text">
-         <string>Hidden Line</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="6">
-       <widget class="Gui::PrefColorButton" name="pcb_Surface">
-        <property name="color">
-         <color>
-          <red>225</red>
-          <green>225</green>
-          <blue>225</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>CutSurfaceColor</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lbl_Select">
-        <property name="text">
-         <string>Selected</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="6">
-       <widget class="Gui::PrefColorButton" name="pcb_Hatch">
-        <property name="color">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-        <property name="prefEntry" stdset="0">
-         <cstring>Hatch</cstring>
-        </property>
-        <property name="prefPath" stdset="0">
-         <cstring>/Mod/TechDraw/Colors</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Background</string>
-        </property>
-       </widget>
-      </item>
      </layout>
-    </item>
-   </layout>
-  </widget>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="gb_Templates">
+     <property name="title">
+      <string>Files</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Template Directory</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Default Template</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
+          <property name="mode">
+           <enum>Gui::FileChooser::Directory</enum>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateDir</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="lbl_Hatch">
+          <property name="text">
+           <string>Hatch Image</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateFile</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
+          <property name="toolTip">
+           <string>Location of default svg/png fill file</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FileHatch</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>PAT File</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="Gui::PrefFileChooser" name="fileChooser">
+          <property name="toolTip">
+           <string>Default location for PAT file</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FilePattern</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/PAT</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_4">
+        <item row="0" column="2">
+         <widget class="Gui::PrefLineEdit" name="lineEdit">
+          <property name="toolTip">
+           <string>Default PAT pattern</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>NamePattern</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/PAT</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_8">
+          <property name="text">
+           <string>Pattern Name</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="gb_Font">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Labels</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
+        <item row="1" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="dsb_LabelSize">
+          <property name="minimum">
+           <double>0.100000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>LabelSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Labels</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="lbl_LabelFont">
+          <property name="text">
+           <string>Label Font</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="Gui::PrefLineEdit" name="le_LabelFont">
+          <property name="text">
+           <string>osifont</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>LabelFont</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Labels</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Label Size</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
index f25d234778..0e56034a06 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
@@ -13,421 +13,467 @@
   <property name="windowTitle">
    <string>TechDraw 2</string>
   </property>
-  <widget class="QGroupBox" name="gbDim">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>20</y>
-     <width>501</width>
-     <height>161</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Dimensions</string>
-   </property>
-   <widget class="QWidget" name="gridLayoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>30</y>
-      <width>471</width>
-      <height>125</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout" columnstretch="1,2,1">
-     <item row="0" column="0">
-      <widget class="Gui::PrefCheckBox" name="cbShowUnits">
-       <property name="text">
-        <string>Show Units</string>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>ShowUnits</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Dimensions</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Font Size</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="1" column="2">
-      <widget class="Gui::PrefDoubleSpinBox" name="dsbFontSize">
-       <property name="decimals">
-        <number>1</number>
-       </property>
-       <property name="value">
-        <double>4.000000000000000</double>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>FontSize</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Dimensions</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <widget class="Gui::PrefColorButton" name="colDimColor">
-       <property name="color">
-        <color>
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>Color</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Dimensions</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Diameter Symbol</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2">
-      <widget class="Gui::PrefLineEdit" name="leDiameter">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>⌀</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>DiameterSymbol</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Dimensions</cstring>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QGroupBox" name="groupBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>190</y>
-     <width>501</width>
-     <height>231</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string>Decorations</string>
-   </property>
-   <widget class="QWidget" name="gridLayoutWidget_2">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>30</y>
-      <width>471</width>
-      <height>194</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,2,1">
-     <item row="0" column="2">
-      <widget class="Gui::PrefComboBox" name="pcbMatting">
-       <property name="prefEntry" stdset="0">
-        <cstring>MattingStyle</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Decorations</cstring>
-       </property>
-       <item>
-        <property name="text">
-         <string>Round</string>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="gbDim">
+     <property name="title">
+      <string>Dimensions</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout" columnstretch="1,2,1">
+        <item row="0" column="0">
+         <widget class="Gui::PrefCheckBox" name="cbShowUnits">
+          <property name="text">
+           <string>Show Units</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>ShowUnits</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Color</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Font Size</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="dsbFontSize">
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="decimals">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <double>4.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>FontSize</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefColorButton" name="colDimColor">
+          <property name="color">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>Color</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_8">
+          <property name="text">
+           <string>Diameter Symbol</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefLineEdit" name="leDiameter">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>⌀</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>DiameterSymbol</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Square</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-       </item>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Section Line Style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Center Line Style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Matting Style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <widget class="Gui::PrefColorButton" name="colCenterLine">
-       <property name="color">
-        <color>
-         <red>175</red>
-         <green>175</green>
-         <blue>175</blue>
-        </color>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>CenterColor</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Decorations</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="Gui::PrefComboBox" name="pcbCenterStyle">
-       <property name="currentIndex">
-        <number>2</number>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>CenterLine</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Decorations</cstring>
-       </property>
-       <item>
-        <property name="text">
-         <string>NeverShow</string>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Decorations</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,2,1">
+        <item row="0" column="2">
+         <widget class="Gui::PrefComboBox" name="pcbMatting">
+          <property name="prefEntry" stdset="0">
+           <cstring>MattingStyle</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Decorations</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>Round</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Square</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Section Line Style</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Center Line Style</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Matting Style</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="Gui::PrefColorButton" name="colCenterLine">
+          <property name="color">
+           <color>
+            <red>175</red>
+            <green>175</green>
+            <blue>175</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>CenterColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Decorations</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="Gui::PrefComboBox" name="pcbCenterStyle">
+          <property name="currentIndex">
+           <number>2</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>CenterLine</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Decorations</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>NeverShow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Sollid</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dash</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDotDot</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefComboBox" name="pcbSectionStyle">
+          <property name="currentIndex">
+           <number>2</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>SectionLine</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Decorations</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>NeverShow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Solid</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dash</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDot</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>DashDotDot</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Center Line Color</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>Section Line Color</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2">
+         <widget class="Gui::PrefColorButton" name="colSectionLine">
+          <property name="color">
+           <color>
+            <red>175</red>
+            <green>175</green>
+            <blue>175</blue>
+           </color>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>SectionColor</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Decorations</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>Arrow Style</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2">
+         <widget class="Gui::PrefComboBox" name="pcbArrow">
+          <property name="toolTip">
+           <string>Preferred arrowhead style</string>
+          </property>
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <property name="maxVisibleItems">
+           <number>5</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>ArrowStyle</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/Decorations</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>0 - Filled Triangle</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/icons/arrowfilled.svg</normalon>
+            </iconset>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1 - Open Arrowhead</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/icons/arrowopen.svg</normalon>
+            </iconset>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>2 - Tick</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/icons/arrowtick.svg</normalon>
+            </iconset>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>3 - Dot</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/icons/arrowdot.svg</normalon>
+            </iconset>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>4 - Open Circle</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normalon>:/icons/arrowopendot.svg</normalon>
+            </iconset>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="label_10">
+          <property name="toolTip">
+           <string>Default weight for GeomHatch lines</string>
+          </property>
+          <property name="text">
+           <string>Hatch Weight</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="2">
+         <widget class="Gui::PrefDoubleSpinBox" name="doubleSpinBox">
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="value">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>GeomWeight</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/TechDraw/PAT</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Sollid</string>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
         </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Dash</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Dot</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>DashDot</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>DashDotDot</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="3" column="2">
-      <widget class="Gui::PrefComboBox" name="pcbSectionStyle">
-       <property name="currentIndex">
-        <number>2</number>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>SectionLine</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Decorations</cstring>
-       </property>
-       <item>
-        <property name="text">
-         <string>NeverShow</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Solid</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Dash</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Dot</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>DashDot</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>DashDotDot</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Center Line Color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Section Line Color</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="2">
-      <widget class="Gui::PrefColorButton" name="colSectionLine">
-       <property name="color">
-        <color>
-         <red>175</red>
-         <green>175</green>
-         <blue>175</blue>
-        </color>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>SectionColor</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>/Mod/TechDraw/Decorations</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>Arrow Style</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="2">
-      <widget class="Gui::PrefComboBox" name="pcbArrow">
-       <property name="toolTip">
-        <string>Preferred arrowhead style</string>
-       </property>
-       <property name="currentIndex">
-        <number>0</number>
-       </property>
-       <property name="maxVisibleItems">
-        <number>5</number>
-       </property>
-       <property name="prefEntry" stdset="0">
-        <cstring>ArrowStyle</cstring>
-       </property>
-       <property name="prefPath" stdset="0">
-        <cstring>Mod/TechDraw/Decorations</cstring>
-       </property>
-       <item>
-        <property name="text">
-         <string>0 - Filled Triangle</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/icons/arrowfilled.svg</normalon>
-         </iconset>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>1 - Open Arrowhead</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/icons/arrowopen.svg</normalon>
-         </iconset>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>2 - Tick</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/icons/arrowtick.svg</normalon>
-         </iconset>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>3 - Dot</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/icons/arrowdot.svg</normalon>
-         </iconset>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>4 - Open Circle</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normalon>:/icons/arrowopendot.svg</normalon>
-         </iconset>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
   <customwidget>