diff --git a/.config/hypr/config/Keybinds.conf b/.config/hypr/config/Keybinds.conf
index c060b8c..5a73fc5 100644
--- a/.config/hypr/config/Keybinds.conf
+++ b/.config/hypr/config/Keybinds.conf
@@ -1,118 +1,5 @@
+$keybindsPath = ~/.config/hypr/config/keybinds
-$mainMod = SUPER
-# Default
-$scriptsDir = $HOME/.config/scripts
-$configs = $HOME/.config/hypr/configs
-
-$files = hyprdrop ghostty --identifier yazi_hyprdrop --args="yazi" --env="PWD=~/"
-$term = ghostty
-$appLauncher = rofi -show drun -show-icons
-
-bind = $mainMod, Q, killactive,
-
-# Special Keys / Hot Keys
-bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc # volume up
-bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec # volume down
-bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic # mic mute
-bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle # mute
-bindl = , xf86Sleep, exec, systemctl suspend # sleep button
-bindl = , xf86Rfkill, exec, $scriptsDir/AirplaneMode.sh # Airplane mode
-
-# media controls using keyboards
-bindl = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
-bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
-bindl = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
-bindl = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
-
-# Move focus with mainMod + LHKJ
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, J, movefocus, d
-
-# Move windows
-#bind = $mainMod SHIFT, H, movewindow, l
-#bind = $mainMod SHIFT, L, movewindow, r
-#bind = $mainMod SHIFT, K, movewindow, u
-#bind = $mainMod SHIFT, J, movewindow, d
-
-# Container layouts
-bind = $mainMod, E, togglesplit
-bind = $mainMod, W, togglegroup
-
-bind = $mainMod SHIFT, Space, togglefloating
-bind = $mainMod SHIFT, Space, pin
-
-# Workspaces
-bind = $mainMod, code:16, workspace, 7
-bind = $mainMod, code:17, workspace, 8
-bind = $mainMod, code:18, workspace, 9
-bind = $mainMod, code:19, workspace, 10
-
-bind = $mainMod, B, workspace, 1
-bind = $mainMod, T, workspace, 2
-bind = $mainMod, C, workspace, 3
-bind = $mainMod, G, workspace, 4
-bind = $mainMod, M, workspace, 5
-bind = $mainMod, P, workspace, 6
-
-# Move active window to a workspace silently mainMod + CTRL [0-9]
-bind = $mainMod SHIFT, code:10, movetoworkspacesilent, 1
-bind = $mainMod SHIFT, code:11, movetoworkspacesilent, 2
-bind = $mainMod SHIFT, code:12, movetoworkspacesilent, 3
-bind = $mainMod SHIFT, code:13, movetoworkspacesilent, 4
-bind = $mainMod SHIFT, code:14, movetoworkspacesilent, 5
-bind = $mainMod SHIFT, code:15, movetoworkspacesilent, 6
-bind = $mainMod SHIFT, code:16, movetoworkspacesilent, 7
-bind = $mainMod SHIFT, code:17, movetoworkspacesilent, 8
-bind = $mainMod SHIFT, code:18, movetoworkspacesilent, 9
-bind = $mainMod SHIFT, code:19, movetoworkspacesilent, 10
-bind = $mainMod SHIFT, bracketleft, movetoworkspacesilent, -1 # brackets [ or ]
-bind = $mainMod SHIFT, bracketright, movetoworkspacesilent, +1
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-bind = $mainMod, bracketright, workspace, e+1
-bind = $mainMod, bracketleft, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod SHIFT, mouse:272, movewindow
-bindm = $mainMod SHIFT, mouse:273, resizewindow
-
-# Stuff
-bind = $mainMod, N, exec, $scriptsDir/LockScreen.sh # screen lock
-bind = , Print, exec, $scriptsDir/screenshot.sh area # screenshot (area)
-bind = , F12, exec, $scriptsDir/screenshot.sh active # screenshot (active window only)
-
-bind = $mainMod SHIFT, N, exec, rofi -show system # swayNC notification panel
-
-bind = , F13, movecurrentworkspacetomonitor, +1
-bind = $mainMod SHIFT, H, movecurrentworkspacetomonitor, +1
-
-bind = $mainMod, F, fullscreen, 1
-bind = $mainMod, Space, fullscreen, 0
-
-# rofi App launcher
-#bind = $mainMod, Tab, exec, nwg-drawer -pbexit "wayland-logout" -pbpoweroff "systemctl poweroff" -pbreboot "systemctl reboot"
-bind = , Home, exec, $appLauncher
-bind = $mainMod, Tab, exec, $appLauncher
-bind = ALT, Tab, exec, rofi -show window -show-icons
-
-bind = $mainMod, Return, exec, $term
-bind = $mainMod Shift, Return, exec, hyprdrop ghostty --identifier term_hyprdrop
-bind = $mainMod, Z, exec, $files
-
-
-bind = $mainMod, R, focusurgentorlast
-bind = $mainMod SHIFT, P, exec, rofi -modes "2fa" -show 2fa
-
-bind = $mainMod, O, exec, killall -USR1 waybar
-
-# Master Layout Keybinds
-bind = $mainMod, A, layoutmsg,swapwithmaster master
-
-bind = $mainMod, F10, exec, rofi -show pactl
-bind = $mainMod SHIFT, T, exec, rofi -show calc
+source = $keybindsPath/WindowMgmt.conf
+source = $keybindsPath/MediaCtrl.conf
+source = $keybindsPath/Applications.conf
diff --git a/.config/hypr/config/Settings.conf b/.config/hypr/config/Settings.conf
index 5c89d4f..80655ec 100644
--- a/.config/hypr/config/Settings.conf
+++ b/.config/hypr/config/Settings.conf
@@ -10,3 +10,4 @@ source = $settingsPath/Binds.conf
source = $settingsPath/Xwayland.conf
source = $settingsPath/Render.conf
source = $settingsPath/Cursor.conf
+source = $settingsPath/Groups.conf
diff --git a/.config/hypr/config/keybinds/Applications.conf b/.config/hypr/config/keybinds/Applications.conf
new file mode 100644
index 0000000..d83d74d
--- /dev/null
+++ b/.config/hypr/config/keybinds/Applications.conf
@@ -0,0 +1,34 @@
+$mainMod = SUPER
+# Default
+$scriptsDir = $HOME/.config/scripts
+$configs = $HOME/.config/hypr/configs
+
+$files = hyprdrop thunar --identifier thunar_hyprdrop
+$term = ghostty
+$appLauncher = rofi -show drun -show-icons
+
+# Toggle waybar visibility
+bind = $mainMod, O, exec, killall -USR1 waybar
+
+# System
+bind = $mainMod, N, exec, $scriptsDir/LockScreen.sh # screen lock
+bind = $mainMod SHIFT, N, exec, rofi -show system # swayNC notification panel
+
+bind = , Print, exec, $scriptsDir/screenshot.sh area # screenshot (area)
+bind = , F12, exec, $scriptsDir/screenshot.sh active # screenshot (active window only)
+
+bind = $mainMod, D, exec, $files
+
+# Rofi
+bind = , Home, exec, $appLauncher
+bind = ALT, Tab, exec, rofi -show window -show-icons
+
+bind = $mainMod SHIFT, O, exec, rofi -modes "2fa" -show 2fa
+
+bind = $mainMod, F10, exec, rofi -show pactl
+bind = , XF86Calculator, exec, rofi -show calc
+
+# Terminal
+bind = $mainMod, Return, exec, $term
+bind = $mainMod Shift, Return, exec, hyprdrop ghostty --identifier term_hyprdrop
+
diff --git a/.config/hypr/config/keybinds/MediaCtrl.conf b/.config/hypr/config/keybinds/MediaCtrl.conf
new file mode 100644
index 0000000..9f4f66e
--- /dev/null
+++ b/.config/hypr/config/keybinds/MediaCtrl.conf
@@ -0,0 +1,17 @@
+$mainMod = SUPER
+
+$scriptsDir = $HOME/.config/scripts
+
+# Special Keys / Hot Keys
+bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc # volume up
+bindel = , xf86audiolowervolume, exec, $scriptsDir/Volume.sh --dec # volume down
+bindl = , xf86AudioMicMute, exec, $scriptsDir/Volume.sh --toggle-mic # mic mute
+bindl = , xf86audiomute, exec, $scriptsDir/Volume.sh --toggle # mute
+
+# media controls using keyboards
+bindl = , xf86AudioPlayPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioPause, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioPlay, exec, $scriptsDir/MediaCtrl.sh --pause
+bindl = , xf86AudioNext, exec, $scriptsDir/MediaCtrl.sh --nxt
+bindl = , xf86AudioPrev, exec, $scriptsDir/MediaCtrl.sh --prv
+bindl = , xf86audiostop, exec, $scriptsDir/MediaCtrl.sh --stop
diff --git a/.config/hypr/config/keybinds/WindowMgmt.conf b/.config/hypr/config/keybinds/WindowMgmt.conf
new file mode 100644
index 0000000..14e522c
--- /dev/null
+++ b/.config/hypr/config/keybinds/WindowMgmt.conf
@@ -0,0 +1,81 @@
+$mainMod = SUPER
+
+bind = $mainMod, Q, killactive,
+# Move focus with mainMod + LHKJ
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, L, movefocus, r
+bind = $mainMod, K, movefocus, u
+bind = $mainMod, J, movefocus, d
+
+# Move windows
+#bind = $mainMod SHIFT, H, movewindow, l
+#bind = $mainMod SHIFT, L, movewindow, r
+#bind = $mainMod SHIFT, K, movewindow, u
+#bind = $mainMod SHIFT, J, movewindow, d
+
+# Container layouts
+
+bind = $mainMod, F, togglefloating
+bind = $mainMod, F, pin
+
+# Workspaces
+bind = $mainMod, B, workspace, 1
+bind = $mainMod, T, workspace, 2
+bind = $mainMod, C, workspace, 3
+bind = $mainMod, G, workspace, 4
+bind = $mainMod, M, workspace, 5
+bind = $mainMod, P, workspace, 6
+
+bind = $mainMod, code:16, workspace, 7
+bind = $mainMod, code:17, workspace, 8
+bind = $mainMod, code:18, workspace, 9
+bind = $mainMod, code:19, workspace, 10
+
+
+# Move active window to a workspace silently mainMod + CTRL [0-9]
+bind = $mainMod SHIFT, B, movetoworkspacesilent, 1
+bind = $mainMod SHIFT, T, movetoworkspacesilent, 2
+bind = $mainMod SHIFT, C, movetoworkspacesilent, 3
+bind = $mainMod SHIFT, G, movetoworkspacesilent, 4
+bind = $mainMod SHIFT, M, movetoworkspacesilent, 5
+bind = $mainMod SHIFT, P, movetoworkspacesilent, 6
+bind = $mainMod SHIFT, code:16, movetoworkspacesilent, 7
+bind = $mainMod SHIFT, code:17, movetoworkspacesilent, 8
+bind = $mainMod SHIFT, code:18, movetoworkspacesilent, 9
+bind = $mainMod SHIFT, code:19, movetoworkspacesilent, 10
+bind = $mainMod SHIFT, bracketleft, movetoworkspacesilent, -1 # brackets [ or ]
+bind = $mainMod SHIFT, bracketright, movetoworkspacesilent, +1
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod, bracketright, workspace, e+1
+bind = $mainMod, bracketleft, workspace, e-1
+
+# Move workspaces
+bind = $mainMod SHIFT, H, movecurrentworkspacetomonitor, +1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod SHIFT, mouse:272, movewindow
+bindm = $mainMod SHIFT, mouse:273, resizewindow
+
+# Master Layout Keybinds
+bind = $mainMod, A, layoutmsg,swapwithmaster master
+
+# Fullscreen handling
+bind = $mainMod, Space, fullscreen, 1
+bind = $mainMod Shift, Space, fullscreen, 0
+
+# Spliting
+$splitingMod = $mainMod CTRL
+bind = $splitingMod, Space, togglegroup
+
+bind = $splitingMod, H, moveintogroup, l
+bind = $splitingMod, L, moveintogroup, r
+bind = $splitingMod, K, moveintogroup, u
+bind = $splitingMod, J, moveintogroup, d
+
+bind = $splitingMod, U, moveoutofgroup, b
+
+bind = $splitingMod, N, changegroupactive, f
+bind = $splitingMod, M, changegroupactive, b
diff --git a/.config/hypr/config/settings/Groups.conf b/.config/hypr/config/settings/Groups.conf
new file mode 100644
index 0000000..bd4efd8
--- /dev/null
+++ b/.config/hypr/config/settings/Groups.conf
@@ -0,0 +1,15 @@
+group {
+ groupbar {
+
+ font_size = 10
+ font_weight_active = bold
+ indicator_height = 5
+
+ rounding_power = 10.0
+ rounding = 4
+
+ gradients = true
+
+ col.active = rgba(ff0000ff) rgba(ff000000)
+ }
+}
diff --git a/.config/hypr/config/settings/Misc.conf b/.config/hypr/config/settings/Misc.conf
index 6630297..d93c267 100644
--- a/.config/hypr/config/settings/Misc.conf
+++ b/.config/hypr/config/settings/Misc.conf
@@ -12,5 +12,7 @@ misc {
focus_on_activate = false
initial_workspace_tracking = 0
middle_click_paste = false
+
+ font_family = JetBrainsMono NF
}
diff --git a/.config/hypr/config/settings/Xwayland.conf b/.config/hypr/config/settings/Xwayland.conf
index 48d4886..7d916d0 100644
--- a/.config/hypr/config/settings/Xwayland.conf
+++ b/.config/hypr/config/settings/Xwayland.conf
@@ -1,4 +1,3 @@
-
xwayland {
enabled = true
force_zero_scaling = true
diff --git a/.config/xdg-desktop-portal/portals.conf b/.config/xdg-desktop-portal/portals.conf
index 5a36bf6..e69de29 100644
--- a/.config/xdg-desktop-portal/portals.conf
+++ b/.config/xdg-desktop-portal/portals.conf
@@ -1,2 +0,0 @@
-[preferred]
-org.freedesktop.impl.portal.FileChooser=termfilechooser
diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
index 4595507..d4bb9af 100644
--- a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
@@ -12,8 +12,8 @@
-
-
+
+