diff --git a/default/hypr/apps.conf b/default/hypr/apps.conf
new file mode 100644
index 0000000..48c0edf
--- /dev/null
+++ b/default/hypr/apps.conf
@@ -0,0 +1,7 @@
+# App-specific tweaks
+source = ~/.local/share/omarchy/default/hypr/apps/chromium.conf
+source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
+source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
+source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
+source = ~/.local/share/omarchy/default/hypr/apps/system.conf
+source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
diff --git a/default/hypr/apps/chromium.conf b/default/hypr/apps/chromium.conf
new file mode 100644
index 0000000..af69071
--- /dev/null
+++ b/default/hypr/apps/chromium.conf
@@ -0,0 +1,6 @@
+# Force chromium into a tile to deal with --app bug
+windowrule = tile, class:^(Chromium)$
+
+# Only slight opacity when unfocused
+windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
+windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
diff --git a/default/hypr/apps/hyprshot.conf b/default/hypr/apps/hyprshot.conf
new file mode 100644
index 0000000..c900320
--- /dev/null
+++ b/default/hypr/apps/hyprshot.conf
@@ -0,0 +1,2 @@
+# Remove 1px border around hyprshot screenshots
+layerrule = noanim, selection
diff --git a/default/hypr/apps/retroarch.conf b/default/hypr/apps/retroarch.conf
new file mode 100644
index 0000000..2c019de
--- /dev/null
+++ b/default/hypr/apps/retroarch.conf
@@ -0,0 +1,3 @@
+windowrule = fullscreen, class:com.libretro.RetroArch
+windowrule = opacity 1 1, class:com.libretro.RetroArch
+
diff --git a/default/hypr/apps/steam.conf b/default/hypr/apps/steam.conf
new file mode 100644
index 0000000..be76209
--- /dev/null
+++ b/default/hypr/apps/steam.conf
@@ -0,0 +1,4 @@
+# Float Steam, fullscreen RetroArch
+windowrule = float, class:steam
+windowrule = center, class:steam, title:Steam
+windowrule = opacity 1 1, class:steam
diff --git a/default/hypr/apps/system.conf b/default/hypr/apps/system.conf
new file mode 100644
index 0000000..9f3af5f
--- /dev/null
+++ b/default/hypr/apps/system.conf
@@ -0,0 +1,16 @@
+# Float and center settings and previews
+windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
+windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
+windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
+windowrule = size 600 470, class:Omarchy
+windowrule = size 700 470 class:About
+
+# Float and center file pickers
+windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
+windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
+
+# Fullscreen screensaver
+windowrule = fullscreen, class:Screensaver
+
+# No transparency on media windows
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
diff --git a/default/hypr/apps/walker.conf b/default/hypr/apps/walker.conf
new file mode 100644
index 0000000..9681c09
--- /dev/null
+++ b/default/hypr/apps/walker.conf
@@ -0,0 +1,2 @@
+# Application-sepcific animation
+layerrule = noanim, walker
diff --git a/default/hypr/looknfeel.conf b/default/hypr/looknfeel.conf
index 124acc5..d73f677 100644
--- a/default/hypr/looknfeel.conf
+++ b/default/hypr/looknfeel.conf
@@ -69,12 +69,6 @@ animations {
     animation = workspaces, 0, 0, ease
 }
 
-# Application-sepcific animation
-layerrule = noanim,walker
-
-# Remove 1px border around hyprshot screenshots
-layerrule = noanim, selection
-
 # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
 # "Smart gaps" / "No gaps when only"
 # uncomment all if you wish to use that.
diff --git a/default/hypr/windows.conf b/default/hypr/windows.conf
index c9d6992..bc665b2 100644
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@@ -1,34 +1,11 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 windowrule = suppressevent maximize, class:.*
 
-# Force chromium into a tile to deal with --app bug
-windowrule = tile, class:^(Chromium)$
-
-# Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 600 470, class:Omarchy
-windowrule = size 700 470 class:About
-
-# Float and center file pickers
-windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-
-# Float Steam, fullscreen RetroArch
-windowrule = float, class:steam
-windowrule = center, class:steam, title:Steam
-windowrule = fullscreen, class:^(com.libretro.RetroArch)$
-
-# Fullscreen screensaver
-windowrule = fullscreen, class:Screensaver
-
-# Just dash of opacity
+# Just dash of opacity by default
 windowrule = opacity 0.97 0.9, class:.*
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
-windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$
 
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+# App-specific tweaks
+source = ~/.local/share/omarchy/default/hypr/apps.conf