From 50cf44c40c339db5084d79b24b973771535e0cd8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 23 Sep 2014 15:55:09 +0200
Subject: [PATCH] Move to new github repository (under codemirror organization)

---
 CONTRIBUTING.md                    |  4 +-
 README.md                          |  2 +-
 demo/activeline.html               |  2 +-
 demo/anywordhint.html              |  2 +-
 demo/bidi.html                     |  4 +-
 demo/btree.html                    |  2 +-
 demo/buffers.html                  |  2 +-
 demo/changemode.html               |  2 +-
 demo/closebrackets.html            |  2 +-
 demo/closetag.html                 |  2 +-
 demo/complete.html                 |  2 +-
 demo/emacs.html                    |  2 +-
 demo/folding.html                  |  2 +-
 demo/fullscreen.html               |  2 +-
 demo/hardwrap.html                 |  2 +-
 demo/html5complete.html            |  2 +-
 demo/indentwrap.html               |  2 +-
 demo/lint.html                     |  2 +-
 demo/loadmode.html                 |  2 +-
 demo/marker.html                   |  2 +-
 demo/markselection.html            |  2 +-
 demo/matchhighlighter.html         |  2 +-
 demo/matchtags.html                |  2 +-
 demo/merge.html                    |  2 +-
 demo/multiplex.html                |  2 +-
 demo/mustache.html                 |  2 +-
 demo/placeholder.html              |  2 +-
 demo/preview.html                  |  2 +-
 demo/requirejs.html                |  2 +-
 demo/resize.html                   |  2 +-
 demo/rulers.html                   |  2 +-
 demo/runmode.html                  |  2 +-
 demo/search.html                   |  2 +-
 demo/spanaffectswrapping_shim.html |  2 +-
 demo/sublime.html                  |  2 +-
 demo/tern.html                     |  2 +-
 demo/theme.html                    |  2 +-
 demo/trailingspace.html            |  2 +-
 demo/variableheight.html           |  2 +-
 demo/vim.html                      |  2 +-
 demo/visibletabs.html              |  2 +-
 demo/widget.html                   |  2 +-
 demo/xmlcomplete.html              |  2 +-
 doc/compress.html                  |  2 +-
 doc/internals.html                 |  2 +-
 doc/manual.html                    |  4 +-
 doc/realworld.html                 |  4 +-
 doc/releases.html                  | 66 +++++++++++++++---------------
 doc/reporting.html                 |  2 +-
 doc/upgrade_v2.2.html              |  2 +-
 doc/upgrade_v3.html                |  2 +-
 doc/upgrade_v4.html                |  2 +-
 index.html                         |  6 +--
 mode/apl/index.html                |  2 +-
 mode/asterisk/index.html           |  2 +-
 mode/clike/index.html              |  2 +-
 mode/clike/scala.html              |  2 +-
 mode/clojure/index.html            |  2 +-
 mode/cobol/index.html              |  2 +-
 mode/coffeescript/index.html       |  2 +-
 mode/commonlisp/index.html         |  2 +-
 mode/css/index.html                |  2 +-
 mode/css/less.html                 |  2 +-
 mode/css/scss.html                 |  2 +-
 mode/cypher/index.html             |  2 +-
 mode/d/index.html                  |  2 +-
 mode/diff/index.html               |  2 +-
 mode/django/index.html             |  2 +-
 mode/dtd/dtd.js                    |  2 +-
 mode/dtd/index.html                |  2 +-
 mode/dylan/index.html              |  2 +-
 mode/ecl/index.html                |  2 +-
 mode/eiffel/index.html             |  2 +-
 mode/erlang/index.html             |  2 +-
 mode/fortran/index.html            |  2 +-
 mode/gas/index.html                |  2 +-
 mode/gfm/index.html                |  2 +-
 mode/gherkin/gherkin.js            |  2 +-
 mode/gherkin/index.html            |  2 +-
 mode/go/index.html                 |  2 +-
 mode/groovy/index.html             |  2 +-
 mode/haml/index.html               |  2 +-
 mode/haskell/index.html            |  2 +-
 mode/haxe/index.html               |  2 +-
 mode/htmlembedded/index.html       |  2 +-
 mode/htmlmixed/index.html          |  2 +-
 mode/http/index.html               |  2 +-
 mode/index.html                    |  2 +-
 mode/jade/index.html               |  2 +-
 mode/javascript/index.html         |  2 +-
 mode/javascript/json-ld.html       |  2 +-
 mode/javascript/typescript.html    |  2 +-
 mode/jinja2/index.html             |  2 +-
 mode/julia/index.html              |  2 +-
 mode/kotlin/index.html             |  2 +-
 mode/livescript/index.html         |  2 +-
 mode/lua/index.html                |  2 +-
 mode/markdown/index.html           |  2 +-
 mode/mirc/index.html               |  2 +-
 mode/mllike/index.html             |  2 +-
 mode/modelica/index.html           |  2 +-
 mode/nginx/index.html              |  2 +-
 mode/ntriples/index.html           |  2 +-
 mode/octave/index.html             |  2 +-
 mode/pascal/index.html             |  2 +-
 mode/pegjs/index.html              |  2 +-
 mode/perl/index.html               |  2 +-
 mode/php/index.html                |  2 +-
 mode/pig/index.html                |  2 +-
 mode/properties/index.html         |  2 +-
 mode/puppet/index.html             |  2 +-
 mode/python/index.html             |  2 +-
 mode/q/index.html                  |  2 +-
 mode/r/index.html                  |  2 +-
 mode/rpm/changes/index.html        |  2 +-
 mode/rpm/index.html                |  2 +-
 mode/rst/index.html                |  2 +-
 mode/ruby/index.html               |  2 +-
 mode/rust/index.html               |  2 +-
 mode/sass/index.html               |  2 +-
 mode/scheme/index.html             |  2 +-
 mode/shell/index.html              |  2 +-
 mode/sieve/index.html              |  2 +-
 mode/slim/index.html               |  2 +-
 mode/smalltalk/index.html          |  2 +-
 mode/smarty/index.html             |  2 +-
 mode/smartymixed/index.html        |  2 +-
 mode/solr/index.html               |  2 +-
 mode/sparql/index.html             |  2 +-
 mode/sql/index.html                |  2 +-
 mode/stex/index.html               |  2 +-
 mode/tcl/index.html                |  2 +-
 mode/tiddlywiki/index.html         |  2 +-
 mode/tiki/index.html               |  2 +-
 mode/toml/index.html               |  2 +-
 mode/turtle/index.html             |  2 +-
 mode/vb/index.html                 |  2 +-
 mode/vbscript/index.html           |  2 +-
 mode/velocity/index.html           |  2 +-
 mode/verilog/index.html            |  2 +-
 mode/xml/index.html                |  2 +-
 mode/xquery/index.html             |  2 +-
 mode/yaml/index.html               |  2 +-
 mode/z80/index.html                |  2 +-
 package.json                       |  4 +-
 test/index.html                    |  2 +-
 theme/mdn-like.css                 |  2 +-
 147 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3624a39e2b..47006a17f4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Community discussion, questions, and informal bug reporting is done on the
 ## Submitting bug reports
 
 The preferred way to report bugs is to use the
