diff --git a/hosts/midas/services/default.nix b/hosts/midas/services/default.nix
index 93f98b02..28e33959 100644
--- a/hosts/midas/services/default.nix
+++ b/hosts/midas/services/default.nix
@@ -6,6 +6,7 @@
     icecast.enable = true;
     jellyfin.enable = true;
     matrix-synapse.enable = true;
+    mysql.enable = true;
     nextcloud.enable = true;
     nfs.server.enable = true;
     nginx.enable = true;
@@ -20,7 +21,7 @@
       servers = {
         velocity.enable = true;
         johnside.enable = true;
-	marsh.enable = true;
+        marsh.enable = true;
         cornworld.enable = true;
         skyblock.enable = true;
       };
diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix
index add1dd68..c44d57d8 100644
--- a/hosts/prophet/default.nix
+++ b/hosts/prophet/default.nix
@@ -5,6 +5,7 @@
     ./disko
     ./filesystems
     ./hardware
+    ./servies
     ./users
     ../../modules/system
     (modulesPath + "/profiles/headless.nix")
@@ -20,11 +21,4 @@
     server.enable = true;
     stateVersion = "24.05";
   };
-
-  services = {
-    cloudflare-dyndns.enable = true;
-    mailserver.enable = true;
-    nginx.enable = true;
-    wireguard.client.enable = true;
-  };
 }
diff --git a/hosts/prophet/services/default.nix b/hosts/prophet/services/default.nix
new file mode 100644
index 00000000..9499a7ac
--- /dev/null
+++ b/hosts/prophet/services/default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+{
+  services = {
+    cloudflare-dyndns.enable = true;
+    mailserver.enable = true;
+    mysql.enable = true;
+    nginx.enable = true;
+    wireguard.client.enable = true;
+  };
+}
diff --git a/modules/home/programs/gui/mpv/default.nix b/modules/home/programs/gui/mpv/default.nix
index a049eb14..c3a719f8 100644
--- a/modules/home/programs/gui/mpv/default.nix
+++ b/modules/home/programs/gui/mpv/default.nix
@@ -8,7 +8,7 @@
       thumbnail
     ];
     config = {
-      volume = 55;
+      volume = 60;
       loop-playlist = "inf";
       osc = "no";
     };
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index 1c5699ef..85c1278b 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -3,6 +3,7 @@
   home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     ffmpeg
     ffmpegthumbnailer
+    playerctl
     puddletag
     pulsemixer
     spotdl
diff --git a/modules/home/programs/terminal/ncmpcpp/default.nix b/modules/home/programs/terminal/ncmpcpp/default.nix
index 0e3d11e0..9c46c035 100644
--- a/modules/home/programs/terminal/ncmpcpp/default.nix
+++ b/modules/home/programs/terminal/ncmpcpp/default.nix
@@ -1,22 +1,16 @@
 { config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.home.desktop.enable {
-    home.packages = with pkgs; [ mpc-cli ];
-
-    programs.ncmpcpp = {
-      enable = true;
-      settings = {
-        browser_sort_mode = "name";
-        user_interface = "alternative";
-      };
-      bindings = [
-        { key = "h"; command = "volume_down"; }
-        { key = "j"; command = "scroll_down"; }
-        { key = "k"; command = "scroll_up"; }
-        { key = "l"; command = "volume_up"; }
-      ];
+  programs.ncmpcpp = {
+    enable = config.services.mpd.enable;
+    settings = {
+      browser_sort_mode = "name";
+      user_interface = "alternative";
     };
-
-    services.mpd-discord-rpc.enable = true;
+    bindings = [
+      { key = "h"; command = "volume_down"; }
+      { key = "j"; command = "scroll_down"; }
+      { key = "k"; command = "scroll_up"; }
+      { key = "l"; command = "volume_up"; }
+    ];
   };
 }
diff --git a/modules/home/programs/terminal/zsh/default.nix b/modules/home/programs/terminal/zsh/default.nix
index a11af022..0fcbb99c 100644
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@@ -2,8 +2,10 @@
 {
   programs.zsh = {
     enable = true;
+    dotDir = ".config/zsh";
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
+    historySubstringSearch.enable = true;
     oh-my-zsh = {
       enable = true;
       theme = "agnoster";
@@ -16,11 +18,11 @@
       append = true;
       ignoreAllDups = true;
       ignoreSpace = true;
+      path = "$ZDOTDIR/.zsh_history";
     };
     initExtra = ''
       pfetch
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
-      setopt RM_STAR_WAIT
     '';
   };
 }
diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix
index 817d37fa..89f12947 100644
--- a/modules/home/services/default.nix
+++ b/modules/home/services/default.nix
@@ -4,5 +4,6 @@
     ./easyeffects
     ./gnome-keyring
     ./mpd
+    ./playerctl
   ];
 }
diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index 0a4649bb..fce2cd27 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -1,15 +1,19 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
-  services.mpd = {
-    enable = config.home.desktop.enable;
-    network.startWhenNeeded = true;
-    musicDirectory = "/home/${config.home.username}/Midas/storage/Music/NixBops";
-    playlistDirectory = "/home/${config.home.username}/Midas/storage/Music/NixBops/Playlists";
-    extraConfig = ''
-      audio_output {
-        type "pipewire"
-        name "Local Pipewire"
-      }
-    '';
+  services = lib.mkIf config.home.desktop.enable {
+    mpd = {
+      enable = true;
+      network.startWhenNeeded = true;
+      musicDirectory = "${config.home.homeDirectory}/Midas/storage/Music/NixBops";
+      playlistDirectory = "${config.services.mpd.musicDirectory}/Playlists";
+      extraConfig = ''
+        audio_output {
+          type "pipewire"
+          name "Local Pipewire"
+        }
+      '';
+    };
+    mpd-mpris.enable = true;
+    mpd-discord-rpc.enable = true;
   };
 }
diff --git a/modules/home/services/playerctl/default.nix b/modules/home/services/playerctl/default.nix
new file mode 100644
index 00000000..84890696
--- /dev/null
+++ b/modules/home/services/playerctl/default.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  services.playerctld.enable = config.home.desktop.enable;
+}
diff --git a/modules/home/wms/niri/autostart/default.nix b/modules/home/wms/niri/autostart/default.nix
index 35e4f3ff..0bb65d92 100644
--- a/modules/home/wms/niri/autostart/default.nix
+++ b/modules/home/wms/niri/autostart/default.nix
@@ -10,7 +10,6 @@
     spawn-at-startup "mako"
     spawn-at-startup "rot8"
     spawn-at-startup "wlsunset" "-s" "23:00" "-S" "07:30"
-    spawn-at-startup "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
     spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
     
     // Foreground
diff --git a/modules/home/wms/niri/hotkeys/default.nix b/modules/home/wms/niri/hotkeys/default.nix
index 09299452..b569f1d8 100644
--- a/modules/home/wms/niri/hotkeys/default.nix
+++ b/modules/home/wms/niri/hotkeys/default.nix
@@ -42,11 +42,12 @@
       ${secMod}+m { spawn "sh" "-c" "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; }
     
       // MPD
-      ${primeMod}+Backslash { spawn "sh" "-c" "mpc toggle"; }
-      ${secMod}+Shift+h { spawn "sh" "-c" "mpc prev"; }
-      ${secMod}+Shift+j { spawn "sh" "-c" "mpc volume -3"; }
-      ${secMod}+Shift+k { spawn "sh" "-c" "mpc volume +3"; }
-      ${secMod}+Shift+l { spawn "sh" "-c" "mpc next"; }
+      ${primeMod}+Backslash { spawn "sh" "-c" "playerctl -p firefox play-pause"; }
+      ${primeMod}+Shift+Backslash { spawn "sh" "-c" "playerctl -p mpd play-pause"; }
+      ${secMod}+Shift+h { spawn "sh" "-c" "playerctl -p mpd previous"; }
+      ${secMod}+Shift+j { spawn "sh" "-c" "playerctl -p mpd volume 0.03-"; }
+      ${secMod}+Shift+k { spawn "sh" "-c" "playerctl -p mpd volume 0.03+"; }
+      ${secMod}+Shift+l { spawn "sh" "-c" "playerctl -p mpd next"; }
     
       //// Miscellaneous
     
@@ -151,7 +152,7 @@
       ${primeMod}+Shift+c { center-column; }
 
       // Move these into scratchpads if or when they get supported
-      ${primeMod}+Shift+Backslash { spawn "sh" "-c" "foot btop"; }
+      ${primeMod}+Shift+BackSpace { spawn "sh" "-c" "foot btop"; }
       ${primeMod}+Shift+m { spawn "sh" "-c" "foot ncmpcpp"; }
       ${primeMod}+Shift+v { spawn "sh" "-c" "foot pulsemixer"; }
     }
