diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js
index 85b1e918..b2bb55ad 100644
--- a/lib/ace/mode/coffee.js
+++ b/lib/ace/mode/coffee.js
@@ -42,7 +42,7 @@ var oop = require("../lib/oop");
 
 function Mode() {
     this.$tokenizer = new Tokenizer(new Rules().getRules());
-    this.$outdent   = new Outdent();
+    this.$outdent = new Outdent();
     this.foldingRules = new FoldMode();
 }
 
diff --git a/lib/ace/mode/dart.js b/lib/ace/mode/dart.js
index 9f1aa48a..043f9c1c 100644
--- a/lib/ace/mode/dart.js
+++ b/lib/ace/mode/dart.js
@@ -44,10 +44,12 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var DartHighlightRules = require("./dart_highlight_rules").DartHighlightRules;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
     var highlighter = new DartHighlightRules();
-    
+    this.foldingRules = new CStyleFoldMode();
+
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
 oop.inherits(Mode, TextMode);
diff --git a/lib/ace/mode/golang.js b/lib/ace/mode/golang.js
index 094d8966..f5738873 100644
--- a/lib/ace/mode/golang.js
+++ b/lib/ace/mode/golang.js
@@ -19,7 +19,6 @@ define(function(require, exports, module) {
         
         this.toggleCommentLines = function(state, doc, startRow, endRow) {
             var outdent = true;
-            var outentedRows = [];
             var re = /^(\s*)\/\//;
 
             for (var i=startRow; i<= endRow; i++) {
diff --git a/lib/ace/mode/haml.js b/lib/ace/mode/haml.js
index 64b0040f..ee474f44 100644
--- a/lib/ace/mode/haml.js
+++ b/lib/ace/mode/haml.js
@@ -44,9 +44,11 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var HamlHighlightRules = require("./haml_highlight_rules").HamlHighlightRules;
+var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
     var highlighter = new HamlHighlightRules();
+    this.foldingRules = new FoldMode();    
     
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
diff --git a/lib/ace/mode/makefile.js b/lib/ace/mode/makefile.js
index 77a0bad7..d0af9d79 100644
--- a/lib/ace/mode/makefile.js
+++ b/lib/ace/mode/makefile.js
@@ -44,9 +44,11 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var MakefileHighlightRules = require("./makefile_highlight_rules").MakefileHighlightRules;
+var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
     var highlighter = new MakefileHighlightRules();
+    this.foldingRules = new FoldMode();
     
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
diff --git a/lib/ace/mode/objectivec.js b/lib/ace/mode/objectivec.js
index a659d836..554c3bda 100644
--- a/lib/ace/mode/objectivec.js
+++ b/lib/ace/mode/objectivec.js
@@ -44,10 +44,12 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var ObjectiveCHighlightRules = require("./objectivec_highlight_rules").ObjectiveCHighlightRules;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
     var highlighter = new ObjectiveCHighlightRules();
-    
+    this.foldingRules = new CStyleFoldMode();
+
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
 oop.inherits(Mode, TextMode);
diff --git a/lib/ace/mode/stylus.js b/lib/ace/mode/stylus.js
index c0a99511..879f35fb 100644
--- a/lib/ace/mode/stylus.js
+++ b/lib/ace/mode/stylus.js
@@ -44,9 +44,11 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var StylusHighlightRules = require("./stylus_highlight_rules").StylusHighlightRules;
+var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
     var highlighter = new StylusHighlightRules();
+    this.foldingRules = new FoldMode();
     
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
diff --git a/tool/mode.tmpl.js b/tool/mode.tmpl.js
index 3a3e4c60..a3da521e 100644
--- a/tool/mode.tmpl.js
+++ b/tool/mode.tmpl.js
@@ -44,10 +44,12 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var %language%HighlightRules = require("./%languageHighlightFilename%_highlight_rules").%language%HighlightRules;
+// TODO: pick appropriate fold mode
+var FoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
     var highlighter = new %language%HighlightRules();
-    
+    this.foldingRules = new FoldMode();
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
 oop.inherits(Mode, TextMode);