diff --git a/flake.lock b/flake.lock
index 5248602..e48ca65 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733572789,
-        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1733708804,
-        "narHash": "sha256-PiUrztTiR4aVRC2fMdNcOWYWF1ojvqbrSUYmhtp3970=",
+        "lastModified": 1734745015,
+        "narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "1531210f371ecf966ff67e87975f684553bdbbf7",
+        "rev": "1c922245aec471610533c7a225bf9c20e7002ff2",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1733481457,
-        "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
+        "lastModified": 1734352517,
+        "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
+        "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733581040,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1733412085,
-        "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
+        "lastModified": 1734600368,
+        "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
+        "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1733581040,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733625333,
-        "narHash": "sha256-tIML2axjm4AnlKP29upVJxzBpj4Cy4ak+PKonqQtXmc=",
+        "lastModified": 1734661750,
+        "narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "430c8b054e45ea44fd2c9521a378306ada507a6c",
+        "rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe",
         "type": "github"
       },
       "original": {
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index da6630b..949452a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -6,9 +6,10 @@
 
     # GUI
     ../../modules/system/gui/hyprland.nix
+    ../../modules/system/gui/cosmic.nix
+    ../../modules/system/gui/cosmic-greeter.nix
     ../../modules/system/gui/steam.nix
     ../../modules/system/gui/thunar.nix
-    # ../../modules/system/gui/plasma.nix
     
     # CLI
     ../../modules/system/cli/common.nix
@@ -40,6 +41,7 @@
   };
 
   # Configure hardware
+  services.ratbagd.enable = true;
 
   # Bootloader.
   boot.loader.efi.canTouchEfiVariables = true;
@@ -60,10 +62,6 @@
 
   nix.settings.trusted-users = [ "root" "xeovalyte" ];
 
-  # Enable cosmic desktop eenvironment
-  services.desktopManager.cosmic.enable = true;
-  services.displayManager.cosmic-greeter.enable = true;
-
   # Prevent system freeze on high load
   services.earlyoom = {
     enable = true;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 429e168..54e1c37 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -46,10 +46,8 @@
       # Desktop Applications
       kdenlive
       prismlauncher
-      unstable.modrinth-app
       unstable.joplin-desktop
       unstable.prusa-slicer
-      unstable.font-manager
       signal-desktop
       unstable.vesktop
       unstable.webcord
@@ -58,7 +56,6 @@
       loupe
       unstable.rnote
       unstable.bottles
-      resources
 
       # Office
       libreoffice
@@ -78,15 +75,6 @@
     # Enable home-manager
     programs.home-manager.enable = true;
 
-    # Enable default applications
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = "firefox.desktop";
-        "application/rnote" = "rnote.desktop";
-      };
-    };
-
     home.stateVersion = "24.05";
   };
 
diff --git a/modules/home/cli/develop.nix b/modules/home/cli/develop.nix
index 2a05eb4..27da1f8 100644
--- a/modules/home/cli/develop.nix
+++ b/modules/home/cli/develop.nix
@@ -23,11 +23,11 @@
       keybinds {
         normal {
           bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; }
-          bind "Ctrl 1" { GoToTab 1; }
-          bind "Ctrl 2" { GoToTab 2; }
-          bind "Ctrl 3" { GoToTab 3; }
-          bind "Ctrl 4" { GoToTab 4; }
-          bind "Ctrl 5" { GoToTab 5; }
+          bind "Alt 1" { GoToTab 1; }
+          bind "Alt 2" { GoToTab 2; }
+          bind "Alt 3" { GoToTab 3; }
+          bind "Alt 4" { GoToTab 4; }
+          bind "Alt 5" { GoToTab 5; }
         }
       }
     '';
diff --git a/modules/system/gui/cosmic-greeter.nix b/modules/system/gui/cosmic-greeter.nix
new file mode 100644
index 0000000..36f33d2
--- /dev/null
+++ b/modules/system/gui/cosmic-greeter.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.displayManager.cosmic-greeter.enable = true;
+}
diff --git a/modules/system/gui/cosmic.nix b/modules/system/gui/cosmic.nix
new file mode 100644
index 0000000..b936e94
--- /dev/null
+++ b/modules/system/gui/cosmic.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  services.desktopManager.cosmic.enable = true;
+
+  environment.sessionVariables = {
+    COSMIC_DISABLE_DIRECT_SCANOUT = "true";
+  };
+}
diff --git a/modules/system/gui/hyprland.nix b/modules/system/gui/hyprland.nix
index a9b6b23..ca6dd78 100644
--- a/modules/system/gui/hyprland.nix
+++ b/modules/system/gui/hyprland.nix
@@ -7,29 +7,6 @@
     xwayland.enable = true;
   };
 
-  # Configure display manager
-  # services.greetd = {
-  #   enable = true;
-  #   settings = {
-  #     default_session = {
-  #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --time --cmd Hyprland";
-  #       user = "xeovalyte";
-  #     };
-  #   };
-  # };
-
-  # SDDM configuration
-  # environment.systemPackages = with pkgs; [
-  #   libsForQt5.qt5.qtquickcontrols2
-  #   libsForQt5.qt5.qtgraphicaleffects
-  # ];
-
-  # services.displayManager.sddm = {
-  #   enable = true;
-  #   wayland.enable = true;
-  #   theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
-  # };
-
   # Sound configuration
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
diff --git a/modules/system/gui/sddm.nix b/modules/system/gui/sddm.nix
new file mode 100644
index 0000000..a6f9521
--- /dev/null
+++ b/modules/system/gui/sddm.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    libsForQt5.qt5.qtquickcontrols2
+    libsForQt5.qt5.qtgraphicaleffects
+  ];
+
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+    theme = "${import ./sddm-theme.nix { inherit pkgs; }}";
+  };
+}