diff --git a/config.sh b/config.sh
index 89dcf87..f36478e 100644
--- a/config.sh
+++ b/config.sh
@@ -154,7 +154,7 @@ baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER $displaymanager
 # boo#1039756
 [ "$desktop" = "gnome" ] && baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM gnome
 
-#Disable journal write to disk in live mode, bug 950999
+# Disable journal write to disk in live mode, bug 950999
 echo "Storage=volatile" >> /etc/systemd/journald.conf
 
 # Remove generated files (boo#1098535)
@@ -163,7 +163,6 @@ rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random
 # Remove netronome firmware (part of kernel-firmware): this sums up to 125MB
 rm -rf /lib/firmware/netronome/
 
-
 cat >/etc/systemd/system/fixupbootloader.service <<EOF
 # boo#1155545 - LOADER_TYPE has to be nil for the upgrade to work properly.
 # Kiwi does not allow changing the file directly, so do it in this ugly way.
diff --git a/list-common.sh b/list-common.sh
index ec256f8..72069de 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -190,12 +190,20 @@ buildignore open-vm-tools
 # Pulls in tcl
 buildignore usb_modeswitch
 
+# Make vim smaller
+buildignore vim-data
+if [ "$distro" = "tumbleweed" ]; then
+        buildignore vim
+        install vim-small
+fi
+
 # This was previously required by base
 install patterns-yast-yast2_basis
 installPattern yast2_basis
 
 # This was previously required by rest_cd_core
 install kernel-default
+# The compressed (-all) version results in a bigger .iso!
 install kernel-firmware
 install patterns-base-enhanced_base
 installPattern enhanced_base
diff --git a/list-gnome.sh b/list-gnome.sh
index d06021f..77e2130 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -44,9 +44,6 @@ buildignore gnome-software
 # Pulls in color management tools
 buildignore gnome-control-center-color
 
-# We need space - more space
-buildignore vim-data
-
 # 17 MiB, really?
 buildignore libgweather-lang
 buildignore gnome-user-docs
diff --git a/list-x11.sh b/list-x11.sh
index 9756c9e..0f48bdc 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -47,11 +47,6 @@ buildignore avahi
 buildignore fprintd
 buildignore accountsservice
 buildignore MozillaFirefox
-buildignore vim-data
-if [ "$distro" = "tumbleweed" ]; then
-	buildignore vim
-	install vim-small
-fi
 buildignore tcpdump
 
 install gparted
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 9b76918..90f59d8 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -317,6 +317,8 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
@@ -471,8 +473,6 @@
     <ignore name="gnome-software"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
-    <package name="aaa_base" replaces="vim-data"/>
-    <ignore name="vim-data"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
     <ignore name="libgweather-lang"/>
     <package name="aaa_base" replaces="gnome-user-docs"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index edc3e7c..207f40e 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -317,6 +317,8 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index fa77cc0..38de878 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -317,6 +317,8 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
@@ -492,8 +494,6 @@
     <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
-    <package name="aaa_base" replaces="vim-data"/>
-    <ignore name="vim-data"/>
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index a5a6d22..a666e71 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -12,6 +12,13 @@ Fri Oct 30 10:10:31 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
   and then not consume it.
 - Use tr [:lower:] [:upper:] instead of tr a-z A-Z.
 
+-------------------------------------------------------------------
+Wed Oct 14 08:36:12 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop set -e, it breaks when there's a conditional experssion as
+  last statement in a file
+- Use vim-small for non-Rescue as well
+
 -------------------------------------------------------------------
 Mon Sep  7 09:07:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index e8b0dfe..923c08e 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -317,6 +317,11 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
@@ -462,8 +467,6 @@
     <ignore name="gnome-software"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
-    <package name="aaa_base" replaces="vim-data"/>
-    <ignore name="vim-data"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
     <ignore name="libgweather-lang"/>
     <package name="aaa_base" replaces="gnome-user-docs"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index a71a6a3..368f7bb 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -317,6 +317,11 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 3657c77..305b7dc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -317,6 +317,11 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
@@ -483,11 +488,6 @@
     <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
-    <package name="aaa_base" replaces="vim-data"/>
-    <ignore name="vim-data"/>
-    <package name="aaa_base" replaces="vim"/>
-    <ignore name="vim"/>
-    <package name="vim-small"/>
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 1200b0b..dfcc640 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -317,6 +317,11 @@
     <ignore name="open-vm-tools"/>
     <package name="aaa_base" replaces="usb_modeswitch"/>
     <ignore name="usb_modeswitch"/>
+    <package name="aaa_base" replaces="vim-data"/>
+    <ignore name="vim-data"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
+    <package name="vim-small"/>
     <package name="patterns-yast-yast2_basis"/>
     <namedCollection name="yast2_basis"/>
     <package name="kernel-default"/>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index cc02330..45c2c6d 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -50,7 +50,7 @@ for distro in leap tumbleweed; do
 		else
 			name="${distroname} ${uppercaseflavor} Live"
 		fi
-	
+
 		PACKAGES="\n    <!-- list-common.sh -->"
 		. "$PWD/list-common.sh"
 		PACKAGES="$PACKAGES\n\n    <!-- list-${flavor}.sh -->"