diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index a9b628ccf..92603e7aa 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -1,7 +1,19 @@
-################################################################################
-# Sample taskwarrior 1.9 (or later) dark 16-color theme
+# dark-16
+# This is the proposed defult color theme
+# and the template file for metadata, layout and precedence
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +37,70 @@
 #
 ###############################################################################
 
-color=on
-color.header=yellow
-color.footnote=yellow
-color.error=yellow
-color.debug=yellow
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=black on green
-color.summary.background=white on black
+# basics
+color.active=bold yellow
+color.completed=green on white
+color.deleted=red on white
+color.due.today=on yellow
+color.due=on blue
+color.overdue=on red
+color.blocking=bold green
+color.blocked=bold cyan
+color.recurring=
+color.scheduled=on green
+color.tagged=
+color.pri.H=bold white
+color.pri.M=
+color.pri.L=
 
-color.history.add=black on red
-color.history.done=black on green
-color.history.delete=black on yellow
+# missing attributes
+color.project.none=
+color.tag.none=
+color.pri.none=
 
-color.burndown.pending=on red
-color.burndown.started=on yellow
-color.burndown.done=on green
+# personal color rules (remove "#" and replace "X" with your value)
+#color.keyword.X=
+#color.project.X=
+color.tag.next=bold yellow
+#color.uda.X=
 
+# interface
+color.alternate=
+color.header=
+color.label=inverse
+color.footnote=
+
+# burndown report
+color.burndown.pending=on green
+color.burndown.started=on bright yellow
+color.burndown.done=on bright green
+
+# calendar
+color.calendar.holiday=bold yellow
+color.calendar.today=bold white
+color.calendar.due.today=on yellow
+color.calendar.due=on blue
+color.calendar.overdue=on red
+color.calendar.weekend=on bright black
+color.calendar.weeknumber=bold black
+
+# history report
+color.history.add=red on green
+color.history.done=black on bright green
+color.history.delete=white on red
+
+# summary report (background color only)
+color.summary.bar=on green
+color.summary.background=on black
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red
-
-color.undo.before=red
-color.undo.after=green
-
-color.calendar.today=bold white on bright blue
-color.calendar.due=white on red
-color.calendar.due.today=bold white on red
-color.calendar.overdue=black on bright red
-color.calendar.weekend=white on bright black
-color.calendar.holiday=black on bright yellow
-color.calendar.weeknumber=bold blue
-
-color.recurring=magenta
-color.overdue=bold red
-color.due.today=red
-color.due=red
-color.active=black on bright green
-color.pri.none=
-color.pri.H=bold white
-color.pri.M=white
-color.pri.L=
-color.tagged=green
-color.blocked=black on white
-color.blocking=black on bright white
-color.project.none=
-color.tag.none=
-color.alternate=
-
+color.warning=bold red
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 9355d7403..f8812c666 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -1,7 +1,17 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme
+# dark-256
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +35,71 @@
 #
 ###############################################################################
 
-color=on
-color.header=color3
-color.footnote=color3
-color.error=color3
-color.debug=color3
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=black on rgb141
-color.summary.background=white on color0
+# basics
+color.active=bold yellow
+color.completed=rgb010 on white
+color.deleted=rgb100 on white
+color.due.today=on rgb020
+color.due=on rgb010
+color.overdue=on rgb100
+color.blocking=rgb522
+color.blocked=rgb235
+color.recurring=
+color.scheduled=on rgb001
+color.tagged=
+color.pri.H=bold white
+color.pri.M=gray23
+color.pri.L=gray12
+color.pri.none=gray23
 
