diff --git a/files/bash/.bashrc b/files/bash/.bashrc
index ab9871f..79f90b5 100644
--- a/files/bash/.bashrc
+++ b/files/bash/.bashrc
@@ -22,6 +22,7 @@ pathadd /home/nemo/.local/share/junest/bin
 export GPG_TTY="$(tty)"
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
+alias adb.run='apktool build src/ -o patched.apk && java -jar ~/apps/uber-apk-signer-1.1.0.jar -a patched.apk  && adb install -r -d patched-aligned-debugSigned.apk && adb shell monkey -p '$1' -v 1'
 alias mk='microk8s.kubectl'
 alias settings='env XDG_CURRENT_DESKTOP=GNOME gnome-control-center'
 alias watch='watch '
@@ -29,7 +30,7 @@ alias xclip='xclip -selection c'
 alias sl=ls
 alias dynamodump='docker run bchew/dynamodump /usr/local/bin/dynamodump'
 alias wine32='WINEARCH=win32 WINEPREFIX=~/win32 wine'
-alias signal_update='docker run captn3m0/signal-arch-builder'
+alias signal_update='sss docker && docker run captn3m0/signal-arch-builder'
 alias kc='kapitan compile'
 # https://tizardsbriefcase.com/1059/linux/remove-query-string-filename-wget
 alias clean.filenames='for file in *; do mv "$file" "${file%%\?*}"; done'
