diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 5075ba6..c9147c7 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -7,16 +7,7 @@ monitor=DP-1,2560x1440@144,auto,auto
 # Laptop
 monitor=eDP-1,1920x1080@60,auto,1.20
 
-# Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
-
-# PyWal Colors
-source = ~/.cache/wal/colors-hyprland.conf
-
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
-
-# Set programs that you use
+# Programs
 $terminal = kitty
 $fileManager = Thunar
 $menu = ~/.config/rofi/scripts/launcher_t1
@@ -26,28 +17,11 @@ $lockScreen = hyprlock
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
-exec-once=hyprctl setcursor volantes_cursors 24
-# Themes
-env = GTK_THEME,WhiteSur-Dark
-env = ICON_THEME,WhiteSur-Dark
-env = COLOR_SCHEME,prefer-dark
-
-#Cursors
-env = XCURSOR_THEME,Catppuccin-Macchiato-Dark
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_THEME,Catppuccin-Macchiato-Dark
-env = HYPRCURSOR_SIZE,24
-
-
-# Fonts
-env = FONT_NAME,JetBrainsMono Nerd Font 24
-env = DOCUMENT_FONT_NAME,Cantarell 24
-env = MONOSPACE_FONT_NAME,JetBrainsMono Nerd Font 5
-env = FONT_ANTIALIASING,rgba
-env = FONT_HINTING,full
-
 $hypr = ~/.config/hypr/hyprland
 
+source = $hypr/animations.conf
+source = $hypr/colours.conf
+source = $hypr/decorations.conf
 source = $hypr/env.conf
 source = $hypr/execs.conf
 source = $hypr/keybinds.conf
@@ -76,8 +50,6 @@ general {
     gaps_in = 10
     gaps_out = 10
     border_size = 3
-    col.active_border = $color4 $color13 45deg
-    col.inactive_border = $color0
 
     layout = dwindle
 
@@ -85,41 +57,6 @@ general {
     allow_tearing = true
 }
 
-decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    rounding = 10
- 
-  blur {
-        enabled = true
-        size = 3
-        passes = 1
-        ignore_opacity = true
-    }
-
-    shadow {
-      enabled = true
-      range = 4
-      render_power = 3
-      color = rgba(1a1a1aee)
-    }
-}
-
-animations {
-    enabled = yes
-
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
 dwindle {
     # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
     pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
diff --git a/hypr/hyprland/animations.conf b/hypr/hyprland/animations.conf
new file mode 100644
index 0000000..83444b5
--- /dev/null
+++ b/hypr/hyprland/animations.conf
@@ -0,0 +1,14 @@
+animations {
+    enabled = yes
+
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
diff --git a/hypr/hyprland/colours.conf b/hypr/hyprland/colours.conf
new file mode 100644
index 0000000..caa84ef
--- /dev/null
+++ b/hypr/hyprland/colours.conf
@@ -0,0 +1,7 @@
+# PyWal Colors
+source = ~/.cache/wal/colors-hyprland.conf
+
+general {
+    col.active_border = $color4 $color13 45deg
+    col.inactive_border = $color0
+}
diff --git a/hypr/hyprland/decorations.conf b/hypr/hyprland/decorations.conf
new file mode 100644
index 0000000..0c9b896
--- /dev/null
+++ b/hypr/hyprland/decorations.conf
@@ -0,0 +1,19 @@
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    rounding = 6
+ 
+  blur {
+        enabled = true
+        size = 4
+        passes = 1
+        ignore_opacity = true
+    }
+
+    shadow {
+      enabled = true
+      range = 4
+      render_power = 3
+      color = rgba(1a1a1aee)
+    }
+}
diff --git a/hypr/hyprland/env.conf b/hypr/hyprland/env.conf
index 926b9e1..b2cda83 100644
--- a/hypr/hyprland/env.conf
+++ b/hypr/hyprland/env.conf
@@ -22,3 +22,22 @@ env = QT_QPA_PLATFORM,wayland
 env = WLR_NO_HARDWARE_CURSORS,1
 env = __GL_VRR_ALLOWED,1
 env = WLR_DRM_NO_ATOMIC,1
+
+# Themes
+env = GTK_THEME,WhiteSur-Dark
+env = ICON_THEME,WhiteSur-Dark
+env = COLOR_SCHEME,prefer-dark
+
+#Cursors
+env = XCURSOR_THEME,Catppuccin-Macchiato-Dark
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_THEME,Catppuccin-Macchiato-Dark
+env = HYPRCURSOR_SIZE,24
+
+
+# Fonts
+env = FONT_NAME,JetBrainsMono Nerd Font 24
+env = DOCUMENT_FONT_NAME,Cantarell 24
+env = MONOSPACE_FONT_NAME,JetBrainsMono Nerd Font 5
+env = FONT_ANTIALIASING,rgba
+env = FONT_HINTING,full
diff --git a/hypr/hyprland/execs.conf b/hypr/hyprland/execs.conf
index cf57e24..8487793 100644
--- a/hypr/hyprland/execs.conf
+++ b/hypr/hyprland/execs.conf
@@ -1,3 +1,6 @@
+# Set cursor
+exec-once=hyprctl setcursor volantes_cursors 24
+
 # Notification Daemon
 exec-once = bash ~/.config/hypr/scripts/start-swaync.sh
 # Idle Daemon