diff --git a/maddie/mpd.nix b/maddie/mpd.nix
index dd1f6d5..993646b 100644
--- a/maddie/mpd.nix
+++ b/maddie/mpd.nix
@@ -1,8 +1,25 @@
 { config, pkgs, username, ... }:
 
 {
-  services.mpd.enable = true;
-  services.mpd.musicDirectory = "/home/${username}/Music";
+  services.mpd = {
+    enable = true;
+    musicDirectory = "${config.home.homeDirectory}/Music";
+    extraConfig = ''
+      auto_update "yes"
+
+      audio_output {
+        type            "pipewire"
+        name            "PipeWire Sound Server"
+      }
+
+      audio_output {
+        type	"fifo"
+        name	"Visualizer feed"
+        path	"/tmp/mpd.fifo"
+        format	"44100:16:2"
+      }
+    '';
+  };
 
   home.packages = with pkgs; [
     mpc_cli
diff --git a/maddie/xorg.nix b/maddie/xorg.nix
index 1f8cc1c..5bbede8 100644
--- a/maddie/xorg.nix
+++ b/maddie/xorg.nix
@@ -36,8 +36,14 @@
   programs.feh.enable = true;
   home.file.".xinitrc".text = ''
     # Monitor configuration
-    ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560
     ${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
+
+    # Apply wallpaper
+    ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_1.jpg" --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_3.jpg"
+
+    # Refresh xresources
+    ${pkgs.xorg.xrdb}/bin/xrdb "$HOME/.Xresources"
 
     # Speed up repeated keypresses
     ${pkgs.xorg.xset}/bin/xset r rate 300 50
@@ -45,9 +51,6 @@
     # Set keyboard map and remap caps to escape
     ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb --option caps:escape
 
-    # Apply wallpaper
-    ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_1.jpg" --bg-fill "$HOME/Pictures/Wallpapers/The Walking Dead/shane_3.jpg"
-
     # Start the window manager
     ${pkgs.openssh}/bin/ssh-agent ${pkgs.dbus}/bin/dbus-run-session ${pkgs.dwm}/bin/dwm
   '';