diff --git a/ChangeLog b/ChangeLog
index 2532502d2..464d18c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -246,7 +246,7 @@
 - Removed version 1.x sort column support.
 - Old-style color names including underscores are no longer supported.
 - Removed priority counts from the 'projects' report.
-- New themes: dark-default-16.theme, dark-gray-blue-256.theme
+- New theme: dark-gray-blue-256.theme
 - Added certificate verification to GnuTLS versions < 2.9.10 (thanks to Alexander
   Sulfrian).
 - Added certificate hostname verification (thanks to Alexander Sulfrian).
diff --git a/NEWS b/NEWS
index f18630d16..48f7d84f2 100644
--- a/NEWS
+++ b/NEWS
@@ -35,7 +35,7 @@ New configuration options in taskwarrior 2.4.0
 
   - The 'taskd.trust' setting is now a tri-state, supporting values 'strict',
     'ignore hostname' and 'allow all', for server certificate validation.
-  - New themes: dark-default-16.theme, dark-gray-blue-256.theme
+  - New theme: dark-gray-blue-256.theme
   - The 'allow.empty.filter' setting can be set to 'no' to disallow the
     potentially dangerous combination of write commands and empty filters.
   - New truncated_count column style for the description field which as the
diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index 4e02b935b..c974f29b4 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -30,66 +30,66 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=
-color.header=
-color.footnote=
+color.header=yellow
+color.footnote=yellow
 color.warning=bold red
-color.error=red on white
-color.debug=black on white
+color.error=yellow
+color.debug=yellow
 
 # Task state
 color.completed=green on white
 color.deleted=red on white
-color.active=bold yellow
-color.recurring=
+color.active=black on bright green
+color.recurring=magenta
 color.scheduled=on green
 color.until=
-color.blocked=bold cyan
-color.blocking=bold green
+color.blocked=black on white
+color.blocking=black on bright white
 
 # Project
 color.project.none=
 
 # Priority
 color.pri.H=bold white
-color.pri.M=
+color.pri.M=white
 color.pri.L=
 color.pri.none=
 
 # Tags
 color.tag.next=bold yellow
 color.tag.none=
-color.tagged=
+color.tagged=green
 
 # Due
-color.due=on blue
-color.due.today=on yellow
-color.overdue=on red
+color.due=red
+color.due.today=red
+color.overdue=bold red
 
 # UDA
 #color.uda.X=
 
 # Report: burndown
-color.burndown.done=on bright green
-color.burndown.pending=on green
-color.burndown.started=on bright yellow
+color.burndown.done=on green
+color.burndown.pending=on red
+color.burndown.started=on yellow
 
 # Report: history
-color.history.add=red on green
-color.history.delete=white on red
-color.history.done=black on bright green
+color.history.add=black on red
+color.history.delete=black on yellow
+color.history.done=black on green
 
 # Report: summary
-color.summary.background=on black
-color.summary.bar=on green
+color.summary.background=white on black
+color.summary.bar=black on green
 
 # Command: calendar
-color.calendar.due=on blue
-color.calendar.due.today=on yellow
-color.calendar.holiday=bold yellow
-color.calendar.overdue=on red
-color.calendar.today=bold white
-color.calendar.weekend=on bright black
-color.calendar.weeknumber=bold black
+color.calendar.due=white on red
+color.calendar.due.today=bold white on red
+color.calendar.holiday=black on bright yellow
+color.calendar.overdue=black on bright red
+color.calendar.today=bold white on bright blue
+color.calendar.weekend=white on bright black
+color.calendar.weeknumber=bold blue
 
 # Command: sync
 color.sync.added=green
@@ -98,5 +98,5 @@ color.sync.rejected=red
 
 # Command: undo
 color.undo.after=green
-color.undo.before=yellow
+color.undo.before=red
 
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index f3b286cae..5fd2b5f4b 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -30,70 +30,70 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=on gray1
-color.header=color0 on gray11
-color.footnote=on gray5
+color.header=color3
+color.footnote=color3
 color.warning=bold red
