diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf
index 59f797c89..3c487cba2 100644
--- a/etc/archboot/aarch64.conf
+++ b/etc/archboot/aarch64.conf
@@ -15,9 +15,9 @@ archboot_acpi archboot_motd \
 archboot_hwdetect block archboot_net  \
 keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
 encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
-archboot_pppoe archboot_grub_arm archboot_efibootmgr archboot_iptables archboot_pciutils archboot_usbutils \
+archboot_pppoe archboot_grub archboot_efibootmgr archboot_iptables archboot_pciutils archboot_usbutils \
 archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless_arm archboot_wireless_staging \
-archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim_arm archboot_wipe archboot_testdisk archboot_ddrescue \
+archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
 archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
 archboot_hypervisor archboot_amd_ucode archboot_wvdial \
 archboot_usb_modeswitch archboot_secure_boot_arm archboot_efivar archboot_lshw)
diff --git a/usr/lib/initcpio/install/archboot_grub b/usr/lib/initcpio/install/archboot_grub
index a601e317f..a62a7e017 100644
--- a/usr/lib/initcpio/install/archboot_grub
+++ b/usr/lib/initcpio/install/archboot_grub
@@ -24,11 +24,18 @@ build ()
         add_file "$i"
     done
     
-    # add bios and x86_64-efi files
-    # i386 efi is very rare. They are only used in old Macs, 
-    # in which the kernel itself has issues booting in EFI mode
-    add_full_dir /usr/lib/grub/i386-pc  
-    add_full_dir /usr/lib/grub/x86_64-efi
+    if [[ "$(uname -m)" == "x86_64" ]]; then
+        # add bios and x86_64-efi files
+        # i386 efi is very rare. They are only used in old Macs, 
+        # in which the kernel itself has issues booting in EFI mode
+        add_full_dir /usr/lib/grub/i386-pc  
+        add_full_dir /usr/lib/grub/x86_64-efi
+    fi
+    
+    if [[ "$(uname -m)" == "aarch64" ]]; then
+        # add aarch64 arm64-efi files
+        add_full_dir /usr/lib/grub/arm64-efi
+    fi
     
     ## add grub(2) unicode font file
     add_file "/usr/share/grub/unicode.pf2"
diff --git a/usr/lib/initcpio/install/archboot_vim b/usr/lib/initcpio/install/archboot_vim
index e4cca576c..423362610 100644
--- a/usr/lib/initcpio/install/archboot_vim
+++ b/usr/lib/initcpio/install/archboot_vim
@@ -19,7 +19,6 @@ build ()
     done
     # fix colors
     [[ -e "/usr/share/vim/vim82/colors/lists/default.vim" ]] && add_file "/usr/share/vim/vim82/colors/lists/default.vim"
-    add_file "/usr/share/vim/vim82/rgb.txt"
     add_file "/usr/share/licenses/vim/license.txt"
     add_full_dir "/usr/share/vim/vim82/autoload/dist"
 }
diff --git a/usr/lib/initcpio/install/archboot_vim_arm b/usr/lib/initcpio/install/archboot_vim_arm
deleted file mode 100644
index 423362610..000000000
--- a/usr/lib/initcpio/install/archboot_vim_arm
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-build ()
-{
-    add_binary "vim"
-    add_file "/etc/vimrc"
-    # fix vi symlink
-    add_symlink "/usr/bin/vi" "/usr/bin/vim"
-    add_file "/usr/share/vim/vimfiles/archlinux.vim"
-    VIM_MODULE="syntax conf dosini sh grub manual synload colortest syncolor hitest whitespace nosyntax resolv fstab bash zsh exports passwd sysctl systemd vim"
-    for i in ${VIM_MODULE}; do
-        [[ -e "/usr/share/vim/vim82/syntax/$i.vim" ]] && add_file "/usr/share/vim/vim82/syntax/$i.vim"
-        [[ -e "/usr/share/vim/vim82/indent/$i.vim" ]] && add_file "/usr/share/vim/vim82/indent/$i.vim"
-    done
-    VIM_BASIC_MODULE="defaults filetype indent indoff menu scripts synmenu"
-    for i in ${VIM_BASIC_MODULE}; do
-       [[ -e "/usr/share/vim/vim82/$i.vim" ]] && add_file "/usr/share/vim/vim82/$i.vim"
-    done
-    # fix colors
-    [[ -e "/usr/share/vim/vim82/colors/lists/default.vim" ]] && add_file "/usr/share/vim/vim82/colors/lists/default.vim"
-    add_file "/usr/share/licenses/vim/license.txt"
-    add_full_dir "/usr/share/vim/vim82/autoload/dist"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes small version of vim on an archboot image.
-HELPEOF
-}