diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 13e7bb5..94e4dc9 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -89,10 +89,7 @@
 #-------------------------------------------------
 ##### EDITION BASE PACKAGES
 
-#---------=> BUI basic utilities
-speedcrunch
-
-#---------=> CLI package manager
+#---------=> package manager
 pamac-cli
 pacui
 
@@ -147,11 +144,11 @@ hddtemp
 htop
 inxi
 jp2a
-mesa-demos
+#mesa-demos
 neofetch
 ps_mem
-tlp-rdw
-tlpui
+#tlp-rdw
+#tlpui
 tree
 upower
 xterm
diff --git a/community/openbox/Packages-Mhwd b/community/openbox/Packages-Mhwd
deleted file mode 120000
index 9df3d5e..0000000
--- a/community/openbox/Packages-Mhwd
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/community/openbox/Packages-Mhwd b/community/openbox/Packages-Mhwd
new file mode 100644
index 0000000..fb7290a
--- /dev/null
+++ b/community/openbox/Packages-Mhwd
@@ -0,0 +1,58 @@
+## The following is only temp for 18.1-rc7
+#>extra libreoffice-still
+#>extra freeoffice
+
+## Normal MHWD package list
+
+KERNEL-bbswitch
+KERNEL-broadcom-wl
+#KERNEL-r8168
+KERNEL-zfs
+zfs-utils
+#KERNEL-rt3562sta
+KERNEL-virtualbox-guest-modules
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+>multilib lib32-libva-vdpau-driver 
+libxaw
+libxpm
+libxvmc
+mesa-vdpau
+>multilib lib32-mesa-vdpau
+>multilib lib32-libxvmc
+>multilib lib32-primus
+#>nonfree_default catalyst-utils
+#>nonfree_default KERNEL-catalyst
+>nonfree_default KERNEL-nvidia
+>nonfree_default KERNEL-nvidia-340xx
+>nonfree_default KERNEL-nvidia-390xx
+>nonfree_default nvidia-340xx-utils
+>nonfree_default nvidia-390xx-utils
+>nonfree_default nvidia-utils
+#>nonfree_multilib lib32-catalyst-utils
+>nonfree_multilib lib32-nvidia-utils
+>nonfree_multilib lib32-nvidia-340xx-utils
+>nonfree_multilib lib32-nvidia-390xx-utils
+opencl-mesa
+open-vm-tools
+pangox-compat
+primus
+bumblebee
+virtualbox-guest-utils
+vulkan-radeon
+>multilib lib32-vulkan-radeon
+vulkan-intel
+>multilib lib32-vulkan-intel
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
diff --git a/community/openbox/desktop-overlay/etc/lightdm/lightdm.conf b/community/openbox/desktop-overlay/etc/lightdm/lightdm.conf
deleted file mode 100644
index a88302d..0000000
--- a/community/openbox/desktop-overlay/etc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-backend = X backend to use (mir)
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-backend=
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-greeter-session=slick-greeter
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-user-session=openbox
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-autologin-user=fh
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
diff --git a/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf
deleted file mode 100644
index ac6d975..0000000
--- a/community/openbox/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[Greeter]
-background=/usr/share/backgrounds/manjaro-wallpapers-18.0/wMJ_neutral_textured_warm.jpg
-theme-name=Matcha-sea
-icon-theme-name=Papirus-Maia
-draw-grid=false
-background-color=#525252
-enable-hidpi=auto
-font-name=Roboto
-only-on-monitor=-1
diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf
index 730c52c..6880d5f 100644
--- a/community/openbox/profile.conf
+++ b/community/openbox/profile.conf
@@ -36,7 +36,7 @@ geoip="true"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'NetworkManager' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'firewalld')
+enable_systemd=('dpcpcd' 'systemd-timesyncd')
 disable_systemd=('pacman-init')
 
 # add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"