3 files changed, 13 insertions, 9 deletions
diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/configs/ENVariables.conf
index e8a51555..1148384a 100644
--- a/config/hypr/configs/ENVariables.conf
+++ b/config/hypr/configs/ENVariables.conf
@@ -22,7 +22,7 @@ env = CLUTTER_BACKEND,wayland
 #env = SDL_VIDEODRIVER,wayland
 
 ### XDG Specifications ###
-# Trying to fix flatpak not being seen in rofi this fix below errors 
+# Trying to fix flatpak not being seen in rofi this fix below errors
 #env = XDG_DATA_DIRS,/usr/local/share:/usr/share:$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/$USER/.local/share/flatpak/exports/share
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
@@ -32,7 +32,6 @@ env = XDG_SESSION_TYPE,wayland
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_STYLE_OVERRIDE,Fusion
 
 ### hyprland-qt-support ###
 # Keep a safe default. copy.sh switches this to org.hyprland.style when the
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index db666f2f..f65fb401 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -24,11 +24,11 @@ bindd = $mainMod, A, Desktop overview, exec, $scriptsDir/OverviewToggle.sh # tog
 #bindd = $mainMod, A, Ags overview, exec, pkill rofi || true && ags -t 'overview' # desktop overview (if installed)
 #bindd = $mainMod, A, Quickshell overview, global, quickshell:overviewToggle # desktop overview (if installed)
 bindd = $mainMod, Return, Open terminal, exec, $scriptsDir/LaunchTerminal.sh "$term"
-bindd = $mainMod, E, File manager, exec, $scriptsDir/LaunchFileManager.sh "$files" "$term"
+bindd = $mainMod, T, File manager, exec, $scriptsDir/LaunchFileManager.sh "$files" "$term"
 bindd = $mainMod, C, SSH session manager, exec, $scriptsDir/rofi-ssh-menu.sh
 
 # FEATURES / EXTRAS
-bindd = $mainMod, T, Global theme switcher using Wallust, exec, $scriptsDir/ThemeChanger.sh #Global theme switcher
+bindd = $mainMod, E, Global theme switcher using Wallust, exec, $scriptsDir/ThemeChanger.sh #Global theme switcher
 bindd = $mainMod, H, Help / cheat sheet, exec, $scriptsDir/KeyHints.sh
 bindd = $mainMod ALT, R, Refresh bar and menus, exec, $scriptsDir/Refresh.sh
 bindd = $mainMod ALT, E, Emoji menu, exec, $scriptsDir/RofiEmoji.sh
@@ -40,14 +40,19 @@ bindd = $mainMod ALT, L, Toggle layouts, exec, $scriptsDir/ChangeLayout.sh toggl
 bindd = $mainMod ALT, V, Clipboard manager, exec, $scriptsDir/ClipManager.sh
 bindd = $mainMod CTRL, R, Rofi theme selector, exec, $scriptsDir/RofiThemeSelector.sh
 bindd = $mainMod CTRL SHIFT, R, Rofi theme selector (modified), exec, pkill rofi || true && $scriptsDir/RofiThemeSelector-modified.sh
-bindd = $mainMod CTRL, K, Kitty theme selector, exec, $scriptsDir/Kitty_themes.sh  
-bindd = $mainMod CTRL, G, Ghostty theme selector, exec, $scriptsDir/Ghostty_themes.sh  
+bindd = $mainMod CTRL, K, Kitty theme selector, exec, $scriptsDir/Kitty_themes.sh
+bindd = $mainMod CTRL, G, Ghostty theme selector, exec, $scriptsDir/Ghostty_themes.sh
 bindd = $mainMod SHIFT, B, Set static Rainbow Border, exec, $UserScripts/RainbowBorders-low-cpu.sh  --run-once
 bindd = $mainMod SHIFT, H, Toggle Mute/Unmute for Active-Window, exec, $scriptsDir/Toggle-Active-Window-Audio.sh
 bindd =  ALT SHIFT, S, Hyprshot Screen Capture, exec, $scriptsDir/hyprshot.sh -m region -o $HOME/Pictures/Screenshots
 
+<<<<<<< HEAD
+bindd = $mainMod ,F , Fullscreen, fullscreen
+bindd = $mainMod SHIFT, F, Maximize window, fullscreen, 1
+=======
 bindd = $mainMod SHIFT, F, Fullscreen, fullscreen
 bindd = $mainMod, F, Maximize window, fullscreen, 1
+>>>>>>> upstream
 bindd = $mainMod, SPACE, Float current window, togglefloating,
 bindd = $mainMod ALT, SPACE, Float all windows, exec, $scriptsDir/Float-all-Windows.sh
 # NOTE: Dropterminal is currently certified only with kitty. Not all terminals behave correctly as a dropdown.
@@ -117,9 +122,9 @@ bindd = $mainMod ALT, 2, Layout master, exec, $scriptsDir/ChangeLayout.sh master
 bindd = $mainMod ALT, 3, Layout scrolling, exec, $scriptsDir/ChangeLayout.sh scrolling
 bindd = $mainMod ALT, 4, Layout monocle, exec, $scriptsDir/ChangeLayout.sh monocle
 
-# Scrolling Layout 
+# Scrolling Layout
 bindd = $mainMod SHIFT, period, Move to right column, layoutmsg, move +col
-bindd = $mainMod SHIFT, comma, Move to left column, layoutmsg, move -col 
+bindd = $mainMod SHIFT, comma, Move to left column, layoutmsg, move -col
 bindd = $mainMod ALT, comma, Swap columns left, layoutmsg, swapcol l
 bindd = $mainMod ALT, period, Swap columns right, layoutmsg, swapcol r
 bindd = $mainMod, R, Cycle column width preset (scrolling), exec, bash $scriptsDir/ScrollCycleColumnWidth.sh
diff --git a/config/hypr/configs/SystemSettings.conf b/config/hypr/configs/SystemSettings.conf
index 6db89ef8..40389096 100644
--- a/config/hypr/configs/SystemSettings.conf
+++ b/config/hypr/configs/SystemSettings.conf
@@ -117,7 +117,7 @@ misc {
   disable_splash_rendering = true
   force_default_wallpaper = false
   # vfr = true     # Not supported past v0.54.3
-  vrr = 0    # Disabling by default causes MPV to black screen when maximixes 
+  vrr = 0    # Disabling by default causes MPV to black screen when maximixes
              #vrr = 0,disabled, 1, alweays on, 2, only on when fullscreen
   mouse_move_enables_dpms = true
   enable_swallow = off