diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 82e8756..ba4a6d1 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -51,7 +51,6 @@
     <package name="live-langset-data"/>
     <package name="live-add-yast-repos"/>
     <archive name="livecd-udev.tar.xz"/>
-    <archive name="xfce-changecontrolxml.tar.xz"/>
     
     <!-- list-common.sh -->
     <package name="aaa_base" replaces="gutenprint"/>
@@ -359,6 +358,7 @@
     <package name="aaa_base" replaces="fprintd"/>
     <ignore name="fprintd"/>
     <package name="libxslt-tools"/>
+    <archive name="xfce-changecontrolxml.tar.xz"/>
     <package name="aaa_base" replaces="sound-juicer"/>
     <ignore name="sound-juicer"/>
     <package name="aaa_base" replaces="remmina"/>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 3be8e0f..84c7b33 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -26,6 +26,10 @@ installPattern() {
 	PACKAGES="$PACKAGES\n    <namedCollection name=\"$1\"/>"
 }
 
+archive() {
+	PACKAGES="$PACKAGES\n    <archive name=\"$1\"/>"
+}
+
 for distro in leap tumbleweed; do
 	distroname="openSUSE Tumbleweed"
 	if [ "${distro}" = "leap" ]; then
@@ -35,22 +39,22 @@ for distro in leap tumbleweed; do
 	for flavor in gnome kde xfce x11; do
 		uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
 	
-	        if [ "${flavor}" = "x11" ]; then
-	            name="${distroname} Rescue CD"
-	        else
-	            name="${distroname} ${uppercaseflavor} Live"
-	        fi
+	if [ "${flavor}" = "x11" ]; then
+		name="${distroname} Rescue CD"
+	else
+		name="${distroname} ${uppercaseflavor} Live"
+	fi
 	
-	        PACKAGES="\n    <!-- list-common.sh -->"
-		. "$PWD/list-common.sh"
-	        PACKAGES="$PACKAGES\n\n    <!-- list-${flavor}.sh -->"
-		. "$PWD/list-${flavor}.sh"
+	PACKAGES="\n    <!-- list-common.sh -->"
+	. "$PWD/list-common.sh"
+	PACKAGES="$PACKAGES\n\n    <!-- list-${flavor}.sh -->"
+	. "$PWD/list-${flavor}.sh"
 
-	    [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
+	[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
 		sed "s#@FLAVOR@#${flavor}#g;\
-	             s#@NAME@#${name// /-}#g;\
-	             s#@DISPLAYNAME@#${name}#g;\
-	             s#@VOLID@#${name// /_}#g;\
-	             s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi      
+		     s#@NAME@#${name// /-}#g;\
+		     s#@DISPLAYNAME@#${name}#g;\
+		     s#@VOLID@#${name// /_}#g;\
+		     s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi      
 	done
 done