diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index b0ba58db..a0a70830 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -832,7 +832,7 @@ in
       };
 
       mpv = {
-        enable = false;
+        enable = true;
         config = {
           gpu-context = "wayland";
         };
diff --git a/home/modules/hyprland/caelestia.nix b/home/modules/hyprland/caelestia.nix
index 747dda3e..58cd9274 100644
--- a/home/modules/hyprland/caelestia.nix
+++ b/home/modules/hyprland/caelestia.nix
@@ -174,7 +174,7 @@
       apps = {
         audio = ["kitty" "--title=NcpaMixer" "-e" "ncpamixer"];
         explorer = ["kitty" "--title=Yazi" "-e" "yazi"];
-        playback = ["vlc"];
+        playback = ["mpv"];
         terminal = ["kitty"];
       };
 
diff --git a/home/modules/niri/default.nix b/home/modules/niri/default.nix
index 6f04a34a..10d5c9c5 100644
--- a/home/modules/niri/default.nix
+++ b/home/modules/niri/default.nix
@@ -428,11 +428,11 @@ in {
               hotkey-overlay = {title = "Move column to the left. Equivalent bindings for other directions.";};
             };
             "Mod+Shift+J" = {
-              action = move-window-down;
+              action = move-window-down-or-to-workspace-down;
               hotkey-overlay = {hidden = true;};
             };
             "Mod+Shift+K" = {
-              action = move-window-up;
+              action = move-window-up-or-to-workspace-up;
               hotkey-overlay = {hidden = true;};
             };
             "Mod+Shift+L" = {
diff --git a/home/modules/yazi/default.nix b/home/modules/yazi/default.nix
index f293ff20..ada197d4 100644
--- a/home/modules/yazi/default.nix
+++ b/home/modules/yazi/default.nix
@@ -68,7 +68,7 @@ in {
         opener = {
           play = [
             {
-              run = ''vlc "$@"'';
+              run = ''mpv "$@"'';
               orphan = true;
               desc = "Play selection";
             }
diff --git a/system/default.nix b/system/default.nix
index 77260597..3a44dfab 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -70,8 +70,8 @@ with mylib.networking; {
       defaultWebBrowser = "firefox.desktop";
       defaultPdfViewer = "org.pwmt.zathura.desktop";
       defaultImageViewer = "imv-dir.desktop";
-      defaultAudioPlayer = "vlc.desktop";
-      defaultVideoPlayer = "vlc.desktop";
+      defaultAudioPlayer = "mpv.desktop";
+      defaultVideoPlayer = "mpv.desktop";
     };
 
     network = {