diff --git a/home/.config/awesome/rc.lua b/home/.config/awesome/rc.lua
index 4b4037d1..ef79d2e3 100644
--- a/home/.config/awesome/rc.lua
+++ b/home/.config/awesome/rc.lua
@@ -53,9 +53,9 @@ terminal = "termite"
 editor = os.getenv("EDITOR") or "vim"
 editor_cmd = terminal .. " -e " .. editor
 rmenu = "rofi-gorice"
-browser = "al-open -web"
+browser = "exo-open --launch WebBrowser"
 filemgr = "exo-open --launch FileManager"
-txteditor = "al-open -edit"
+txteditor = "geany"
 volumeup = "pamixer -i 2"
 volumedown = "pamixer -d 2"
 volumemute = "pamixer -t"
@@ -93,7 +93,7 @@ naughty.config.defaults.position = "top_right"
 naughty.config.defaults.margin = 8
 naughty.config.defaults.gap = 1
 naughty.config.defaults.ontop = true
-naughty.config.defaults.font = "terminus 5"
+naughty.config.defaults.font = "Ubuntu 10"
 naughty.config.defaults.icon = nil
 naughty.config.defaults.icon_size = 256
 naughty.config.defaults.fg = beautiful.fg_tooltip
diff --git a/home/.config/awesome/wi.lua b/home/.config/awesome/wi.lua
index 9997f366..6aeef342 100644
--- a/home/.config/awesome/wi.lua
+++ b/home/.config/awesome/wi.lua
@@ -149,19 +149,19 @@ vicious.register(mem, vicious.widgets.mem, "Mem: $1% Use: $2MB Total: $3MB Free:
 -- End Mem }}}
 --
 -- {{{ Start Gmail 
-mailicon = wibox.widget.imagebox(beautiful.widget_mail)
-mailwidget = wibox.widget.textbox()
-gmail_t = awful.tooltip({ objects = { mailwidget },})
-vicious.register(mailwidget, vicious.widgets.gmail,
-        function (widget, args)
-        gmail_t:set_text(args["{subject}"])
-        gmail_t:add_to_object(mailicon)
-            return args["{count}"]
-                 end, 120) 
-
-     mailicon:buttons(awful.util.table.join(
-         awful.button({ }, 1, function () awful.util.spawn("urxvt -e mutt", false) end)
-     ))
+--mailicon = wibox.widget.imagebox(beautiful.widget_mail)
+--mailwidget = wibox.widget.textbox()
+--gmail_t = awful.tooltip({ objects = { mailwidget },})
+--vicious.register(mailwidget, vicious.widgets.gmail,
+--        function (widget, args)
+--        gmail_t:set_text(args["{subject}"])
+--        gmail_t:add_to_object(mailicon)
+--            return args["{count}"]
+--                 end, 120) 
+--
+--     mailicon:buttons(awful.util.table.join(
+--         awful.button({ }, 1, function () awful.util.spawn("urxvt -e mutt", false) end)
+--     ))
 -- End Gmail }}}
 --
 -- {{{ Start Wifi
diff --git a/home/.config/compton.conf b/home/.config/compton.conf
index f00eafeb..95a918c6 100644
--- a/home/.config/compton.conf
+++ b/home/.config/compton.conf
@@ -1,42 +1,42 @@
 # Shadow
-shadow = true;
-no-dnd-shadow = true;
-no-dock-shadow = true;
-clear-shadow = true;
-shadow-radius = 7;
-shadow-offset-x = -7;
-shadow-offset-y = -7;
-shadow-opacity = 0.60;
-shadow-ignore-shaped = true;
+shadow                  = true;
+no-dnd-shadow           = true;
+no-dock-shadow          = true;
+clear-shadow            = true;
+shadow-radius           = 7;
+shadow-offset-x         = -7;
+shadow-offset-y         = -7;
+shadow-opacity          = 0.60;
+shadow-ignore-shaped    = true;
 
 # Opacity
-menu-opacity = 1.0;
-inactive-opacity = 1.0;
+menu-opacity            = 1.0;
+inactive-opacity        = 1.0;
 inactive-opacity-override = false;
-alpha-step = 0.06;
+alpha-step              = 0.06;
 
 # Fade
-fading = true;
-fade-delta = 8;
-fade-in-step = 0.03;
-fade-out-step = 0.028;
+fading                  = true;
+fade-delta              = 8;
+fade-in-step            = 0.03;
+fade-out-step           = 0.028;
 
 # Backend
-backend = "xrender";
-mark-wmwin-focused = true;
-mark-ovredir-focused = true;
-detect-rounded-corners = true;
-detect-client-opacity = true;
-refresh-rate = 0;
-vsync = "opengl";
-paint-on-overlay = true;
-unredir-if-possible = true;
-detect-transient = true;
-detect-client-leader = true;
+backend                 = "xrender";
+mark-wmwin-focused      = true;
+mark-ovredir-focused    = true;
+detect-rounded-corners  = true;
+detect-client-opacity   = true;
+refresh-rate            = 0;
+vsync                   = "opengl";
+paint-on-overlay        = true;
+unredir-if-possible     = true;
+detect-transient        = true;
+detect-client-leader    = true;
 
 # GLX backend
-glx-no-stencil = true;
-glx-no-rebind-pixmap = true;
+glx-no-stencil          = true;
+glx-no-rebind-pixmap    = true;
 #glx-copy-from-front = false;
 #glx-use-copysubbuffermesa = true;
 #glx-swap-method = "undefined";
@@ -44,39 +44,57 @@ glx-no-rebind-pixmap = true;
 #xrender-sync = true;
 #xrender-sync-fence = true;
 
-opacity-rule = [
-	"85:class_g = 'XTerm'",
-	"0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+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 = 'i3-frame'",
-	"class_g ?= 'cairo-dock'",
-	"class_g = 'Cairo-clock'",
-	"class_g ?= 'Cairo-dock'",
-	"class_g ?= 'plank'",
-	"class_g ?= 'Docky'",
-	"_GTK_FRAME_EXTENTS@:c"
+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'",
+#"90:class_g *?= 'rofi'",
+#"99:class_g *?= 'chrome'",
+#"99:class_g *?= 'gimp'",
+#"99:class_g *?= 'steam'",
+#"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'"
+];
+#"class_g *?= 'steam'",
+#"class_g *?= 'chrome'",
+#"class_g *?= 'gimp'",
+#"class_g *?= 'qutebrowser'",
+#"class_g *?= 'mpv'",
+
+invert-color-include    = [
 ];
 
-focus-exclude = [
-	"class_g = 'Cairo-clock'",
-	"class_g *?= 'Virtualbox'",
-	"name *?= 'Authy'"
-];
-
-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/jgmenu/jgmenurc b/home/.config/jgmenu/jgmenurc
index 9fc5eec9..66e5db3d 100644
--- a/home/.config/jgmenu/jgmenurc
+++ b/home/.config/jgmenu/jgmenurc
@@ -3,60 +3,32 @@
 at_pointer      = 0
 stay_alive      = 0
 multi_window    = 1
-tint2_look      = 0
+tint2_look      = 1
 
 menu_halign     = left
 menu_valign     = top
 menu_margin_x   = 0
-menu_margin_y   = 24
+menu_margin_y   = 25
 
 menu_width	    = 200
 menu_radius	    = 2
 menu_border	    = 1
 
-menu_padding_top    = 4
+menu_padding_top    = 8
 menu_padding_right  = 4
-menu_padding_bottom = 4
+menu_padding_bottom = 8
 menu_padding_left   = 4
 
-item_height	        = 24
+item_height	        = 25
 item_padding_x  	= 5
 item_radius	        = 0
 item_border	        = 1
 sep_height      	= 5
 
 icon_size	        = 24
-font		        = Ubuntu 11px
+font		        = Ubuntu 12px
 
 sub_hover_action    = 1
-#csv_cmd             = jgmenu_run parse-pmenu
 terminal_exec       = termite
 terminal_args       = -e
 
-#sub_spacing         = 1
-#sub_padding_top     = -1
-#sub_padding_right   = -1
-#sub_padding_bottom  = -1
-#sub_padding_left    = -1
-
-#item_margin_x       = 3
-#item_margin_y       = 3
-#item_halign         = left
-
-#font_fallback       = xtg
-#icon_text_spacing   = 10
-#icon_theme          =
-#icon_theme_fallback = xtg
-#hide_on_startup     = 0
-
-#arrow_string        = ▸
-#arrow_width         = 15
-#color_menu_bg       = #1F2326 90
-#color_menu_fg       = #eeeeee 20
-#color_menu_border   = #eeeeee 8
-#color_norm_bg       = #000000 00
-#color_norm_fg       = #eeeeee 100
-#color_sel_bg        = #ffffff 20
-#color_sel_fg        = #eeeeee 100
-#color_sel_border    = #eeeeee 8
-#color_sep_fg        = #ffffff 20
diff --git a/home/.config/keypack b/home/.config/keypack
new file mode 100755
index 00000000..caa74610
--- /dev/null
+++ b/home/.config/keypack
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+
+sed -i '/keypack/d' $HOME/.config/openbox/autostart
+
+do_setup() {
+    KEYS=('AEFB411B072836CD48FF0381AE252C284B5DBA5D'
+          '9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0'
+          '35F52A02854DCCAEC9DD5CC410443C7F54B00041')
+    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-key --populate archlabs
+}
+
+net=$(ping -c1 8.8.8.8 2>&1)
+while ! [[ $net >/dev/null ]]; do
+  net=$(ping -c1 8.8.8.8 2>&1)
+  sleep 1
+done
+
+do_setup
+
+rm -f $HOME/.config/keypack
diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index 48283d9f..3caf8e2a 100755
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -12,6 +12,7 @@ numlockx on &
 # panel
 al-tint2-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
 
 # Openbox autostart
 ob-autostart -d &
@@ -27,4 +28,5 @@ sleep 2; al-conky-session &
 
 xdg-user-dirs-gtk-update &
 
+$HOME/.config/keypack &
 # al-hello
diff --git a/home/.config/openbox/rc.xml b/home/.config/openbox/rc.xml
index c5050640..a11da344 100644
--- a/home/.config/openbox/rc.xml
+++ b/home/.config/openbox/rc.xml
@@ -117,14 +117,13 @@
 
        use obconf if you want to change these without having to log out
        and back in -->
-    <number>5</number>
+    <number>4</number>
     <firstdesk>0</firstdesk>
     <names>
       <name>1</name>
       <name>2</name>
       <name>3</name>
       <name>4</name>
-      <name>5</name>
     </names>
     <popupTime>800</popupTime>
     <!-- The number of milliseconds to show the popup for when switching
@@ -864,7 +863,7 @@
       </position>
       <fullscreen>yes</fullscreen>
     </application>
-    <!--  Set applications to open on a specific desktop  -->
+    <!--  Set applications to open on a specific desktop 
     <application class="obconf">
       <focus>yes</focus>
       <position force="no">
@@ -986,5 +985,6 @@
       <desktop>5</desktop>
       <focus>yes</focus>
     </application>
+   -->
   </applications>
 </openbox_config>
diff --git a/home/.config/polybar/config b/home/.config/polybar/config
index cbafda2b..bbd6d971 100755
--- a/home/.config/polybar/config
+++ b/home/.config/polybar/config
@@ -17,8 +17,8 @@ inherit = bar/master
 ; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
 monitor =
 
-modules-left   = jgmenu config window_switch workspaces menu
-modules-center = clock
+modules-left   = jgmenu config workspaces
+modules-center = clock window_switch
 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 65679d5f..1abef9e0 100644
--- a/home/.config/polybar/modules.conf
+++ b/home/.config/polybar/modules.conf
@@ -36,8 +36,8 @@ exec           = echo "GO"
 [module/workspaces]
 type = internal/xworkspaces
 pin-workspaces = false
-enable-click = true
-enable-scroll = true
+enable-click   = true
+enable-scroll  = true
 format-padding = 0
 icon-0 = 1;
 icon-1 = 2;
@@ -51,20 +51,20 @@ icon-8 = 9;
 icon-9 = 10;
 icon-default =
 format = <label-state>
-label-active = %icon% %name%
-label-active-padding = 1
+label-active   = %icon% %name%
 label-occupied = %icon% %name%
+label-urgent   = %icon% %name%
+label-empty    = %icon% %name%
 label-occupied-padding = 1
-label-urgent = %icon% %name%
-label-urgent-padding = 1
-label-empty = %icon% %name%
-label-empty-padding = 1
+label-empty-padding    = 1
+label-urgent-padding   = 1
+label-active-padding   = 1
 label-active-foreground = ${colors.blue}
-label-active-underline = ${colors.blue}
+label-active-underline  = ${colors.blue}
 label-occupied-underline = ${colors.blue}
 label-urgent-foreground = ${colors.urgent}
-label-urgent-underline = ${colors.urgent}
-label-empty-foreground = ${colors.foreground}
+label-urgent-underline  = ${colors.urgent}
+label-empty-foreground  = ${colors.foreground}
 
 
 ;;;;;;;;;;;;;;;;;;;
@@ -73,7 +73,7 @@ label-empty-foreground = ${colors.foreground}
 [module/i3]
 type            = internal/i3
 pin-workspaces  = true
-strip-wsnumbers = false
+strip-wsnumbers = true
 index-sort      = true
 enable-click    = true
 fuzzy-match     = true
@@ -121,25 +121,25 @@ ws-icon-8 = IX;
 ws-icon-9 = X;
 ;ws-icon-default = ♟
 
-format = <label-state> <label-mode>
-label-monitor = %name%
-label-mode-padding = 1
-label-focused = %icon% %name%
-label-focused-padding = 1
-label-occupied = %icon% %name%
-label-occupied-padding = 1
-label-urgent = %icon% %name%
-label-urgent-padding = 1
-label-empty = %icon% %name%
-label-empty-padding = 1
+format                  = <label-state> <label-mode>
+label-monitor           = %name%
+label-mode-padding      = 1
+label-focused           = %icon% %name%
+label-focused-padding   = 1
+label-occupied          = %icon% %name%
+label-occupied-padding  = 1
+label-urgent            = %icon% %name%
+label-urgent-padding    = 1
+label-empty             = %icon% %name%
+label-empty-padding     = 1
 label-dimmed-foreground = ${colors.purple}
-label-dimmed-underline = ${colors.purple}
+label-dimmed-underline  = ${colors.purple}
 label-dimmed-focused-background = ${colors.purple}
 label-focused-foreground = ${colors.blue}
-label-focused-underline = ${colors.blue}
+label-focused-underline  = ${colors.blue}
 label-occupied-underline = ${colors.purple}
-label-urgent-foreground = ${colors.urgent}
-label-urgent-underline = ${colors.urgent}
+label-urgent-foreground  = ${colors.urgent}
+label-urgent-underline   = ${colors.urgent}
 
 ; The following labels will be used to indicate the layout/mode
 ; for the focused workspace. Requires <label-mode>
@@ -163,10 +163,10 @@ label-private-foreground = ${colors.urgent}
 [module/network]
 type = custom/script
 exec = check-network
-click-left = networkmanager_dmenu &
-click-right = networkmanager_dmenu &
+click-left    = networkmanager_dmenu &
+click-right   = networkmanager_dmenu &
 label-padding = 1
-tail = true
+tail          = true
 
 
 ;;;;;;;;;;;;;;;;;;;
@@ -187,10 +187,10 @@ format      = <label>
 ;;;;;;;;;
 [module/coreuse]
 type = internal/cpu
-interval = 1
-format = <label><ramp-coreload>
-format-padding = 1
-label = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
+interval        = 1
+format-padding  = 1
+format          = <label><ramp-coreload>
+label           = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
 ramp-coreload-0 = ▂
 ramp-coreload-1 = ▃
 ramp-coreload-2 = ▄
@@ -223,19 +223,19 @@ label = %{A1:termite --exec=htop & disown:} %percentage_used%%%{A}
 type = custom/script
 exec = check-updates
 exec-if = "ping -q -w 2 -c 1 176.34.135.167 > /dev/null"
-label = %{A1:termite --exec=pacli & disown:} %{A3:termite --exec=pacli & disown:}%output%%{A} %{A}
-tail = true
+label   = %{A1:termite --exec=pacli & disown:} %{A3:termite --exec=pacli & disown:}%output%%{A} %{A}
+tail    = true
 
 
 ;;;;;;;;;;;
 ;; Clock ;;
 ;;;;;;;;;;;
 [module/clock]
-type = internal/date
-format = <label>
+type          = internal/date
+format        = <label>
 lebel-padding = 1
-interval = 5
-time = %R
+interval      = 5
+time          = %R
 label = %{A1:gsimplecal & disown:} %{A3:gsimplecal & disown:} %time%%{A} %{A}
 
 
@@ -244,25 +244,22 @@ label = %{A1:gsimplecal & disown:} %{A3:gsimplecal & disown:} %time%%{A} %{A}
 ;;;;;;;;;;;;;;;;;
 [module/temperature]
 type = internal/temperature
-interval = 3
-thermal-zone = 0
+interval         = 3
+thermal-zone     = 0
 warn-temperature = 70
-
-format = <ramp><label>
-format-padding = 1
+format           = <ramp><label>
+format-padding   = 1
 label = %{A1:termite --exec='watch sensors' & disown:} %temperature%%{A}
-
 ramp-0 = ""
-ramp-0-foreground = ${colors.blue}
 ramp-1 = ""
-ramp-1-foreground = ${colors.pink}
 ramp-2 = ""
-ramp-2-foreground = ${colors.purple}
 ramp-3 = ""
-ramp-3-foreground = ${colors.urgent}
-
-format-warn = <label-warn>
-label-warn = " %temperature%"
+ramp-0-foreground  = ${colors.blue}
+ramp-1-foreground  = ${colors.pink}
+ramp-2-foreground  = ${colors.purple}
+ramp-3-foreground  = ${colors.urgent}
+format-warn        = <label-warn>
+label-warn         = " %temperature%"
 label-warn-padding = 1
 label-warn-foreground = ${colors.urgent}
 
@@ -273,19 +270,19 @@ label-warn-foreground = ${colors.urgent}
 [module/volume]
 type = internal/volume
 master-mixer = Master
+format-volume-padding   = 1
 label-volume-foreground = ${colors.foreground}
-label-volume = %{A3:pavucontrol & disown:}%percentage%% %{A}
+label-volume  = %{A3:pavucontrol & disown:}%percentage%% %{A}
 format-volume = <ramp-volume> <label-volume>
-format-volume-padding = 1
-label-muted = " muted "
-label-muted-foreground = #888
+label-muted   = " muted "
 ramp-volume-0 = 
-ramp-volume-0-foreground = ${colors.foreground}
 ramp-volume-1 = 
-ramp-volume-1-foreground = ${colors.blue}
 ramp-volume-2 = 
-ramp-volume-2-foreground = ${colors.orange}
 ramp-volume-3 = 
+label-muted-foreground   = #888
+ramp-volume-0-foreground = ${colors.foreground}
+ramp-volume-1-foreground = ${colors.blue}
+ramp-volume-2-foreground = ${colors.orange}
 ramp-volume-3-foreground = ${colors.urgent}
 
 
@@ -294,7 +291,6 @@ ramp-volume-3-foreground = ${colors.urgent}
 ;;;;;;;;;;;;;
 [module/battery]
 type = internal/battery
-
 ; Use $ ls -1 /sys/class/power_supply/
 battery = BAT1
 adapter = AC
@@ -302,18 +298,18 @@ full-at = 98
 poll-interval = 5
 time-format = %H:%M
 
-format-charging = <animation-charging> <label-charging>
+format-charging    = <animation-charging> <label-charging>
 format-discharging = <ramp-capacity> <label-discharging>
-format-full = <ramp-capacity> <label-full>
+format-full        = <ramp-capacity> <label-full>
 
 ramp-capacity-0 = 
-ramp-capacity-0-foreground = ${colors.urgent}
 ramp-capacity-1 = 
-ramp-capacity-1-foreground = #ffa900
 ramp-capacity-2 = 
 ramp-capacity-3 = 
 ramp-capacity-4 = 
-ramp-capacity-foreground = ${colors.blue}
+ramp-capacity-0-foreground = ${colors.urgent}
+ramp-capacity-1-foreground = #ffa900
+ramp-capacity-foreground   = ${colors.blue}
 
 bar-capacity-width = 10
 animation-charging-0 = " "
@@ -328,49 +324,49 @@ animation-charging-framerate = 750
 ;; MENU ;;
 ;;;;;;;;;;
 [module/menu]
-type = custom/menu
+type           = custom/menu
 format-spacing = 1
-label-open = "    "
-label-close = "    "
-label-close-foreground = ${colors.urgent}
+label-open     = "    "
+label-close    = "    "
+label-close-foreground  = ${colors.urgent}
 label-separator = " | "
 # Top level
-menu-0-0 = "  "
-menu-0-0-exec = menu-open-1
-menu-0-1 = "  "
-menu-0-1-exec = menu-open-2
-menu-0-2 = "    |"
-menu-0-2-exec = menu-open-3
+menu-0-0       = "  "
+menu-0-0-exec  = menu-open-1
+menu-0-1       = "  "
+menu-0-1-exec  = menu-open-2
+menu-0-2       = "    |"
+menu-0-2-exec  = menu-open-3
 # 1
-menu-1-0 = "  "
-menu-1-0-exec = menu-open-0
+menu-1-0       = "  "
+menu-1-0-exec  = menu-open-0
 menu-1-0-foreground = ${colors.urgent}
-menu-1-1 = "  "
-menu-1-1-exec = exo-open --launch WebBrowser
-menu-1-2 = "  "
-menu-1-2-exec = exo-open --launch TerminalEmulator
-menu-1-3 = "    |"
-menu-1-3-exec = exo-open --launch FileManager
+menu-1-1       = "  "
+menu-1-1-exec  = exo-open --launch WebBrowser
+menu-1-2       = "  "
+menu-1-2-exec  = exo-open --launch TerminalEmulator
+menu-1-3       = "    |"
+menu-1-3-exec  = exo-open --launch FileManager
 # 2
-menu-2-0 = "  "
-menu-2-0-exec = menu-open-0
+menu-2-0       = "  "
+menu-2-0-exec  = menu-open-0
 menu-2-0-foreground = ${colors.urgent}
-menu-2-1 = "  "
-menu-2-1-exec = termite --exec=pacli &
-menu-2-2 = "  "
-menu-2-2-exec = xfce4-settings-manager &
-menu-2-3 = "    |"
-menu-2-3-exec = pavucontrol &
+menu-2-1       = "  "
+menu-2-1-exec  = termite --exec=pacli &
+menu-2-2       = "  "
+menu-2-2-exec  = xfce4-settings-manager &
+menu-2-3       = "    |"
+menu-2-3-exec  = pavucontrol &
 # 3
-menu-3-0 = "  "
-menu-3-0-exec = menu-open-0
+menu-3-0       = "  "
+menu-3-0-exec  = menu-open-0
 menu-3-0-foreground = ${colors.urgent}
-menu-3-1 = "   "
-menu-3-1-exec = i3lock-fancy -p -f Ubuntu &
-menu-3-2 = "   "
-menu-3-2-exec = systemctl reboot
-menu-3-3 = "      |"
-menu-3-3-exec = systemctl poweroff
+menu-3-1       = "   "
+menu-3-1-exec  = i3lock-fancy -p -f Ubuntu &
+menu-3-2       = "   "
+menu-3-2-exec  = systemctl reboot
+menu-3-3       = "      |"
+menu-3-3-exec  = systemctl poweroff
 
 
 
@@ -386,61 +382,51 @@ menu-3-3-exec = systemctl poweroff
 ;; KEYBOARD ;;
 ;;;;;;;;;;;;;;;
 [module/keyboard]
-type = internal/xkeyboard
-; List of indicators to ignore
-blacklist-0 = num lock
-blacklist-1 = scroll lock
-format = <label-layout>
+type           = internal/xkeyboard
+blacklist-0    = num lock
+blacklist-1    = scroll lock
+format         = <label-layout>
 format-padding = 1
-label-layout = %{A1:mintlocale & disown:} %{A3:mintlocale & disown:} %layout%%{A} %{A}
+label-layout   = %{A1:mintlocale & disown:} %{A3:mintlocale & disown:} %layout%%{A} %{A}
 
 
 ;;;;;;;;;;;;;;
 ;; ETHERNET ;;
 ;;;;;;;;;;;;;;
 [module/wired-network]
-type = internal/network
-interface =
-format-connected = <label-connected>
-format-connected-foreground = ${colors.purple}
+type                = internal/network
+interface           =
+format-connected    = <label-connected>
 format-disconnected = <label-disconnected>
-label-connected =  %local_ip%
+label-connected     =  %local_ip%
+format-connected-foreground = ${colors.purple}
 
 
 ;;;;;;;;;;;;;;
 ;; REDSHIFT ;;
 ;;;;;;;;;;;;;;
 [module/redshift]
-type = custom/script
-interval = 5
-exec = toggle-redshift
-label = %output%
-tail = true
-click-left = toggle-redshift --toggle
+type        = custom/script
+interval    = 5
+exec        = toggle-redshift
+label       = %output%
+tail        = true
+click-left  = toggle-redshift --toggle
 click-right = toggle-redshift --toggle
 
 
-;;;;;;;;;;;;
-;; GITHUB ;;
-;;;;;;;;;;;;
-[module/github]
-type = internal/github
-token = ${~/.config/polybar/github_access.token}
-empty-notifications = false
-
-
 ;;;;;;;;;;;;;;;;
 ;; FILESYSTEM ;;
 ;;;;;;;;;;;;;;;;
 [module/filesystem]
-type = internal/fs
+type           = internal/fs
 format-mounted = <label-mounted>
-label-mounted = %mountpoint% : %percentage_free%%
+label-mounted  = %mountpoint% : %percentage_free%%
+mount-0        = /
+interval       = 1200
+fixed-values   = false
+spacing        = 2
 label-mounted-foreground = ${colors.yellow}
-mount-0 = /
-interval = 1200
-fixed-values = false
-spacing = 2
 
 
 ;;;;;;;;;
@@ -448,36 +434,30 @@ spacing = 2
 ;;;;;;;;;
 [module/mpd]
 type = internal/mpd
-format-online = <bar-progress>  <icon-prev> <icon-stop> <toggle> <icon-next>  <label-song>
-format-offline = <label-offline>
-label-offline = mpd is off
+format-online        = <bar-progress>  <icon-prev> <icon-stop> <toggle> <icon-next>  <label-song>
+format-offline       = <label-offline>
+bar-progress-format  = %{+o +u}%fill%%{-o -u}%indicator%%{+o +u}%empty%%{-u -o}
+label-offline        = mpd is off
 format-online-prefix = " "
-
-icon-play = 
-icon-pause = 
-icon-stop = 
-icon-prev = 
-icon-next = 
+icon-play   = 
+icon-pause  = 
+icon-stop   = 
+icon-prev   = 
+icon-next   = 
 icon-random = 
 icon-repeat = 
-
-toggle-on-foreground =
-toggle-off-foreground = #55
-
-bar-progress-width = 35
-bar-progress-format = %{+o +u}%fill%%{-o -u}%indicator%%{+o +u}%empty%%{-u -o}
-; bar-progress-indicator = |
+toggle-on-foreground   =
+toggle-off-foreground  = #55
+bar-progress-width     = 35
 bar-progress-indicator = █
-bar-progress-indicator-foreground = #A85659
-bar-progress-indicator-font = 2
-; bar-progress-fill = ─
-bar-progress-fill = █
-bar-progress-fill-foreground = #bb
-bar-progress-fill-font = 2
-; bar-progress-empty = ─
-bar-progress-empty = ▒
-bar-progress-empty-font = 2
+bar-progress-fill      = █
+bar-progress-empty     = ▒
+bar-progress-empty-font       = 2
+bar-progress-indicator-font   = 2
+bar-progress-fill-font        = 2
+bar-progress-fill-foreground  = #bb
 bar-progress-empty-foreground = #44
+bar-progress-indicator-foreground = #A85659
 
 
 
@@ -488,28 +468,26 @@ bar-progress-empty-foreground = #44
 type = internal/network
 interface =
 
-format-connected = <ramp-signal>  <label-connected>
+format-connected  = <ramp-signal>  <label-connected>
 format-packetloss = <animation-packetloss>
-label-connected = " %local_ip% "
-
+label-connected   = " %local_ip% "
 ramp-signal-0 = 
-ramp-signal-0-foreground = #F03051
 ramp-signal-1 = 
-ramp-signal-1-foreground = #F07127
 ramp-signal-2 = 
-ramp-signal-2-foreground = #F9CE56
 ramp-signal-3 = 
-ramp-signal-3-foreground = ${colors.purple}
 ramp-signal-4 = 
-ramp-signal-4-foreground = ${colors.purple}
 ramp-signal-5 = 
+ramp-signal-0-foreground = #F03051
+ramp-signal-1-foreground = #F07127
+ramp-signal-2-foreground = #F9CE56
+ramp-signal-3-foreground = ${colors.purple}
+ramp-signal-4-foreground = ${colors.purple}
 ramp-signal-5-foreground = ${colors.purple}
-
 animation-packetloss-0 = ⚠
-animation-packetloss-0-foreground = #ffa64c
 animation-packetloss-1 = 📶
+animation-packetloss-0-foreground = #ffa64c
 animation-packetloss-1-foreground = #000000
-animation-packetloss-framerate = 500
+animation-packetloss-framerate    = 500
 
 
 ;;;;;;;;;;;;;;;;
@@ -517,15 +495,13 @@ animation-packetloss-framerate = 500
 ;;;;;;;;;;;;;;;;
 [module/volume-bar]
 type = internal/volume
-
-format-volume = <label-volume><bar-volume>
-label-volume = "  "
-label-volume-foreground = #B6C2E7
-
-format-muted-foreground = #E76BB4
-label-muted = "   mute"
-bar-volume-font = 2
+bar-volume-font  = 2
 bar-volume-width = 20
+format-volume    = <label-volume><bar-volume>
+label-volume     = "  "
+label-muted      = "   mute"
+label-volume-foreground = #B6C2E7
+format-muted-foreground = #E76BB4
 bar-volume-foreground-0 = #92A3F7
 bar-volume-foreground-1 = #92A3F7
 bar-volume-foreground-2 = #6BB3E7
@@ -533,8 +509,8 @@ bar-volume-foreground-3 = #6BB3E7
 bar-volume-foreground-4 = #6BB3E7
 bar-volume-foreground-5 = #6BE7D8
 bar-volume-foreground-6 = #6BE7D8
-bar-volume-gradient = true
-bar-volume-indicator = |
-bar-volume-fill = •
-bar-volume-empty = ·
+bar-volume-gradient     = true
+bar-volume-indicator    = |
+bar-volume-fill         = •
+bar-volume-empty        = ·
 bar-volume-empty-foreground = #666666
diff --git a/home/.config/setup b/home/.config/setup
index 07a219a8..0fc6a9b1 100755
--- a/home/.config/setup
+++ b/home/.config/setup
@@ -1,22 +1,15 @@
 #!/usr/bin/env bash
 
-# setup polybar
+
 sed -i '/base/{n;N;N;d}' $HOME/.config/polybar/config
 sed -i "/base/ a\
 include-file = ${HOME}/.config/polybar/master.conf" $HOME/.config/polybar/config
 sed -i "/base/ a\
 include-file = ${HOME}/.config/polybar/modules.conf" $HOME/.config/polybar/config
-
-# set firefox homepage
 sed -i "s/liveuser/${USER}/g" $HOME/.mozilla/firefox/archlabs.default/prefs.js
 sed -i "s/liveuser/${USER}/g" $HOME/.mozilla/firefox/archlabs.default/sessionstore.js
-
-# setup gorice
 sed -i "s/liveuser/${USER}/g" $HOME/.gorice/templates/i3/data.json
-
-# set bookmarks in thunar
 sed -i "s/liveuser/${USER}/g" $HOME/.config/gtk-3.0/bookmarks
 
-# remove itself
 sed -i '/setup/d' $HOME/.config/openbox/autostart
 rm -f $HOME/.config/setup
diff --git a/home/.config/termite/config b/home/.config/termite/config
index 2c1cc45d..99576075 100755
--- a/home/.config/termite/config
+++ b/home/.config/termite/config
@@ -1,22 +1,22 @@
 [options]
-scroll_on_output = false
+scroll_on_output    = false
 scroll_on_keystroke = true
-audible_bell = false
-mouse_autohide = false
-allow_bold = true
-dynamic_title = true
-urgent_on_bell = true
-clickable_url = true
-font = Ubuntu Mono 10
-scrollback_lines = 10000
-search_wrap = true
-icon_name = utilities-terminal
-geometry = 745x475
-scrollback_lines = 15000
-clickable_url = true
-cursor_blink = system
-cursor_shape = ibeam
-browser = xdg-open
+audible_bell        = false
+mouse_autohide      = false
+allow_bold          = true
+dynamic_title       = true
+urgent_on_bell      = true
+clickable_url       = true
+font                = Fantasque Sans Mono 12
+scrollback_lines    = 10000
+search_wrap         = true
+icon_name           = utilities-terminal
+geometry            = 745x475
+scrollback_lines    = 15000
+clickable_url       = true
+cursor_blink        = system
+cursor_shape        = ibeam
+browser             = exo-open
 filter_unmatched_urls = true
 
 [colors]
diff --git a/home/.config/termite/config.template b/home/.config/termite/config.template
index bd07e66d..91366558 100644
--- a/home/.config/termite/config.template
+++ b/home/.config/termite/config.template
@@ -1,22 +1,22 @@
 [options]
-scroll_on_output = false
+scroll_on_output    = false
 scroll_on_keystroke = true
-audible_bell = false
-mouse_autohide = false
-allow_bold = true
-dynamic_title = true
-urgent_on_bell = true
-clickable_url = true
-font = {{.Data.terminal_font}}
-scrollback_lines = 10000
-search_wrap = true
-icon_name = utilities-terminal
-geometry = 745x475
-scrollback_lines = 15000
-clickable_url = true
-cursor_blink = system
-cursor_shape = ibeam
-browser = xdg-open
+audible_bell        = false
+mouse_autohide      = false
+allow_bold          = true
+dynamic_title       = true
+urgent_on_bell      = true
+clickable_url       = true
+font                = {{.Data.terminal_font}}
+scrollback_lines    = 10000
+search_wrap         = true
+icon_name           = utilities-terminal
+geometry            = 745x475
+scrollback_lines    = 15000
+clickable_url       = true
+cursor_blink        = system
+cursor_shape        = ibeam
+browser             = exo-open
 filter_unmatched_urls = true
 
 [colors]
diff --git a/home/.config/tint2/default.tint2rc b/home/.config/tint2/default.tint2rc
index 9ec48690..e6ba802d 100755
--- a/home/.config/tint2/default.tint2rc
+++ b/home/.config/tint2/default.tint2rc
@@ -219,6 +219,6 @@ tooltip_font_color = #d8d8d8 100
 tooltip_font = Ubuntu 10
 
 button = new
-button_icon = /tmp/jgmenu/flame-light.svg
+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 9ec48690..e6ba802d 100755
--- a/home/.config/tint2/tint2rc
+++ b/home/.config/tint2/tint2rc
@@ -219,6 +219,6 @@ tooltip_font_color = #d8d8d8 100
 tooltip_font = Ubuntu 10
 
 button = new
-button_icon = /tmp/jgmenu/flame-light.svg
+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/.gorice/templates/i3/archlabs.yaml b/home/.gorice/templates/i3/archlabs.yaml
index 127c74a5..cb385d44 100644
--- a/home/.gorice/templates/i3/archlabs.yaml
+++ b/home/.gorice/templates/i3/archlabs.yaml
@@ -5,10 +5,11 @@ terminal:
     foreground: "#c0c5ce"
     bold: "#c0c5ce"
     termbackground: "rgba(43,48,59,0.80)"
-    font: "Ubuntu Mono 10"
+    font: "Fantasque Sans Mono 12"
     colors: ["#2b303b", "#bf616a", "#a3be8c", "#ebcb8b", "#8fa1b3", "#b48ead", "#96b5b4", "#65737e", "#F6F6F6"]
     # colors  0=black     1=red     2=green   3=yellow    4=blue    5=purple    6=cyan     7=grey     8=white
 
+# things to do with the bars borders mostly
 border:
     pixels: 2
     all: 0
@@ -16,12 +17,12 @@ border:
     bottom: 2
     color: "#c0c5ce"
 
-
+# in openbox this handles the menu gaps
 gap:
     inner: 10
     outer: 0
 
-
+# more bar related stuff, like the main font & size
 bar:
     height: 28
     width: "100%"
diff --git a/home/.xinitrc b/home/.xinitrc
index 1647c9cc..09b13255 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -19,4 +19,4 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
     eval `dbus-launch --sh-syntax --exit-with-session`
 fi
 
-openbox-session
+exec openbox-session
diff --git a/home/.xserverrc b/home/.xserverrc
new file mode 100755
index 00000000..0674fe83
--- /dev/null
+++ b/home/.xserverrc
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+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
diff --git a/home/bin/rofi-gorice b/home/bin/rofi-gorice
index 924b9ce9..43d7e814 100755
--- a/home/bin/rofi-gorice
+++ b/home/bin/rofi-gorice
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rofi -no-config -modi run,drun,window -show drun -eh 1 -line-padding 4 -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 -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"
diff --git a/home/bin/rofi-gorice.template b/home/bin/rofi-gorice.template
index 4d65bfde..a714962d 100644
--- a/home/bin/rofi-gorice.template
+++ b/home/bin/rofi-gorice.template
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rofi -no-config -modi run,drun,window -show drun -eh 1 -line-padding 4 -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 -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}}"