diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90aa2649..4fd3f82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta
 - Drilling Tool - fixed a bug where this Tool will work on a previous version of the selected Excellon object (in case that the object was altered between launch of the Drilling Tool and the GCode generation)
 - added some color coded titles in some Application Tools that hold multiple functions
 - in ObjectCollection class made sure to use the log handler defined in the App class
+- minor changes in App.__init__()
 
 9.11.2020
 
diff --git a/appGUI/preferences/PreferencesUIManager.py b/appGUI/preferences/PreferencesUIManager.py
index 175112e5..04eef80c 100644
--- a/appGUI/preferences/PreferencesUIManager.py
+++ b/appGUI/preferences/PreferencesUIManager.py
@@ -81,7 +81,7 @@ class PreferencesUIManager:
             "global_theme": self.ui.general_defaults_form.general_gui_group.theme_radio,
             "global_gray_icons": self.ui.general_defaults_form.general_gui_group.gray_icons_cb,
             "global_layout": self.ui.general_defaults_form.general_gui_group.layout_combo,
-            "global_hover": self.ui.general_defaults_form.general_gui_group.hover_cb,
+            "global_hover_shape": self.ui.general_defaults_form.general_gui_group.hover_cb,
             "global_selection_shape": self.ui.general_defaults_form.general_gui_group.selection_cb,
 
             "global_sel_fill": self.ui.general_defaults_form.general_gui_group.sf_color_entry,
diff --git a/app_Main.py b/app_Main.py
index 62117c37..31af94b6 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -1115,6 +1115,24 @@ class App(QtCore.QObject):
         if self.plotcanvas == 'fail':
             return
 
+        # Storage for shapes, storage that can be used by FlatCAm tools for utility geometry
+        # VisPy visuals
+        if self.is_legacy is False:
+            try:
+                self.tool_shapes = ShapeCollection(parent=self.plotcanvas.view.scene, layers=1)
+            except AttributeError:
+                self.tool_shapes = None
+
+            # Storage for Hover Shapes
+            self.hover_shapes = ShapeCollection(parent=self.plotcanvas.view.scene, layers=1)
+        else:
+            from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy
+            self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool")
+
+            # Storage for Hover Shapes
+            # will use the default Matplotlib axes
+            self.hover_shapes = ShapeCollectionLegacy(obj=self, app=self, name='hover')
+
         end_plot_time = time.time()
         self.used_time = end_plot_time - start_plot_time
         self.log.debug("Finished Canvas initialization in %s seconds." % str(self.used_time))
@@ -1127,31 +1145,11 @@ class App(QtCore.QObject):
                                     color=QtGui.QColor("gray"))
         self.ui.splitter.setStretchFactor(1, 2)
 
-        # Storage for shapes, storage that can be used by FlatCAm tools for utility geometry
-        # VisPy visuals
-        if self.is_legacy is False:
-            try:
-                self.tool_shapes = ShapeCollection(parent=self.plotcanvas.view.scene, layers=1)
-            except AttributeError:
-                self.tool_shapes = None
-        else:
-            from appGUI.PlotCanvasLegacy import ShapeCollectionLegacy
-            self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool")
-
-        # Storage for Hover Shapes
-        if self.is_legacy is False:
-            self.hover_shapes = ShapeCollection(parent=self.plotcanvas.view.scene, layers=1)
-        else:
-            # will use the default Matplotlib axes
-            self.hover_shapes = ShapeCollectionLegacy(obj=self, app=self, name='hover')
-
         # ###########################################################################################################
         # ############################################### Worker SETUP ##############################################
         # ###########################################################################################################
-        if self.defaults["global_worker_number"]:
-            self.workers = WorkerStack(workers_number=int(self.defaults["global_worker_number"]))
-        else:
-            self.workers = WorkerStack(workers_number=2)
+        w_number = int(self.defaults["global_worker_number"]) if self.defaults["global_worker_number"] else 2
+        self.workers = WorkerStack(workers_number=w_number)
 
         self.worker_task.connect(self.workers.add_task)
         self.log.debug("Finished creating Workers crew.")
@@ -6687,7 +6685,7 @@ class App(QtCore.QObject):
                     self.selection_type = None
 
                 # hover effect - enabled in Preferences -> General -> appGUI Settings
-                if self.defaults['global_hover']:
+                if self.defaults['global_hover_shape']:
                     for obj in self.collection.get_list():
                         try:
                             # select the object(s) only if it is enabled (plotted)
diff --git a/defaults.py b/defaults.py
index 689f7e65..6d18e5c9 100644
--- a/defaults.py
+++ b/defaults.py
@@ -111,7 +111,7 @@ class FlatCAMDefaults:
         "global_gray_icons": False,
 
         "global_layout": "compact",
-        "global_hover": False,
+        "global_hover_shape": False,
         "global_selection_shape": True,
 
         "global_sel_fill": '#a5a5ffbf',