diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf
index 45fc0622..236f67e1 100644
--- a/community/cinnamon/profile.conf
+++ b/community/cinnamon/profile.conf
@@ -5,9 +5,6 @@
 # use multilib packages; x86_64 only
 # multilib="true"
 
-# use extra packages as defined in pkglist to activate a full profile
-extra="true"
-
 ################ install ################
 
 # default displaymanager: none
diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf
index 282f850f..56ec5404 100644
--- a/community/deepin/profile.conf
+++ b/community/deepin/profile.conf
@@ -5,9 +5,6 @@
 # use multilib packages; x86_64 only
 # multilib="true"
 
-# use extra packages as defined in pkglist to activate a full profile
-extra="true"
-
 ################ install ################
 
 # default displaymanager: none
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 155bc7db..a558aafa 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -126,7 +126,6 @@ ttf-liberation
 upower
 vertex-maia-themes
 vi
-vibrancy-colors
 viewnior
 vim
 vlc-nightly
diff --git a/community/i3/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/i3/desktop-overlay/etc/lightdm/slick-greeter.conf
index 8faf76a6..21b49d1b 100644
--- a/community/i3/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/i3/desktop-overlay/etc/lightdm/slick-greeter.conf
@@ -3,7 +3,7 @@ background=/usr/share/backgrounds/i3_default_background.jpg
 background-color=#2e3d44
 draw-grid=false
 theme-name=Adapta-Nokto-Eta-Maia
-icon-theme-name=Vibrancy-Full-Dark-Teal
+icon-theme-name=Papirus-Adapta-Nokto-Maia
 font-name='Noto Sans 11'
 xft-antialias=true
 xft-hintstyle=hintfull
diff --git a/community/i3/live-overlay/etc/skel/.i3/config b/community/i3/live-overlay/etc/skel/.i3/config
index 7ff6e457..7f97ad9b 100644
--- a/community/i3/live-overlay/etc/skel/.i3/config
+++ b/community/i3/live-overlay/etc/skel/.i3/config
@@ -56,7 +56,7 @@ bindsym $mod+Ctrl+m exec terminal -e 'alsamixer'
 
 # Start Applications
 bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
-bindsym $mod+i exec sudo -E calamares
+bindsym $mod+i exec calamares_polkit
 bindsym $mod+F2 exec palemoon
 bindsym $mod+F3 exec pcmanfm
 # bindsym $mod+F3 exec ranger
diff --git a/community/i3/profile.conf b/community/i3/profile.conf
index 77f16814..95d7d8fa 100644
--- a/community/i3/profile.conf
+++ b/community/i3/profile.conf
@@ -5,9 +5,6 @@
 # use multilib packages; x86_64 only
 # multilib="true"
 
-# use extra packages as defined in pkglist to activate a full profile
-extra="true"
-
 ################ install ################
 
 # default displaymanager: none
diff --git a/community/lxde/Packages-Desktop b/community/lxde/Packages-Desktop
index 09af148b..d38b952a 100644
--- a/community/lxde/Packages-Desktop
+++ b/community/lxde/Packages-Desktop
@@ -113,6 +113,7 @@ qt5-styleplugins
 # theming
 gnome-icon-theme
 gnome-themes-standard
+ttf-dejavu
 
 ## Basic Applications
 manjaro-hello
diff --git a/community/lxde/profile.conf b/community/lxde/profile.conf
index 4947e902..41b79c7e 100644
--- a/community/lxde/profile.conf
+++ b/community/lxde/profile.conf
@@ -3,11 +3,11 @@
 ##########################################
 
 # use multilib packages; x86_64 only
-# multilib="true"
+#multilib="true"
 multilib=false
 
 # use extra packages as defined in pkglist to activate a full profile
-# extra="false"
+#extra="false"
 
 ################ install ################
 
@@ -16,38 +16,39 @@ multilib=false
 displaymanager="lightdm"
 
 # Set to false to disable autologin in the livecd
-# autologin="true"
+#autologin="true"
 
 # nonfree xorg drivers
-# nonfree_mhwd="true"
+#nonfree_mhwd="true"
 
 # possible values: grub;systemd-boot
