diff --git a/flake.lock b/flake.lock
index d25db20..c8a8709 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692248770,
-        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
+        "lastModified": 1696360011,
+        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
+        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692763155,
-        "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=",
+        "lastModified": 1696409884,
+        "narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a20e40acaebf067da682661aa67da8b36812606",
+        "rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693028636,
-        "narHash": "sha256-WOG42JO/yyvgYK3jQktDEy2qtZI7R+s3Lo4Y9gBr6XM=",
+        "lastModified": 1696385948,
+        "narHash": "sha256-GSUIyYROcOExkGt3hDPDPeu/7ska2StMCL0voxMK/ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e61ea96d43505ba0d2c066134eb9d67cadfddce7",
+        "rev": "d1c9180c6d1f8fce9469436f48c1cb8180d7087d",
         "type": "github"
       },
       "original": {
diff --git a/maddie/common/exa.nix b/maddie/common/esa.nix
similarity index 91%
rename from maddie/common/exa.nix
rename to maddie/common/esa.nix
index 270d574..7d4167b 100644
--- a/maddie/common/exa.nix
+++ b/maddie/common/esa.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  programs.exa = {
+  programs.eza = {
     enable = true;
     enableAliases = true;
     extraOptions = [
diff --git a/maddie/common/python.nix b/maddie/common/python.nix
index cb254d7..7024e6d 100644
--- a/maddie/common/python.nix
+++ b/maddie/common/python.nix
@@ -13,6 +13,7 @@ let
     argon2_cffi
     python-dotenv
     python-lsp-server
+    openrgb-python
   ];
 in
 {
diff --git a/maddie/common/shell.nix b/maddie/common/shell.nix
index d132eaa..535e3af 100644
--- a/maddie/common/shell.nix
+++ b/maddie/common/shell.nix
@@ -27,7 +27,7 @@
       unfuck-wifi = "doas systemctl restart wpa_supplicant.service";
       search = "f=$(fzf) && cd \"$f\" 2>/dev/null || xdg-open \"$f\" >/dev/null 2>&1";
       cdt = "cd $(mktemp -d)";
-      sx = "startx ~/.config/x11/xinitrc";
+      sx = "startx ~/.xprofile";
       sdn = "doas shutdown -h now";
       kys = "kill $(pidof '$@')";
 
diff --git a/maddie/nixos/dmenu/dmenu-code b/maddie/nixos/dmenu/dmenu-code
old mode 100644
new mode 100755
diff --git a/maddie/nixos/dmenu/dmenu-man b/maddie/nixos/dmenu/dmenu-man
old mode 100644
new mode 100755
diff --git a/maddie/nixos/jetbrains.nix b/maddie/nixos/jetbrains.nix
index 51b934f..00ba844 100644
--- a/maddie/nixos/jetbrains.nix
+++ b/maddie/nixos/jetbrains.nix
@@ -6,6 +6,7 @@
     jetbrains.goland
     jetbrains.webstorm
     jetbrains.datagrip
+    jetbrains.rust-rover
     jetbrains.pycharm-professional
   ];
 }
diff --git a/maddie/nixos/kdeconnect.nix b/maddie/nixos/kdeconnect.nix
index 2b2df12..32be6dc 100644
--- a/maddie/nixos/kdeconnect.nix
+++ b/maddie/nixos/kdeconnect.nix
@@ -3,7 +3,7 @@
 {
   services.kdeconnect.enable = true;
 
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Start kdeconnect when entering a graphical session
     systemctl restart --user kdeconnect.service &
   '';
diff --git a/maddie/nixos/openrgb.nix b/maddie/nixos/openrgb.nix
index ffaa72f..b783e0d 100644
--- a/maddie/nixos/openrgb.nix
+++ b/maddie/nixos/openrgb.nix
@@ -5,7 +5,7 @@
     openrgb-with-all-plugins
   ];
 
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Set RGB perhipherals to white
     ${pkgs.openrgb}/bin/openrgb -c white -m static &
 
diff --git a/maddie/nixos/picom.nix b/maddie/nixos/picom.nix
index eb5f048..7f99365 100644
--- a/maddie/nixos/picom.nix
+++ b/maddie/nixos/picom.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Import xorg environment into systemd for the picom service to work
     systemctl --user import-environment XAUTHORITY DISPLAY &
 
diff --git a/maddie/nixos/secrets.nix b/maddie/nixos/secrets.nix
index d83450d..fced800 100644
--- a/maddie/nixos/secrets.nix
+++ b/maddie/nixos/secrets.nix
@@ -6,7 +6,7 @@
     storePath = "${config.xdg.dataHome}/password-store";
   };
 
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Restart pass-secret-service as it tends to start failed
     systemctl restart --user pass-secret-service.service &
   '';
diff --git a/maddie/nixos/slstatus.nix b/maddie/nixos/slstatus.nix
index e990e5a..a5e9af4 100644
--- a/maddie/nixos/slstatus.nix
+++ b/maddie/nixos/slstatus.nix
@@ -5,7 +5,7 @@
     slstatus
   ];
 
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Start slstatus
     ${pkgs.slstatus}/bin/slstatus &
   '';
