diff --git a/machines/thaylen-city/default.nix b/machines/thaylen-city/default.nix
index 492fb842..4bf430e5 100644
--- a/machines/thaylen-city/default.nix
+++ b/machines/thaylen-city/default.nix
@@ -107,10 +107,10 @@
           ];
           theme = "robbyrussell";
         };
-        sessionVariables = { 
-          DEFAULT_USER = "charlotte.vanpetegem"; 
+        sessionVariables = {
+          DEFAULT_USER = "charlotte.vanpetegem";
           # Until I get emacs set up on this machine
-	  EDITOR = "vim";
+          EDITOR = "vim";
         };
         shellAliases = {
           gupd = "gfa && gprom";
diff --git a/shells/silverfin-tpi.nix b/shells/silverfin-tpi.nix
index fe41b362..36c94da3 100644
--- a/shells/silverfin-tpi.nix
+++ b/shells/silverfin-tpi.nix
@@ -2,11 +2,14 @@
 pkgs.devshell.mkShell {
   name = "Silverfin";
   imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
-  devshell.startup = {
-    # Hack to make sure Rubymine doesn't use an ephemeral path from the nix store
-    "link-devshell-dir".text = ''
-      ln -snf $DEVSHELL_DIR $PRJ_DATA_DIR/devshell
-    '';
+  devshell = {
+    motd = "";
+    startup = {
+      # Hack to make sure Rubymine doesn't use an ephemeral path from the nix store
+      "link-devshell-dir".text = ''
+        ln -snf $DEVSHELL_DIR $PRJ_DATA_DIR/devshell
+      '';
+    };
   };
   packages = with pkgs; [
     cmake
diff --git a/shells/silverfin.nix b/shells/silverfin.nix
index 17fbc301..272ebf82 100644
--- a/shells/silverfin.nix
+++ b/shells/silverfin.nix
@@ -2,16 +2,19 @@
 pkgs.devshell.mkShell {
   name = "Silverfin";
   imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
-  devshell.startup = {
-    # Hack to make sure Rubymine doesn't use an ephemeral path from the nix store
-    "link-devshell-dir".text = ''
-      ln -snf $DEVSHELL_DIR $PRJ_DATA_DIR/devshell
-    '';
+  devshell = {
+    motd = "";
+    startup = {
+      # Hack to make sure Rubymine doesn't use an ephemeral path from the nix store
+      "link-devshell-dir".text = ''
+        ln -snf $DEVSHELL_DIR $PRJ_DATA_DIR/devshell
+      '';
+    };
   };
   commands = [
     {
       name = "delete-merged";
-      category = "general commands";
+      category = "[general commands]";
       help = "Delete merged branches";
       command = ''
         git fetch -p ; git branch -r | awk '{print $1}' | egrep -v -f - <(git branch -vv | grep origin) | awk '{print $1}' | xargs -r git branch -D