diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 086f79b0..cacc4b31 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -2,106 +2,103 @@
 
 
 # Xwaylandvideobridge (if installed)
-windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$
-windowrulev2 = noanim,class:^(xwaylandvideobridge)$
-windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
-windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
-windowrulev2 = noblur,class:^(xwaylandvideobridge)$
+windowrule = opacity 0.0 override, no_anim on, no_initial_focus on, max_size 1 1, no_blur on, match:class ^(xwaylandvideobridge)$
 
 
 
 # windowrule - tags - add apps under appropriate tag to use the same settings
-
 # browser tags
-windowrule = match:class ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr|[Ff]irefox-bin)$, tag +browser
-windowrule = match:class ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$, tag +browser
-windowrule = match:class ^(chrome-.+-Default)$, tag +browser
-windowrule = match:class ^([Cc]hromium)$, tag +browser
-windowrule = match:class ^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable))$, tag +browser
-windowrule = match:class ^(Brave-browser(-beta|-dev|-unstable)?)$, tag +browser
-windowrule = match:class ^([Tt]horium-browser|[Cc]achy-browser)$, tag +browser
-windowrule = match:class ^(zen-alpha|zen)$, tag +browser
+windowrule = tag +browser, match:class ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr|[Ff]irefox-bin)$
+windowrule = tag +browser, match:class ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
+windowrule = tag +browser, match:class ^(chrome-.+-Default)$ # Chrome PWAs
+windowrule = tag +browser, match:class ^([Cc]hromium)$
+windowrule = tag +browser, match:class ^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable))$
+windowrule = tag +browser, match:class ^(Brave-browser(-beta|-dev|-unstable)?)$
+windowrule = tag +browser, match:class ^([Tt]horium-browser|[Cc]achy-browser)$
+windowrule = tag +browser, match:class ^(zen-alpha|zen|zen-browser)$
+
 
 # terminal tags
 windowrule = tag +terminal, match:class ^(Alacritty|kitty|Kitty)$
 
 
 # project tags
-windowrule = match:class ^(codium|codium-url-handler|VSCodium)$, tag +projects
-windowrule = match:class ^(VSCode|code|code-url-handler)$, tag +projects
+windowrule = tag +projects, match:class ^(codium|codium-url-handler|VSCodium)$
+windowrule = tag +projects, match:class ^(VSCode|code-url-handler)$
 
 # IM tags
-windowrule = match:class ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$, tag +im
-windowrule = match:class ^([Ff]erdium)$, tag +im
-windowrule = match:class ^([Ww]hatsapp-for-linux)$, tag +im
-windowrule = match:class ^(ZapZap|com.rtosta.zapzap)$, tag +im
-windowrule = match:class ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$, tag +im
-windowrule = match:class ^(teams-for-linux)$, tag +im
-windowrule = match:class ^(im.riot.Riot|Element)$, tag +im
+windowrule = tag +im, match:class ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
+windowrule = tag +im, center on, float on, match:class ^([Ff]erdium)$
+windowrule = tag +im, center on, match:class ^([Ww]hatsapp-for-linux)$
+windowrule = tag +im, match:class ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop|materialgram)$
+windowrule = tag +im, match:class ^(teams-for-linux)$
+
 
 # file-manager tags
-windowrule = match:class ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$, tag +file-manager
-windowrule = match:class ^(app.drey.Warp)$, tag +file-manager
+windowrule = tag +file-manager, match:class ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
+windowrule = tag +file-manager, match:class ^(app.drey.Warp)$
+
 
 # multimedia-video tags
-windowrule = match:class ^([Mm]pv|vlc)$, tag +multimedia_video
+windowrule = tag +multimedia_video, match:class ^([Mm]pv|vlc)$
 
 # settings tags
-windowrule = match:class ^(wihotspot(-gui)?)$, tag +settings
-windowrule = match:class ^([Bb]aobab|org.gnome.[Bb]aobab)$, tag +settings
-windowrule = match:class ^(gnome-disks|wihotspot(-gui)?)$, tag +settings
-windowrule = match:title (Kvantum Manager), tag +settings
-windowrule = match:class ^(file-roller|org.gnome.FileRoller)$, tag +settings
-windowrule = match:class ^(nm-applet|nm-connection-editor|blueman-manager)$, tag +settings
-windowrule = match:class ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$, tag +settings
-windowrule = match:class ^(qt5ct|qt6ct|[Yy]ad)$, tag +settings
-windowrule = match:class (xdg-desktop-portal-gtk), tag +settings
-windowrule = match:class ^(org.kde.polkit-kde-authentication-agent-1)$, tag +settings
+windowrule = tag +settings, match:class ^(gnome-disks|wihotspot(-gui)?)$
+windowrule = tag +settings, match:class ^(file-roller|org.gnome.FileRoller)$ # archive manager
+windowrule = tag +settings, match:class ^(nm-applet|nm-connection-editor|blueman-manager)$
+windowrule = tag +settings, match:class ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol|nwg-look)$
+windowrule = tag +settings, match:class ^(qt5ct|qt6ct|[Yy]ad)$
+windowrule = tag +settings, match:class (xdg-desktop-portal-gtk)
+windowrule = tag +settings, match:class ^(org.kde.polkit-kde-authentication-agent-1)$
 
 # viewer tags
