diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 68cff9eb..d1453b5a 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -106,6 +106,7 @@ var modes = [
     new Mode("liquid", "Liquid", ["liquid"]),
     new Mode("markdown", "Markdown", ["md", "markdown"]),
     new Mode("ocaml", "OCaml", ["ml", "mli"]),
+    new Mode("scad", "OpenSCAD", ["scad"]),
     new Mode("perl", "Perl", ["pl", "pm"]),
     new Mode("pgsql", "pgSQL", ["pgsql", "sql"]),
     new Mode("php", "PHP", ["php"]),
@@ -224,6 +225,10 @@ var docs = [
         "scala", "Scala",
         require("ace/requirejs/text!./docs/scala.scala")
     ),
+    new Doc(
+        "scad", "OpenSCAD",
+        require("ace/requirejs/text!./docs/OpenSCAD.scad")
+    ),
     new Doc(
         "csharp", "C#",
         require("ace/requirejs/text!./docs/csharp.cs")
@@ -421,8 +426,8 @@ themeEl.updateTheme = function(){
 bindDropdown("theme", function(value) {
     if (!value)
         return;
-	env.editor.setTheme(value);
-	themeEl.selectedValue = value;
+    env.editor.setTheme(value);
+    themeEl.selectedValue = value;
 });
 
 bindDropdown("keybinding", function(value) {
diff --git a/demo/kitchen-sink/docs/OpenSCAD.scad b/demo/kitchen-sink/docs/OpenSCAD.scad
new file mode 100644
index 00000000..a45c1aec
--- /dev/null
+++ b/demo/kitchen-sink/docs/OpenSCAD.scad
@@ -0,0 +1,21 @@
+// ace can highlight scad!
+module Element(xpos, ypos, zpos){
+	translate([xpos,ypos,zpos]){
+		union(){
+			cube([10,10,4],true);
+			cylinder(10,15,5);
+			translate([0,0,10])sphere(5);
+		}
+	}
+}
+
+union(){
+	for(i=[0:30]){
+		# Element(0,0,0);
+		Element(15*i,0,0);
+	}
+}
+
+for (i = [3, 5, 7, 11]){
+	rotate([i*10,0,0])scale([1,1,i])cube(10);
+}
\ No newline at end of file