diff --git a/doc/rc/default.theme b/doc/rc/default.theme
new file mode 100644
index 000000000..4092d0ebe
--- /dev/null
+++ b/doc/rc/default.theme
@@ -0,0 +1,101 @@
+###############################################################################
+#
+# Copyright 2006 - 2021, Tomas Babej, Paul Beckingham, Federico Hernandez.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# https://www.opensource.org/licenses/mit-license.php
+#
+###############################################################################
+
+rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
+
+# This contains all the default colors.
+
+# General decoration
+rule.color.merge=1
+color.label=
+color.label.sort=
+color.alternate=on gray2
+color.header=color3
+color.footnote=color3
+color.warning=bold red
+color.error=white on red
+color.debug=color4
+
+# Task state
+color.completed=
+color.deleted=
+color.active=rgb555 on rgb410
+color.recurring=rgb013
+color.scheduled=on rgb001
+color.until=
+color.blocked=white on color8
+color.blocking=black on color15
+
+# Project
+color.project.none=
+
+# Priority UDA
+color.uda.priority.H=color255
+color.uda.priority.L=color245
+color.uda.priority.M=color250
+
+# Tags
+color.tag.next=rgb440
+color.tag.none=
+color.tagged=rgb031
+
+# Due
+color.due.today=rgb400
+color.due=color1
+color.overdue=color9
+
+# Report: burndown
+color.burndown.done=on rgb010
+color.burndown.pending=on color9
+color.burndown.started=on color11
+
+# Report: history
+color.history.add=color0 on rgb500
+color.history.delete=color0 on rgb550
+color.history.done=color0 on rgb050
+
+# Report: summary
+color.summary.background=white on color0
+color.summary.bar=black on rgb141
+
+# Command: calendar
+color.calendar.due.today=color15 on color1
+color.calendar.due=color0 on color1
+color.calendar.holiday=color0 on color11
+color.calendar.scheduled=rgb013 on color15
+color.calendar.overdue=color0 on color9
+color.calendar.today=color15 on rgb013
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb013
+
+# Command: sync
+color.sync.added=rgb010
+color.sync.changed=color11
+color.sync.rejected=color9
+
+# Command: undo
+color.undo.after=color2
+color.undo.before=color1
diff --git a/src/Context.cpp b/src/Context.cpp
index 9fe1e468b..45d3e979d 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -206,78 +206,6 @@ std::string configurationDefaults =
     "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due."
     "today,due,blocked,blocking,recurring,tagged,uda.\n"
     "\n"
-    "# General decoration\n"
-    "rule.color.merge=1\n"
-    "color.label=\n"
-    "color.label.sort=\n"
-    "color.alternate=on gray2\n"
-    "color.header=color3\n"
-    "color.footnote=color3\n"
-    "color.warning=bold red\n"
-    "color.error=white on red\n"
-    "color.debug=color4\n"
-    "\n"
-    "# Task state\n"
-    "color.completed=\n"
-    "color.deleted=\n"
-    "color.active=rgb555 on rgb410\n"
-    "color.recurring=rgb013\n"
-    "color.scheduled=on rgb001\n"
-    "color.until=\n"
-    "color.blocked=white on color8\n"
-    "color.blocking=black on color15\n"
-    "\n"
-    "# Project\n"
-    "color.project.none=\n"
-    "\n"
-    "# Priority UDA\n"
-    "color.uda.priority.H=color255\n"
-    "color.uda.priority.L=color245\n"
-    "color.uda.priority.M=color250\n"
-    "\n"
-    "# Tags\n"
-    "color.tag.next=rgb440\n"
-    "color.tag.none=\n"
-    "color.tagged=rgb031\n"
-    "\n"
-    "# Due\n"
-    "color.due.today=rgb400\n"
-    "color.due=color1\n"
-    "color.overdue=color9\n"
-    "\n"
-    "# Report: burndown\n"
-    "color.burndown.done=on rgb010\n"
-    "color.burndown.pending=on color9\n"
-    "color.burndown.started=on color11\n"
-    "\n"
-    "# Report: history\n"
-    "color.history.add=color0 on rgb500\n"
-    "color.history.delete=color0 on rgb550\n"
-    "color.history.done=color0 on rgb050\n"
-    "\n"
-    "# Report: summary\n"
-    "color.summary.background=white on color0\n"
-    "color.summary.bar=black on rgb141\n"
-    "\n"
-    "# Command: calendar\n"
-    "color.calendar.due.today=color15 on color1\n"
-    "color.calendar.due=color0 on color1\n"
-    "color.calendar.holiday=color0 on color11\n"
-    "color.calendar.scheduled=rgb013 on color15\n"
-    "color.calendar.overdue=color0 on color9\n"
-    "color.calendar.today=color15 on rgb013\n"
-    "color.calendar.weekend=on color235\n"
-    "color.calendar.weeknumber=rgb013\n"
-    "\n"
-    "# Command: sync\n"
-    "color.sync.added=rgb010\n"
-    "color.sync.changed=color11\n"
-    "color.sync.rejected=color9\n"
-    "\n"
-    "# Command: undo\n"
-    "color.undo.after=color2\n"
-    "color.undo.before=color1\n"
-    "\n"
     "# UDA priority\n"
     "uda.priority.type=string                       # UDA priority is a string type\n"
     "uda.priority.label=Priority                    # UDA priority has a display label'\n"
@@ -1195,6 +1123,7 @@ void Context::createDefaultConfig() {
              << "#include solarized-dark-256.theme\n"
              << "#include solarized-light-256.theme\n"
              << "#include no-color.theme\n"
+             << "include default.theme\n"
              << '\n';
 
     // Write out the new file.