-color.history.add=color0 on rgb500
-color.history.done=color0 on rgb050
-color.history.delete=color0 on rgb550
-
-color.burndown.pending=on color9
-color.burndown.started=on color11
-color.burndown.done=on rgb010
-
-color.sync.added=rgb010
-color.sync.changed=color11
-color.sync.rejected=color9
-
-color.undo.before=color1
-color.undo.after=color2
-
-color.calendar.today=color15 on rgb013
-color.calendar.due=color0 on color1
-color.calendar.due.today=color15 on color1
-color.calendar.overdue=color0 on color9
-color.calendar.weekend=on color235
-color.calendar.holiday=color0 on color11
-color.calendar.weeknumber=rgb013
-
-color.recurring=rgb013
-color.overdue=color9
-color.due.today=rgb400
-color.due=color1
-color.active=rgb555 on rgb410
-color.pri.none=
-color.pri.H=color255
-color.pri.M=color250
-color.pri.L=color245
-color.tagged=rgb031
-color.blocked=white on color8
-color.blocking=white on color15
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on color233
+color.pri.none=
 
+# personal color rules (replace "X" with your value)
+color.keyword.X=
+color.project.X=
+color.tag.next=rgb440
+color.uda.X=
+
+# interface
+color.alternate=on gray1
+color.header=color0 on gray11
+color.label=inverse
+color.footnote=on gray5
+
+# burndown report
+color.burndown.pending=rgb000 on rgb010
+color.burndown.started=rgb000 on bright yellow
+color.burndown.done=rgb000 on rgb020
+
+# calendar
+color.calendar.holiday=bold yellow
+color.calendar.today=bold white
+color.calendar.due.today=on rgb020
+color.calendar.due=on rgb010
+color.calendar.overdue=on rgb100
+color.calendar.weekend=on gray5
+color.calendar.weeknumber=gray8
+
+# history report
+color.history.add=gray14 on rgb010
+color.history.done=black on rgb020
+color.history.delete=gray14 on rgb100
+
+# summary report (background color only)
+color.summary.bar=on rgb010
+color.summary.background=on black
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 45721ea86..cbe81ad49 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -1,7 +1,18 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring blue.
+# color.theme.name=dark-blue-256
+# color.theme.description=truly blue
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -24,52 +35,71 @@
 # 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.
 
-color=on
-color.header=rgb013
-color.footnote=rgb013
-color.error=rgb013
-color.debug=rgb013
+# basics
+color.active=bold yellow
+color.completed=rgb001 on white
+color.deleted=rgb100 on white
+color.due.today=on rgb002
+color.due=on rgb001
+color.overdue=on rgb102
+color.blocking=rgb150
+color.blocked=rgb035
+color.recurring=
+color.scheduled=on rgb011
+color.tagged=
+color.pri.H=bold white
+color.pri.M=gray23
+color.pri.L=gray12
+color.pri.none=gray23
 
-color.summary.bar=white on rgb003
-color.summary.background=white on color0
-
-color.history.add=color0 on rgb015
-color.history.done=color0 on rgb025
-color.history.delete=color0 on rgb035
-
-color.burndown.pending=on rgb004
-color.burndown.started=on rgb015
-color.burndown.done=on gray4
-
-color.sync.added=gray4
-color.sync.changed=rgb015
-color.sync.rejected=rgb004
-
-color.undo.before=rgb013
-color.undo.after=rgb035
-
-color.calendar.today=color0 on rgb115
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color252
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=color255 on rgb013
-color.calendar.weeknumber=rgb015
-
-color.recurring=rgb115
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb045 on rgb015
-color.pri.none=
-color.pri.H=rgb035
-color.pri.M=rgb025
-color.pri.L=rgb015
-color.tagged=color246
-color.blocked=white on rgb001
-color.blocking=white on rgb002
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on color233
+color.pri.none=
 
