diff --git a/.config/hypr/configs/env.conf b/.config/hypr/configs/env.conf
new file mode 100644
index 00000000..b4ac6f2e
--- /dev/null
+++ b/.config/hypr/configs/env.conf
@@ -0,0 +1,17 @@
+# XDG
+envd = XDG_CURRENT_DESKTOP, Hyprland
+envd = XDG_SESSION_TYPE, wayland
+envd = XDG_SESSION_DESKTOP, Hyprland
+
+# QT
+env = QT_QPA_PLATFORMTHEME, qt5ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION, 1
+env = QT_AUTO_SCREEN_SCALE_FACTOR, 1
+
+# Tearing
+env = WLR_DRM_NO_ATOMIC, 1
+
+# Themes
+env = GTK_THEME, Catppuccin-Macchiato-Standard-Lavender-Dark
+env = XCURSOR_THEME, Catppuccin-Macchiato-Dark-Cursors
+env = XCURSOR_SIZE, 24
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 09d4b663..158ed01d 100755
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,4 +1,5 @@
 # Configs (change to whichever config you want to use)
+source = ~/.config/hypr/configs/env.conf
 source = ~/.config/hypr/configs/binds.conf
 source = ~/.config/hypr/configs/monitors.conf
 source = ~/.config/hypr/configs/workspaces.conf
@@ -7,10 +8,6 @@ source = ~/.config/hypr/configs/workspaces.conf
 exec-once = $HOME/.config/hypr/scripts/autostart/services
 exec-once = $HOME/.config/hypr/scripts/autostart/apps
 
-# Environment Variables
-env = QT_QPA_PLATFORMTHEME, qt5ct
-env = WLR_DRM_NO_ATOMIC, 1
-
 # Theme (change to whichever theme you want to use)
 source = ~/.config/hypr/themes/luna/theme.conf
 source = ~/.config/hypr/themes/luna/rules.conf
diff --git a/.config/hypr/scripts/autostart/services b/.config/hypr/scripts/autostart/services
index 20165be7..ff5edd8b 100755
--- a/.config/hypr/scripts/autostart/services
+++ b/.config/hypr/scripts/autostart/services
@@ -33,14 +33,9 @@ swayidle &
 wl-clip-persist --clipboard regular &
 wl-paste --watch cliphist store &
 
-# Gnome polkit authentication
+# Polkit authentication
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 
-# umm is this unnecessary?
-dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
-dbus-update-activation-environment --systemd --all &
-systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
-
 # Screen sharing and portals
 "$scripts"/launch_portals &
 xwaylandvideobridge &