diff --git a/maddie/nixos/syncplay.nix b/maddie/nixos/syncplay.nix
index 4ee5032..9d89535 100644
--- a/maddie/nixos/syncplay.nix
+++ b/maddie/nixos/syncplay.nix
@@ -2,6 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    syncplay
+    #syncplay
   ];
 }
diff --git a/maddie/nixos/uxplay.nix b/maddie/nixos/uxplay.nix
new file mode 100644
index 0000000..4c7e6f9
--- /dev/null
+++ b/maddie/nixos/uxplay.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    uxplay
+  ];
+}
diff --git a/maddie/nixos/xorg.nix b/maddie/nixos/xorg.nix
index 74a62bd..2fb6324 100644
--- a/maddie/nixos/xorg.nix
+++ b/maddie/nixos/xorg.nix
@@ -43,9 +43,9 @@
     "*.font" = "Iosevka:pixelsize=12:antialias=true:autohint=true";
   };
 
-  # Configure ~/.xinitrc
+  # Configure ~/.xprofile
   programs.feh.enable = true;
-  home.file.".xinitrc".text = ''
+  home.file.".xprofile".text = ''
     # Monitor configuration
     ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right
     ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560
diff --git a/systems/mdesktop/boot.nix b/systems/mdesktop/boot.nix
index 9ccad04..96a141a 100644
--- a/systems/mdesktop/boot.nix
+++ b/systems/mdesktop/boot.nix
@@ -15,12 +15,6 @@
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
   boot.initrd.systemd.enable = true;
 
-  # Plymouth
-  boot.plymouth = {
-    enable = true;
-    #logo = ./plymouth/logo.png;
-  };
-
   # Setup crypto keyfile
   boot.initrd.secrets = {
     "/crypto_keyfile.bin" = null;
@@ -31,9 +25,11 @@
   boot.initrd.luks.devices."luks-16dda63d-9dce-4ef2-9da6-ee458ba3c44c".device = "/dev/disk/by-uuid/16dda63d-9dce-4ef2-9da6-ee458ba3c44c";
   boot.initrd.luks.devices."luks-c180a121-376a-432e-a661-f4be3cc23dfa".keyFile = "/crypto_keyfile.bin";
 
+  # Kernel settings
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelParams = [ "video=2560x1440@180" ];
   boot.extraModulePackages = [ ];
 
   # Use the linux-zen kernel
diff --git a/systems/mdesktop/fonts.nix b/systems/mdesktop/fonts.nix
index 4c18ac6..e1b02f6 100644
--- a/systems/mdesktop/fonts.nix
+++ b/systems/mdesktop/fonts.nix
@@ -8,5 +8,6 @@
     source-han-sans
     source-han-serif
     source-han-code-jp
+    terminus_font
   ];
 }
diff --git a/systems/mdesktop/locale.nix b/systems/mdesktop/locale.nix
index 1c7fd22..0b0581e 100644
--- a/systems/mdesktop/locale.nix
+++ b/systems/mdesktop/locale.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   # Time zone
@@ -7,7 +7,7 @@
   # Internationalisation properties
   i18n.defaultLocale = "en_GB.UTF-8";
   console = {
-    font = "Lat2-Terminus16";
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-v12n.psf.gz";
     keyMap = "uk";
   };
 }
diff --git a/systems/mdesktop/nvidia.nix b/systems/mdesktop/nvidia.nix
index 5aa7362..ebde31b 100644
--- a/systems/mdesktop/nvidia.nix
+++ b/systems/mdesktop/nvidia.nix
@@ -6,7 +6,7 @@
   hardware.opengl.driSupport32Bit = true;
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
   hardware.nvidia.open = false;
-  hardware.nvidia.modesetting.enable = true;
+  hardware.nvidia.modesetting.enable = false;
   services.xserver.videoDrivers = [ "nvidia" ];
 
   hardware.opengl.extraPackages = [
diff --git a/systems/mdesktop/plymouth/logo.png b/systems/mdesktop/plymouth/logo.png
deleted file mode 100644
index 8ddb015..0000000
Binary files a/systems/mdesktop/plymouth/logo.png and /dev/null differ
diff --git a/systems/mdesktop/xorg.nix b/systems/mdesktop/xorg.nix
index ccaface..186640b 100644
--- a/systems/mdesktop/xorg.nix
+++ b/systems/mdesktop/xorg.nix
@@ -5,21 +5,13 @@
     # Enable X11 windowing system
     enable = true;
 
-    # Set gb X11 keymap
+    # Set X11 keymap as GB
     layout = "gb";
     xkbOptions = "eurosign:e";
 
     displayManager = {
       # Use startx for starting window managers
       startx.enable = true;
-
-      # Use sddm for starting KDE
-      # sddm.enable = true;
     };
-
-    # Enable KDE Plasma 5
-    /* desktopManager = {
-      plasma5.enable = true;
-    }; */
   };
 }
diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix
index 89d0e5f..61eef16 100644
--- a/systems/mmacbookpro/apps.nix
+++ b/systems/mmacbookpro/apps.nix
@@ -43,6 +43,7 @@
       "zed"
       "neovide"
       "pycharm"
+      "rustrover"
       "webstorm"
       "clion"
       "goland"