+# personal color rules (remove "#" and replace "X" with your value)
+#color.keyword.X=
+#color.project.X=
+color.tag.next=rgb550
+#color.uda.X=
+
+# interface
+color.alternate=on gray1
+color.header=color0 on gray11
+color.label=inverse
+color.footnote=on gray5
+
+# burndown report
+color.burndown.pending=on rgb001
+color.burndown.started=on rgb330
+color.burndown.done=on rgb004
+
+# calendar
+color.calendar.holiday=rgb550
+color.calendar.today=bold white
+color.calendar.due.today=on rgb004
+color.calendar.due=on rgb002
+color.calendar.overdue=on rgb102
+color.calendar.weekend=on gray4
+color.calendar.weeknumber=rgb003
+
+# history report
+color.history.add=white on rgb001
+color.history.done=black on rgb004
+color.history.delete=white on rgb100
+
+# summary report (background color only)
+color.summary.bar=on rgb001
+color.summary.background=on gray2
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red
diff --git a/doc/rc/dark-gray-256.theme b/doc/rc/dark-gray-256.theme
index f9e795541..0bf9df3f5 100644
--- a/doc/rc/dark-gray-256.theme
+++ b/doc/rc/dark-gray-256.theme
@@ -1,7 +1,18 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) dark gray 256-color theme
+# dark-gray-256
+# no color, only shades of gray
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +36,71 @@
 #
 ###############################################################################
 
-color=on
-color.header=color8
-color.footnote=color8
-color.error=color8
-color.debug=color8
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=black on gray12
-color.summary.background=white on gray3
+# basics
+color.active=black on gray18
+color.completed=black on white
+color.deleted=black on white
+color.due.today=on gray4
+color.due=on gray2
+color.overdue=on gray6
+color.blocking=bold white
+color.blocked=gray13
+color.recurring=
+color.scheduled=on gray8
+color.tagged=
+color.pri.H=gray21
+color.pri.M=gray18
+color.pri.L=gray12
+color.pri.none=gray18
 
-color.history.add=color0 on gray6
-color.history.done=color0 on gray15
-color.history.delete=color0 on gray10
-
-color.burndown.pending=on gray6
-color.burndown.started=on gray15
-color.burndown.done=on gray10
-
-color.sync.added=gray10
-color.sync.changed=gray15
-color.sync.rejected=gray6
-
-color.undo.before=gray6
-color.undo.after=gray15
-
-color.calendar.today=color8 on color15
-color.calendar.due=color7 on color8
-color.calendar.due.today=color15 on color8
-color.calendar.overdue=underline color0 on color7
-color.calendar.weekend=on color235
-color.calendar.holiday=color7 on color15
-color.calendar.weeknumber=gray4
-
-color.recurring=gray8
-color.overdue=color0 on color15
-color.due.today=underline color0 on color7
-color.due=color7
-color.active=color7 on color8
-color.pri.none=
-color.pri.H=color15
-color.pri.M=color7
-color.pri.L=color8
-color.tagged=gray12
-color.blocked=color15 on color8
-color.blocking=color15 on color7
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on gray2
+color.pri.none=
 
+# personal color rules (replace "X" with your value)
+color.keyword.X=
+color.project.X=
+color.tag.next=bold white
+color.uda.X=
+
+# interface
+color.alternate=on gray1
+color.header=color0 on gray11
+color.label=inverse
+color.footnote=on gray5
+
+# burndown report
+color.burndown.pending=rgb000 on rgb010
+color.burndown.started=rgb000 on bright yellow
+color.burndown.done=rgb000 on rgb020
+
+# calendar
+color.calendar.holiday=black on gray20
+color.calendar.today=bold white
+color.calendar.due.today=on gray15
+color.calendar.due=on gray8
+color.calendar.overdue=gray2 on gray10
+color.calendar.weekend=on gray2
+color.calendar.weeknumber=gray6
+
+# history report
+color.history.add=gray15 on gray5
+color.history.done=gray5 on gray23
+color.history.delete=black on gray10
+
+# summary report (background color only)
+color.summary.bar=on gray15
+color.summary.background=on black
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index cc57ea8db..2bd9307f9 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -1,7 +1,18 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring green.
+# color.theme.name=dark-green-256
+# color.theme.description=as green as grass
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -24,52 +35,71 @@
 # 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.
 
