--- compiz-start	2008-02-02 20:19:52.000000000 -0800
+++ compiz-start	2008-02-02 20:47:25.000000000 -0800
@@ -30,12 +30,32 @@ 
 	export LIBGL_ALWAYS_INDIRECT=1
 fi
 
-if [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then
+gtkdec=`ps ux|grep metacity|grep -v grep`
+kdedec=`ps ux|grep kwin|grep -v grep`
+
+
+if [ ! $1 = "" ]; then
+     if [ $1 = "kde" ] && [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then
 	echo Using KDE decorator
 	kde-window-decorator --replace &
+    elif [ $1 = "gtk" ]; then
+	echo Using GTK decorator
+	gtk-window-decorator --replace &
+    else
+        echo Using emerald decorator
+	emerald --replace &   
+    fi
 else
+    if [ ! "$gtkdec" = "" ]; then
 	echo Using GTK decorator
 	gtk-window-decorator --replace &
+    elif [ ! "$kdedec" = "" ]; then
+	if [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then
+	    echo Using KDE decorator
+	    kde-window-decorator --replace &
+	fi
+    fi
 fi
 
-compiz $COMPIZ_OPTIONS gconf move resize minimize place decoration wobbly fade cube rotate scale switcher zoom dbus
+compiz $COMPIZ_OPTIONS ccp
+