diff --git a/c3cat-bottle-clip/c3cat-bottle-clip.scad b/c3cat-bottle-clip/c3cat-bottle-clip.scad
index e922c2c..e51e373 100644
--- a/c3cat-bottle-clip/c3cat-bottle-clip.scad
+++ b/c3cat-bottle-clip/c3cat-bottle-clip.scad
@@ -25,13 +25,6 @@
  * licensing terms.
  */
 
-NAME = "c3cat";
-RENDER_COLOR_1 = true; // used for clip body
-RENDER_COLOR_2 = true; // used for logo and one small ear
-RENDER_COLOR_3 = true; // used for name and other small ear
-SMALL_EARS = true;
-$fn=360;
-
 include <write/Write.scad>
 
 /**
@@ -58,17 +51,13 @@ include <write/Write.scad>
  */
 scale([0.2, 0.2, 0.2]) {
   difference() {
-    scale([5, 5, 5]) rotate(45, [0, 0, 1]) bottle_clip(name=NAME);
-    if (SMALL_EARS) {
-      translate([ 15*5, 0*5, 18*5]) rotate(80, [0, 1, 0]) catear();
-      translate([-15*5, 0*5, 18*5]) rotate(-80, [0, 1, 0]) catear();
-    }
+    scale([5, 5, 5]) rotate(45, [0, 0, 1]) bottle_clip(name="c3cat");
+    translate([ 15*5, 0*5, 18*5]) rotate(80, [0, 1, 0]) catear();
+    translate([-15*5, 0*5, 18*5]) rotate(-80, [0, 1, 0]) catear();
   }
 
-  if (SMALL_EARS) {
-    if (RENDER_COLOR_2) {translate([0,  5*5, 0]) catear();}
-    if (RENDER_COLOR_3) {rotate(180) translate([0,  5*5, 0]) catear();}
-  }
+  translate([0,  5*5, 0]) catear();
+  rotate(180) translate([0,  5*5, 0]) catear();
 }
 
 module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/orbitron.dxf", logo="") {
@@ -78,65 +67,45 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
   difference() {
     rotate([0,0,-45]) union() {
       // main cylinder
-      if (RENDER_COLOR_1) {cylinder(r1=rl+width, r2=ru+width, h=ht);}
+      cylinder(r1=rl+width, r2=ru+width, h=ht);
       // text and logo
       if(logo == "") {
-        if (RENDER_COLOR_3) {
-          color("orange")
-            writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
-        }
-        if (RENDER_COLOR_2) {
-          translate([4.7, -rl, ht*1.08])
-            rotate(-10, [1, 0, 0])
-              rotate(76, [0, 1, 0])
-                scale([0.08, 2, 0.08])
-                  color("red")
-                    import("catears.stl");
-        }
+        color("orange") writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
+        translate([4.7, -rl, ht*1.08]) rotate(-10, [1, 0, 0]) rotate(76, [0, 1, 0]) scale([0.08, 2, 0.08]) color("red") import("catears.stl");
       } else {
-        if (RENDER_COLOR_3) {
-          color("orange")
-            writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
-        }
+        color("orange") writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
 
-        if (RENDER_COLOR_2) {
-          // The logo has been split in 3 parts. // well the ohm one was ...
+        // The logo has been split in 3 parts.
 /*
-          rotate([0,0,-48]) translate([0,0,ht*3/4-0.1])
-            rotate([90,0,0])
-              scale([0.9,0.9,1])
-                scale([ht/100,ht/100,1])
-                  translate([-25,-29,0.5])
-                    linear_extrude(height=max(ru,rl)*2)
-                      import("logo_1.dxf");
+        rotate([0,0,-48]) translate([0,0,ht*3/4-0.1])
+          rotate([90,0,0])
+            scale([0.9,0.9,1])
+              scale([ht/100,ht/100,1])
+                translate([-25,-29,0.5])
+                  linear_extrude(height=max(ru,rl)*2)
+                    import("logo_1.dxf");
 */
-          translate([0,0,ht*3/4-0.1])
-            rotate([90,0,0])
-              scale([0.8,0.8,1])
-                scale([ht/100,ht/100,1])
-                  translate([-18,-22,0.5])
-                    linear_extrude(height=max(ru,rl)*2)
-                      import(logo);
+        translate([0,0,ht*3/4-0.1])
+          rotate([90,0,0])
+            scale([0.8,0.8,1])
+              scale([ht/100,ht/100,1])
+                translate([-18,-22,0.5])
+                  linear_extrude(height=max(ru,rl)*2)
+                    import(logo);
 /*
-          rotate([0,0,44]) translate([0,0,ht*3/4-0.1])
-            rotate([90,0,0])
-              scale([0.7,0.7,1])
-                scale([ht/100,ht/100,1])
-                  translate([-25,-26,0.5])
-                    linear_extrude(height=max(ru,rl)*2)
-                      import("logo_3.dxf");
+        rotate([0,0,44]) translate([0,0,ht*3/4-0.1])
+          rotate([90,0,0])
+            scale([0.7,0.7,1])
+              scale([ht/100,ht/100,1])
+                translate([-25,-26,0.5])
+                  linear_extrude(height=max(ru,rl)*2)
+                    import("logo_3.dxf");
 */
-        }
       }
     }
-    if (RENDER_COLOR_1) {
-      // inner cylinder which is substracted
-      translate([0,0,-1])
-        cylinder(r1=rl, r2=ru, h=ht+2);
-    } else {
-      // main cylinder which is subtracted when not rendering color 1
-      cylinder(r1=rl+width, r2=ru+width, h=ht);
-    }
+    // inner cylinder which is substracted
+    translate([0,0,-1])
+      cylinder(r1=rl, r2=ru, h=ht+2);
     // outer cylinder which is substracted, so the text and the logo end
     // somewhere on the outside ;-)
     difference () {
diff --git a/globals.scad b/globals.scad
index d3d8a35..2f53cd2 100644
--- a/globals.scad
+++ b/globals.scad
@@ -12,7 +12,7 @@ RAKE_WIDTH=1;
 RAKE_STRETCH=1;
 RAKE_CHAMFER=0.5;
 CHAMFER=1;
-CHAMFER_SHAPE="cone";
+CHAMFER_SHAPE="curve";
 
 INSERTICLE_X = 4.6;
 INSERTICLE_Y = 7.4;