diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index ee849cfa8a..e2fb8e5189 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>536</width>
-    <height>672</height>
+    <height>752</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -36,46 +36,7 @@
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
          <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="l_ccx_binary_std">
-            <property name="text">
-             <string>CalculiX binary</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
-            <property name="text">
-             <string>Use standard ccx binary path</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>UseStandardCcxLocation</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="l_ccx_binary_path">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>ccx binary path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
+          <item row="3" column="1">
            <widget class="Gui::PrefFileChooser" name="fc_ccx_binary_path" native="true">
             <property name="enabled">
              <bool>false</bool>
@@ -115,14 +76,14 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="4" column="0">
            <widget class="QLabel" name="l_editor">
             <property name="text">
              <string>Editor</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="4" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_int_editor">
             <property name="text">
              <string>Use internal editor for .inp files</string>
@@ -138,7 +99,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="5" column="0">
            <widget class="QLabel" name="l_ext_editor">
             <property name="enabled">
              <bool>false</bool>
@@ -154,7 +115,46 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="2" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
+            <property name="text">
+             <string>Use standard ccx binary path</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>UseStandardCcxLocation</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="l_ccx_binary_path">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>ccx binary path:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_editor_3">
+            <property name="text">
+             <string>Solver frame work to run CalculiX with</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
            <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
             <property name="enabled">
              <bool>false</bool>
@@ -167,14 +167,14 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item row="6" column="0">
            <widget class="QLabel" name="l_editor_2">
             <property name="text">
              <string>Split .inp</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
+          <item row="6" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_split_inp_writer">
             <property name="enabled">
              <bool>true</bool>
@@ -193,6 +193,57 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="l_ccx_binary_std">
+            <property name="text">
+             <string>CalculiX binary</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_new">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>General FEM solver framework</string>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>useNewSolverFrameWork</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_old">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="accessibleDescription">
+             <string>sdfsdfsdfds</string>
+            </property>
+            <property name="text">
+             <string>CCX Tools (well tested)</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>useOldSolverFrameWork</cstring>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -457,7 +508,7 @@
             </property>
            </widget>
           </item>
-           <item row="7" column="1">
+          <item row="7" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_BeamShellOutput">
             <property name="text">
              <string>3D Output, unchecked for 2D</string>
@@ -557,7 +608,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
-         <layout class="QGridLayout" name="gl_freuq">
+         <layout class="QGridLayout" name="gl_frequ" columnstretch="0,0,0">
           <item row="1" column="1">
            <widget class="Gui::PrefSpinBox" name="sb_eigenmode_number">
             <property name="maximum">
@@ -697,6 +748,11 @@
    <extends>QDoubleSpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefRadioButton</class>
+   <extends>QRadioButton</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="Resources/Fem.qrc"/>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
index c274c28221..f76dcf96db 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
@@ -71,6 +71,8 @@ void DlgSettingsFemCcxImp::saveSettings()
     cb_ccx_binary_std->onSave();
     fc_ccx_binary_path->onSave();
     cb_split_inp_writer->onSave();
+    rb_ccx_solver_old->onSave();
+    rb_ccx_solver_new->onSave();
 }
 
 void DlgSettingsFemCcxImp::loadSettings()
@@ -96,6 +98,8 @@ void DlgSettingsFemCcxImp::loadSettings()
     cb_ccx_binary_std->onRestore();
     fc_ccx_binary_path->onRestore();
     cb_split_inp_writer->onRestore();
+    rb_ccx_solver_old->onRestore();
+    rb_ccx_solver_new->onRestore();
 
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
         ("User parameter:BaseApp/Preferences/Mod/Fem/Ccx");