diff --git a/home/home.nix b/home/home.nix
index 9e65afd..4627bf8 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -266,22 +266,22 @@ in
     pueue.enable = true;
 
     # For matrix clients that don't have e2ee
-    pantalaimon = {
-      enable = true;
-      settings = {
-        Default = {
-          LogLevel = "Debug";
-          SSL = true;
-        };
-        local-matrix = {
-          Homeserver = "https://matrix.tfcconnection.org";
-          ListenAddress = "127.0.0.1";
-          ListenPort = 8008;
-          # SSL = true;
-          # IgnoreVerification = true;
-        };
-      };
-    };
+    # pantalaimon = {
+    #   enable = true;
+    #   settings = {
+    #     Default = {
+    #       LogLevel = "Debug";
+    #       SSL = true;
+    #     };
+    #     local-matrix = {
+    #       Homeserver = "https://matrix.tfcconnection.org";
+    #       ListenAddress = "127.0.0.1";
+    #       ListenPort = 8008;
+    #       # SSL = true;
+    #       # IgnoreVerification = true;
+    #     };
+    #   };
+    # };
   };
 
   # stylix = {
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 632fb00..f6ca2d1 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -86,7 +86,7 @@ with lib;
   };
 
   security.pam.services = {
-    sddm.enableKwallet = true;
+    # sddm.enableKwallet = true;
     greetd.enableKwallet = true;
     swaylock = {};
   };
diff --git a/modules/gaming.nix b/modules/gaming.nix
index cec0fc6..b863448 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -2,9 +2,9 @@
 
 with lib;
 {
-  hardware.opengl = {
+  hardware.graphics = {
     # driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
   programs.steam = {
     enable = true;
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index ef1ebc5..106fb1f 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -10,12 +10,12 @@ with lib;
     caffeine-ng
     hunspell
     hunspellDicts.en_US-large
-    transmission
+    transmission_4
     openssh
     openssl
     cyrus-sasl-xoauth2
     ark
-    pantalaimon
+    # pantalaimon
     ifuse
     dash
     dolphin
@@ -31,7 +31,6 @@ with lib;
     qutebrowser
     brave
     ttyper
-    kget
     audacity
     krename
     kwallet-pam
@@ -44,27 +43,20 @@ with lib;
     sassc
     # pantalaimon
     kdePackages.kwallet
-    # sierra-breeze-enhanced
     libimobiledevice
-    # textgen-amd
-    # bottles
-    # jitsi-meet-electron
     imv
     feh
     tagutil
     # python310Packages.mutagen
     python310Packages.audiotools
     (mpv.override {scripts = with pkgs.mpvScripts; [ mpris quality-menu sponsorblock ];})
-    # haruna
     ani-cli
     # mov-cli
     nerdfonts
     plasma-browser-integration
     alacritty
-    # libsForQt5.bismuth
     libnotify
     rofi-wayland
-    #anyrun
     wf-recorder
     wofi
     waybar
@@ -88,37 +80,27 @@ with lib;
     swww
     grim
     slurp
-    # mkchromecast
     plocate
-    # librepresenter.libre-presenter
     papirus-icon-theme
     phinger-cursors
     plasma-hud
     kde-cli-tools
     gzip 
     qrencode
-    # brave
     # scribus
     darktable
-    # qutebrowser
     virt-manager
     virt-viewer
-    # firefox
-    # kate
     kdialog
     # kdePackages.khotkeys
-    # openlp
     inkscape
     libreoffice-fresh
     vlc
-    elegant-sddm
-    # neochat
     haskellPackages.greenclip
     pulsemixer
     any-nix-shell
     wtype
     xdotool
-    # ydotool
     wmctrl
     xcape
     xclip
@@ -131,11 +113,6 @@ with lib;
     lxappearance
     spotdl
     # rustdesk
-    # (kdenlive.override {
-    #     mlt = mlt.override {
-    #       ffmpeg = ffmpeg-full;
-    #     };
-    #   })
     kdenlive
     # olive-editor
     # davinci-resolve
@@ -144,12 +121,10 @@ with lib;
     mediainfo
     libmediainfo
     pqiv
-    plasma5Packages.audiotube
     discord
-    # natron
     # digikam
     rubberband
-    texlive
+    texlive.combined.scheme-full
     wlroots
     pamixer
     playerctl
@@ -159,15 +134,8 @@ with lib;
     gimp
     krita
     powertop
-    element-desktop-wayland
     scrcpy
     python3
-    # hyprland
-    # (callPackage ./ydotool {  })
-    # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders
-    # (libsForQt5.callPackage /home/chris/.dotfiles/RoundedSBE {}) 
-    # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter
-    # (libsForQt5.callPackage /home/chris/dev/tyler {}) # librepresenter
     nix-index
     sqlite
     fennel
diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix
index a692a38..5ddcc90 100644
--- a/systems/kaladin/configuration.nix
+++ b/systems/kaladin/configuration.nix
@@ -20,9 +20,8 @@
   # NVIDIA
   # services.xserver.videoDrivers = [ "nvidia" ];
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
       extraPackages = with pkgs; [
         mesa.drivers
         vaapiVdpau
diff --git a/systems/syl/configuration.nix b/systems/syl/configuration.nix
index b0a03a7..a84188a 100644
--- a/systems/syl/configuration.nix
+++ b/systems/syl/configuration.nix
@@ -28,7 +28,7 @@
   # };
 
   services.xserver.videoDrivers = ["intel"];
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver # LIBVA_DRIVER_NAME=iHD