-color.error=red on white
-color.debug=black on white
+color.error=color3
+color.debug=color3
 
 # Task state
 color.completed=rgb010 on white
 color.deleted=rgb100 on white
-color.active=bold yellow
-color.recurring=
+color.active=rgb555 on rgb410
+color.recurring=rgb013
 color.scheduled=on rgb001
 color.until=
-color.blocked=rgb235
-color.blocking=rgb522
+color.blocked=white on color8
+color.blocking=white on color15
 
 # Project
 color.project.none=
 
 # Priority
-color.pri.H=bold white
-color.pri.M=gray23
-color.pri.L=gray12
-color.pri.none=gray23
+color.pri.H=color255
+color.pri.L=color245
+color.pri.M=color250
+color.pri.none=
 
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=
+color.tagged=rgb031
 
 # Due
-color.due.today=on rgb020
-color.due=on rgb010
-color.overdue=on rgb100
+color.due.today=rgb400
+color.due=color1
+color.overdue=color9
 
 # Report: burndown
-color.burndown.done=rgb000 on rgb020
-color.burndown.pending=rgb000 on rgb010
-color.burndown.started=rgb000 on bright yellow
+color.burndown.done=on rgb010
+color.burndown.pending=on color9
+color.burndown.started=on color11
 
 # Report: history
-color.history.add=gray14 on rgb010
-color.history.done=black on rgb020
-color.history.delete=gray14 on rgb100
+color.history.add=color0 on rgb500
+color.history.delete=color0 on rgb550
+color.history.done=color0 on rgb050
 
 # Report: summary
-color.summary.bar=on rgb010
-color.summary.background=on black
+color.summary.background=white on color0
+color.summary.bar=black on rgb141
 
 # Command: calendar
-color.calendar.due=on rgb010
-color.calendar.due.today=on rgb020
-color.calendar.holiday=bold yellow
-color.calendar.overdue=on rgb100
-color.calendar.today=bold white
-color.calendar.weekend=on gray5
-color.calendar.weeknumber=gray8
+color.calendar.due.today=color15 on color1
+color.calendar.due=color0 on color1
+color.calendar.holiday=color0 on color11
+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=green
-color.sync.changed=yellow
-color.sync.rejected=red
+color.sync.added=rgb010
+color.sync.changed=color11
+color.sync.rejected=color9
 
 # Command: undo
-color.undo.before=yellow
-color.undo.after=green
+color.undo.after=color2
+color.undo.before=color1
 
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index e3fbac483..6659eb682 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -30,70 +30,70 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=on gray1
-color.header=color0 on gray11
-color.footnote=on gray5
+color.header=rgb013
+color.footnote=rgb013
 color.warning=bold red
-color.error=red on white
-color.debug=black on white
+color.error=rgb013
+color.debug=rgb013
 
 # Task state
 color.completed=rgb001 on white
 color.deleted=rgb100 on white
-color.active=bold yellow
-color.recurring=
+color.active=rgb045 on rgb015
+color.recurring=rgb115
 color.scheduled=on rgb011
 color.until=
-color.blocked=rgb035
-color.blocking=rgb150
+color.blocked=white on rgb001
+color.blocking=white on rgb002
 
 # Project
 color.project.none=
 
 # Priority
-color.pri.H=bold white
-color.pri.M=gray23
-color.pri.L=gray12
-color.pri.none=gray23
+color.pri.H=rgb035
+color.pri.L=rgb015
+color.pri.M=rgb025
+color.pri.none=
 
 # Tags
 color.tag.next=rgb550
 color.tag.none=
-color.tagged=
+color.tagged=color246
 
 # Due
-color.due=on rgb001
-color.due.today=on rgb002
-color.overdue=on rgb102
+color.due.today=color252
+color.due=color249
+color.overdue=color255
 
 # Report: burndown
-color.burndown.done=on rgb004
-color.burndown.pending=on rgb001
-color.burndown.started=on rgb330
+color.burndown.done=on gray4
+color.burndown.pending=on rgb004
+color.burndown.started=on rgb015
 
 # Report: history