diff --git a/modules/home/wms/niri/inputs/default.nix b/modules/home/wms/niri/inputs/default.nix
index 2f569c01..af58f194 100644
--- a/modules/home/wms/niri/inputs/default.nix
+++ b/modules/home/wms/niri/inputs/default.nix
@@ -16,5 +16,8 @@
       warp-mouse-to-focus
       focus-follows-mouse
     }
+    clipboard {
+      disable-primary
+    }
   '';
 }
diff --git a/modules/home/wms/sway/autostart/default.nix b/modules/home/wms/sway/autostart/default.nix
index 7bb3cdf5..10ef504f 100644
--- a/modules/home/wms/sway/autostart/default.nix
+++ b/modules/home/wms/sway/autostart/default.nix
@@ -17,7 +17,6 @@
       { command = "sunshine"; }
       { command = "rot8"; }
       { command = "wlsunset -s 22:30 -S 07:30"; }
-      { command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; }
 
       # Foreground
       { command = "thunderbird"; }
diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix
index bcdb680d..18fb8582 100644
--- a/modules/home/wms/sway/hotkeys/default.nix
+++ b/modules/home/wms/sway/hotkeys/default.nix
@@ -46,11 +46,12 @@
       "${secMod}+m" = ''exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'';
 
       # MPD
-      "${primeMod}+Backslash" = ''exec mpc toggle'';
-      "${secMod}+Shift+h" = ''exec mpc prev'';
-      "${secMod}+Shift+j" = ''exec mpc volume -3'';
-      "${secMod}+Shift+k" = ''exec mpc volume +3'';
-      "${secMod}+Shift+l" = ''exec mpc next'';
+      "${primeMod}+Backslash" = ''exec playerctl -p firefox play-pause'';
+      "${primeMod}+Shift+Backslash" = ''exec playerctl -p mpd play-pause'';
+      "${secMod}+Shift+h" = ''exec playerctl -p mpd previous'';
+      "${secMod}+Shift+j" = ''exec playerctl -p mpd volume 0.03-'';
+      "${secMod}+Shift+k" = ''exec playerctl -p mpd volume 0.03+'';
+      "${secMod}+Shift+l" = ''exec playerctl -p mpd next'';
 
       ## Miscellaneous
 
@@ -152,7 +153,7 @@
       "${primeMod}+shift+a" = ''focus child'';
 
       # Scratchpads
-      "${primeMod}+Shift+Backslash" = ''[app_id="btop"] scratchpad show, move position center, resize set 1216 888'';
+      "${primeMod}+Shift+BackSpace" = ''[app_id="btop"] scratchpad show, move position center, resize set 1216 888'';
       "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657'';
       "${primeMod}+Shift+v" = ''[app_id="sound"] scratchpad show, move position center, resize set 1000 800'';
     };
