diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 1fce8ca..1645c9b 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -77,8 +77,8 @@
 >extra xfburn
 
 #---------=> GUI internet apps
->basic midori
 >extra chromium
+>extra firefox
 >extra thunderbird
 
 #---------=> flatpak snap
@@ -93,7 +93,7 @@
 #---------=> powermanager
 >extra xfce4-power-manager-gtk3
 #>extra tlp-rdw
->extra tlpui
+#>extra tlpui
 
 #---------=> wallpapers
 >extra manjaro-wallpapers-by-lunix-cool-logo
@@ -106,6 +106,34 @@
 #-------------------------------------------------
 ##### EDITION BASE PACKAGES
 
+#---------=> i3
+artwork-i3
+bmenu
+brandr
+conky-i3
+dmenu-manjaro
+i3exit
+i3status
+i3-gaps
+i3-help
+i3-scripts
+i3-scrot
+ncdu
+nerd-fonts-terminus
+morc_menu
+sbxkbd
+#terminus-font
+#ttf-bitstream-vera
+urxvt-perls
+
+wmutils
+xautolock
+xsel
+xdg-su
+xorg-twm
+xorg-xhost
+
+
 #---------=> package manager
 pamac-common
 pamac-cli
@@ -116,9 +144,9 @@ xreader
 xviewer
 
 #---------=> manjaro user infomartion
-manjaro-application-utility
-manjaro-documentation-en
-manjaro-hello
+>extra manjaro-application-utility
+>extra manjaro-documentation-en
+>extra manjaro-hello
 
 #---------=> GUI text editor
 xed
@@ -162,8 +190,9 @@ hddtemp
 htop
 inxi
 jp2a
-#mesa-demos
+mesa-demos
 neofetch
+pastebinit
 ps_mem
 tree
 upower
@@ -195,8 +224,8 @@ manjaro-openbox-desktop-settings
 #---------=> edition theming and settings
 kvantum-theme-matcha
 manjaro-grub-theme-glassfield
+manjaro-openbox-matcha
 manjaro-openbox-scripts
-manjaro-openbox-maia
 manjaro-openbox-wallpapers
 manjaro-openbox-wallpapers-matrix
 manjaro-slick-greeter-theme-glassfield
diff --git a/community/openbox/Packages-Mhwd b/community/openbox/Packages-Mhwd
deleted file mode 100644
index 148d1e8..0000000
--- a/community/openbox/Packages-Mhwd
+++ /dev/null
@@ -1,60 +0,0 @@
-## 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
-# ------- virtualbox
-KERNEL-virtualbox-guest-modules
-virtualbox-guest-utils
-# ------- \virtualbox
-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
-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/Packages-Mhwd b/community/openbox/Packages-Mhwd
new file mode 120000
index 0000000..9df3d5e
--- /dev/null
+++ b/community/openbox/Packages-Mhwd
@@ -0,0 +1 @@
+../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/community/openbox/desktop-overlay/etc/lightdm/ligthdm.conf b/community/openbox/desktop-overlay/etc/lightdm/ligthdm.conf
new file mode 100644
index 0000000..49002b4
--- /dev/null
+++ b/community/openbox/desktop-overlay/etc/lightdm/ligthdm.conf
@@ -0,0 +1,2 @@
+[Seat:*]
+user-session=openbox
\ No newline at end of file