diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fb3379e..39798946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta
 - Excellon and Geometry objects no longer have the self.options dict overwritten with the application defaults
 - Drilling Tool - first tool that benefit from using the object options instead of application defaults; this is useful if an object is recreated on project load
 - Drilling Tool - fixed it to update the UI form also for common parameters on object change
+- new Application Objects will hold all the options that start with 'tools_'
 
 10.12.2020
 
diff --git a/appObjects/AppObject.py b/appObjects/AppObject.py
index 9549ebf4..55c77992 100644
--- a/appObjects/AppObject.py
+++ b/appObjects/AppObject.py
@@ -136,6 +136,7 @@ class AppObject(QtCore.QObject):
                 obj.options[oname] = self.app.options[option]
 
         # add some of the FlatCAM Tools related properties
+        # it is done like this to preserve some kind of order in the keys
         if kind == 'excellon':
             for option in self.app.options:
                 if option.find('tools_drill_') == 0:
@@ -150,7 +151,9 @@ class AppObject(QtCore.QObject):
             for option in self.app.options:
                 if option.find('tools_mill_') == 0:
                     obj.options[option] = self.app.options[option]
-
+            for option in self.app.options:
+                if option.find('tools_') == 0:
+                    obj.options[option] = self.app.options[option]
         # ############################################################################################################
         # ############################################################################################################