diff --git a/common/home-manager.nix b/common/home-manager.nix
index cd6b8e9..cbcd230 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -6,149 +6,13 @@
   ];
 
   home-manager.users.sijmen = {
+    imports = [
+      ./home-manager/home.nix
+      ./home-manager/gtk.nix
+    ];
+
     nixpkgs.config.allowUnfree = true;
-
-    home = {
-      stateVersion = config.system.stateVersion;
-
-      packages = with pkgs; [
-        # Office
-        aerc
-        libreoffice-fresh
-
-        # Programming
-        bacon
-        drone-cli
-        sublime-merge
-        tig
-        vscode-fhs
-
-        # Graphics
-        gimp
-        inkscape
-
-        # Internet
-        discord
-        httpie
-        tdesktop
-        transmission-gtk
-        w3m
-        wget
-
-        # Sound & Video
-        mpv
-        spotify
-
-        # System Tools
-        htop
-        iotop
-        sysstat
-        lsof
-        screen
-        borgbackup
-        smartmontools
-        tmux
-        fd
-        gnome.gnome-tweaks
-        gnomeExtensions.openweather
-        htop
-        tree
-        killall
-        pika-backup
-        silver-searcher
-        unzip
-        unrar
-        zip
-        p7zip
-        virt-manager
-        wl-clipboard
-      ];
-
-      sessionVariables = {
-        MOZ_ENABLE_WAYLAND = 1;
-        NIXOS_OZONE_WL = 1;
-        QT_QPA_PLATFORM = "wayland";
-        SDL_VIDEODRIVER = "wayland";
-        EDITOR = "nvim";
-      };
-
-      shellAliases = {
-        ".." = "cd ..";
-        "..." = "cd ../..";
-
-        config = "vim /etc/nixos/configuration.nix";
-        hmconf = "vim /etc/nixos/common/home-manager.nix";
-        switch = "sudo nixos-rebuild switch";
-
-        nr = "nix run --impure";
-        ns = "nix-shell";
-        nsp = "nix-shell -p";
-
-        cdnix = "cd /etc/nixos";
-
-        ga = "git add";
-        gc = "git commit";
-        gcm = "git commit -m";
-        gl = "git pull";
-        gla = "git pull --autostash";
-        gp = "git push";
-        gpf = "git push --force-with-lease";
-        gr = "git reset";
-        grs = "git reset --soft";
-        tigs = "tig status";
-      };
-    };
-
-    gtk = {
-      enable = true;
-
-      gtk2.extraConfig = ''
-        gtk-enable-animations=1
-        gtk-primary-button-warps-slider=0
-        gtk-toolbar-style=3
-        gtk-menu-images=1
-        gtk-button-images=1
-        gtk-cursor-theme-size=24
-        gtk-cursor-theme-name="breeze_cursors"
-        gtk-icon-theme-name="breeze"
-        gtk-font-name="Noto Sans,  10"
-      '';
-
-      gtk3.bookmarks = [
-        "file:///home/sijmen/Sync"
-        "smb://10.100.0.1/docs/ NAS"
-        "smb://10.100.0.1/docs/users/sijmen     sijmen"
-        "smb://10.100.0.1/docs/media     Media"
-        "sftp://sijmens@virtuscin.scintilla.utwente.nl/data Scintilla Drive"
-        "sftp://sijmens@virtuscin.scintilla.utwente.nl/data/commissies/spock/SPOCK7     SPOCK7"
-      ];
-
-      gtk3.extraConfig = {
-        gtk-application-prefer-dark-theme = "false";
-        gtk-button-images = "true";
-        gtk-cursor-theme-name = "breeze_cursors";
-        gtk-cursor-theme-size = "24";
-        gtk-decoration-layout = "icon:minimize,maximize,close";
-        gtk-enable-animations = "true";
-        gtk-font-name = "Noto Sans,  10";
-        gtk-icon-theme-name = "breeze";
-        gtk-menu-images = "true";
-        gtk-modules = "colorreload-gtk-module";
-        gtk-primary-button-warps-slider = "false";
-        gtk-toolbar-style = "3";
-      };
-
-      gtk4.extraConfig = {
-        gtk-application-prefer-dark-theme = "false";
-        gtk-cursor-theme-name = "breeze_cursors";
-        gtk-cursor-theme-size = 24;
-        gtk-decoration-layout = "icon:minimize,maximize,close";
-        gtk-enable-animations = "true";
-        gtk-font-name = "Noto Sans, 10";
-        gtk-icon-theme-name = "breeze";
-        gtk-primary-button-warps-slider = "false";
-      };
-    };
+    home.stateVersion = config.system.stateVersion;
 
     programs.git = {
       enable = true;
diff --git a/common/home-manager/gtk.nix b/common/home-manager/gtk.nix
new file mode 100644
index 0000000..c3f4946
--- /dev/null
+++ b/common/home-manager/gtk.nix
@@ -0,0 +1,52 @@
+{
+  gtk = {
+    enable = true;
+
+    gtk2.extraConfig = ''
+      gtk-enable-animations=1
+      gtk-primary-button-warps-slider=0
+      gtk-toolbar-style=3
+      gtk-menu-images=1
+      gtk-button-images=1
+      gtk-cursor-theme-size=24
+      gtk-cursor-theme-name="breeze_cursors"
+      gtk-icon-theme-name="breeze"
+      gtk-font-name="Noto Sans,  10"
+    '';
+
+    gtk3.bookmarks = [
+      "file:///home/sijmen/Sync"
+      "smb://10.100.0.1/docs/ NAS"
+      "smb://10.100.0.1/docs/users/sijmen     sijmen"
+      "smb://10.100.0.1/docs/media     Media"
+      "sftp://sijmens@virtuscin.scintilla.utwente.nl/data Scintilla Drive"
+      "sftp://sijmens@virtuscin.scintilla.utwente.nl/data/commissies/spock/SPOCK7     SPOCK7"
+    ];
+
+    gtk3.extraConfig = {
+      gtk-application-prefer-dark-theme = "false";
+      gtk-button-images = "true";
+      gtk-cursor-theme-name = "breeze_cursors";
+      gtk-cursor-theme-size = "24";
+      gtk-decoration-layout = "icon:minimize,maximize,close";
+      gtk-enable-animations = "true";
+      gtk-font-name = "Noto Sans,  10";
+      gtk-icon-theme-name = "breeze";
+      gtk-menu-images = "true";
+      gtk-modules = "colorreload-gtk-module";
+      gtk-primary-button-warps-slider = "false";
+      gtk-toolbar-style = "3";
+    };
+
+    gtk4.extraConfig = {
+      gtk-application-prefer-dark-theme = "false";
+      gtk-cursor-theme-name = "breeze_cursors";
+      gtk-cursor-theme-size = 24;
+      gtk-decoration-layout = "icon:minimize,maximize,close";
+      gtk-enable-animations = "true";
+      gtk-font-name = "Noto Sans, 10";
+      gtk-icon-theme-name = "breeze";
+      gtk-primary-button-warps-slider = "false";
+    };
+  };
+}
diff --git a/common/home-manager/home.nix b/common/home-manager/home.nix
new file mode 100644
index 0000000..8141564
--- /dev/null
+++ b/common/home-manager/home.nix
@@ -0,0 +1,92 @@
+{ config, pkgs, ... }:
+
+{
+  home = {
+    packages = with pkgs; [
+      # Office
+      aerc
+      libreoffice-fresh
+
+      # Programming
+      bacon
+      drone-cli
+      sublime-merge
+      tig
+      vscode-fhs
+
+      # Graphics
+      gimp
+      inkscape
+
+      # Internet
+      discord
+      httpie
+      tdesktop
+      transmission-gtk
+      w3m
+      wget
+
+      # Sound & Video
+      mpv
+      spotify
+
+      # System Tools
+      htop
+      iotop
+      sysstat
+      lsof
+      screen
+      borgbackup
+      smartmontools
+      tmux
+      fd
+      gnome.gnome-tweaks
+      gnomeExtensions.openweather
+      htop
+      tree
+      killall
+      pika-backup
+      silver-searcher
+      unzip
+      unrar
+      zip
+      p7zip
+      virt-manager
+      wl-clipboard
+    ];
+
+    sessionVariables = {
+      MOZ_ENABLE_WAYLAND = 1;
+      NIXOS_OZONE_WL = 1;
+      QT_QPA_PLATFORM = "wayland";
+      SDL_VIDEODRIVER = "wayland";
+      EDITOR = "nvim";
+    };
+
+    shellAliases = {
+      ".." = "cd ..";
+      "..." = "cd ../..";
+
+      config = "vim /etc/nixos/configuration.nix";
+      hmconf = "vim /etc/nixos/common/home-manager.nix";
+      switch = "sudo nixos-rebuild switch";
+
+      nr = "nix run --impure";
+      ns = "nix-shell";
+      nsp = "nix-shell -p";
+
+      cdnix = "cd /etc/nixos";
+
+      ga = "git add";
+      gc = "git commit";
+      gcm = "git commit -m";
+      gl = "git pull";
+      gla = "git pull --autostash";
+      gp = "git push";
+      gpf = "git push --force-with-lease";
+      gr = "git reset";
+      grs = "git reset --soft";
+      tigs = "tig status";
+    };
+  };
+}