-color.history.add=white on rgb001
-color.history.done=black on rgb004
-color.history.delete=white on rgb100
+color.history.add=color0 on rgb015
+color.history.delete=color0 on rgb035
+color.history.done=color0 on rgb025
 
 # Report: summary
-color.summary.bar=on rgb001
-color.summary.background=on gray2
+color.summary.background=white on color0
+color.summary.bar=white on rgb003
 
 # Command: calendar
-color.calendar.due=on rgb002
-color.calendar.due.today=on rgb004
-color.calendar.holiday=rgb550
-color.calendar.overdue=on rgb102
-color.calendar.today=bold white
-color.calendar.weekend=on gray4
-color.calendar.weeknumber=rgb003
+color.calendar.due.today=color0 on color252
+color.calendar.due=color0 on color249
+color.calendar.holiday=color255 on rgb013
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb115
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb015
 
 # Command: sync
-color.sync.added=green
-color.sync.changed=yellow
-color.sync.rejected=red
+color.sync.added=gray4
+color.sync.changed=rgb015
+color.sync.rejected=rgb004
 
 # Command: undo
-color.undo.before=yellow
-color.undo.after=green
+color.undo.after=rgb035
+color.undo.before=rgb013
 
diff --git a/doc/rc/dark-default-16.theme b/doc/rc/dark-default-16.theme
deleted file mode 100644
index f8827dc7f..000000000
--- a/doc/rc/dark-default-16.theme
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-#
-# Copyright 2006 - 2015, 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.
-#
-# http://www.opensource.org/licenses/mit-license.php
-#
-###############################################################################
-
-rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
-
-# General decoration
-color.label=
-color.label.sort=
-color.alternate=on color8
-color.header=color3 on color0
-color.footnote=color3 on color0
-color.warning=
-color.error=color1 on color7
-color.debug=color7 on color1
-
-# Task state
-color.completed=
-color.deleted=
-color.active=on color3
-color.recurring=color14
-color.scheduled=color11
-color.until=
-color.blocked=on color4
-color.blocking=on color6
-
-# Project
-color.project.none=
-
-# Priority
-color.pri.H=bold white
-color.pri.M=color7
-color.pri.L=color13
-color.pri.none=color7
-
-# Tags
-color.tag.next=
-color.tag.none=
-color.tagged=
-
-# Due
-color.due=on color2
-color.due.today=color11
-color.overdue=on color5
-
-# Report: burndown
-color.burndown.done=on color10
-color.burndown.pending=on color2
-color.burndown.started=on color3
-
-# Report: history
-color.history.add=on color2
-color.history.delete=on color1
-color.history.done=color8 on color10
-
-# Report: summary
-color.summary.background=on color6
-color.summary.bar=on color2
-
-# Command: calendar
-color.calendar.due=on color2
-color.calendar.due.today=color3
-color.calendar.holiday=on color3
-color.calendar.overdue=on color5
-color.calendar.today=color14
-color.calendar.weekend=color13
-color.calendar.weeknumber=color4
-
-# Command: sync
-color.sync.added=color11
-color.sync.changed=color10
-color.sync.rejected=color9
-
-# Command: undo
-color.undo.before=color10
-color.undo.after=color9
-
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index a5cd5f49b..f2d741a71 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -30,69 +30,69 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=on gray1
-color.header=color0 on gray11
-color.footnote=on gray5
+color.header=rgb031
+color.footnote=rgb031
 color.warning=bold red
-color.error=red on white
-color.debug=black on white
+color.error=rgb031
+color.debug=rgb031
 
 # Task state
 color.completed=rgb020 on white
 color.deleted=rgb200 on white
-color.active=bold yellow
-color.recurring=
+color.active=rgb050 on rgb010
+color.recurring=rgb151
 color.scheduled=on rgb011
 color.until=
-color.blocked=rgb353
-color.blocking=rgb533
+color.blocked=white on rgb010
+color.blocking=white on rgb020
 
 # Project
 color.project.none=
 
 # Priority
