diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3624a39e2b2cc2773f9420fc64a54d581df89965..47006a17f413a4cb447260f19dd9dab4c4b452f7 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 6a0011b6be87ae054c360c1ca7bf2b8860bf47a3..be81882063636efe8d5ed810bbd1c71e15159ff2 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 14851c35e42bcfdad429202fd4259c6e93655394..c1391ef27e70ea0f611f1d1faf03dfffba059b3d 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 c76b997bf59f48157ae42cc470a21a4ce9ff471b..d20c97ba1f7031fa0b0f43d2dc8b25ee30f7bdd8 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 569693c875f7563f103ecf6dc0da7d8c722412dd..13a67716729bd45b6e74a68d846d1ae295f2cfd0 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 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   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 b7bd39088dd6f536c0d2fcb3c34f21240aa359e8..cc644b19b960019a02083d7d9feb21c13efed085 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 951209cad5ed2ac4f68f6063f0465bc3ca2ce767..a656a6c378f18cd6fd102ea81899677d023a07a2 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 ad4c9d1b2c8a2fc5ab5c0809888dc023ceeb1cdb..36175aeea50eb28185531409e88286319ae28943 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 f7d5afbd879de60c2ffd4d37a490b73438d846ec..b9d299d911f8449e470391caa5dd8caeb3ecab45 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 39ca8b3f5158740a996ec262eb437455a887c132..5e43391f19d75a2bff485767860b6fb541b1f268 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 047a7ecca49c02f8eabe8d85f485bddcfc5c5088..3a178108251f007647a6ac052b5ed42cbbd52d4f 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 5b622a9992cb1417ea6405858783a05139fa49a7..3efa57456ff49b72c6de0e33e9cbd65c1fc963ff 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 8126c5c705b253dedce675f061d7b955133b0adb..3f2048422753a1db8dd9e9f23f707a7e6de340f5 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 0a11f3192442a635bc7a3a4839f5c123c82bfaa0..f027efe5028b1bc92eb8e759d36ef92dcae41ec4 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 598bf957dfe2d16b9faf56ec110cb34f30c878d3..0aaea0c5d950f7ea09c4e23ded6fa63771d1db43 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 94ced527d0e0570e4f9edfc9343af6e5fc1ad757..2a7c57ab6d26f4756b4486a91bf9c01247fcd80e 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 efdba5d59e863d824e1db8f5dc6fdc76e7d2855c..ca13b1a17b36239a74b57419425dc6a329ef8c61 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 2129885298a1a256ab8959457efecb8870a87c61..f792f5da329045b9b3020af923f5e81da41a3c9a 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 be28c7a81d231da28f1f825a8317f5be0a26cb6a..80fda584d8ae655f3b68b4b3c939fa6bc4152734 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 ac4dfda893fe5e6eaa8840c2ed34c3aa393bd036..80fd370e0263e4dda4e7f83ad6595fe88fd05656 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 d729515e58fae9fb8e6829529132abdafc27ae51..14242579c02f573bc71c96bc9208b285f0b81f68 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 170213bfc5cd747744f2370b306912093d5df741..2a95f3c849c5c1d358cb704e99e0507e50a6f2b8 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 ba4b3645d9b482d3ace612b24ddd9ccb50e95258..0a02941d0f7c034a6f2c308b6b50266fee460e38 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 e592ab36277a4e6dcb4556c4eb24acbcc6ec7958..b8f2e45ba1bb7364361ac4e65fc5d0039ea8c659 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 2ad9608a82cb5331dbe009e89e4bdb717ed40d88..1e2d1b8fef6aa99dee8d1c2d199696d128a8c7cb 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 cb0291598a937cdd3b89e59d36377ed07cb609df..5dcbca525998450cafb763de6dc06bc81e14602b 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 6cf098b01ad42c0ebb197c6d4798abbab6fec096..eb70886b9586b1b628c56f06774d3a277fa789fb 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 d2aada3c805a2fef37cadeafef5cff070f56c17f..47615f5f764a010729b2ddf1f56ad1205488de2f 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 6399f8d769cb884a75e456ada9045666adf71043..01197962d0c80c65a179cfb557bdacbd4568c316 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 10326ef66fb705d79b33fbbc7fcce221e8669607..2fb6e108d55bb2474a132327ac5aeb49d3959132 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 0f8397af20208ede1faeb0b58e0c30feccd57506..04abc96d13e687fa2776cc9fc00e20f92a12b5c0 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 144783d34720d620b03b7c954c56863163907feb..a1b400606d91200851221e40f6f12aac66e7fd92 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 21c9b278a9de515a823deed302085ef4e27f071b..896526e587426ad61ca81168eb72e090637fd008 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 e598221c0c542ae6b0854979c03908078962a407..8271241259c4750a7b8072cbf40566c3e0696a12 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 f9115f57be457ed8f7dc11385f1a45f276281c21..ec9fdb3ac0a12cc2c00a6f8c7b0c5d2ab91a1fa4 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 57027f72676a6f988d9887787254899594cbc843..01e734c5ba2d9b816e0833ca8b860a1d56d67827 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 4d59d2435909e66ebda7f8d067752b7e36223549..f558b21c32f5c9f4269aa17fb95a8335b705a3a4 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 c3e9c376368625ca3ae6b6778987fbae0d383a2d..5e5a6e06e37e19af93052beafc4743de8a0f1789 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 98f2fd29d054eb0c6617a54ff3fe05ca2d52f332..d993572898357c44f148849dd2aed542bd8ef2e2 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 cc616759f0e53e385083b862003c9604d98823b5..9e75163b6d3960990ffaa53882f09d3279c72e4e 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 5a5a19aa019ad58fd193122378440a1a672581ae..0c8ca3a8891534fe6a86f4a018abd225dba2c6c9 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 cc06968d8cbd23b0bc4a41ee5e0f8cbfcbdc9171..e0961737654dd245c8b6c387404d9f8c882b5299 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 b1ff1fe26bf20448fd3848c2aba6c35263634c6c..ab4a8513a0d8c9b0807b113d06377ef9cbe4b919 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 4fdcc1331cdab670d6a58819f7b75a5da0aa5930..5dc69b5101721c9c51de3f159d535e4ac0053d47 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 3f1b7de8699cdf930426c699d0fc5cfd0dd02bc5..c6a3798cc46f83e059292ac7b9acba5814233482 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 e0378103f7796254246612981682453819487db4..0fdf8d5cdc00747a5a2a90f821421f79abfae8bb 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 @@
     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 590e07b18ae6a240ea742d4941dc886da512d909..a49d4c8be45e92bb869d0472d0b002dc1935d44e 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 f878850d3921c64a4412f920a063f8e45187c43d..91c8ac90992f0fb326eff589846db11cf00f55db 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 @@
     <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 @@
     <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 @@
     <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 @@
     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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     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 @@
     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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
     <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 @@
   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 84da6111d97e416f3cbdff8c29854a7ccfb87d89..9a8a63fe816cba357c5900c8e1a3b365b8321bd6 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 a2dddef760c1a8ba8717b5db14b87cd31d49c6ec..d718a9ee9a0c3f9497f11aa04b1e4e955dddf3b8 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 19757924c1b90c089fa4e8d92f7d8d56bfa4d188..94d1197289cc224388c9666a4a85430b33339b41 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 c35be5b7fc639b9ecc95db8e13a30d311d8a5145..9f1d79ab7cc6d4de47196bc6277feb69b8703e08 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 3b53e00dc08cc8b4449714325edc4a65269f2d57..7a2bbdcfcef4e386ea94fbdaa3a0ccee3fd87607 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 @@
   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 @@
 
   <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 f8282ac42fa8b84f4d19379cb1db31d8ed834374..5842c9b7f3e228133f93f7bcd0f93713061142e0 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 6abdecb50dc6f1815022a7b7ed7aa259bace547f..1576e5a6e3f15f42a20d611c8966fd6c4c59423b 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 d1abf9359d1c053379fd5f0c1629c06086d1006a..5fb5f2cd17ce6d2337ec4a9e954b9c31fbb299ac 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 e9acc049b3e7f15f520b3a06a652923d375749b7..9ffcc67924f935b5a9a9de2504391879e57e9189 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 5a50c566fc80a9c4a6e71264b4ceaf39ea1f22ce..fb284b17b0a11e4784251db5f30b67468eb032f9 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 a6c5c339ca0ff19288186b1d6158cfd8839ade94..72a5faf4622052b644da11b5fd3acdb68539d67e 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 fc0a7705810ac2328a3ddbcab09cc33051b8786f..329f8651e41534b095c17808173f58a6bd5a42c3 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 d48be8d233fe5e7c429de2a2644693e977cc7eb0..811edfe35ffbc0904ebda88fd38336ae1dff13ab 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 80ef518e90bd23fbce69480b279b0334fa70e18a..bdba89228876a530e73e83df2de2f6ad2c440427 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 1030ca43fe9ed62d54aeed3938a6e7e6944dfb24..ea9b4f3d99bc7c2cd638d2bb7a2587801c45d8cc 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 0677d08fe14face6b0f5f6bc49686579db022e5d..bcd9f120afab2cf027b9332a2e95c7868dcad2e0 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 2b765fe5aa7b28e607618c7bfae5f5b023d2466b..cbf1e85d1bdb338cbf68a9b7af7e54d4c17a137f 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 8b25fcc5c99c77664fd76145516930a708ca6edd..9054b7f35b5bc40a3fcfe7a259add1f26e73ada6 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 6ceae8b33acd099624c708f1a22267391cbcc4ca..e897ccd83b5518a0f40b8ecb23066bfefa079ac3 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 07963bc611a70814cb1479762b98034b4e6df3b9..7942e348d0a9eac29fccf67b142062027418505b 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 1df9fc8b323efd35706ff01a8d30366f7e54b2af..f37029a77ddab5c25339768102d5a424435d51b5 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 076d827f7f9fe22a59e31c2b53b8ac24c01d91e4..0a27cdbdbb27537e5008afebb6d5744c4e6f0580 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 049f93cc6370eb88ae40d396f539ea6903b25e84..fec90c654e7bef5f48620cf48ed3b92503c14b1c 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 f4b612d6106268687ddf125dda13904f4d08ce0c..0be5a3d01a723faff8fb74da9b4ed9c72d56c3f9 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 95c5f885b0ff57a77789787122836e3c683e1da7..346fed9e42b1cd7abff1f0109b7bb765f56aee2b 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 9cacb759f6931cd176d81283ff5c3c243b36fb4e..a5b30ae57622ca5f59893d0241391f67a9784f75 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 efa55ec89ab8c6039dfb3fcc49415260818e2ae2..fd72329701059e41035c63b3f3c9cd52d2e015ca 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 cd8a2ff5a6619e054a734adcd58a4e45a5616717..a4ab73f240da8410faca8f2e6b74ce11a25eb333 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 b71cd5c75f404c17411bc346871c171ba02625e9..bd44fcbb9f2b164b7208e2d90a5a086b177849b7 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 ed7ba7978e1c1d584c100d37d0e8cc798c964a83..fc2ebee167df77004bd24b0555a08f2dd96bf0cd 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 b76877acd64a1ffc46db84059a820c05865414ea..d8e307881f4872affad72758266e9a782dbe1848 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 3673fa0b069f4c9b14d3d82e91416a5adc24e6a6..074e6a05764ca9a54fc7cacca72acc6abea68b39 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 f5efdf758f32b10a092dd5f84529fcc6a4f23442..f6ab73fb8a9ce7ce4b3f81cefc69b86fdd6b22ba 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 a73787554d90749f38a899ba98c9171aff73087f..ac91c7eb7d524c5f751cab9196b8e3edbff54a9a 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 056b01d46b16ed28a042fc93ee2b4af7cdc92d1e..53bb7db347db017c49a511a7ce7568f3808ed68e 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 4c3b9783bb01ecea5a1fc25a17f18384b4e1ff03..a06421008789a135db892638866a15d6229a7963 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 fee11968395a5cb30dc912faf1aa8b64120a5e29..9ee73bc3830902826b9499f946ed8e372ed3ee7c 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 bd06bb504c407e0eb41bd8102de9f8cca4dd9f81..d033624e6ce838fee29c247bd9a585506f5d5b65 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 705085e227fc6f7be7d73c332eb531f79b808725..cba8042372d18a4d0e517fd91da1ee3b7a7bc65c 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 e3339ad0854d78023d4a7169382a97efd5b42a74..c717702d6a7ac5eee37bd1744b539ce0e334bb3f 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 8bfd5620c03656339913e9b55ce44154ec6066ff..7f7ca4a498bf4f42c1d55857991775a7f0248f5e 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 59e3924e1c53b0ee6a52124deb60e8b61b0e78f1..9dfac25339e0fda4cf727a041c1346465032200e 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 256bb0f62414a7f2c31caded34f932eab97a06c0..545e6dfa19cb66832d9a4a685743f69a22af27a8 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 9cc5f49321182c9150d2744ec4aef4590927c69f..0b30c5355d72542878285adecbd0b795aeaa5e76 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 c99daf6c4a0e4f37235f1c561c5621e5a87212d7..d65c308d354944cd52f5a4fbff3e7e06f47efd44 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 945e1a91fcac1d9e738fdc50093f7cdc3aea1ca4..75bdab40b66fb7d9b6b3d57a5aac1372406298ba 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 38700f32268e6f3118ccbe649547f33b752b182a..67fd39c945b7ab62188707764d252476beefb7f7 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 3ce897485489d5ce17445f6073ae593a310480e6..d1fb0f6f102311a51ce53e22641a219015282cdc 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 7f4eb2c84a62bf2f8c99a2bbe21e01af201cce42..324b59b86f430df963998f1c7bcc26929766285d 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 a6b541e2ebb6e1a581cc259db43c0ca936e7edba..7f0541518c754aaa8869f01e20dd26f25bdf7a44 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 c346f1c7ef8b242965f7046dc95a47f3e8a9a838..c6fbc312102af63e03665a00ef109daf2e0a5adf 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 67bfef8581d017e8b45ea2ad0c725cbf335e0d6d..ba0f1849bc3f9366d07d929fa2bb15ecb2d9bad6 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 eb4f08c57d29b831477cbb5d0bf91603b2cf8f97..94334e489092699b8d9dda21e7f873f50fc907f9 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 16be1eb614cfc18a5c7bf83d1e43375d03278d1a..c63772da9637fc007447da78d3f4120c8a74a9f0 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 c8a67916d57a6b7a2c6e2183fa2e4c940dfa49f2..210274fdc4c76017d841f59ebb3f2783f2c5c742 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 573ce423821bc8cfd287abd9f1732bfa43140bc1..3d468b52316c575b46da05fea143cb1b15f5ce42 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 bf8ff0d635320734ead3412e23446b179c8e9d4e..c2f2ddadc1ab43c7023043c9e0386261a793684b 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 678b714d8ea0b25f173f05fec66c5abbaf09b30f..0d894b1621b58091941620acd7dbd7f881fefcea 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 2b7578efe65fe06d169c778284d3a541a8247295..d531f2a0949615212d497c855a821f2a77e57ccd 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 dd25a5e78824c10a92021c59c89818fc2c2aa90b..d7f949b1353cb72071e9ddb56543fd7990414c01 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 93744ae2d98c912b06cb63b9de0df3a6245382d0..ba94e95b5b828782492cca53b3cd70ca0c8c3319 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 40ee1a37b26a25766983e737695e1b06f6e4647e..345cadfa3ad13ab71c8ff06f11d96e624cd3ac54 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 f307636b2e1abccc6e65ab79e9165936bd08d526..d29b6448946d8c94fce3a69ff649d5a963566c1e 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 a1d6d2d8380fd72475c5857d1df9495288d46a78..2e438f51f55faea2e5ab3d6a3617377fb5233042 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 78ed3d88ffb84cd4a8224ea37ee43dc348eff4b9..42dee6f510f0419d9e75dddaa512fd450828ab29 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 6e1d3719685017246fa3505a33755d5a06325aa6..dae3dbd28a0eed3a687f278f8ad3751f0a0eb110 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 0ade017966dc2203dc14eca8cd3ffe0d21f84719..6f0035f6fe18df73248cf7dbd9f5eb3af73d983c 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 e0f501ba4c7f4be108419069141f2e860a81132e..03e0222985e99af6bea806742ed88ef2bbaf8d50 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 cb8269751a22cc43377441a529eedc56778c9408..f6da0339be86601281e0586488faa5625cd23e82 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 8f0ebca8e82de0dc28896a48db660276a5c79046..21bd45b53682afe764387f8620eff2115404e892 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 4fc0999228f3e48cde370b351cc3f5967e505818..d74c0dc3f5e6db81502b10aff68fef60cfeba124 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 66d4677844fab36d093334207ddba1912780d738..f7263b5e5905798e0c26b244d4c6b63c2e0c82de 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 164d5da60d41b1eb22babd87038653350fb0fb4c..b2b72eda3190965d0f75aaeba75166f10df4765f 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 cf415e832c8f1fc0cab87fe95f1c2fc62d463754..e3e79fdc9c3ef186e7ded04ec774f0b77294f8b7 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 9d814a9d5a5f625a6e575e9fde83d737f7fd602d..11908412b072792910c1d6d85f1ef8d1611e2dec 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 1a3b6ac867a473385cb9d40a7b59d379aee7b7ad..948ca0a44fbcc3bdc10d65a84f8679a47de0387d 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 0d2b172e17cc71d8d4c6b40d30558727b2e04ace..67e0d6ef5fd03d3c7f02fc1eb8b0b6b6b9708655 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 d458aef0ff71edc55b99eeb009dee55ef45830f6..5ff1ff88da45e5c62943cd31ebfd589456932003 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 47c805facab0767153b5721d867f33a22b90b402..a62bc37eeaac071e5b32d0b6dd046e5d13136c18 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 cb880244be49512c6e5ea222ea65a620dec6ae22..9539f4f2ec8557f9ca502c52c0b21fa7f5af0125 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 5f19d647bfe577373f049e59fef5aa625d91cd24..9fa81ce8640e2617d6ae664bbfba80b9db333fe4 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 7dd5f3075eb88703e0c01d72224b521bf609d1a8..9471b689fd5344fdcab1138858d709856a71eada 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 28b8f64be3cddca96378f7a9f421e498ceb0203c..caa008665be68701c75bffbb6b8cc999213f7a14 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 c48e253241e2b9d4af0323ef9fb223f0b7bd2305..709e10081e3c923d7965d6c92f533bd87f2c8ebe 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 6ef64a4d060e3c737200e1f1a66ae5718af54af3..2620c1cd3c5504dd6cf92f6edd0a3927db2acc75 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 5315dbfcdac71370f13bfb9cdd8fe05ef1b7f0fe..d6bfe069c029930ba19b7bb8238596be97912217 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 c59b4cc085e4bd2a8b445f35393b8e2dac39b5bd..7ec9df10a9547503cb5b6c814f8b2091d620290d 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 27689c34ff3c3e8f65e5ef7c2a01c74573e8a8a6..68e650a033b007055fbb1886e5ddb9cd4bc26b6b 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 8b81a88b91e0ba8eea267e6b3d6caef28e1bfe8b..31f136d3811069ddad3d628e50e9f684ba48f314 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 9b506b7985633c43f2173ae9d71d82bb541c42a6..57940d798db424019d7d39abd166768452b2bfcc 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 bd38b886b2c7a823e89cf6118d0dbc8efd8bd468..8df6b5de039cbce2d9f6e4f8a6d7d030e87a9309 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 4c06cdaecf27e7f457a1572a71e01a1268a17c39..f01c659aaf93f3054bfdb32cf32617b9fb69274c 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 60ebd2017708410c1add79717e720f1a752a9ebe..2515f3f5189e90344be29cbb76d14125c10f741e 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 3baf5e3e3b197410286ae92af8bbc32a8dcc3512..6f8b638892ea83b75baa897d36b4df8e4aa3766d 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 bbb40a3c7d62adcafc56ffa87184664b7c10963d..f2f877e257724456777dd23e325c7763cdd9e059 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 b63c9621aa66277d242926dd06a5428945c4c113..666aa0e99de08c900c42c3b4c0bcf3be477332ce 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 d0d76c07159085db2959bffcf6c795c38fb74ea3..097d73c781d26839863433b59ee73731b289cdad 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 a10bd182d4dce70b963bf33221eb4e628ac9aef1..6e051254dbde19e89f486e59cfb7d4077bf7f24b 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 1e20b9e21bc843dc7f0517401eb0835aa90b07a7..81b21772d24119fb8d5bbdf7be32f1c409652e07 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