diff --git a/lib/ace/mode/xquery.js b/lib/ace/mode/xquery.js
index 0bf786e1..e1a7b4f8 100644
--- a/lib/ace/mode/xquery.js
+++ b/lib/ace/mode/xquery.js
@@ -35,13 +35,16 @@ var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
-//var XQueryBackgroundHighlighter = require("./xquery_background_highlighter").XQueryBackgroundHighlighter;
+//var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
 
 var Mode = function(parent) {
     this.$tokenizer   = new Tokenizer(new XQueryHighlightRules().getRules());
-    this.$behaviour   = new XQueryBehaviour(parent);
+    this.$behaviour   = new CstyleBehaviour(parent);
+    this.foldingRules = new CStyleFoldMode();
 };
 
 oop.inherits(Mode, TextMode);