diff --git a/shapes.scad b/shapes.scad
index 096d689..686312a 100644
--- a/shapes.scad
+++ b/shapes.scad
@@ -90,12 +90,18 @@ module chamfcube(
 										[-1,-1,0], [-1,1,0], [1,1,0], [1,-1,0]
 									],
 									faces=[
-										[ 8,  4,  9,  5],
-										[ 9,  3, 10,  2],
-										[10,  7, 11,  6],
-										[11,  0,  8,  1],
-										[ 0,  7,  3,  4],
-										[ 1,  5,  2,  6],
+										[ 8,  4,  9],
+										[ 8,  9,  5],
+										[ 9,  3, 10],
+										[ 9, 10,  2],
+										[10,  7, 11],
+										[10, 11,  6],
+										[11,  0,  8],
+										[11,  8,  1],
+										[ 0,  7,  3],
+										[ 0,  3,  4],
+										[ 1,  5,  2],
+										[ 1,  2,  6],
 
 										[ 1,  8,  5],
 										[ 5,  9,  2],
@@ -309,9 +315,12 @@ module right_triangle(size=[1, 1, 1], center=false)
 			],
 			faces=[
 				[0, 1, 2],
-				[0, 2, 5, 3],
-				[0, 3, 4, 1],
-				[1, 4, 5, 2],
+				[0, 2, 5],
+				[0, 5, 3],
+				[0, 3, 4],
+				[0, 4, 1],
+				[1, 4, 5],
+				[1, 5, 2],
 				[3, 5, 4]
 			],
 			convexity=2
@@ -345,12 +354,18 @@ module trapezoid(size1=[1,1], size2=[1,1], h=1, center=false)
 				[-s1[0]/2, +s1[1]/2, -h/2],
 			],
 			faces=[
-				[0, 1, 2, 3],
-				[0, 4, 5, 1],
-				[1, 5, 6, 2],
-				[2, 6, 7, 3],
-				[3, 7, 4, 0],
-				[4, 7, 6, 5],
+				[0, 1, 2],
+				[0, 2, 3],
+				[0, 4, 5],
+				[0, 5, 1],
+				[1, 5, 6],
+				[1, 6, 2],
+				[2, 6, 7],
+				[2, 7, 3],
+				[3, 7, 4],
+				[3, 4, 0],
+				[4, 7, 6],
+				[4, 6, 5],
 			],
 			convexity=2
 		);