diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index ce0997443c..8d24bd8992 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -24,7 +24,7 @@
 #include "config/gimpdisplayconfig.h"
 
 
-#define GIMP_CONFIG_DEFAULT_THEME          "Dark"
+#define GIMP_CONFIG_DEFAULT_THEME          "Default"
 #define GIMP_CONFIG_DEFAULT_ICON_THEME     "Symbolic"
 
 
diff --git a/app/gui/themes.c b/app/gui/themes.c
index f0fa4688b0..6f46336085 100644
--- a/app/gui/themes.c
+++ b/app/gui/themes.c
@@ -259,11 +259,20 @@ themes_apply_theme (Gimp          *gimp,
           gchar *tmp;
 
           tmp = g_build_filename (gimp_data_directory (),
-                                  "themes", "System", "gimp.css",
+                                  "themes", "Default", "gimp.css",
                                   NULL);
           css_files = g_slist_prepend (
             css_files, g_file_new_for_path (tmp));
           g_free (tmp);
+
+          if (config->prefer_dark_theme)
+            {
+              tmp = g_build_filename (gimp_data_directory (),
+                                      "themes", "Default", "gimp-dark.css",
+                                      NULL);
+              css_files = g_slist_prepend (css_files, g_file_new_for_path (tmp));
+              g_free (tmp);
+            }
         }
 
       css_files = g_slist_prepend (
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 4e1c250cba..14032a4879 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -992,7 +992,7 @@ Sets the theme search path.  This is a colon-separated list of folders to
 search.
 
 .TP
-(theme "Dark")
+(theme "Default")
 
 The name of the theme to use.  This is a string value.
 
diff --git a/etc/gimprc.in b/etc/gimprc.in
index 71d66fe16c..3d6e1e7923 100644
--- a/etc/gimprc.in
+++ b/etc/gimprc.in
@@ -786,7 +786,7 @@
 
 # The name of the theme to use.  This is a string value.
 # 
-# (theme "Dark")
+# (theme "Default")
 
 # The name of the theme to use.  Possible values are yes and no.
 #