diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ba26e229
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wk_tmp
\ No newline at end of file
diff --git a/archlive/airootfs/etc/skel/.Xresources b/archlive/airootfs/etc/skel/.Xresources
index 5a39a77c..ce6e4b9a 100644
--- a/archlive/airootfs/etc/skel/.Xresources
+++ b/archlive/airootfs/etc/skel/.Xresources
@@ -1,6 +1,7 @@
 URxvt*font:	xft:Inconsolata:size=11
 
-URxvt*geometry:	128x32+24+24
+! The line below will be modified by ~/.urxvt_default_res
+URxvt*geometry:	96x32+24+24
 
 URxvt*scrollBar_right:	True
 URxvt*scrollstyle:	plain
diff --git a/archlive/airootfs/etc/skel/.config/Thunar/accels.scm b/archlive/airootfs/etc/skel/.config/Thunar/accels.scm
new file mode 100644
index 00000000..7876f2fe
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/Thunar/accels.scm
@@ -0,0 +1,71 @@
+; Thunar GtkAccelMap rc-file         -*- scheme -*-
+; this file is an automated accelerator map dump
+;
+; (gtk_accel_path "<Actions>/ThunarLauncher/sendto-desktop" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/create-folder" "<Primary><Shift>n")
+; (gtk_accel_path "<Actions>/ThunarShortcutsPane/sendto-shortcuts" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-menu" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/paste-into-folder" "<Primary>v")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-home" "<Alt>Home")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-menu" "")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open" "<Primary>o")
+; (gtk_accel_path "<Actions>/ThunarWindow/go-menu" "")
+; (gtk_accel_path "<Actions>/ThunarActions/uca-action-1462127723240094-1" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-file-system" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/zoom-out" "<Primary>minus")
+; (gtk_accel_path "<Actions>/ThunarStandardView/paste" "<Primary>v")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-menu" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/help-menu" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/file-menu" "")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other-in-menu" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/detach-tab" "")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-tab" "<Primary><Shift>p")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-menubar" "<Primary>m")
+; (gtk_accel_path "<Actions>/ThunarStandardView/back" "<Alt>Left")
+; (gtk_accel_path "<Actions>/ThunarWindow/close-tab" "<Primary>w")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-as-compact-list" "<Primary>3")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "<Primary>e")
+; (gtk_accel_path "<Actions>/ThunarStandardView/restore" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-network" "")
+; (gtk_accel_path "<Actions>/ThunarActions/Tap::create-archive" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/new-tab" "<Primary>t")
+; (gtk_accel_path "<Actions>/ThunarWindow/preferences" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/rename" "F2")
+; (gtk_accel_path "<Actions>/ThunarWindow/sendto-menu" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/edit-menu" "")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-toolbar" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/invert-selection" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/make-link" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-as-icons" "<Primary>1")
+; (gtk_accel_path "<Actions>/ThunarWindow/new-window" "<Primary>n")
+; (gtk_accel_path "<Actions>/ThunarStandardView/forward" "<Alt>Right")
+; (gtk_accel_path "<Actions>/ThunarStandardView/move-to-trash" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/select-by-pattern" "<Primary>s")
+; (gtk_accel_path "<Actions>/ThunarWindow/about" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/setup-columns" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/contents" "F1")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-desktop" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/close-all-windows" "<Primary><Shift>w")
+; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in" "<Primary>plus")
+; (gtk_accel_path "<Actions>/ThunarStandardView/duplicate" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-parent" "<Alt>Up")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-shortcuts" "<Primary>b")
+; (gtk_accel_path "<Actions>/ThunarWindow/reload" "<Primary>r")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-templates" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/copy" "<Primary>c")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-pathbar" "")
+; (gtk_accel_path "<Actions>/ThunarStandardView/properties" "<Alt>Return")
+; (gtk_accel_path "<Actions>/ThunarStandardView/delete" "")
+; (gtk_accel_path "<Actions>/ThunarActions/Twp::setwallpaper" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/empty-trash" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-menu" "")
+; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-window" "<Primary><Shift>o")
+; (gtk_accel_path "<Actions>/ThunarStandardView/cut" "<Primary>x")
+; (gtk_accel_path "<Actions>/ThunarWindow/close-window" "<Primary>q")
+; (gtk_accel_path "<Actions>/ThunarStandardView/select-all-files" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/open-location" "<Primary>l")
+; (gtk_accel_path "<Actions>/ThunarWindow/zoom-reset" "<Primary>0")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-statusbar" "")
+; (gtk_accel_path "<Actions>/ThunarWindow/show-hidden" "<Primary>h")
+; (gtk_accel_path "<Actions>/ThunarWindow/view-as-detailed-list" "<Primary>2")
diff --git a/archlive/airootfs/etc/skel/.config/Thunar/uca.xml b/archlive/airootfs/etc/skel/.config/Thunar/uca.xml
new file mode 100644
index 00000000..74185535
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/Thunar/uca.xml
@@ -0,0 +1,13 @@
+<?xml encoding="UTF-8" version="1.0"?>
+<actions>
+<action>
+	<icon>utilities-terminal</icon>
+	<name>Open Terminal Here</name>
+	<unique-id>1462127723240094-1</unique-id>
+	<command>exo-open --working-directory %f --launch TerminalEmulator</command>
+	<description>Example for a custom action</description>
+	<patterns>*</patterns>
+	<startup-notify/>
+	<directories/>
+</action>
+</actions>
diff --git a/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop b/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop
deleted file mode 100644
index 2459b12d..00000000
--- a/archlive/airootfs/etc/skel/.config/autostart/wifi.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=WiFi
-Comment=WiFi
-Exec=/home/wktech/.wifi
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini b/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini
new file mode 100644
index 00000000..62930e9d
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/gtk-2.0/gtkfilechooser.ini
@@ -0,0 +1,11 @@
+[Filechooser Settings]
+LocationMode=path-bar
+ShowHidden=false
+ShowSizeColumn=true
+GeometryX=-1
+GeometryY=-1
+GeometryWidth=-1
+GeometryHeight=-1
+SortColumn=name
+SortOrder=ascending
+StartupMode=recent
diff --git a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini
index 55e57f9b..3a73097e 100644
--- a/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini
+++ b/archlive/airootfs/etc/skel/.config/gtk-3.0/settings.ini
@@ -1,15 +1,5 @@
 [Settings]
-gtk-theme-name=Numix
-gtk-icon-theme-name=Adwaita
+gtk-theme-name=Arc
+gtk-icon-theme-name=Numic Circle
 gtk-font-name=Noto Sans 10
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=none
+
diff --git a/archlive/airootfs/etc/skel/.config/midori/config b/archlive/airootfs/etc/skel/.config/midori/config
new file mode 100644
index 00000000..30a10bcf
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/midori/config
@@ -0,0 +1,21 @@
+[settings]
+default-encoding=ISO-8859-1
+default-font-family=Noto Sans
+monospace-font-family=Noto Mono
+enable-developer-extras=true
+enable-site-specific-quirks=true
+enable-javascript=true
+default-charset=ISO-8859-1
+last-panel-position=249
+last-panel-page=3
+last-window-state=MIDORI_WINDOW_MAXIMIZED
+location-entry-search=https://duckduckgo.com/?q=%s
+toolbar-items=TabNew,Back,NextForward,ReloadStop,BookmarkAdd,Location,Search,Trash,CompactMenu
+homepage=https://www.google.com/
+tabhome=about:dial
+download-folder=/home/wktech
+load-on-startup=MIDORI_STARTUP_HOMEPAGE
+user-agent=Mozilla/5.0 (X11; Linux) AppleWebKit/538.15 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/538.15 Midori/0.5
+
+[extensions]
+libadblock.so=true
diff --git a/archlive/airootfs/etc/skel/.config/mimeapps.list b/archlive/airootfs/etc/skel/.config/mimeapps.list
new file mode 100644
index 00000000..e8beceeb
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/mimeapps.list
@@ -0,0 +1,25 @@
+[Added Associations]
+application/pdf=mupdf.desktop;
+application/vnd.adobe.flash.movie=mpv.desktop;
+application/vnd.ms-asf=mpv.desktop;
+audio/flac=mpv.desktop;
+audio/mp4=mpv.desktop;
+audio/mpeg=mpv.desktop;
+audio/x-vorbis+ogg=mpv.desktop;
+image/bmp=ristretto.desktop;
+image/gif=ristretto.desktop;
+image/jpeg=ristretto.desktop;
+image/png=ristretto.desktop;
+image/vnd.microsoft.icon=ristretto.desktop;
+inode/directory=exo-file-manager.desktop
+text/plain=mousepad.desktop;
+video/mp4=mpv.desktop;
+video/mpeg=mpv.desktop;
+video/quicktime=mpv.desktop;
+video/x-flv=mpv.desktop;
+video/x-matroska=mpv.desktop;
+video/x-msvideo=mpv.desktop;
+video/x-ms-wmv=mpv.desktop;
+x-scheme-handler/http=exo-web-browser.desktop
+x-scheme-handler/https=exo-web-browser.desktop
+x-scheme-handler/trash=exo-file-manager.desktop
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc
deleted file mode 100644
index dd31bbe4..00000000
--- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[/]
-row=0
-col=0
-
-[/home/wktech]
-row=1
-col=0
-
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc
deleted file mode 100644
index f8a12092..00000000
--- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x711.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[/home/wktech/Desktop/SpeedTest.desktop]
-row=2
-col=0
-
-[/home/wktech/Desktop/HW Diagnostics.desktop]
-row=3
-col=0
-
-[/]
-row=0
-col=0
-
-[/home/wktech]
-row=1
-col=0
-
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc b/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc
deleted file mode 100644
index dd31bbe4..00000000
--- a/archlive/airootfs/etc/skel/.config/xfce4/desktop/icons.screen0-1008x752.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-[xfdesktop-version-4.10.3+-rcfile_format]
-4.10.3+=true
-
-[/]
-row=0
-col=0
-
-[/home/wktech]
-row=1
-col=0
-
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc b/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc
index 889c575f..61bd79cd 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc
+++ b/archlive/airootfs/etc/skel/.config/xfce4/helpers.rc
@@ -1,3 +1,4 @@
 WebBrowser=midori
+FileManager=Thunar
 TerminalEmulator=urxvt
 
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc b/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc
deleted file mode 100644
index 220e1d4b..00000000
--- a/archlive/airootfs/etc/skel/.config/xfce4/panel/cpugraph-9.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-UpdateInterval=0
-TimeScale=0
-Size=32
-Mode=0
-Frame=1
-Border=1
-Bars=0
-TrackedCore=0
-Command=xfce4-taskmanager
-InTerminal=0
-StartupNotification=1
-ColorMode=0
-Foreground1=#2b2b6363b1b1
-Foreground2=#ffff00000000
-Foreground3=#00000000ffff
-Background=#2b2b2e2e3737
-
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc b/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
similarity index 68%
rename from archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc
rename to archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
index 00f15a7d..93ffb654 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-18.rc
+++ b/archlive/airootfs/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@@ -1,12 +1,12 @@
-favorites=exo-file-manager.desktop,hwdiags.desktop,gparted.desktop,gsmartcontrol.desktop,truecrypt.desktop,speedtest.desktop,exo-web-browser.desktop
-recent=exo-web-browser.desktop
+favorites=Hardware Diagnostics.desktop,exo-file-manager.desktop,gparted.desktop,gsmartcontrol.desktop,SpeedTest.desktop,truecrypt.desktop,exo-web-browser.desktop
+recent=xfce4-settings-editor.desktop,xfce-session-settings.desktop,xfce4-power-manager-settings.desktop,gsmartcontrol.desktop,gparted.desktop
 button-title=Applications
-button-icon=desktop-environment-xfce
+button-icon=distributor-logo-archlinux
 button-single-row=false
 show-button-title=false
 show-button-icon=true
 launcher-show-name=true
-launcher-show-description=true
+launcher-show-description=false
 item-icon-size=3
 hover-switch-category=false
 category-icon-size=1
@@ -14,11 +14,11 @@ load-hierarchy=false
 recent-items-max=10
 favorites-in-recent=true
 display-recent-default=false
-position-search-alternate=false
-position-commands-alternate=false
+position-search-alternate=true
+position-commands-alternate=true
 position-categories-alternate=false
-menu-width=399
-menu-height=508
+menu-width=400
+menu-height=500
 menu-opacity=100
 command-settings=xfce4-settings-manager
 show-command-settings=true
@@ -29,7 +29,7 @@ show-command-switchuser=false
 command-logout=xfce4-session-logout
 show-command-logout=true
 command-menueditor=menulibre
-show-command-menueditor=true
+show-command-menueditor=false
 command-profile=mugshot
 show-command-profile=false
 search-actions=4
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc b/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc
index 15984ea3..41bfc4df 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc
+++ b/archlive/airootfs/etc/skel/.config/xfce4/terminal/terminalrc
@@ -16,11 +16,4 @@ MiscTabCloseButtons=TRUE
 MiscTabCloseMiddleClick=TRUE
 MiscTabPosition=GTK_POS_TOP
 MiscHighlightUrls=TRUE
-ColorForeground=#839496
-ColorBackground=#002b36
-ColorCursor=#93a1a1
-ColorPalette=#073642;#dc322f;#859900;#b58900;#268bd2;#d33682;#2aa198;#eee8d5;#002b36;#cb4b16;#586e75;#657b83;#839496;#6c71c4;#93a1a1;#fdf6e3
-ColorBold=#93a1a1
-ColorBoldUseDefault=FALSE
-TabActivityColor=#dc322f
 
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc b/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc
index dfbd1328..bc341e3b 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfce4-taskmanager.rc
@@ -19,7 +19,7 @@ ColumnCPU=TRUE
 ColumnPriority=FALSE
 SortColumn=0
 SortType=0
-WindowWidth=838
-WindowHeight=591
+WindowWidth=490
+WindowHeight=465
 HandlePosition=100
 ProcessTreeView=FALSE
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
new file mode 100644
index 00000000..781e4e71
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="ristretto" version="1.0">
+  <property name="window" type="empty">
+    <property name="navigationbar" type="empty">
+      <property name="position" type="string" value="left"/>
+    </property>
+  </property>
+</channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
index 020078d0..567ac037 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="thunar" version="1.0">
-  <property name="last-view" type="string" value="ThunarIconView"/>
+  <property name="last-view" type="string" value="ThunarDetailsView"/>
   <property name="misc-single-click" type="bool" value="false"/>
-  <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_NORMAL"/>
+  <property name="default-view" type="string" value="ThunarDetailsView"/>
+  <property name="misc-date-style" type="string" value="THUNAR_DATE_STYLE_ISO"/>
+  <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_SMALLER"/>
+  <property name="last-details-view-column-widths" type="string" value="50,132,50,50,228,50,50,72,186"/>
   <property name="last-separator-position" type="int" value="170"/>
   <property name="last-show-hidden" type="bool" value="false"/>
-  <property name="last-window-maximized" type="bool" value="true"/>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index 0337f6f7..f1b3664f 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -8,6 +8,7 @@
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
           <property name="last-image" type="string" value="/usr/share/wallpaper/current.png"/>
+          <property name="backdrop-cycle-enable" type="bool" value="false"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
@@ -27,18 +28,13 @@
       </property>
     </property>
   </property>
-  <property name="last" type="empty">
-    <property name="window-width" type="int" value="638"/>
-    <property name="window-height" type="int" value="521"/>
-  </property>
-  <property name="desktop-icons" type="empty">
-    <property name="style" type="int" value="0"/>
-  </property>
   <property name="desktop-menu" type="empty">
     <property name="show" type="bool" value="false"/>
-    <property name="show-icons" type="bool" value="true"/>
   </property>
   <property name="windowlist-menu" type="empty">
     <property name="show" type="bool" value="false"/>
   </property>
+  <property name="desktop-icons" type="empty">
+    <property name="style" type="int" value="0"/>
+  </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index f52b0e10..cf01628b 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -29,26 +29,20 @@
       <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
       <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
       <property name="override" type="bool" value="true"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-taskmanager"/>
+      <property name="&lt;Super&gt;f" type="string" value="exo-open --launch  FileManager"/>
+      <property name="&lt;Super&gt;h" type="string" value="xfce4-taskmanager"/>
       <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder --collapsed">
         <property name="startup-notify" type="bool" value="true"/>
       </property>
+      <property name="&lt;Super&gt;d" type="string" value="urxvt -T &quot;Hardware Diagnostics&quot; -e hw-diags"/>
+      <property name="&lt;Super&gt;s" type="string" value="urxvt -T &quot;Hardware Diagnostics&quot; -e hw-diags foh"/>
+      <property name="&lt;Super&gt;m" type="string" value="urxvt -T &quot;Mount all Volumes&quot; -e mount-all-volumes foh">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="&lt;Super&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
       <property name="&lt;Super&gt;w" type="string" value="exo-open --launch WebBrowser"/>
-      <property name="&lt;Alt&gt;Super_L" type="empty">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;t" type="string" value="exo-open --launch TerminalEmulator">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;h" type="string" value="xfce4-taskmanager">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
       <property name="&lt;Super&gt;x" type="string" value="xfce4-session-logout"/>
-      <property name="&lt;Super&gt;f" type="string" value="exo-open --launch FileManager /home/wktech">
-        <property name="startup-notify" type="bool" value="true"/>
-      </property>
-      <property name="&lt;Super&gt;m" type="string" value="urxvt -title &quot;Mount all Volumes&quot; -e mount-all-volumes"/>
-      <property name="&lt;Super&gt;d" type="string" value="urxvt -title &quot;Hardware Diagnostics&quot; -e hw-diags"/>
-      <property name="&lt;Super&gt;s" type="string" value="urxvt -title &quot;Hardware Diagnostics - FoH&quot; -e hw-diags foh"/>
       <property name="&lt;Primary&gt;Escape" type="string" value="xfce4-popup-whiskermenu"/>
     </property>
   </property>
@@ -164,7 +158,7 @@
     </property>
   </property>
   <property name="providers" type="array">
-    <value type="string" value="xfwm4"/>
     <value type="string" value="commands"/>
+    <value type="string" value="xfwm4"/>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
deleted file mode 100644
index 33cccb13..00000000
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-mime-settings" version="1.0">
-  <property name="last" type="empty">
-    <property name="window-width" type="int" value="550"/>
-    <property name="window-height" type="int" value="400"/>
-    <property name="mime-width" type="int" value="300"/>
-    <property name="status-width" type="int" value="75"/>
-    <property name="default-width" type="int" value="144"/>
-  </property>
-</channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml
new file mode 100644
index 00000000..49d6bca6
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-mixer" version="1.0">
+  <property name="sound-card" type="string" value="Intel82801AAICHAlsamixer"/>
+  <property name="sound-cards" type="empty">
+    <property name="Intel82801AAICHAlsamixer" type="array">
+      <value type="string" value="Stereo Mic"/>
+      <value type="string" value="Spread Front to Surround and Center/LFE"/>
+      <value type="string" value="Exchange Front/Surround"/>
+      <value type="string" value="Mic Select"/>
+      <value type="string" value="Mic Boost (+20dB)"/>
+      <value type="string" value="Microphone Capture"/>
+      <value type="string" value="Microphone"/>
+      <value type="string" value="CD Capture"/>
+      <value type="string" value="CD"/>
+      <value type="string" value="Line Jack Sense"/>
+      <value type="string" value="Line-in Capture"/>
+      <value type="string" value="Line-in"/>
+      <value type="string" value="PCM Out Path &amp; Mute"/>
+      <value type="string" value="PCM"/>
+      <value type="string" value="Headphone Jack Sense"/>
+      <value type="string" value="Master Mono"/>
+      <value type="string" value="Master"/>
+    </property>
+  </property>
+  <property name="window-height" type="int" value="400"/>
+  <property name="window-width" type="int" value="640"/>
+</channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
new file mode 100644
index 00000000..5cf67af8
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-notifyd" version="1.0">
+  <property name="notify-location" type="uint" value="2"/>
+</channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index bd7b830d..14332612 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -5,49 +5,61 @@
   <property name="panels" type="array">
     <value type="int" value="1"/>
     <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=512;y=752"/>
-      <property name="length" type="uint" value="100"/>
+      <property name="position" type="string" value="p=8;x=512;y=747"/>
+      <property name="mode" type="uint" value="0"/>
       <property name="position-locked" type="bool" value="true"/>
       <property name="size" type="uint" value="40"/>
+      <property name="disable-struts" type="bool" value="false"/>
+      <property name="length-adjust" type="bool" value="true"/>
+      <property name="length" type="uint" value="100"/>
       <property name="plugin-ids" type="array">
-        <value type="int" value="18"/>
-        <value type="int" value="3"/>
-        <value type="int" value="15"/>
         <value type="int" value="1"/>
-        <value type="int" value="6"/>
-        <value type="int" value="4"/>
         <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
       </property>
-      <property name="background-style" type="uint" value="0"/>
-      <property name="autohide-behavior" type="uint" value="0"/>
     </property>
   </property>
   <property name="plugins" type="empty">
-    <property name="plugin-3" type="string" value="tasklist"/>
-    <property name="plugin-15" type="string" value="separator">
+    <property name="plugin-1" type="string" value="whiskermenu"/>
+    <property name="plugin-5" type="string" value="tasklist">
+      <property name="flat-buttons" type="bool" value="true"/>
+      <property name="show-handle" type="bool" value="false"/>
+      <property name="grouping" type="uint" value="0"/>
+      <property name="show-wireframes" type="bool" value="true"/>
+      <property name="window-scrolling" type="bool" value="false"/>
+      <property name="show-labels" type="bool" value="true"/>
+    </property>
+    <property name="plugin-6" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
       <property name="style" type="uint" value="0"/>
     </property>
-    <property name="plugin-5" type="string" value="clock">
-      <property name="mode" type="uint" value="2"/>
-      <property name="digital-format" type="string" value="%R"/>
-      <property name="tooltip-format" type="string" value="%Y-%m-%d"/>
-    </property>
-    <property name="plugin-6" type="string" value="systray">
-      <property name="names-visible" type="array">
-        <value type="string" value="orage"/>
-        <value type="string" value="systray icon"/>
-        <value type="string" value="networkmanager applet"/>
-        <value type="string" value="task manager"/>
-      </property>
-    </property>
-    <property name="plugin-18" type="string" value="whiskermenu"/>
-    <property name="plugin-1" type="string" value="mixer">
-      <property name="sound-card" type="string" value="default"/>
+    <property name="plugin-7" type="string" value="mixer">
+      <property name="sound-card" type="string" value="Intel82801AAICHAlsamixer"/>
       <property name="track" type="string" value="Master"/>
       <property name="command" type="string" value="xfce4-mixer"/>
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
     </property>
-    <property name="plugin-4" type="string" value="power-manager-plugin"/>
+    <property name="plugin-8" type="string" value="systray">
+      <property name="names-visible" type="array">
+        <value type="string" value="networkmanager applet"/>
+        <value type="string" value="xfce4-power-manager"/>
+        <value type="string" value="task manager"/>
+        <value type="string" value="notes"/>
+      </property>
+      <property name="show-frame" type="bool" value="false"/>
+      <property name="names-hidden" type="array">
+      </property>
+      <property name="size-max" type="uint" value="40"/>
+    </property>
+    <property name="plugin-9" type="string" value="power-manager-plugin"/>
+    <property name="plugin-10" type="string" value="clock">
+      <property name="tooltip-format" type="string" value="%Y-%m-%d"/>
+      <property name="digital-format" type="string" value="%R"/>
+      <property name="mode" type="uint" value="2"/>
+    </property>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
index ff8fb309..94ae4a47 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -2,9 +2,9 @@
 
 <channel name="xfce4-power-manager" version="1.0">
   <property name="xfce4-power-manager" type="empty">
+    <property name="dpms-on-ac-off" type="uint" value="0"/>
     <property name="blank-on-ac" type="int" value="0"/>
     <property name="dpms-on-ac-sleep" type="uint" value="0"/>
-    <property name="dpms-on-ac-off" type="uint" value="0"/>
-    <property name="presentation-mode" type="bool" value="false"/>
+    <property name="show-tray-icon" type="int" value="0"/>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
index 0e99df2f..bfaccb81 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -3,8 +3,9 @@
 <channel name="xfce4-session" version="1.0">
   <property name="general" type="empty">
     <property name="FailsafeSessionName" type="empty"/>
-    <property name="SaveOnExit" type="bool" value="false"/>
     <property name="SessionName" type="string" value="Default"/>
+    <property name="SaveOnExit" type="bool" value="false"/>
+    <property name="PromptOnLogout" type="bool" value="true"/>
   </property>
   <property name="sessions" type="empty">
     <property name="Failsafe" type="empty">
@@ -23,24 +24,13 @@
     </property>
   </property>
   <property name="splash" type="empty">
-    <property name="Engine" type="string" value=""/>
-    <property name="engines" type="empty">
-      <property name="simple" type="empty">
-        <property name="Font" type="string" value="Sans Bold 10"/>
-        <property name="BgColor" type="string" value="#000000"/>
-        <property name="FgColor" type="string" value="#ffffff"/>
-        <property name="Image" type="string" value=""/>
-      </property>
-      <property name="balou" type="empty">
-        <property name="Theme" type="string" value="Default"/>
-      </property>
-    </property>
+    <property name="Engine" type="empty"/>
+  </property>
+  <property name="compat" type="empty">
+    <property name="LaunchGNOME" type="bool" value="true"/>
   </property>
   <property name="shutdown" type="empty">
     <property name="ShowSuspend" type="bool" value="false"/>
     <property name="ShowHibernate" type="bool" value="false"/>
   </property>
-  <property name="compat" type="empty">
-    <property name="LaunchGNOME" type="bool" value="true"/>
-  </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
index a9444be1..cd059aab 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
@@ -2,7 +2,7 @@
 
 <channel name="xfce4-settings-manager" version="1.0">
   <property name="last" type="empty">
-    <property name="window-width" type="int" value="687"/>
+    <property name="window-width" type="int" value="707"/>
     <property name="window-height" type="int" value="539"/>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
index edfe5c35..aebf9edd 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -11,7 +11,7 @@
     <property name="button_spacing" type="int" value="0"/>
     <property name="click_to_focus" type="bool" value="true"/>
     <property name="cycle_apps_only" type="bool" value="false"/>
-    <property name="cycle_draw_frame" type="bool" value="false"/>
+    <property name="cycle_draw_frame" type="bool" value="true"/>
     <property name="cycle_hidden" type="bool" value="true"/>
     <property name="cycle_minimum" type="bool" value="true"/>
     <property name="cycle_preview" type="bool" value="true"/>
@@ -29,7 +29,7 @@
     <property name="horiz_scroll_opacity" type="bool" value="false"/>
     <property name="inactive_opacity" type="int" value="100"/>
     <property name="maximized_offset" type="int" value="0"/>
-    <property name="mousewheel_rollup" type="bool" value="true"/>
+    <property name="mousewheel_rollup" type="bool" value="false"/>
     <property name="move_opacity" type="int" value="100"/>
     <property name="placement_mode" type="string" value="center"/>
     <property name="placement_ratio" type="int" value="20"/>
@@ -72,16 +72,16 @@
     <property name="use_compositing" type="bool" value="true"/>
     <property name="workspace_count" type="int" value="1"/>
     <property name="wrap_cycle" type="bool" value="true"/>
+    <property name="wrap_layout" type="bool" value="true"/>
+    <property name="wrap_resistance" type="int" value="10"/>
+    <property name="wrap_windows" type="bool" value="true"/>
+    <property name="wrap_workspaces" type="bool" value="false"/>
+    <property name="zoom_desktop" type="bool" value="true"/>
     <property name="workspace_names" type="array">
       <value type="string" value="Workspace 1"/>
       <value type="string" value="Workspace 2"/>
       <value type="string" value="Workspace 3"/>
       <value type="string" value="Workspace 4"/>
     </property>
-    <property name="wrap_layout" type="bool" value="true"/>
-    <property name="wrap_resistance" type="int" value="10"/>
-    <property name="wrap_windows" type="bool" value="true"/>
-    <property name="wrap_workspaces" type="bool" value="false"/>
-    <property name="zoom_desktop" type="bool" value="true"/>
   </property>
 </channel>
diff --git a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index c00d8438..2284a963 100644
--- a/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/archlive/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -3,7 +3,7 @@
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
     <property name="ThemeName" type="string" value="Arc"/>
-    <property name="IconThemeName" type="string" value="Numix-Circle-Light"/>
+    <property name="IconThemeName" type="string" value="Numix-Circle"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
     <property name="DndDragThreshold" type="empty"/>
@@ -31,7 +31,7 @@
     <property name="MenuImages" type="empty"/>
     <property name="ButtonImages" type="empty"/>
     <property name="MenuBarAccel" type="empty"/>
-    <property name="CursorThemeName" type="string" value="default"/>
+    <property name="CursorThemeName" type="empty"/>
     <property name="CursorThemeSize" type="empty"/>
     <property name="DecorationLayout" type="empty"/>
   </property>
diff --git a/archlive/airootfs/etc/skel/.conky_start b/archlive/airootfs/etc/skel/.conky_start
index 811f7722..8ebe5067 100644
--- a/archlive/airootfs/etc/skel/.conky_start
+++ b/archlive/airootfs/etc/skel/.conky_start
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sleep 3s && conky
+sleep 5s && conky
diff --git a/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin b/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin
new file mode 100644
index 00000000..e7f302f4
Binary files /dev/null and b/archlive/airootfs/etc/skel/.gstreamer-0.10/registry.x86_64.bin differ
diff --git a/archlive/airootfs/etc/skel/.local/share/notes/Notes/Notes b/archlive/airootfs/etc/skel/.local/share/notes/Notes/Notes
new file mode 100644
index 00000000..e69de29b
diff --git a/archlive/airootfs/etc/skel/.local/share/recently-used.xbel b/archlive/airootfs/etc/skel/.local/share/recently-used.xbel
new file mode 100644
index 00000000..bedfa5f0
--- /dev/null
+++ b/archlive/airootfs/etc/skel/.local/share/recently-used.xbel
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xbel version="1.0"
+      xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
+      xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
+>
+  <bookmark href="file:///usr/share/wallpaper" added="2016-05-01T18:50:20Z" modified="2016-05-01T18:50:20Z" visited="2016-05-01T18:50:21Z">
+    <info>
+      <metadata owner="http://freedesktop.org">
+        <mime:mime-type type="inode/directory"/>
+        <bookmark:applications>
+          <bookmark:application name="xfdesktop-settings" exec="&apos;xfdesktop-settings %u&apos;" modified="2016-05-01T18:50:20Z" count="1"/>
+        </bookmark:applications>
+      </metadata>
+    </info>
+  </bookmark>
+</xbel>
\ No newline at end of file
diff --git a/archlive/airootfs/etc/skel/.tmux.conf b/archlive/airootfs/etc/skel/.tmux.conf
index cdf5a3f2..29cf429c 100644
--- a/archlive/airootfs/etc/skel/.tmux.conf
+++ b/archlive/airootfs/etc/skel/.tmux.conf
@@ -1 +1,2 @@
 set -g status off
+set -g pane-active-border-fg white
diff --git a/archlive/airootfs/etc/skel/.wifi b/archlive/airootfs/etc/skel/.wifi
deleted file mode 100644
index 859c57b5..00000000
--- a/archlive/airootfs/etc/skel/.wifi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sleep 1s
-nmcli dev wifi con "SomeWiFi" password "Abracadabra"
-
diff --git a/archlive/airootfs/etc/skel/.zsh_aliases b/archlive/airootfs/etc/skel/.zsh_aliases
index 417a3e84..b6c91916 100644
--- a/archlive/airootfs/etc/skel/.zsh_aliases
+++ b/archlive/airootfs/etc/skel/.zsh_aliases
@@ -5,6 +5,7 @@ alias 7z3='7z a -t7z -mx=3'
 alias 7z5='7z a -t7z -mx=5'
 alias 7z7='7z a -t7z -mx=7'
 alias 7z9='7z a -t7z -mx=9'
+alias diff='colordiff' -ur
 alias du='du -sch --apparent-size'
 alias fidentify="/usr/bin/fidentify-wip$(getconf LONG_BIT)"
 alias fix-perms='find -type d -exec chmod 755 "{}" \; && find -type f -exec chmod 644 "{}" \;'
diff --git a/archlive/airootfs/usr/local/bin/hw-diags-badblocks b/archlive/airootfs/usr/local/bin/hw-diags-badblocks
index 8b5d75dc..817996d3 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-badblocks
+++ b/archlive/airootfs/usr/local/bin/hw-diags-badblocks
@@ -4,7 +4,7 @@
 
 function usage {
     echo "Usage: $0 log-dir device"
-    echo "  e.g. $0 /var/tmp/hw-diags/9001 /dev/sda"
+    echo "  e.g. $0 /tmp/tmp.7Mh5f1RhSL9001 /dev/sda"
 }
 
 # Bail early
diff --git a/archlive/airootfs/usr/local/bin/hw-diags-inner b/archlive/airootfs/usr/local/bin/hw-diags-inner
index 28b4d600..1bc5bde3 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-inner
+++ b/archlive/airootfs/usr/local/bin/hw-diags-inner
@@ -2,10 +2,6 @@
 #
 ## WK HW Diagnostics - Main script
 
-# Setup tmux
-# tmux set remain-on-exit on
-tmux set status off
-
 # Get TICKET#
 TICKET=""
 while [[ "$TICKET" == "" ]]; do
@@ -26,7 +22,7 @@ DIAG_SERVER_AVAIL="False"
 DIAG_SERVER="10.0.0.10"
 DIAG_DEST="/srv/Diagnostics/${TICKET}/${DIAG_DATE}"
 DIAG_USER="wkdiag"
-TMP_DIR="/var/tmp/hw-diags/${TICKET}/${DIAG_DATE}"
+TMP_DIR="$(mktemp -d)"
 ERRORS="False"
 ERROR_IMG="$TMP_DIR/error.jpg"
 PASSED_IMG="$TMP_DIR/passed.jpg"
@@ -46,6 +42,29 @@ for d in "${ARCH_DRIVES[@]}"; do
     DRIVES=(${DRIVES[@]//*$d*})
 done
 
+# Connect to network
+if ! ip a | grep -q '192.168.1'; then
+    # LAN
+    if ! ip l | grep -Eq '[0-9]+: +en'; then
+        ## Reload the tg3/broadcom driver (known fix for some Dell systems)
+        echo "No wired network adapters found; reloading drivers..."
+        sudo modprobe -r tg3
+        sudo modprobe broadcom
+        sudo modprobe tg3
+        sleep 5s
+    fi
+    
+    # WiFi
+    if ip l | grep -Eq '[0-9]+: +wl'; then
+        ## Skip if we're already connected (e.g. the code above worked)
+        if ! ip a | grep -q '192.168.1'; then
+            echo "Attempting to connect to SomeWiFi..."
+            nmcli dev wifi con "SomeWiFi" password "Abracadabra"
+            sleep 5s
+        fi
+    fi
+fi
+
 # Test connection to DIAG_SERVER
 if ip a | grep -q '192.168.1' && \
    ping -c 1 -q $DIAG_SERVER >/dev/null 2>&1; then
@@ -408,7 +427,7 @@ if [[ "$TEST_BADBLOCKS" == "True" ]]; then
             echo "Testing drive: ${tmp_device}"
             
             # Split and run
-            tmux split-window -d -v -l 7 "hw-diags-badblocks $TMP_DIR /dev/${tmp_device}"
+            tmux split-window -v -l 7 "hw-diags-badblocks $TMP_DIR /dev/${tmp_device}"
             
             # Wait until done
             sleep 2s
@@ -472,10 +491,15 @@ sudo inxi -CDdGlMmNopRsc 0 | grep -Ev '(/dev/ram|No RAID devices|Display Server|
 
 # Cleanup
 mkdir "$HOME/Tickets/$TICKET" -p 2>/dev/null
-rsync -aS "$TMP_DIR" "$HOME/Tickets/"
+rsync -aS "$TMP_DIR/" "$HOME/Tickets/$TICKET/"
 popd >/dev/null
 cd "$HOME/Tickets" && tar czf "${TICKET}.tgz" "$TICKET"
 
+# Update Server
+if [[ "$DIAG_SERVER_AVAIL" == "True" ]]; then
+    rsync -aqz "$TMP_DIR/" "${TICKET}.tgz" $DIAG_USER@$DIAG_SERVER:"$DIAG_DEST/" --exclude '*.out'
+fi
+
 # End
 echo -n "Press Enter to exit..."
 read -r
diff --git a/archlive/airootfs/usr/local/bin/hw-diags-prime95 b/archlive/airootfs/usr/local/bin/hw-diags-prime95
index 191639e5..6e29b670 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-prime95
+++ b/archlive/airootfs/usr/local/bin/hw-diags-prime95
@@ -7,7 +7,7 @@ MPRIME="/usr/bin/mprime$(getconf LONG_BIT)"
 
 function usage {
     echo "Usage: $0 log-dir"
-    echo "  e.g. $0 /var/tmp/hw-diags/9001"
+    echo "  e.g. $0 /tmp/tmp.7Mh5f1RhSL9001"
 }
 
 # Bail early
diff --git a/archlive/airootfs/usr/local/bin/hw-diags-sensors b/archlive/airootfs/usr/local/bin/hw-diags-sensors
index 66cddcc0..32fa7dc4 100644
--- a/archlive/airootfs/usr/local/bin/hw-diags-sensors
+++ b/archlive/airootfs/usr/local/bin/hw-diags-sensors
@@ -6,7 +6,7 @@ LOG_DIR="$1"
 
 function usage {
     echo "Usage: $0 log-dir"
-    echo "  e.g. $0 /var/tmp/hw-diags/9001"
+    echo "  e.g. $0 /tmp/tmp.7Mh5f1RhSL9001"
 }
 
 # Bail early
diff --git a/archlive/airootfs/usr/local/bin/mount-all-volumes b/archlive/airootfs/usr/local/bin/mount-all-volumes
index fe50a427..edf3094a 100644
--- a/archlive/airootfs/usr/local/bin/mount-all-volumes
+++ b/archlive/airootfs/usr/local/bin/mount-all-volumes
@@ -12,3 +12,9 @@ for v in $(inxi -Do | grep -E "$regex" | sed -r "s#.*($regex).*#\1#"); do
         echo "Failed to mount."
     fi
 done
+
+if [[ "$1" == "foh" && -n $DISPLAY ]]; then
+    sleep 1s
+    exo-open --launch FileManager "$HOME"
+fi
+echo "Done."
diff --git a/archlive/airootfs/usr/local/bin/mount-backup-shares b/archlive/airootfs/usr/local/bin/mount-backup-shares
index be313995..36e44645 100644
--- a/archlive/airootfs/usr/local/bin/mount-backup-shares
+++ b/archlive/airootfs/usr/local/bin/mount-backup-shares
@@ -3,8 +3,8 @@
 ## Mount NAS backup shares
 
 echo "Mounting NAS backup shares"
-sudo mkdir /Backups/ServerOne
+sudo mkdir /Backups/ServerOne -p
 sudo mount //10.0.0.10/Backups /Backups/ServerOne -o username=backup,password=Abracadabra
-sudo mkdir /Backups/ServerTwo
+sudo mkdir /Backups/ServerTwo -p
 sudo mount //10.0.0.11/Backups /Backups/ServerTwo -o username=backup,password=Abracadabra
 
diff --git a/archlive/airootfs/usr/local/bin/msword-search b/archlive/airootfs/usr/local/bin/msword-search
index bc7d4aa5..5917d660 100644
--- a/archlive/airootfs/usr/local/bin/msword-search
+++ b/archlive/airootfs/usr/local/bin/msword-search
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+TMP_FILE="$(mktemp)"
+
 IFS=$'\n'
 for s in $*; do
     REGEX="$s"
@@ -9,7 +11,7 @@ for s in $*; do
     for d in *doc; do
         if antiword "$d" | grep -iqsP "($REGEX)"; then
             echo "Possible match: $d"
-            echo "$d" >> msword.tmp
+            echo "$d" >> "$TMP_FILE"
         fi
     done
     
@@ -17,14 +19,20 @@ for s in $*; do
     for d in *docx; do
         if unzip -p "$d" word/document.xml | grep -iqsP "($REGEX)"; then
             echo "Possible match: $d"
-            echo "$d" >> msword.tmp
+            echo "$d" >> "$TMP_FILE"
         fi
     done
 
 done
 
 # Cleanup results
-if [[ -f msword.tmp ]]; then
-    sort -u msword.tmp >> msword-matches.txt
+if [[ -s "$TMP_FILE" ]]; then
+    sort -u "$TMP_FILE" >> "$HOME/msword-matches.txt"
 fi
+rm "$TMP_FILE"
 
+# Done
+if [[ -s "$HOME/msword-matches.txt" ]]; then
+    echo "Found $(wc -l "$HOME/msword-matches.txt") possible matches"
+    echo "The results have been saved to $HOME"
+fi
\ No newline at end of file
diff --git a/archlive/packages.both b/archlive/packages.both
index 5db6acf4..b87730d9 100644
--- a/archlive/packages.both
+++ b/archlive/packages.both
@@ -5,6 +5,8 @@ b43-fwcutter
 btrfs-progs
 chntpw
 clonezilla
+cmatrix
+colordiff
 conky
 crda
 curl
@@ -33,6 +35,7 @@ grub
 gsmartcontrol
 gtk-engine-murrine
 hdparm
+hexedit
 hfsprogs
 htop
 inxi
@@ -49,7 +52,8 @@ mc
 mdadm
 mediainfo
 mesa
-midori
+mesa-demos
+midori-gtk2
 mkvtoolnix-cli
 mpv
 mtools
@@ -93,6 +97,7 @@ truecrypt
 ttf-inconsolata
 udevil
 udisks2
+unzip
 usb_modeswitch
 vim
 vpnc
diff --git a/build-wk b/build-wk
new file mode 100644
index 00000000..2ffa0d3b
--- /dev/null
+++ b/build-wk
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Set Vars
+TMP_DIR="$(pwd)/wk_tmp"
+OUT_DIR="$TMP_DIR/out"
+
+# Build ISO
+mkdir $TMP_DIR
+mkdir $OUT_DIR
+./archlive/build.sh -N "arch-wk" -V "$(date +%F)" -L "ARCH_WK" -w "$TMP_DIR" -o "$OUT_DIR" -v
+
+# Cleanup
+mv -nv "$OUT_DIR"/*iso "$HOME/" && rm "$TMP_DIR" -Rf