diff --git a/taskwarrior/.config/task/colorscheme b/taskwarrior/.config/task/colorscheme
new file mode 100644
index 0000000..634e976
--- /dev/null
+++ b/taskwarrior/.config/task/colorscheme
@@ -0,0 +1,19 @@
+# Themes are in this file so it can be ignored by
+# git and theme changes don't show up as committable
+# edits.
+
+# Color theme (uncomment one to use)
+#include /usr/share/doc/task/rc/light-16.theme
+#include /usr/share/doc/task/rc/light-256.theme
+#include /usr/share/doc/task/rc/dark-16.theme
+#include /usr/share/doc/task/rc/dark-256.theme
+#include /usr/share/doc/task/rc/dark-red-256.theme
+#include /usr/share/doc/task/rc/dark-green-256.theme
+#include /usr/share/doc/task/rc/dark-blue-256.theme
+#include /usr/share/doc/task/rc/dark-violets-256.theme
+#include /usr/share/doc/task/rc/dark-yellow-green.theme
+#include /usr/share/doc/task/rc/dark-gray-256.theme
+#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
+include /usr/share/doc/task/rc/solarized-dark-256.theme
+#include /usr/share/doc/task/rc/solarized-light-256.theme
+#include /usr/share/doc/task/rc/no-color.theme
diff --git a/taskwarrior/.config/task/taskrc b/taskwarrior/.config/task/taskrc
index 0b5148e..1077e86 100644
--- a/taskwarrior/.config/task/taskrc
+++ b/taskwarrior/.config/task/taskrc
@@ -62,21 +62,9 @@ urgency.user.tag.next.coefficient=5.0
 
 # Holidays for calendar
 include /usr/share/doc/task/rc/holidays.de-DE.rc
-# Color theme (uncomment one to use)
-include /usr/share/doc/task/rc/light-16.theme
-#include /usr/share/doc/task/rc/light-256.theme
-#include /usr/share/doc/task/rc/dark-16.theme
-#include /usr/share/doc/task/rc/dark-256.theme
-#include /usr/share/doc/task/rc/dark-red-256.theme
-#include /usr/share/doc/task/rc/dark-green-256.theme
-#include /usr/share/doc/task/rc/dark-blue-256.theme
-#include /usr/share/doc/task/rc/dark-violets-256.theme
-#include /usr/share/doc/task/rc/dark-yellow-green.theme
-#include /usr/share/doc/task/rc/dark-gray-256.theme
-#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
-#include /usr/share/doc/task/rc/solarized-dark-256.theme
-#include /usr/share/doc/task/rc/solarized-light-256.theme
-#include /usr/share/doc/task/rc/no-color.theme
+
+# Themes are in additional file
+include colorscheme
 
 # Taskserver sync settings
 include task-sync.rc