diff --git a/hm/desktop/default.nix b/hm/desktop/default.nix
index 9481309..08ba20e 100644
--- a/hm/desktop/default.nix
+++ b/hm/desktop/default.nix
@@ -8,7 +8,7 @@
     ./frobar/module.nix
     ./i3.nix
     ./lock
-    ./mpd
+    ./mopidy
     ./presentation
     ./redness
     ./screenshots
diff --git a/hm/desktop/mpd/default.nix b/hm/desktop/mopidy/default.nix
similarity index 59%
rename from hm/desktop/mpd/default.nix
rename to hm/desktop/mopidy/default.nix
index 1de7ed8..8e13472 100644
--- a/hm/desktop/mpd/default.nix
+++ b/hm/desktop/mopidy/default.nix
@@ -3,24 +3,29 @@
   config = lib.mkIf config.frogeye.desktop.xorg {
     home = {
       packages = with pkgs; [
-        ashuffle
-        mpc-cli
-        vimpc
+        ashuffle # Probs don't work
+        mpc-cli # mpc add completion only works partially
+        vimpc # library straight up doesn't work
+        ncmpcpp # This one is fine but I don't know the shortcuts :(
       ];
-      sessionVariables = {
-        MPD_PORT = "${toString config.services.mpd.network.port}";
-      };
     };
-    services.mpd = {
+    services.mopidy = {
       enable = true;
-      network = {
-        listenAddress = "0.0.0.0"; # Can be controlled remotely, determined with firewall
-        startWhenNeeded = true;
+      extensionPackages = with pkgs; [
+        mopidy-mpd # Compat
+        mopidy-iris # Web UI
+        mopidy-local
+        mopidy-jellyfin
+        # Break in case of emergency: (I one of those cause issues, but not sure)
+        mopidy-youtube
+        mopidy-bandcamp
+        mopidy-soundcloud
+      ];
+      settings = {
+        local = {
+          media_dir = [ "${config.home.homeDirectory}/Musiques" ];
+        };
       };
-      extraConfig = ''
-        restore_paused "yes"
-      '';
-      musicDirectory = "${config.home.homeDirectory}/Musiques";
     };
     xdg = {
       configFile = {