diff --git a/home/modules/aichat.nix b/home/aichat.nix
similarity index 100%
rename from home/modules/aichat.nix
rename to home/aichat.nix
diff --git a/home/modules/calendars.nix b/home/calendars.nix
similarity index 100%
rename from home/modules/calendars.nix
rename to home/calendars.nix
diff --git a/home/desktop-full.nix b/home/desktop-full.nix
deleted file mode 100644
index dfdf6bb..0000000
--- a/home/desktop-full.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./desktop-slim.nix
-
-    ./modules/messaging.nix
-    ./modules/r.nix
-    ./modules/tex.nix
-    ./modules/mail
-    ./modules/office-gui.nix
-    ./modules/office-cli.nix
-    ./modules/aichat.nix
-  ];
-}
diff --git a/home/modules/devel.nix b/home/devel.nix
similarity index 100%
rename from home/modules/devel.nix
rename to home/devel.nix
diff --git a/home/modules/firefox.nix b/home/firefox.nix
similarity index 100%
rename from home/modules/firefox.nix
rename to home/firefox.nix
diff --git a/home/modules/fish.nix b/home/fish.nix
similarity index 100%
rename from home/modules/fish.nix
rename to home/fish.nix
diff --git a/home/modules/fonts.nix b/home/fonts.nix
similarity index 95%
rename from home/modules/fonts.nix
rename to home/fonts.nix
index 23d9e4a..d8db3b7 100644
--- a/home/modules/fonts.nix
+++ b/home/fonts.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   home.packages = with pkgs; [
diff --git a/home/modules/foot.nix b/home/foot.nix
similarity index 100%
rename from home/modules/foot.nix
rename to home/foot.nix
diff --git a/home/modules/gnome.nix b/home/gnome.nix
similarity index 100%
rename from home/modules/gnome.nix
rename to home/gnome.nix
diff --git a/home/modules/gpg.nix b/home/gpg.nix
similarity index 100%
rename from home/modules/gpg.nix
rename to home/gpg.nix
diff --git a/home/modules/hyprland.nix b/home/hyprland.nix
similarity index 100%
rename from home/modules/hyprland.nix
rename to home/hyprland.nix
diff --git a/home/modules/khard-dump.nix b/home/khard-dump.nix
similarity index 100%
rename from home/modules/khard-dump.nix
rename to home/khard-dump.nix
diff --git a/home/modules/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc
similarity index 100%
rename from home/modules/mail/bindings.neomuttrc
rename to home/mail/bindings.neomuttrc
diff --git a/home/modules/mail/config.neomuttrc b/home/mail/config.neomuttrc
similarity index 100%
rename from home/modules/mail/config.neomuttrc
rename to home/mail/config.neomuttrc
diff --git a/home/modules/mail/default.nix b/home/mail/default.nix
similarity index 97%
rename from home/modules/mail/default.nix
rename to home/mail/default.nix
index 3f73a72..f6dba07 100644
--- a/home/modules/mail/default.nix
+++ b/home/mail/default.nix
@@ -5,7 +5,8 @@ let
   makeConfig = accountName:
     ''
       unset reverse_name
-      unset smime_is_default
+      unset crypt_auto_pgp
+      unset crypt_auto_smime
       set my_account='${ accountName }'
       macro index,pager / "<vfolder-from-query>tag:${ accountName } "
       unalternates *
@@ -87,7 +88,7 @@ in
           extraConfig = makeConfig name + ''
             color status blue default
             alternates ^tstraube@(em|rz)?.uni-frankfurt.de$
-            set smime_is_default
+            set crypt_auto_smime
           '';
         };
       };
@@ -107,6 +108,7 @@ in
             color status green default
             alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$
             set reverse_name
+            set crypt_auto_pgp
           '';
         };
         msmtp.extraConfig.port = "587";
@@ -126,6 +128,7 @@ in
         neomutt = {
           extraConfig = makeConfig name + ''
             color status red default
+            set crypt_auto_pgp
           '';
         };
         passwordCommand = "pass ksh/systemli";
