diff --git a/hypr-configs/dotfiles/hypr/configs/animation/export.conf b/hypr-configs/dotfiles/hypr/configs/animation/export.conf
index 24a4c43..ca45072 100644
--- a/hypr-configs/dotfiles/hypr/configs/animation/export.conf
+++ b/hypr-configs/dotfiles/hypr/configs/animation/export.conf
@@ -1 +1 @@
-source = ~/.config/hypr/configs/animation/variants/animations-river.conf
\ No newline at end of file
+source = ~/.config/hypr/configs/animation/variants/animations-river.conf
diff --git a/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-classic.conf b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-classic.conf
new file mode 100644
index 0000000..4598fe7
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-classic.conf
@@ -0,0 +1,15 @@
+# ----------------------------------------------------- 
+# Animations
+# name "Classic"
+# ----------------------------------------------------- 
+
+animations {
+    enabled = true
+    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
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-dynamic.conf b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-dynamic.conf
new file mode 100644
index 0000000..3542451
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-dynamic.conf
@@ -0,0 +1,20 @@
+# ----------------------------------------------------- 
+# Animations
+# name "Dynamic"
+# ----------------------------------------------------- 
+
+animations {
+    enabled = true
+    bezier = wind, 0.05, 0.9, 0.1, 1.05
+    bezier = winIn, 0.1, 1.1, 0.1, 1.1
+    bezier = winOut, 0.3, -0.3, 0, 1
+    bezier = liner, 1, 1, 1, 1
+    animation = windows, 1, 6, wind, slide
+    animation = windowsIn, 1, 6, winIn, slide
+    animation = windowsOut, 1, 5, winOut, slide
+    animation = windowsMove, 1, 5, wind, slide
+    animation = border, 1, 1, liner
+    animation = borderangle, 1, 30, liner, loop
+    animation = fade, 1, 10, default
+    animation = workspaces, 1, 5, wind
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-moving.conf b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-moving.conf
index 7411713..a4b9e14 100644
--- a/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-moving.conf
+++ b/hypr-configs/dotfiles/hypr/configs/animation/variants/animations-moving.conf
@@ -16,4 +16,4 @@ animations {
     animation = fade, 1, 5, smoothIn
     animation = fadeDim, 1, 5, smoothIn
     animation = workspaces, 1, 6, default
-}
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/input.conf b/hypr-configs/dotfiles/hypr/configs/input.conf
index a7bf025..95b96b3 100644
--- a/hypr-configs/dotfiles/hypr/configs/input.conf
+++ b/hypr-configs/dotfiles/hypr/configs/input.conf
@@ -15,10 +15,4 @@ input {
         natural_scroll = false
         disable_while_typing = 1
     }
-}
-
-gestures {
-    workspace_swipe = true
-    workspace_swipe_invert = true
-    workspace_swipe_cancel_ratio = 0.1
-}
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/layout.conf b/hypr-configs/dotfiles/hypr/configs/layout.conf
deleted file mode 100644
index a4de585..0000000
--- a/hypr-configs/dotfiles/hypr/configs/layout.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# -----------------------------------------------------
-# Layouts
-# -----------------------------------------------------
-
-dwindle {
-    pseudotile = true
-    preserve_split = true
-}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/layout/export.conf b/hypr-configs/dotfiles/hypr/configs/layout/export.conf
new file mode 100644
index 0000000..ad52604
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/configs/layout/export.conf
@@ -0,0 +1 @@
+source = ~/.config/hypr/configs/layout/variants/desktop.conf
diff --git a/hypr-configs/dotfiles/hypr/configs/layout/variants/desktop.conf b/hypr-configs/dotfiles/hypr/configs/layout/variants/desktop.conf
new file mode 100644
index 0000000..3ea4fdb
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/configs/layout/variants/desktop.conf
@@ -0,0 +1,19 @@
+# ----------------------------------------------------- 
+# Layouts
+# ----------------------------------------------------- 
+
+dwindle {
+    pseudotile = true
+    preserve_split = true
+    force_split = 2
+}
+
+gestures {
+    workspace_swipe = false
+}
+
+binds {
+  workspace_back_and_forth = true
+  allow_workspace_cycles = true
+  pass_mouse_when_bound = false
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/layout/variants/laptop.conf b/hypr-configs/dotfiles/hypr/configs/layout/variants/laptop.conf
new file mode 100644
index 0000000..c01758f
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/configs/layout/variants/laptop.conf
@@ -0,0 +1,30 @@
+# ----------------------------------------------------- 
+# Layouts
+# ----------------------------------------------------- 
+
+dwindle {
+    pseudotile = true
+    preserve_split = true
+}
+
+master {
+    # Commented out due to compatibility reasons
+    # new_status = master
+}
+
+gestures {
+  workspace_swipe = true
+  workspace_swipe_fingers = 3
+  workspace_swipe_distance = 500
+  workspace_swipe_invert = true
+  workspace_swipe_min_speed_to_force = 30
+  workspace_swipe_cancel_ratio = 0.5
+  workspace_swipe_create_new = true 
+  workspace_swipe_forever = true
+}
+
+binds {
+  workspace_back_and_forth = true
+  allow_workspace_cycles = true
+  pass_mouse_when_bound = false
+}
\ No newline at end of file
diff --git a/hypr-configs/dotfiles/hypr/configs/mouse.conf b/hypr-configs/dotfiles/hypr/configs/mouse.conf
index ee4625f..69dddbb 100644
--- a/hypr-configs/dotfiles/hypr/configs/mouse.conf
+++ b/hypr-configs/dotfiles/hypr/configs/mouse.conf
@@ -2,15 +2,6 @@
 # Mouse
 # -----------------------------------------------------
 
-$mouse_cursor = Bibata-Modern-Ice
-$mouse_cursor_size = 24
-
-env = HYPRCURSOR_THEME, $mouse_cursor
-env = XCURSOR_THEME, $mouse_cursor
-env = HYPRCURSOR_SIZE, $mouse_cursor_size
-env = XCURSOR_SIZE, $mouse_cursor_size
-exec-once = gsettings set org.gnome.desktop.interface cursor-theme '$mouse_cursor'
-
 # cursor {
 #    no_hardware_cursors = true
 # }
diff --git a/hypr-configs/dotfiles/hypr/env.conf b/hypr-configs/dotfiles/hypr/env.conf
new file mode 100644
index 0000000..0a53430
--- /dev/null
+++ b/hypr-configs/dotfiles/hypr/env.conf
@@ -0,0 +1,51 @@
+# -----------------------------------------------------
+# General Environments
+# -----------------------------------------------------
+
+env = XDG_DATA_DIRS, $HOME/.nix-profile/share:/usr/share/:$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/var/lib/flatpak/exports/share
+
+$mouse_cursor = Bibata-Modern-Ice
+$mouse_cursor_size = 24
+
+env = HYPRCURSOR_THEME, $mouse_cursor
+env = XCURSOR_THEME, $mouse_cursor
+env = HYPRCURSOR_SIZE, $mouse_cursor_size
+env = XCURSOR_SIZE, $mouse_cursor_size
+exec-once = gsettings set org.gnome.desktop.interface cursor-theme $mouse_cursor
+
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+env = QT_QPA_PLATFORM, wayland
+env = QT_QPA_PLATFORMTHEME, qt6ct
+env = QT_STYLE_OVERRIDE, kvantum
+exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+
+$main_mod = SUPER
+
+$script_dir = ~/.config/hypr/scripts
+$eww_script_dir = ~/.config/eww/scripts
+$eww_toggle_panel = $eww_script_dir/eww/toggle-panel.sh
+
+$alacritty_terminal = alacritty
+$kitty_terminal = kitty
+$rio_terminal = rio
+
+$terminal = $alacritty_terminal
+$zterminal = $terminal -o "window.opacity=1" -e zellij
+
+$fileManager = nemo
+$bluetooth-manager = blueman-manager
+$pkg_manager = octoxbps
+$locker = hyprlock
+
+$screenshot = $script_dir/hyprshot.sh
+$pavucontrol = $script_dir/pavucontrol-launch.sh
+$nekoray = $script_dir/nekoray-launch.sh
+$network_manager = $script_dir/nmtui-launch.sh
+$random_wallpaper = $script_dir/wallpaper/wallpaper-daemon.sh
+$kill_wallpaper_daemon = $script_dir/wallpaper/kill-daemon.sh
+$waybar_toggle = $script_dir/waybar/toggle.sh
+$rofi_menu = $script_dir/rofi-launch.sh d
+$rofi_powermenu = $script_dir/rofi-launch.sh p
+$rofi_screenshot = $script_dir/rofi-launch.sh s
+$rofi_clipboard = $script_dir/rofi-launch.sh c
+$rofi_wallpaper = $script_dir/rofi-launch.sh w
diff --git a/hypr-configs/dotfiles/hypr/hyprland.conf b/hypr-configs/dotfiles/hypr/hyprland.conf
index 1d31120..3d766de 100644
--- a/hypr-configs/dotfiles/hypr/hyprland.conf
+++ b/hypr-configs/dotfiles/hypr/hyprland.conf
@@ -7,57 +7,16 @@
 #
 # -----------------------------------------------------
 
-# -----------------------------------------------------
-# Environments
-# -----------------------------------------------------
-
-env = ELECTRON_OZONE_PLATFORM_HINT,auto
-env = QT_QPA_PLATFORM, wayland
-env = QT_QPA_PLATFORMTHEME, qt6ct
-env = QT_STYLE_OVERRIDE, kvantum
-exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-
-env = XDG_DATA_DIRS, $HOME/.nix-profile/share:/usr/share/:$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/var/lib/flatpak/exports/share
-
-$main_mod = SUPER
-
-$script_dir = ~/.config/hypr/scripts
-$eww_script_dir = ~/.config/eww/scripts
-$eww_toggle_panel = $eww_script_dir/eww/toggle-panel.sh
-
-$alacritty_terminal = alacritty
-$kitty_terminal = kitty
-$rio_terminal = rio
-
-$terminal = $alacritty_terminal
-$zterminal = $terminal -o "window.opacity=1" -e zellij
-
-$fileManager = nemo
-$bluetooth-manager = blueman-manager
-$pkg_manager = octoxbps
-$locker = hyprlock
-
-$screenshot = $script_dir/hyprshot.sh
-$pavucontrol = $script_dir/pavucontrol-launch.sh
-$nekoray = $script_dir/nekoray-launch.sh
-$network_manager = $script_dir/nmtui-launch.sh
-$random_wallpaper = $script_dir/wallpaper/wallpaper-daemon.sh
-$kill_wallpaper_daemon = $script_dir/wallpaper/kill-daemon.sh
-$waybar_toggle = $script_dir/waybar/toggle.sh
-$rofi_menu = $script_dir/rofi-launch.sh d
-$rofi_powermenu = $script_dir/rofi-launch.sh p
-$rofi_screenshot = $script_dir/rofi-launch.sh s
-$rofi_clipboard = $script_dir/rofi-launch.sh c
-$rofi_wallpaper = $script_dir/rofi-launch.sh w
-
 # -----------------------------------------------------
 # Main configuration files
 # -----------------------------------------------------
 
+source = ~/.config/hypr/env.conf
 source = ~/.config/hypr/configs/autostart.conf
 source = ~/.config/hypr/configs/startup.conf
 source = ~/.config/hypr/configs/monitor/export.conf
 source = ~/.config/hypr/configs/animation/export.conf
+source = ~/.config/hypr/configs/layout/export.conf
 source = ~/.config/hypr/configs/input.conf
 source = ~/.config/hypr/configs/mouse.conf
 
@@ -68,6 +27,5 @@ source = ~/.config/hypr/configs/mouse.conf
 source = ~/.config/hypr/configs/settings.conf
 source = ~/.config/hypr/configs/devices.conf
 source = ~/.config/hypr/configs/decoration/export.conf
-source = ~/.config/hypr/configs/layout.conf
 source = ~/.config/hypr/configs/keybinds.conf
 source = ~/.config/hypr/configs/rules.conf