diff --git a/xfce-minimal/Packages b/xfce-minimal/Packages
index 70d56b9..8cc6812 100644
--- a/xfce-minimal/Packages
+++ b/xfce-minimal/Packages
@@ -14,7 +14,6 @@ findutils
 gawk
 >i686 gcc-libs
 >x86_64 gcc-libs-multilib
-gcc-libs
 gettext
 glibc
 grep
@@ -23,7 +22,7 @@ inetutils
 iproute2
 iputils
 jfsutils
-keyboardctl
+keyboardctl #depreciated
 less
 licenses
 locale-info
@@ -62,10 +61,16 @@ xfsprogs
 linux-firmware
 lsb-release
 haveged # needed for pacman-init
+intel-ucode
 manjaro-firmware
 manjaro-release
 memtest86+

+## EFI support (only x86_64)
+>x86_64 gummiboot
+>x86_64 prebootloader
+>x86_64 refind-efi
+
 ## Kernel
 KERNEL

@@ -104,11 +109,6 @@ pv
 tcpdump
 wget

-## EFI support (only x86_64)
->x86_64 gummiboot
->x86_64 prebootloader
->x86_64 refind-efi
-
 ## Network
 b43-fwcutter
 dhclient
@@ -138,6 +138,3 @@ smartmontools
 tlp
 wireless_tools
 xorg-xset
-
-## ucode for new cpus
-intel-ucode
diff --git a/xfce-minimal/Packages-Xfce b/xfce-minimal/Packages-Xfce
index bd7c802..f8d5d18 100644
--- a/xfce-minimal/Packages-Xfce
+++ b/xfce-minimal/Packages-Xfce
@@ -3,18 +3,13 @@
 ## Minmal XFCE Desktop Packages
 gconf # fix qt-theme
 gnome-keyring # fix wlan segfault
->i686 gnome-vfs
+gnome-vfs
 gvfs # to fix trash in thunar
 menulibre
 network-manager-applet
-accountsservice
-lightdm-gtk3-greeter
-lightdm-gtk-greeter-settings
-light-locker-xfce
 #numlockx
 xcursor-simpleandsoft
 xcursor-vanilla-dmz-aa
-xcursor-menda
 xfce4-panel
 xfce4-session
 xfce4-terminal
@@ -29,6 +24,7 @@ xfce4-battery-plugin
 xfce4-clipman-plugin
 xfce4-power-manager
 xfce4-whiskermenu-plugin
+xfce4-xkb-plugin

 ## Audio Packages
 manjaro-alsa
@@ -38,13 +34,17 @@ pa-applet
 pulseaudio-ctl

 ## Applications
+accountsservice
 gksu
 gparted
 gst-libav
 libreoffice-installer
 lxsession
+lightdm-gtk3-greeter
+lightdm-gtk-greeter-settings
+light-locker-xfce
 manjaro-settings-manager
-manjaro-welcome
+#manjaro-welcome
 midori
 mousepad
 pamac
@@ -53,9 +53,11 @@ polkit-gnome # for gparted
 qpdfview
 >i686 sylpheed
 >i686 xnoise
+open-fuse-iso

 ## Installer
-thus
+qt5-svg
+calamares

 ## Network
 netctl
@@ -85,16 +87,21 @@ xorg-server-utils
 xorg-twm
 xorg-utils
 xorg-xinit
-xorg-xkill

 ## Artwork
 menda-circle-icon-theme
+#menda-square-icon-theme
+#faenza-green-icon-theme
 menda-themes
-gnome-themes-standard
 manjaro-artwork
-xfce-theme-greenbird
+xcursor-menda
+>i686 xfce-theme-greenbird
 plymouth-theme-manjaro-elegant

 ## Fonts
 ttf-dejavu
-adobe-source-sans-pro-fonts
+cantarell-fonts
+ttf-droid
+
+## Documentation
+#manjaro-documentation