diff --git a/i3/.config/i3/config.thinkpad b/i3/.config/i3/config.thinkpad
index a0184b8..9a26229 100644
--- a/i3/.config/i3/config.thinkpad
+++ b/i3/.config/i3/config.thinkpad
@@ -6,6 +6,12 @@ set $audio ffmpeg -f alsa -i default -c:a flac -y output.flac
 set $browser firefox
 set $term=termite
 
+# i3-gaps
+hide_edge_borders both
+for_window [class="^.*"] border pixel 0 
+gaps inner 15 
+gaps outer 15
+
 # Colours
 set $base00 #101218
 set $base01 #1f222d
@@ -93,6 +99,7 @@ exec urxvt -name weechat -e weechat
 
 # start a terminal
 bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+shift+Return exec i3-sensible-terminal -e tmux
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -207,8 +214,10 @@ mode "resize" {
 
 # Custom KeyBinds
 bindsym Control+$mod+l exec i3lock-fancy
-bindsym --release $mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -s -e 'mv $f ~/Dropbox/Screenshots/'
-bindsym --release Shift+$mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -e 'mv $f ~/Dropbox/Screenshots/'
+
+# Screenshots
+bindsym Print 			exec --no-startup-id scrot -e 'mv $f ~/Pictures/Screenshots/'
+bindsym Shift+Print 		exec --no-startup-id scrot -u -e 'mv $f ~/Pictures/Screenshots/'
 
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
diff --git a/i3/.config/i3/i3blocks b/i3/.config/i3/i3blocks
deleted file mode 160000
index 36680fd..0000000
--- a/i3/.config/i3/i3blocks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36680fd035d742e1db88d763bc5c40b2291c335a
diff --git a/i3/.config/i3/i3blocks.conf b/i3/.config/i3/i3blocks.conf
deleted file mode 100644
index 95a5c06..0000000
--- a/i3/.config/i3/i3blocks.conf
+++ /dev/null
@@ -1,235 +0,0 @@
-# i3blocks config file
-#
-# Please see man i3blocks for a complete reference!
-# The man page is also hosted at http://vivien.github.io/i3blocks
-#
-# List of valid properties:
-#
-# align
-# color
-# command
-# full_text
-# instance
-# interval
-# label
-# min_width
-# name
-# separator
-# separator_block_width
-# short_text
-# signal
-# urgent
-
-# Global properties
-#
-# The top properties below are applied to every block, but can be overridden.
-# Each block command defaults to the script name to avoid boilerplate.
-command=/usr/lib/i3blocks/$BLOCK_NAME
-separator_block_width=15
-markup=none
-
-[arch-updates]
-command=~/.config/i3/i3blocks/archupdates
-label=
-color=#FF0000
-interval=300
-
-# Volume indicator
-#
-# The first parameter sets the step (and units to display)
-# The second parameter overrides the mixer selection
-# See the script for details.
-[volume]
-#label=VOL
-label=
-instance=Master
-#instance=PCM
-interval=once
-signal=10
-
-
-[mail-gmail]
-command=~/.config/i3/i3blocks/gmail
-label=G
-instance=~/.i3mail/gmail
-interval=60
-color=#00FF00
-separator=false
-
-[mail-andthensome]
-command=~/.config/i3/i3blocks/gmail
-label=A 
-instance=~/.i3mail/andthensome
-interval=60
-color=#00FF00
-
-# Music
-[cmus]
-command=~/.config/i3/i3blocks/cmus
-label=
-interval=5
-
-#[playerctl]
-#command=~/.config/i3/vendor/i3blocks/blocks/playerctl
-#label=
-#instance=clementine
-#interval=5
-
-# Docker
-[containers]
-label= 
-command=~/.config/i3/i3blocks/container
-interval=5
-
-# Temperature
-#
-# Support multiple chips, though lm-sensors.
-# The script may be called with -w and -c switches to specify thresholds,
-# see the script for details.
-[temperature]
-label= 
-interval=10
-
-# Disk usage
-#
-# The directory defaults to $HOME if the instance is not specified.
-# The script may be called with a optional argument to set the alert
-# (defaults to 10 for 10%).
-[disk]
-label=
-instance=/
-#instance=/mnt/data
-interval=30
-separator=false
-
-[disk]
-label=
-instance=/home
-interval=30
-
-# Memory usage
-#
-# The type defaults to "mem" if the instance is not specified.
-[memory]
-label=
-separator=false
-interval=30
-
-[cpu]
-command=~/.config/i3/vendor/i3blocks/blocks/cpu
-label=
-interval=2
-separator=false
-
-[load_average]
-label=
-interval=10
-
-# Network interface monitoring
-#
-# If the instance is not specified, use the interface used for default route.
-# The address can be forced to IPv4 or IPv6 with -4 or -6 switches.
-[iface]
-#instance=wlan0
-label=
-color=#00FF00
-interval=10
-separator=false
-
-[whatismyip]
-label= 
-command=~/.config/i3/i3blocks/whatismyip
-color=#00FF00
-interval=30
-separator=false
-
-[wifi]
-label=
-instance=wlp4s0
-interval=10
-
-[battery]
-label=⚡
-command=~/.config/i3/vendor/i3blocks/blocks/battery
-interval=30
-
-#[bandwidth]
-#command=~/.config/i3/vendor/i3blocks/blocks/bandwidth
-#instance=eno1;in
-#label=
-#interval=1
-#separator=false
-
-#[bandwidth]
-#command=~/.config/i3/vendor/i3blocks/blocks/bandwidth
-#instance=eno1;out
-#label=
-#interval=1
-
-#[bandwidth]
-#instance=eth0
-#interval=5
-
-# CPU usage
-#
-# The script may be called with -w and -c switches to specify thresholds,
-# see the script for details.
-#[cpu_usage]
-#label=CPU
-#interval=10
-#min_width=CPU: 100.00%
-#separator=false
-
-# Battery indicator
-#
-# The battery instance defaults to 0.
-#[battery]
-#label=BAT
-#label=⚡
-#instance=1
-#interval=30
-
-# Date Time
-[time]
-label= 
-command=date '+%Y-%m-%d'
-interval=1800
-separator=false
-
-[time]
-label= 
-command=date '+%H:%M:%S'
-interval=1
-separator=true
-
-
-# Generic media player support
-#
-# This displays "ARTIST - SONG" if a music is playing.
-# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
-#[mediaplayer]
-#instance=spotify
-#interval=5
-#signal=10
-
-# OpenVPN support
-#
-# Support multiple VPN, with colors.
-#[openvpn]
-#interval=20
-
-# Key indicators
-#
-# Add the following bindings to i3 config file:
-#
-# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
-# bindsym --release Num_Lock  exec pkill -SIGRTMIN+11 i3blocks
-#[keyindicator]
-#instance=CAPS
-#interval=once
-#signal=11
-
-#[keyindicator]
-#instance=NUM
-#interval=once
-#signal=11
diff --git a/i3/.config/i3/i3status.conf b/i3/.config/i3/i3status.conf
deleted file mode 100644
index aa20709..0000000
--- a/i3/.config/i3/i3status.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 5
-}
-
-order += "disk /"
-#order += "run_watch DHCP"
-order += "run_watch VPN"
-order += "ethernet _first_"
-order += "load"
-order += "tztime local"
-
-ethernet _first_ {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-run_watch DHCP {
-        pidfile = "/var/run/dhcpcd-eno1.pid"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/vpnc/pid"
-}
-
-tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
-}
-
-load {
-        format = "%1min %5min %15min"
-}
-
-disk "/" {
-        format = "%avail"
-}
diff --git a/i3/.config/i3/vendor/i3blocks b/i3/.config/i3/vendor/i3blocks
deleted file mode 160000
index 97497f3..0000000
--- a/i3/.config/i3/vendor/i3blocks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97497f345013a5e044cba43b4a8059bf15cc989d