diff --git a/include/layers_id_colors_and_visibility.h b/include/layers_id_colors_and_visibility.h
index fa71f9b8c9..bc74d75f0b 100644
--- a/include/layers_id_colors_and_visibility.h
+++ b/include/layers_id_colors_and_visibility.h
@@ -94,12 +94,16 @@ enum LAYER_ID
 
     B_Adhes,        // 32
     F_Adhes,
+
     B_Paste,
     F_Paste,
+
     B_SilkS,
     F_SilkS,
+
     B_Mask,
     F_Mask,
+
     Dwgs_User,
     Cmts_User,
     Eco1_User,
@@ -107,10 +111,11 @@ enum LAYER_ID
     Edge_Cuts,
     Margin,
 
-    F_CrtYd,        // CrtYd & Fab are footprint only
     B_CrtYd,
-    F_Fab,
+    F_CrtYd,
+
     B_Fab,
+    F_Fab,
 
     LAYER_ID_COUNT
 };
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index 50d6fd121e..3cfb646176 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -593,6 +593,10 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
         Eco2_User,
         Edge_Cuts,
         Margin,
+        B_CrtYd,
+        F_CrtYd,
+        B_Fab,
+        F_Fab,
     };
 
     for( LSEQ seq = aBoard->GetEnabledLayers().Seq( non_cu, DIM( non_cu ) );  seq;  ++seq )