-color=on
-color.header=rgb031
-color.footnote=rgb031
-color.error=rgb031
-color.debug=rgb031
+# basics
+color.active=bold yellow
+color.completed=rgb020 on white
+color.deleted=rgb200 on white
+color.due.today=on rgb020
+color.due=on rgb010
+color.overdue=on rgb120
+color.blocking=rgb533
+color.blocked=rgb353
+color.recurring=
+color.scheduled=on rgb011
+color.tagged=
+color.pri.H=bold white
+color.pri.M=gray23
+color.pri.L=gray14
+color.pri.none=gray23
 
-color.summary.bar=white on rgb030
-color.summary.background=white on color0
-
-color.history.add=color0 on rgb010
-color.history.done=color0 on rgb030
-color.history.delete=color0 on rgb050
-
-color.burndown.pending=on rgb010
-color.burndown.started=on rgb030
-color.burndown.done=on gray4
-
-color.sync.added=gray4
-color.sync.changed=rgb030
-color.sync.rejected=rgb010
-
-color.undo.before=rgb031
-color.undo.after=rgb053
-
-color.calendar.today=color0 on rgb151
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color225
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=rgb151 on rgb020
-color.calendar.weeknumber=rgb010
-
-color.recurring=rgb151
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb050 on rgb010
-color.pri.none=
-color.pri.H=rgb050
-color.pri.M=rgb030
-color.pri.L=rgb010
-color.tagged=color246
-color.blocked=white on rgb010
-color.blocking=white on rgb020
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on color233
+color.pri.none=
 
+# personal color rules (remove "#" and replace "X" with your value)
+#color.keyword.X=
+#color.project.X=
+color.tag.next=rgb440
+#color.uda.X=
+
+# interface
+color.alternate=on gray1
+color.header=color0 on gray11
+color.label=inverse
+color.footnote=on gray5
+
+# burndown report
+color.burndown.pending=on rgb010
+color.burndown.started=on bright yellow
+color.burndown.done=on rgb030
+
+# calendar
+color.calendar.holiday=rgb550
+color.calendar.today=bold white
+color.calendar.due.today=on rgb020
+color.calendar.due=on rgb010
+color.calendar.overdue=on rgb120
+color.calendar.weekend=on gray4
+color.calendar.weeknumber=rgb020
+
+# history report
+color.history.add=white on rgb010
+color.history.done=black on rgb030
+color.history.delete=white on rgb100
+
+# summary report (background color only)
+color.summary.bar=on rgb010
+color.summary.background=gray4
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index 0bfa26932..e2b866a24 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -1,7 +1,18 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) dark 256-color theme, featuring red.
+# color.theme.name=dark-red-256
+# color.theme.description=well red, warmer than most
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later)
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +36,71 @@
 #
 ###############################################################################
 
-color=on
-color.header=rgb100
-color.footnote=rgb100
-color.error=rgb100
-color.debug=rgb100
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=white on rgb300
-color.summary.background=white on color0
+# basics
+color.active=bold yellow
+color.completed=rgb020 on white
+color.deleted=rgb200 on white
+color.due.today=on rgb300
+color.due=on rgb100
+color.overdue=on rgb200
+color.blocking=rgb152
+color.blocked=rgb125
+color.recurring=
+color.scheduled=on rgb201
+color.tagged=
+color.pri.H=bold white
+color.pri.M=gray23
+color.pri.L=gray12
+color.pri.none=gray23
 
-color.history.add=color0 on rgb100
-color.history.done=color0 on rgb300
-color.history.delete=color0 on rgb500
-
-color.burndown.pending=on rgb200
-color.burndown.started=on rgb411
-color.burndown.done=on gray4
-
-color.sync.added=gray4
-color.sync.changed=rgb411
-color.sync.rejected=rgb200
-
-color.undo.before=rgb301
-color.undo.after=rgb503
-
-color.calendar.today=color0 on rgb511
-color.calendar.due=color0 on color249
-color.calendar.due.today=color0 on color252
-color.calendar.overdue=color0 on color255
-color.calendar.weekend=on color235
-color.calendar.holiday=rgb522 on rgb300
-color.calendar.weeknumber=rgb100
-
-color.recurring=rgb511
-color.overdue=color255
-color.due.today=color252
-color.due=color249
-color.active=rgb500 on rgb100
-color.pri.none=
-color.pri.H=rgb500
-color.pri.M=rgb400
-color.pri.L=rgb300
-color.tagged=color246
-color.blocked=white on rgb100
-color.blocking=white on rgb200
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on color233
+color.pri.none=
 
