diff --git a/etc/oblogout.conf b/etc/oblogout.conf
index b23dbb50..f62a06b2 100644
--- a/etc/oblogout.conf
+++ b/etc/oblogout.conf
@@ -20,7 +20,7 @@ lock = K
 shutdown = systemctl poweroff
 restart = systemctl reboot
 suspend = systemctl suspend
-logout = openbox --exit
+logout = session-logout
 #hibernate = systemctl hibernate
 lock = pkill oblogout; i3lock-fancy -p
 #switchuser = gdm-control --switch-user
diff --git a/home/.config/compton.conf b/home/.config/compton.conf
index 95a918c6..451c38d6 100644
--- a/home/.config/compton.conf
+++ b/home/.config/compton.conf
@@ -12,14 +12,17 @@ shadow-ignore-shaped    = true;
 # Opacity
 menu-opacity            = 1.0;
 inactive-opacity        = 1.0;
+active-opacity          = 1.0;
 inactive-opacity-override = false;
-alpha-step              = 0.06;
 
 # Fade
 fading                  = true;
-fade-delta              = 8;
+fade-delta              = 10;
 fade-in-step            = 0.03;
 fade-out-step           = 0.028;
+alpha-step              = 0.06;
+no-fading-openclose     = true;
+no-fading-destroyed-argb = false;
 
 # Backend
 backend                 = "xrender";
@@ -37,33 +40,33 @@ detect-client-leader    = true;
 # GLX backend
 glx-no-stencil          = true;
 glx-no-rebind-pixmap    = true;
-#glx-copy-from-front = false;
+#glx-copy-from-front     = false;
 #glx-use-copysubbuffermesa = true;
-#glx-swap-method = "undefined";
-#glx-use-gpushader4 = true;
-#xrender-sync = true;
-#xrender-sync-fence = true;
+#glx-swap-method         = "undefined";
+#glx-use-gpushader4      = true;
+#xrender-sync            = true;
+#xrender-sync-fence      = true;
 
