diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix
index e422e31..156f8bc 100644
--- a/homes/emenel/default.nix
+++ b/homes/emenel/default.nix
@@ -10,6 +10,7 @@
     music
     langs
     emacs
+    taskwarrior
   ];
 
   home = {
diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix
index 3f74346..90eab2f 100644
--- a/hosts/media-server/configuration.nix
+++ b/hosts/media-server/configuration.nix
@@ -208,8 +208,8 @@
       flood.enable = true;
       openFirewall = true;
       extraSettings = {
-        incomplete-dir = "/mnt/filez/media/downloads/torrents";
-        download-dir = "/mnt/filez/media/downloads/torrents/incomplete";
+        incomplete-dir = "/mnt/filez/media/downloads/torrents/incomplete";
+        download-dir = "/mnt/filez/media/downloads/torrents";
       };
     };
 
diff --git a/modules/home/email.nix b/modules/home/email.nix
index 3f1cad3..14f16ae 100644
--- a/modules/home/email.nix
+++ b/modules/home/email.nix
@@ -19,7 +19,7 @@
         msmtp.enable = true;
         flavor = "fastmail.com";
         passwordCommand = "rbw get mu4e-fastmail";
-        thunderbird.enable = true;
+        # thunderbird.enable = true;
       };
 
       "admin@studyoftime.org" = {
@@ -38,19 +38,19 @@
         imap.host = "imap.dreamhost.com";
         smtp.host = "imap.dreamhost.com";
         userName = "admin@studyoftime.org";
-        thunderbird.enable = true;
+        # thunderbird.enable = true;
       };
 
-      "m.nishlapidus@utoronto.ca" = {
-        address = "m.nishlapidus@utoronto.ca";
-        realName = "Matt Nish-Lapidus";
-        imap.host = "outlook.office365.com";
-        imap.port = 993;
-        smtp.host = "smtp.office365.com";
-        smtp.port = 587;
-        userName = "m.nishlapidus@utoronto.ca";
-        thunderbird.enable = true;
-      };
+      # "m.nishlapidus@utoronto.ca" = {
+      #   address = "m.nishlapidus@utoronto.ca";
+      #   realName = "Matt Nish-Lapidus";
+      #   imap.host = "outlook.office365.com";
+      #   imap.port = 993;
+      #   smtp.host = "smtp.office365.com";
+      #   smtp.port = 587;
+      #   userName = "m.nishlapidus@utoronto.ca";
+      #   thunderbird.enable = true;
+      # };
     };
   };
 
diff --git a/modules/home/taskwarrior.nix b/modules/home/taskwarrior.nix
new file mode 100644
index 0000000..e62e686
--- /dev/null
+++ b/modules/home/taskwarrior.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  home.packages = with pkgs; [
+    vit
+    tasksh
+    taskwarrior-tui
+    # syncall
+  ];
+  
+  programs.taskwarrior = {
+    enable = true;
+  };
+}