diff --git a/WORKSPACE b/WORKSPACE
index a93d526fed..0d0f414ddf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,7 +1,7 @@
 workspace(name = "gerrit")
 
 load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL")
-load("//lib/codemirror:cm.bzl", "DIFF_MATCH_PATCH_VERSION")
+load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION")
 
 ANTLR_VERS = "3.5.2"
 
@@ -850,18 +850,16 @@ maven_jar(
     sha1 = "9bfabe48876ec38f6cbaa6931bad05c64a9ea942",
 )
 
-CM_VERSION = "5.19.0"
-
 maven_jar(
     name = "codemirror_minified",
     artifact = "org.webjars.npm:codemirror-minified:" + CM_VERSION,
-    sha1 = "263bf4acb7c4429be3fe46908af240f9f629d51c",
+    sha1 = "3e8767c9293614968176fcf66cb873d6eb8b3051",
 )
 
 maven_jar(
     name = "codemirror_original",
     artifact = "org.webjars.npm:codemirror:" + CM_VERSION,
-    sha1 = "e9ab382c6be240d55f112051bba3f6c637b798ce",
+    sha1 = "879c49085a44f062554a4e4a9ac248b7083d37cf",
 )
 
 maven_jar(
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
index 6408f9dbc7..d7a5b80295 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
@@ -18,6 +18,7 @@ public enum Theme {
   // Light themes
   DEFAULT,
   DAY_3024,
+  DUOTONE_LIGHT,
   BASE16_LIGHT,
   ECLIPSE,
   ELEGANT,
@@ -40,6 +41,7 @@ public enum Theme {
   COBALT,
   COLORFORTH,
   DRACULA,
+  DUOTONE_DARK,
   ERLANG_DARK,
   HOPSCOTCH,
   ICECODER,
@@ -66,7 +68,6 @@ public enum Theme {
 
   public boolean isDark() {
     switch (this) {
-      case NIGHT_3024:
       case ABCDEF:
       case AMBIANCE:
       case BASE16_DARK:
@@ -75,6 +76,7 @@ public enum Theme {
       case COBALT:
       case COLORFORTH:
       case DRACULA:
+      case DUOTONE_DARK:
       case ERLANG_DARK:
       case HOPSCOTCH:
       case ICECODER:
@@ -86,6 +88,7 @@ public enum Theme {
       case MIDNIGHT:
       case MONOKAI:
       case NIGHT:
+      case NIGHT_3024:
       case PARAISO_DARK:
       case PASTEL_ON_DARK:
       case RAILSCASTS:
@@ -99,9 +102,10 @@ public enum Theme {
       case XQ_DARK:
       case ZENBURN:
         return true;
+      case BASE16_LIGHT:
       case DEFAULT:
       case DAY_3024:
-      case BASE16_LIGHT:
+      case DUOTONE_LIGHT:
       case ECLIPSE:
       case ELEGANT:
       case MDN_LIKE:
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java b/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java
index 80304a3159..dc95b4a0ae 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java
@@ -32,6 +32,8 @@ public interface Themes extends ClientBundle {
   @Source("cobalt.css") ExternalTextResource cobalt();
   @Source("colorforth.css") ExternalTextResource colorforth();
   @Source("dracula.css") ExternalTextResource dracula();
+  @Source("duotone-dark.css") ExternalTextResource duotone_dark();
+  @Source("duotone-light.css") ExternalTextResource duotone_light();
   @Source("eclipse.css") ExternalTextResource eclipse();
   @Source("elegant.css") ExternalTextResource elegant();
   @Source("erlang-dark.css") ExternalTextResource erlang_dark();
diff --git a/lib/codemirror/BUCK b/lib/codemirror/BUCK
index eb5adb8c29..040690f72a 100644
--- a/lib/codemirror/BUCK
+++ b/lib/codemirror/BUCK
@@ -1,14 +1,14 @@
 include_defs('//lib/maven.defs')
 include_defs('//lib/codemirror/cm.defs')
 
-VERSION = '5.19.0'
+VERSION = '5.22.0'
 TOP = 'META-INF/resources/webjars/codemirror/%s' % VERSION
 TOP_MINIFIED = 'META-INF/resources/webjars/codemirror-minified/%s' % VERSION
 
 maven_jar(
   name = 'codemirror-minified',
   id = 'org.webjars.npm:codemirror-minified:' + VERSION,
-  sha1 = '263bf4acb7c4429be3fe46908af240f9f629d51c',
+  sha1 = '3e8767c9293614968176fcf66cb873d6eb8b3051',
   attach_source = False,
   license = 'codemirror-minified',
   visibility = [],
@@ -17,7 +17,7 @@ maven_jar(
 maven_jar(
   name = 'codemirror-original',
   id = 'org.webjars.npm:codemirror:' + VERSION,
-  sha1 = 'e9ab382c6be240d55f112051bba3f6c637b798ce',
+  sha1 = '879c49085a44f062554a4e4a9ac248b7083d37cf',
   attach_source = False,
   license = 'codemirror-original',
   visibility = [],
diff --git a/lib/codemirror/cm.bzl b/lib/codemirror/cm.bzl
index bf8f94d34e..168ab3346a 100644
--- a/lib/codemirror/cm.bzl
+++ b/lib/codemirror/cm.bzl
@@ -36,7 +36,7 @@ CM_ADDONS = [
 ]
 
 # Available themes must be enumerated here,
-# in gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Theme.java,
+# in gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java,
 # in gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java
 CM_THEMES = [
     "3024-day",
@@ -50,6 +50,8 @@ CM_THEMES = [
     "cobalt",
     "colorforth",
     "dracula",
+    "duotone-dark",
+    "duotone-light",
     "eclipse",
     "elegant",
     "erlang-dark",
@@ -212,11 +214,11 @@ CM_MODES = [
     "z80",
 ]
 
-VERSION = "5.19.0"
+CM_VERSION = "5.22.0"
 
-TOP = "META-INF/resources/webjars/codemirror/%s" % VERSION
+TOP = "META-INF/resources/webjars/codemirror/%s" % CM_VERSION
 
-TOP_MINIFIED = "META-INF/resources/webjars/codemirror-minified/%s" % VERSION
+TOP_MINIFIED = "META-INF/resources/webjars/codemirror-minified/%s" % CM_VERSION
 
 LICENSE = "//lib:LICENSE-codemirror-original"
 
diff --git a/lib/codemirror/cm.defs b/lib/codemirror/cm.defs
index a6e873a1b6..bfb4f7ac86 100644
--- a/lib/codemirror/cm.defs
+++ b/lib/codemirror/cm.defs
@@ -48,6 +48,8 @@ CM_THEMES = [
   'cobalt',
   'colorforth',
   'dracula',
+  'duotone-dark',
+  'duotone-light',
   'eclipse',
   'elegant',
   'erlang-dark',