diff --git a/.xinitrc b/.xinitrc
index 11f20f2..d3ddf86 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,8 +1,5 @@
-#!/bin/sh
-export LC_ALL=en_US.UTF-8
-xset b off
-xsetroot -solid '#92F'
-xrdb -merge .Xdefaults
-xterm&
-while sleep 1; do ~/bin/status; done &
-while sleep 1; do /usr/local/bin/dwm; done
+export LC_ALL=C.UTF-8
+export LIBGL_ALWAYS_SOFTWARE=1
+export TERM=xterm-256color
+/usr/X11R6/bin/xterm &
+exec /usr/X11R6/bin/fvwm
diff --git a/.xsession b/.xsession
index 11f20f2..d3ddf86 100755
--- a/.xsession
+++ b/.xsession
@@ -1,8 +1,5 @@
-#!/bin/sh
-export LC_ALL=en_US.UTF-8
-xset b off
-xsetroot -solid '#92F'
-xrdb -merge .Xdefaults
-xterm&
-while sleep 1; do ~/bin/status; done &
-while sleep 1; do /usr/local/bin/dwm; done
+export LC_ALL=C.UTF-8
+export LIBGL_ALWAYS_SOFTWARE=1
+export TERM=xterm-256color
+/usr/X11R6/bin/xterm &
+exec /usr/X11R6/bin/fvwm