-# efi_boot_loader="grub"
+#efi_boot_loader="grub"
 
 # configure calamares for netinstall
-# netinstall="false"
+#netinstall="false"
 
 # configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
-# chrootcfg="false"
+#chrootcfg="false"
 
 # use geoip
-# geoip="true"
+#geoip="true"
 
 # unset defaults to given values
 # names must match systemd service names
 # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
-# disable_systemd=()
+enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd')
+disable_systemd=('pacman-init')
 
 # unset defaults to given values,
 # names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-# disable_openrc=()
+#enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+#disable_openrc=()
 
 # unset defaults to given values
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel"
+#addgroups="video,power,storage,optical,network,lp,scanner,wheel"
 
 # the same workgroup name if samba is used
-# smb_workgroup="Manjaro"
+#smb_workgroup="Manjaro"
 
 ################# live-session #################
 
@@ -55,21 +56,21 @@ displaymanager="lightdm"
 hostname="manjaro-lxde"
 
 # unset defaults to given value
-# username="manjaro"
+#username="manjaro"
 
 # unset defaults to given value
-# password="manjaro"
+#password="manjaro"
 
 # the login shell
 # defaults to bash
-# login_shell=/bin/bash
+#login_shell=/bin/bash
 
 # unset defaults to given values
 # names must match systemd service names
 # services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+#enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
 
 # unset defaults to given values,
 # names must match openrc service names
 # services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+#enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 4e3fcecf..469cae2d 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -7,7 +7,6 @@ xorg-xkill
 xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
-xf86-input-synaptics
 
 ## nice programs
 bash-completion
@@ -25,8 +24,12 @@ python2-xdg
 xdg-user-dirs
 xdg-utils
 
-## toolkit
+## manjaro
+manjaro-settings-manager
+
+## theming
 gtk3-classic
+manjaro-openbox-settings
 
 ## display manager
 lightdm
@@ -35,24 +38,19 @@ lightdm-slick-greeter
 ## network
 networkmanager
 networkmanager-dmenu
-networkmanager-openconnect
-networkmanager-pptp
-networkmanager-vpnc
 
 ## browser
->basic midori
->extra chromium
+lynx
+chromium
 
 ## terminal
 termite
->extra lxterminal-gtk3
+lxterminal
 
 ## filemanager
+mc
 pcmanfm-gtk3
->extra thunar-gtk3
->extra thunar-archive-plugin
->extra thunar-volman-gtk3
->extra file-roller
+ranger
 xarchiver
 
 ## mail
@@ -60,90 +58,46 @@ sylpheed
 
 ## package manager
 pacui
->extra pamac
+pamac
 
 ## desktop and settings
->extra lxrandr-gtk3         # monitor layout
 arandr                      # monitor layout
 exo-gtk3                    # open with default programs
 lxappearance-gtk3           # openbox appearance manager
 lxappearance-obconf-gtk3    # obconf plugin
 lxinput-gtk3                # input manager
 lxsession-gtk3              # session manager
-kickshaw                    # menu editor
-ob-autostart                # auto start
-obkey-gtk3                  # openbox hotkey manager
-obmenu-generator            # dynamic menu generator
-opensnap                    # snap windows
->extra polybar              # status bar
-tint2                       # status bar
->extra trayer-srg           # sys tray
-
-## theming
->basic manjaro-openbox-basic-settings
->extra manjaro-openbox-settings
-manjaro-zsh-config
-ttf-dejavu
->extra ttf-font-logos
-ttf-roboto
 
 ## net tools
-bind-tools                  # 
+bind-tools                  #
 net-tools                   #
 nmap                        #
 
-## utilities 1
-compton                     # compositing
->extra conky                #
->extra dunst                # messages
-i3lock
->extra jgmenu               # system menu
->extra jsoncpp              # required by various apps
-nitrogen                    # wallpaper
-rofi                        # nice dmenu replacement
-scrot                       # screen capture
-skippy-xd                   # window swicher
->extra wireless_tools       # polybar helper
->extra wmctrl               # polybar helper
-xcape                       # hotkey
->extra xdotool              # used by polybar
-zenity                      # bar-dock-config
-
-## utilities 2
->extra gucharmap            # char map
+## utilities
 epdfview                    # pdf
 galculator                  # calculator