diff --git a/modules/system/devices/boot/grub/default.nix b/modules/system/devices/boot/grub/default.nix
index 7b245f7e..d0a24689 100644
--- a/modules/system/devices/boot/grub/default.nix
+++ b/modules/system/devices/boot/grub/default.nix
@@ -1,11 +1,8 @@
-{ config, lib, ... }:
+{ ... }:
 {
-  boot.loader = {
-    grub = {
-      efiSupport = true;
-      efiInstallAsRemovable = true;
-      device = "nodev";
-    };
-    efi.canTouchEfiVariables = false;
+  boot.loader.grub = {
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+    device = "nodev";
   };
 }
diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix
index 957c5435..6c567f45 100644
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, lanzaboote, ... }:
+{ pkgs, lanzaboote, ... }:
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
diff --git a/modules/system/devices/boot/systemd/default.nix b/modules/system/devices/boot/systemd/default.nix
index ac608a78..bc13baff 100644
--- a/modules/system/devices/boot/systemd/default.nix
+++ b/modules/system/devices/boot/systemd/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ ... }:
 {
   boot.loader.systemd-boot = {
     editor = false;
diff --git a/modules/system/devices/disks/impermanence/main/default.nix b/modules/system/devices/disks/impermanence/main/default.nix
index f75b6cc8..8db68972 100644
--- a/modules/system/devices/disks/impermanence/main/default.nix
+++ b/modules/system/devices/disks/impermanence/main/default.nix
@@ -16,10 +16,11 @@
 
         ".config/blender"
         ".config/dconf"
-        ".config/vesktop"
-        ".config/sunshine"
         ".config/heroic"
         ".config/obs-studio"
+        ".config/sunshine"
+        ".config/vesktop"
+        ".config/zsh"
 
         ".local/share/mpd"
         ".local/share/nvim/undo"
@@ -28,6 +29,7 @@
         ".local/share/TelegramDesktop"
 
         ".local/state/wireplumber"
+        ".local/state/lazygit"
 
         ".cache/nix-index"
 
@@ -35,11 +37,6 @@
         { directory = ".gnupg"; mode = "0700"; }
         { directory = ".local/share/keyrings"; mode = "0700"; }
       ];
-      files = [
-        ".zsh_history"
-        ".local/state/lazygit/state.yml"
-        ".local/share/applications" # Create directory so nothing generates inside of it
-      ];
     };
   };
 }
diff --git a/modules/system/services/server/mysql/default.nix b/modules/system/services/server/mysql/default.nix
index ecb7ba94..c119013d 100644
--- a/modules/system/services/server/mysql/default.nix
+++ b/modules/system/services/server/mysql/default.nix
@@ -1,12 +1,5 @@
 { config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.system.server.enable {
-    services.mysql = {
-      enable = true;
-      package = pkgs.mariadb;
-    };
-    environment.persistence."/persist".directories = [
-      "/var/lib/mysql"
-    ];
-  };
+  services.mysql.package = pkgs.mariadb;
+  environment.persistence."/persist".directories = lib.mkIf config.services.mysql.enable [ "/var/lib/mysql" ];
 }
diff --git a/modules/system/settings/security/default.nix b/modules/system/settings/security/default.nix
index e187a55b..68e9b8e6 100644
--- a/modules/system/settings/security/default.nix
+++ b/modules/system/settings/security/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ./apparmor
-    ./polkit
     ./privilege
+    ./rtkit
   ];
 }
diff --git a/modules/system/settings/security/polkit/default.nix b/modules/system/settings/security/polkit/default.nix
deleted file mode 100644
index 25395030..00000000
--- a/modules/system/settings/security/polkit/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  security = lib.mkIf config.system.desktop.enable {
-    polkit.enable = true;
-    rtkit.enable = true;
-  };
-}
diff --git a/modules/system/settings/security/rtkit/default.nix b/modules/system/settings/security/rtkit/default.nix
new file mode 100644
index 00000000..31a54f74
--- /dev/null
+++ b/modules/system/settings/security/rtkit/default.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  security.rtkit.enable = config.system.desktop.enable;
+}