diff --git a/etc/environment.d/90tileos-river.conf b/etc/environment.d/90tileos-river.conf
new file mode 100644
index 0000000..530ed1d
--- /dev/null
+++ b/etc/environment.d/90tileos-river.conf
@@ -0,0 +1,17 @@
+# Force Wayland for Mozilla Firefox
+MOZ_ENABLE_WAYLAND=1
+MOZ_DBUS_REMOTE=1
+
+# Force Wayland for Qt apps
+QT_QPA_PLATFORM="wayland;xcb"
+QT_QPA_PLATFORMTHEME=qt5ct
+
+# Set default cursor size
+XCURSOR_SIZE=24
+
+# Force Wayland for EFL (Enlightenment) apps
+ECORE_EVAS_ENGINE="wayland-egl"
+ELM_ACCEL="gl"
+
+# Java XWayland blank screens fix
+_JAVA_AWT_WM_NONREPARENTING=1
diff --git a/etc/skel/.config/river/environment b/etc/skel/.config/river/environment
deleted file mode 100644
index 6b53f94..0000000
--- a/etc/skel/.config/river/environment
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is a part of TileOS configuration for River and will be sourced
-# from /usr/bin/start-river script for all users of the system.
-# User-specific variables should be placed in $XDG_CONFIG_HOME/river/environment
diff --git a/usr/bin/start-river b/usr/bin/start-river
index 6537699..5f6653a 100755
--- a/usr/bin/start-river
+++ b/usr/bin/start-river
@@ -5,21 +5,6 @@ export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 
-# Force Wayland for Mozilla Firefox
-export MOZ_ENABLE_WAYLAND=1
-export MOZ_DBUS_REMOTE=1
-
-# Force Wayland for Qt apps
-export QT_QPA_PLATFORM="wayland;xcb"
-export QT_QPA_PLATFORMTHEME=qt5ct
-
-# Force Wayland for EFL (Enlightenment) apps
-export ECORE_EVAS_ENGINE="wayland-egl"
-export ELM_ACCEL="gl"
-
-# Java XWayland blank screens fix
-export _JAVA_AWT_WM_NONREPARENTING=1
-
 # Check if system is running in virtual machine
 case "$(systemd-detect-virt)" in
 qemu)
@@ -42,11 +27,23 @@ if [ -d /sys/module/nvidia ]; then
     export LIBVA_DRIVER_NAME=nvidia
 fi
 
-## Load user environment customizations
-if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/river/environment" ]; then
+## Load system environment customizations
+if [ -d /etc/environment.d ]; then
     set -o allexport
-    # shellcheck source=/dev/null
-    . "${XDG_CONFIG_HOME:-$HOME/.config}/river/environment"
+    for f in /etc/environment.d/*.conf; do
+        # shellcheck source=/dev/null
+        . "$f"
+    done
+    set +o allexport
+fi
+
+## Load user environment customizations
+if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
+    set -o allexport
+    for i in "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d"/*.conf; do
+        # shellcheck source=/dev/null
+        . "$i"
+    done
     set +o allexport
 fi