->extra geany                # geany
->extra geany-plugins        # geany plugins
->extra gnome-disk-utility   # disks
 gparted                     # partition tool
 gpicview-gtk3               # image viewer
 gsimplecal                  # calendar
 htop                        # process monitor
-imagemagick                 # image converter
 inxi                        # sysinfo
-l3afpad                     # simple gui editor
->extra neofetch             #
 numlockx                    # numlock
 ps_mem                      # memory monitor
->extra screenfetch          # screen capture
+scite                       # multi-purpose text editor
 
 ## media, audio & codec
->extra manjaro-pulse
->extra alsa-firmware
->extra alsa-plugins
->extra alsa-utils
->extra ffmpeg2.8
->extra gst-libav
->extra gst-plugins-base
->extra gst-plugins-good
->extra gstreamer
->extra libmad
->extra libmatroska
->extra lxmusic-gtk3         # musicplayer
->extra mpd                  # mediaplayer
->extra mpv                  # mediaplayer
->extra pamixer              # mixer control
->extra pavucontrol          # sound control
->extra playerctl            # player control
->extra volumeicon           # volume control
+audacious-gtk3
+audacious-plugins-gtk3
+ffmpeg2.8
+gst-libav
+gst-plugins-base
+gst-plugins-good
+gstreamer
+libmad
+libmatroska
+manjaro-pulse
+mpv                         # mediaplayer
+pavucontrol                 # sound control
+playerctl                   # player control
+pamixer                     # mixer control
+volumeicon                  # volume control
diff --git a/community/openbox/desktop-overlay/etc/X11/xorg.conf.d/50-touchpad.conf b/community/openbox/desktop-overlay/etc/X11/xorg.conf.d/50-touchpad.conf
new file mode 100644
index 00000000..1e7d12bc
--- /dev/null
+++ b/community/openbox/desktop-overlay/etc/X11/xorg.conf.d/50-touchpad.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+       Identifier "tap-by-default"
+       MatchIsTouchpad "on"
+       MatchDriver "libinput"
+       Option "Tapping" "on"
+EndSection
\ No newline at end of file
diff --git a/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf
index 695cae79..aae67797 100644
--- a/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf
@@ -1,5 +1,5 @@
 [Greeter]
-background=/usr/share/backgrounds/manjarowall17_05.jpg
+background=/usr/share/backgrounds/openbox-wall-blue.png
 theme-name=Adapta-Nokto-Breath
 icon-theme-name=Vibrancy-Light-Teal
 draw-grid=false
diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf
index 021cb85a..18150715 100644
--- a/community/openbox/profile.conf
+++ b/community/openbox/profile.conf
@@ -15,7 +15,7 @@ autologin="true"
 nonfree_mhwd="false"
 
 # use extra packages as defined in pkglist to activate a full profile
-# extra="false"
+#extra="false"
 
 ################ install ################
 
@@ -23,17 +23,18 @@ nonfree_mhwd="false"
 efi_boot_loader="grub"
 
 # configure calamares for netinstall
-netinstall="false"
+#netinstall="false"
 
 # configure calamares to use chrootcfg instead of unpackfs
-# chrootcfg="false"
+#chrootcfg="false"
 
 # use geoip for localization
 geoip='true'
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
+#enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
@@ -57,7 +58,7 @@ hostname="manjaro-openbox"
 
 # the login shell
 # defaults to bash
-# login_shell=/bin/bash
+login_shell=/bin/zsh
 
 # unset defaults to given values
 # addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel"
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 209b96a2..6880b790 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -133,6 +133,7 @@ xf86-input-void
 xorg-server
 xorg-twm
 xorg-xinit
+>extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
 yelp
 
 ms-office-online