+# personal color rules (remove "#" and replace "X" with your value)
+#color.keyword.X=
+#color.project.X=
+color.tag.next=rgb440
+#color.uda.X=
+
+# interface
+color.alternate=on gray1
+color.header=black on gray11
+color.label=inverse
+color.footnote=gray2 on gray12
+
+# burndown report
+color.burndown.pending=on rgb010
+color.burndown.started=on bright yellow
+color.burndown.done=on rgb030
+
+# calendar
+color.calendar.holiday=rgb550
+color.calendar.today=bold white
+color.calendar.due.today=on rgb500
+color.calendar.due=on rgb100
+color.calendar.overdue=on rgb300
+color.calendar.weekend=on gray4
+color.calendar.weeknumber=rgb200
+
+# history report
+color.history.add=white on rgb010
+color.history.done=black on rgb030
+color.history.delete=white on rgb100
+
+# summary report (background color only)
+color.summary.bar=on rgb010
+color.summary.background=gray4
+
+# status
+color.error=red on white
+color.debug=black on white
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index 674111c35..50f0de0bd 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -1,7 +1,17 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) light 16-color theme
+# light-16 
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later) 
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +35,71 @@
 #
 ###############################################################################
 
-color=on
-color.header=blue
-color.footnote=blue
-color.error=blue
-color.debug=blue
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=black on green
-color.summary.background=white on black
+# basics
+color.active=color11 on color8
+color.completed=green on black
+color.deleted=red on black
+color.due.today=on color11
+color.due=on color10
+color.overdue=on color13
+color.blocking=red
+color.blocked=blue
+color.recurring=
+color.scheduled=on color14
+color.tagged=
+color.pri.H=
+color.pri.M=
+color.pri.L=color8
+color.pri.none=
 
-color.history.add=black on red
-color.history.done=black on green
-color.history.delete=black on yellow
+# missing attributes
+color.project.none=
+color.tag.none=
+color.pri.none=
 
-color.burndown.pending=on red
-color.burndown.started=on yellow
-color.burndown.done=on green
+# personal color rules (replace "X" with your value)
+color.keyword.X=
+color.project.X=
+color.tag.next=color11 on color8
+color.uda.X=
 
+# interface
+color.alternate=
+color.header=bold white on color8
+color.label=white on black
+color.footnote=color14 on color8
+
+# burndown report
+color.burndown.pending=on color10 
+color.burndown.started=on color11
+color.burndown.done=on color2
+
+# calendar
+color.calendar.holiday=yellow
+color.calendar.today=color4
+color.calendar.due.today=color4 on color11
+color.calendar.due=on color10
+color.calendar.overdue=on color13
+color.calendar.weekend=on white
+color.calendar.weeknumber=color7 on color8
+
+# history report
+color.history.add=blue on color11
+color.history.done=color2 on color10
+color.history.delete=black on color9
+
+# summary report (background color only)
+color.summary.bar=on color10
+color.summary.background=on white
+
+# status
+color.error=red on white
+color.debug=white on black
+color.undo.before=yellow
+color.undo.after=green
 color.sync.added=green
 color.sync.changed=yellow
 color.sync.rejected=red
-
-color.undo.before=red
-color.undo.after=green
-
-color.calendar.today=black on bright blue
-color.calendar.due=white on red
-color.calendar.due.today=bold white on red
-color.calendar.overdue=black on bright red
-color.calendar.weekend=white on bright black
-color.calendar.holiday=black on yellow
-color.calendar.weeknumber=bold blue
-
-color.recurring=blue
-color.overdue=bold red
-color.due.today=red
-color.due=red
-color.active=black on green
-color.pri.none=
-color.pri.H=bold black
-color.pri.M=black
-color.pri.L=
-color.tagged=green
-color.blocked=white on black
-color.blocking=bold white on black
-color.project.none=
-color.tag.none=
-color.alternate=
-
+color.warning=bold red
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index 91c302c27..f36e29d4c 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -1,7 +1,17 @@
-###############################################################################
-# Sample taskwarrior 1.9 (or later) light 256-color theme
+# light-256 
 #
