diff --git a/resources/tmux.conf b/resources/tmux.conf
index d44a65e..27db9f5 100644
--- a/resources/tmux.conf
+++ b/resources/tmux.conf
@@ -21,7 +21,8 @@ bind l select-pane -R
 bind r source-file ~/.tmux.conf \; display ​"Reloaded!"
 
 # a e s t h e t i c s 
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
+set -g default-shell /bin/zsh
 set-option -g status on
 set-option -g status-interval 2
 set-option -g status-justify "centre"
diff --git a/scripts/init.sh b/scripts/init.sh
index 01eb35e..d7343e3 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -19,6 +19,9 @@ fi
 
 echo ""
 
+# This makes sure that ctrl+C exits the entire script
+trap "exit" INT
+
 install_if_needed() {
     for package in "$@"
     do
@@ -30,7 +33,7 @@ install_if_needed() {
                     sudo apt install -y $package
                     ;;
                 "arch")
-                    sudo pacman -S $package
+                    sudo pacman -S $package --noconfirm
                     ;;
                 "mac")
                     brew install $package
@@ -63,25 +66,20 @@ echo ""
 echo "Making sure we've got the basics..."
 case $DISTRO in
     "debian")
-        echo "Updating the repositories!"
-        sudo apt update
-        sudo apt autoremove
-        install_if_needed vim tmux zsh git silversearcher-ag
+        install_if_needed make vim tmux zsh git silversearcher-ag
         ;;
     "arch")
-        echo "Updating the repositories!"
-        sudo pacman -Syu
-        install_if_needed vim tmux zsh git the_silver_searcher
+        install_if_needed make vim tmux zsh git the_silver_searcher
         ;;
     "mac")
-        install_if_needed vim tmux zsh git the_silver_searcher
+        install_if_needed make vim tmux zsh git the_silver_searcher
         ;;
 esac
 echo ""
 
 echo "Getting tmux-powerline"
-mkdir $HOME/.tmux
-git clone https://github.com/erikw/tmux-powerline.git $HOME/.tmux/
+mkdir -p $HOME/.tmux
+git clone https://github.com/erikw/tmux-powerline.git $HOME/.tmux/tmux-powerline
 echo ""
 
 echo "Copying configuration files"