diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7e13950..79068f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## [Unreleased]
+### Changed
+- Removed the "plot" option "check_zone_fills". Use the preflight option.
+
 ### Added
 - Help for the supported outputs (--help-list-outputs, --help-outputs and
   --help-output)
diff --git a/docs/samples/example_1.kiplot.yaml b/docs/samples/example_1.kiplot.yaml
index fa7b6cb2..831df405 100644
--- a/docs/samples/example_1.kiplot.yaml
+++ b/docs/samples/example_1.kiplot.yaml
@@ -94,7 +94,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # gerber options
       line_width: 0.1
diff --git a/docs/samples/generic_plot.kiplot.yaml b/docs/samples/generic_plot.kiplot.yaml
index 68e7343c..becddabc 100644
--- a/docs/samples/generic_plot.kiplot.yaml
+++ b/docs/samples/generic_plot.kiplot.yaml
@@ -32,7 +32,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # gerber options
       line_width: 0.15
@@ -85,7 +84,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PS options
       line_width: 0.15
@@ -119,7 +117,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # DXF options
       drill_marks: full
@@ -143,7 +140,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # SVG options
       line_width: 0.25
@@ -168,7 +164,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # HPGL options
       drill_marks: full
@@ -194,7 +189,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/kiplot/out_any_layer.py b/kiplot/out_any_layer.py
index 3e9d305f..914f1c92 100644
--- a/kiplot/out_any_layer.py
+++ b/kiplot/out_any_layer.py
@@ -28,8 +28,7 @@ class AnyLayer(BaseOutput):
             self.force_plot_invisible_refs_vals = False
             """ include references and values even when they are marked as invisible """
             self.tent_vias = True
-            """ the vias """
-        self.check_zone_fills = True
+            """ cover the vias """
         # Mappings to KiCad values
         self._drill_marks_map = {
                                  'none': PCB_PLOT_PARAMS.NO_DRILL_SHAPE,
diff --git a/tests/yaml_samples/dxf.kiplot.yaml b/tests/yaml_samples/dxf.kiplot.yaml
index 1e594245..c2b76675 100644
--- a/tests/yaml_samples/dxf.kiplot.yaml
+++ b/tests/yaml_samples/dxf.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PS options
       drill_marks: full
diff --git a/tests/yaml_samples/error_no_layers.kiplot.yaml b/tests/yaml_samples/error_no_layers.kiplot.yaml
index e3abe195..70cc9c1a 100644
--- a/tests/yaml_samples/error_no_layers.kiplot.yaml
+++ b/tests/yaml_samples/error_no_layers.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_no_name.kiplot.yaml b/tests/yaml_samples/error_no_name.kiplot.yaml
index 51201673..0e8076da 100644
--- a/tests/yaml_samples/error_no_name.kiplot.yaml
+++ b/tests/yaml_samples/error_no_name.kiplot.yaml
@@ -14,7 +14,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_no_type.kiplot.yaml b/tests/yaml_samples/error_no_type.kiplot.yaml
index 4f42617b..c1daca40 100644
--- a/tests/yaml_samples/error_no_type.kiplot.yaml
+++ b/tests/yaml_samples/error_no_type.kiplot.yaml
@@ -14,7 +14,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_unk_attr.kiplot.yaml b/tests/yaml_samples/error_unk_attr.kiplot.yaml
index d0749b82..6594ea6c 100644
--- a/tests/yaml_samples/error_unk_attr.kiplot.yaml
+++ b/tests/yaml_samples/error_unk_attr.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_1.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_1.kiplot.yaml
index 43822375..17708ebf 100644
--- a/tests/yaml_samples/error_wrong_layer_1.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_1.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_2.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_2.kiplot.yaml
index e97d3ccb..e7375398 100644
--- a/tests/yaml_samples/error_wrong_layer_2.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_2.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_3.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_3.kiplot.yaml
index 6a325e0a..e8b5aae7 100644
--- a/tests/yaml_samples/error_wrong_layer_3.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_3.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_4.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_4.kiplot.yaml
index 6ad58d2f..f422c34c 100644
--- a/tests/yaml_samples/error_wrong_layer_4.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_4.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_5.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_5.kiplot.yaml
index 675abdae..e3e1c2cd 100644
--- a/tests/yaml_samples/error_wrong_layer_5.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_5.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/error_wrong_layer_6.kiplot.yaml b/tests/yaml_samples/error_wrong_layer_6.kiplot.yaml
index c70113aa..f32a0027 100644
--- a/tests/yaml_samples/error_wrong_layer_6.kiplot.yaml
+++ b/tests/yaml_samples/error_wrong_layer_6.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/gerber_inner.kiplot.yaml b/tests/yaml_samples/gerber_inner.kiplot.yaml
index 00823b24..888846db 100644
--- a/tests/yaml_samples/gerber_inner.kiplot.yaml
+++ b/tests/yaml_samples/gerber_inner.kiplot.yaml
@@ -18,7 +18,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # gerber options
       line_width: 0.15
diff --git a/tests/yaml_samples/hpgl.kiplot.yaml b/tests/yaml_samples/hpgl.kiplot.yaml
index 49ba6c94..73c007ac 100644
--- a/tests/yaml_samples/hpgl.kiplot.yaml
+++ b/tests/yaml_samples/hpgl.kiplot.yaml
@@ -14,7 +14,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # HPGL options
       drill_marks: full
diff --git a/tests/yaml_samples/pdf.kiplot.yaml b/tests/yaml_samples/pdf.kiplot.yaml
index e0615cb4..90272014 100644
--- a/tests/yaml_samples/pdf.kiplot.yaml
+++ b/tests/yaml_samples/pdf.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/pdf_zone-refill.kiplot.yaml b/tests/yaml_samples/pdf_zone-refill.kiplot.yaml
index c1ca79a8..6b614883 100644
--- a/tests/yaml_samples/pdf_zone-refill.kiplot.yaml
+++ b/tests/yaml_samples/pdf_zone-refill.kiplot.yaml
@@ -18,7 +18,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PDF options
       drill_marks: small
diff --git a/tests/yaml_samples/ps.kiplot.yaml b/tests/yaml_samples/ps.kiplot.yaml
index 52040a54..8c77c589 100644
--- a/tests/yaml_samples/ps.kiplot.yaml
+++ b/tests/yaml_samples/ps.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # PS options
       line_width: 0.15
diff --git a/tests/yaml_samples/simple_2layer.kiplot.yaml b/tests/yaml_samples/simple_2layer.kiplot.yaml
index 3e6535c9..753b017b 100644
--- a/tests/yaml_samples/simple_2layer.kiplot.yaml
+++ b/tests/yaml_samples/simple_2layer.kiplot.yaml
@@ -18,7 +18,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # gerber options
       line_width: 0.15
diff --git a/tests/yaml_samples/svg.kiplot.yaml b/tests/yaml_samples/svg.kiplot.yaml
index acf174b0..a83f919c 100644
--- a/tests/yaml_samples/svg.kiplot.yaml
+++ b/tests/yaml_samples/svg.kiplot.yaml
@@ -15,7 +15,6 @@ outputs:
       plot_footprint_values: true
       force_plot_invisible_refs_vals: false
       tent_vias: true
-      check_zone_fills: true
 
       # SVG options
       line_width: 0.25