diff --git a/private_dot_config/hypr/hyprland/rules.conf b/private_dot_config/hypr/hyprland/rules.conf
new file mode 100644
index 0000000..34c1009
--- /dev/null
+++ b/private_dot_config/hypr/hyprland/rules.conf
@@ -0,0 +1,55 @@
+windowrule {
+    name = pavucontrol-float
+    match:class = ^(org.pulseaudio.pavucontrol)$
+    float =  1
+    size = 80% 60%
+    stay_focused = 1
+    center = 1
+    pin = 1
+}
+
+windowrule {
+    name = share-picker-float
+    match:class = ^(hyprland-share-picker)$
+    float = 1
+    center = 1
+    pin = 1
+}
+
+windowrule {
+    name = steam-friends-list
+    match:title = ^(Lista znajomych)$
+    float = 1
+    center = 1
+    size = 40% 60%
+}
+
+windowrule {
+    name = vesktop-dont-focus-pls
+    match:class = ^(vesktop)$
+    no_initial_focus = 1
+    focus_on_activate = 0
+    render_unfocused = 1
+}
+
+windowrule {
+    name = xdg-desktop-portal-gtk
+    match:class = ^(xdg-desktop-portal-gtk)$
+    float = 1
+    center = 1
+    size = 55% 50%
+}
+
+windowrule {
+    name = picture-in-picture
+    match:title = ^(Obraz w obrazie)$
+    pseudo = 1
+    no_initial_focus = 1
+}
+
+windowrule {
+    name = login-google-zen
+    match:title = ^(Logowanie – Konta Google — Zen Browser)$
+    float = 1
+    center = 1
+}
diff --git a/private_dot_config/hypr/hyprland/workspaces.conf b/private_dot_config/hypr/hyprland/workspaces.conf
index 653f57c..18638a4 100644
--- a/private_dot_config/hypr/hyprland/workspaces.conf
+++ b/private_dot_config/hypr/hyprland/workspaces.conf
@@ -9,9 +9,46 @@ workspace = 9, monitor:DP-2
 workspace = 10, monitor:DP-2
 
 # smart gaps or smt
-workspace = w[tv1], gapsout:1, gapsin:0
-workspace = f[1], gapsout:3, gapsin:3
-windowrule = bordersize 1, floating:1, onworkspace:w[tv1]
-windowrule = rounding 2, floating:1, onworkspace:w[tv1]
-windowrule = bordersize 0, floating:0, onworkspace:f[1]
-windowrule = rounding 2, floating:0, onworkspace:f[1]
+workspace = w[tv1], gapsout:0, gapsin:0
+workspace = f[1], gapsout:0, gapsin:0
+windowrule = border_size 0, match:float 0, match:workspace w[tv1]
+windowrule = rounding 0, match:float 0, match:workspace w[tv1]
+windowrule = border_size 0, match:float 0, match:workspace f[1]
+windowrule = rounding 0, match:float 0, match:workspace f[1]
+
+# assign windows to workspaces
+
+# Workspace 1
+windowrule = match:class ^(signal)$, workspace 1
+windowrule = match:class ^(vesktop)$, workspace 1 silent
+windowrule = match:class ^(chrome-facebook.com__-Default)$, workspace 1
+
+# Workspace 2
+windowrule = match:class ^(zen)$, workspace 2
+windowrule = match:class ^(com.github.IsmaelMartinez.teams_for_linux)$, workspace 2
+windowrule = match:class ^(FreeTube)$, workspace 2
+windowrule = match:class ^(chrome-x.com__-Default)$, workspace 2
+windowrule = match:class ^(chrome-www.inoreader.com__all_articles-Default)$, workspace 2
+windowrule = match:class ^(chrome-mail.proton.me__u_0_inbox.com-Default)$, workspace 2
+windowrule = match:class ^(chrome-app.tuta.com__-Default)$, workspace 2
+
+# Workspace 3
+windowrule = match:class ^(steam)$, workspace 3 silent
+windowrule = match:class ^(heroic)$, workspace 3
+windowrule = match:class ^(net.lutris.Lutris)$, workspace 3
+windowrule = match:class ^(rpcs3)$, workspace 3
+
+# Workspace 5
+windowrule = match:class ^(winboat)$, workspace 5
+
+# Workspace 6
+windowrule = match:class ^(obsidian)$, workspace 6
+
+# Workspace 8
+windowrule = match:class ^(gimp)$, workspace 8
+
+# Workspace 9
+windowrule = match:class .*potify, workspace 9 silent
+
+# Workspace 10
+windowrule = match:class ^(com.obsproject.Studio)$, workspace 10