diff --git a/doc/misc/themes/README b/doc/misc/themes/README
index d7318ed03..bcc7b93e3 100644
--- a/doc/misc/themes/README
+++ b/doc/misc/themes/README
@@ -6,7 +6,7 @@ that need to be illustrated in theme sample.
 
 Then edit the 'rc' file to include the desired theme file.
 
-Then run 'per' once per theme, and capture the display.
+Then run 'per' to run a few commands for each theme.
 
 Note that this will require that the terminal window be switched between a black
 and white background to properly show the light and dark themes.
diff --git a/doc/misc/themes/per b/doc/misc/themes/per
deleted file mode 100755
index 1085761f5..000000000
--- a/doc/misc/themes/per
+++ /dev/null
@@ -1,8 +0,0 @@
-echo '$ task list'
-task rc:rc list | grep -v alternate
-echo '$ task summary'
-task rc:rc summary | grep -v alternate
-echo '$ task ghistory'
-task rc:rc ghistory | grep -v alternate
-echo '$ task calendar'
-task rc:rc calendar | grep -v alternate
diff --git a/doc/misc/themes/run b/doc/misc/themes/run
index 9456995a8..4a30d07e7 100755
--- a/doc/misc/themes/run
+++ b/doc/misc/themes/run
@@ -1,47 +1,23 @@
-rm pending.data completed.data undo.data rc
 
-cat <<EOF >>rc
 
+for theme in $PWD/../../rc/*.theme
+do
+  cat <<EOF >>x
 data.location=.
 confirmation=off
 _forcecolor=on
-
-#include $PWD/../../rc/light-16.theme
-#include $PWD/../../rc/dark-16.theme
-#include $PWD/../../rc/light-256.theme
-#include $PWD/../../rc/dark-256.theme
-#include $PWD/../../rc/dark-gray-256.theme
-#include $PWD/../../rc/dark-red-256.theme
-#include $PWD/../../rc/dark-green-256.theme
-#include $PWD/../../rc/dark-blue-256.theme
-include $PWD/../../rc/dark-violets-256.theme
-#include $PWD/../../rc/dark-yellow-green.theme
-#include $PWD/../../rc/solarized-dark-256.theme
-#include $PWD/../../rc/solarized-light-256.theme
-
+include $theme
 EOF
 
-task rc:rc add Ordinary task
-task rc:rc add Started task
-task rc:rc 2 start
-task rc:rc add High priority task pri:H
-task rc:rc add Medium priority task pri:M
-task rc:rc add Low priority task pri:L
-task rc:rc add Household task project:Home
-task rc:rc add Outdoor task project:Garden
-task rc:rc add Overdue task due:yesterday
-task rc:rc add Due task due:tomorrow
-task rc:rc add Not yet due tasks due:eom
-task rc:rc add Recurring task due:eom recur:monthly
-task rc:rc add Tagged task +tag1
-task rc:rc add Blocking task
-task rc:rc add Dependent task
-
-task rc:rc log Completed_1 project:Garden
-task rc:rc log Completed_2 project:Garden
-task rc:rc log Completed_3 project:Home
-task rc:rc add Deleted_1
-
-task rc:rc 14 mod depends:13
-task rc:rc 15 delete
-
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
diff --git a/doc/misc/themes/run.dark b/doc/misc/themes/run.dark
new file mode 100755
index 000000000..6fcdfd31e
--- /dev/null
+++ b/doc/misc/themes/run.dark
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/dark-16.theme \
+             $PWD/../../rc/dark-256.theme \
+             $PWD/../../rc/dark-blue-256.theme \
+             $PWD/../../rc/dark-default-16.theme \
+             $PWD/../../rc/dark-gray-256.theme \
+             $PWD/../../rc/dark-gray-blue-256.theme \
+             $PWD/../../rc/dark-green-256.theme \
+             $PWD/../../rc/dark-red-256.theme \
+             $PWD/../../rc/dark-violets-256.theme \
+             $PWD/../../rc/dark-yellow-green.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
diff --git a/doc/misc/themes/run.light b/doc/misc/themes/run.light
new file mode 100755
index 000000000..be74f42b7
--- /dev/null
+++ b/doc/misc/themes/run.light
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/light-16.theme \
+             $PWD/../../rc/light-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
diff --git a/doc/misc/themes/run.solar.dark b/doc/misc/themes/run.solar.dark
new file mode 100755
index 000000000..de43551a2
--- /dev/null
+++ b/doc/misc/themes/run.solar.dark
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/solarized-dark-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
diff --git a/doc/misc/themes/run.solar.light b/doc/misc/themes/run.solar.light
new file mode 100755
index 000000000..780cc2ac0
--- /dev/null
+++ b/doc/misc/themes/run.solar.light
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+for theme in $PWD/../../rc/solarized-light-256.theme
+do
+  cat <<EOF >x
+data.location=.
+confirmation=off
+detection=off
+_forcecolor=on
+default.height=24
+verbose=off
+include $theme
+EOF
+
+  echo "--- $theme -----------------------------------------------------"
+  echo '$ task list'
+  task rc:x list
+  echo '$ task summary'
+  task rc:x summary
+  echo '$ task ghistory'
+  task rc:x ghistory
+  echo '$ task calendar'
+  task rc:x calendar
+  echo '$ task burndown.daily'
+  task rc:x burndown.daily
+done
diff --git a/doc/misc/themes/setup b/doc/misc/themes/setup
new file mode 100755
index 000000000..869ba67dc
--- /dev/null
+++ b/doc/misc/themes/setup
@@ -0,0 +1,33 @@
+rm pending.data completed.data undo.data x
+
+cat <<EOF >>x
+
+data.location=.
+confirmation=off
+_forcecolor=on
+EOF
+
+task rc:x add Ordinary task
+task rc:x add Started task
+task rc:x 2 start
+task rc:x add High priority task pri:H
+task rc:x add Medium priority task pri:M
+task rc:x add Low priority task pri:L
+task rc:x add Household task project:Home
+task rc:x add Outdoor task project:Garden
+task rc:x add Overdue task due:yesterday
+task rc:x add Due task due:tomorrow
+task rc:x add Not yet due tasks due:eom
+task rc:x add Recurring task due:eom recur:monthly
+task rc:x add Tagged task +tag1
+task rc:x add Blocking task
+task rc:x add Dependent task
+
+task rc:x log Completed_1 project:Garden
+task rc:x log Completed_2 project:Garden
+task rc:x log Completed_3 project:Home
+task rc:x add Deleted_1
+
+task rc:x 14 mod depends:13
+task rc:x 15 delete
+