diff --git a/lib/ace/mode/jade.js b/lib/ace/mode/jade.js
index 076b29c8..4432f96c 100644
--- a/lib/ace/mode/jade.js
+++ b/lib/ace/mode/jade.js
@@ -40,13 +40,13 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules;
-// var JavascriptMode = require("../mode/javascript").Mode;
-// var CssMode = require("../mode/css").Mode;
+var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
     var highlighter = new JadeHighlightRules();
     
     this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.foldingRules = new FoldMode();
 };
 oop.inherits(Mode, TextMode);
 
diff --git a/lib/ace/mode/typescript.js b/lib/ace/mode/typescript.js
index 3839671e..67e40b35 100644
--- a/lib/ace/mode/typescript.js
+++ b/lib/ace/mode/typescript.js
@@ -41,19 +41,27 @@ define(function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
+var jsMode = require("./javascript").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var TypeScriptHighlightRules = require("./typescript_highlight_rules").TypeScriptHighlightRules;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 
 var Mode = function() {
     var highlighter = new TypeScriptHighlightRules();
     
     this.$tokenizer = new Tokenizer(highlighter.getRules());
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
 };
-oop.inherits(Mode, TextMode);
+oop.inherits(Mode, jsMode);
 
 (function() {
-    // Extra logic goes here. 
+    this.createWorker = function(session) {
+        return null;
+    };
 }).call(Mode.prototype);
 
 exports.Mode = Mode;