diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarneFrapperRetrait.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarneFrapperRetrait.java
index dcc97e7..bc40e7e 100644
--- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarneFrapperRetrait.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarneFrapperRetrait.java
@@ -30,11 +30,6 @@ public enum FourCornerX00PetitVideCoinCarneFrapperRetrait {
 	
 	NONE,
 	
-	CENTER_10,
-	CENTER_20,
-	CENTER_30,
-	CENTER_40,
-	
 	LEFT_10,
 	LEFT_20,
 	LEFT_30,
@@ -44,6 +39,26 @@ public enum FourCornerX00PetitVideCoinCarneFrapperRetrait {
 	RIGHT_20,
 	RIGHT_30,
 	RIGHT_40,
+	
+	BOTH_L10_R10,
+	BOTH_L10_R20,
+	BOTH_L10_R30,
+	BOTH_L10_R40,
+	
+	BOTH_L20_R10,
+	BOTH_L20_R20,
+	BOTH_L20_R30,
+	BOTH_L20_R40,
+	
+	BOTH_L30_R10,
+	BOTH_L30_R20,
+	BOTH_L30_R30,
+	BOTH_L30_R40,
+	
+	BOTH_L40_R10,
+	BOTH_L40_R20,
+	BOTH_L40_R30,
+	BOTH_L40_R40,
 	;
 	
 	private FourCornerX00PetitVideCoinCarneFrapperRetrait() {
diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
index 2fcb302..1fee128 100644
--- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java
@@ -150,13 +150,13 @@ public enum FCDotCDC1604DashP6 implements FourCornerX00PetitColleZero33P8, FourC
 	public FourCornerX00PetitVideCoinCarneFrapper petitVideCoinCarneFrapper() {
 		// TODO: Add kerning for symbols too
 		if (this == NX01_A) {
-			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyTop(FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_20);
+			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyTop(FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L20_R20);
 		}
 		if (this == NX06_F) {
 			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.RIGHT_10);
 		}
 		if (this == NX09_I) {
-			return FourCornerX00PetitVideCoinCarneFrapper.valueForQuad(FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_10, FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_10);
+			return FourCornerX00PetitVideCoinCarneFrapper.valueForQuad(FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L10_R10, FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L10_R10);
 		}
 		if (this == NX10_J) {
 			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyTop(FourCornerX00PetitVideCoinCarneFrapperRetrait.LEFT_10);
@@ -168,13 +168,13 @@ public enum FCDotCDC1604DashP6 implements FourCornerX00PetitColleZero33P8, FourC
 			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.RIGHT_10);
 		}
 		if (this == NX20_T) {
-			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_20);
+			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L20_R20);
 		}
 		if (this == NX22_V) {
-			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_20);
+			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L20_R20);
 		}
 		if (this == NX25_Y) {
-			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.CENTER_20);
+			return FourCornerX00PetitVideCoinCarneFrapper.valueOnlyBottom(FourCornerX00PetitVideCoinCarneFrapperRetrait.BOTH_L20_R20);
 		}
 		return FourCornerX00PetitVideCoinCarneFrapper.valueForNone();
 	}