diff --git a/hypr/conf/environments/default.conf b/hypr/conf/environments/default.conf
index 60b23a9..a2d09c4 100644
--- a/hypr/conf/environments/default.conf
+++ b/hypr/conf/environments/default.conf
@@ -2,11 +2,4 @@
 # Environment Variables
 # name: "Default"
 # ----------------------------------------------------- 
-
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = QT_QPA_PLATFORM,wayland
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1
+# Set in ml4w.conf
\ No newline at end of file
diff --git a/hypr/conf/environments/kvm.conf b/hypr/conf/environments/kvm.conf
index 11c5870..7f5494c 100644
--- a/hypr/conf/environments/kvm.conf
+++ b/hypr/conf/environments/kvm.conf
@@ -2,13 +2,5 @@
 # Environment Variables
 # name: "KVM"
 # ----------------------------------------------------- 
-
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = QT_QPA_PLATFORM,wayland
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1
 env = WLR_RENDERER_ALLOW_SOFTWARE, 1
 env = WLR_NO_HARDWARE_CURSORS, 1
\ No newline at end of file
diff --git a/hypr/conf/ml4w.conf b/hypr/conf/ml4w.conf
index 8c90684..162daf4 100644
--- a/hypr/conf/ml4w.conf
+++ b/hypr/conf/ml4w.conf
@@ -2,10 +2,12 @@
 # ML4W configurations
 # ----------------------------------------------------- 
 
+# OpenAI ChatGPT floating
 windowrulev2 = float,class:(.*chat.openai.com.*)
 windowrulev2 = size 500 50%,class:(.*chat.openai.com.*)
 windowrulev2 = move 20 70,class:(.*chat.openai.com.*)
 
+# ML4W Welcome App floating
 windowrulev2 = float,class:(com.ml4w.welcome)
 windowrulev2 = size 700 600,class:(com.ml4w.welcome)
 windowrulev2 = center,class:(com.ml4w.welcome)
@@ -14,6 +16,7 @@ windowrulev2 = float,class:(ml4w-welcome.py)
 windowrulev2 = size 400 500,class:(ml4w-welcome.py)
 windowrulev2 = center,class:(ml4w-welcome.py)
 
+# ML4W Settings App floating
 windowrulev2 = float,class:(com.ml4w.dotfilessettings)
 windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings)
 windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings)
@@ -22,6 +25,7 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)
 
+# ML4W Hyprland App floating
 windowrulev2 = float,class:(com.ml4w.hyprland.settings)
 windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
 windowrulev2 = center,class:(com.ml4w.hyprland.settings)
@@ -30,10 +34,31 @@ windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
 windowrulev2 = center,class:(ml4w-hyprland-settings.py)
 
+# General floating
 windowrulev2 = float,class:(dotfiles-floating)
 windowrulev2 = size 1000 800,class:(dotfiles-floating)
 windowrulev2 = center,class:(dotfiles-floating)
 
-env = APPIMAGELAUNCHER_DISABLE,1
-env = XCURSOR_SIZE,24
+# XDG Desktop Portal
 env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+# QT
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_QPA_PLATFORMTHEME,qt6ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+
+# GTK
+env = GDK_SCALE,1
+
+# Mozilla
+env = MOZ_ENABLE_WAYLAND,1
+
+# Set the cursor size for xcursor
+env = XCURSOR_SIZE,24
+
+# Disable appimage launcher by default
+env = APPIMAGELAUNCHER_DISABLE,1
+