diff --git a/bin/compress b/bin/compress
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+// Compression helper for CodeMirror
+//
+// Example:
+//
+//   bin/compress codemirror runmode javascript xml
+//
+// Will take lib/codemirror.js, lib/util/runmode.js,
+// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
+// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
+// out the result.
+//
+//   bin/compress codemirror --local /path/to/bin/UglifyJS
+//
+// Will use a local minifier instead of the online default one.
+//
+// Script files are specified without .js ending. Prefixing them with
+// their full (local) path is optional. So you may say lib/codemirror
+// or mode/xml/xml to be more precise. In fact, even the .js suffix
+// may be speficied, if wanted.
+
+"use strict";
+
+var fs = require("fs");
+
+function help(ok) {
+  console.log("usage: " + process.argv[1] + " [--local /path/to/uglifyjs] files...");
+  process.exit(ok ? 0 : 1);
+}
+
+var local = null, args = null, files = [], blob = "";
+
+for (var i = 2; i < process.argv.length; ++i) {
+  var arg = process.argv[i];
+  if (arg == "--local" && i + 1 < process.argv.length) {
+    var parts = process.argv[++i].split(/\s+/);
+    local = parts[0];
+    args = parts.slice(1);
+  } else if (arg == "--help") {
+    help(true);
+  } else if (arg[0] != "-") {
+    files.push({name: arg, re: new RegExp("(?:\\/|^)" + arg + (/\.js$/.test(arg) ? "$" : "\\.js$"))});
+  } else help(false);
+}
+
+function walk(dir) {
+  fs.readdirSync(dir).forEach(function(fname) {
+    if (/^[_\.]/.test(fname)) return;
+    var file = dir + fname;
+    if (fs.statSync(file).isDirectory()) return walk(file + "/");
+    if (files.some(function(spec, i) {
+      var match = spec.re.test(file);
+      if (match) files.splice(i, 1);
+      return match;
+    })) {
+      if (local) args.push(file);
+      else blob += fs.readFileSync(file, "utf8");
+    }
+  });
+}
+
+walk("lib/");
+walk("mode/");
+
+if (!blob) help(false);
+
+if (files.length) {
+  console.log("Some speficied files were not found: " +
+              files.map(function(a){return a.name;}).join(", "));
+  process.exit(1);
+}
+
+if (local) {
+  require("child_process").spawn(local, args, {stdio: ["ignore", process.stdout, process.stderr]});
+} else {
+  var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
+  var req = require("http").request({
+    host: "marijnhaverbeke.nl",
+    port: 80,
+    method: "POST",
+    path: "/uglifyjs",
+    headers: {"content-type": "application/x-www-form-urlencoded",
+              "content-length": data.length}
+  });
+  req.on("response", function(resp) {
+    resp.on("data", function (chunk) { process.stdout.write(chunk); });
+  });
+  req.end(data);
+}
diff --git a/demo/activeline.html b/demo/activeline.html
@@ -60,10 +60,13 @@ <h1>CodeMirror: Active Line Demo</h1>
   lineNumbers: true,
   lineWrapping: true
 });
-var hlLine = editor.setLineClass(0, null, "activeline");
+var hlLine = editor.addLineClass(0, "background", "activeline");
 editor.on("cursorActivity", function() {
-  editor.setLineClass(hlLine, null, null);
-  hlLine = editor.setLineClass(editor.getCursor().line, null, "activeline");
+  var cur = editor.getLineHandle(editor.getCursor().line);
+  if (cur != hlLine) {
+    editor.removeLineClass(hlLine, "background", "activeline");
+    hlLine = editor.addLineClass(cur, "background", "activeline");
+  }
 });
 </script>
 

diff --git a/demo/folding.html b/demo/folding.html
@@ -12,8 +12,13 @@
 
     <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-folded {width: .8em;}
-      .CodeMirror-foldmarker {color:#600; font-size: 80%;}
+      .CodeMirror-foldmarker {
+        color: blue;
+        text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+        font-family: arial;
+        line-height: .3;
+        cursor: pointer;
+      }
     </style>
   </head>
   <body>
@@ -40,25 +45,22 @@ <h1>CodeMirror: Code Folding Demo</h1>
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
     lineNumbers: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-folded"],
     lineWrapping: true,
     extraKeys: {"Ctrl-Q": function(cm){foldFunc(cm, cm.getCursor().line);}}
   });
   editor.on("gutterClick", foldFunc);
   foldFunc(editor, 9);
-  foldFunc(editor, 20);
 
   var foldFunc_html = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder);
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
     lineNumbers: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-folded"],
     lineWrapping: true,
     extraKeys: {"Ctrl-Q": function(cm){foldFunc_html(cm, cm.getCursor().line);}}
   });
   editor_html.on("gutterClick", foldFunc_html);
+  foldFunc_html(editor_html, 11);
   foldFunc_html(editor_html, 1);
-  foldFunc_html(editor_html, 15);
 };
 </script>
   </body>

diff --git a/demo/theme.html b/demo/theme.html
@@ -18,6 +18,8 @@
     <link rel="stylesheet" href="../theme/ambiance.css">
     <link rel="stylesheet" href="../theme/blackboard.css">
     <link rel="stylesheet" href="../theme/vibrant-ink.css">
+    <link rel="stylesheet" href="../theme/solarized.css">
+    <link rel="stylesheet" href="../theme/twilight.css">
     <script src="../mode/javascript/javascript.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
 
@@ -55,6 +57,9 @@ <h1>CodeMirror: Theme demo</h1>
     <option>neat</option>
     <option>night</option>
     <option>rubyblue</option>
+    <option>solarized dark</option>
+    <option>solarized light</option>
+    <option>twilight</option>
     <option>vibrant-ink</option>
     <option>xq-dark</option>
 </select>
@@ -69,7 +74,8 @@ <h1>CodeMirror: Theme demo</h1>
     var theme = input.options[input.selectedIndex].innerHTML;
     editor.setOption("theme", theme);
   }
-  var choice = document.location.search && document.location.search.slice(1);
+  var choice = document.location.search &&
+               decodeURIComponent(document.location.search.slice(1));
   if (choice) {
     input.value = choice;
     editor.setOption("theme", choice);

diff --git a/doc/compress.html b/doc/compress.html
@@ -30,8 +30,11 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0rc1;f=">3.0rc1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0beta2;f=">3.0beta2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0beta1;f=">3.0beta1</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.36;f=">2.36</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.35;f=">2.35</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.34;f=">2.34</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.33;f=">2.33</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.32;f=">2.32</option>
@@ -114,6 +117,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
           <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
           <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
+          <option value="http://codemirror.net/mode/z80/z80.js">z80.js</option>
         </optgroup>
         <optgroup label="Utilities and add-ons">
           <option value="http://codemirror.net/lib/util/overlay.js">overlay.js</option>

diff --git a/doc/docs.css b/doc/docs.css
@@ -123,7 +123,8 @@ a.download:hover {
 }
 
 .left {
-  width: 37em;
+  margin-right: 20.68em;
+  max-width: 37em;
   padding-right: 6.53em;
   padding-bottom: 1em;
 }
@@ -134,11 +135,12 @@ a.download:hover {
 }
 
 .left2 {
-  width: 15.24em;
+  max-width: 15.24em;
 }
 
 .right {
   width: 20.68em;
+  margin-left: -20.68em;
 }
 
 .leftbig {