diff --git a/assemble_image.sh b/assemble_image.sh
index 5aecfa8a63af6d687cdad37d0555f8269b0341b7..28af9a3f7bde8cfb8bd4b32c40365edd951d8d07 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -124,4 +124,4 @@ set -e
 
 mv /var/cache/manjaro-tools/iso/osak/lip/*/*.iso "$WORKSPACE"
 
-# vim: tabstop=2 shiftwidth=2 expandtab number
+# vim: tabstop=2 shiftwidth=2 expandtab
diff --git a/calamares-packages.conf b/calamares-packages.conf
index 09f7418d2148abd5678a820e7c81c03340d30d66..1cfed68b4ce178c7cf9aaed8e2cae6976a28592d 100644
--- a/calamares-packages.conf
+++ b/calamares-packages.conf
@@ -2,3 +2,6 @@ backend: pacman
 skip_if_no_internet: false
 update_db: false
 update_system: false
+
+
+# vim: filetype=yaml tabstop=2 shiftwidth=2 expandtab
diff --git a/calamares-settings.conf b/calamares-settings.conf
index 1b72ce351f64149bfbf96b1ddea9578cfc8d54f0..21a184d80fe9fbf0fa2cf75e06b002bbe44b0fec 100644
--- a/calamares-settings.conf
+++ b/calamares-settings.conf
@@ -63,3 +63,5 @@ oem-setup: false
 disable-cancel: false
 disable-cancel-during-exec: true
 quit-at-end: false
+
+# vim: filetype=yaml tabstop=2 shiftwidth=2 expandtab
diff --git a/extract_iso_fs.sh b/extract_iso_fs.sh
index c5e340cceb825ab33c993279313fe5b87c131ee6..d4f14d11045a400f7df6ce4e8ba07fa948d73834 100755
--- a/extract_iso_fs.sh
+++ b/extract_iso_fs.sh
@@ -16,3 +16,5 @@ unsquashfs -dest "$DEST/rootfs" "$MOUNTED_ISO/manjaro/x86_64/rootfs.sfs"
 umount "$MOUNTED_ISO"
 losetup --detach "$LOOP"
 rm -d "$MOUNTED_ISO"
+
+# vim: tabstop=2 shiftwidth=2 expandtab