diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs
index fcd4e0e4..b7b60b4d 100644
--- a/PROMS/fmtxml/AppendPlantSpecific.cs
+++ b/PROMS/fmtxml/AppendPlantSpecific.cs
@@ -196,10 +196,9 @@ namespace fmtxml
 		}
 		private void AddFNPfmt(ref FormatData fmtdata)
 		{
-			fmtdata.ComponentTableFormat = "True";   // KBR: remove for next FNP update
 			fmtdata.SectData.StepSectionData.StpSectLayData.WidSTableEdit = "445,186,120";
 			fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "420,186,120";
-			fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "0,134";
+			fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "0,186";
 			fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,198,138";
 			fmtdata.SectData.StepSectionData.SequentialTabFormat[2].TabFormat = "#1#{seq}  ";
 			fmtdata.SectData.StepSectionData.SequentialTabFormat[2].PrintTabFormat = "#1#{seq}  ";
@@ -220,7 +219,6 @@ namespace fmtxml
 		}
 		private void AddFNP_X0x(ref FormatData fmtdata)
 		{
-			fmtdata.ComponentTableFormat = "True";   // KBR - remove for next FNP update
 			fmtdata.SectData.StepSectionData.SequentialTabFormat[2].TabFormat = "#1#{seq}  ";
 			fmtdata.SectData.StepSectionData.SequentialTabFormat[2].PrintTabFormat = "#1#{seq}  ";
 			fmtdata.SectData.StepSectionData.SequentialTabFormat[3].TabFormat = "#1#{seq}  ";
@@ -3160,12 +3158,18 @@ namespace fmtxml
 		}
 		private void AddFNPDOC(ref DocStyles dcstyles)
 		{
-			// KBR commented out for MCG update: dcstyles.DcStyles[5].ComponentList = true;
+			dcstyles.DcStyles[5].ComponentList = true;
 			dcstyles.DcStyles[5].TopMargin = 144;
+			dcstyles.DcStyles[0].CBNoOverrideSpace = true;
+			dcstyles.DcStyles[1].CBNoOverrideSpace = true;
+			dcstyles.DcStyles[3].CBNoOverrideSpace = true;
+			dcstyles.DcStyles[4].CBNoOverrideSpace = true;
+			dcstyles.DcStyles[7].CBNoOverrideSpace = true;
 		}
 		private void AddFNP_Y0x(ref DocStyles dcstyles)
 		{
-			// KBR commented out for MCG update: dcstyles.DcStyles[1].ComponentList = true;
+			dcstyles.DcStyles[0].CBNoOverrideSpace = true;
+			dcstyles.DcStyles[1].ComponentList = true;
 			dcstyles.DcStyles[1].TopMargin = 144;
 		}
 		private void AddCALBCKDOC(ref DocStyles dcstyles)