-opacity-rule            = [
-  "85:class_g           = 'XTerm'",
+opacity-rule = [
+  "85:class_g = 'XTerm'",
   "0:_NET_WM_STATE@:32a * = '_NET_WM_STATE_HIDDEN'"
 ];
 
-shadow-exclude          = [
-  "name *?              = 'Notification'",
-  "class_g *?           = 'VirtualBox'",
-  "class_g *?           = 'Conky'",
-  "class_g ?            = 'Notify-osd'",
-  "class_g ?            = 'cairo-dock'",
-    "class_g *?         = 'trayer'",
-    "class_g *?         = 'i3-frame'",
-    "class_g *?         = 'firefox'",
-    "class_g *?         = 'navigator'",
-  "class_g *?           = 'Cairo-clock'",
-  "class_g *?           = 'Cairo-dock'",
-  "class_g *?           = 'plank'",
-  "class_g *?           = 'Docky'",
-    "_NET_WM_STATE@:32a * = '_NET_WM_STATE_HIDDEN'",
+shadow-exclude = [
+  "name *?= 'Notification'",
+  "class_g *?= 'VirtualBox'",
+  "class_g *?= 'Conky'",
+  "class_g *?= 'Notify-osd'",
+  "class_g *?= 'cairo-dock'",
+  "class_g *?= 'trayer'",
+  "class_g *?= 'i3-frame'",
+  "class_g *?= 'firefox'",
+  "class_g *?= 'navigator'",
+  "class_g *?= 'Cairo-clock'",
+  "class_g *?= 'Cairo-dock'",
+  "class_g *?= 'plank'",
+  "class_g *?= 'Docky'",
+  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
   "_GTK_FRAME_EXTENTS@:c"
 ];
 #"85:class_g *?= 'xterm'",
@@ -74,12 +77,12 @@ shadow-exclude          = [
 #"99:class_g *?= 'qutebrowser'",
 #"99:class_g *?= 'mpv'",
 
-focus-exclude           = [
-  "class_g *?           = 'Cairo-clock'",
-  "class_g *?           = 'Virtualbox'",
-    "class_g *?         = 'trayer'",
-    "_NET_WM_STATE@:32a * = '_NET_WM_STATE_HIDDEN'",
-  "name *?              = 'Authy'"
+focus-exclude = [
+  "class_g *?= 'Cairo-clock'",
+  "class_g *?= 'Virtualbox'",
+  "class_g *?= 'trayer'",
+  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
+  "name *?= 'Authy'"
 ];
 #"class_g *?= 'steam'",
 #"class_g *?= 'chrome'",
@@ -87,14 +90,14 @@ focus-exclude           = [
 #"class_g *?= 'qutebrowser'",
 #"class_g *?= 'mpv'",
 
-invert-color-include    = [
+invert-color-include = [
 ];
 
-fade-exclude            = [
+fade-exclude = [
 ];
 
 # Window type settings
 wintypes:
 {
-  tooltip               = { fade = true; shadow = true; focus = true; };
+  tooltip = { fade = true; shadow = true; focus = true; };
 };
diff --git a/home/.config/dunst/dunstrc b/home/.config/dunst/dunstrc
index 3550c88a..7a0b061b 100755
--- a/home/.config/dunst/dunstrc
+++ b/home/.config/dunst/dunstrc
@@ -21,7 +21,7 @@
     line_height = 0
     separator_height = 2
     padding = 10
-    horizontal_padding = 10
+    horizontal_padding = 20
     frame_color = "#c0c5ce"
     separator_color = frame
     frame_width = 1
diff --git a/home/.config/dunst/dunstrc.template b/home/.config/dunst/dunstrc.template
index 8d432fa5..545e454c 100644
--- a/home/.config/dunst/dunstrc.template
+++ b/home/.config/dunst/dunstrc.template
@@ -21,7 +21,7 @@
     line_height = 0
     separator_height = 2
     padding = 10
-    horizontal_padding = 10
+    horizontal_padding = 20
     frame_color = "{{.Data.border_color}}"
     separator_color = frame
     frame_width = 1
diff --git a/home/.config/i3/config b/home/.config/i3/config
index c46e4dd5..516a0481 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -33,12 +33,12 @@ client.urgent           $red  $bg $red   $red  $red
 client.placeholder      $grey $bg $bg    $bg   $bg
 client.background       $bg
 
-# border & title
+# border & title.. Must be set to border pixel for gaps to work
 for_window [class="^.*"] border pixel 2, title_format "<b> %class >> %title </b>"
 
 # gaps
 gaps inner 15
-gaps outer 0
+gaps outer 5
 
 # font
 font pango:Ubuntu 11
@@ -99,7 +99,9 @@ bindsym Mod1+q kill
 
 # launchers
 bindsym Control+space exec --no-startup-id rofi-gorice
-bindsym Mod1+F1       exec --no-startup-id rofi-gorice
+
+# this is needed for super key to launch rofi
+bindsym Mod1+F1 exec --no-startup-id rofi-gorice
 
 # core
 bindsym $Mod+e exec --no-startup-id al-open -edit
@@ -245,10 +247,10 @@ bindsym $Mod+y border 1pixel
 bindsym $Mod+u border none
 
 # change gaps
-bindsym $Mod+plus                gaps outer current plus  5
-bindsym $Mod+minus               gaps outer current minus 5
-bindsym $Mod+Shift+plus          gaps inner current plus  5
-bindsym $Mod+Shift+minus         gaps inner current minus 5
+bindsym $Mod+plus                gaps inner current plus  5
+bindsym $Mod+minus               gaps inner current minus 5
+bindsym $Mod+Shift+plus          gaps outer current plus  5
+bindsym $Mod+Shift+minus         gaps outer current minus 5
 
 bindsym $Mod+Control+plus        gaps inner all plus  5
 bindsym $Mod+Control+minus       gaps inner all minus 5
diff --git a/home/.config/jgmenu/jgmenurc b/home/.config/jgmenu/jgmenurc
index 66e5db3d..ba7c949c 100644
--- a/home/.config/jgmenu/jgmenurc
+++ b/home/.config/jgmenu/jgmenurc
@@ -7,22 +7,23 @@ tint2_look      = 1
 
 menu_halign     = left
 menu_valign     = top
-menu_margin_x   = 0
-menu_margin_y   = 25
+menu_margin_x   = 5
+menu_margin_y   = 30
 
 menu_width	    = 200
-menu_radius	    = 2
+menu_radius	    = 0
 menu_border	    = 1
 
-menu_padding_top    = 8
-menu_padding_right  = 4
-menu_padding_bottom = 8
-menu_padding_left   = 4
+menu_padding_top    = 15
+menu_padding_right  = 2
+menu_padding_bottom = 5
+menu_padding_left   = 2
 
-item_height	        = 25
+item_height	        = 30
 item_padding_x  	= 5
+item_margin_y	    = 5
 item_radius	        = 0
-item_border	        = 1
+item_border	        = 0
 sep_height      	= 5
 
 icon_size	        = 24
@@ -32,3 +33,10 @@ sub_hover_action    = 1
 terminal_exec       = termite
 terminal_args       = -e
 
+color_menu_bg = #2b303b 100
+color_menu_fg = #8fa1b3 100
+color_norm_bg = #2b303b 0
+color_norm_fg = #8fa1b3 100
+color_sel_bg  = #8fa1b3 60
+color_sel_fg  = #2b303b 100
+color_sep_fg  = #8fa1b3 40
diff --git a/home/.config/keypack b/home/.config/keypack
index caa74610..b5e875f7 100755
--- a/home/.config/keypack
+++ b/home/.config/keypack
@@ -7,6 +7,7 @@ do_setup() {
     KEYS=('AEFB411B072836CD48FF0381AE252C284B5DBA5D'
           '9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0'
           '35F52A02854DCCAEC9DD5CC410443C7F54B00041')
+    sudo dirmngr </dev/null  # sometimes prevents failure to connect to keyserver
     sudo pacman-key --init
     sudo pacman-key --populate archlinux
     for key in "${KEYS[@]}"; do
diff --git a/home/.config/obmenu-generator/schema.pl b/home/.config/obmenu-generator/schema.pl
index d529471e..32dbb08f 100644
--- a/home/.config/obmenu-generator/schema.pl
+++ b/home/.config/obmenu-generator/schema.pl
@@ -41,8 +41,7 @@ our $SCHEMA = [
     {cat => ['settings',                                        'Settings',              'gnome-settings']},
     {cat => ['system',                                          'System',                'applications-system']},
     {sep => undef},
-    {pipe => ['al-places-pipemenu',                             'Places',                'folder']},
-    {pipe => ['al-recent-files-pipemenu',                       'Recent Files',          'folder-recent']},
+    {pipe => ['al-places-pipemenu --recent ~/',                 'Places',                'folder']},
     {sep => undef},
     {begin_cat => ['Preferences',                                                        'theme']},
         {begin_cat => ['Openbox',                                                        'openbox']},
diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index 3caf8e2a..fcc7b911 100755
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -1,18 +1,21 @@
-# launch compton
+# launch compton if enabled
 al-compositor --start &
 
 $HOME/.config/setup &
+# enable numlock, comment out if you dont have a numpad
+numlockx on &
 
 # restore wallpaper
 nitrogen --restore &
 
-# enable numlock
-numlockx on &
-
-# panel
+# start tint2 if enabled
 al-tint2-session &
+
+# start polybar if tint2 not enabled (start after al-tint-session)
 sleep 1; start-polybar &
-sleep 1; trayer --edge bottom --align left --heighttype pixel --height 22 --widthtype request --SetDockType true --expand true --transparent true --alpha 255
+
+# system tray
+sleep 1; trayer --edge bottom --align left --widthtype request --SetDockType false --expand true &
 
 # Openbox autostart
 ob-autostart -d &
@@ -20,7 +23,7 @@ ob-autostart -d &
 # PolicyKit authentication
 lxpolkit &
 
-# Required for xfce setting to work
+# Required for xfce settings to work
 xfsettingsd &
 
 # Launch conky if session exists
diff --git a/home/.config/openbox/menu.xml b/home/.config/openbox/menu.xml
index 0bb5a4f7..f0f35404 100644
--- a/home/.config/openbox/menu.xml
+++ b/home/.config/openbox/menu.xml
@@ -75,8 +75,7 @@
       </item>
     </menu>
     <separator/>
-    <menu execute="/usr/bin/al-places-pipemenu" id="pipe-placesmenu" label="Places"/>
-    <menu execute="/usr/bin/al-recent-files-pipemenu" id="pipe-recentfilesmenu" label="Recent Files"/>
+    <menu execute="al-places-pipemenu --recent ~/" id="pipe-placesmenu" label="Places"/>
     <separator/>
     <menu id="preferences" label="Preferences">
       <menu id="obConfig" label="Openbox">
diff --git a/home/.config/polybar/config b/home/.config/polybar/config
index bbd6d971..7ea20bdb 100755
--- a/home/.config/polybar/config
+++ b/home/.config/polybar/config
@@ -18,7 +18,7 @@ inherit = bar/master
 monitor =
 
 modules-left   = jgmenu config workspaces
-modules-center = clock window_switch
+modules-center = window_switch clock 
 modules-right  = pkg memory temperature coreuse network volume
 
 ; All available modules (some require configuration in modules.conf)
diff --git a/home/.config/polybar/modules.conf b/home/.config/polybar/modules.conf
index 1abef9e0..00ee7305 100644
--- a/home/.config/polybar/modules.conf
+++ b/home/.config/polybar/modules.conf
@@ -10,7 +10,7 @@ type          = custom/script
 label         = %output%
 label-padding = 1
 interval      = 10
-exec          = echo "MENU"
+exec          = echo "Menu"
 click-left    = jgmenu_run lx
 click-right   = exo-open $HOME/.config/jgmenu/jgmenurc
 
@@ -22,11 +22,11 @@ click-right   = exo-open $HOME/.config/jgmenu/jgmenurc
 type           = custom/script
 interval       = 5
 label          = %output%
-format-padding = 2
+format-padding = 1
 format         = <label>
 click-right    = termite "--exec=gorice edit i3/current" &
 click-left     = gorice dump i3 ~/.gorice/output.yaml.template; config_ui &
-exec           = echo "GO"
+exec           = echo ""
 ;exec           = grep "current" data.json | cut -d '"' -f22 | cut -d . -f1 | cut -d / -f2 | tr '[:lower:]' '[:upper:]'
 
 
diff --git a/home/.config/termite/config b/home/.config/termite/config
index 99576075..39297dff 100755
--- a/home/.config/termite/config
+++ b/home/.config/termite/config
@@ -11,7 +11,7 @@ font                = Fantasque Sans Mono 12
 scrollback_lines    = 10000
 search_wrap         = true
 icon_name           = utilities-terminal
-geometry            = 745x475
+geometry            = 740x500
 scrollback_lines    = 15000
 clickable_url       = true
 cursor_blink        = system
diff --git a/home/.config/termite/config.template b/home/.config/termite/config.template
index 91366558..ef3f6ace 100644
--- a/home/.config/termite/config.template
+++ b/home/.config/termite/config.template
@@ -11,7 +11,7 @@ font                = {{.Data.terminal_font}}
 scrollback_lines    = 10000
 search_wrap         = true
 icon_name           = utilities-terminal
-geometry            = 745x475
+geometry            = 740x500
 scrollback_lines    = 15000
 clickable_url       = true
 cursor_blink        = system
diff --git a/home/.config/tint2/default.tint2rc b/home/.config/tint2/default.tint2rc
index e6ba802d..cc209116 100755
--- a/home/.config/tint2/default.tint2rc
+++ b/home/.config/tint2/default.tint2rc
@@ -3,18 +3,18 @@
 #-------------------------------------
 # Backgrounds
 # Background 1: Active task
-rounded = 4
+rounded = 0
 border_width = 3
 border_sides = T
 background_color = #888888 0
 border_color = #1793d1 100
-background_color_hover = #0028fe 22
+background_color_hover = #888888 20
 border_color_hover = #1793d1 100
-background_color_pressed = #888888 0
+background_color_pressed = #888888 20
 border_color_pressed = #1793d1 100
 
 # Background 2: Default task, Iconified task
-rounded = 4
+rounded = 0
 border_width = 0
 border_sides = TBLR
 background_color = #000000 0
@@ -25,52 +25,52 @@ background_color_pressed = #888888 20
 border_color_pressed = #888888 20
 
 # Background 3: Urgent task
-rounded = 4
-border_width = 2
+rounded = 0
+border_width = 3
 border_sides = T
 background_color = #888888 0
 border_color = #e64141 100
-background_color_hover = #888888 0
+background_color_hover = #888888 20
 border_color_hover = #e64141 100
-background_color_pressed = #888888 0
+background_color_pressed = #888888 20
 border_color_pressed = #e64141 100
 
-# Background 4: Battery, Clock, Inactive desktop name, Inactive taskbar, Launcher, Launcher icon, Systray
-rounded = 4
-border_width = 2
+# Background 4: Inactive desktop name, Inactive taskbar
+rounded = 0
+border_width = 0
 border_sides = LR
-background_color = #2b303b 78
+background_color = #2b303b 80
 border_color = #000000 0
-background_color_hover = #0112f0 14
+background_color_hover = #888888 20
 border_color_hover = #000000 0
-background_color_pressed = #0023ff 20
+background_color_pressed = #888888 20
 border_color_pressed = #000000 0
 
-# Background 5: Active desktop name, Active taskbar
-rounded = 4
-border_width = 2
+# Background 5: Active desktop name, Active taskbar, Battery, Button, Clock, Launcher, Systray
+rounded = 0
+border_width = 0
 border_sides = LR
-background_color = #35415d 86
+background_color = #2b303b 90
 border_color = #d8d8d8 0
-background_color_hover = #d8d8d8 8
+background_color_hover = #d8d8d8 0
 border_color_hover = #d8d8d8 0
-background_color_pressed = #d8d8d8 8
+background_color_pressed = #d8d8d8 0
 border_color_pressed = #d8d8d8 0
 
 # Background 6: Tooltip
-rounded = 4
+rounded = 0
 border_width = 0
 border_sides = TBLR
-background_color = #222222 90
+background_color = #2b303b 100
 border_color = #222222 90
-background_color_hover = #222222 90
+background_color_hover = #2b303b 100
 border_color_hover = #222222 90
-background_color_pressed = #222222 90
+background_color_pressed = #2b303b 100
 border_color_pressed = #222222 90
 
 #-------------------------------------
 # Panel
-panel_items = PLTSC
+panel_items = PLTC
 panel_size = 100% 30
 panel_margin = 0 0
 panel_padding = 0 0 0
@@ -97,17 +97,17 @@ mouse_pressed_icon_asb = 100 0 0
 # Taskbar
 taskbar_mode = multi_desktop
 taskbar_hide_if_empty = 1
-taskbar_padding = 6 0 6
+taskbar_padding = 0 0 0
 taskbar_background_id = 4
 taskbar_active_background_id = 5
-taskbar_name = 1
+taskbar_name = 0
 taskbar_hide_inactive_tasks = 0
 taskbar_hide_different_monitor = 1
 taskbar_hide_different_desktop = 0
 taskbar_always_show_all_desktop_tasks = 0
-taskbar_name_padding = 2 0
-taskbar_name_background_id = 4
-taskbar_name_active_background_id = 5
+taskbar_name_padding = 4 4
+taskbar_name_background_id = 0
+taskbar_name_active_background_id = 0
 taskbar_name_font = Ubuntu 10
 taskbar_name_font_color = #828282 100
 taskbar_name_active_font_color = #a0a0bd 100
@@ -122,7 +122,7 @@ task_icon = 1
 task_centered = 1
 urgent_nb_of_blink = 20
 task_maximum_size = 36 30
-task_padding = 4 3 2
+task_padding = 6 2 4
 task_font = Ubuntu 10
 task_tooltip = 1
 task_font_color = #828282 60
@@ -138,15 +138,15 @@ task_active_background_id = 1
 task_urgent_background_id = 3
 task_iconified_background_id = 2
 mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
+mouse_middle = close
+mouse_right = none
 mouse_scroll_up = toggle
 mouse_scroll_down = iconify
 
 #-------------------------------------
 # System tray (notification area)
 systray_padding = 8 2 4
-systray_background_id = 4
+systray_background_id = 5
 systray_sort = right2left
 systray_icon_size = 16
 systray_icon_asb = 100 0 0
@@ -156,14 +156,14 @@ systray_name_filter =
 #-------------------------------------
 # Launcher
 launcher_padding = 5 0 5
-launcher_background_id = 4
-launcher_icon_background_id = 4
+launcher_background_id = 5
+launcher_icon_background_id = 0
 launcher_icon_size = 24
 launcher_icon_asb = 100 0 0
 launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/thunar-settings.desktop
+launcher_item_app = /usr/share/applications/exo-file-manager.desktop
 launcher_item_app = /usr/share/applications/exo-terminal-emulator.desktop
 launcher_item_app = /usr/share/applications/geany.desktop
 launcher_item_app = /usr/share/applications/exo-web-browser.desktop
@@ -178,7 +178,7 @@ time2_timezone =
 time2_font = Ubuntu Light 0
 clock_font_color = #ffffff 100
 clock_padding = 10 4
-clock_background_id = 4
+clock_background_id = 5
 clock_tooltip =
 clock_tooltip_timezone =
 clock_lclick_command = gsimplecal
@@ -199,9 +199,9 @@ battery_font_color = #b5b5b5 100
 bat1_format =
 bat2_format =
 battery_padding = 4 2
-battery_background_id = 4
+battery_background_id = 5
 battery_hide = 101
-battery_lclick_command =
+battery_lclick_command = xfce4-power-manager-settings
 battery_rclick_command = xfce4-power-manager-settings
 battery_mclick_command =
 battery_uwheel_command =
@@ -209,16 +209,28 @@ battery_dwheel_command =
 ac_connected_cmd =
 ac_disconnected_cmd =
 
+#-------------------------------------
+# Button 1
+button = new
+button_icon = /usr/share/icons/ArchLabs-Dark/32x32/places/distributor-logo-archlabs.png
+button_text =
+button_lclick_command= jgmenu_run lx
+button_rclick_command= exo-open ~/.config/jgmenu/jgmenurc
+button_mclick_command=
+button_uwheel_command=
+button_dwheel_command=
+button_font_color = #000000 100
+button_padding = 8 2
+button_background_id = 5
+button_centered = 1
+button_max_icon_size = 22
+
 #-------------------------------------
 # Tooltip
 tooltip_show_timeout = 0
 tooltip_hide_timeout = 0
-tooltip_padding = 2 2
+tooltip_padding = 10 6
 tooltip_background_id = 6
 tooltip_font_color = #d8d8d8 100
 tooltip_font = Ubuntu 10
 
-button = new
-button_icon = /usr/share/icons/ArchLabs-Dark/32x32/places/distributor-logo-archlabs.png
-button_max_icon_size = 22
-button_lclick_command= jgmenu_run lx
diff --git a/home/.config/tint2/tint2rc b/home/.config/tint2/tint2rc
index e6ba802d..cc209116 100755
--- a/home/.config/tint2/tint2rc
+++ b/home/.config/tint2/tint2rc
@@ -3,18 +3,18 @@
 #-------------------------------------
 # Backgrounds
 # Background 1: Active task
-rounded = 4
+rounded = 0
 border_width = 3
 border_sides = T
 background_color = #888888 0
 border_color = #1793d1 100
-background_color_hover = #0028fe 22
+background_color_hover = #888888 20
 border_color_hover = #1793d1 100
-background_color_pressed = #888888 0
+background_color_pressed = #888888 20
 border_color_pressed = #1793d1 100
 
 # Background 2: Default task, Iconified task
-rounded = 4
+rounded = 0
 border_width = 0
 border_sides = TBLR
 background_color = #000000 0
@@ -25,52 +25,52 @@ background_color_pressed = #888888 20
 border_color_pressed = #888888 20
 
 # Background 3: Urgent task
-rounded = 4
-border_width = 2
+rounded = 0
+border_width = 3
 border_sides = T
 background_color = #888888 0
 border_color = #e64141 100
-background_color_hover = #888888 0
+background_color_hover = #888888 20
 border_color_hover = #e64141 100
-background_color_pressed = #888888 0
+background_color_pressed = #888888 20
 border_color_pressed = #e64141 100
 
-# Background 4: Battery, Clock, Inactive desktop name, Inactive taskbar, Launcher, Launcher icon, Systray
-rounded = 4
-border_width = 2
+# Background 4: Inactive desktop name, Inactive taskbar
+rounded = 0
+border_width = 0
 border_sides = LR
-background_color = #2b303b 78
+background_color = #2b303b 80
 border_color = #000000 0
-background_color_hover = #0112f0 14
+background_color_hover = #888888 20
 border_color_hover = #000000 0
-background_color_pressed = #0023ff 20
+background_color_pressed = #888888 20
 border_color_pressed = #000000 0
 
-# Background 5: Active desktop name, Active taskbar
-rounded = 4
-border_width = 2
+# Background 5: Active desktop name, Active taskbar, Battery, Button, Clock, Launcher, Systray
+rounded = 0
+border_width = 0
 border_sides = LR
-background_color = #35415d 86
+background_color = #2b303b 90
 border_color = #d8d8d8 0
-background_color_hover = #d8d8d8 8
+background_color_hover = #d8d8d8 0
 border_color_hover = #d8d8d8 0
-background_color_pressed = #d8d8d8 8
+background_color_pressed = #d8d8d8 0
 border_color_pressed = #d8d8d8 0
 
 # Background 6: Tooltip
-rounded = 4
+rounded = 0
 border_width = 0
 border_sides = TBLR
-background_color = #222222 90
+background_color = #2b303b 100
 border_color = #222222 90
-background_color_hover = #222222 90
+background_color_hover = #2b303b 100
 border_color_hover = #222222 90
-background_color_pressed = #222222 90
+background_color_pressed = #2b303b 100
 border_color_pressed = #222222 90
 
 #-------------------------------------
 # Panel
-panel_items = PLTSC
+panel_items = PLTC
 panel_size = 100% 30
 panel_margin = 0 0
 panel_padding = 0 0 0
@@ -97,17 +97,17 @@ mouse_pressed_icon_asb = 100 0 0
 # Taskbar
 taskbar_mode = multi_desktop
 taskbar_hide_if_empty = 1
-taskbar_padding = 6 0 6
+taskbar_padding = 0 0 0
 taskbar_background_id = 4
 taskbar_active_background_id = 5
-taskbar_name = 1
+taskbar_name = 0
 taskbar_hide_inactive_tasks = 0
 taskbar_hide_different_monitor = 1
 taskbar_hide_different_desktop = 0
 taskbar_always_show_all_desktop_tasks = 0
-taskbar_name_padding = 2 0
-taskbar_name_background_id = 4
-taskbar_name_active_background_id = 5
+taskbar_name_padding = 4 4
+taskbar_name_background_id = 0
+taskbar_name_active_background_id = 0
 taskbar_name_font = Ubuntu 10
 taskbar_name_font_color = #828282 100
 taskbar_name_active_font_color = #a0a0bd 100
@@ -122,7 +122,7 @@ task_icon = 1
 task_centered = 1
 urgent_nb_of_blink = 20
 task_maximum_size = 36 30
-task_padding = 4 3 2
+task_padding = 6 2 4
 task_font = Ubuntu 10
 task_tooltip = 1
 task_font_color = #828282 60
@@ -138,15 +138,15 @@ task_active_background_id = 1
 task_urgent_background_id = 3
 task_iconified_background_id = 2
 mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
+mouse_middle = close
+mouse_right = none
 mouse_scroll_up = toggle
 mouse_scroll_down = iconify
 
 #-------------------------------------
 # System tray (notification area)
 systray_padding = 8 2 4
-systray_background_id = 4
+systray_background_id = 5
 systray_sort = right2left
 systray_icon_size = 16
 systray_icon_asb = 100 0 0
@@ -156,14 +156,14 @@ systray_name_filter =
 #-------------------------------------
 # Launcher
 launcher_padding = 5 0 5
-launcher_background_id = 4
-launcher_icon_background_id = 4
+launcher_background_id = 5
+launcher_icon_background_id = 0
 launcher_icon_size = 24
 launcher_icon_asb = 100 0 0
 launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/thunar-settings.desktop
+launcher_item_app = /usr/share/applications/exo-file-manager.desktop
 launcher_item_app = /usr/share/applications/exo-terminal-emulator.desktop
 launcher_item_app = /usr/share/applications/geany.desktop
 launcher_item_app = /usr/share/applications/exo-web-browser.desktop
@@ -178,7 +178,7 @@ time2_timezone =
 time2_font = Ubuntu Light 0
 clock_font_color = #ffffff 100
 clock_padding = 10 4
-clock_background_id = 4
+clock_background_id = 5
 clock_tooltip =
 clock_tooltip_timezone =
 clock_lclick_command = gsimplecal
@@ -199,9 +199,9 @@ battery_font_color = #b5b5b5 100
 bat1_format =
 bat2_format =
 battery_padding = 4 2
-battery_background_id = 4
+battery_background_id = 5
 battery_hide = 101
-battery_lclick_command =
+battery_lclick_command = xfce4-power-manager-settings
 battery_rclick_command = xfce4-power-manager-settings
 battery_mclick_command =
 battery_uwheel_command =
@@ -209,16 +209,28 @@ battery_dwheel_command =
 ac_connected_cmd =
 ac_disconnected_cmd =
 
+#-------------------------------------
+# Button 1
+button = new
+button_icon = /usr/share/icons/ArchLabs-Dark/32x32/places/distributor-logo-archlabs.png
+button_text =
+button_lclick_command= jgmenu_run lx
+button_rclick_command= exo-open ~/.config/jgmenu/jgmenurc
+button_mclick_command=
+button_uwheel_command=
+button_dwheel_command=
+button_font_color = #000000 100
+button_padding = 8 2
+button_background_id = 5
+button_centered = 1
+button_max_icon_size = 22
+
 #-------------------------------------
 # Tooltip
 tooltip_show_timeout = 0
 tooltip_hide_timeout = 0
-tooltip_padding = 2 2
+tooltip_padding = 10 6
 tooltip_background_id = 6
 tooltip_font_color = #d8d8d8 100
 tooltip_font = Ubuntu 10
 
-button = new
-button_icon = /usr/share/icons/ArchLabs-Dark/32x32/places/distributor-logo-archlabs.png
-button_max_icon_size = 22
-button_lclick_command= jgmenu_run lx
diff --git a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1033.rc b/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1033.rc
deleted file mode 100755
index fd8f8201..00000000
--- a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1033.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[DEBC8E9CBC8E6EB9]
-row=3
-col=0
-
-[Trash]
-row=0
-col=0
-
-[/]
-row=1
-col=0
-
-[/home/smoke]
-row=2
-col=0
-
diff --git a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1064.rc b/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1064.rc
deleted file mode 100755
index 3650957c..00000000
--- a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x1064.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[Trash]
-row=0
-col=0
-
-[/]
-row=1
-col=0
-
-[/home/smoke]
-row=2
-col=0
-
diff --git a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x984.rc b/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x984.rc
deleted file mode 100755
index 3650957c..00000000
--- a/home/.config/xfce4/al-xfce-configs/desktop/icons.screen0-1904x984.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[Trash]
-row=0
-col=0
-
-[/]
-row=1
-col=0
-
-[/home/smoke]
-row=2
-col=0
-
diff --git a/home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc b/home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc
index 5c632978..58b15332 100755
--- a/home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc
+++ b/home/.config/xfce4/al-xfce-configs/panel/whiskermenu-1.rc
@@ -1,7 +1,7 @@
 favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop
 recent=exo-web-browser.desktop,exo-mail-reader.desktop,exo-file-manager.desktop,exo-terminal-emulator.desktop
 button-title=ArchLabs
-button-icon=/etc/skel/.config/neofetch/archlabs-dark.png
+button-icon=/usr/share/icons/ArchLabs-Dark/64x64/places/distributor-logo-archlabs.png
 button-single-row=false
 show-button-title=true
 show-button-icon=true
diff --git a/home/.config/xfce4/al-xfce-configs/terminal/accels.scm b/home/.config/xfce4/al-xfce-configs/terminal/accels.scm
deleted file mode 100644
index b5ea578d..00000000
--- a/home/.config/xfce4/al-xfce-configs/terminal/accels.scm
+++ /dev/null
@@ -1,53 +0,0 @@
-; xfce4-terminal GtkAccelMap rc-file         -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-4" "<Alt>4")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-3" "<Alt>3")
-; (gtk_accel_path "<Actions>/terminal-window/file-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/close-other-tabs" "")
-; (gtk_accel_path "<Actions>/terminal-window/search" "<Primary><Shift>f")
-; (gtk_accel_path "<Actions>/terminal-window/next-tab" "<Primary>Page_Down")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-1" "<Alt>1")
-; (gtk_accel_path "<Actions>/terminal-window/show-menubar" "")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-reset" "<Primary>0")
-; (gtk_accel_path "<Actions>/terminal-window/terminal-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/close-window" "<Primary><Shift>q")
-; (gtk_accel_path "<Actions>/terminal-window/close-tab" "<Primary><Shift>w")
-; (gtk_accel_path "<Actions>/terminal-window/save-contents" "")
-; (gtk_accel_path "<Actions>/terminal-window/new-tab" "<Primary><Shift>t")
-; (gtk_accel_path "<Actions>/terminal-window/view-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/show-toolbar" "")
-; (gtk_accel_path "<Actions>/terminal-window/paste" "<Primary><Shift>v")
-; (gtk_accel_path "<Actions>/terminal-window/copy" "<Primary><Shift>c")
-; (gtk_accel_path "<Actions>/terminal-window/edit-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/fullscreen" "F11")
-; (gtk_accel_path "<Actions>/terminal-window/read-only" "")
-; (gtk_accel_path "<Actions>/terminal-window/detach-tab" "<Primary><Shift>d")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-8" "<Alt>8")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-2" "<Alt>2")
-; (gtk_accel_path "<Actions>/terminal-window/prev-tab" "<Primary>Page_Up")
-; (gtk_accel_path "<Actions>/terminal-window/move-tab-left" "<Primary><Shift>Page_Up")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-in" "<Primary>plus")
-; (gtk_accel_path "<Actions>/terminal-window/search-prev" "")
-; (gtk_accel_path "<Actions>/terminal-window/reset-and-clear" "")
-; (gtk_accel_path "<Actions>/terminal-window/about" "")
-; (gtk_accel_path "<Actions>/terminal-window/search-next" "")
-(gtk_accel_path "<Actions>/terminal-window/toggle-menubar" "F10")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-7" "<Alt>7")
-; (gtk_accel_path "<Actions>/terminal-window/select-all" "<Primary><Shift>a")
-; (gtk_accel_path "<Actions>/terminal-window/help-menu" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-9" "<Alt>9")
-; (gtk_accel_path "<Actions>/terminal-window/show-borders" "")
-; (gtk_accel_path "<Actions>/terminal-window/preferences" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-6" "<Alt>6")
-; (gtk_accel_path "<Actions>/terminal-window/contents" "F1")
-; (gtk_accel_path "<Actions>/terminal-window/new-window" "<Primary><Shift>n")
-; (gtk_accel_path "<Actions>/terminal-window/move-tab-right" "<Primary><Shift>Page_Down")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-out" "<Primary>minus")
-; (gtk_accel_path "<Actions>/terminal-window/set-title" "<Primary><Shift>s")
-; (gtk_accel_path "<Actions>/terminal-window/paste-selection" "")
-; (gtk_accel_path "<Actions>/terminal-window/undo-close-tab" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-5" "<Alt>5")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/reset" "")
-; (gtk_accel_path "<Actions>/terminal-window/tabs-menu" "")
diff --git a/home/.config/xfce4/terminal/accels.scm b/home/.config/xfce4/terminal/accels.scm
deleted file mode 100644
index b5ea578d..00000000
--- a/home/.config/xfce4/terminal/accels.scm
+++ /dev/null
@@ -1,53 +0,0 @@
-; xfce4-terminal GtkAccelMap rc-file         -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-4" "<Alt>4")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-3" "<Alt>3")
-; (gtk_accel_path "<Actions>/terminal-window/file-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/close-other-tabs" "")
-; (gtk_accel_path "<Actions>/terminal-window/search" "<Primary><Shift>f")
-; (gtk_accel_path "<Actions>/terminal-window/next-tab" "<Primary>Page_Down")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-1" "<Alt>1")
-; (gtk_accel_path "<Actions>/terminal-window/show-menubar" "")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-reset" "<Primary>0")
-; (gtk_accel_path "<Actions>/terminal-window/terminal-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/close-window" "<Primary><Shift>q")
-; (gtk_accel_path "<Actions>/terminal-window/close-tab" "<Primary><Shift>w")
-; (gtk_accel_path "<Actions>/terminal-window/save-contents" "")
-; (gtk_accel_path "<Actions>/terminal-window/new-tab" "<Primary><Shift>t")
-; (gtk_accel_path "<Actions>/terminal-window/view-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/show-toolbar" "")
-; (gtk_accel_path "<Actions>/terminal-window/paste" "<Primary><Shift>v")
-; (gtk_accel_path "<Actions>/terminal-window/copy" "<Primary><Shift>c")
-; (gtk_accel_path "<Actions>/terminal-window/edit-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/fullscreen" "F11")
-; (gtk_accel_path "<Actions>/terminal-window/read-only" "")
-; (gtk_accel_path "<Actions>/terminal-window/detach-tab" "<Primary><Shift>d")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-8" "<Alt>8")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-2" "<Alt>2")
-; (gtk_accel_path "<Actions>/terminal-window/prev-tab" "<Primary>Page_Up")
-; (gtk_accel_path "<Actions>/terminal-window/move-tab-left" "<Primary><Shift>Page_Up")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-in" "<Primary>plus")
-; (gtk_accel_path "<Actions>/terminal-window/search-prev" "")
-; (gtk_accel_path "<Actions>/terminal-window/reset-and-clear" "")
-; (gtk_accel_path "<Actions>/terminal-window/about" "")
-; (gtk_accel_path "<Actions>/terminal-window/search-next" "")
-(gtk_accel_path "<Actions>/terminal-window/toggle-menubar" "F10")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-7" "<Alt>7")
-; (gtk_accel_path "<Actions>/terminal-window/select-all" "<Primary><Shift>a")
-; (gtk_accel_path "<Actions>/terminal-window/help-menu" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-9" "<Alt>9")
-; (gtk_accel_path "<Actions>/terminal-window/show-borders" "")
-; (gtk_accel_path "<Actions>/terminal-window/preferences" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-6" "<Alt>6")
-; (gtk_accel_path "<Actions>/terminal-window/contents" "F1")
-; (gtk_accel_path "<Actions>/terminal-window/new-window" "<Primary><Shift>n")
-; (gtk_accel_path "<Actions>/terminal-window/move-tab-right" "<Primary><Shift>Page_Down")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-out" "<Primary>minus")
-; (gtk_accel_path "<Actions>/terminal-window/set-title" "<Primary><Shift>s")
-; (gtk_accel_path "<Actions>/terminal-window/paste-selection" "")
-; (gtk_accel_path "<Actions>/terminal-window/undo-close-tab" "")
-(gtk_accel_path "<Actions>/terminal-window/goto-tab-5" "<Alt>5")
-; (gtk_accel_path "<Actions>/terminal-window/zoom-menu" "")
-; (gtk_accel_path "<Actions>/terminal-window/reset" "")
-; (gtk_accel_path "<Actions>/terminal-window/tabs-menu" "")
diff --git a/home/.xinitrc b/home/.xinitrc
index 09b13255..e78bfab4 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -1,13 +1,14 @@
 #!/bin/sh
 #
 # ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
+# Executed by startx 
+# By calling this with arguments we can start different sessions
+# eg. startx ~/.xinitrc i3  or  startx ~/.xinitrc bspwm
+# simply using startx, openbox is set as the default
 
+session=${1:-openbox}
 
-XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CONFIG_HOME
-
+# source files in /etc/X11/xinit/xinitrc.d
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
     for f in /etc/X11/xinit/xinitrc.d/*; do
         [ -x "$f" ] && . "$f"
@@ -15,8 +16,28 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     unset f
 fi
 
-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-    eval `dbus-launch --sh-syntax --exit-with-session`
-fi
+# this must be before the 'exec' command
+# it sources ~/.xprofile for additional settings
+[ -f ~/.xprofile ] && . ~/.xprofile
 
-exec openbox-session
+# start the session
+case $session in
+    i3|i3wm) 
+        exec i3
+        ;;
+    bsp|bspwm)
+        exec bspwm
+        ;;
+    awesome)
+        exec awesome
+        ;;
+    xfce|xfce4) 
+        exec startxfce4
+        ;;
+    openbox|openbox-session) 
+        exec openbox-session
+        ;;
+    *) 
+        exec $1
+        ;;
+esac
diff --git a/home/.xprofile b/home/.xprofile
old mode 100644
new mode 100755
index c3fbd6a7..52b7b071
--- a/home/.xprofile
+++ b/home/.xprofile
@@ -1,18 +1,21 @@
 # .xprofile
+# lightdm sources this file at boot
+# as well as our own xinitrc with startx
 
 XDG_CONFIG_HOME=$HOME/.config
 export XDG_CONFIG_HOME
+
+# include ~/bin in path
 export PATH=$HOME/bin:$PATH
 
 # include sbin in PATH
 if [ -d "/sbin" ] ; then
-  PATH="/sbin:$PATH"
+    PATH="/sbin:$PATH"
 fi
-
 if [ -d "/usr/sbin" ] ; then
-  PATH="/usr/sbin:$PATH"
+    PATH="/usr/sbin:$PATH"
 fi
 
 if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-  eval `dbus-launch --sh-syntax --exit-with-session`
+    eval `dbus-launch --sh-syntax --exit-with-session`
 fi
diff --git a/home/.xserverrc b/home/.xserverrc
index 0674fe83..89a94315 100755
--- a/home/.xserverrc
+++ b/home/.xserverrc
@@ -1,38 +1,7 @@
 #!/bin/sh
+#
+# executed by xinit when using startx
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-export PATH=$HOME/bin:$PATH
-XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CONFIG_HOME
-
-
-# merge in defaults and keymaps
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-exec openbox-session
+# make sure to be runnning in authenticated session with logind
+# this will make it so you cannot bypass screenlock by switching terminals
+exec /usr/bin/Xorg -nolisten tcp "$@" vt$XDG_VTNR
diff --git a/home/bin/check-network b/home/bin/check-network
index 95acaba6..76f9d8f5 100755
--- a/home/bin/check-network
+++ b/home/bin/check-network
@@ -4,10 +4,10 @@ connected=""
 disconnected=""
 
 while true; do
-  if ping -c1 8.8.8.8 >/dev/null; then
-    echo "$connected"; sleep 10
-  else
-    echo "$disconnected"; sleep 1
-    echo "$connected"; sleep 1
-  fi
+    if ping -c1 8.8.8.8 >/dev/null; then
+        echo "$connected"; sleep 10
+    else
+        echo "$disconnected"; sleep 1
+        echo "$connected"; sleep 1
+    fi
 done
diff --git a/home/bin/polybar-trash b/home/bin/polybar-trash
index c092deb7..c64d1bee 100755
--- a/home/bin/polybar-trash
+++ b/home/bin/polybar-trash
@@ -3,20 +3,20 @@
 TRASH_DIRECTORY="${BLOCK_INSTANCE}"
 
 if [[ "${TRASH_DIRECTORY}" = "" ]]; then
-  TRASH_DIRECTORY="${XDG_DATA_HOME:-${HOME}/.local/share}/Trash"
+    TRASH_DIRECTORY="${XDG_DATA_HOME:-${HOME}/.local/share}/Trash"
 fi
 
 # Left click
 if [[ "${BLOCK_BUTTON}" -eq 1 ]]; then
-  xdg-open "${TRASH_DIRECTORY}/files"
-# Right click
+    xdg-open "${TRASH_DIRECTORY}/files"
+    # Right click
 elif [[ "${BLOCK_BUTTON}" -eq 3 ]]; then
-  # Delete all files permanently (unlink them)
-  rm -r "${TRASH_DIRECTORY}/files"
-  rm -r "${TRASH_DIRECTORY}/info"
-  # Create new directory
-  mkdir "${TRASH_DIRECTORY}/files"
-  mkdir "${TRASH_DIRECTORY}/info"
+    # Delete all files permanently (unlink them)
+    rm -r "${TRASH_DIRECTORY}/files"
+    rm -r "${TRASH_DIRECTORY}/info"
+    # Create new directory
+    mkdir "${TRASH_DIRECTORY}/files"
+    mkdir "${TRASH_DIRECTORY}/info"
 fi
 
 TRASH_COUNT=$(ls -U -1 "${TRASH_DIRECTORY}/files" | wc -l)
@@ -28,5 +28,5 @@ echo "${TRASH_COUNT}"
 echo ""
 
 if [[ "${TRASH_COUNT}" -ge "${URGENT_VALUE}" ]]; then
-  exit 31
+    exit 31
 fi
diff --git a/home/bin/rofi-gorice b/home/bin/rofi-gorice
index 43d7e814..c95b1cc1 100755
--- a/home/bin/rofi-gorice
+++ b/home/bin/rofi-gorice
@@ -1,3 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-rofi -no-config -modi run,drun,window -show drun -eh 1 -line-padding 4 -show-icons -drun-icon-theme "ArchLabs-Light" -padding 50 -sidebar-mode -font "Ubuntu 11" -color-enabled -color-window "#2b303b, #8fa1b3, #2b303b" -color-normal "#2b303b, #8fa1b3, #2b303b, #8fa1b3, #2b303b"
+rofi -no-config -modi run,drun,window -show drun \
+    -eh 1 -line-padding 4 -padding 50 -sidebar-mode \
+    -show-icons -drun-icon-theme "ArchLabs-Light" \
+    -font "Ubuntu 11" -color-enabled \
+    -color-window "#2b303b, #8fa1b3, #2b303b" \
+    -color-normal "#2b303b, #8fa1b3, #2b303b, #8fa1b3, #2b303b"
diff --git a/home/bin/rofi-gorice.template b/home/bin/rofi-gorice.template
index a714962d..ac57645c 100644
--- a/home/bin/rofi-gorice.template
+++ b/home/bin/rofi-gorice.template
@@ -1,3 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-rofi -no-config -modi run,drun,window -show drun -eh 1 -line-padding 4 -show-icons -drun-icon-theme "ArchLabs-Light" -padding 50 -sidebar-mode -font "Ubuntu 11" -color-enabled -color-window "{{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}" -color-normal "{{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}"
+rofi -no-config -modi run,drun,window -show drun \
+    -eh 1 -line-padding 4 -padding 50 -sidebar-mode \
+    -show-icons -drun-icon-theme "ArchLabs-Light" \
+    -font "Ubuntu 11" -color-enabled \
+    -color-window "{{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}" \
+    -color-normal "{{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}"
diff --git a/home/bin/rofi-logout b/home/bin/rofi-logout
index 3e796d90..dc7ac998 100755
--- a/home/bin/rofi-logout
+++ b/home/bin/rofi-logout
@@ -1,32 +1,26 @@
 #!/usr/bin/env bash
 
-if [[ "$(xprop -root | grep -i "openbox")" > /dev/null ]]; then
-    CUR_WM="openbox"
-else
-    CUR_WM=$(xprop -root | grep "_NET_WM_NAME(UTF8_STRING)" | cut -d " " -f 3 | sed 's/"//g' | awk '{print tolower($0)}')
-fi
+question=$(echo " lock| logout| reboot| shutdown" | rofi -sep "|" \
+    -dmenu -i -p 'System: ' "" -width 20 -hide-scrollbar -font "Ubuntu 11" \
+    -eh 1 -line-padding 4 -padding 20 -no-config -lines 4 -color-enabled \
+    -color-window "#2b303b, #8fa1b3, #2b303b" \
+    -color-normal "#2b303b, #8fa1b3, #2b303b, #8fa1b3, #2b303b")
 
-ANS=$(echo " lock| logout| reboot| shutdown" | rofi -sep "|" -dmenu -i -p 'System: ' "" -width 20 -hide-scrollbar -font "Ubuntu 11" -eh 1 -line-padding 4 -padding 20 -no-config -lines 4 -color-enabled -color-window "#1F2326, #F1F1F1, #1F2326" -color-normal "#1F2326, #F1F1F1, #1F2326, #4E88CF, #1F2326")
+case $question in
+    *lock) 
+        i3lock-fancy
+        ;;
+    *logout) 
+        session-logout
+        ;;
+    *reboot) 
+        systemctl reboot
+        ;;
+    *shutdown) 
+        systemctl poweroff
+        ;;
+    *) 
+        :  # do nothing on wrong response
+        ;;
+esac
 
-if [[ "$ANS" == *lock ]]; then
-  i3lock-fancy
-elif [[ "$ANS" == *logout ]]; then
-    if [[ "$CUR_WM" == "i3" ]]; then
-        i3-msg exit
-    elif [[ "$CUR_WM" == "bspwm" ]]; then
-        for window_id in $(bspc query -W); do
-            bspc window $window_id -c
-        done
-        killall sxhkd
-        bspc quit
-    elif [[ "$CUR_WM" == "openbox" ]]; then
-        openbox --exit
-    else
-        echo "Unknown WM... Exiting"
-        exit 1
-    fi
-elif [[ "$ANS" == *reboot ]]; then
-  systemctl reboot
-elif [[ "$ANS" == *shutdown ]]; then
-  systemctl poweroff
-fi
diff --git a/home/bin/rofi-logout.template b/home/bin/rofi-logout.template
index a1d20674..69865a45 100644
--- a/home/bin/rofi-logout.template
+++ b/home/bin/rofi-logout.template
@@ -1,32 +1,25 @@
 #!/usr/bin/env bash
 
-if [[ "$(xprop -root | grep -i "openbox")" > /dev/null ]]; then
-    CUR_WM="openbox"
-else
-    CUR_WM=$(xprop -root | grep "_NET_WM_NAME(UTF8_STRING)" | cut -d " " -f 3 | sed 's/"//g' | awk '{print tolower($0)}')
-fi
+question=$(echo " lock| logout| reboot| shutdown" | rofi -sep "|" \
+    -dmenu -i -p 'System: ' "" -width 20 -hide-scrollbar -font "Ubuntu 11" \
+    -eh 1 -line-padding 4 -padding 20 -no-config -lines 4 -color-enabled \
+    -color-window "{{.Data.terminal_background}}, {{.Data.terminal_foreground}}, {{.Data.terminal_background}}" \
+    -color-normal "{{.Data.terminal_background}}, {{.Data.terminal_foreground}}, {{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}")
 
-ANS=$(echo " lock| logout| reboot| shutdown" | rofi -sep "|" -dmenu -i -p 'System: ' "" -width 20 -hide-scrollbar -font "Ubuntu 11" -eh 1 -line-padding 4 -padding 20 -no-config -lines 4 -color-enabled -color-window "{{.Data.terminal_background}}, {{.Data.terminal_foreground}}, {{.Data.terminal_background}}" -color-normal "{{.Data.terminal_background}}, {{.Data.terminal_foreground}}, {{.Data.terminal_background}}, {{index .Data.terminal_colors 4}}, {{.Data.terminal_background}}")
-
-if [[ "$ANS" == *lock ]]; then
-  i3lock-fancy
-elif [[ "$ANS" == *logout ]]; then
-    if [[ "$CUR_WM" == "i3" ]]; then
-        i3-msg exit
-    elif [[ "$CUR_WM" == "bspwm" ]]; then
-        for window_id in $(bspc query -W); do
-            bspc window $window_id -c
-        done
-        killall sxhkd
-        bspc quit
-    elif [[ "$CUR_WM" == "openbox" ]]; then
-        openbox --exit
-    else
-        echo "Unknown WM... Exiting"
-        exit 1
-    fi
-elif [[ "$ANS" == *reboot ]]; then
-  systemctl reboot
-elif [[ "$ANS" == *shutdown ]]; then
-  systemctl poweroff
-fi
+case $question in
+    *lock) 
+        i3lock-fancy
+        ;;
+    *logout) 
+        session-logout
+        ;;
+    *reboot) 
+        systemctl reboot
+        ;;
+    *shutdown) 
+        systemctl poweroff
+        ;;
+    *) 
+        :  # do nothing on wrong response
+        ;;
+esac
diff --git a/home/bin/session-logout b/home/bin/session-logout
new file mode 100755
index 00000000..f5797219
--- /dev/null
+++ b/home/bin/session-logout
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+
+# check which wm were using, case insensitive
+WMS=(bspwm i3 openbox)
+for i in ${WMS[@]}; do
+    if [[ "$(wmctrl -m | grep -i name | awk '{print tolower($2)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(xprop -root -notype | grep "WM_NAME =" | tr -d '"' | awk '{print tolower($3)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(awk '{print tolower($0)}' <<< $XDG_CURRENT_DESKTOP)" == "$i" ]]; then
+        WM=$i && break
+    fi  
+done
+
+# do the logout
+case $WM in
+    i3)
+        i3-msg exit
+        ;;
+    bspwm)
+        for window_id in $(bspc query -W); do
+            bspc window $window_id -c
+        done
+        killall sxhkd
+        bspc quit
+        ;;
+    openbox)
+        openbox --exit
+        ;;
+    *)
+        echo "WM not yet supported.. Exiting"
+        exit 0
+        ;;
+esac
+
diff --git a/home/bin/start-polybar b/home/bin/start-polybar
index 4ef4f4a3..140d969b 100755
--- a/home/bin/start-polybar
+++ b/home/bin/start-polybar
@@ -1,44 +1,53 @@
 #!/usr/bin/env bash
 
-#
 # Polybar launcher script written by Nathaniel Maia for use in ArchLabs
 # Will launch bars depending on WM 
 # Can also be used to reload openbox session with [--reload] or [-r]
 
 
-# Enter your bar names here (seperated by spaces) eg BARS=(bar bar1 my-bar)
-# This will be combined with CUR_WM eg. openbox-bar, bspwm-bar, i3-bar
+# Enter your bar names here (seperated by spaces) eg. BARS=(bar bar1 my-bar)
+# This will be combined with CUR_WM in WMS below  eg. openbox-bar, bspwm-bar1, i3-my-bar etc.
+# by default it is set up in WM-BAR naming format
 BARS=(bar)
 CONFIG=$HOME/.config/polybar/config
+WMS=(bspwm i3 openbox)
 
+HELP="\nUSAGE:\n\tstart-polybar [OPTIONS]
+\nOPTIONS:\n\t--reload, -r\tIf running in openbox, will reload the session
+\t--help, -h\tPrint this usage message and exit
+\n\tWith no options the script will stop and reload polybar"
 
-if [[ "$(xprop -root | grep -i "openbox")" > /dev/null ]]; then
-    CUR_WM="openbox"
-else
-    CUR_WM=$(xprop -root | grep "_NET_WM_NAME(UTF8_STRING)" | cut -d " " -f 3 | sed 's/"//g' | awk '{print tolower($0)}')
-fi
+for i in ${WMS[@]}; do
+    if [[ "$(wmctrl -m | grep -i name | awk '{print tolower($2)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(xprop -root -notype | grep "WM_NAME =" | tr -d '"' | awk '{print tolower($3)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(awk '{print tolower($0)}' <<< $XDG_CURRENT_DESKTOP)" == "$i" ]]; then
+        WM=$i && break
+    fi  
+done
 
-# Reload openbox session
-if [[ $1 == "--reload" ]] && [[ $CUR_WM == "openbox" ]]; then
-    openbox --restart
-    al-compositor --restart
-    al-tint2restart
-elif [[ $1 == "--reload" ]]; then 
-    echo "[WARN]:  Option [--reload] is meant for Openbox..."
-fi
+case "$@" in
+    *help|-h)
+        echo -e $HELP && exit 0
+        ;;
+    *reload|-r)
+        if [[ "$CUR_WM" == "openbox" ]]; then
+            openbox --restart
+            al-compositor --restart && al-tint2restart
+        fi
+        ;;
+    *)
+        :
+        ;;
+esac
 
-# Drop out if tint2 is running
 if pgrep tint2 >/dev/null; then
-    echo "Tint is running...  Exiting"
-    exit 0
+    echo "Tint is running...  Exiting" && exit 0
 else
-    # Terminate already running Bars
     while pgrep polybar >/dev/null; do
-        pkill polybar
-        sleep 0.5
+        pkill polybar && sleep 0.5
     done
-
-    # Launch each bar in BARS=() above
     echo "Using $CUR_WM...  Launching Bars"
     for bar in "${BARS[@]}"; do
         polybar -r --config=$CONFIG ${CUR_WM}-$bar &
diff --git a/home/bin/stop-polybar b/home/bin/stop-polybar
index d5f658e7..db443a0e 100755
--- a/home/bin/stop-polybar
+++ b/home/bin/stop-polybar
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 while pgrep polybar >/dev/null; do
-    killall -q polybar
-    sleep 0.5
+    killall -q polybar && sleep 0.5
 done
 echo "Bars stopped..."
diff --git a/home/bin/toggle-caffeine b/home/bin/toggle-caffeine
index a25fc94f..b0f84940 100755
--- a/home/bin/toggle-caffeine
+++ b/home/bin/toggle-caffeine
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 # if the script is passed --toggle
-if [[ "$1" == *toggle* ]] && pgrep caffeine >/dev/null; then
+if [[ $1 == *toggle* ]] && pgrep caffeine >/dev/null; then
     killall caffeine && exit 0
-elif [[ "$1" == *toggle* ]]; then
+elif [[ $1 == *toggle* ]]; then
     caffeine &>/dev/null && exit 0
 fi
 
diff --git a/home/bin/toggle-compton b/home/bin/toggle-compton
index d4ffef06..7e67e0b3 100755
--- a/home/bin/toggle-compton
+++ b/home/bin/toggle-compton
@@ -9,8 +9,12 @@ elif [[ $1 == *toggle* ]]; then
     al-compositor --start && exit 0
 fi
 
-if pgrep compton >/dev/null; then
-	echo "$on"
-else
-	echo "%{F#888888}$off"
-fi
+while true; do
+    if pgrep compton >/dev/null; then
+        echo "$on"
+    else
+        echo "%{F#888888}$off"
+    fi
+    sleep 2
+done
+
diff --git a/home/bin/toggle-redshift b/home/bin/toggle-redshift
index 3985da76..ea52259f 100755
--- a/home/bin/toggle-redshift
+++ b/home/bin/toggle-redshift
@@ -4,25 +4,29 @@ if [[ $1 = "--toggle" ]] || [[ $1 = "-t" ]]; then
   if pgrep redshift >/dev/null; then
     pkill redshift 
   else
-    redshift &
+    redshift-gtk &
   fi
   exit 0
 fi
 
-
 icon=""
-pgrep -x redshift &> /dev/null
-if [[ $? -eq 0 ]]; then
-  temp=$(redshift -p 2>/dev/null | grep temp | cut -d' ' -f3)
-  temp=${temp//K/}
-fi
 
-if [[ -z $temp ]]; then
-  echo " $icon "       # Greyed out (not running)
-elif [[ $temp -ge 5000 ]]; then
-  echo "%{F#8039A0} $icon "       # Blue
-elif [[ $temp -ge 4000 ]]; then
-  echo "%{F#F203F0} $icon "       # Yellow
-else
-  echo "%{F#FF5B6C} $icon "       # Orange
-fi
+while true; do
+    pgrep -x redshift &> /dev/null
+    if [[ $? -eq 0 ]]; then
+        temp=$(redshift -p 2>/dev/null | grep temp | cut -d' ' -f3)
+        temp=${temp//K/}
+    fi
+
+    if [[ -z $temp ]]; then
+        echo " $icon "       # Greyed out (not running)
+    elif [[ $temp -ge 5000 ]]; then
+        echo "%{F#8039A0} $icon "       # Blue
+    elif [[ $temp -ge 4000 ]]; then
+        echo "%{F#F203F0} $icon "       # Yellow
+    else
+        echo "%{F#FF5B6C} $icon "       # Orange
+    fi
+    sleep 2
+done
+
diff --git a/upgrade-archlabs b/upgrade-archlabs
index bc7ec52a..95cf4ffe 100755
--- a/upgrade-archlabs
+++ b/upgrade-archlabs
@@ -6,165 +6,127 @@
 # Written by Nathaniel Maia <natemaia10@gmail.com>
 #
 
+yes="y"
+no="n"
 REPO='
 [archlabs_repo]
 Server = https://archlabs.github.io/archlabs_repo/$arch
 Server = https://downloads.sourceforge.net/project/archlabs-repo/archlabs_repo/$arch'
 
+HFILES=("$HOME/bin" "$HOME/.config" "$HOME/.themes" "$HOME/.gtkrc-2.0"
+        "$HOME/.gorice" "$HOME/.Xresources" "$HOME/.Xresources.template"
+        "$HOME/.mozilla" "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.icons"
+        "$HOME/.local" "$HOME/.xprofile" "$HOME/.xserverrc" "$HOME/.xinitrc")
+
+CFILES=("$HOME/.config/awesome" "$HOME/.config/jgmenu" "$HOME/.config/bspwm"
+        "$HOME/.config/dunst" "$HOME/.config/i3" "$HOME/.config/obmenu-generator"
+        "$HOME/.config/qt5ct" "$HOME/.config/Thunar" "$HOME/.config/conky"
+        "$HOME/.config/geany" "$HOME/.config/neofetch" "$HOME/.config/polybar"
+        "$HOME/.config/termite" "$HOME/.config/xfce4" "$HOME/.config/openbox"
+        "$HOME/.config/ob-autostart")
+
+SFILES=('/etc/skel/bin' '/etc/skel/.config' '/etc/skel/.themes' '/etc/skel/.gorice'
+        '/etc/skel/.Xresources' '/etc/skel/.Xresources.template' '/etc/skel/.mozilla'
+        '/etc/skel/.zshrc' '/etc/skel/.bashrc' '/etc/skel/.icons' '/etc/skel/.local'
+        '/etc/skel/.xprofile' '/etc/skel/.xserverrc' '/etc/skel/.xinitrc' '/etc/skel/.gtkrc-2.0')
+
 KEYS=('AEFB411B072836CD48FF0381AE252C284B5DBA5D'
       '9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0'
       '35F52A02854DCCAEC9DD5CC410443C7F54B00041')
-curWM=$(wmctrl -m | grep Name | cut -d " " -f2)
-yes="y"
-no="n"
-
 
+WMS=(bspwm i3 openbox)
+for i in ${WMS[@]}; do
+    if [[ "$(wmctrl -m | grep -i name | awk '{print tolower($2)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(xprop -root -notype | grep "WM_NAME =" | tr -d '"' | awk '{print tolower($3)}')" == "$i" ]]; then
+        WM=$i && break
+    elif [[ "$(awk '{print tolower($0)}' <<< $XDG_CURRENT_DESKTOP)" == "$i" ]]; then
+        WM=$i && break
+    fi  
+done
 
 # Loop until network connected
+net=$(ping -c1 8.8.8.8 2>&1)
 while ! [[ $net >/dev/null ]]; do
-  net=$(ping -c1 8.8.8.8 2>&1)
-  echo -e "Please Connect to a Network Before Continuing"
-  clear; sleep 1
+    net=$(ping -c1 8.8.8.8 2>&1)
+    echo -e "Please Connect to a Network Before Continuing"
+    clear; sleep 1
 done
 
-
-
 setupKeyring() {
+    sudo dirmngr </dev/null
+    sudo pacman-key --init
+    sudo pacman-key --populate archlinux
+    for key in ${KEYS[@]}; do
+        if ! sudo pacman-key --list-keys | grep $key > /dev/null 2>&1; then
+            gpg --receive-keys $key
+            sudo pacman-key -r $key
+        fi
+    done
+    sudo pacman -S archlabs-keyring --needed --noconfirm
+    sudo pacman-key --populate archlabs
 
-clear
-echo "############################################################################################
-########             Setting up keyring & Adding repo to pacman.conf               #########
-############################################################################################"
-sleep 2
-
-# import each key and populate the keyring
-sudo pacman-key --init
-sudo pacman-key --populate archlinux
-for key in "${KEYS[@]}"; do
-  if ! sudo pacman-key --list-keys | grep $key > /dev/null 2>&1; then
-    gpg --receive-keys $key
-    sudo pacman-key -r $key
-  fi
-done
-
-
-# add $REPO to pacman.conf
-if ! grep "archlabs_repo" /etc/pacman.conf > /dev/null 2>&1; then
-  echo "$REPO" | sudo tee -a /etc/pacman.conf > /dev/null 2>&1
-
-else  # if entries exist remove them
-  sudo sed -i '/archlabs_repo/d' /etc/pacman.conf
-  echo "$REPO" | sudo tee -a /etc/pacman.conf > /dev/null 2>&1
-
-fi
-
-
-# finish populating the keyring
-sudo pacman -S archlabs-keyring --needed --noconfirm
-sudo pacman-key --populate archlabs
-
-
+    if grep "archlabs_repo" /etc/pacman.conf > /dev/null 2>&1; then
+        sudo sed -i '/archlabs_repo/d' /etc/pacman.conf
+    fi
+    echo $REPO | sudo tee -a /etc/pacman.conf > /dev/null 2>&1
 }
 
-
-
 backupConfigs() {
-
-clear
-echo "############################################################################################
-########   Backing up configs to /home/$USER/Downloads/$USER-config-backup.tar.gz  #########
-############################################################################################"
-
-# Backup configs to $HOME/Downloads/ if backup doesn't exist already
-if ! [ -e "$HOME/Downloads/$USER-config-backup.tar.gz" ]; then
-  tar czvf "$HOME/Downloads/$USER-config-backup.tar.gz" "$HOME"/.{config,Xresources,zshrc,bashrc,icons,xsession,xsessionrc,xinitrc} > /dev/null 2>&1
-
-else
-  echo "[WARNING]  Backup already exists... Not overwriting"
-  sleep 2
-
-fi
-
-
+    if ! [ -e "$HOME/Downloads/$USER-backup.tar.gz" ]; then
+        tar czvf $HOME/Downloads/$USER-backup.tar.gz ${HFILES[@]} > /dev/null 2>&1
+    else
+        echo "[WARNING]  Backup already exists... Not overwriting"
+        sleep 2
+    fi
 }
 
-
-
 setupConfigs() {
-
-clear
-echo "############################################################################################
-########                           Setting up new configs                          #########
-############################################################################################"
-sleep 2
-
-# install packages needed for configs
-sudo pacman -S clutter-gtk libgee gdk-pixbuf2 pango python-yaml --needed --noconfirm
-
-# cleanup ~/.config
-rm -rf "$HOME"/.config/{bspwm,dunst,i3,obmenu-generator,qt5ct,Thunar,conky,geany,neofetch,polybar,termite,xfce4,openbox}
-
-# clean /etc/skel
-sudo rm -rf /etc/skel/*
-
-# Copy configs to /etc/skel
-sudo cp -rf "$PWD"/home/{bin,.ArchLabs-homepage,.config,.themes,.gorice,.Xresources,.Xresources.template,.mozilla,.zshrc,.bashrc,.icons,.local,.xsession,.xsessionrc,.xinitrc} /etc/skel/
-
-# copy /etc (things like lightdm.conf, oblogout.conf, lsb-release)
-sudo cp -rf "$PWD"/etc /
-
-# copy /etc/skel to $HOME
-cp -rf /etc/skel/{bin,.ArchLabs-homepage,.config,.themes,.gorice,.Xresources,.Xresources.template,.mozilla,.zshrc,.bashrc,.icons,.local,.xsession,.xsessionrc,.xinitrc} "$HOME"/
-
-
+    sudo pacman -S clutter-gtk libgee archlabs-jgmenu --needed --noconfirm
+    sudo pacman -S gdk-pixbuf2 pango python-yaml --needed --noconfirm
+    rm -rf ${CFILES[@]}
+    cp -rf ${SFILES[@]} /etc/skel/.zshrc /etc/skel/.bashrc $HOME/
 }
 
 
-
 # first setup Keyring
 setupKeyring
 
-# ask to setup configs
-clear
-printf "\nThis step will get the latest configs for polybar, tint2, openbox, i3, etc.
-\n\nYour existing configs will be backed up to an archive located at:
-\n\t$HOME/Downloads/$USER-config-backup.tar.gz\n\n\n\nDo you want to continue?  [y/N]:"
-read -r answer
-
-if [ "${answer,,}" = "${yes,,}" ]; then
-
-  # backup configs before continuing
-  backupConfigs
-
-  # setupConfigs only if a backup was made
-  if [ -e "$HOME/Downloads/$USER-config-backup.tar.gz" ]; then
-    setupConfigs
-  fi
-
-  # finish up by running setup then reloading everything
-  $HOME/.config/setup
-  if [[ $curWM == i3 ]]; then
-    i3-msg restart
-  else
-    $HOME/.config/polybar/scripts/launch-polybar --reload > /dev/null 2>&1
-  fi
-
-
-else # only setup skel if answered no
-
-  # remove old configs and copy new
-  sudo rm -rf /etc/skel/*
-  sudo cp -rf "$PWD"/home/{bin,.ArchLabs-homepage,.config,.themes,.gorice,.Xresources,.Xresources.template,.mozilla,.zshrc,.bashrc,.icons,.local,.xsession,.xsessionrc,.xinitrc} /etc/skel/
-  sudo cp -rf "$PWD"/etc /
-
+# make sure skel package is installed and updated
+if ! pacman -Q archlabs-user-skel >/dev/null 2>&1; then
+    sudo rm -rf ${SFILES[@]}
+    sudo pacman -S archlabs-user-skel --needed --noconfirm
+else
+    sudo pacman -Syyu --noconfirm
 fi
 
 
+clear
+printf "\nThis step will get the latest configs for polybar, openbox, i3 etc.
+\n\nYour existing configs will be archived to:
+\n\t$HOME/Downloads/$USER-backup.tar.gz\n\n\n\nDo you want to continue?  [y/N]:"
+read -r answer
+
+if [ "${answer,,}" = "${yes,,}" ]; then
+    backupConfigs
+    if [ -e "$HOME/Downloads/$USER-backup.tar.gz" ]; then
+        setupConfigs
+    fi
+
+    rm -f $HOME/.config/keypack
+    sed -i '/keypack/d' $HOME/.config/openbox/autostart
+    $HOME/.config/setup
+
+    if [[ "$WM" == "i3" ]]; then
+        i3-msg restart
+    elif [[ "$WM" == "openbox" ]]; then
+        start-polybar --reload > /dev/null 2>&1
+    fi
+fi
 
 clear
-echo "############################################################################################
-########                       Setup Successfully Completed                        #########
-############################################################################################"
-
+echo "##########################################################
+########            Setup Completed              #########
+##########################################################"
 
 exit 0