diff --git a/home/.config/gtk-3.0/bookmarks b/home/.config/gtk-3.0/bookmarks
index bfdff79d..dbacd0c8 100644
--- a/home/.config/gtk-3.0/bookmarks
+++ b/home/.config/gtk-3.0/bookmarks
@@ -7,6 +7,5 @@ file:///home/liveuser/Videos
 file:///home/liveuser/Templates
 file:///home/liveuser/.config .config
 file:///home/liveuser/.config/polybar
-file:///home/liveuser/.config/neofetch
 file:///home/liveuser/.config/termite
 file:///home/liveuser/.config/openbox
diff --git a/home/.config/keypack b/home/.config/keypack
index bdb129cd..a9c63a53 100755
--- a/home/.config/keypack
+++ b/home/.config/keypack
@@ -5,10 +5,9 @@
 # only after a valid internet connection is made
 
 do_setup() {
-    keys=(
-    AEFB411B072836CD48FF0381AE252C284B5DBA5D
-    9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0
-    35F52A02854DCCAEC9DD5CC410443C7F54B00041
+    keys=("AEFB411B072836CD48FF0381AE252C284B5DBA5D"
+    "9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0"
+    "35F52A02854DCCAEC9DD5CC410443C7F54B00041"
     )
     sudo dirmngr </dev/null
     sudo pacman-key --init
diff --git a/home/.config/neofetch/archlabs.png b/home/.config/neofetch/archlabs.png
deleted file mode 100644
index 94726eb2..00000000
Binary files a/home/.config/neofetch/archlabs.png and /dev/null differ
diff --git a/home/.config/neofetch/config b/home/.config/neofetch/config
deleted file mode 100644
index 395cbfcd..00000000
--- a/home/.config/neofetch/config
+++ /dev/null
@@ -1,716 +0,0 @@
-#!/usr/bin/env bash
-#
-# Neofetch config file
-# https://github.com/dylanaraps/neofetch
-
-# Speed up script by not using unicode
-export LC_ALL=C
-export LANG=C
-
-# See this wiki page for more info:
-# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
-print_info() {
-    info title
-    info underline
-
-    info "OS" distro
-    #info "Model" model
-    info "Kernel" kernel
-    info "Uptime" uptime
-    info "Packages" packages
-    info "Shell" shell
-    info underline
-    #info "Resolution" resolution
-    #info "DE" de
-    info "WM" wm
-    #info "WM Theme" wm_theme
-    info "Theme" theme
-    info "Icons" icons
-    info "Terminal" term
-    info underline
-    #info "Terminal Font" term_font
-    info "CPU" cpu
-    info "GPU" gpu
-    info "Memory" memory
-
-
-    # info "CPU Usage" cpu_usage
-    # info "Disk" disk
-    # info "Battery" battery
-    # info "Font" font
-    # info "Song" song
-    # info "Local IP" local_ip
-    # info "Public IP" public_ip
-    # info "Users" users
-    # info "Install Date" install_date
-
-    info line_break
-    info cols
-    info line_break
-}
-
-
-# Kernel
-
-
-# Shorten the output of the kernel function.
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --kernel_shorthand
-# Supports: Everything except *BSDs (except PacBSD and PC-BSD)
-#
-# Example:
-# on:  '4.8.9-1-ARCH'
-# off: 'Linux 4.8.9-1-ARCH'
-kernel_shorthand="on"
-
-
-# Distro
-
-
-# Shorten the output of the distro function
-#
-# Default:  'off'
-# Values:   'on', 'off', 'tiny'
-# Flag:     --distro_shorthand
-# Supports: Everything except Windows and Haiku
-distro_shorthand="on"
-
-# Show/Hide OS Architecture.
-# Show 'x86_64', 'x86' and etc in 'Distro:' output.
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --os_arch
-#
-# Example:
-# on:  'Arch Linux x86_64'
-# off: 'Arch Linux'
-os_arch="off"
-
-
-# Uptime
-
-
-# Shorten the output of the uptime function
-#
-# Default: 'on'
-# Values:  'on', 'off', 'tiny'
-# Flag:    --uptime_shorthand
-#
-# Example:
-# on:   '2 days, 10 hours, 3 mins'
-# off:  '2 days, 10 hours, 3 minutes'
-# tiny: '2d 10h 3m'
-uptime_shorthand="on"
-
-
-# Shell
-
-
-# Show the path to $SHELL
-#
-# Default: 'off'
-# Values:  'on', 'off'
-# Flag:    --shell_path
-#
-# Example:
-# on:  '/bin/bash'
-# off: 'bash'
-shell_path="off"
-
-# Show $SHELL version
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --shell_version
-#
-# Example:
-# on:  'bash 4.4.5'
-# off: 'bash'
-shell_version="on"
-
-
-# CPU
-
-
-# CPU speed type
-#
-# Default: 'bios_limit'
-# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'.
-# Flag:    --speed_type
-# Supports: Linux with 'cpufreq'
-# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value.
-speed_type="bios_limit"
-
-# Shorten the output of the CPU function
-#
-# Default: 'off'
-# Values:  'on', 'off', 'tiny', 'name', 'speed'
-# Flag:    --cpu_shorthand
-#
-# Example:
-# on:    'i7-6500U (4) @ 3.1GHz'
-# off:   'Intel i7-6500U (4) @ 3.1GHz'
-# tiny:  'i7-6500U (4)'
-# name:  'Intel i7-6500U (4)'
-# speed: '3.1GHz'
-cpu_shorthand="on"
-
-# CPU Speed
-# Hide/Show CPU speed.
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --cpu_speed
-#
-# Example:
-# on:  'Intel i7-6500U (4) @ 3.1GHz'
-# off: 'Intel i7-6500U (4)'
-cpu_speed="on"
-
-# CPU Cores
-# Display CPU cores in output
-#
-# Default: 'logical'
-# Values:  'logical', 'physical', 'off'
-# Flag:    --cpu_cores
-# Support: 'physical' doesn't work on BSD.
-#
-# Example:
-# logical:  'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores)
-# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores)
-# off:      'Intel i7-6500U @ 3.1GHz'
-cpu_cores="off"
-
-# CPU Temperature
-# Hide/Show CPU temperature.
-# Note the temperature is added to the regular CPU function.
-#
-# Default: 'off'
-# Values:  'C', 'F', 'off'
-# Flag:    --cpu_temp
-# Supports: Linux
-#
-# Example:
-# C:   'Intel i7-6500U (4) @ 3.1GHz [27.2°C]'
-# F:   'Intel i7-6500U (4) @ 3.1GHz [82.0°F]'
-# off: 'Intel i7-6500U (4) @ 3.1GHz'
-cpu_temp="off"
-
-
-# GPU
-
-
-# Enable/Disable GPU Brand
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --gpu_brand
-#
-# Example:
-# on:  'AMD HD 7950'
-# off: 'HD 7950'
-gpu_brand="off"
-
-# Which GPU to display
-#
-# Default: 'all'
-# Values:  'all', 'dedicated', 'integrated'
-# Flag:    --gpu_type
-# Supports: Linux
-#
-# Example:
-# all:
-#   GPU1: AMD HD 7950
-#   GPU2: Intel Integrated Graphics
-#
-# dedicated:
-#   GPU1: AMD HD 7950
-#
-# integrated:
-#   GPU1: Intel Integrated Graphics
-gpu_type="all"
-
-
-# Resolution
-
-
-# Display refresh rate next to each monitor
-# Default: 'off'
-# Values:  'on', 'off'
-# Flag:    --refresh_rate
-# Supports: Doesn't work on Windows.
-#
-# Example:
-# on:  '1920x1080 @ 60Hz'
-# off: '1920x1080'
-refresh_rate="off"
-
-
-# Gtk Theme / Icons / Font
-
-
-# Shorten output of GTK Theme / Icons / Font
-#
-# Default: 'off'
-# Values:  'on', 'off'
-# Flag:    --gtk_shorthand
-#
-# Example:
-# on:  'Numix, Adwaita'
-# off: 'Numix [GTK2], Adwaita [GTK3]'
-gtk_shorthand="on"
-
-
-# Enable/Disable gtk2 Theme / Icons / Font
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --gtk2
-#
-# Example:
-# on:  'Numix [GTK2], Adwaita [GTK3]'
-# off: 'Adwaita [GTK3]'
-gtk2="on"
-
-# Enable/Disable gtk3 Theme / Icons / Font
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --gtk3
-#
-# Example:
-# on:  'Numix [GTK2], Adwaita [GTK3]'
-# off: 'Numix [GTK2]'
-gtk3="off"
-
-
-# IP Address
-
-
-# Website to ping for the public IP
-#
-# Default: 'http://ident.me'
-# Values:  'url'
-# Flag:    --ip_host
-public_ip_host="http://ident.me"
-
-
-# Disk
-
-
-# Which disks to display.
-# The values can be any /dev/sdXX, mount point or directory.
-# NOTE: By default we only show the disk info for '/'.
-#
-# Default: '/'
-# Values:  '/', '/dev/sdXX', '/path/to/drive'.
-# Flag:    --disk_show
-#
-# Example:
-# disk_show=('/' '/dev/sdb1'):
-#      'Disk (/): 74G / 118G (66%)'
-#      'Disk (/mnt/Videos): 823G / 893G (93%)'
-#
-# disk_show=('/'):
-#      'Disk (/): 74G / 118G (66%)'
-#
-disk_show=('/')
-
-# Disk subtitle.
-# What to append to the Disk subtitle.
-#
-# Default: 'mount'
-# Values:  'mount', 'name'
-# Flag:    --disk_subtitle
-#
-# Example:
-# name:   'Disk (/dev/sda1): 74G / 118G (66%)'
-#         'Disk (/dev/sdb2): 74G / 118G (66%)'
-#
-# mount:  'Disk (/): 74G / 118G (66%)'
-#         'Disk (/mnt/Local Disk): 74G / 118G (66%)'
-disk_subtitle="mount"
-
-
-# Song
-
-
-# Print the Artist and Title on separate lines
-#
-# Default: 'off'
-# Values:  'on', 'off'
-# Flag:    --song_shorthand
-#
-# Example:
-# on:  'Artist: The Fratellis'
-#      'Song: Chelsea Dagger'
-#
-# off: 'Song: The Fratellis - Chelsea Dagger'
-song_shorthand="on"
-
-
-# Install Date
-
-
-# Whether to show the time in the output
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --install_time
-#
-# Example:
-# on:  'Thu 14 Apr 2016 11:50 PM'
-# off: 'Thu 14 Apr 2016'
-install_time="on"
-
-# Set time format in the output
-#
-# Default: '24h'
-# Values:  '12h', '24h'
-# Flag:    --install_time_format
-#
-# Example:
-# 12h: 'Thu 14 Apr 2016 11:50 PM'
-# 24h: 'Thu 14 Apr 2016 23:50'
-install_time_format="12h"
-
-
-# Text Colors
-
-
-# Text Colors
-#
-# Default:  'distro'
-# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
-# Flag:     --colors
-#
-# Each number represents a different part of the text in
-# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info'
-#
-# Example:
-# colors=(distro)      - Text is colored based on Distro colors.
-# colors=(4 6 1 8 8 6) - Text is colored in the order above.
-colors=(distro)
-
-
-# Text Options
-
-
-# Toggle bold text
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --bold
-bold="on"
-
-# Enable/Disable Underline
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --underline
-underline_enabled="on"
-
-# Underline character
-#
-# Default:  '-'
-# Values:   'string'
-# Flag:     --underline_char
-underline_char="-"
-
-
-# Color Blocks
-
-
-# Color block range
-# The range of colors to print.
-#
-# Default:  '0', '7'
-# Values:   'num'
-# Flag:     --block_range
-#
-# Example:
-#
-# Display colors 0-7 in the blocks.  (8 colors)
-# neofetch --block_range 0 7
-#
-# Display colors 0-15 in the blocks. (16 colors)
-# neofetch --block_range 0 15
-block_range=(0 7)
-
-# Toggle color blocks
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --color_blocks
-color_blocks="on"
-
-# Color block width in spaces
-#
-# Default:  '3'
-# Values:   'num'
-# Flag:     --block_width
-block_width=3
-
-# Color block height in lines
-#
-# Default:  '1'
-# Values:   'num'
-# Flag:     --block_height
-block_height=1
-
-
-# Progress Bars
-
-
-# Bar characters
-#
-# Default:  '-', '='
-# Values:   'string', 'string'
-# Flag:     --bar_char
-#
-# Example:
-# neofetch --bar_char 'elapsed' 'total'
-# neofetch --bar_char '-' '='
-bar_char_elapsed="-"
-bar_char_total="="
-
-# Toggle Bar border
-#
-# Default:  'on'
-# Values:   'on', 'off'
-# Flag:     --bar_border
-bar_border="on"
-
-# Progress bar length in spaces
-# Number of chars long to make the progress bars.
-#
-# Default:  '15'
-# Values:   'num'
-# Flag:     --bar_length
-bar_length=15
-
-# Progress bar colors
-# When set to distro, uses your distro's logo colors.
-#
-# Default:  'distro', 'distro'
-# Values:   'distro', 'num'
-# Flag:     --bar_colors
-#
-# Example:
-# neofetch --bar_colors 3 4
-# neofetch --bar_colors distro 5
-bar_color_elapsed="distro"
-bar_color_total="distro"
-
-
-# Info display
-# Display a bar with the info.
-#
-# Default: 'off'
-# Values:  'bar', 'infobar', 'barinfo', 'off'
-# Flags:   --cpu_display
-#          --memory_display
-#          --battery_display
-#          --disk_display
-#
-# Example:
-# bar:     '[---=======]'
-# infobar: 'info [---=======]'
-# barinfo: '[---=======] info'
-# off:     'info'
-cpu_display="off"
-memory_display="off"
-battery_display="off"
-disk_display="off"
-
-
-# Backend Settings
-
-# Image backend.
-#
-# Default:  'ascii'
-# Values:   'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m'
-# Flag:     --backend
-image_backend="w3m"
-
-# Image Source
-#
-# Which image or ascii file to display.
-#
-# Default:  'auto'
-# Values:   'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/'
-# Flag:     --source
-#
-# NOTE: 'auto' will pick the best image source for whatever image backend is used.
-#       In ascii mode, distro ascii art will be used and in an image mode, your
-#       wallpaper will be used.
-image_source="$HOME/.config/neofetch/archlabs.png"
-
-
-# Ascii Options
-
-
-# Ascii distro
-# Which distro's ascii art to display.
-#
-# Default: 'auto'
-# Values:  'auto', 'distro_name'
-# Flag:    --ascii_distro
-#
-# NOTE: Arch and Ubuntu have 'old' logo variants.
-#       Change this to 'arch_old' or 'ubuntu_old' to use the old logos.
-# NOTE: Ubuntu has flavor variants.
-#       Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors.
-# NOTE: Arch, Crux and Gentoo have a smaller logo variant.
-#       Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos.
-#ascii_distro="arch_old"
-
-# Ascii Colors
-#
-# Default:  'distro'
-# Values:   'distro', 'num' 'num' 'num' 'num' 'num' 'num'
-# Flag:     --ascii_colors
-#
-# Example:
-# ascii_colors=(distro)      - Ascii is colored based on Distro colors.
-# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors.
-ascii_colors=(distro)
-
-# Bold ascii logo
-# Whether or not to bold the ascii logo.
-#
-# Default: 'on'
-# Values:  'on', 'off'
-# Flag:    --ascii_bold
-ascii_bold="on"
-
-
-# Image Options
-
-
-# Thumbnail directory
-#
-# Default: '~/.cache/thumbnails/neofetch'
-# Values:  'dir'
-thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch"
-
-# Crop mode
-#
-# Default:  'normal'
-# Values:   'normal', 'fit', 'fill'
-# Flag:     --crop_mode
-#
-# See this wiki page to learn about the fit and fill options.
-# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F
-crop_mode="normal"
-
-# Crop offset
-# Note: Only affects 'normal' crop mode.
-#
-# Default:  'center'
-# Values:   'northwest', 'north', 'northeast', 'west', 'center'
-#           'east', 'southwest', 'south', 'southeast'
-# Flag:     --crop_offset
-crop_offset="center"
-
-# Image size
-# The image is half the terminal width by default.
-#
-# Default: 'auto'
-# Values:  'auto', '00px', '00%', 'none'
-# Flags:   --image_size
-#          --size
-image_size="200"
-
-# Ggap between image and text
-#
-# Default: '3'
-# Values:  'num', '-num'
-# Flag:    --gap
-gap=3
-
-# Image offsets
-# Only works with the w3m backend.
-#
-# Default: '0'
-# Values:  'px'
-# Flags:   --xoffset
-#          --yoffset
-yoffset=10
-xoffset=10
-
-# Image background color
-# Only works with the w3m backend.
-#
-# Default: ''
-# Values:  'color', 'blue'
-# Flag:    --bg_color
-background_color=
-
-
-# Scrot Options
-
-
-# Whether or not to always take a screenshot
-# You can manually take a screenshot with "--scrot" or "-s"
-#
-# Default: 'off'
-# Values:  'on', 'off'
-# Flags:   --scrot
-#          -s
-scrot="off"
-
-# Screenshot Program
-# Neofetch will automatically use whatever screenshot tool
-# is installed on your system.
-#
-# If 'neofetch -v' says that it couldn't find a screenshot
-# tool or you're using a custom tool then you can change
-# the option below to a custom command.
-#
-# Default: 'auto'
-# Values:  'auto' 'cmd -flags'
-# Flag:    --scrot_cmd
-scrot_cmd="auto"
-
-# Screenshot Directory
-# Where to save the screenshots
-#
-# Default: '~/Pictures/'
-# Values:  'dir'
-# Flag:    --scrot_dir
-#
-# Note: Neofetch won't create the directory if it doesn't exist.
-scrot_dir="$HOME/Pictures/"
-
-# Screenshot Filename
-# What to name the screenshots
-#
-# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png'
-# Values:  'string'
-# Flag:    --scrot_name
-scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png"
-
-# Image upload host
-# Where to upload the image.
-#
-# Default: 'teknik'
-# Values:  'imgur', 'teknik'
-# Flag:    --image_host
-#
-# NOTE: If you'd like another image host to be added to Neofetch.
-#       Open an issue on github.
-image_host="teknik"
-
-
-# Misc Options
-
-
-# Config version.
-#
-# NOTE: Don't change this value, neofetch reads this to determine
-# how to handle backwards compatibility.
-config_version="2.1.0"
diff --git a/home/.config/ob-autostart/config b/home/.config/ob-autostart/config
index e314240a..ef2fded2 100644
--- a/home/.config/ob-autostart/config
+++ b/home/.config/ob-autostart/config
@@ -1,5 +1,4 @@
 # OB_Autostart config
 LAUNCH_LIST = [
-	 ("Window snapping","opensnap --daemon -c /etc/opensnap","0","*"),
 	 ("Window switcher","skippy-xd --config $HOME/.config/skippy-xd/skippy-xd.rc --start-daemon","1","*"),
 	]
diff --git a/home/.config/obmenu-generator/schema.pl b/home/.config/obmenu-generator/schema.pl
index 2c18651d..e7634c84 100644
--- a/home/.config/obmenu-generator/schema.pl
+++ b/home/.config/obmenu-generator/schema.pl
@@ -85,4 +85,4 @@ our $SCHEMA = [
     {sep => undef},
     {item => ['i3lock-fancy -p', 'Lock Screen', 'lock']},
     {item => ['oblogout', 'Exit Openbox', 'exit']},
-    ]
+]
diff --git a/home/.config/openbox/environment b/home/.config/openbox/environment
index 8ef77587..d0dba124 100644
--- a/home/.config/openbox/environment
+++ b/home/.config/openbox/environment
@@ -4,14 +4,11 @@
 # To set your language for displaying messages and time/date formats, use the following:
 # LANG=en_US.UTF8
 
-# GNOME Keyring
-export "$(gnome-keyring-daemon --start --components=pkcs11,secrets)"
-
 # xdg-open applications
-export XDG_CURRENT_DESKTOP=XFCE
-export DE="xfce"
+# export XDG_CURRENT_DESKTOP=XFCE
+# export DE="xfce"
 
-# dbus with openbox
-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-    eval "$(dbus-launch --sh-syntax --exit-with-session)"
-fi
+# # dbus with openbox
+# if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+#     eval "$(dbus-launch --sh-syntax --exit-with-session)"
+# fi
diff --git a/home/.config/openbox/menu-static.xml b/home/.config/openbox/menu-static.xml
deleted file mode 100644
index ca48b66e..00000000
--- a/home/.config/openbox/menu-static.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openbox_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openbox.org/  file:///usr/share/openbox/menu.xsd">
-  <menu id="root-menu" label="Openbox 3">
-    <separator label="ArchLabs"/>
-    <item label="Terminal">
-      <action name="Execute">
-        <command>exo-open --launch TerminalEmulator</command>
-      </action>
-    </item>
-    <item label="Web Browser">
-      <action name="Execute">
-        <command>exo-open --launch WebBrowser</command>
-      </action>
-    </item>
-    <item label="File Manager">
-      <action name="Execute">
-        <command>exo-open --launch FileManager</command>
-      </action>
-    </item>
-    <item label="Text Editor">
-      <action name="Execute">
-        <command>geany</command>
-      </action>
-    </item>
-    <separator/>
-    <menu id="accessories" label="Accessories">
-      <item label="Calculator">
-        <action name="Execute">
-          <command>galculator</command>
-        </action>
-      </item>
-      <item label="Archive Manager">
-        <action name="Execute">
-          <command>file-roller</command>
-        </action>
-      </item>
-      <item label="Picture Viewer">
-        <action name="Execute">
-          <command>gpicview</command>
-        </action>
-      </item>
-    </menu>
-    <menu id="screenshot" label="Screenshot">
-      <item label="Screenshot Now">
-        <action name="Execute">
-          <command>scrot 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f'</command>
-        </action>
-      </item>
-      <item label="Screenshot in 5">
-        <action name="Execute">
-          <command>scrot -d 5 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f'</command>
-        </action>
-      </item>
-      <item label="Screenshot in 10">
-        <action name="Execute">
-          <command>scrot -d 10 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f'</command>
-        </action>
-      </item>
-      <item label="Screenshot With Selection">
-        <action name="Execute">
-          <command>scrot -s 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f'</command>
-        </action>
-      </item>
-    </menu>
-    <menu id="multimedia" label="Multimedia">
-      <item label="Music Player">
-        <action name="Execute">
-          <command>audacious</command>
-        </action>
-      </item>
-      <item label="Video Player">
-        <action name="Execute">
-          <command>mpv --player-operation-mode=pseudo-gui</command>
-        </action>
-      </item>
-    </menu>
-    <separator/>
-    <menu execute="al-places-pipemenu --recent ~/" id="pipe-placesmenu" label="Places"/>
-    <separator/>
-    <menu id="preferences" label="Preferences">
-      <menu id="obConfig" label="Openbox">
-        <item label="Settings Editor">
-          <action name="Execute">
-            <command>obconf</command>
-          </action>
-        </item>
-        <item label="Menu Editor">
-          <action name="Execute">
-            <command>kickshaw</command>
-          </action>
-        </item>
-        <item label="Keybind Editor">
-          <action name="Execute">
-            <command>obkey</command>
-          </action>
-        </item>
-        <item label="Autostart Editor">
-          <action name="Execute">
-            <command>ob-autostart</command>
-          </action>
-        </item>
-        <separator/>
-        <item label="Edit menu.xml">
-          <action name="Execute">
-            <command>exo-open ~/.config/openbox/menu.xml</command>
-          </action>
-        </item>
-        <item label="Edit rc.xml">
-          <action name="Execute">
-            <command>exo-open ~/.config/openbox/rc.xml</command>
-          </action>
-        </item>
-        <item label="Edit autostart">
-          <action name="Execute">
-            <command>exo-open ~/.config/openbox/autostart</command>
-          </action>
-        </item>
-        <separator/>
-        <item label="Openbox Reconfigure">
-          <action name="Reconfigure"/>
-        </item>
-        <item label="Openbox Restart">
-          <action name="Restart"/>
-        </item>
-      </menu>
-      <menu execute="al-compositor" id="CompositingPipeMenu" label="Compositor"/>
-      <menu execute="al-polybar-pipemenu" id="PolybarPipeMenu" label="Polybar"/>
-      <menu execute="al-conky-pipemenu" id="ConkyPipeMenu" label="Conky"/>
-      <menu execute="al-tint2-pipemenu" id="TintPipeMenu" label="Tint2"/>
-      <item label="Panel Chooser">
-        <action name="Execute">
-          <command>al-panel-chooser</command>
-        </action>
-      </item>
-      <separator/>
-      <item label="Appearance">
-        <action name="Execute">
-          <command>xfce4-appearance-settings</command>
-        </action>
-      </item>
-      <item label="Wallpaper">
-        <action name="Execute">
-          <command>nitrogen</command>
-        </action>
-      </item>
-      <item label="Rofi Theme">
-        <action name="Execute">
-          <command>rofi-theme-selector</command>
-        </action>
-      </item>
-      <separator/>
-      <item label="Settings Manager">
-        <action name="Execute">
-          <command>xfce4-settings-manager</command>
-        </action>
-      </item>
-      <item label="Audio Settings">
-        <action name="Execute">
-          <command>pavucontrol</command>
-        </action>
-      </item>
-      <item label="Screen Layout">
-        <action name="Execute">
-          <command>arandr</command>
-        </action>
-      </item>
-    </menu>
-    <menu id="system-settings" label="System Settings">
-      <item label="Package Manager">
-        <action name="Execute">
-          <command>termite --exec=pacli</command>
-        </action>
-      </item>
-      <item label="GParted">
-        <action name="Execute">
-          <command>gparted</command>
-        </action>
-      </item>
-    </menu>
-    <menu execute="al-help-pipemenu" id="help" label="Help and Info"/>
-    <menu execute="al-kb-pipemenu" id="keybinds" label="Keybinds"/>
-    <separator/>
-    <item label="Lock Screen">
-      <action name="Execute">
-        <command>i3lock-fancy -p</command>
-      </action>
-    </item>
-    <item label="Exit Openbox">
-      <action name="Execute">
-        <command>rofr.sh -l</command>
-      </action>
-    </item>
-  </menu>
-</openbox_menu>
-<!-- vim:sw=2
--->
diff --git a/home/.xinitrc b/home/.xinitrc
index 24f8ef80..ee49c026 100755
--- a/home/.xinitrc
+++ b/home/.xinitrc
@@ -6,15 +6,12 @@
 #    startx ~/.xinitrc WM
 
 
-# Session to run if none given
+# Session to run if none passed via startx
 session=${1:-openbox}
 
-# set ENV window manager for use in other scripts
+# set environment wm for use in scripts
 export WM="$session"
 
-# bspwm requires this to be set
-export XDG_CONFIG_HOME=$HOME/.config
-
 # Default Arch xinit scripts
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
     for f in /etc/X11/xinit/xinitrc.d/*.sh; do
@@ -22,59 +19,36 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     done
 fi
 
-if [ -f /etc/X11/xinit/.Xmodmap ]; then
-    xmodmap /etc/X11/xinit/.Xmodmap
-fi
-
 # user init scripts and settings
-if [ -f ~/.Xmodmap ]; then
-    xmodmap ~/.Xmodmap
-fi
-
-if [ -f ~/.Xresources ]; then
-    xrdb -merge ~/.Xresources
-fi
-
-if [ -f ~/.xprofile ]; then
-    source ~/.xprofile
-fi
-
+[ -f /etc/X11/xinit/.Xmodmap ] && xmodmap /etc/X11/xinit/.Xmodmap
+[ -f ~/.Xmodmap ] && xmodmap ~/.Xmodmap
+[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+[ -f ~/.xprofile ] && source ~/.xprofile
 
+# keyring for storing passwords
 if hash gnome-keyring &>/dev/null; then
-    # keyring for storing passwords
     gnome-keyring-daemon --start --components=pkcs11 &
 fi
 
-if [ -x "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" ]; then
-    # run policy kit
-    /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-fi
+# display timeout and sleep
+xset s 3600 3600
+xset dpms 3600 3700 4000
 
 # keyboard repeat rate
-kbdrate -d 400 -r 50
 xset r rate 400 50
+kbdrate -d 400 -r 50
 
-# display timeout
-xset s 3600 3600
+# 1/1 mouse acceleration
+xset m 1/1
 
 
-# Do NOT put code below this case statement
+# Do NOT put commands below the exec lines
 case $session in
-    i3|i3wm)
-        exec i3
-        ;;
-    bsp|bspwm)
-        exec bspwm
-        ;;
-    xfce|xfce4)
-        exec startxfce4
-        ;;
-    openbox)
-        exec openbox-session
-        ;;
-    dwm)
-        exec dwm
-        ;;
-    *)
-        exec "$1" # Unknown, try running it
+    i3|i3wm)    exec i3              ;;
+    bsp|bspwm)  exec bspwm           ;;
+    xfce|xfce4) exec startxfce4      ;;
+    openbox)    exec openbox-session ;;
+    awesome)    exec awesome         ;;
+    dwm)        exec dwm             ;;
+    *)          exec "$1"            # Unknown, try running it
 esac
diff --git a/home/.xprofile b/home/.xprofile
index 67a0238b..3568b721 100644
--- a/home/.xprofile
+++ b/home/.xprofile
@@ -1,22 +1,10 @@
 # .xprofile
 # vim:ft=sh
-# lightdm sources this file at boot
-# as well as our own xinitrc with startx
 
-export XDG_CONFIG_HOME=$HOME/.config
+# sourced at boot by xinit
 
-if [ -d "/sbin" ]; then
-    PATH="/sbin:$PATH"
-fi
+[ -d "/sbin" ] && PATH="$PATH:/sbin"
+[ -d "/usr/sbin" ] && PATH="$PATH:/usr/sbin"
+[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
 
-if [ -d "/usr/sbin" ]; then
-    PATH="/usr/sbin:$PATH"
-fi
-
-if [ -d "$HOME/bin" ]; then
-    PATH=$HOME/bin:$PATH
-fi
-
-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-    eval "$(dbus-launch --sh-syntax --exit-with-session)"
-fi
+export XDG_CONFIG_HOME="$HOME/.config"
diff --git a/home/.zprofile b/home/.zprofile
index be8db225..38f0384f 100644
--- a/home/.zprofile
+++ b/home/.zprofile
@@ -1,9 +1,5 @@
 # .zprofile
 # sourced by zsh when used as a login shell
 
-# Uncomment below to autologin startx
-# also see comments in ~/.xinitrc for more info
-
-if [[ -z $DISPLAY ]] && [[ -n $XDG_VTNR ]] && [[ $XDG_VTNR -eq 1 ]]; then
-    exec startx -- vt1 &> /dev/null
-fi
+# automatically run startx when logging in to tty1
+[[ -z $DISPLAY ]] && [[ $XDG_VTNR -eq 1 ]] && exec startx -- vt1 &>/dev/null
diff --git a/home/bin/updates.sh b/home/bin/updates.sh
index aff9bc2f..8924171d 100755
--- a/home/bin/updates.sh
+++ b/home/bin/updates.sh
@@ -29,7 +29,7 @@ while true; do
 
     while [[ $updates -eq 0 ]]; do
         echo $BAR_ICON
-        sleep 1200
+        sleep 1600
         updates=$(checkupdates | wc -l)
     done
 done