diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index 954b6d7..a79e500 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -94,6 +94,7 @@ let
     /* Other Stuff, not yet sorted */
     mu4e-alert
     google-translate
+    tramp
     transmission
     org-plus-contrib orgit ox-gfm ox-rst
     easy-jekyll markdown-mode impatient-mode simple-httpd htmlize
@@ -132,14 +133,15 @@ let
   ]);
 
   extra = with pkgs; [
-    transmission
-    texlive.combined.scheme-full
-  ];
-  
-  mailutils = with pkgs; [
-    fetchmail
     imagemagick
+    texlive.combined.scheme-full
+    transmission
+  ];
+
+  mail_utils = with pkgs; [
+    fetchmail
     isync
+    mailutils
     mu-git
     pandoc
     postfix
@@ -167,7 +169,7 @@ let
     (with gitpkgs.eclipses; eclipseWithPlugins {
       eclipse = eclipse-platform;
       jvmArgs = [ "-Xmx2048m" ];
-      plugins = with plugins; [ 
+      plugins = with plugins; [
         color-theme
         # emacsplus
         checkstyle
@@ -214,25 +216,25 @@ let
 #    flask-compress
 #    flask-cors
 #    flask-limiter
-#    flask-pymongo      
+#    flask-pymongo
 #    flask-restful
-#    flask-restplus     
+#    flask-restplus
 #    flask_assets
 #    flask_elastic
 #    flask_login
 #    flask_mail
 #    flask_marshmallow
 #    flask_migrate
-#    flask_oauthlib     
+#    flask_oauthlib
 #    flask_principal
 #    flask_script
 #    flask_sqlalchemy
-#    flask_testing    
+#    flask_testing
 #    flask_wtf
 #    flaskbabel
   ] ++ optionals (elem "i3" cfg.desktop.wms) [ py3status pytz tzlocal ]);
 
-  rustpkgs = with pkgs; [ 
+  rustpkgs = with pkgs; [
     rustup
     carnix
     rustracer
@@ -274,7 +276,7 @@ in {
                             ++ (optPkgs dict "dict")
                             ++ (optPkgs [emacs] "emacs")
                             ++ (optPkgs extra "extra")
-                            ++ (optPkgs mailutils "mailutils")
+                            ++ (optPkgs mail_utils "mailutils")
                             ++ (optPkgs cpp "cpp")
                             ++ (optPkgs [haskell] "haskell")
                             ++ (optPkgs java "java")