Index: startkde.cmake
===================================================================
--- startkde.cmake
+++ startkde.cmake	2011-04-18 19:33:19.988003724 -0300
@@ -9,6 +9,10 @@
     export KWIN_COMPOSE KDE_FAILSAFE
 fi
 
+# make the debug output prettier
+export KDE_COLOR_DEBUG=1
+export QTEST_COLORED=1
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -25,6 +29,24 @@
         exit 1
 fi
 
+if [ "$MGA_MENU_STYLE" = "upstream" ]; then
+    if  [ -z "$XDG_CONFIG_DIRS" ]; then
+        export XDG_CONFIG_DIRS="/etc/xdg/kde4:/etc/xdg"
+    else
+        export XDG_CONFIG_DIRS="/etc/xdg/kde4:$XDG_CONFIG_DIRS"
+    fi
+else
+    if  [ -z "$XDG_CONFIG_DIRS" ]; then
+        export XDG_CONFIG_DIRS="/etc/xdg:/etc/xdg/kde4"
+               XDG_MENU_PREFIX=kde-
+               export  XDG_MENU_PREFIX=kde-
+    else
+        export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg/kde4"
+               XDG_MENU_PREFIX=kde-
+               export  XDG_MENU_PREFIX=kde-
+    fi
+fi
+
 # Set the background to plain grey.
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
@@ -69,7 +91,7 @@
 # The user's personal KDE directory is usually ~/.kde, but this setting
 # may be overridden by setting KDEHOME.
 
-kdehome=$HOME/@KDE_DEFAULT_HOME@
+kdehome=$HOME/.kde4
 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
 
 # see kstartupconfig source for usage
@@ -77,7 +99,7 @@
 mkdir -m 700 -p $kdehome/share
 mkdir -m 700 -p $kdehome/share/config
 cat >$kdehome/share/config/startupconfigkeys <<EOF
-kcminputrc Mouse cursorTheme 'Oxygen_Black'
+kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
 ksplashrc KSplash Theme Default
 ksplashrc KSplash Engine KSplashX
@@ -148,6 +170,9 @@
     Simple)
       ksplash_pid=`ksplashsimple "${ksplashrc_ksplash_theme}" --pid`
       ;;
+    kde4-splash-mdv)
+       ksplash_pid=`kde4-splash-mdv --pid`
+     ;;  
     *)
       ;;
   esac
@@ -168,8 +193,9 @@
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+servicepath=`kde4-config --path services | tr : '\n'`
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` `echo "$servicepath" | sed -n -e 's,/service.*,/env/,p'`; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done