diff --git a/hyprland/dot-config/hypr/animations.conf b/hyprland/dot-config/hypr/animations.conf
new file mode 100644
index 0000000..3119c76
--- /dev/null
+++ b/hyprland/dot-config/hypr/animations.conf
@@ -0,0 +1,16 @@
+
+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/hyprland/dot-config/hypr/decoration.conf b/hyprland/dot-config/hypr/decoration.conf
new file mode 100644
index 0000000..55fd732
--- /dev/null
+++ b/hyprland/dot-config/hypr/decoration.conf
@@ -0,0 +1,17 @@
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    rounding = 10
+    
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+    }
+
+    drop_shadow = yes
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+}
+
diff --git a/hyprland/dot-config/hypr/gestures.conf b/hyprland/dot-config/hypr/gestures.conf
new file mode 100644
index 0000000..bcb7b5a
--- /dev/null
+++ b/hyprland/dot-config/hypr/gestures.conf
@@ -0,0 +1,6 @@
+gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = off
+}
+
+
diff --git a/hyprland/dot-config/hypr/hyprland.conf b/hyprland/dot-config/hypr/hyprland.conf
index 076fd37..4df8489 100644
--- a/hyprland/dot-config/hypr/hyprland.conf
+++ b/hyprland/dot-config/hypr/hyprland.conf
@@ -1,54 +1,27 @@
-
-# #######################################################################################
-# AUTOGENERATED HYPR CONFIG.
-# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-# #######################################################################################
-
-#
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-#
-
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,1
-
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
 # Execute your favorite apps at launch
 exec-once = hyprpaper & waybar & dunst
 
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
-source = ~/.config/hypr/themes/frappe.conf
-
 # Set programs that you use
 $terminal = kitty
 $fileManager = nautilus
 $menu = rofi -show drun
 $browser = flatpak run org.mozilla.firefox
 
+# Source a file (multi-file configs)
+source = ~/.config/hypr/themes/frappe.conf
+source = ~/.config/hypr/animations.conf
+source = ~/.config/hypr/decoration.conf
+source = ~/.config/hypr/gestures.conf
+source = ~/.config/hypr/keyboard.conf
+source = ~/.config/hypr/keymaps.conf
+source = ~/.config/hypr/layouts.conf
+source = ~/.config/hypr/misc.conf
+source = ~/.config/hypr/monitors.conf
+source = ~/.config/hypr/window-rules.conf
+
 # Some default env vars.
 env = XCURSOR_SIZE,24
-env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
-
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 0
-
-    touchpad {
-        natural_scroll = no
-    }
-
-    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
-}
+env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that
 
 general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
@@ -56,135 +29,15 @@ general {
     gaps_in = 10
     gaps_out = 20
     border_size = 3
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
+    col.active_border = $mauve $lavender 45deg
+    col.inactive_border = $overlay2 $overlay1 45deg
+    col.nogroup_border = $rosewater
+    col.nogroup_border_active = $flamingo
 
     layout = master
+    resize_on_border = true
 
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
     allow_tearing = false
 }
 
-decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    rounding = 10
-    
-    blur {
-        enabled = true
-        size = 3
-        passes = 1
-    }
-
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = 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
-    preserve_split = yes # you probably want this
-}
-
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
-
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = off
-}
-
-misc {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
-}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-device {
-    name = epic-mouse-v1
-    sensitivity = -0.5
-}
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
-
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = SUPER
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, T, exec, $terminal
-bind = $mainMod, Q, killactive, 
-bind = $mainMod, M, exit, 
-bind = $mainMod, F, exec, $fileManager
-bind = $mainMod, V, togglefloating, 
-bind = $mainMod, SPACE, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, B, exec, $browser
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
diff --git a/hyprland/dot-config/hypr/keyboard.conf b/hyprland/dot-config/hypr/keyboard.conf
new file mode 100644
index 0000000..8d94844
--- /dev/null
+++ b/hyprland/dot-config/hypr/keyboard.conf
@@ -0,0 +1,18 @@
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+input {
+    kb_layout = us
+    kb_variant = ,alt-intl
+    kb_model =
+    kb_options =
+    kb_rules =
+    numlock_by_default = true
+
+    follow_mouse = 0
+
+    touchpad {
+        natural_scroll = no
+    }
+
+    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
+}
+
diff --git a/hyprland/dot-config/hypr/keymaps.conf b/hyprland/dot-config/hypr/keymaps.conf
new file mode 100644
index 0000000..b5025fc
--- /dev/null
+++ b/hyprland/dot-config/hypr/keymaps.conf
@@ -0,0 +1,58 @@
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, T, exec, $terminal
+bind = $mainMod, Q, killactive, 
+bind = $mainMod, M, exit, 
+bind = $mainMod, F, exec, $fileManager
+bind = $mainMod, V, togglefloating, 
+bind = $mainMod, SPACE, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, B, exec, $browser
+bind = $mainMod, R, exec, rofi -show run
+bind = $mainMod, W, exec, rofi -show window
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
diff --git a/hyprland/dot-config/hypr/layouts.conf b/hyprland/dot-config/hypr/layouts.conf
new file mode 100644
index 0000000..2516197
--- /dev/null
+++ b/hyprland/dot-config/hypr/layouts.conf
@@ -0,0 +1,12 @@
+
+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
+    preserve_split = yes # you probably want this
+}
+
+master {
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
+}
+
diff --git a/hyprland/dot-config/hypr/misc.conf b/hyprland/dot-config/hypr/misc.conf
new file mode 100644
index 0000000..4214cda
--- /dev/null
+++ b/hyprland/dot-config/hypr/misc.conf
@@ -0,0 +1,7 @@
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = true
+    disable_splash_rendering = true
+}
+
diff --git a/hyprland/dot-config/hypr/monitors.conf b/hyprland/dot-config/hypr/monitors.conf
new file mode 100644
index 0000000..6b6b445
--- /dev/null
+++ b/hyprland/dot-config/hypr/monitors.conf
@@ -0,0 +1,3 @@
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,preferred,auto,1
+
diff --git a/hyprland/dot-config/hypr/window-rules.conf b/hyprland/dot-config/hypr/window-rules.conf
new file mode 100644
index 0000000..53aa7be
--- /dev/null
+++ b/hyprland/dot-config/hypr/window-rules.conf
@@ -0,0 +1,9 @@
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+
+