diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template
index beb8da661f..45d1ea462d 100644
--- a/templates/xbps-base-files/template
+++ b/templates/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.17
+version=0.18
 build_style=custom-install
 short_desc="xbps base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/triggers/gtk-icon-cache b/triggers/gtk-icon-cache
index 98034ced60..a2aa6e18e8 100755
--- a/triggers/gtk-icon-cache
+++ b/triggers/gtk-icon-cache
@@ -14,22 +14,23 @@ targets)
 	echo "post-install post-remove"
 	;;
 run)
-	case "$2" in
-	post-install)
-		for dir in ${gtk_iconcache_dirs}; do
-			if [ -x ${iconcache_bin} ]; then
-				echo -n "Updating GTK+ icon cache for "
-				echo -n "${dir}... "
-				${iconcache_bin} -q -f -t ${dir}
-				echo "done."
-			fi
-		done
-		;;
-	post-remove)
+	if [ "$2" = "post-remove" -a "${PKGNAME}" = "gtk+" ]; then
 		for dir in ${gtk_iconcache_dirs}; do
 			if [ -f ${dir}/icon-theme.cache ]; then
 				rm -f ${dir}/icon-theme.cache
-				echo "Removed GTK+ icon theme cache for ${dir}."
+				echo -n "Removed GTK+ icon theme "
+				echo "cache for ${dir}."
+			fi
+		done
+		break
+	fi
+	case "$2" in
+	post-*)
+		for dir in ${gtk_iconcache_dirs}; do
+			if [ -x ${iconcache_bin} ]; then
+				echo -n "Updating GTK+ icon cache for "
+				echo "${dir}..."
+				${iconcache_bin} -q -f -t ${dir}
 			fi
 		done
 		;;
diff --git a/triggers/gtk-immodules b/triggers/gtk-immodules
index 2caa907c43..e1743c4d75 100755
--- a/triggers/gtk-immodules
+++ b/triggers/gtk-immodules
@@ -15,12 +15,12 @@ targets)
 	echo "post-install post-remove"
 	;;
 run)
+	if [ "$2" = "post-remove" -a "${PKGNAME}" = "gtk+" ]; then
+		[ -f ${immodules_db} ] rm -f ${immodules_db}
+		break
+	fi
 	case "$2" in
 	post-*)
-		if [ "${PKGNAME}" = "gtk+" ]; then
-			[ -f ${immodules_db} ] rm -f ${immodules_db}
-			break
-		fi
 		if [ -x ${immodules_bin} ]; then
 			echo "Updating GTK's immodules database..."
 			${immodules_bin} > ${immodules_db}
diff --git a/triggers/gtk-pixbuf-loaders b/triggers/gtk-pixbuf-loaders
index ba10170a33..5b9f83b830 100755
--- a/triggers/gtk-pixbuf-loaders
+++ b/triggers/gtk-pixbuf-loaders
@@ -15,12 +15,12 @@ targets)
 	echo "post-install post-remove"
 	;;
 run)
+	if [ "$2" = "post-remove" -a "${PKGNAME}" = "gtk+" ]; then
+		[ -f ${pixbuf_loaders} ] && rm -f ${pixbuf_loaders}
+		break
+	fi
 	case "$2" in
 	post-*)
-		if [ "${PKGNAME}" = "gtk+" ]; then
-			[ -f ${pixbuf_loaders} ] && rm -f ${pixbuf_loaders}
-			break
-		fi
 		if [ -x ${pixbuf_bin} ]; then
 			echo "Updating GTK's pixbuf modules file..."
 			${pixbuf_bin} > ${pixbuf_loaders}
diff --git a/triggers/pango-modules b/triggers/pango-modules
index 7ad85a564a..691ac31bd5 100755
--- a/triggers/pango-modules
+++ b/triggers/pango-modules
@@ -15,15 +15,15 @@ targets)
 	echo "post-install post-remove"
 	;;
 run)
+	if [ "$2" = "post-remove" -a "${PKGNAME}" = "pango" ]; then
+		if [ -f ${pango_modules} ]; then
+			echo "Removing pango modules file..."
+			rm -f ${pango_modules}
+		fi
+		break
+	fi
 	case "$2" in
 	post-*)
-		if [ "${PKGNAME}" = "pango" ]; then
-			if [ -f ${pango_modules} ]; then
-				echo "Removing pango modules file..."
-				rm -f ${pango_modules}
-			fi
-			break
-		fi
 		if [ -x ${pango_bin} ]; then
 			echo "Updating pango modules file..."
 			${pango_bin} > ${pango_modules}
diff --git a/triggers/update-desktopdb b/triggers/update-desktopdb
index 8d1056d498..36ccf1bd39 100755
--- a/triggers/update-desktopdb
+++ b/triggers/update-desktopdb
@@ -17,12 +17,12 @@ targets)
 	echo "post-install post-remove"
 	;;
 run)
+	if [ "$2" = "post-remove" -a "${PKGNAME}" = "desktop-file-utils" ]; then
+		[ -f ${desktopdb_cache} ] && rm -f ${desktopdb_cache}
+		break
+	fi
 	case "$2" in
 	post-*)
-		if [ "${PKGNAME}" = "desktop-file-utils" ]; then
-			[ -f ${desktopdb_cache} ] && rm -f ${desktopdb_cache}
-			break
-		fi
 		if [ -x ${desktopdb_bin} ]; then
 			echo "Updating MIME database..."
 			${desktopdb_bin} ${desktopdb_dir}
diff --git a/triggers/xml-catalog b/triggers/xml-catalog
index 79518ace7e..493b5c10f2 100755
--- a/triggers/xml-catalog
+++ b/triggers/xml-catalog
@@ -67,7 +67,6 @@ run)
 	[ -n "${sgml_entries}" -a ! -f "${sgml_catalog}" ] && exit 0
 	[ -n "${xml_entries}" -a ! -f "${xml_catalog}" ] && exit 0
 
-	echo "Running $trigger trigger..."
 	case "$2" in
 	post-install)
 		register_entries