diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eef3f28..16178d09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
 
 - refactored the Isolation Plugin class
 - some more work on the Isolation plugin
+- fixed more issues in the `ncc` and `paint` Tcl commands (missing `segx` and `segy` keys)
 
 29.01.2022
 
diff --git a/tclCommands/TclCommandCopperClear.py b/tclCommands/TclCommandCopperClear.py
index e5addd94..71aa9d55 100644
--- a/tclCommands/TclCommandCopperClear.py
+++ b/tclCommands/TclCommandCopperClear.py
@@ -193,35 +193,7 @@ class TclCommandCopperClear(TclCommand):
         default_data.update({
             "name":             outname,
             "plot":             False,
-            "tools_mill_cutz":             self.app.defaults["tools_mill_cutz"],
-            "tools_mill_vtipdia":          float(self.app.defaults["tools_mill_vtipdia"]),
-            "tools_mill_vtipangle":        float(self.app.defaults["tools_mill_vtipangle"]),
-            "tools_mill_travelz":          self.app.defaults["tools_mill_travelz"],
-            "tools_mill_feedrate":         self.app.defaults["tools_mill_feedrate"],
-            "tools_mill_feedrate_z":       self.app.defaults["tools_mill_feedrate_z"],
-            "tools_mill_feedrate_rapid":   self.app.defaults["tools_mill_feedrate_rapid"],
-            "tools_mill_dwell":            self.app.defaults["tools_mill_dwell"],
-            "tools_mill_dwelltime":        self.app.defaults["tools_mill_dwelltime"],
-            "tools_mill_multidepth":       self.app.defaults["tools_mill_multidepth"],
-            "tools_mill_ppname_g":         self.app.defaults["tools_mill_ppname_g"],
-            "tools_mill_depthperpass":     self.app.defaults["tools_mill_depthperpass"],
-            "tools_mill_extracut":         self.app.defaults["tools_mill_extracut"],
-            "tools_mill_extracut_length":  self.app.defaults["tools_mill_extracut_length"],
-            "tools_mill_toolchange":       self.app.defaults["tools_mill_toolchange"],
-            "tools_mill_toolchangez":      self.app.defaults["tools_mill_toolchangez"],
-            "tools_mill_endz":             self.app.defaults["tools_mill_endz"],
-            "tools_mill_endxy":            self.app.defaults["tools_mill_endxy"],
-            "tools_mill_spindlespeed":     self.app.defaults["tools_mill_spindlespeed"],
-            "tools_mill_toolchangexy":     self.app.defaults["tools_mill_toolchangexy"],
-            "tools_mill_startz":           self.app.defaults["tools_mill_startz"],
-
-            "area_exclusion":               self.app.defaults["tools_mill_area_exclusion"],
-            "area_shape":                   self.app.defaults["tools_mill_area_shape"],
-            "area_strategy":                self.app.defaults["tools_mill_area_strategy"],
-            "area_overz":                   float(self.app.defaults["tools_mill_area_overz"]),
-
-            "tooldia":                      tooldia,
-            "tools_ncc_operation":          self.app.defaults["tools_ncc_operation"],
+            "tooldia": tooldia,
 
             "tools_ncc_margin":             margin,
             "tools_ncc_method":             method_data,
@@ -230,9 +202,8 @@ class TclCommandCopperClear(TclCommand):
             "tools_ncc_contour":            contour,
             "tools_ncc_overlap":            overlap,
 
-            "tools_ncc_offset_choice":      self.app.defaults["tools_ncc_offset_choice"],
-            "tools_ncc_offset_value":       self.app.defaults["tools_ncc_offset_value"],
-            "tools_ncc_milling_type":       self.app.defaults["tools_ncc_milling_type"]
+            "segx":                         self.app.defaults["geometry_segx"],
+            "segy":                         self.app.defaults["geometry_segy"]
         })
         ncc_tools = {}
 
diff --git a/tclCommands/TclCommandPaint.py b/tclCommands/TclCommandPaint.py
index 06145309..2e743703 100644
--- a/tclCommands/TclCommandPaint.py
+++ b/tclCommands/TclCommandPaint.py
@@ -180,54 +180,28 @@ class TclCommandPaint(TclCommand):
         default_data.update({
             "name":                 outname,
             "plot":                 False,
-            "cutz":                 self.app.defaults["tools_mill_cutz"],
-            "vtipdia":              float(self.app.defaults["tools_paint_tipdia"]),
-            "vtipangle":            float(self.app.defaults["tools_paint_tipangle"]),
-            "travelz":              self.app.defaults["tools_mill_travelz"],
-            "feedrate":             self.app.defaults["tools_mill_feedrate"],
-            "feedrate_z":           self.app.defaults["tools_mill_feedrate_z"],
-            "feedrate_rapid":       self.app.defaults["tools_mill_feedrate_rapid"],
-            "dwell":                self.app.defaults["tools_mill_dwell"],
-            "dwelltime":            self.app.defaults["tools_mill_dwelltime"],
-            "multidepth":           self.app.defaults["tools_mill_multidepth"],
-            "ppname_g":             self.app.defaults["tools_mill_ppname_g"],
-            "depthperpass":         self.app.defaults["tools_mill_depthperpass"],
-            "extracut":             self.app.defaults["tools_mill_extracut"],
-            "extracut_length":      self.app.defaults["tools_mill_extracut_length"],
-            "toolchange":           self.app.defaults["tools_mill_toolchange"],
-            "toolchangez":          self.app.defaults["tools_mill_toolchangez"],
-            "endz":                 self.app.defaults["tools_mill_endz"],
-            "endxy":                self.app.defaults["tools_mill_endxy"],
-
-            "spindlespeed":         self.app.defaults["tools_mill_spindlespeed"],
-            "toolchangexy":         self.app.defaults["tools_mill_toolchangexy"],
-            "startz":               self.app.defaults["tools_mill_startz"],
-
-            "area_exclusion":       self.app.defaults["tools_mill_area_exclusion"],
-            "area_shape":           self.app.defaults["tools_mill_area_shape"],
-            "area_strategy":        self.app.defaults["tools_mill_area_strategy"],
-            "area_overz":           float(self.app.defaults["tools_mill_area_overz"]),
-
-            "tooldia":                  tooldia,
+            "tooldia":              tooldia,
+            "tools_mill_cutz":                 self.app.defaults["tools_mill_cutz"],
+            "tools_paint_tipdia":              float(self.app.defaults["tools_paint_tipdia"]),
+            "tools_paint_tipangle":            float(self.app.defaults["tools_paint_tipangle"]),
             "tools_paint_offset":       offset,
             "tools_paint_method":       method,
             "tools_paint_selectmethod": select,
             "tools_paint_connect":      connect,
             "tools_paint_contour":      contour,
-            "tools_paint_overlap":      overlap
+            "tools_paint_overlap":      overlap,
+            "segx": self.app.defaults["geometry_segx"],
+            "segy": self.app.defaults["geometry_segy"]
         })
-        paint_tools = {}
 
+        # create a `tools` dict
+        paint_tools = {}
         tooluid = 0
         for tool in tools:
             tooluid += 1
             paint_tools.update({
                 int(tooluid): {
                     'tooldia': self.app.dec_format(float(tool), self.app.decimals),
-                    'offset': 'Path',
-                    'offset_value': 0.0,
-                    'type': 'Iso',
-                    'tool_type': 'C1',
                     'data': dict(default_data),
                     'solid_geometry': []
                 }