-windowrule = match:class ^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$, tag +viewer
-windowrule = match:class ^(evince)$, tag +viewer
-windowrule = match:class ^(eog|org.gnome.Loupe|imv|imv-dir)$, tag +viewer
+windowrule = tag +viewer, match:class ^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
+windowrule = tag +viewer, match:class ^(evince|zathura)$ # document viewer
+windowrule = tag +viewer, match:class ^(eog|org.gnome.Loupe|imv|imv-dir)$ # image viewer
 
 
 # POSITION
-windowrule = match:class ([Tt]hunar) match:title negative:(.*[Tt]hunar.*), center on
-windowrule = match:class ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$, center on
-windowrule = match:title ^(Picture-in-Picture)$, move 72% 7%
+# windowrule = center,floating:1 # warning, it cause even the menu to float and center.
+windowrule = center on, float on, match:class ([Tt]hunar), match:title negative:(.*[Tt]hunar.*)
+windowrule = center on, match:class ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
+windowrule = move ((monitor_w*0.72)) ((monitor_h*0.07)), float on, match:title ^(Picture-in-Picture)$
+#windowrule = move 72% 7%,title:^(Firefox)$
 
 # windowrule move to workspace
-windowrule = match:tag file-manager, workspace 4
-windowrule = match:tag browser, workspace 3
+windowrule = workspace 3, match:tag browser*
+windowrule = workspace 4, match:class ^([Tt]hunar)$
+windowrule = workspace 6, match:tag im*
+
 
 # FLOAT
-windowrule = match:class ([Zz]oom|onedriver|onedriver-launcher), float on
-windowrule = match:class (org.gnome.Calculator) match:title (Calculator), float on
-windowrule = match:class ^(mpv|com.github.rafostar.Clapper)$, float on
-windowrule = match:class ^([Qq]alculate-gtk)$, float on
-windowrule = match:class ^([Ff]erdium)$, float on
-windowrule = match:title ^(Picture-in-Picture)$, float on
+windowrule = float on, match:tag settings*
+windowrule = float on, match:tag viewer*
+windowrule = float on, match:class ([Zz]oom|onedriver|onedriver-launcher)$
+windowrule = float on, match:class (org.gnome.Calculator), match:title (Calculator)
+windowrule = float on, match:class ^(mpv|com.github.rafostar.Clapper)$
+windowrule = float on, match:class ^([Qq]alculate-gtk)$
+#windowrule = float, class:^([Ww]hatsapp-for-linux|ZapZap|com.rtosta.zapzap)$
+#windowrule = float, title:^(Firefox)$
 
 # windowrule - ######### float popups and dialogue #######
-windowrule = match:title ^(Authentication Required)$, float on, center on
-windowrule = match:class (codium|codium-url-handler|VSCodium) match:title negative:(.*codium.*|.*VSCodium.*), float on
-windowrule = match:class ^(com.heroicgameslauncher.hgl)$ match:title negative:(Heroic Games Launcher), float on
-windowrule = match:class ^([Ss]team)$ match:title negative:^([Ss]team)$, float on
-windowrule = match:class ([Tt]hunar) match:title negative:(.*[Tt]hunar.*), float on
+windowrule = float on, center on, match:title ^(Authentication Required)$
+windowrule = float on, match:class (codium|codium-url-handler|VSCodium), match:title negative:(.*codium.*|.*VSCodium.*)
 
-windowrule = match:title ^(Add Folder to Workspace)$, float on, size (monitor_w*0.7) (monitor_h*0.6), center on
+windowrule = float on, size (monitor_w*0.7) (monitor_h*0.6), center on, match:title ^(Add Folder to Workspace)$
+windowrule = float on, size (monitor_w*0.7) (monitor_h*0.6), center on, match:title ^(Save As)$
 
-windowrule = match:title ^(Save As)$, float on, size (monitor_w*0.7) (monitor_h*0.6), center on
-
-windowrule = match:initial_title (Open Files), float on, size (monitor_w*0.7) (monitor_h*0.6)
+windowrule = float on, size (monitor_w*0.7) (monitor_h*0.6), match:initial_title (Open Files)
 
 
 # Kitty float
-windowrule =  match:title ^(float_kitty)$ , center on, float on,size 850 550
+windowrule = size 850 550, move (center), float on, match:title float_kitty
 
 
 #Layer Rules
-layerrule = match:namespace hyprpicker, no_anim on
-layerrule = match:namespace selection, no_anim on
+layerrule = no_anim on, match:namespace hyprpicker
+layerrule = no_anim on, match:namespace selection
 
-layerrule = match:namespace no_anim, no_anim on
-layerrule = match:namespace gtk-layer-shell, ignore_alpha on
+layerrule = no_anim on, match:namespace noanim
+layerrule = ignore_alpha 0, match:namespace gtk-layer-shell
+
+layerrule = no_anim on, match:namespace fabric