diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk
index 211e0f53..2a9bfa69 100644
--- a/conf.d/slinux.mk
+++ b/conf.d/slinux.mk
@@ -9,7 +9,10 @@ distro/slinux-live: distro/.livecd-install use/slinux/base
 
 distro/slinux: distro/.installer use/slinux/full use/rescue/base
 	@$(call set,INSTALLER,simply-linux)
-	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/comm-base)
+	@$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/comm-base)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,MAIN_GROUPS, slinux/graphics-full-synfigstudio)
+endif
 	@$(call set,META_VOL_ID,Simply Linux $(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_APP_ID,Simply Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
 endif
diff --git a/pkg.in/lists/slinux/emulators-full b/pkg.in/lists/slinux/emulators-full
index 7ccd92cc..3578b4cd 100644
--- a/pkg.in/lists/slinux/emulators-full
+++ b/pkg.in/lists/slinux/emulators-full
@@ -4,9 +4,9 @@ libwine-vanilla-twain@i586
 i586-wine-vanilla@x86_64
 i586-libwine-vanilla-gl@x86_64
 i586-libwine-vanilla-twain@x86_64
-wine-mono
+wine-mono@X86
 i586-xorg-dri-.*@x86_64
-cabextract
+cabextract@X86
 dosbox
 #kernel-modules-virtualbox-@KERNEL@
-virtualbox
+virtualbox@X86
diff --git a/pkg.in/lists/slinux/not-install-full b/pkg.in/lists/slinux/not-install-full
index 0e143cdb..08b7aef2 100644
--- a/pkg.in/lists/slinux/not-install-full
+++ b/pkg.in/lists/slinux/not-install-full
@@ -7,8 +7,8 @@ i586-nvidia_glx_.*@x86_64
 #i586-fglrx_glx@x86_64
 
 # Bumblebee
-bumblebee
-#kernel-modules-bbswitch-@KERNEL_MOD@
+bumblebee@X86
+#kernel-modules-bbswitch-@KERNEL_MOD@@X86
 
 # Proprietary blob
 #citrix-client