@@ -173,7 +176,7 @@ in
     settings = {
       abort_noattach = "ask-yes";
       abort_noattach_regex = "\"(attach|enclosed|anbei|anhängen|angehängt|anhang|anhänge|hängt an)\"";
-      auto_edit = "no";
+      auto_edit = "yes";
       beep = "no";
       confirm_append = "no";
       crypt_auto_sign = "yes";
@@ -217,7 +220,7 @@ in
       { key = "k"; map = [ "pager" ]; action = "previous-entry"; }
       { key = "j"; map = [ "pager" ]; action = "next-entry"; }
       { key = "<return>"; map = [ "index" ]; action = "display-message"; }
-      { key = "<space>"; map = [ "index" ]; action = "entire-thread"; }
+      { key = "<space>"; map = "index"; action = "entire-thread"; }
       { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; }
       { key = "<Tab>"; map = [ "editor" ]; action = "complete-query"; }
       { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }
diff --git a/home/modules/media.nix b/home/media.nix
similarity index 100%
rename from home/modules/media.nix
rename to home/media.nix
diff --git a/home/modules/messaging.nix b/home/messaging.nix
similarity index 81%
rename from home/modules/messaging.nix
rename to home/messaging.nix
index 8c8f0dd..e33d6b4 100644
--- a/home/modules/messaging.nix
+++ b/home/messaging.nix
@@ -3,7 +3,7 @@
 {
   home.packages = with pkgs; [
     signal-desktop
-    # telegram-desktop
+    telegram-desktop
     simplex-chat-desktop
   ];
 }
diff --git a/home/modules/git.nix b/home/modules/git.nix
deleted file mode 100644
index 4119ab0..0000000
--- a/home/modules/git.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{...}:
-
-{
-  programs.git = { 
-    enable = true;
-    settings = {
-      pull.rebase = true;
-      extraConfig.init.defaultBranch = "main";
-    };
-    lfs.enable = true;
-  };
-}
diff --git a/home/npm.conf b/home/npm.conf
new file mode 100644
index 0000000..dc3f6fb
--- /dev/null
+++ b/home/npm.conf
@@ -0,0 +1 @@
+prefix = ${HOME}/.npm-packages
diff --git a/home/modules/nvim/config.vim b/home/nvim/config.vim
similarity index 100%
rename from home/modules/nvim/config.vim
rename to home/nvim/config.vim
diff --git a/home/modules/nvim/default.nix b/home/nvim/default.nix
similarity index 99%
rename from home/modules/nvim/default.nix
rename to home/nvim/default.nix
index a9c3a26..e982334 100644
--- a/home/modules/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -5,7 +5,6 @@
     astro-language-server
     marksman
     nil
-    tree-sitter
     typescript-language-server
     vim-language-server
   ];
@@ -108,7 +107,6 @@
           vim.lsp.enable('marksman')
           vim.lsp.enable('nil_ls')
           vim.lsp.enable('r_language_server')
-          vim.lsp.enable('rust-analyzer')
           vim.lsp.enable('texlab')
           vim.lsp.enable('ts_ls')
           vim.lsp.enable('vimls')