-color.pri.H=bold white
-color.pri.M=gray23
-color.pri.L=gray14
-color.pri.none=gray23
+color.pri.H=rgb050
+color.pri.L=rgb010
+color.pri.M=rgb030
+color.pri.none=
 
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=
+color.tagged=color246
 
 # Due
-color.due=on rgb010
-color.due.today=on rgb020
-color.overdue=on rgb120
+color.due.today=color252
+color.due=color249
+color.overdue=color255
 
 # Report: burndown
+color.burndown.done=on gray4
 color.burndown.pending=on rgb010
-color.burndown.started=on bright yellow
-color.burndown.done=on rgb030
+color.burndown.started=on rgb030
 
 # Report: history
-color.history.add=white on rgb010
-color.history.done=black on rgb030
-color.history.delete=white on rgb100
+color.history.add=color0 on rgb010
+color.history.delete=color0 on rgb050
+color.history.done=color0 on rgb030
 
 # Report: summary
-color.summary.bar=on rgb010
-color.summary.background=gray4
+color.summary.background=white on color0
+color.summary.bar=white on rgb030
 
 # Command: calendar
-color.calendar.due.today=on rgb020
-color.calendar.due=on rgb010
-color.calendar.holiday=rgb550
-color.calendar.overdue=on rgb120
-color.calendar.today=bold white
-color.calendar.weekend=on gray4
-color.calendar.weeknumber=rgb020
+color.calendar.due.today=color0 on color225
+color.calendar.due=color0 on color249
+color.calendar.holiday=rgb151 on rgb020
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb151
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb010
 
 # Command: sync
-color.sync.added=green
-color.sync.changed=yellow
-color.sync.rejected=red
+color.sync.added=gray4
+color.sync.changed=rgb030
+color.sync.rejected=rgb010
 
 # Command: undo
-color.undo.before=yellow
-color.undo.after=green
+color.undo.after=rgb053
+color.undo.before=rgb031
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index d31c80e9c..17c4b1b69 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -30,70 +30,70 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=on gray1
-color.header=black on gray11
-color.footnote=gray2 on gray12
+color.header=rgb100
+color.footnote=rgb100
 color.warning=bold red
-color.error=red on white
-color.debug=black on white
+color.error=rgb100
+color.debug=rgb100
 
 # Task state
 color.completed=rgb020 on white
 color.deleted=rgb200 on white
-color.active=bold yellow
-color.recurring=
+color.active=rgb500 on rgb100
+color.recurring=rgb511
 color.scheduled=on rgb201
 color.until=
-color.blocked=rgb125
-color.blocking=rgb152
+color.blocked=white on rgb100
+color.blocking=white on rgb200
 
 # Project
 color.project.none=
 
 # Priority
-color.pri.H=bold white
-color.pri.M=gray23
-color.pri.L=gray12
-color.pri.none=gray23
+color.pri.H=rgb500
+color.pri.L=rgb300
+color.pri.M=rgb400
+color.pri.none=
 
 # Tags
 color.tag.next=rgb440
 color.tag.none=
-color.tagged=
+color.tagged=color246
 
 # Due
-color.due=on rgb100
-color.due.today=on rgb300
-color.overdue=on rgb200
+color.due.today=color252
+color.due=color249
+color.overdue=color255
 
 # Report: burndown
-color.burndown.pending=on rgb010
-color.burndown.started=on bright yellow
-color.burndown.done=on rgb030
+color.burndown.done=on gray4
+color.burndown.pending=on rgb200
+color.burndown.started=on rgb411
 
 # Report: history
-color.history.add=white on rgb010
-color.history.done=black on rgb030
-color.history.delete=white on rgb100
+color.history.add=color0 on rgb100
+color.history.delete=color0 on rgb500
+color.history.done=color0 on rgb300
 
 # Report: summary
-color.summary.bar=on rgb010
-color.summary.background=gray4
+color.summary.background=white on color0
+color.summary.bar=white on rgb300
 
 # Command: calendar