-# Copyright 2006 - 2014, Paul Beckingham, Federico Hernandez.
+###############################################################################
+#
+# Color theme for taskwarrior 2.4 (or later) 
+#
+# taskwarrior - a command line task list manager.
+# http://taskwarrior.org - http://tasktools.org
+#
+# For more information on how to use, see 'man taskrc' and 'man task-color'
+#
+###############################################################################
+#
+# Copyright 2006-2014, 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
@@ -25,51 +35,71 @@
 #
 ###############################################################################
 
-color=on
-color.header=color4
-color.footnote=color4
-color.error=color4
-color.debug=color4
+rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.
 
-color.summary.bar=black on rgb141
-color.summary.background=white on color0
+# basics
+color.active=rgb420
+color.completed=rgb353 on black
+color.deleted=rgb533 on black
+color.due.today=on rgb353
+color.due=on rgb343
+color.overdue=on rgb544
+color.blocking=rgb300
+color.blocked=rgb003
+color.recurring=
+color.scheduled=on rgb345
+color.tagged=
+color.pri.H=gray0
+color.pri.M=gray5
+color.pri.L=gray10
+color.pri.none=gray5
 
-color.history.add=color0 on rgb500
-color.history.done=color0 on rgb050
-color.history.delete=color0 on rgb550
-
-color.burndown.pending=on rgb200
-color.burndown.started=on rgb520
-color.burndown.done=on rgb011
-
-color.sync.added=rgb011
-color.sync.changed=rgb520
-color.sync.rejected=rgb200
-
-color.undo.before=color1
-color.undo.after=color2
-
-color.calendar.today=color15 on rgb013
-color.calendar.due=color0 on color9
-color.calendar.due.today=color15 on color1
-color.calendar.overdue=color0 on color1
-color.calendar.weekend=on color253
-color.calendar.holiday=color0 on color3
-color.calendar.weeknumber=rgb013
-
-color.recurring=rgb013
-color.overdue=color1
-color.due.today=rgb400
-color.due=color9
-color.active=rgb555 on rgb520
-color.pri.none=
-color.pri.H=color232
-color.pri.M=color237
-color.pri.L=color242
-color.tagged=rgb020
-color.blocked=gray12 on gray4
-color.blocking=gray12 on gray6
+# missing attributes
 color.project.none=
 color.tag.none=
-color.alternate=on color254
+color.pri.none=
 
+# personal color rules (replace "X" with your value)
+color.keyword.X=
+color.project.X=
+color.tag.next=rgb420
+color.uda.X=
+
+# interface
+color.alternate=on gray22
+color.header=bold white on gray8
+color.label=white on gray12
+color.footnote=on gray18
+
+# burndown report
+color.burndown.pending=on rgb141 
+color.burndown.started=on rgb440
+color.burndown.done=on rgb151
+
+# calendar
+color.calendar.holiday=rgb420
+color.calendar.today=rgb005
+color.calendar.due.today=on rgb353
+color.calendar.due=on rgb343
+color.calendar.overdue=on rgb533
+color.calendar.weekend=on gray21
+color.calendar.weeknumber=gray16
+
+# history report
+color.history.add=rgb005 on rgb440
+color.history.done=rgb020 on rgb343
+color.history.delete=rgb300 on rgb533
+
+# summary report (background color only)
+color.summary.bar=on rgb141
+color.summary.background=on gray20
+
+# status
+color.error=red on white
+color.debug=white on black
+color.undo.before=yellow
+color.undo.after=green
+color.sync.added=green
+color.sync.changed=yellow
+color.sync.rejected=red
+color.warning=bold red