diff --git a/LICENSE b/LICENSE
index 08b09fb5a..9dc1dedf6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -629,7 +629,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    HedgeDoc - Realtime collaborative markdown notes on all platforms.
+    HedgeDoc - The best platform to write and share markdown.
     Copyright (C) 2019  Christoph (Sheogorath) Kern
     Copyright (C) 2019  Claudius Coenen
     Copyright (C) 2019  Max Wu
diff --git a/app.json b/app.json
index 4cf3875be..24e69a9d8 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,6 @@
 {
     "name": "HedgeDoc",
-    "description": "Realtime collaborative markdown notes on all platforms",
+    "description": "The best platform to write and share markdown.",
     "keywords": [
         "Collaborative",
         "Markdown",
diff --git a/locales/ar.json b/locales/ar.json
index ed726689e..baf268b60 100644
--- a/locales/ar.json
+++ b/locales/ar.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "ملاحظات ماركداون تعاونية",
-    "Realtime collaborative markdown notes on all platforms.": "تعاون آني في ملاحظات ماركداون على كافة المنصات.",
     "Best way to write and share your knowledge in markdown.": "أحسن منصة لكتابة ومشاركة ماركداون.",
     "Intro": "مُقدِّمة",
     "History": "التاريخ",
diff --git a/locales/ca.json b/locales/ca.json
index 13520cb03..4383ca2fe 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Notes col·laboratives a Markdown",
-    "Realtime collaborative markdown notes on all platforms.": "Notes col·laboratives a Markdown per a totes les plataformes.",
     "Best way to write and share your knowledge in markdown.": "La millor forma d'escriure i compartir el teu coneixement a Markdown.",
     "Intro": "Introducció",
     "History": "Història",
diff --git a/locales/cs.json b/locales/cs.json
index 264c7abca..a95b23748 100644
--- a/locales/cs.json
+++ b/locales/cs.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Kolaborativní markdown poznámky",
-	"Realtime collaborative markdown notes on all platforms.": "Spolupracujte na markdown poznámkách na všech platformách v reálném čase.",
 	"Best way to write and share your knowledge in markdown.": "Nejlepší platforma pro tvorbu a sdílení vašich znalostí v markdown.",
 	"Intro": "Intro",
 	"History": "Historie",
diff --git a/locales/da.json b/locales/da.json
index 03c49ce51..af096b7d7 100644
--- a/locales/da.json
+++ b/locales/da.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Kollaborative markdown-noter",
-	"Realtime collaborative markdown notes on all platforms.": "Kollaborative markdown-noter i realtid på alle platforme.",
 	"Best way to write and share your knowledge in markdown.": "Bedste måde at skrive og dele din viden i markdown.",
 	"Intro": "Intro",
 	"History": "Historik",
diff --git a/locales/de.json b/locales/de.json
index dbdc68992..dd2351cac 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Gemeinschaftliche Markdown Notizen",
-    "Realtime collaborative markdown notes on all platforms.": "Gemeinschaftliche Notizen in Echtzeit auf allen Plattformen.",
     "Best way to write and share your knowledge in markdown.": "Der beste Weg, Notizen zu schreiben und teilen.",
     "Intro": "Einleitung",
     "History": "Verlauf",
@@ -118,5 +117,13 @@
     "Powered by %s": "Betrieben mit %s",
     "Help us translating": "Hilf uns beim Übersetzen",
     "Join the community": "Tritt der Community bei",
-    "Imprint": "Impressum"
+    "Imprint": "Impressum",
+    "changed": "changed",
+    "created": "created",
+    "Freely - Anyone can edit": "Freely - Anyone can edit",
+    "Editable - Signed-in people can edit": "Editable - Signed-in people can edit",
+    "Limited - Signed-in people can edit (forbid guests)": "Limited - Signed-in people can edit (forbid guests)",
+    "Locked - Only owner can edit": "Locked - Only owner can edit",
+    "Protected - Only owner can edit (forbid guests)": "Protected - Only owner can edit (forbid guests)",
+    "Private - Only owner can view & edit": "Private - Only owner can view & edit"
 }
\ No newline at end of file
diff --git a/locales/el.json b/locales/el.json
index 8f65dfa28..322fb8779 100644
--- a/locales/el.json
+++ b/locales/el.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Συνεργατικές σημειώσεις markdown",
-	"Realtime collaborative markdown notes on all platforms.": "Συνεργατική σημειώσεις markdown σε όλες τις πλατφόρμες σε πραγματικό χρόνο.",
 	"Best way to write and share your knowledge in markdown.": "Ο καλύτερος τρόπος να γράψεις και να μοιραστείς την γνώση σου σε markdown.",
 	"Intro": "Εισαγωγή",
 	"History": "Ιστορία",
diff --git a/locales/en.json b/locales/en.json
index 3d30b66e0..0648a0348 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Collaborative markdown notes",
-    "Realtime collaborative markdown notes on all platforms.": "Collaborate on markdown notes on all platforms in realtime.",
     "Best way to write and share your knowledge in markdown.": "The best platform to write and share markdown.",
     "Intro": "Intro",
     "History": "History",
diff --git a/locales/eo.json b/locales/eo.json
index c7c8cad26..83e66eb5e 100644
--- a/locales/eo.json
+++ b/locales/eo.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Kunlaborataj marksubenaj notoj",
-	"Realtime collaborative markdown notes on all platforms.": "Tujkunlaborataj marksubenaj notoj ĉe ĉiuj sistemoj.",
 	"Best way to write and share your knowledge in markdown.": "La plej bona maniero skribi kaj havigi vian scion marksubene.",
 	"Intro": "Enkonduko",
 	"History": "Historio",
diff --git a/locales/es.json b/locales/es.json
index 5bbb856bc..1dc9a176f 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Notas colaborativas en Markdown",
-    "Realtime collaborative markdown notes on all platforms.": "Notas colaborativas en Markdown para todas las plataformas en tiempo real.",
     "Best way to write and share your knowledge in markdown.": "La mejor forma de escribir y compartir tu conocimiento en Markdown.",
     "Intro": "Introduccion",
     "History": "Historia",
diff --git a/locales/fr.json b/locales/fr.json
index ebda3c69e..4937e3345 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Notes collaboratives en markdown",
-    "Realtime collaborative markdown notes on all platforms.": "Notes en markdown collaboratives en temps réel sur toutes les plateformes.",
     "Best way to write and share your knowledge in markdown.": "Le meilleur moyen d'écrire et partager votre savoir en markdown.",
     "Intro": "Intro",
     "History": "Historique",
diff --git a/locales/hi.json b/locales/hi.json
index e8868087b..ee802779b 100644
--- a/locales/hi.json
+++ b/locales/hi.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "सहयोगात्मक मार्कडॉऊन नोट्स",
-	"Realtime collaborative markdown notes on all platforms.": "सभी प्लेटफार्मों पर वास्तविक समय सहयोगी मार्कडॉऊन के नोट्स",
 	"Best way to write and share your knowledge in markdown.": "मार्कडॉऊन में लिखने के लिए और अपना ज्ञान शेयर करने का सबसे अच्छा तरीका",
 	"Intro": "परिचय",
 	"History": "इतिहास",
diff --git a/locales/hr.json b/locales/hr.json
index e8b4a6fb8..f4c4cac8a 100644
--- a/locales/hr.json
+++ b/locales/hr.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Kolaborativne markdown bilješke",
-	"Realtime collaborative markdown notes on all platforms.": "Kolaborativne markdown bilješke na svim platformama u realnom vremenu.",
 	"Best way to write and share your knowledge in markdown.": "Najbolji način za pisanje i dijeljenje svog znanja u markdown-u.",
 	"Intro": "Uvod",
 	"History": "Povijest",
diff --git a/locales/id.json b/locales/id.json
index a6f985a36..2194e7554 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Catatan markdown kolaboratif",
-    "Realtime collaborative markdown notes on all platforms.": "Berkolaborasi di catatan markdown di semua platform secara realtime",
     "Best way to write and share your knowledge in markdown.": "Platform terbaik untuk menulis dan membagikan markdown",
     "Intro": "Perkenalan",
     "History": "Riwayat",
diff --git a/locales/it.json b/locales/it.json
index d4e20bb38..0c732cafd 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Note collaborative in markdown",
-    "Realtime collaborative markdown notes on all platforms.": "Note markdown collaborative in tempo reale per tutte le piattaforme.",
     "Best way to write and share your knowledge in markdown.": "Miglior modo per scrivere e condividere le tue conoscenze in markdown.",
     "Intro": "Intro",
     "History": "Cronologia",
diff --git a/locales/ja.json b/locales/ja.json
index 0aaf9163d..1bde2aca8 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "共同編集できるMarkdownノート",
-    "Realtime collaborative markdown notes on all platforms.": "マルチプラットフォーム、リアルタイムで共同編集できるMarkdownノート",
     "Best way to write and share your knowledge in markdown.": "Markdownでナレッジを蓄積・共有できるベストツール",
     "Intro": "サービスの紹介",
     "History": "履歴",
diff --git a/locales/ko.json b/locales/ko.json
index a1df7b9d6..165a439f7 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "협동 마크다운 노트",
-    "Realtime collaborative markdown notes on all platforms.": "실시간으로 모든 플랫폼에서 마크다운 노트를 함께 작성해보세요.",
     "Best way to write and share your knowledge in markdown.": "마크다운을 쓰고 공유하는 최고의 플랫폼입니다.",
     "Intro": "소개",
     "History": "기록",
diff --git a/locales/ml.json b/locales/ml.json
index cc91d4e63..0e6e291a2 100644
--- a/locales/ml.json
+++ b/locales/ml.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "സംയോജിത മാർക് ഡൗൺ കുറിപ്പുകൾ",
-    "Realtime collaborative markdown notes on all platforms.": "മാർക്ക് ഡൗൺ കുറിപ്പുകളിൽ ഏത് പ്ലാറ്റ് ഫോമിൽ നിന്നും തത്സമയം സഹകരിക്കാൻ",
     "Best way to write and share your knowledge in markdown.": "മാർക് ഡൗൺ കുറിപ്പുകൾ എഴുതാനും പങ്കുവെക്കാനുമുള്ള ഏറ്റവും മികച്ച പ്ലാറ്റ്ഫോം ",
     "Intro": "ആമുഖം ",
     "History": "ചരിത്രം",
diff --git a/locales/nl.json b/locales/nl.json
index 250153bbd..7422065e0 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Samenwerkende markdown notities",
-    "Realtime collaborative markdown notes on all platforms.": "Realtime samenwerkende markdown notities.",
     "Best way to write and share your knowledge in markdown.": "De beste manier om je kennis vast te leggen en te delen. ",
     "Intro": "Introductie",
     "History": "Geschiedenis",
diff --git a/locales/pl.json b/locales/pl.json
index 0eeb1b5e3..5fb7f5bd9 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Wspólne markdown notatki",
-    "Realtime collaborative markdown notes on all platforms.": "Rzeczywiste wspólne markdown notatki dla wszystkich platform",
     "Best way to write and share your knowledge in markdown.": "Najlepszy sposób na pisanie i dzielenie się swoją wiedzą w markdown.",
     "Intro": "Intro",
     "History": "Historia",
diff --git a/locales/pt.json b/locales/pt.json
index 799feea63..1844d9d74 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Notas em Markdown colaborativas",
-    "Realtime collaborative markdown notes on all platforms.": "Notas colaborativas em Markdown para todas as plataformas.",
     "Best way to write and share your knowledge in markdown.": "A melhor forma de escrever e compartilhar seu conhecimento em Markdown.",
     "Intro": "Introdução",
     "History": "Histórico",
diff --git a/locales/ru.json b/locales/ru.json
index e11be5a07..e21462bfc 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Совместные markdown заметки",
-    "Realtime collaborative markdown notes on all platforms.": "Совместные markdown заметки в режиме реального времени на всех платформах.",
     "Best way to write and share your knowledge in markdown.": "Лучший способ записывать свои знания и делиться ими в формате markdown.",
     "Intro": "Введение",
     "History": "История",
diff --git a/locales/sk.json b/locales/sk.json
index 6c2891a4e..4a2eebbff 100644
--- a/locales/sk.json
+++ b/locales/sk.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Kolaboratívne markdown poznámky",
-    "Realtime collaborative markdown notes on all platforms.": "Spolupracujte na markdown poznámkach na všetkých platformách v reálnom čase.",
     "Best way to write and share your knowledge in markdown.": "Nejlepšia platforma pre tvorbu a zdieľanie vašich znalostí v markdown.",
     "Intro": "Intro",
     "History": "História",
diff --git a/locales/sr.json b/locales/sr.json
index ef81feffe..98ef4aa1b 100644
--- a/locales/sr.json
+++ b/locales/sr.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Дељене белешке у Markdown формату",
-    "Realtime collaborative markdown notes on all platforms.": "Заједнички рад на markdown тексту у реалном времену, на свим платформама",
     "Best way to write and share your knowledge in markdown.": "Савршен начин за писање и дељење знања у markdown формату",
     "Intro": "Увод",
     "History": "Историја",
diff --git a/locales/sv.json b/locales/sv.json
index ef89a27fc..bddf51f8a 100644
--- a/locales/sv.json
+++ b/locales/sv.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Kollaborativa markdownanteckningar",
-    "Realtime collaborative markdown notes on all platforms.": "Kollaborativa markdownantackningar på alla plattformar.",
     "Best way to write and share your knowledge in markdown.": "Bästa sättet att skriva och dela din kunskap i markdown.",
     "Intro": "Intro",
     "History": "Historik",
diff --git a/locales/tr.json b/locales/tr.json
index b0682469a..1558d03f8 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Ortak markdown notları",
-	"Realtime collaborative markdown notes on all platforms.": "Tüm platformlarda gerçek zamanlı markdown notları",
 	"Best way to write and share your knowledge in markdown.": "Markdownda bilginizi paylaşmanın en kolay yolu.",
 	"Intro": "Giriş",
 	"History": "Geçmiş",
diff --git a/locales/uk.json b/locales/uk.json
index 0afc8796b..8131582d0 100644
--- a/locales/uk.json
+++ b/locales/uk.json
@@ -1,6 +1,5 @@
 {
 	"Collaborative markdown notes": "Спільні примітки щодо знижок",
-	"Realtime collaborative markdown notes on all platforms.": "Спільні примітки щодо знижок в реальному часі на всіх платформах.",
 	"Best way to write and share your knowledge in markdown.": "Кращий спосіб, щоб записувати і ділитись своїми знаннями щодо знижок в реальному часі.",
 	"Intro": "Вступ",
 	"History": "Історія",
diff --git a/locales/vi.json b/locales/vi.json
index 40c9257a0..46de96d6d 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Cộng tác ghi chú markdown",
-    "Realtime collaborative markdown notes on all platforms.": "Cộng tác ghi chú markdown đa nền tảng thời gian thực",
     "Best way to write and share your knowledge in markdown.": "Nền tảng tốt nhất để viết và chia sẻ markdown",
     "Intro": "Giới thiệu",
     "History": "Lịch sử",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index deabf0e1c..23a498d71 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Markdown 协作笔记",
-    "Realtime collaborative markdown notes on all platforms.": "使用 Markdown 的跨平台即时协作笔记。",
     "Best way to write and share your knowledge in markdown.": "写作与分享 Markdown 的最佳平台。",
     "Intro": "简介",
     "History": "历史",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 2e674f90f..97dce9a59 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -1,6 +1,5 @@
 {
     "Collaborative markdown notes": "Markdown 協作筆記",
-    "Realtime collaborative markdown notes on all platforms.": "使用 Markdown 的跨平台即時協作筆記",
     "Best way to write and share your knowledge in markdown.": "您使用 Markdown 寫作與分享知識的最佳方式",
     "Intro": "簡介",
     "History": "紀錄",
diff --git a/package.json b/package.json
index cb3bac3bf..5b4b7c5c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "HedgeDoc",
   "version": "1.6.0",
-  "description": "Realtime collaborative markdown notes on all platforms.",
+  "description": "The best platform to write and share markdown.",
   "main": "app.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -29,7 +29,7 @@
     "bootstrap-validator": "^0.11.8",
     "chance": "^1.0.4",
     "cheerio": "^0.22.0",
-    "codemirror": "git+https://github.com/codimd/CodeMirror.git",
+    "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git",
     "compression": "^1.6.2",
     "connect-flash": "^0.1.1",
     "connect-session-sequelize": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2bf315f2b..9eecb7d61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2337,9 +2337,9 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-"codemirror@git+https://github.com/codimd/CodeMirror.git":
+"codemirror@git+https://github.com/hedgedoc/CodeMirror.git":
   version "5.58.2"
-  resolved "git+https://github.com/codimd/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1"
+  resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1"
 
 collapse-white-space@^1.0.2:
   version "1.0.6"