diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 671b53c..c07094b 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -27,7 +27,7 @@ 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:^(Microsoft-edge-beta)$ 
+windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
@@ -42,24 +42,16 @@ windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
 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), title:(Add Folder to Workspace)
-windowrulev2 = float, class:(codium-url-handler), title:(Add Folder to Workspace)
-windowrulev2 = float, class:(VSCodium), title:(Add Folder to Workspace)
+windowrulev2 = float, class:(codium|codium-url-handler|VSCodium), title:(Add Folder to Workspace)
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
-windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$
-windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$
+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:^([Mm]icrosoft-edge-stable)$
-windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-beta)$
-windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-dev)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-beta)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-dev)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-unstable)$
+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)$
@@ -68,14 +60,12 @@ 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:^(codium-url-handler)$
-windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
+windowrulev2 = opacity 0.9 0.7, class:^(VSCodium|codium-url-handler)$
 windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 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:^(code-url-handler)$
-windowrulev2 = opacity 0.9 0.8, class:^(VSCode)$
+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.94 0.86, class:^(discord)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.telegram.desktop)$