diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index bdbd551..42a7a4d 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -3,29 +3,18 @@
 
 #windowrule
 windowrule = float, org.kde.polkit-kde-authentication-agent-1
-windowrule = float, nm-connection-editor|blueman-manager
-windowrule = float, pavucontrol
-windowrule = float, nwg-look|qt5ct|mpv
 windowrule = float, onedriver|onedriver-launcher
-windowrule = float, eog
 windowrule = float, zoom
-windowrule = float, rofi
-windowrule = float, ^(gnome-system-monitor|org.gnome.SystemMonitor)$
-windowrule = float, yad
-windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
-windowrule = float, ^(evince)$ # document viewer
-windowrule = float, ^(file-roller|org.gnome.FileRoller)$ # archive manager
+
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
 
-windowrule = center,^(pavucontrol) 
+windowrule = center,^(pavucontrol)
 
 # windowrule v2 move to workspace
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
-windowrulev2 = workspace 2, class:^([Ff]irefox)$
-windowrulev2 = workspace 2, class:^(org.mozilla.firefox)$
-windowrulev2 = workspace 2, class:^([Ff]irefox-esr)$
+windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
 windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
@@ -42,34 +31,45 @@ windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
 windowrulev2 = float, class:(xdg-desktop-portal-gtk)
 windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
 windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
+windowrulev2 = float, class:^([Rr]ofi)$
+windowrulev2 = float, class:^(eog)$
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct|mpv)$
+windowrulev2 = float, title:(Kvantum Manager)
+windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
+windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ # system monitor
+windowrulev2 = float, class:^(yad)$ # icon browser
+windowrulev2 = float, class:^(wihotspot-gui)$ # wifi hotspot
+windowrulev2 = float, class:^(evince)$ # document viewer
+windowrulev2 = float, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$
-windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox)$
-windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$
-windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
 windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
-windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
+windowrulev2 = opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor)$
 windowrulev2 = opacity 0.9 0.8, class:^(deluge)$
 windowrulev2 = opacity 0.9 0.8, class:^(Alacritty)$
 windowrulev2 = opacity 0.9 0.8, class:^(kitty)$
 windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
 windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
-windowrulev2 = opacity 0.9 0.7, class:^(yad)$
+windowrulev2 = opacity 0.9 0.8, class:^(nwg-look|qt5ct|qt6ct|yad)$
+windowrulev2 = opacity 0.9 0.8, title:(Kvantum Manager)
 windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode|code-url-handler)$
 windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-studio)$ # Android Studio
+windowrulev2 = opacity 0.9 0.8, class:^(jetbrains-phpstorm)$ # PHPStorm
 windowrulev2 = opacity 0.94 0.86, class:^(discord)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$
-windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
-windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
+windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot-gui|org.gnome.baobab)$
+windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui
@@ -77,7 +77,9 @@ windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring
 # windowrule v2 - size
 windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
 windowrulev2 = size 70% 70%, class:^(xdg-desktop-portal-gtk)$
-windowrulev2 = size 70% 70%, class:^(evince)$
+windowrulev2 = size 60% 70%, title:(Kvantum Manager)
+windowrulev2 = size 60% 70%, class:^(qt6ct)$
+windowrulev2 = size 70% 70%, class:^(evince|wihotspot-gui)$
 windowrulev2 = size 60% 70%, class:^(file-roller|org.gnome.FileRoller)$
 
 #layerrule = unset,class:^([Rr]ofi)$