diff --git a/.bashrc b/.bashrc
index ec70834..ec8df15 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,20 +6,12 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-export EDITOR=/usr/bin/nano
+export EDITOR=/usr/bin/vim
 export GIT_EDITOR=$EDITOR
 export SUDO_EDITOR=$EDITOR
 
 # Powerline
-if [ -z $ENABLE_POWERLINE ]
-then
-    PS1='[\u@\h \W]\$ '
-else
-    powerline-daemon -q
-    POWERLINE_BASH_CONTINUATION=1
-    POWERLINE_BASH_SELECT=1
-    . ~/.local/lib/powerline/bindings/bash/powerline.sh
-fi
+PS1='[\u@\h \W]\$ '
 
 # Color aliases
 alias ls='ls --color=auto'
diff --git a/.i3/config b/.config/i3/config
similarity index 61%
rename from .i3/config
rename to .config/i3/config
index 68549b7..e8dc8ad 100644
--- a/.i3/config
+++ b/.config/i3/config
@@ -1,55 +1,21 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
 exec --no-startup-id shopt -s huponexit
 
 set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:DejaVu Sans Mono 8
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-# Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+font pango:DejaVu Sans Mono 8
+bindsym $mod+Return exec gnome-terminal
 
 # kill focused window
 bindsym $mod+Shift+q kill
 
-# start dmenu (a program launcher)
 bindsym $mod+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 bindsym $mod+Shift+d exec --no-startup-id i3-dmenu-desktop
 
-# change focus
-#bindsym $mod+j focus left
-#bindsym $mod+k focus down
-#bindsym $mod+l focus up
-#bindsym $mod+semicolon focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -58,10 +24,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-#bindsym $mod+Shift+j move left
-#bindsym $mod+Shift+k move down
-#bindsym $mod+Shift+l move up
-#bindsym $mod+Shift+semicolon move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -70,7 +36,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym $mod+b split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -93,7 +59,7 @@ bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
 
 # focus the child container
-#bindsym $mod+d focus child
+bindsym $mod+Shift+a focus child
 
 # switch to workspace
 bindsym $mod+1 workspace number 1
@@ -137,10 +103,10 @@ mode "resize" {
         # Pressing right will grow the window’s width.
         # Pressing up will shrink the window’s height.
         # Pressing down will grow the window’s height.
-#        bindsym j resize shrink width 10 px or 10 ppt
-#        bindsym k resize grow height 10 px or 10 ppt
-#        bindsym l resize shrink height 10 px or 10 ppt
-#        bindsym semicolon resize grow width 10 px or 10 ppt
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym j resize grow height 10 px or 10 ppt
+        bindsym k resize shrink height 10 px or 10 ppt
+        bindsym l resize grow width 10 px or 10 ppt
 
         # same bindings, but for the arrow keys
         bindsym Left resize shrink width 10 px or 10 ppt
@@ -155,16 +121,12 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-exec --no-startup-id "~/.local/lib/powerline/bindings/lemonbar/powerline-lemonbar.py --i3 --height 20 -i 5 -- -b -f 'DejaVu:size=10' -f 'PowerlineSymbols:size=12'"
 
 # Multimedia keys
-bindsym XF86MonBrightnessDown exec xbacklight -dec 10
-bindsym XF86MonBrightnessUp exec xbacklight -inc 10
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10%
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +10%
 
-
 # Network management
 bindsym $mod+n exec networkmanager_dmenu
 
@@ -173,8 +135,20 @@ exec --no-startup-id redshift
 # Background
 exec --no-startup-id nitrogen --restore &
 
-# Locker
-exec --no-startup-id light-locker --lock-on-suspend --no-late-locking &
-#exec --no-startup-id xautolock -locker "/usr/bin/light-locker-command -l" -t 10m
-bindsym $mod+Shift+l exec /usr/bin/light-locker-command -l
+# Lock script
+bindsym $mod+Shift+p exec --no-startup-id /home/adam/bin/lock.sh
 
+# GSD/GPM Backend
+exec --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings
+exec_always --no-startup-id gnome-power-manager
+
+# Automount
+exec --no-startup-id udiskie &
+
+# Notification Handler
+exec --no-startup-id twmnd &
+
+# Bar
+exec_always --no-startup-id /home/adam/bin/polybar.sh
+
+focus_follows_mouse no
diff --git a/.i3status.conf b/.config/i3status/config
similarity index 100%
rename from .i3status.conf
rename to .config/i3status/config
diff --git a/.tmux.conf b/.tmux.conf
index 794df5d..653af3a 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -9,5 +9,3 @@ set -g status-bg cyan
 set -g status-fg black
 
 bind-key b send-prefix
-
-source ~/.local/lib/powerline/bindings/tmux/powerline.conf