-[GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before
+[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before
 reporting a bug, read these pointers.
 
 **Note:** The issue tracker is for *bugs*, not requests for help. Questions
@@ -48,7 +48,7 @@ should be asked on the
 ## Contributing code
 
 - Make sure you have a [GitHub Account](https://github.com/signup/free)
-- Fork [CodeMirror](https://github.com/marijnh/CodeMirror/)
+- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
   ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
 - Make your changes
 - If your changes are easy to test or likely to regress, add tests.
diff --git a/README.md b/README.md
index 6a0011b6be..be81882063 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@ in, it will color your code, and optionally help with indentation.
 
 The project page is http://codemirror.net  
 The manual is at http://codemirror.net/doc/manual.html  
-The contributing guidelines are in [CONTRIBUTING.md](https://github.com/marijnh/CodeMirror/blob/master/CONTRIBUTING.md)
+The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
diff --git a/demo/activeline.html b/demo/activeline.html
index 14851c35e4..c1391ef27e 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Active Line</a>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index c76b997bf5..d20c97ba1f 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Any Word Completion</a>
diff --git a/demo/bidi.html b/demo/bidi.html
index 569693c875..13a6771672 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Bi-directional Text</a>
@@ -67,7 +67,7 @@ <h2>Bi-directional Text Demo</h2>
   blog post</a> for more background.</p>
 
   <p><strong>Note:</strong> There is
-  a <a href="https://github.com/marijnh/CodeMirror/issues/1757">known
+  a <a href="https://github.com/codemirror/CodeMirror/issues/1757">known
   bug</a> with cursor motion and mouse clicks in bi-directional lines
   that are line wrapped.</p>
 
diff --git a/demo/btree.html b/demo/btree.html
index b7bd39088d..cc644b19b9 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">B-Tree visualization</a>
diff --git a/demo/buffers.html b/demo/buffers.html
index 951209cad5..a656a6c378 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiple Buffer & Split View</a>
diff --git a/demo/changemode.html b/demo/changemode.html
index ad4c9d1b2c..36175aeea5 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode-Changing</a>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index f7d5afbd87..b9d299d911 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Closebrackets</a>
diff --git a/demo/closetag.html b/demo/closetag.html
index 39ca8b3f51..5e43391f19 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Close-Tag</a>
diff --git a/demo/complete.html b/demo/complete.html
index 047a7ecca4..3a17810825 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autocomplete</a>
diff --git a/demo/emacs.html b/demo/emacs.html
index 5b622a9992..3efa57456f 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Emacs bindings</a>
diff --git a/demo/folding.html b/demo/folding.html
index 8126c5c705..3f20484227 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -29,7 +29,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Code Folding</a>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 0a11f31924..f027efe502 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Full Screen Editing</a>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 598bf957df..0aaea0c5d9 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Hard-wrapping</a>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 94ced527d0..2a7c57ab6d 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -27,7 +27,7 @@
     <ul>
       <li><a href="../index.html">Home</a>
       <li><a href="../doc/manual.html">Manual</a>
-      <li><a href="https://github.com/marijnh/codemirror">Code</a>
+      <li><a href="https://github.com/codemirror/codemirror">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index efdba5d59e..ca13b1a17b 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Indented wrapped line</a>
diff --git a/demo/lint.html b/demo/lint.html
index 2129885298..f792f5da32 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Linter</a>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index be28c7a81d..80fda584d8 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Lazy Mode Loading</a>
diff --git a/demo/marker.html b/demo/marker.html
index ac4dfda893..80fd370e02 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Breakpoint</a>
diff --git a/demo/markselection.html b/demo/markselection.html
index d729515e58..14242579c0 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Selection Marking</a>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 170213bfc5..2a95f3c849 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -22,7 +22,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Match Highlighter</a>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index ba4b3645d9..0a02941d0f 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tag Matcher</a>
diff --git a/demo/merge.html b/demo/merge.html
index e592ab3627..b8f2e45ba1 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">merge view</a>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 2ad9608a82..1e2d1b8fef 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiplexing Parser</a>
diff --git a/demo/mustache.html b/demo/mustache.html
index cb0291598a..5dcbca5259 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Overlay Parser</a>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index 6cf098b01a..eb70886b95 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Placeholder</a>
diff --git a/demo/preview.html b/demo/preview.html
index d2aada3c80..47615f5f76 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -30,7 +30,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">HTML5 preview</a>
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 6399f8d769..01197962d0 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -19,7 +19,7 @@
     <ul>
       <li><a href="../index.html">Home</a>
       <li><a href="../doc/manual.html">Manual</a>
-      <li><a href="https://github.com/marijnh/codemirror">Code</a>
+      <li><a href="https://github.com/codemirror/codemirror">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/resize.html b/demo/resize.html
index 10326ef66f..2fb6e108d5 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autoresize</a>
diff --git a/demo/rulers.html b/demo/rulers.html
index 0f8397af20..04abc96d13 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Ruler demo</a>
diff --git a/demo/runmode.html b/demo/runmode.html
index 144783d347..a1b400606d 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode Runner</a>
diff --git a/demo/search.html b/demo/search.html
index 21c9b278a9..896526e587 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Search/Replace</a>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index e598221c0c..8271241259 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Automatically derive odd wrapping behavior for your browser</a>
diff --git a/demo/sublime.html b/demo/sublime.html
index f9115f57be..ec9fdb3ac0 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -30,7 +30,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Sublime bindings</a>
diff --git a/demo/tern.html b/demo/tern.html
index 57027f7267..01e734c5ba 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -32,7 +32,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tern</a>
diff --git a/demo/theme.html b/demo/theme.html
index 4d59d24359..f558b21c32 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -47,7 +47,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Theme</a>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index c3e9c37636..5e5a6e06e3 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Trailing Whitespace</a>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index 98f2fd29d0..d993572898 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Variable Height</a>
diff --git a/demo/vim.html b/demo/vim.html
index cc616759f0..9e75163b6d 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Vim bindings</a>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index 5a5a19aa01..0c8ca3a889 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Visible tabs</a>
diff --git a/demo/widget.html b/demo/widget.html
index cc06968d8c..e096173765 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Inline Widget</a>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index b1ff1fe26b..ab4a8513a0 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">XML Autocomplete</a>
diff --git a/doc/compress.html b/doc/compress.html
index 4fdcc1331c..5dc69b5101 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -13,7 +13,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Compression helper</a>
diff --git a/doc/internals.html b/doc/internals.html
index 3f1b7de869..c6a3798cc4 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -12,7 +12,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="#top">Introduction</a></li>
diff --git a/doc/manual.html b/doc/manual.html
index e0378103f7..0fdf8d5cdc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -28,7 +28,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="#overview" class=active data-default="true">Manual</a></li>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a></li>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a></li>
   </ul>
   <ul>
     <li><a href="#usage">Basic Usage</a></li>
@@ -72,7 +72,7 @@ <h2 style="position: relative">
     functionality. It does provide a rich API on top of which such
     functionality can be straightforwardly implemented. See
     the <a href="#addons">addons</a> included in the distribution,
-    and the <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">list
+    and the <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">list
     of externally hosted addons</a>, for reusable
     implementations of extra features.</p>
 
diff --git a/doc/realworld.html b/doc/realworld.html
index 590e07b18a..a49d4c8be4 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Real-world uses</a>
@@ -21,7 +21,7 @@
 
 <h2>CodeMirror real-world uses</h2>
 
-    <p>Create a <a href="https://github.com/marijnh/codemirror">pull
+    <p>Create a <a href="https://github.com/codemirror/codemirror">pull
     request</a> or <a href="mailto:marijnh@gmail.com">email me</a> if
     you'd like your project to be added to this list.</p>
 
diff --git a/doc/releases.html b/doc/releases.html
index f878850d39..91c8ac9099 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -11,7 +11,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active data-default="true" href="#v4">Version 4.x</a>
@@ -35,7 +35,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/modelica/index.html">Modelica</a></li>
     <li>New method: <a href="manual.html#findWordAt"><code>findWordAt</code></a></li>
     <li>Make it easier to <a href="../demo/markselection.html">use text background styling</a></li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
@@ -45,7 +45,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/slim/index.html">Slim</a></li>
     <li>New command: <a href="manual.html#command_goLineLeftSmart"><code>goLineLeftSmart</code></a></li>
     <li>More fixes and extensions for the <a href="../demo/vim.html">Vim</a> visual block mode</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-07-2014: <a href="http://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
@@ -59,7 +59,7 @@ <h2>Version 4.x</h2>
     <li>Visual block mode for <a href="../demo/vim.html">vim</a> (&lt;C-v>) is nearly complete</li>
     <li>New mode: <a href="../mode/kotlin/index.html">Kotlin</a></li>
     <li>Better multi-selection paste for text copied from multiple CodeMirror selections</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">23-06-2014: <a href="http://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
@@ -72,7 +72,7 @@ <h2>Version 4.x</h2>
     setting <a href="manual.html#option_cursorBlinkRate"><code>cursorBlinkRate</code></a>
     to a negative value.</li>
     <li>Make gutter markers themeable, use this in foldgutter.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
@@ -89,7 +89,7 @@ <h2>Version 4.x</h2>
     <li>Recognize per-editor configuration for the <a href="manual.html#addon_show-hint">show-hint</a> and <a href="manual.html#addon_foldcode">foldcode</a> addons.</li>
     <li>More intelligent scanning for existing close tags in <a href="manual.html#addon_closetag">closetag</a> addon.</li>
     <li>In the <a href="../demo/vim.html">Vim bindings</a>: Fix bracket matching, support case conversion in visual mode, visual paste, append action.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
@@ -104,7 +104,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/django/index.html">Django</a>.</li>
     <li>Improved modes: <a href="../mode/verilog/index.html">Verilog</a> (rewritten), <a href="../mode/jinja2/index.html">Jinja2</a>, <a href="../mode/haxe/index.html">Haxe</a>, <a href="../mode/php/index.html">PHP</a> (string interpolation highlighted), <a href="../mode/javascript/index.html">JavaScript</a> (indentation of trailing else, template strings), <a href="../mode/livescript/index.html">LiveScript</a> (multi-line strings).</li>
     <li>Many small issues from the 3.x→4.x transition were found and fixed.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
@@ -120,7 +120,7 @@ <h2>Version 4.x</h2>
     <li><a href="manual.html#modloader">Module loader shims</a> wrapped around all modules.</li>
     <li>Selection <a href="manual.html#command_undoSelection">undo</a>/<a href="manual.html#command_redoSelection">redo</a>.</li>
     <li>Improved character measuring (faster, handles wrapped lines more robustly).</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
   </ul>
 
 </section>
@@ -152,7 +152,7 @@ <h2>Version 3.x</h2>
     <li>New addons: <a href="manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
     <li>New theme: <a href="../demo/theme.html?mdn-like">mdn-like</a>.</li>
     <li>New mode: <a href="../mode/solr/index.html">Solr</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
@@ -166,7 +166,7 @@ <h2>Version 3.x</h2>
     <li>Make it possible to fetch multiple applicable helper values with <a href="manual.html#getHelpers"><code>getHelpers</code></a>, and to register helpers matched on predicates with <a href="manual.html#registerGlobalHelper"><code>registerGlobalHelper</code></a>.</li>
     <li>New theme <a href="../demo/theme.html?pastel-on-dark">pastel-on-dark</a>.</li>
     <li>Better ECMAScript 6 support in <a href="../mode/javascript/index.html">JavaScript</a> mode.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
@@ -177,7 +177,7 @@ <h2>Version 3.x</h2>
     <li>Improved indentation for the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a>.</li>
     <li>Make non-printable-character representation <a href="manual.html#option_specialChars">configurable</a>.</li>
     <li>Add ‘notification’ functionality to <a href="manual.html#addon_dialog">dialog</a> addon.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-10-2013: <a href="http://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
@@ -187,7 +187,7 @@ <h2>Version 3.x</h2>
     <li>New addons: <a href="manual.html#addon_hardwrap">hardwrap</a>, <a href="manual.html#addon_sql-hint">sql-hint</a>.</li>
     <li>New theme: <a href="../demo/theme.html?mbo">MBO</a>.</li>
     <li>Add <a href="manual.html#token_style_line">support</a> for line-level styling from mode tokenizers.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
@@ -202,7 +202,7 @@ <h2>Version 3.x</h2>
     <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
     <li>New addons: <a href="../addon/lint/css-lint.js"><code>css-lint</code></a>, <a href="manual.html#addon_css-hint"><code>css-hint</code></a>.</li>
     <li>Improve resilience to CSS 'frameworks' that globally mess up <code>box-sizing</code>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
@@ -214,7 +214,7 @@ <h2>Version 3.x</h2>
     <li>Improved interaction between themes and <a href="manual.html#addon_active-line">active-line</a>/<a href="manual.html#addon_matchbrackets">matchbrackets</a> addons.</li>
     <li>New <a href="manual.html#addon_foldcode">folding</a> function <code>CodeMirror.fold.comment</code>.</li>
     <li>Added <a href="manual.html#addon_fullscreen">fullscreen</a> addon.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
@@ -225,7 +225,7 @@ <h2>Version 3.x</h2>
     <li>Introduced <a href="manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
     <li>New method: <a href="manual.html#getModeAt"><code>getModeAt</code></a>.</li>
     <li>New themes: base16 <a href="../demo/theme.html?base16-dark">dark</a>/<a href="../demo/theme.html?base16-light">light</a>, 3024 <a href="../demo/theme.html?3024-night">dark</a>/<a href="../demo/theme.html?3024-day">light</a>, <a href="../demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
@@ -252,7 +252,7 @@ <h2>Version 3.x</h2>
     <li>Various improvements to <a href="../mode/ruby/index.html">Ruby</a>,
     <a href="../mode/smarty/index.html">Smarty</a>, <a href="../mode/sql/index.html">SQL</a>,
     and <a href="../demo/vim.html">Vim</a> modes.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
@@ -262,7 +262,7 @@ <h2>Version 3.x</h2>
     <li>New options: <a href="manual.html#option_cursorScrollMargin"><code>cursorScrollMargin</code></a> and <a href="manual.html#option_coverGutterNextToScrollbar"><code>coverGutterNextToScrollbar</code></a>.</li>
     <li>New addon: <a href="manual.html#addon_comment">commenting</a>.</li>
     <li>More features added to the <a href="../demo/vim.html">Vim keymap</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
@@ -276,7 +276,7 @@ <h2>Version 3.x</h2>
     option for <code>markText</code>.</li>
     <li>Various fixes to JavaScript tokenization and indentation corner cases.</li>
     <li>Further improvements to the vim mode.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-03-2013: <a href="http://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
@@ -301,7 +301,7 @@ <h2>Version 3.x</h2>
     dialog addon.</li>
     <li>Tweak behavior of by-word cursor motion.</li>
     <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-02-2013: <a href="http://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
@@ -337,7 +337,7 @@ <h2>Version 3.x</h2>
     <li>New modes: <a href="../mode/turtle/index.html">Turtle</a>
     and <a href="../mode/q/index.html">Q</a>.</li>
     <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
   </ul>
   
 
@@ -363,7 +363,7 @@ <h2>Version 3.x</h2>
     <li>Support <code>showIfHidden</code> option for <a href="manual.html#addLineWidget">line widgets</a>.</li>
     <li>Add simple <a href="manual.html#addon_python-hint">Python hinter</a>.</li>
     <li>Bring back the <a href="manual.html#option_fixedGutter"><code>fixedGutter</code></a> option.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
   </ul>
 
   <p class="rel">10-12-2012: <a href="http://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
@@ -377,7 +377,7 @@ <h2>Version 3.x</h2>
     <li>Rewritten VIM mode.</li>
     <li>Fix a few minor scrolling and sizing issues.</li>
     <li>Work around Safari segfault when dragging.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
   
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
@@ -389,7 +389,7 @@ <h2>Version 3.x</h2>
     <li>Reduce gutter glitches during horiz. scrolling.</li>
     <li>Add <a href="manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
     <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
@@ -406,7 +406,7 @@ <h2>Version 3.x</h2>
     <li>Add <a href="manual.html#isClean"><code>isClean</code></a>/<a href="manual.html#markClean"><code>markClean</code></a> methods.</li>
     <li>Remove <code>compoundChange</code> method, use better undo-event-combining heuristic.</li>
     <li>Improve scrolling performance smoothness.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
@@ -422,7 +422,7 @@ <h2>Version 3.x</h2>
     <li>Add <a href="manual.html#option_flattenSpans"><code>flattenSpans</code></a> option.</li>
     <li>Many optimizations. Poor responsiveness should be fixed.</li>
     <li>Initialization in hidden state works again.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
@@ -454,7 +454,7 @@ <h2>Version 2.x</h2>
     <li>New mode: <a href="../mode/sql/index.html">SQL</a> (will replace <a href="../mode/plsql/index.html">plsql</a> and <a href="../mode/mysql/index.html">mysql</a> modes).</li>
     <li>Further work on the new VIM mode.</li>
     <li>Fix Cmd/Ctrl keys on recent Operas on OS X.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
@@ -468,7 +468,7 @@ <h2>Version 2.x</h2>
     <li>Various extensions to the vim keymap.</li>
     <li>Make <a href="../mode/php/index.html">PHP mode</a> build on <a href="../mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
     <li>Add <a href="manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
-    <li>Full <a href="../https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
+    <li>Full <a href="../https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
@@ -479,7 +479,7 @@ <h2>Version 2.x</h2>
     <li>Fix several bugs in <a href="manual.html#markText"><code>markText</code></a>/undo interaction.</li>
     <li>Better indentation of JavaScript code without semicolons.</li>
     <li>Add <a href="manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
@@ -492,7 +492,7 @@ <h2>Version 2.x</h2>
     <li>Add a <a href="manual.html#version"><code>CodeMirror.version</code></a> property.</li>
     <li>More robust handling of nested modes in <a href="../demo/formatting.html">formatting</a> and <a href="../demo/closetag.html">closetag</a> plug-ins.</li>
     <li>Un/redo now preserves <a href="manual.html#markText">marked text</a> and bookmarks.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
+    <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
   </ul>
 
   <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
@@ -506,7 +506,7 @@ <h2>Version 2.x</h2>
     <li>More tweaks to the scrolling model.</li>
     <li>Expanded testsuite. Basic linter added.</li>
     <li>Remove most uses of <code>innerHTML</code>. Remove <code>CodeMirror.htmlEscape</code>.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
+    <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
   </ul>
 
   <p class="rel">23-07-2012: <a href="http://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
@@ -524,7 +524,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="manual.html#getHistory"><code>getHistory</code></a> and <a href="manual.html#setHistory"><code>setHistory</code></a> methods.</li>
     <li>Allow custom line separator string in <a href="manual.html#getValue"><code>getValue</code></a> and <a href="manual.html#getRange"><code>getRange</code></a>.</li>
     <li>Support double- and triple-click drag, double-clicking whitespace.</li>
-    <li>And more... <a href="https://github.com/marijnh/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
+    <li>And more... <a href="https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
   </ul>
 
   <p class="rel">22-06-2012: <a href="http://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
@@ -536,7 +536,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="../demo/multiplex.html">mode-multiplexing</a> utility script.</li>
     <li>Fix bug where right-click paste works in read-only mode.</li>
     <li>Add a <a href="manual.html#getScrollInfo"><code>getScrollInfo</code></a> method.</li>
-    <li>Lots of other <a href="https://github.com/marijnh/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
+    <li>Lots of other <a href="https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
   </ul>
 
   <p class="rel">23-05-2012: <a href="http://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
@@ -774,7 +774,7 @@ <h2>Version 2.x</h2>
   and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580">this</a>
   for more information.</p>
 
-  <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
+  <p class="rel">22-02-2011: <a href="https://github.com/codemirror/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
   <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</p>
 
   <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
diff --git a/doc/reporting.html b/doc/reporting.html
index 84da6111d9..9a8a63fe81 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Reporting bugs</a>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index a2dddef760..d718a9ee9a 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">2.2 upgrade guide</a>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 19757924c1..94d1197289 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index c35be5b7fc..9f1d79ab7c 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -11,7 +11,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/index.html b/index.html
index 3b53e00dc0..7a2bbdcfce 100644
--- a/index.html
+++ b/index.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a class=active data-default="true" href="#description">Home</a>
     <li><a href="doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="#features">Features</a>
@@ -156,7 +156,7 @@ <h2>Community</h2>
   and <a href="doc/realworld.html">many other projects</a>.</p>
 
   <p>Development and bug tracking happens
-  on <a href="https://github.com/marijnh/CodeMirror/">github</a>
+  on <a href="https://github.com/codemirror/CodeMirror/">github</a>
   (<a href="http://marijnhaverbeke.nl/git/codemirror">alternate git
   repository</a>).
   Please <a href="http://codemirror.net/doc/reporting.html">read these
@@ -175,7 +175,7 @@ <h2>Community</h2>
 
   <p>A list of CodeMirror-related software that is not part of the
   main distribution is maintained
-  on <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">our
+  on <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">our
   wiki</a>. Feel free to add your project.</p>
 </section>
 
diff --git a/mode/apl/index.html b/mode/apl/index.html
index f8282ac42f..5842c9b7f3 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 6abdecb50d..1576e5a6e3 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index d1abf9359d..5fb5f2cd17 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index e9acc049b3..9ffcc67924 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 5a50c566fc..fb284b17b0 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index a6c5c339ca..72a5faf462 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -44,7 +44,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index fc0a770581..329f8651e4 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index d48be8d233..811edfe35f 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/index.html b/mode/css/index.html
index 80ef518e90..bdba892288 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index 1030ca43fe..ea9b4f3d99 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 0677d08fe1..bcd9f120af 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index 2b765fe5aa..cbf1e85d1b 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/d/index.html b/mode/d/index.html
index 8b25fcc5c9..9054b7f35b 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/diff/index.html b/mode/diff/index.html
index 6ceae8b33a..e897ccd83b 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/django/index.html b/mode/django/index.html
index 07963bc611..7942e348d0 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 1df9fc8b32..f37029a77d 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -4,7 +4,7 @@
 /*
   DTD mode
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 */
 
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index 076d827f7f..0a27cdbdbb 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index 049f93cc63..fec90c654e 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index f4b612d610..0be5a3d01a 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 95c5f885b0..346fed9e42 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 9cacb759f6..a5b30ae576 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index efa55ec89a..fd72329701 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gas/index.html b/mode/gas/index.html
index cd8a2ff5a6..a4ab73f240 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index b71cd5c75f..bd44fcbb9f 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index ed7ba7978e..fc2ebee167 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -3,7 +3,7 @@
 
 /*
 Gherkin mode - http://www.cukes.info/
-Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
 */
 
 // Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index b76877acd6..d8e307881f 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/go/index.html b/mode/go/index.html
index 3673fa0b06..074e6a0576 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index f5efdf758f..f6ab73fb8a 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haml/index.html b/mode/haml/index.html
index a73787554d..ac91c7eb7d 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 056b01d46b..53bb7db347 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 4c3b9783bb..a064210087 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index fee1196839..9ee73bc383 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index bd06bb504c..d033624e6c 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/http/index.html b/mode/http/index.html
index 705085e227..cba8042372 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/index.html b/mode/index.html
index e3339ad085..c717702d6a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Language modes</a>
diff --git a/mode/jade/index.html b/mode/jade/index.html
index 8bfd5620c0..7f7ca4a498 100644
--- a/mode/jade/index.html
+++ b/mode/jade/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 59e3924e1c..9dfac25339 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 256bb0f624..545e6dfa19 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 9cc5f49321..0b30c5355d 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index c99daf6c4a..d65c308d35 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 945e1a91fc..75bdab40b6 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
index 38700f3226..67fd39c945 100644
--- a/mode/kotlin/index.html
+++ b/mode/kotlin/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index 3ce8974854..d1fb0f6f10 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 7f4eb2c84a..324b59b86f 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index a6b541e2eb..7f0541518c 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index c346f1c7ef..c6fbc31210 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index 67bfef8581..ba0f1849bc 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index eb4f08c57d..94334e4890 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 16be1eb614..c63772da96 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index c8a67916d5..210274fdc4 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 573ce42382..3d468b5231 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index bf8ff0d635..c2f2ddadc1 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 678b714d8e..0d894b1621 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -18,7 +18,7 @@
       <ul>
         <li><a href="../../index.html">Home</a>
         <li><a href="../../doc/manual.html">Manual</a>
-        <li><a href="https://github.com/marijnh/codemirror">Code</a>
+        <li><a href="https://github.com/codemirror/codemirror">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 2b7578efe6..d531f2a094 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/php/index.html b/mode/php/index.html
index dd25a5e788..d7f949b135 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 93744ae2d9..ba94e95b5b 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/properties/index.html b/mode/properties/index.html
index 40ee1a37b2..345cadfa3a 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index f307636b2e..d29b644894 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/python/index.html b/mode/python/index.html
index a1d6d2d838..2e438f51f5 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/q/index.html b/mode/q/index.html
index 78ed3d88ff..42dee6f510 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/r/index.html b/mode/r/index.html
index 6e1d371968..dae3dbd28a 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 0ade017966..6f0035f6fe 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../../index.html">Home</a>
     <li><a href="../../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../../index.html">Language modes</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index e0f501ba4c..03e0222985 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index cb8269751a..f6da0339be 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 8f0ebca8e8..21bd45b536 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rust/index.html b/mode/rust/index.html
index 4fc0999228..d74c0dc3f5 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 66d4677844..f7263b5e59 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index 164d5da60d..b2b72eda31 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/shell/index.html b/mode/shell/index.html
index cf415e832c..e3e79fdc9c 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 9d814a9d5a..11908412b0 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/slim/index.html b/mode/slim/index.html
index 1a3b6ac867..948ca0a44f 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 0d2b172e17..67e0d6ef5f 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index d458aef0ff..5ff1ff88da 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
index 47c805faca..a62bc37eea 100644
--- a/mode/smartymixed/index.html
+++ b/mode/smartymixed/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/solr/index.html b/mode/solr/index.html
index cb880244be..9539f4f2ec 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 5f19d647bf..9fa81ce864 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 7dd5f3075e..9471b689fd 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -22,7 +22,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 28b8f64be3..caa008665b 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index c48e253241..709e10081e 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 6ef64a4d06..2620c1cd3c 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 5315dbfcda..d6bfe069c0 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/toml/index.html b/mode/toml/index.html
index c59b4cc085..7ec9df10a9 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 27689c34ff..68e650a033 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 8b81a88b91..31f136d381 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 9b506b7985..57940d798d 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index bd38b886b2..8df6b5de03 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index 4c06cdaecf..f01c659aaf 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 60ebd20177..2515f3f518 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 3baf5e3e3b..6f8b638892 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index bbb40a3c7d..f2f877e257 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/z80/index.html b/mode/z80/index.html
index b63c9621aa..666aa0e99d 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/package.json b/package.json
index d0d76c0715..097d73c781 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,12 @@
     "scripts": {"test": "node ./test/run.js"},
     "devDependencies": {"node-static": "0.6.0",
                         "phantomjs": "1.9.2-5"},
-    "bugs": "http://github.com/marijnh/CodeMirror/issues",
+    "bugs": "http://github.com/codemirror/CodeMirror/issues",
     "keywords": ["JavaScript", "CodeMirror", "Editor"],
     "homepage": "http://codemirror.net",
     "maintainers":[{"name": "Marijn Haverbeke",
                     "email": "marijnh@gmail.com",
                     "web": "http://marijnhaverbeke.nl"}],
     "repository": {"type": "git",
-                   "url": "https://github.com/marijnh/CodeMirror.git"}
+                   "url": "https://github.com/codemirror/CodeMirror.git"}
 }
diff --git a/test/index.html b/test/index.html
index a10bd182d4..6e051254db 100644
--- a/test/index.html
+++ b/test/index.html
@@ -52,7 +52,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Test suite</a>
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 1e20b9e21b..81b21772d2 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -1,7 +1,7 @@
 /*
   MDN-LIKE Theme - Mozilla
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 
   The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation