diff --git a/home/common/chromium.nix b/home/chromium.nix
similarity index 100%
rename from home/common/chromium.nix
rename to home/chromium.nix
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
new file mode 100644
index 0000000..5669df0
--- /dev/null
+++ b/home/desktop/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./gtk.nix
+    ./gnome.nix
+    ./mimeapps.nix
+  ];
+}
diff --git a/home/common/gnome.nix b/home/desktop/gnome.nix
similarity index 100%
rename from home/common/gnome.nix
rename to home/desktop/gnome.nix
diff --git a/home/common/gtk.nix b/home/desktop/gtk.nix
similarity index 100%
rename from home/common/gtk.nix
rename to home/desktop/gtk.nix
diff --git a/home/common/mimeapps.nix b/home/desktop/mimeapps.nix
similarity index 67%
rename from home/common/mimeapps.nix
rename to home/desktop/mimeapps.nix
index 5a09ad7..f3b4b89 100644
--- a/home/common/mimeapps.nix
+++ b/home/desktop/mimeapps.nix
@@ -3,14 +3,21 @@
 {
   xdg.mimeApps.enable = true;
   xdg.mimeApps.defaultApplications = {
-    "text/html" = [ "chromium-browser.desktop" ];
+    "image/gif" = [ "eog.desktop" ];
+    "image/jpeg" = [ "eog.desktop" ];
+    "image/jpg" = [ "eog.desktop" ];
+    "image/png" = [ "eog.desktop" ];
+    "image/webp" = [ "eog.desktop" ];
+    "inode/directory" = [ "nautilus.desktop" "org.gnome.Nautilus.desktop" ];
     "text/calendar" = [ "chromium-browser.desktop" ];
+    "text/html" = [ "chromium-browser.desktop" ];
+    "text/plain" = [ "org.gnome.gedit.desktop" ];
+    "x-scheme-handler/about" = [ "chromium-browser.desktop" ];
     "x-scheme-handler/http" = [ "chromium-browser.desktop" ];
     "x-scheme-handler/https" = [ "chromium-browser.desktop" ];
-    "x-scheme-handler/about" = [ "chromium-browser.desktop" ];
-    "x-scheme-handler/unknown" = [ "chromium-browser.desktop" ];
     "x-scheme-handler/mailto" = [ "chromium-browser.desktop" ];
-    "x-scheme-handler/webcal" = [ "chromium-browser.desktop" ];
     "x-scheme-handler/sgnl" = [ "signal-desktop.desktop" ];
+    "x-scheme-handler/unknown" = [ "chromium-browser.desktop" ];
+    "x-scheme-handler/webcal" = [ "chromium-browser.desktop" ];
   };
 }
diff --git a/home/common/dotnet.nix b/home/dotnet.nix
similarity index 100%
rename from home/common/dotnet.nix
rename to home/dotnet.nix
diff --git a/home/common/editors/coc.vim b/home/editors/coc.vim
similarity index 100%
rename from home/common/editors/coc.vim
rename to home/editors/coc.vim
diff --git a/home/common/editors/default.nix b/home/editors/default.nix
similarity index 100%
rename from home/common/editors/default.nix
rename to home/editors/default.nix
diff --git a/home/common/editors/emacs.nix b/home/editors/emacs.nix
similarity index 100%
rename from home/common/editors/emacs.nix
rename to home/editors/emacs.nix
diff --git a/home/common/editors/init.vim b/home/editors/init.vim
similarity index 100%
rename from home/common/editors/init.vim
rename to home/editors/init.vim
diff --git a/home/common/editors/neovim.nix b/home/editors/neovim.nix
similarity index 100%
rename from home/common/editors/neovim.nix
rename to home/editors/neovim.nix
diff --git a/home/common/editors/vscode.nix b/home/editors/vscode.nix
similarity index 100%
rename from home/common/editors/vscode.nix
rename to home/editors/vscode.nix
diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index a447921..b36877b 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -3,17 +3,14 @@
 with pkgs;
 {
   imports = [
-    ./common/sh.nix
-    ./common/direnv.nix
-    ./common/mimeapps.nix
-    ./common/gtk.nix
-    ./common/gnome.nix
-    ./common/editors
-    ./common/keybase.nix
-    ./common/signal.nix
-    ./common/chromium.nix
-    ./common/dotnet.nix
-    ./common/planck.nix
+    ./shell
+    ./editors
+    ./desktop
+    ./keybase.nix
+    ./signal.nix
+    ./chromium.nix
+    ./dotnet.nix
+    ./planck.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/home/felschr.nix b/home/felschr.nix
index 6567563..0f30067 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -3,15 +3,14 @@
 with pkgs;
 {
   imports = [
-    ./common/sh.nix
-    ./common/mimeapps.nix
-    ./common/gtk.nix
-    ./common/gnome.nix
-    ./common/editors
-    ./common/keybase.nix
-    ./common/signal.nix
-    ./common/chromium.nix
-    ./common/planck.nix
+    ./shell
+    ./direnv
+    ./editors
+    ./desktop
+    ./keybase.nix
+    ./signal.nix
+    ./chromium.nix
+    ./planck.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -25,12 +24,6 @@ with pkgs;
       night = "0.9";
     };
   };
-   
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    enableFishIntegration = true;
-  };
 
   programs.ssh = {
     enable = true;
diff --git a/home/common/keybase.nix b/home/keybase.nix
similarity index 100%
rename from home/common/keybase.nix
rename to home/keybase.nix
diff --git a/home/common/planck.nix b/home/planck.nix
similarity index 100%
rename from home/common/planck.nix
rename to home/planck.nix
diff --git a/home/common/.direnvrc b/home/shell/.direnvrc
similarity index 100%
rename from home/common/.direnvrc
rename to home/shell/.direnvrc
diff --git a/home/shell/default.nix b/home/shell/default.nix
new file mode 100644
index 0000000..31b4ac4
--- /dev/null
+++ b/home/shell/default.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./shell.nix
+    ./direnv.nix
+  ];
+}
diff --git a/home/common/direnv.nix b/home/shell/direnv.nix
similarity index 100%
rename from home/common/direnv.nix
rename to home/shell/direnv.nix
diff --git a/home/common/sh.nix b/home/shell/shell.nix
similarity index 100%
rename from home/common/sh.nix
rename to home/shell/shell.nix
diff --git a/home/common/signal.nix b/home/signal.nix
similarity index 100%
rename from home/common/signal.nix
rename to home/signal.nix