-color.calendar.due=on rgb100
-color.calendar.due.today=on rgb500
-color.calendar.holiday=rgb550
-color.calendar.overdue=on rgb300
-color.calendar.today=bold white
-color.calendar.weekend=on gray4
-color.calendar.weeknumber=rgb200
+color.calendar.due.today=color0 on color252
+color.calendar.due=color0 on color249
+color.calendar.holiday=rgb522 on rgb300
+color.calendar.overdue=color0 on color255
+color.calendar.today=color0 on rgb511
+color.calendar.weekend=on color235
+color.calendar.weeknumber=rgb100
 
 # Command: sync
-color.sync.added=green
-color.sync.changed=yellow
-color.sync.rejected=red
+color.sync.added=gray4
+color.sync.changed=rgb411
+color.sync.rejected=rgb200
 
 # Command: undo
-color.undo.before=yellow
-color.undo.after=green
+color.undo.after=rgb503
+color.undo.before=rgb301
 
diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme
index 344b14695..62d14e56c 100644
--- a/doc/rc/dark-yellow-green.theme
+++ b/doc/rc/dark-yellow-green.theme
@@ -29,7 +29,7 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 # General decoration
 color.label=
 color.label.sort=
-color.alternate=on gray0
+color.alternate=on gray2
 color.header=rgb031
 color.footnote=rgb031
 color.warning=
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index bb21f9a84..527a21f9d 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -30,8 +30,8 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=
-color.header=bold white on color8
-color.footnote=color14 on color8
+color.header=bold white on bright black
+color.footnote=bold cyan on bright black
 color.warning=bold red
 color.error=red on white
 color.debug=white on black
@@ -39,9 +39,9 @@ color.debug=white on black
 # Task state
 color.completed=green on black
 color.deleted=red on black
-color.active=color11 on color8
+color.active=bold yellow on bright black
 color.recurring=
-color.scheduled=on color14
+color.scheduled=on bright cyan
 color.until=
 color.blocking=red
 color.blocked=blue
@@ -52,41 +52,41 @@ color.project.none=
 # Priority
 color.pri.H=
 color.pri.M=
-color.pri.L=color8
+color.pri.L=bright black
 color.pri.none=
 
 # Tags
-color.tag.next=color11 on color8
+color.tag.next=bold yellow on bright black
 color.tag.none=
 color.tagged=
 
 # Due
-color.due=on color10
-color.due.today=on color11
-color.overdue=on color13
+color.due=on bright green
+color.due.today=on bright yellow
+color.overdue=on bright magenta
 
 # Report: burndown
-color.burndown.pending=on color10 
-color.burndown.started=on color11
-color.burndown.done=on color2
+color.burndown.pending=on bright green
+color.burndown.started=on bright yellow
+color.burndown.done=on green
 
 # Report: history
-color.history.add=blue on color11
-color.history.done=color2 on color10
-color.history.delete=black on color9
+color.history.add=blue on bright yellow
+color.history.done=green on bright green
+color.history.delete=black on red
 
 # Report: summary
-color.summary.bar=on color10
+color.summary.bar=on bright green
 color.summary.background=on white
 
 # Command: calendar
-color.calendar.due=on color10
-color.calendar.due.today=color4 on color11
+color.calendar.due=on bright green
+color.calendar.due.today=blue on bright yellow
 color.calendar.holiday=yellow
-color.calendar.overdue=on color13
-color.calendar.today=color4
+color.calendar.overdue=on bright magenta
+color.calendar.today=blue
 color.calendar.weekend=on white
-color.calendar.weeknumber=color7 on color8
+color.calendar.weeknumber=white on bright black
 
 # Command: sync
 color.sync.added=green
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index 629ba230e..359272fd1 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -30,15 +30,15 @@ rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overd
 color.label=
 color.label.sort=
 color.alternate=on gray22
-color.header=bold white on gray8
+color.header=color15 on gray8
 color.footnote=on gray18
-color.warning=bold red
+color.warning=color9
 color.error=red on white
-color.debug=white on black
+color.debug=color7 on color0
 
 # Task state
-color.completed=rgb353 on black
-color.deleted=rgb533 on black
+color.completed=rgb353 on rgb000
+color.deleted=rgb533 on rgb000
 color.active=rgb420
 color.recurring=
 color.scheduled=on rgb345