diff --git a/home/modules/nvim/dotfiles/after/ftplugin/markdown.vim b/home/nvim/dotfiles/after/ftplugin/markdown.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/after/ftplugin/markdown.vim
rename to home/nvim/dotfiles/after/ftplugin/markdown.vim
diff --git a/home/modules/nvim/dotfiles/autocommands.vim b/home/nvim/dotfiles/autocommands.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/autocommands.vim
rename to home/nvim/dotfiles/autocommands.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/markdown.vim b/home/nvim/dotfiles/ftplugin/markdown.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/markdown.vim
rename to home/nvim/dotfiles/ftplugin/markdown.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/nix.vim b/home/nvim/dotfiles/ftplugin/nix.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/nix.vim
rename to home/nvim/dotfiles/ftplugin/nix.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/r.vim b/home/nvim/dotfiles/ftplugin/r.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/r.vim
rename to home/nvim/dotfiles/ftplugin/r.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/rmd.vim b/home/nvim/dotfiles/ftplugin/rmd.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/rmd.vim
rename to home/nvim/dotfiles/ftplugin/rmd.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/tex.vim b/home/nvim/dotfiles/ftplugin/tex.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/tex.vim
rename to home/nvim/dotfiles/ftplugin/tex.vim
diff --git a/home/modules/nvim/dotfiles/ftplugin/typescript.vim b/home/nvim/dotfiles/ftplugin/typescript.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/ftplugin/typescript.vim
rename to home/nvim/dotfiles/ftplugin/typescript.vim
diff --git a/home/modules/nvim/dotfiles/syntax/rmd.vim b/home/nvim/dotfiles/syntax/rmd.vim
similarity index 100%
rename from home/modules/nvim/dotfiles/syntax/rmd.vim
rename to home/nvim/dotfiles/syntax/rmd.vim
diff --git a/home/modules/nvim/lsp.lua b/home/nvim/lsp.lua
similarity index 100%
rename from home/modules/nvim/lsp.lua
rename to home/nvim/lsp.lua
diff --git a/home/modules/nvim/nvim-cmp.lua b/home/nvim/nvim-cmp.lua
similarity index 100%
rename from home/modules/nvim/nvim-cmp.lua
rename to home/nvim/nvim-cmp.lua
diff --git a/home/modules/office-cli.nix b/home/office-cli.nix
similarity index 100%
rename from home/modules/office-cli.nix
rename to home/office-cli.nix
diff --git a/home/modules/office-gui.nix b/home/office-gui.nix
similarity index 100%
rename from home/modules/office-gui.nix
rename to home/office-gui.nix
diff --git a/home/modules/password-store.nix b/home/password-store.nix
similarity index 100%
rename from home/modules/password-store.nix
rename to home/password-store.nix
diff --git a/home/modules/plasma.nix b/home/plasma.nix
similarity index 100%
rename from home/modules/plasma.nix
rename to home/plasma.nix
diff --git a/home/profiles/desktop-full.nix b/home/profiles/desktop-full.nix
new file mode 100644
index 0000000..c786f38
--- /dev/null
+++ b/home/profiles/desktop-full.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  imports = [
+    ./desktop-slim.nix
+
+    ../messaging.nix
+    ../r.nix
+    ../tex.nix
+    ../mail
+    ../office-gui.nix
+    ../office-cli.nix
+    ../aichat.nix
+  ];
+}
diff --git a/home/desktop-slim.nix b/home/profiles/desktop-slim.nix
similarity index 59%
rename from home/desktop-slim.nix
rename to home/profiles/desktop-slim.nix
index 9979ab9..c2936c4 100644
--- a/home/desktop-slim.nix
+++ b/home/profiles/desktop-slim.nix
@@ -4,13 +4,14 @@
   imports = [
     ./minimal.nix
 
-    ./modules/devel.nix
-    ./modules/firefox.nix
-    ./modules/fonts.nix
-    ./modules/media.nix
-    ./modules/user-dirs.nix
-    ./modules/gpg.nix
-    ./modules/password-store.nix
+    ../devel.nix
+    ../firefox.nix
+    ../fonts.nix
+    # ../foot.nix
+    ../media.nix
+    ../user-dirs.nix
+    ../gpg.nix
+    ../password-store.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home/minimal.nix b/home/profiles/minimal.nix
similarity index 72%
rename from home/minimal.nix
rename to home/profiles/minimal.nix
index 0f9547a..d04876e 100644
--- a/home/minimal.nix
+++ b/home/profiles/minimal.nix
@@ -5,14 +5,6 @@
 
   home.homeDirectory = "/home/${config.home.username}";
 
-  imports = [
-    ./modules/fish.nix
-    ./modules/vifm.nix
-    ./modules/nvim
-    ./modules/tmux.nix
-    ./modules/git.nix
-  ];
-
   home.packages = with pkgs; [
     dust
     eza
@@ -39,14 +31,30 @@
     ymd = "date +'%Y-%m-%d'";
   };
 
+  imports = [
+    ../fish.nix
+    ../vifm.nix
+    ../nvim
+    ../tmux.nix
+  ];
+
   programs.nix-index = {
     enable = true;
     enableFishIntegration = true;
   };
 
+  programs.git = { 
+    enable = true;
+    settings = {
+      pull.rebase = true;
+      extraConfig.init.defaultBranch = "main";
+    };
+    lfs.enable = true;
+  };
+
   programs.bottom = { 
     enable = true;
-    # settings.styles.theme = "default-light";
+    settings.styles.theme = "default-light";
   };
 
   home.stateVersion = "22.11";
diff --git a/home/profiles/on-server.nix b/home/profiles/on-server.nix
new file mode 100644
index 0000000..68c51f6
--- /dev/null
+++ b/home/profiles/on-server.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./minimal.nix
+    ./devel.nix
+  ];
+}
diff --git a/home/modules/r.nix b/home/r.nix
similarity index 100%
rename from home/modules/r.nix
rename to home/r.nix
diff --git a/home/modules/tasks.nix b/home/tasks.nix
similarity index 100%
rename from home/modules/tasks.nix
rename to home/tasks.nix
diff --git a/home/modules/tex.nix b/home/tex.nix
similarity index 100%
rename from home/modules/tex.nix
rename to home/tex.nix
diff --git a/home/modules/tmux.nix b/home/tmux.nix
similarity index 100%
rename from home/modules/tmux.nix
rename to home/tmux.nix
diff --git a/home/modules/user-dirs.nix b/home/user-dirs.nix
similarity index 100%
rename from home/modules/user-dirs.nix
rename to home/user-dirs.nix
diff --git a/home/modules/vifm.nix b/home/vifm.nix
similarity index 100%
rename from home/modules/vifm.nix
rename to home/vifm.nix