diff --git a/scripts/bordergen.sh b/scripts/bordergen.sh
index e5b1e84..248eb44 100755
--- a/scripts/bordergen.sh
+++ b/scripts/bordergen.sh
@@ -9,7 +9,7 @@ cp ~/.linux/dots/tint2rctemplate ~/.config/tint2/plac
 sed -i "s/TEMPLATE/${csub}/g" ~/.config/tint2/plac
 rm -f ~/.config/tint2/tint2rc
 mv ~/.config/tint2/plac ~/.config/tint2/tint2rc
-killall -SIGUSR1 tint2
+killall -SIGUSR1 -q tint2
 
 # Create new gtk css
 cp ~/.linux/dots/gtk/3/gtktemplate.css ~/.config/gtk-3.0/gtkplac.css
diff --git a/scripts/setup.sh b/scripts/setup.sh
old mode 100644
new mode 100755
index f316763..fc9961d
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -20,13 +20,14 @@ echo "deb http://repository.spotify.com stable non-free" | sudo tee /etc/apt/sou
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACCAF35C
 echo "deb http://apt.insync.io/$ID $VERSION_CODENAME non-free contrib" | sudo tee /etc/apt/sources.list.d/insync.list
 wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
+# echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
 
 sudo apt update
 
 # Install things
-sudo apt install abcde arc-theme biber calibre cmus conky-all curl emacs26 evince eyed3 feh ffmpeg fonts-crosextra-carlito fonts-noto fonts-noto-color-emoji fonts-sil-andika fonts-sil-doulos geoclue-2.0 ghostscript gimp google-chrome insync kid3-qt lame libcurl4-openssl-dev libnotify-dev libreoffice maildir-utils mu4e offlineimap openbox pandoc papirus-icon-theme plank pnmixer python-pip python2.7 python3 python3-venv python3-pip redshift-gtk ruby-full sakura spotify-client suru-icon-set texlive-extra-utils texlive-latex-extra texlive-xetex tex-gyre thunderbird tint2 tree vlc vlc-plugin-fluidsynth xcompmgr zotero zsh
-# build-essential libsox-fmt-all sox xserver-xorg-core xserver-xlib-input-synaptics zlib1g-dev
+sudo apt install abcde arc-theme biber calibre cmus conky-all curl dh-autoreconf emacs26 evince eyed3 feh ffmpeg fonts-crosextra-carlito fonts-noto fonts-noto-color-emoji fonts-sil-andika fonts-sil-doulos geoclue-2.0 ghostscript gimp insync kid3-qt lame libcurl4-openssl-dev libnotify-dev libreoffice maildir-utils mu4e offlineimap openbox pandoc papirus-icon-theme plank pnmixer python2.7 python3 python3-venv python3-pip redshift-gtk ruby-full sakura spotify-client suru-icon-set texlive-extra-utils texlive-latex-extra texlive-xetex tex-gyre thunderbird tint2 tree vlc vlc-plugin-fluidsynth xcompmgr zsh
+# build-essential libsox-fmt-all sox xserver-xorg-core xserver-xlib-input-synaptics zlib1g-dev zotero # not required
+# google-chrome python-pip # not working in focal
 
 sudo apt update
 sudo apt upgrade
@@ -50,7 +51,11 @@ rm -f https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k
 git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
 
-# Download various packages from github
+# Download non-apt things
+wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+sudo dpkg -i google-chrome-stable_current_amd64.deb
+rm -f google-chrome-stable_current_amd64.deb
+
 mkdir -p ~/.config/GIMP/2.10/scripts # updated filepath should work??
 curl https://api.github.com/repos/tshatrov/scriptfu/releases/latest | grep "browser_download_url.*scm" | cut -d : -f 2,3 | tr -d \" | wget -qi - 
 mv animstack.scm ~/.config/GIMP/2.10/scripts/
@@ -125,7 +130,7 @@ touch ~/.colourvars
 mv ~/dotfiles ~/.linux
 
 # Set cursor theme
-rm -f ~/.Xresources
+rm -f ~/.Xresources ~/.XResources
 touch ~/.Xresources
 echo Xcursor.theme: Suru > .Xresources # this is set again after wal
 
@@ -172,9 +177,6 @@ cat ~/.linux/dots/plank/plank.ini | dconf load /net/launchpad/plank/docks/
 cp ~/.linux/dots/.offlineimaprc ~
 echo Need to set password for mu4e
 
-# Set up maildir-utils
-mu init
-
 # Set up .emacs.d (haven't tested this part)
 rm -f ~/.emacs
 rm -rf ~/.emacs.d