diff --git a/ASML_JobCreator/Defaults.py b/ASML_JobCreator/Defaults.py
index 299dfc9..506e205 100644
--- a/ASML_JobCreator/Defaults.py
+++ b/ASML_JobCreator/Defaults.py
@@ -78,11 +78,13 @@ def LoadDefaultValues(self):
         self.Plotting_MarkLineWidth = 2.0
         self.Plotting_MarkAlpha = 1.0
         
-        self.Plotting_ReticleTableColor = self.Plotting_WaferColor
-        self.Plotting_LensColor = self.Plotting_WaferEdgeColor
-        self.Plotting_BGOutlineColor = 'darkgrey'   # unused
-        self.Plotting_BGOutlineStyle = ":"
-        self.Plotting_BGOutlineWidth = 1.0
+        self.Plotting_ReticleTableColor = self.Plotting_WaferEdgeColor
+        self.Plotting_LensColor = "None"
+        self.Plotting_ReticleBGOutlineColor = 'darkgrey'   # unused
+        self.Plotting_ReticleBGOutlineStyle = ":"
+        self.Plotting_ReticleBGOutlineWidth = 1.5
+        self.Plotting_ReticleLensAlpha = 0.6
+        self.Plotting_ReticleTableAlpha = 0.3
 
         
         
diff --git a/ASML_JobCreator/Plot.py b/ASML_JobCreator/Plot.py
index 318437c..6fd1b3b 100644
--- a/ASML_JobCreator/Plot.py
+++ b/ASML_JobCreator/Plot.py
@@ -255,12 +255,11 @@ def plot_reticles(self, scale=False, showwindow=True, showlens=True):
                 ## Plot the Lens outline:
                 Lens = mplp.Circle( (0,0), Defaults.LENS_DIAMETER/2.0 * Mag, label="Lens Diameter", 
                 facecolor=Defaults.Plotting_LensColor, 
-                linewidth=Defaults.Plotting_BGOutlineWidth,
-                edgecolor=Defaults.Plotting_BGOutlineColor, 
-                linestyle=Defaults.Plotting_BGOutlineStyle,
-                alpha = Defaults.Plotting_Alpha  )
+                linewidth=Defaults.Plotting_ReticleBGOutlineWidth,
+                edgecolor=Defaults.Plotting_ReticleBGOutlineColor, 
+                linestyle=Defaults.Plotting_ReticleBGOutlineStyle,
+                alpha = Defaults.Plotting_ReticleLensAlpha  )
                 ax.add_patch(   Lens   )
-                LegendEntries.append( Lens )
             #end if(showlens)
         
             if showwindow:
@@ -268,12 +267,11 @@ def plot_reticles(self, scale=False, showwindow=True, showlens=True):
                 RT = mplp.Rectangle( (-Defaults.RETICLE_TABLE_WINDOW[0]/2.0 * Mag, -Defaults.RETICLE_TABLE_WINDOW[1]/2.0 * Mag), Defaults.RETICLE_TABLE_WINDOW[0] * Mag, Defaults.RETICLE_TABLE_WINDOW[1] * Mag,
                 label="Reticle Table Window", 
                 facecolor=Defaults.Plotting_ReticleTableColor, 
-                linewidth=Defaults.Plotting_BGOutlineWidth,
-                edgecolor=Defaults.Plotting_BGOutlineColor, 
-                linestyle=Defaults.Plotting_BGOutlineStyle,
-                alpha = Defaults.Plotting_Alpha )
+                linewidth=Defaults.Plotting_ReticleBGOutlineWidth,
+                edgecolor=Defaults.Plotting_ReticleBGOutlineColor, 
+                linestyle=Defaults.Plotting_ReticleBGOutlineStyle,
+                alpha = Defaults.Plotting_ReticleTableAlpha )
                 ax.add_patch(   RT   )
-                LegendEntries.append( RT )
             #end if(showwindow)
         
             ax.set_xlabel("%ix Scale, mm" % (Mag), fontsize=PlotLabelFontSize)
@@ -303,6 +301,10 @@ def plot_reticles(self, scale=False, showwindow=True, showlens=True):
             ax.axis('scaled')  # proportional axes
 
             # Put a legend to the right of the current axis
+            if showlens:
+                LegendEntries.append( Lens )
+            if showwindow:
+                LegendEntries.append( RT )
             ax.legend(handles=LegendEntries, title="Images", fontsize="small", loc='upper left', bbox_to_anchor=(1.01, 1), borderaxespad=0.)
         
             fig.show()