diff --git a/x-ui.sh b/x-ui.sh
index 05ef0064c..81822b9d2 100755
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -1,37 +1,211 @@
 #!/bin/sh
 
-#Xephyr :1 -noreset -ac -br -dpi 142 -screen 240x320x16 &
-#Xephyr :1 -noreset -ac -br -dpi 142 -screen 320x240x16 &
-#Xephyr :1 -noreset -ac -br -dpi 186 -screen 272x480x16 &
-#Xephyr :1 -noreset -ac -br -dpi 186 -screen 480x272x16 &
-#Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320x16 &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 320x480x16 -host-cursor &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 &
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 -host-cursor &
+DPI=${DPI:-142}
+SCREEN=${SCREEN:-240x320}
+PROFILE=${PROFILE:-illume-home}
+VERBOSE=${VERBOSE:-0}
+VALGRIND=${VALGRIND}
+VALGRIND_LOG_FILE=${VALGRIND_LOG_FILE}
+MASSIF=${MASSIF}
+CALLGRIND=${CALLGRIND}
+HOST_CURSOR=${HOST_CURSOR}
+TEST_HOME=${TEST_HOME}
 
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 960x400x16 -host-cursor &
+show_help()
+{
+    cat <<HELP_EOF
+Usage:
 
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x800 -host-cursor &
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 &
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 &
-#Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320 &
-#Xephyr :1 -noreset -ac -br -dpi 186 -screen 272x480 &
-Xephyr :1 -noreset -ac -br -dpi 142 -screen 240x320 &
-#Xephyr :1 -noreset -ac -br -dpi 142 -screen 240x240 -host-cursor &
+   $0 [options]
+
+where options are:
+
+  -c, --host-cursor        Uses host-cursor, otherwise uses Xephyr's.
+  -d, --dpi=NUMBER         states the dots-per-inch to be used.
+  -s, --screen=SPEC        WIDTHxHEIGHT[xDEPTH] to be used.
+  -p, --profile=NAME       Enlightenment profile name.
+  -e, --empty-home[=PATH]  Run with \$HOME being a new, empty directory at /tmp
+
+
+Debugger options:
+
+  --valgrind=MODE      Run under valgrind to check for memory problems.
+                       Same value as enlightenment_start, mode is "OR" of:
+                          1 = plain valgrind to catch crashes (default)
+                          2 = trace children (thumbnailer, efm slaves, ...)
+                          4 = check leak
+                          8 = show reachable after processes finish.
+                        all = all of above
+  --valgrind-log-file=FILENAME
+                       Save valgrind log to file, see valgrind's
+                       --log-file for details.
+  --massif             Run under massif valgrind tool.
+  --callgrind          Run under callgrind valgrind tool.
+
+
+Misc options:
+  -v, --verbose            Be verbose about what is being done.
+  -h, --help               Show this help.
+
+
+Useful or common options:
+
+    --dpi=142 --screen=240x320x16
+    --dpi=142 --screen=320x240x16
+    --dpi=186 --screen=272x480x16
+    --dpi=186 --screen=480x272x16
+    --dpi=181 --screen=320x320x16
+    --dpi=183 --screen=320x480x16 --host-cursor
+    --dpi=183 --screen=480x320x16 --host-cursor
+    --dpi=183 --screen=480x800x16
+    --dpi=183 --screen=800x480x16
+    --dpi=284 --screen=480x640x16
+    --dpi=284 --screen=640x480x16 --host-cursor
+    --dpi=183 --screen=960x400x16 --host-cursor
+    --dpi=284 --screen=480x800 --host-cursor
+    --dpi=284 --screen=480x640
+    --dpi=284 --screen=640x480
+    --dpi=181 --screen=320x320
+    --dpi=186 --screen=272x480
+    --dpi=142 --screen=240x320
+    --dpi=142 --screen=240x240 --host-cursor
+
+HELP_EOF
+}
+
+while [ $# -gt 0 ]; do
+    arg=$1
+    shift
+    option=`echo "'$arg'" | cut -d'=' -f1 | tr -d "'"`
+    value=`echo "'$arg'" | cut -d'=' -f2- | tr -d "'"`
+    if [ x"$value" = x"$option" ]; then
+        value=""
+    fi
+
+    case $option in
+        -h|-help|--help)
+            show_help
+            exit 0
+            ;;
+        -v|-verbose|--verbose)
+            VERBOSE=1
+            ;;
+        -e|-empty-home|--empty-home)
+            if [ -z "$value" ]; then
+                TEST_HOME="/tmp/e-test-${USER:-$UID}"
+            else
+                TEST_HOME="$value"
+            fi
+            ;;
+        -d|-dpi|--dpi)
+            if [ -z "$value" ]; then
+                value=$1
+                shift
+            fi
+            DPI=$value
+            ;;
+        -s|-screen|--screen)
+            if [ -z "$value" ]; then
+                value=$1
+                shift
+            fi
+            SCREEN=$value
+            ;;
+        -p|-profile|--profile)
+            if [ -z "$value" ]; then
+                value=$1
+                shift
+            fi
+            PROFILE=$value
+            ;;
+        -c|-host-cursor|--host-cursor)
+            HOST_CURSOR="-host-cursor"
+            ;;
+        -valgrind|--valgrind)
+            if [ -z "$value" ]; then
+                value=$1
+                shift
+            fi
+            VALGRIND=$value
+            ;;
+        -valgrind-log-file|--valgrind-log-file)
+            if [ -z "$value" ]; then
+                value=$1
+                shift
+            fi
+            VALGRIND_LOG_FILE=$value
+            ;;
+        -massif|--massif)
+            MASSIF="1"
+            ;;
+        -callgrind|--callgrind)
+            CALLGRIND="1"
+            ;;
+        *)
+            echo "Unknown option: $option" 1>&2
+            ;;
+    esac
+done
+
+debuggers=0
+
+if [ ! -z "$MASSIF" ]; then
+    DEBUGGER="-massif"
+    ((debuggers++))
+fi
+
+if [ ! -z "$CALLGRIND" ]; then
+    DEBUGGER="-callgrind"
+    ((debuggers++))
+fi
+
+if [ ! -z "$VALGRIND" ]; then
+    DEBUGGER="-valgrind=$VALGRIND"
+    ((debuggers++))
+fi
+
+if [ $debuggers -gt 1 ]; then
+    echo "WARNING: more than one debugger specified. Using $DEBUGGER" 1>&2
+fi
+
+if [ ! -z "$TEST_HOME" ]; then
+    if [ "${TEST_HOME#/tmp/}" != "$TEST_HOME" ]; then
+        # just delete if inside /tmp
+        rm -fr "$TEST_HOME/"
+    fi
+    mkdir -p "$TEST_HOME"
+fi
+
+unset E_RESTART E_START E_IPC_SOCKET E_START_TIME E_CONF_PROFILE
+
+if [ $VERBOSE -ne 0 ]; then
+    cat <<EOF
+Using:
+
+   DPI=$DPI
+   SCREEN=$SCREEN
+   PROFILE=$PROFILE
+   HOST_CURSOR=$HOST_CURSOR
+   DEBUGGER=$DEBUGGER
+      VALGRIND=$VALGRIND
+      VALGRIND_LOG_FILE=$VALGRIND_LOG_FILE
+      MASSIF=$MASSIF
+      CALLGRIND=$CALLGRIND
+   TEST_HOME=$TEST_HOME
+EOF
+    set -x
+fi
+
+Xephyr :1 -noreset -ac -br -dpi $DPI -screen $SCREEN $HOST_CURSOR &
 
 sleep 1
 export DISPLAY=:1
-#export E_CONF_PROFILE=illume-home
-#valgrind --db-attach=yes --leak-check=full --leak-resolution=high --num-callers=32 \
-#enlightenment \
-unset E_RESTART E_START E_IPC_SOCKET E_START_TIME E_CONF_PROFILE
+[ ! -z "$TEST_HOME" ] && export HOME="$TEST_HOME"
 enlightenment_start \
--no-precache \
--i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it \
--profile illume-home
+    -no-precache \
+    -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it \
+    -profile $PROFILE \
+    $DEBUGGER
 
 #-fake-xinerama-screen 480x400+0+0 \
 #$-fake-xinerama-screen 480x400+480+0