diff --git a/pkgs-set/default.nix b/pkgs-set/default.nix
index 7a1debe..a1be820 100644
--- a/pkgs-set/default.nix
+++ b/pkgs-set/default.nix
@@ -10,7 +10,7 @@
     l.mapAttrsToList
     (
       name: _: let
-        o = import "${./overlays}/${name}";
+        o = import "${./.}/overlays/${name}";
       in
         if (l.functionArgs o) ? inputs
         then o {inherit inputs;}
diff --git a/pkgs-set/overlays/bitwig.nix b/pkgs-set/overlays/bitwig.nix
new file mode 100644
index 0000000..e2aa050
--- /dev/null
+++ b/pkgs-set/overlays/bitwig.nix
@@ -0,0 +1,12 @@
+final: prev: {
+  bitwig-studio = prev.bitwig-studio.overrideAttrs (old: rec {
+    version = "5.0.4";
+    src = final.fetchurl {
+      url = "https://downloads.bitwig.com/stable/${version}/${old.pname}-${version}.deb";
+      sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y=";
+    };
+    postInstall = ''
+      cp ${../patches/bitwig.jar} $out/libexec/bin/bitwig.jar
+    '';
+  });
+}
diff --git a/pkgs-set/patches/bitwig.jar b/pkgs-set/patches/bitwig.jar
new file mode 100644
index 0000000..71b2644
Binary files /dev/null and b/pkgs-set/patches/bitwig.jar differ
diff --git a/pkgs-set/pkgs-to-export.nix b/pkgs-set/pkgs-to-export.nix
index 99dcf31..91e0c29 100644
--- a/pkgs-set/pkgs-to-export.nix
+++ b/pkgs-set/pkgs-to-export.nix
@@ -3,8 +3,7 @@ pkgs: (
   [
     "phantom"
     "comic-mono"
-    "fluidsynth-dssi"
-    "calf"
+    "bitwig-studio"
   ]
   pkgs
 )
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 66784c0..ff621ef 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -139,6 +139,9 @@ in {
           # caches / history stuff
           ".directory_history"
           ".cache"
+          "Bitwig Studio"
+          ".BitwigStudio"
+          ".vst"
         ]
         ++ mkPaths ".local/share" [
           "direnv"
@@ -221,9 +224,9 @@ in {
         gtkcord4
         gh
         transmission_4-gtk
-        # yabridge
-        # yabridgectl
-        # bitwig-studio
+        yabridge
+        yabridgectl
+        bitwig-studio
         # reaper
         # ardour
         (retroarch.override {