diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
index 7598d74..8f133fa 100644
--- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java
@@ -25,7 +25,6 @@ package	org.x4o.fc18;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
index e2355de..e50bc78 100644
--- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
@@ -168,7 +168,7 @@ public enum FourCornerDotCake {
 	FC_PIE9D_26(1 + FC_PIE9D_25.getStop(), 26, FCDotPIE9DDash26.values()),
 	FC_PIE9D_27(1 + FC_PIE9D_26.getStop(), 27, FCDotPIE9DDash27.values()),
 	
-	__MIND_THE_GAP18(1 + FC_PIE9D_27.getStop(), 1024 - 1 - FC_PIE9D_27.getStop()),
+//	__MIND_THE_GAP18(1 + FC_PIE9D_27.getStop(), 1024 - 1 - FC_PIE9D_27.getStop()),
 	
 	// =========== Allow end-dark mode
 	
@@ -184,26 +184,24 @@ public enum FourCornerDotCake {
 	
 	// =========== Allow end-user select rendering of data gram packet per context
 	
+	FC_BMW0102_S2(1024 - 12, 2, "Binary Model Word encoding for bit 0 and bit 1 notation"),
+	FC_AMD0110_SA(1024 - 10, 10, "Application Methodoums Decimals, normal numbers"),
+	
 	/// Allow HEX to be displayed in Greek/Korean/Inuktitut/etc symbols. 
 	FC_IBM1616_H8(1024, 256, "Interim Byte Mode, embed raw Hex 8 bit Data"),
+	FC_NES0127_9C(1280, 27, "Nigerian Extra Smile"),
+	FC_ESC0109_S9(1307, 9, "Eccentric Symbol Code"),
+	FC_W3C0107_S7(1316, 7, "Water 3th Color"),
+	FC_SCO0106_S6(1323, 6, "Six Character Object"),
+	FC_NEC0105_S5(1329, 5, "New Endian Compass"),
+	FC_NXP0103_S3(1334, 3, "Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals"),
+	/// See: https://www.ibm.com/docs/en/db2/11.5?topic=uce-code-page-coded-character-set-identifier-ccsid-numbers-unicode-graphic-data
+	// TODO: check if ?? Remove CDC white space and newline !!!
+	FC_UWU0101_S1(1337, 1, "Universal White Unidad"),
+	FC_DNA0104_S4(1338, 4, "Direct Nuclear Air strike for quadratonic values"),
+	
 	/// Reserved for future data grams use
-	__RESERVED_DATAGRAMS(1280, 1445-1280),
-	
-	// See: https://www.ibm.com/docs/en/db2/11.5?topic=uce-code-page-coded-character-set-identifier-ccsid-numbers-unicode-graphic-data
-	// TODO: Add FC_UWU0101 (unique white unicode) = Locale white space defined by word-set.
-	
-	// TODO: Remove CDC white space and newline !!!
-	
-	//FC_XXX0127_9C(todo, 27),
-	//FC_XXX0109_S9(1418, 9),
-	//FC_XXX0107_S7(1427, 7),
-	//FC_XXX0106_S6(1434, 6),
-	//FC_XXX0105_S5(1440, 5),
-	
-	FC_DNA0104_S4(1445, 4, "Direct Nuclear Air strike for quadratonic values"),
-	FC_NXP0103_S3(1449, 3, "Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals"),
-	FC_BMW0102_S2(1452, 2, "Binary Model Word encoding for bit 0 and bit 1 notation"),
-	FC_AMD0110_SA(1454, 10, "Application Methodoums Decimals, normal numbers"),
+	__RESERVED_DATAGRAMS(1 + FC_DNA0104_S4.getStop(), 1464 - 1 - FC_DNA0104_S4.getStop()),
 	
 	FC_OCE0801_H3(1464, 8, "Octal Character Encoding in Hinari 3 bit"),
 	FC_OCE0808_H6(1472, 64, "Octal Character Encoding in Hinari 6 bit"),