diff --git a/LICENSE b/LICENSE
index 2e96b10..ed89cfc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
 
- Copyright (C) 2010-2018 Josh Sherman <hello@joshtronic.com>
+ Copyright (C) 2010-2021 Josh Sherman <hello@joshtronic.com>
 
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long
diff --git a/README.md b/README.md
index 038a9a0..ecac9aa 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@ am useless.
 bash -c "$(curl -fsSL https://raw.githubusercontent.com/joshtronic/dotfiles/master/install)"
 ```
 
-![LeePaceCelebrate](http://i.giphy.com/Vc5x1pG5RFH3O.gif)
+![BOOM](https://media.giphy.com/media/laUY2MuoktHPy/source.gif)
diff --git a/aliases b/aliases
index 0fa97bd..e02be6d 100644
--- a/aliases
+++ b/aliases
@@ -28,11 +28,11 @@ alias grep="grep --color=auto --exclude-dir={.git,artwork,node_modules,vendor}"
 
 # Git functions
 git_current_branch() {
-  (command git symbolic-ref -q HEAD || command git name-rev --name-only --no-undefined --always HEAD) 2>/dev/null
+  (command git symbolic-ref -q HEAD || command git name-rev --name-only --no-undefined --always HEAD) 2> /dev/null
 }
 
 git_default_branch() {
-  (git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') 2>/dev/null
+  (git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') 2> /dev/null
 }
 
 # Git aliases
@@ -97,13 +97,3 @@ function nvm {
 function pp {
   ss -lptn sport = :$1 | grep -Eo 'pid=[0-9]+' | cut -c5-
 }
-
-# function vim {
-#   BACKGROUND=$(xtermcontrol --get-bg)
-#
-#   if [[ "$BACKGROUND" == "rgb:0000/2b2b/3636" ]]; then
-#     env vim --cmd "let theme = 'dark'" $@
-#   else
-#     env vim --cmd "let theme = 'light'" $@
-#   fi
-# }
diff --git a/bashrc b/bashrc
index 02da7ae..e72ae3c 100644
--- a/bashrc
+++ b/bashrc
@@ -30,7 +30,9 @@ git_prompt() {
   if [ -n "$BRANCH" ]; then
     echo -n "$YELLOW$BRANCH"
 
-    if [ -n "$(git status --short)" ]; then
+    STATUS=$(git status --short 2> /dev/null)
+
+    if [ -n "$STATUS" ]; then
       echo " ${RED}✗"
     fi
   fi
diff --git a/install b/install
index 67ce482..8367749 100755
--- a/install
+++ b/install
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-if [ -z "$HOME" ]; then echo "Seems you're \$HOMEless :("; exit 1; fi
+if [ -z "$HOME" ]; then
+  echo "Seems you're \$HOMEless :("; exit 1;
+fi
 
 DOTCONFIG=$HOME/.config
 DOTFILES=$HOME/.dotfiles
@@ -85,20 +87,10 @@ for INDEX in ${!VIMPLUGS[*]}; do
   $GITCLONE "https://github.com/$VIMPLUG.git" "$HOME/.vim/pack/plugins/start/$PLUGDIR"
 done
 
-# TODO: Want to be able to toggle between these for a bit
-curl -o "$HOME/.vim/colors/solarized.vim" https://raw.githubusercontent.com/altercation/vim-colors-solarized/master/colors/solarized.vim
-# Never did much toggling, seems I've been "happy" with flattened
 curl -o "$HOME/.vim/colors/flattened_dark.vim" https://raw.githubusercontent.com/romainl/flattened/master/colors/flattened_dark.vim
-# Can't seem to get this guy to use truecolor in my terminal...
-git clone https://github.com/lifepillar/vim-solarized8.git "$HOME/.vim/pack/themes/opt/solarized8"
 
 cd "$HOME" || exit
 rm -f "${HOME}/.zcompdump*"
 
-# Required to kill the terminal's border in GNOME 3.32+
-# gsettings set org.gnome.Terminal.Legacy.Settings headerbar "@mb false"
-echo
-echo "If this is your first time, you should restart GNOME"
-
 echo
 echo "ENJOY! :)"
diff --git a/screenrc b/screenrc
index 1d36757..7454bcd 100644
--- a/screenrc
+++ b/screenrc
@@ -1,4 +1,3 @@
 startup_message off
 defscrollback 1000000
 hardstatus alwayslastline "%w %= %S"
-# hardstatus string "%{.kW}%-w%{.bW}%t [%n]%{-}%+w %=%{..G} %S"
diff --git a/zshrc b/zshrc
index b421c52..e302770 100644
--- a/zshrc
+++ b/zshrc
@@ -52,7 +52,9 @@ git_prompt() {
   if [ ! -z $BRANCH ]; then
     echo -n "%F{yellow}$BRANCH"
 
-    if [ ! -z "$(git status --short)" ]; then
+    STATUS=$(git status --short 2> /dev/null)
+
+    if [ ! -z "$STATUS" ]; then
       echo " %F{red}✗"
     fi
   fi