diff --git a/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh b/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh
new file mode 100644
index 0000000..c7ed5e7
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/bashrc.d/000.disable-catalina-nag.sh
@@ -0,0 +1 @@
+export BASH_SILENCE_DEPRECATION_WARNING=1
diff --git a/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh b/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh
new file mode 100644
index 0000000..8b24e93
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/bashrc.d/100.disable-spyware.sh
@@ -0,0 +1,14 @@
+export DO_NOT_TRACK=1
+
+# the rest
+
+export HOMEBREW_NO_ANALYTICS=1
+export GATSBY_TELEMETRY_DISABLED=1
+export STNOUPGRADE=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export SAM_CLI_TELEMETRY=0
+export AZURE_CORE_COLLECT_TELEMETRY=0
+
+if command -v gcloud >/dev/null 2>&1 >/dev/null ; then
+    gcloud config set disable_usage_reporting true >/dev/null 2>&1
+fi
diff --git a/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh b/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh
deleted file mode 100644
index 8602170..0000000
--- a/custompkg/root/etc/skel/Library/bashrc.d/100.homebrew-no-spyware.sh
+++ /dev/null
@@ -1 +0,0 @@
-export HOMEBREW_NO_ANALYTICS=1
diff --git a/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
index 4b92648..6a49d23 100755
--- a/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/099.add-python-path.sh
@@ -1,4 +1,6 @@
 # adds homebrew python packages dir to python paths
 
+if [[ -d "$HOME/Library/Python/2.7/lib/python/site-packages/" ]]; then
 echo "import site; site.addsitedir(\"$HOME/Library/Homebrew/lib/python2.7/site-packages\")" >> \
 	$HOME/Library/Python/2.7/lib/python/site-packages/homebrew.pth
+fi
diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
index 344c7c2..e858e25 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-caskroom-apps.sh
@@ -13,30 +13,26 @@ brew tap caskroom/cask
 
 # no google-drive-file-stream because it requires admin privs and installs to /Applications systemwide
 CASKS="
-    1password
-    1password-cli
     ableton-live-suite
+    alacritty
     anki
     atom
-    dashlane
+    bitwarden
     deluge
     disk-inventory-x
-    expandrive
     google-chrome
     google-cloud-sdk
     handbrake
     iterm2
-    keepassx
     keybase
-    lastpass
     little-snitch
-    minikube
     openscad
+    signal
     sketch
     slack
     spotify
     sublime-text
-    syncthing-app
+    syncthing
     tor-browser
     vcv-rack
     vlc
@@ -48,7 +44,7 @@ for CASK in $CASKS ; do
     brew cask install $CASK
 done
 
-brew tap caskroom/fonts
+brew tap homebrew/cask-fonts
 
 FONTS="
     font-anonymice-powerline
diff --git a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
index 50c01ef..fe79b5b 100755
--- a/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
+++ b/custompkg/root/etc/skel/Library/user-setup/100.install-homebrew-apps.sh
@@ -73,8 +73,9 @@ HOMEBREW_PKGS="
     watch
     wget
     whatmask
+    yarn
 "
 
 for PKG in $HOMEBREW_PKGS ; do
-    brew install $PKG
+    brew install --build-from-source $PKG
 done
diff --git a/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh b/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
deleted file mode 100644
index c142e1d..0000000
--- a/custompkg/root/etc/skel/Library/user-setup/200.install-npm-packages.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# set up paths and whatnot
-source $HOME/.profile
-
-NPM_PKGS="
-    coffee-script
-    yarn
-"
-
-for PKG in $NPM_PKGS ; do
-    # -g is okay because "global" prefix is where homebrew
-    # installed npm, i.e. in ~/Library/Homebrew, not actually systemwide
-    npm install -g $PKG
-done
-
-YARN_PKGS="
-    now
-"
-
-for PKG in $YARN_PKGS ; do
-    yarn global add $PKG
-done
diff --git a/custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh b/custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh
new file mode 100644
index 0000000..179241e
--- /dev/null
+++ b/custompkg/root/etc/skel/Library/user-setup/200.install-yarn-packages.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# set up paths and whatnot
+source $HOME/.profile
+
+YARN_PKGS="
+    now
+    prettier
+"
+
+for PKG in $YARN_PKGS ; do
+    yarn global add $PKG
+done
diff --git a/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh b/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh
deleted file mode 100644
index 7cedb4d..0000000
--- a/custompkg/root/etc/skel/Library/user-setup/900.link-googledrive.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# setup google drive as synceddir in ~/.paths
-if [[ ! -e ~/.paths/synceddir ]]; then
-    ln -s ~/Google\ Drive\ File\ Stream/My\ Drive ~/.paths/synceddir
-fi