diff --git a/.config/fish/functions/aws-reset-role.fish b/.config/fish/functions/aws-reset-role.fish
index c2acc76..b96c4b7 100644
--- a/.config/fish/functions/aws-reset-role.fish
+++ b/.config/fish/functions/aws-reset-role.fish
@@ -7,4 +7,5 @@ function aws-reset-role
   set -e AWS_SESSION_TOKEN 
   set -e AWS_SECURITY_TOKEN 
   set -e AWS_PROFILE
+  echo "Role cleared"
 end
diff --git a/.config/fish/functions/aws-role.fish b/.config/fish/functions/aws-role.fish
index e6ff105..1f2ecbc 100644
--- a/.config/fish/functions/aws-role.fish
+++ b/.config/fish/functions/aws-role.fish
@@ -1,5 +1,6 @@
 # Defined in - @ line 2
 function aws-role
 	aws-create-creds
-    eval (awsu -p$argv)
+  eval (awsu -p$argv)
+  echo "Remember: don't drink and prod"
 end
diff --git a/.config/fish/functions/aws-token.fish b/.config/fish/functions/aws-token.fish
index c7580b1..14e22d7 100644
--- a/.config/fish/functions/aws-token.fish
+++ b/.config/fish/functions/aws-token.fish
@@ -1,4 +1,5 @@
 function aws-token
 	aws-create-creds
-awsu token -pjobteaser | xclip -selection clipboard $argv
+  awsu token -pjobteaser | xclip -selection clipboard $argv
+  echo "Have fun with your token"
 end
diff --git a/.config/fish/functions/unlock.fish b/.config/fish/functions/unlock.fish
index be4d3eb..4f9ea1b 100644
--- a/.config/fish/functions/unlock.fish
+++ b/.config/fish/functions/unlock.fish
@@ -1,5 +1,5 @@
 # Defined in - @ line 2
 function unlock
 	set -e BW_SESSION
-    set -gx BW_SESSION (bw unlock --raw)
+  set -gx BW_SESSION (bw unlock --raw)
 end
diff --git a/.config/i3/config b/.config/i3/config
index 9aa8157..fba5fb9 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -17,7 +17,7 @@ set $mod Mod4
 
 # 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 10
+font pango:Hack 10
 
 # 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
@@ -30,7 +30,7 @@ font pango:DejaVu Sans Mono 10
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec gnome-terminal
+bindsym $mod+Return exec sakura
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -180,13 +180,19 @@ bindsym $mod+g exec "~/bin/gtd"
 # If you need to pick an application, try with: 
 # xprop | grep CLASS
 
+# Move second monitor to top when plugged in
+exec --no-startup-id "~/.screenlayout/default.sh"
+
+# Assign workspaces
+workspace 1 output HDMI-1 
+workspace 9 output eDP-1
 
 # Make xmessage always floating
 for_window [class="Xmessage"] floating enable
 
 assign [class="Slack"] 9
 
-exec wicd-client --tray
+exec nm-applet --tray
 exec --no-startup-id i3-msg 'workspace 1; exec firefox; workspace 1'
 exec slack
 exec xfce4-power-manager
@@ -199,6 +205,3 @@ bindsym --release Print exec "scrot ~/tmp/capture/$(date --iso-8601='seconds').p
 bindsym --release Mod1+Sys_Req exec "import -window `xwininfo | awk '/.*Window id:.*/ {print $4}'` ~/tmp/capture/$(date --iso-8601='seconds').png"
 # Selection screenshot
 bindsym --release Shift+Print exec "scrot ~/tmp/capture/$(date --iso-8601='seconds').png -s -e 'xclip -selection c -t image/png < $f'"
-
-# Move second monitor to top when plugged in
-bindsym XF86Display exec --no-startup-id ~/screenlayout/default.sh
diff --git a/.gitignore_global b/.gitignore_global
index aaf782f..754954f 100644
--- a/.gitignore_global
+++ b/.gitignore_global
@@ -1,6 +1,9 @@
+$HOME/bin/*
+$HOME/.aws/*
 state.dump.json
 ansible.vault
 .idea/
 venv/
 .rakeTasks
 **.iml
+*.swp
diff --git a/.local/share/fonts/.uuid b/.local/share/fonts/.uuid
new file mode 100644
index 0000000..c1363f3
--- /dev/null
+++ b/.local/share/fonts/.uuid
@@ -0,0 +1 @@
+b41e20f0-ab5a-4222-be17-790f777b579c
\ No newline at end of file
diff --git a/.local/share/fonts/Hack-Bold.ttf b/.local/share/fonts/Hack-Bold.ttf
new file mode 100644
index 0000000..7ff4975
Binary files /dev/null and b/.local/share/fonts/Hack-Bold.ttf differ
diff --git a/.local/share/fonts/Hack-BoldItalic.ttf b/.local/share/fonts/Hack-BoldItalic.ttf
new file mode 100644
index 0000000..3b137d9
Binary files /dev/null and b/.local/share/fonts/Hack-BoldItalic.ttf differ
diff --git a/.local/share/fonts/Hack-Italic.ttf b/.local/share/fonts/Hack-Italic.ttf
new file mode 100644
index 0000000..d26198a
Binary files /dev/null and b/.local/share/fonts/Hack-Italic.ttf differ
diff --git a/.local/share/fonts/Hack-Regular.ttf b/.local/share/fonts/Hack-Regular.ttf
new file mode 100644
index 0000000..92a90cb
Binary files /dev/null and b/.local/share/fonts/Hack-Regular.ttf differ
diff --git a/.screenlayout/default.sh b/.screenlayout/default.sh
new file mode 100755
index 0000000..02de425
--- /dev/null
+++ b/.screenlayout/default.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+xrandr --output HDMI-2 --off --output HDMI-1 --primary --mode 2560x1080 --pos 0x0 --rotate normal --output DP-1 --off --output eDP-1 --mode 1920x1080 --pos 336x1080 --rotate normal --output DP-2 --off
diff --git a/bin/aws-create-creds b/bin/aws-create-creds
index 96efd64..7b4804a 100755
--- a/bin/aws-create-creds
+++ b/bin/aws-create-creds
@@ -6,6 +6,11 @@ CREDS_TMP=$XDG_RUNTIME_DIR/credentials_aws
 
 BW_ITEM_ID=1ebac7ff-7a4c-4ad8-8731-aafa00b60ba1
 
+if [[ -f "$CREDS_DEST" ]]; then
+  echo "Credentials file exists. Goodbye"
+  exit 0
+fi
+
 if [[ ! $(bw unlock --check) ]]; then
   export BW_SESSION=$(bw unlock --raw)
 fi