diff --git a/community/architect/Packages-Live b/community/architect/Packages-Live
index c32477ed..478580bc 100644
--- a/community/architect/Packages-Live
+++ b/community/architect/Packages-Live
@@ -15,7 +15,6 @@ nbd
 open-vm-tools
 >systemd manjaro-live-systemd
 networkmanager
->x86_64 manjaro-efi-utils
 terminus-font
 virtualbox-guest-utils
 xf86-input-elographics
diff --git a/manjaro/lxqt/Packages-Live b/manjaro/lxqt/Packages-Live
index 0f1ec831..2f6d8dae 100644
--- a/manjaro/lxqt/Packages-Live
+++ b/manjaro/lxqt/Packages-Live
@@ -1,7 +1,6 @@
 
 calamares
 #calamares-dev
->sonar sonar-calamares-branding
 
 KERNEL-broadcom-wl
 KERNEL-ndiswrapper
@@ -10,9 +9,6 @@ KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
 
 >manjaro grub-theme-live
-
-#>sonar sonar-syslinux-theme
-
 manjaro-live-skel
 >openrc manjaro-live-openrc
 >systemd manjaro-live-systemd
@@ -21,7 +17,6 @@ mkinitcpio-nfs-utils
 nbd
 open-vm-tools
 squashfs-tools
->x86_64 manjaro-efi-utils
 virtualbox-guest-utils
 
 xf86-input-elographics
diff --git a/shared/Packages-Live b/shared/Packages-Live
index 42d6e1c9..d782eb12 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -2,11 +2,11 @@ calamares
 manjaro-live-skel
 mkinitcpio-nfs-utils
 nbd
->manjaro grub-theme-live
+>manjaro grub-theme-live-manjaro
+>sonar grub-theme-live-sonar
 >openrc manjaro-live-openrc
 >sonar sonar-calamares-branding
 >sonar sonar-syslinux-theme
 squashfs-tools
 >systemd manjaro-live-systemd
->x86_64 manjaro-efi-utils
 >sonar thus
diff --git a/shared/Packages-Live-Xorg b/shared/Packages-Live-Xorg
index 705c76ad..bfe867fb 100644
--- a/shared/Packages-Live-Xorg
+++ b/shared/Packages-Live-Xorg
@@ -12,12 +12,11 @@ nbd
 >openrc manjaro-live-openrc
 open-vm-tools
 primus
->manjaro grub-theme-live
->sonar sonar-syslinux-theme
+>manjaro grub-theme-live-manjaro
+>sonar grub-theme-live-sonar
 squashfs-tools
 >systemd bumblebee
 >systemd manjaro-live-systemd
->x86_64 manjaro-efi-utils
 xf86-input-vmmouse
 xf86-video-amdgpu
 xf86-video-ati