diff --git a/homes/x86_64-linux/julian@kardorf/default.nix b/homes/x86_64-linux/julian@kardorf/default.nix
index d7f3829..0ebb39b 100644
--- a/homes/x86_64-linux/julian@kardorf/default.nix
+++ b/homes/x86_64-linux/julian@kardorf/default.nix
@@ -23,23 +23,22 @@
   home.username = "julian";
   home.homeDirectory = "/home/julian";
 
-  # DO NOT CHANGE!!!
-  home.stateVersion = "23.11";
-
   modules = {
+    non-nixos.is-nixos = true;
     shell = {
       fish.enable = true;
       direnv.enable = true;
     };
     topgrade.enable = true;
     neovim.enable = true;
-    alacritty.enable = true;
+    # alacritty.enable = true;
+    kitty.enable = true;
+    yazi.enable = true;
     emacs.enable = true;
-    i3 = {
-      enable = true;
-    };
-    rofi.enable = true;
+    i3.enable = true;
     nix-helper.enable = true;
+
+    desktop.enable = true;
   };
 
   home.packages =
@@ -52,9 +51,24 @@
 
   gtk = {
     enable = true;
-    theme.name = "Adwaita-dark";
+    # theme.name = "Adwaita-dark";
+  };
+
+  services.syncthing.tray.enable = true;
+  services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
+
+  programs.chromium = {
+    enable = true;
+    extensions = [
+      # Tampermonkey
+      { id = "dhdgffkkebhmkfjojejmpbldmpobfkfo"; }
+    ];
   };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
+
+  # ======================== DO NOT CHANGE THIS ========================
+  home.stateVersion = "23.11";
+  # ======================== DO NOT CHANGE THIS ========================
 }
diff --git a/homes/x86_64-linux/julian@kardorf/packages.nix b/homes/x86_64-linux/julian@kardorf/packages.nix
index 27a3ae4..b4d3e73 100644
--- a/homes/x86_64-linux/julian@kardorf/packages.nix
+++ b/homes/x86_64-linux/julian@kardorf/packages.nix
@@ -6,11 +6,11 @@ with pkgs;
   shellcheck
 
   # Rust setup
-  rustc
-  rustfmt
-  cargo
-  clippy
-  rust-analyzer
+  unstable.rustc
+  unstable.rustfmt
+  unstable.cargo
+  unstable.clippy
+  unstable.rust-analyzer
 
   # Further tools
   lazygit
@@ -125,7 +125,7 @@ with pkgs;
 
   nomacs
   rocketchat-desktop
-  # zotero
+  zotero
   inkscape
   pulseaudio
   gcolor3
@@ -154,7 +154,7 @@ with pkgs;
   winetricks
 
   # lf
-  rustdesk
+  # rustdesk
   # realvnc-vnc-viewer
   calibre
 
@@ -165,6 +165,25 @@ with pkgs;
   # colmapWithCuda
   path-of-building
 
+  nheko
+
+  pkg-config # Often needed to build something
+
   ## My scripts
   frajul.edit-config
+  frajul.xwacomcalibrate
+
+  (pkgs.writeShellScriptBin "matlab-paper" ''
+    matlab -desktop -sd "/home/julian/dev/phdthesis/Phase B/mainSimulation" -softwareopengl
+  '')
+  (pkgs.writeShellScriptBin "matlab-robotik" ''
+    matlab -desktop -sd "/home/julian/nas-sync/Studium/Vorlesungen-Master/ss24/Robotik2" -softwareopengl
+  '')
+  (pkgs.writeShellScriptBin "matlab-gram" ''
+    export GTK_PATH=/usr/lib/gtk-3.0
+    nix shell nixpkgs#gcc11 --command matlab -desktop -sd "/home/julian/dev/matlab-gram" -softwareopengl
+  '')
+  (pkgs.writeShellScriptBin "expenses-tracker" ''
+    java -jar /home/julian/dev/expensestracker/app/build/libs/app.jar
+  '')
 ]
diff --git a/modules/home/i3/i3/config-kardorf b/modules/home/i3/i3/config-kardorf
index 3c5da54..13d19c4 100644
--- a/modules/home/i3/i3/config-kardorf
+++ b/modules/home/i3/i3/config-kardorf
@@ -29,7 +29,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec alacritty
+bindsym $mod+Return exec kitty
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -214,10 +214,9 @@ bindsym $mod+Print exec --no-startup-id "xfce4-screenshooter"
 
 bindsym $mod+c exec qalculate-gtk
 bindsym $mod+Shift+p exec xwacomcalibrate
-bindsym $mod+e exec thunar
+bindsym $mod+e exec pcmanfm
 bindsym $mod+Shift+c exec $scripts/jupyter-calculator
 bindsym $mod+b exec firefox
-bindsym $mod+u exec pamac-manager
 bindsym $mod+p exec $scripts/display-toggle-mirror
 
 workspace_auto_back_and_forth yes
diff --git a/systems/x86_64-linux/kardorf/default.nix b/systems/x86_64-linux/kardorf/default.nix
index efecb67..01facde 100644
--- a/systems/x86_64-linux/kardorf/default.nix
+++ b/systems/x86_64-linux/kardorf/default.nix
@@ -42,6 +42,8 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
+  modules.system.boot-efi.enable = true;
+
   boot.supportedFilesystems = [
     "btrfs"
     "ntfs"
@@ -69,6 +71,9 @@
 
   modules = {
     locales.enable = true;
+    pcmanfm.enable = true;
+    # wayland.enable = true;
+    # hyprland.enable = true;
   };
 
   nix.settings.auto-optimise-store = true;
@@ -168,7 +173,7 @@
   # home-manager.useUserPackages = true;
 
   programs.fish.enable = true;
-  programs.zsh.enable = true;
+  # programs.zsh.enable = true;
 
   programs.nix-ld.enable = true;