diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 3fadeae..ea64abc 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -171,7 +171,7 @@ yelp
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
 >extra libdvdcss
->extra steam-manjaro
+>x86_64 >extra steam-manjaro
 >extra manjaro-printer
 >extra ffmpegthumbnailer
 >extra timeshift
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index d1880e1..748be92 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -88,7 +88,7 @@ terminus-font
 >extra ttf-droid
 
 ## Games
->extra steam-manjaro
+>x86_64 >extra steam-manjaro
 
 ## Package management
 #appimagelauncher
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 2666de4..bc18456 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -79,7 +79,7 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra ttf-droid
 
 ## Games
->extra steam-manjaro
+>x86_64 >extra steam-manjaro
 
 ## Package management
 >extra apparmor
diff --git a/shared/Packages-Live b/shared/Packages-Live
index 0b20b0a..aae61d0 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -1,4 +1,4 @@
-calamares-git
+calamares
 >manjaro grub-theme-live-manjaro
 gsmartcontrol
 manjaro-architect
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index d96d839..5830822 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -24,12 +24,12 @@ mesa-vdpau
 >multilib lib32-primus
 #>nonfree_default catalyst-utils
 #>nonfree_default KERNEL-catalyst
->nonfree_default KERNEL-nvidia-418xx
 >nonfree_default KERNEL-nvidia-340xx
 >nonfree_default KERNEL-nvidia-390xx
+>nonfree_x86_64 KERNEL-nvidia-418xx
 >nonfree_default nvidia-340xx-utils
 >nonfree_default nvidia-390xx-utils
->nonfree_default nvidia-418xx-utils
+>nonfree_x86_64 nvidia-418xx-utils
 #>nonfree_multilib lib32-catalyst-utils
 >nonfree_multilib lib32-nvidia-418xx-utils
 >nonfree_multilib lib32-nvidia-340xx-utils