diff --git a/manjaro/gnome/live-overlay/usr/share b/manjaro/gnome/live-overlay/usr/share
new file mode 120000
index 00000000..6adfc9d1
--- /dev/null
+++ b/manjaro/gnome/live-overlay/usr/share
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/usr/share
\ No newline at end of file
diff --git a/manjaro/kde/live-overlay/usr b/manjaro/kde/live-overlay/usr
new file mode 120000
index 00000000..b56c83dc
--- /dev/null
+++ b/manjaro/kde/live-overlay/usr
@@ -0,0 +1 @@
+../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 24f0a3f4..24fe2ae0 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -112,23 +112,25 @@ lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
 accountsservice  # Enhanced user accounts handling
 
+## GTK3
+gtk3-classic
+>multilib lib32-gtk3-classic
+
 ## XFCE Group
-exo
-garcon
-gtk-xfce-engine
-thunar
+exo-gtk3
+garcon-gtk3
+thunar-gtk3
 thunar-volman
 tumbler
-xfce4-appfinder
-xfce4-panel
-xfce4-power-manager
-xfce4-session
-xfce4-settings
+xfce4-appfinder-gtk3
+xfce4-panel-gtk3
+xfce4-power-manager-gtk3
+xfce4-session-gtk3
+xfce4-settings-gtk3
 xfce4-terminal
-xfconf
-xfdesktop
-xfwm4
-xfwm4-themes
+xfconf-gtk3
+xfdesktop-gtk3
+xfwm4-gtk3
 
 ## XFCE Extras
 blueman
@@ -145,6 +147,7 @@ menulibre
 orage
 poppler-glib       # tumbler - for PDF thumbnails
 thunar-archive-plugin
+file-roller
 thunar-media-tags-plugin
 # >extra xfce4-artwork
 xfce4-battery-plugin
@@ -161,7 +164,7 @@ xfce4-clipman-plugin
 >extra xfce4-mpc-plugin
 >extra xfce4-netload-plugin
 >extra xfce4-notes-plugin
-xfce4-notifyd
+xfce4-notifyd-gtk3
 xfce4-screenshooter
 >extra xfce4-sensors-plugin
 >extra xfce4-smartbookmark-plugin
@@ -172,7 +175,7 @@ xfce4-taskmanager
 >extra xfce4-verve-plugin
 >extra xfce4-wavelan-plugin
 >extra xfce4-weather-plugin
-xfce4-whiskermenu-plugin
+xfce4-whiskermenu-plugin-gtk3
 xfce4-xkb-plugin
 xfce4-pulseaudio-plugin
 pavucontrol
@@ -231,8 +234,8 @@ unrar  # RAR archive support
 manjaro-documentation-en
 
 ## Settings packages
->extra manjaro-xfce-settings
->basic manjaro-xfce-minimal-settings
+>extra manjaro-xfce-gtk3-settings
+>basic manjaro-xfce-gtk3-minimal-settings
 manjaro-browser-settings
 
 ## Xorg Input Drivers
diff --git a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
index 16c96d3a..2a61d9f5 100644
--- a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
@@ -2,9 +2,9 @@
 background = /usr/share/backgrounds/breath.png
 font-name = Cantarell 10
 xft-antialias = true
-icon-theme-name = Vertex-Maia
+icon-theme-name = Vibrancy-Full-Dark-Teal
 screensaver-timeout = 60
-theme-name = Vertex-Maia
+theme-name = Adapta-Eta-Maia
 cursor-theme-name = xcursor-breeze
 show-clock = false
 default-user-image = #avatar-default
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 5c8ea14e..de6c9a4d 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -1,7 +1,7 @@
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 KERNEL-r8168
-KERNEL-rt3562sta
+#KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
 libva-intel-driver
 libva-mesa-driver
diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
new file mode 100644
index 00000000..d5e30b5e
--- /dev/null
+++ b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
@@ -0,0 +1,23 @@
+---
+componentName:  manjaro
+
+strings:
+    productName:         Manjaro Linux
+    shortProductName:    Manjaro
+    version:             18.0-alpha-1
+    shortVersion:        18.0a1
+    versionedName:       Manjaro Linux 18.0-alpha-1 "Illyria"
+    shortVersionedName:  Manjaro 18.0a1
+    bootloaderEntryName: Manjaro
+
+images:
+    productLogo:         "logo.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#454948"
+   sidebarText:          "#efefef"
+   sidebarTextSelect:    "#9E4F5D"