@@ -71,14 +72,16 @@ composer-unlink() {
 # 2. Terminal (alacritty)
 # 3. TODO
 
+export ALACRITTY_COLOR_DIR=/home/nemo/projects/personal/dotfiles/files/themes/alacritty/colors
+
 function dark() {
-  sed -i '54s/.*/colors: \*dark/' ~/.config/alacritty.yml
-  sed -i '11s$.*$"color_scheme": "Packages/Solarized Color Scheme/Solarized (dark).sublime-color-scheme",$' /home/nemo/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
+  alacritty-colorscheme -C "$ALACRITTY_COLOR_DIR" -a base16-solarized-dark.yml
+  # sed -i '11s$.*$"color_scheme": "Packages/Solarized Color Scheme/Solarized (dark).sublime-color-scheme",$' /home/nemo/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
 }
 
 function light() {
-  sed -i '54s/.*/colors: \*light/' ~/.config/alacritty.yml
-  sed -i '11s$.*$"color_scheme": "Packages/Solarized Color Scheme/Solarized (light).sublime-color-scheme",$' /home/nemo/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
+  alacritty-colorscheme -C "$ALACRITTY_COLOR_DIR" -a base16-solarized-light.yml
+  # sed -i '11s$.*$"color_scheme": "Packages/Solarized Color Scheme/Solarized (light).sublime-color-scheme",$' /home/nemo/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
 }
 
 if [ -f /usr/sbin/virtualenvwrapper.sh ]; then
@@ -103,13 +106,16 @@ alias aur.list='expac -H M "%m\t%n" | sort -h  > /tmp/expac.txt && pacman -Qqm >
 # Same as above, but all packages (except AUR)
 alias package.list='expac -sH M "%-30n %m" | sort -hk 2'
 alias package.owns='pacman -F'
-
+# Download size of all packages marked for upgrade
+alias package.dlsize='expac -S -H M '%k\t%n' $(pacman -Qqu) | sort -sh'
 # To list the packages marked for upgrade with their download size
 alias upgrade.size='pacman -Quq|xargs expac -SH M "%k\t%n" | sort -sh'
 
 # https://github.com/chef/inspec
 function inspec { docker run -it --rm -v $(pwd):/share chef/inspec $@; }
 
+function pingen { pwgen -1Avs -r=qwertyuiopasdfghjklzxcvbnm "$1"; }
+
 # alias kapitan='docker run -t --rm -u $(id -u) -v $(pwd):/src:delegated deepmind/kapitan'
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
@@ -212,12 +218,6 @@ function make_aoc() {
     pdftk 1-$1 aoc.pdf cat output aoc-$1
 }
 
-#My latest prompt
-# powerline-daemon -q
-# POWERLINE_BASH_CONTINUATION=1
-# POWERLINE_BASH_SELECT=1
-# . /usr/share/powerline/bindings/bash/powerline.sh
-
 COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
 COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
 export COMP_WORDBREAKS
diff --git a/files/bash/.profile b/files/bash/.profile
index 3d5775f..fcaa96d 100644
--- a/files/bash/.profile
+++ b/files/bash/.profile
@@ -8,7 +8,7 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
 
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:$HOME/bin:/sbin:$HOME/projects/scripts/:$HOME/.node_modules/bin:$HOME/.gem/ruby/2.5.0/bin:$HOME/bin:/bin"
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:$HOME/bin:/sbin:$HOME/projects/scripts/:$HOME/.node_modules/bin:$HOME/.gem/ruby/2.5.0/bin:/home/nemo/.local/bin:$HOME/bin:/bin"
 export npm_config_prefix=~/.node_modules
 export GOPATH="/home/nemo/projects/go"
 PATH="/usr/sbin:/usr/games:$PATH"
diff --git a/files/display/.autorandr/home/config b/files/display/.autorandr/home/config
index 1ac14a4..bed3620 100644
--- a/files/display/.autorandr/home/config
+++ b/files/display/.autorandr/home/config
@@ -4,13 +4,13 @@ output VIRTUAL1
 off
 output DP2
 crtc 1
-gamma 1.0:0.769:0.588
+gamma 1.0:1.0:0.909
 mode 1920x1080
 pos 0x0
 rate 60.00
 output DP1
 crtc 0
-gamma 1.0:0.769:0.588
+gamma 1.0:1.0:0.909
 mode 2560x1080
 pos 1920x0
 primary
diff --git a/files/display/.autorandr/home/setup b/files/display/.autorandr/home/setup
index 6edbc5e..cb01147 100644
--- a/files/display/.autorandr/home/setup
+++ b/files/display/.autorandr/home/setup
@@ -1,2 +1,2 @@
 DP1 00ffffffffffff001e6df1594a940700081c010380431c78eaca95a6554ea1260f5054a54b80714f818081c0a9c0b3000101010101017e4800e0a0381f4040403a00a11c21000018023a801871382d40582c4500a11c2100001e000000fc004c4720554c545241574944450a000000fd00384b1e5a18000a20202020202001ac02031cf1499004031412051f0113230907078301000065030c001000023a801871382d40582c450056512100001e011d8018711c1620582c250056512100009e011d007251d01e206e28550056512100001e8c0ad08a20e02d10103e9600565121000018000000ff003830384e545954454c3731340a00000000000000000077
-DP2 00ffffffffffff004c2d2c0d42335030201c010380341d782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450009252100001e000000fd0032481e5111000a202020202020000000fc00433234463339300a2020202020000000ff004854514b3830313635300a2020017b02031af14690041f131313230904078301000066030c00100080011d00bc52d01e20b828554009252100001e011d007251d01e206e285500092521000018011d007251d01e206e285500092521000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060
+DP2 00ffffffffffff004c2d2c0d42335030201c010380341d782a5295a556549d250e5054bb8c00b30081c0810081809500a9c001010101023a801871382d40582c450009252100001e000000fd0032481e5111000a202020202020000000fc00433234463339300a2020202020000000ff004854514b3830313635300a2020017b02031ac14690041f131313230904078301000066030c00100080011d00bc52d01e20b828554009252100001e011d007251d01e206e285500092521000018011d007251d01e206e285500092521000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090
diff --git a/files/git/.karn.yml b/files/git/.karn.yml
index 9341e74..396fdd3 100644
--- a/files/git/.karn.yml
+++ b/files/git/.karn.yml
@@ -4,7 +4,7 @@
   email: nemo@razorpay.com
 ~/projects/personal:
   name: Nemo
-  email: me@captnemo.in
+  email: commits@captnemo.in
 # AUR packages
 ~/projects/personal/aur:
   name: Nemo
@@ -12,7 +12,7 @@
 ~/projects/personal/shauryaa:
   name: Abhishek
   email: mama@shauryaa.in
-# This is a Google Project, so requires a 
+# This is a Google Project, so requires a
 # email that I have in my Google Account
 ~/projects/personal/kapitan:
   Name: Abhay Rana
diff --git a/files/i3/.i3/config b/files/i3/.i3/config
index 383b898..6565d18 100644
--- a/files/i3/.i3/config
+++ b/files/i3/.i3/config
@@ -15,6 +15,9 @@ set $WS4 4:
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id redshift-gtk
 
+# Launch the VPN app, but turn it off
+exec riseup-vpn-git --start-vpn off
+
 ## Press Ctrl+C twice to search a word
 ## Dictionaries are kept in ~/Documents/Dictionaries
 exec --no-startup-id goldendict
@@ -241,6 +244,7 @@ for_window [class="Fsearch"] floating enable
 for_window [class="Com.github.parnold-x.nasc"] floating enable 800 420
 for_window [class="xpad" window_role="info-"] move scratchpad
 for_window [class="Com.github.parnold-x.nasc"] move scratchpad
+for_window [class="Blueman-manager"] floating enable resize 640 600
 
 # Sticky Notepad
 exec --no-startup-id xpad
diff --git a/files/ssh/.pam_environment b/files/ssh/.pam_environment
index 9e352a0..cf364e3 100644
--- a/files/ssh/.pam_environment
+++ b/files/ssh/.pam_environment
@@ -1,3 +1,2 @@
 SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/ssh-agent.socket"
-SSH_AGENT_PID	DEFAULT=
-GSM_SKIP_SSH_AGENT_WORKAROUND DEFAULT=1
\ No newline at end of file
+GSM_SKIP_SSH_AGENT_WORKAROUND DEFAULT=1
diff --git a/files/ssh/.ssh/config.d/public b/files/ssh/.ssh/config.d/public
index 9048f1e..5758c47 100644
--- a/files/ssh/.ssh/config.d/public
+++ b/files/ssh/.ssh/config.d/public
@@ -24,3 +24,9 @@ Host sydney
   User nemo
   Port 222
   HostName sydney.captnemo.in
+
+
+Host ares
+  Port 4022
+  HostName ares.dbalan.in
+