diff --git a/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-1.jpg b/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-1.jpg
deleted file mode 100644
index 608a5a6..0000000
Binary files a/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-1.jpg and /dev/null differ
diff --git a/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-2.jpg b/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-2.jpg
deleted file mode 100644
index 608a5a6..0000000
Binary files a/custompkg/root/Library/Desktop Pictures/04037_outofthiswhirl_5120x2880-2.jpg and /dev/null differ
diff --git a/custompkg/root/usr/local/bin/new-system-setup b/custompkg/root/usr/local/bin/new-system-setup
index 3607bc0..cefaa47 100644
--- a/custompkg/root/usr/local/bin/new-system-setup
+++ b/custompkg/root/usr/local/bin/new-system-setup
@@ -18,6 +18,9 @@ sudo defaults write /Library/Preferences/com.apple.alf stealthenabled -bool fals
 # hush time machine
 sudo defaults write /Library/Preferences/com.apple.TimeMachine DoNotOfferNewDisksForBackup -bool true
 
+# disable spotlight phone-home systemwide (belt and suspenders)
+echo "127.0.0.1 api.smoot.apple.com" | sudo tee -a /etc/hosts
+
 # update software
 sudo softwareupdate -i -a
 
diff --git a/custompkg/root/usr/local/bin/new-user-setup b/custompkg/root/usr/local/bin/new-user-setup
index 9bccbf2..b2633d8 100644
--- a/custompkg/root/usr/local/bin/new-user-setup
+++ b/custompkg/root/usr/local/bin/new-user-setup
@@ -32,11 +32,15 @@ defaults write com.apple.Terminal ShellExitAction 2
 defaults write com.apple.Terminal FontAntialias 1
 defaults write com.apple.Terminal "Default Window Settings" "Pro"
 defaults write com.apple.Terminal "Startup Window Settings" "Pro"
-# New Finder windows use ~
+# new finder windows use ~
 defaults write com.apple.finder NewWindowTarget -string "PfHm"
+# new finder windows show status bar
+defaults write com.apple.finder ShowStatusBar -int 1
 # don't show mounted volumes on desktop
 defaults write com.apple.finder ShowExternalHardDrivesOnDesktop -int 0
 defaults write com.apple.finder ShowRemovableMediaOnDesktop -int 0
+# set airdrop/bluetooth to be discoverable by everyone in range
+defaults write com.apple.sharingd DiscoverableMode Everyone
 # finder show all file extensions
 defaults write NSGlobalDomain AppleShowAllExtensions -bool true
 # set menubar clock to 24h with date and seconds
@@ -46,6 +50,13 @@ defaults write com.apple.menuextra.clock DateFormat -string 'EEE MMM d  H:mm:ss'
 defaults write NSGlobalDomain InitialKeyRepeat -int 15
 # normal minimum is 2 (30 ms)
 defaults write NSGlobalDomain KeyRepeat -int 1
+# disable all spelling correction, smart quotes, capitalization, et c:
+# (*important* for code)
+defaults write NSGlobalDomain NSAutomaticCapitalizationEnabled -int 0
+defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -int 0
+defaults write NSGlobalDomain NSAutomaticPeriodSubstitutionEnabled -int 0
+defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -int 0
+defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -int 0
 # safari debug stuff
 defaults write com.apple.Safari IncludeDevelopMenu -bool true
 defaults write com.apple.Safari \
@@ -95,7 +106,6 @@ export PATH+=":$HOME/Library/Homebrew/sbin"
 export HOMEBREW_NO_ANALYTICS=1
 EOF
 ####################################### Set caskroom to install under homedir
-echo '
 cat > ~/Library/bashrc.d/100homebrewcaskdir.sh <<'EOF'
 export HOMEBREW_CASK_OPTS="--appdir=$HOME/Applications"
 EOF
@@ -130,7 +140,12 @@ ssh-add -L 2>/dev/null >/dev/null || rm -f $HOME/.gpg-agent-info
 
 # if no info file, start up potentially-new, working agent
 if [[ ! -e $HOME/.gpg-agent-info ]]; then
-    gpg-agent --enable-ssh-support --daemon --write-env-file \
+    gpg-agent \
+        --enable-ssh-support \
+        --daemon \
+        --write-env-file \
+        --use-standard-socket \
+        --pinentry-program $HOME/Library/Homebrew/bin/pinentry-mac \
         2>&1 >/dev/null
 fi
 
@@ -154,12 +169,13 @@ CASKS="
 	github-desktop
 	google-chrome
 	google-drive
-	gpgtools
 	iterm2
 	keepassx
 	lastpass
 	slack
+	spotify
 	sublime-text
+	xscreensaver
 "
 for CASK in $CASKS ; do
     brew cask install $CASK