diff --git a/pkgs/ida-pro/default.nix b/pkgs/ida-pro/default.nix
index a99f064..5bf5d69 100644
--- a/pkgs/ida-pro/default.nix
+++ b/pkgs/ida-pro/default.nix
@@ -21,7 +21,18 @@
   makeWrapper,
   openssl,
   stdenv,
-  xorg,
+  libice,
+  libsm,
+  libx11,
+  libxau,
+  libxcb,
+  libxext,
+  libxi,
+  libxrender,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   zlib,
   wrapGAppsHook3,
   ## crack
@@ -94,18 +105,18 @@ in
       libxkbcommon
       openssl
       stdenv.cc.cc
-      xorg.libICE
-      xorg.libSM
-      xorg.libX11
-      xorg.libXau
-      xorg.libxcb
-      xorg.libXext
-      xorg.libXi
-      xorg.libXrender
-      xorg.xcbutilimage
-      xorg.xcbutilkeysyms
-      xorg.xcbutilrenderutil
-      xorg.xcbutilwm
+      libice
+      libsm
+      libx11
+      libxau
+      libxcb
+      libxext
+      libxi
+      libxrender
+      libxcb-image
+      libxcb-keysyms
+      libxcb-render-util
+      libxcb-wm
       zlib
     ];
     buildInputs = runtimeDependencies;
diff --git a/sys/profiles/core/compat.nix b/sys/profiles/core/compat.nix
index 30f4a10..cca0c70 100644
--- a/sys/profiles/core/compat.nix
+++ b/sys/profiles/core/compat.nix
@@ -36,20 +36,20 @@
     stdenv.cc.cc
     systemd
     vulkan-loader
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libxcb
-    xorg.libxkbfile
-    xorg.libxshmfence
+    libx11
+    libxscrnsaver
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxtst
+    libxcb
+    libxkbfile
+    libxshmfence
     zlib
 
     glfw
diff --git a/sys/profiles/programs/steam.nix b/sys/profiles/programs/steam.nix
index f0327ef..dc663d3 100644
--- a/sys/profiles/programs/steam.nix
+++ b/sys/profiles/programs/steam.nix
@@ -8,10 +8,10 @@
     ];
     ## Fixes gamescope (NOTE: no clue what this means)
     extraPackages = with pkgs; [
-      xorg.libXcursor
-      xorg.libXi
-      xorg.libXinerama
-      xorg.libXScrnSaver
+      libXcursor
+      libxi
+      libxinerama
+      libxscrnsaver
       libpng
       libpulseaudio
       libvorbis