diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 81603af..d077afd 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -11,12 +11,8 @@ let
   keyboardLayout = config.var.keyboardLayout;
 in {
 
-  imports = [
-    ./animations.nix
-    ./bindings.nix
-    ./polkitagent.nix
-    # ./hyprspace.nix 
-  ];
+  imports =
+    [ ./animations.nix ./bindings.nix ./polkitagent.nix ./hyprspace.nix ];
 
   home.packages = with pkgs; [
     qt5.qtwayland
@@ -45,6 +41,7 @@ in {
     enable = true;
     xwayland.enable = true;
     systemd.enable = true;
+    # withUWSM = true; # One day, but not today
     package = inputs.hyprland.packages."${pkgs.system}".hyprland;
 
     settings = {
@@ -94,6 +91,13 @@ in {
         "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
       ];
 
+      windowrule = [
+        "workspace 6, discord"
+        "workspace 7, spotify"
+        "workspace 8, planify"
+        "workspace 8, calendar"
+      ];
+
       cursor = {
         no_hardware_cursors = true;
         default_monitor = "eDP-2";
diff --git a/home/system/hyprland/hyprspace.nix b/home/system/hyprland/hyprspace.nix
index 4e68ed0..671620d 100644
--- a/home/system/hyprland/hyprspace.nix
+++ b/home/system/hyprland/hyprspace.nix
@@ -1,13 +1,10 @@
 { inputs, pkgs, ... }: {
-
   wayland.windowManager.hyprland = {
     plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
     settings = {
       plugin = { overview = { autoDrag = false; }; };
-
       bind = [
         "$mod,TAB, overview:toggle" # Overview
-
       ];
     };
   };