diff --git a/dot_config/task/taskrc b/dot_config/task/taskrc
index 35c0f8d..86f6c10 100644
--- a/dot_config/task/taskrc
+++ b/dot_config/task/taskrc
@@ -37,43 +37,61 @@ hooks.location=~/.config/task/hooks/
 #include /usr/share/task/solarized-light-256.theme
 #include /usr/share/task/light-256.theme
 #include /usr/share/task/no-color.theme
+
+include gtd
 include ~/projects/arachnitech/tw-spaceduck/spaceduck.theme
-uda.reviewed.type=date
-uda.reviewed.label=Reviewed
-report._reviewed.description=Tasksh review report.  Adjust the filter to your needs.
-report._reviewed.columns=uuid
-report._reviewed.sort=reviewed+,modified+
-report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
-uda.evernote.type=string
-uda.evernote.label=Evernote
-uda.messageid.type=string
-uda.messageid.label=Message-ID
-uda.joplin.type=string
-uda.joplin.label=Joplin
-uda.status_report.type=string
-uda.status_report.label=status_report
-uda.status_report.values=display,hide
-uda.status_report.default=display
-verbose=no
-report.simple.description=Simple list of open tasks by project
-report.simple.columns=id,project,description.count
-report.simple.labels=ID,Proj,Desc
-report.simple.sort=project+\/,entry+
-report.simple.filter=status:pending
+
+# General config
 complete.all.tags=yes
 active.indicator=▸
 recurrence.indicator=♺
 nag=
 dateformat=Y-M-DTH:N
+verbose=no
+context=work
+news.version=2.6.0
+
+#Reports
+report._reviewed.description=Tasksh review report.  Adjust the filter to your needs.
+report._reviewed.columns=uuid
+report._reviewed.sort=reviewed+,modified+
+report._reviewed.filter=( reviewed.none: or reviewed.before:now-6days ) and ( +PENDING or +WAITING )
+
+report.simple.description=Simple list of open tasks by project
+report.simple.columns=id,project,description.count
+report.simple.labels=ID,Proj,Desc
+report.simple.sort=project+\/,entry+
+report.simple.filter=status:pending
+
+#UDA
+uda.reviewed.type=date
+uda.reviewed.label=Reviewed
+
+uda.evernote.type=string
+uda.evernote.label=Evernote
+
+uda.messageid.type=string
+uda.messageid.label=Message-ID
+
+uda.joplin.type=string
+uda.joplin.label=Joplin
+
+uda.status_report.type=string
+uda.status_report.label=status_report
+uda.status_report.values=display,hide
+uda.status_report.default=display
+
+#Context filters
 context.work.read=+work -home or -TAGGED
 context.work.write=+work
+
 context.home.read=+home -work or -TAGGED
 context.home.write=+home
+
+# Taskd
 taskd.certificate=/home/kellya/.local/share/task/private.certificate.pem
 taskd.key=/home/kellya/.local/share/task/private.key.pem
 taskd.ca=/home/kellya/.local/share/task/ca.cert.pem
 taskd.server=inthe.am:53589
 taskd.credentials=inthe_am/kellya/610917c8-9119-4b59-b87e-d886c2e08bf0
 taskd.trust=strict
-context=work
-news.version=2.6.0