diff --git a/bin/omarchy-hyprland-window-corners b/bin/omarchy-hyprland-window-corners
new file mode 100755
index 00000000..bcc3806d
--- /dev/null
+++ b/bin/omarchy-hyprland-window-corners
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# omarchy:summary=Set or toggle shape of Hyprland window corners
+# omarchy:args=[toggle|sharp|round]
+# omarchy:examples=omarchy hyprland window corners toggle | omarchy hyprland window corners round | omarchy hyprland window corners sharp
+
+case "${1:-toggle}" in
+  round) set -- on ;;
+  sharp) set -- off ;;
+  toggle) ;;
+  *)
+    echo "Usage: omarchy-hyprland-window-corners [toggle|sharp|round]"
+    exit 1
+    ;;
+esac
+
+omarchy-hyprland-toggle rounded-corners "$1"
diff --git a/default/hypr/toggles/rounded-corners.conf b/default/hypr/toggles/rounded-corners.conf
new file mode 100644
index 00000000..f81ae4f6
--- /dev/null
+++ b/default/hypr/toggles/rounded-corners.conf
@@ -0,0 +1,4 @@
+decoration {
+    rounding = 6
+    rounding_power = 3
+}
diff --git a/themes/last-horizon/hyprland.conf b/themes/last-horizon/hyprland.conf
index 785354e7..9f5677a7 100644
--- a/themes/last-horizon/hyprland.conf
+++ b/themes/last-horizon/hyprland.conf
@@ -10,15 +10,3 @@ group {
     col.border_active = $activeBorderColor
     col.border_inactive = $inactiveBorderColor
 }
-
-decoration {
-    rounding = 3
-    rounding_power = 3
-
-    shadow {
-      enabled = yes
-      render_power = 3
-      range = 16
-      color = rgba(00000052)
-    }
-}
diff --git a/themes/solitude/hyprland.conf b/themes/solitude/hyprland.conf
index b2b624e1..3b84b5b5 100644
--- a/themes/solitude/hyprland.conf
+++ b/themes/solitude/hyprland.conf
@@ -1,6 +1,3 @@
-# This file is not a full hyprland configuration.
-# It is intended to be included in your main hyprland.conf.
-
 $activeBorderColor = rgba(798186ee) rgba(caccccee)
 $inactiveBorderColor = rgb(1e1e1e)
 
@@ -13,14 +10,3 @@ group {
     col.border_active = $activeBorderColor
     col.border_inactive = $inactiveBorderColor
 }
-
-decoration {
-    rounding = 6
-    rounding_power = 3
-
-    shadow {
-      enabled = yes
-      range = 16
-      color = rgba(00000052)
-    }
-}