diff --git a/HISTORY.md b/HISTORY.md
index ae59562e6..e54183cb2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,8 +1,11 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Release History](#release-history)  
+**Table of Contents** _generated with [DocToc](https://github.com/thlorenz/doctoc)_
+
+- [Release History](#release-history)
+  - [v5.12.0](#v5120)
+  - [v5.2.0](#v520)
   - [v5.1.0](#v510)
   - [v5.0.0](#v500)
   - [v4.4.2](#v442)
@@ -28,138 +31,175 @@
 
 # Release History
 
+## v5.12.0
+
+- no more Ruby (`git-up` is now a gitconfig alias: `git up` that equates to `git pull --autostash --rebase`)
+- remove disable automatic termination of unresponsive apps (commented out)
+- remove SSD specific tweaks (commented out)
+- remove "Restart automatically if the computer freezes" (commented out)
+- remove "Never go into sleep mode" (commented out)
+- remove disable autocorrect (commented out)
+- remove "Disable continuous spell checking" in messages (commented out)
+- remove `openconnect` from homebrew packages
+- remove `macbreakz` from brew cask list
+- remove `the-unarchiver` from brew cask
+- git now uses `main` instead of `master`
+- git now defaults to vscode instead of vimdiff for merge conflicts
+
 ## v5.1.0
- * update passwordless sudo to use method in [issue #35](https://github.com/atomantic/dotfiles/issues/35)
+
+- update passwordless sudo to use method in [issue #35](https://github.com/atomantic/dotfiles/issues/35)
 
 ## v5.0.0
- * each segment of setup now requires positive user input to change the system
- * replace `NERDtree` in vim with `netrw`
- * add spell check to `vim`
- * fix package installs (run in series to prevent homebrew from stepping on itself in parallel)
- * update /etc/hosts file from someonewhocares.org
+
+- each segment of setup now requires positive user input to change the system
+- replace `NERDtree` in vim with `netrw`
+- add spell check to `vim`
+- fix package installs (run in series to prevent homebrew from stepping on itself in parallel)
+- update /etc/hosts file from someonewhocares.org
 
 ## v4.4.2
- * add .iterm2_shell_integration.zsh
+
+- add .iterm2_shell_integration.zsh
 
 ## v4.4.1
- * re-enable notification center
- * fix gitshots optional ability by renaming post-commit -> gitshot-pc
+
+- re-enable notification center
+- fix gitshots optional ability by renaming post-commit -> gitshot-pc
 
 ## v4.4.0
- * cleanup readme and alphabetize software installation for better fork management and listing
- * disable vim YouCompleteMe Bundle (wasn't using it anyway and was causing installation problems on some machines)
- * remove yo, generator-dockerize, box-sync from software installs
- * install node stable (rather than old 4.x.x version)
- * make gitshots optional (and only install `imagesnap` and `imagemagick` if this is on)
- * fix passwordless sudo for Sierra (optional)
- * prompt to overwrite /etc/hosts with someonewhocares.org hosts file (saved in ./configs/hosts in this project)
- * fix default wallpaper in Sierra (Sierra 2)
- * remove sudden motion disable (already disabled: https://github.com/mathiasbynens/dotfiles/pull/755/files)
- * no longer setting hibernation mode to 0 (leaving default 3): https://github.com/mathiasbynens/dotfiles/commit/a3f91f67e07b6b31760b52320e0e890f93ff4e97#commitcomment-20715991
+
+- cleanup readme and alphabetize software installation for better fork management and listing
+- disable vim YouCompleteMe Bundle (wasn't using it anyway and was causing installation problems on some machines)
+- remove yo, generator-dockerize, box-sync from software installs
+- install node stable (rather than old 4.x.x version)
+- make gitshots optional (and only install `imagesnap` and `imagemagick` if this is on)
+- fix passwordless sudo for Sierra (optional)
+- prompt to overwrite /etc/hosts with someonewhocares.org hosts file (saved in ./configs/hosts in this project)
+- fix default wallpaper in Sierra (Sierra 2)
+- remove sudden motion disable (already disabled: https://github.com/mathiasbynens/dotfiles/pull/755/files)
+- no longer setting hibernation mode to 0 (leaving default 3): https://github.com/mathiasbynens/dotfiles/commit/a3f91f67e07b6b31760b52320e0e890f93ff4e97#commitcomment-20715991
 
 ## v4.3.0
- * vim installation fix
- * Enable firewall
- * Enable firewall stealth mode (no response to ICMP / ping requests)
- * Disable remote apple events
- * Disable wake-on modem
- * Disable wake-on LAN
- * Disable file-sharing via AFP or SMB
- * Disable guest account login
- * `pushup` alias (`git-up`, followed by `git push`)
+
+- vim installation fix
+- Enable firewall
+- Enable firewall stealth mode (no response to ICMP / ping requests)
+- Disable remote apple events
+- Disable wake-on modem
+- Disable wake-on LAN
+- Disable file-sharing via AFP or SMB
+- Disable guest account login
+- `pushup` alias (`git-up`, followed by `git push`)
 
 ## v4.2.0
- * new shell functions: `tre` and `sri`
- * cleanup shell functions (remove unused echo helpers)
+
+- new shell functions: `tre` and `sri`
+- cleanup shell functions (remove unused echo helpers)
 
 ## v4.1.1
- * fix `solarized dark` again for mocha test output coloring
+
+- fix `solarized dark` again for mocha test output coloring
 
 ## v4.1.0
- * remove `to.dir` commands (never use them)
- * add aliases: `emptytrash`, `ips`, `iplocal`, `ip`, `ifactive`, `spoton`, `spotoff`, `afk`, `reload`, `path`
+
+- remove `to.dir` commands (never use them)
+- add aliases: `emptytrash`, `ips`, `iplocal`, `ip`, `ifactive`, `spoton`, `spotoff`, `afk`, `reload`, `path`
 
 ## v4.0.0
- * OSX references to MacOS (includes Sierra)
- * remove aliases to things that are no longer useful (`usenode`, `useio`)
- * adding `bpc` alias for a `buzzphrase` git commit + push (don't use this on shared code)
- * `update` alias for updating all software
- * comment out GO path in `.shellpaths` (was causing slowness on machines with no go path)
- * comment out all tool shellpaths (enable them at will)
- * adding iTerm2 shell integration source
- * `weather $city` shellfn
- * cask install `little-snitch` and `micro-snitch`
+
+- OSX references to MacOS (includes Sierra)
+- remove aliases to things that are no longer useful (`usenode`, `useio`)
+- adding `bpc` alias for a `buzzphrase` git commit + push (don't use this on shared code)
+- `update` alias for updating all software
+- comment out GO path in `.shellpaths` (was causing slowness on machines with no go path)
+- comment out all tool shellpaths (enable them at will)
+- adding iTerm2 shell integration source
+- `weather $city` shellfn
+- cask install `little-snitch` and `micro-snitch`
 
 ## v3.3.2
- * `curltime` shell function
- * Mac Sierra fixes for key repeat
- * Mac Sierra wallpaper
+
+- `curltime` shell function
+- Mac Sierra fixes for key repeat
+- Mac Sierra wallpaper
 
 ## v3.3.1
- * fix restore
+
+- fix restore
 
 ## v3.3.0
- * include [httpie](https://github.com/jkbrzt/httpie)
+
+- include [httpie](https://github.com/jkbrzt/httpie)
 
 ## v3.2.1
- * improved handling of `.nvmrc` files on dir change
+
+- improved handling of `.nvmrc` files on dir change
 
 ## v3.2.0
- * adjust solarized theme to fix issue with rendering `mocha` test output
-  * https://github.com/mochajs/mocha/issues/802
-  * now `008` color is light grey instead of matching the solarized background color
+
+- adjust solarized theme to fix issue with rendering `mocha` test output
+- https://github.com/mochajs/mocha/issues/802
+- now `008` color is light grey instead of matching the solarized background color
 
 ## v3.1.0
- * new vim plugins
-  * https://github.com/justinmk/vim-sneak
-  * https://github.com/airblade/vim-gitgutter
-  * https://github.com/tpope/vim-surround
-  * https://github.com/dkprice/vim-easygrep
-  * https://github.com/sjl/gundo.vim
- * vim textwidth now `120`
- * fonts now installed via brew cask (where possible)
-  * thanks to @michielrensen [9db1d074](https://github.com/michielrensen/dotfiles/commit/9db1d0740eeb6df767be0f13c4706cd45c8d527f)
- * now automatically installing vim plugins
-  * thanks to @michielrensen [b668fd56](https://github.com/michielrensen/dotfiles/commit/b668fd56673e12845215706cbb812f749604a3cc)
- * bubblegum theme for vim-airline
- * remove `ssh-agent` from zsh plugins (already launched by OSX)
-  * thanks to @porcupie [a888494b](https://github.com/porcupie/dotfiles/commit/a888494b576dcb91fe24009dec0501504f7ffa80)
- * shorten powerline dir length to 2 dirs max
-  * thanks to @Tsuki [07d4bbcd6](https://github.com/Tsuki/dotfiles/commit/07d4bbcd67dc9e961fefb318910308f424754f1d#diff-9e1651e3e42b7a9ae3b9b7492376b6cbL4)
- * adding `ag` brew
- * fix vim brew install
- * adding horizontal cursor line highlight in vim
- * killed `CTags` (not using them)
- * upgrade node to `4.4.7`
- * compile YouCompleteMe for code completion in vim:
- ```
+
+- new vim plugins
+- https://github.com/justinmk/vim-sneak
+- https://github.com/airblade/vim-gitgutter
+- https://github.com/tpope/vim-surround
+- https://github.com/dkprice/vim-easygrep
+- https://github.com/sjl/gundo.vim
+- vim textwidth now `120`
+- fonts now installed via brew cask (where possible)
+- thanks to @michielrensen [9db1d074](https://github.com/michielrensen/dotfiles/commit/9db1d0740eeb6df767be0f13c4706cd45c8d527f)
+- now automatically installing vim plugins
+- thanks to @michielrensen [b668fd56](https://github.com/michielrensen/dotfiles/commit/b668fd56673e12845215706cbb812f749604a3cc)
+- bubblegum theme for vim-airline
+- remove `ssh-agent` from zsh plugins (already launched by OSX)
+- thanks to @porcupie [a888494b](https://github.com/porcupie/dotfiles/commit/a888494b576dcb91fe24009dec0501504f7ffa80)
+- shorten powerline dir length to 2 dirs max
+- thanks to @Tsuki [07d4bbcd6](https://github.com/Tsuki/dotfiles/commit/07d4bbcd67dc9e961fefb318910308f424754f1d#diff-9e1651e3e42b7a9ae3b9b7492376b6cbL4)
+- adding `ag` brew
+- fix vim brew install
+- adding horizontal cursor line highlight in vim
+- killed `CTags` (not using them)
+- upgrade node to `4.4.7`
+- compile YouCompleteMe for code completion in vim:
+
+```
 cd ~/.vim/bundle/YouCompleteMe
 ./install.py --all
- ```
- * no more `bower` (just use npm)
- * fixed OSX clipboard copy (yank in vim now copies to OSX clipboard)
- * adding `npm config set save-exact true` at install time
-  * ensures we always pin node modules
-  * keeps consistent dev/build environments
-  * saves from security and feature problems when people abuse SemVer
+```
+
+- no more `bower` (just use npm)
+- fixed OSX clipboard copy (yank in vim now copies to OSX clipboard)
+- adding `npm config set save-exact true` at install time
+- ensures we always pin node modules
+- keeps consistent dev/build environments
+- saves from security and feature problems when people abuse SemVer
 
 ## v3.0.0
- * BREAKING CHANGES!!!
- * now using node.js to run install list from `config.js`
- * moved dotfile sources into `homedir/*`
- * removed `osx.sh` script (all software/config exists now in `install.sh` and `config.js`)
- * remove Google Chrome install and configuration (chrome no longer likes to be installed via homebrew)
- * remove IOS simulator in launchpad config
- * backups are now created every time you run `./install.sh` and stored in datetime subfolders (in `./dotfiles_backup`)
+
+- BREAKING CHANGES!!!
+- now using node.js to run install list from `config.js`
+- moved dotfile sources into `homedir/*`
+- removed `osx.sh` script (all software/config exists now in `install.sh` and `config.js`)
+- remove Google Chrome install and configuration (chrome no longer likes to be installed via homebrew)
+- remove IOS simulator in launchpad config
+- backups are now created every time you run `./install.sh` and stored in datetime subfolders (in `./dotfiles_backup`)
 
 ## v2.1.0
- * Now using powerlevel9k theme with awesome-patched fonts
+
+- Now using powerlevel9k theme with awesome-patched fonts
 
 ## v2.0.0
- * switched to using vim as primary editor/IDE
- * vim plugings now use vundle instead of pathogen
+
+- switched to using vim as primary editor/IDE
+- vim plugings now use vundle instead of pathogen
 
 ## v1.1.0
- * Added dotfiles backup and restore.sh script
-     * you can now restore your previous dotfiles with ./restore.sh
- * prompting the user more (e.g. `brew upgrade` is now optional)
+
+- Added dotfiles backup and restore.sh script
+  - you can now restore your previous dotfiles with ./restore.sh
+- prompting the user more (e.g. `brew upgrade` is now optional)
diff --git a/README.md b/README.md
index 60f7d4dda..39e901234 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,8 @@ You don't need to install or configure anything upfront! This works with a brand
   - [Crontab](#crontab)
   - [Remap Caps-Lock](#remap-caps-lock)
 - [Settings](#settings)
-  - [SSD-specific tweaks](#ssd-specific-tweaks)
-  - [General System Changes](#general-system-changes)
   - [Security](#security)
+  - [General System Changes](#general-system-changes)
   - [Trackpad, mouse, keyboard, Bluetooth accessories, and input](#trackpad-mouse-keyboard-bluetooth-accessories-and-input)
   - [Configuring the Screen](#configuring-the-screen)
   - [Finder Configs](#finder-configs)
@@ -40,7 +39,6 @@ You don't need to install or configure anything upfront! This works with a brand
   - [Utilities](#utilities)
   - [Apps](#apps)
   - [NPM Global Modules](#npm-global-modules)
-  - [Ruby Gems](#ruby-gems)
 - [License](#license)
 - [Contributions](#contributions)
 - [Loathing, Mehs and Praise](#loathing-mehs-and-praise)
@@ -109,7 +107,7 @@ Do the following to upgrade your ~/.dotfiles safely:
 
 1. backup your dotfiles: `cp -R ~/.dotfiles ~/.dotfiles_old`
 2. `cd ~/.dotfiles`
-3. update dotfiles: `git-up` or `git pull`
+3. update dotfiles: `git up` or `git pull`
 4. remove old submodule location: `rm -rf .vim` (now lives in `homedir/.vim`)
 5. inspect `install.sh` and `config.js` to make sure all the software you want is installed
 6. inspect `homedir/*` for any changes you want to port from `./dotfiles_old`
@@ -139,10 +137,13 @@ The following will only happen if you agree on the prompt
 - overwrite your /etc/hosts file with a copy from someonewhocares.org (see ./configs/hosts for the file that will be used)
 - replace the system wallpaper with `img/wallpaper.jpg`
 
-## SSD-specific tweaks
-- Disable local Time Machine snapshots
-- Disable hibernation (speeds up entering sleep mode)
-- Remove the sleep image file to save disk space
+## Security
+- Enable firewall
+- Enable firewall stealth mode (no response to ICMP / ping requests)
+- Disable remote apple events
+- Disable wake-on modem
+- Disable wake-on LAN
+- Disable guest account login
 
 ## General System Changes
 - always boot in verbose mode (not MacOS GUI mode)
@@ -162,24 +163,13 @@ The following will only happen if you agree on the prompt
 - Disable the “Are you sure you want to open this application?” dialog
 - Remove duplicates in the “Open With” menu (also see 'lscleanup' alias)
 - Display ASCII control characters using caret notation in standard text views
-- Disable automatic termination of inactive apps
 - Disable the crash reporter
 - Set Help Viewer windows to non-floating mode
 - Reveal IP, hostname, OS, etc. when clicking clock in login window
-- Restart automatically if the computer freezes
-- Never go into computer sleep mode
 - Check for software updates daily, not just once per week
 - Disable smart quotes as they’re annoying when typing code
 - Disable smart dashes as they’re annoying when typing code
 
-## Security
-- Enable firewall
-- Enable firewall stealth mode (no response to ICMP / ping requests)
-- Disable remote apple events
-- Disable wake-on modem
-- Disable wake-on LAN
-- Disable guest account login
-
 ## Trackpad, mouse, keyboard, Bluetooth accessories, and input
 - Trackpad: enable tap to click for this user and for the login screen
 - Trackpad: map bottom right corner to right-click
@@ -191,7 +181,6 @@ The following will only happen if you agree on the prompt
 - Disable press-and-hold for keys in favor of key repeat
 - Set a blazingly fast keyboard repeat rate:
 - Set language and text formats (english/US)
-- Disable auto-correct
 
 ## Configuring the Screen
 - Require password immediately after sleep or screen saver begins
@@ -310,7 +299,6 @@ The following will only happen if you agree on the prompt
 ## Messages
 - Disable automatic emoji substitution (i.e. use plain text smileys)
 - Disable smart quotes as it’s annoying for messages that contain code
-- Disable continuous spell checking
 
 ## SizeUp.app
 - Start SizeUp at login
@@ -318,7 +306,7 @@ The following will only happen if you agree on the prompt
 
 # Software Installation
 
-homebrew, fontconfig, git, ruby (latest), nvm (node + npm), and zsh (latest) are all installed inside the `install.sh` as foundational software for running this project.
+homebrew, fontconfig, git, nvm (node + npm), and zsh (latest) are all installed inside the `install.sh` as foundational software for running this project.
 Additional software is configured in `config.js` and can be customized in your own fork/branch (you can change everything in your own fork/brance).
 The following is the software that I have set as default:
 
@@ -373,9 +361,6 @@ The following is the software that I have set as default:
 * trash
 * vtop
 
-## Ruby Gems
-* git-up
-
 # License
 This project is licensed under ISC. Please fork, contribute and share.
 
diff --git a/config.js b/config.js
index baba26a81..1c42b3aae 100644
--- a/config.js
+++ b/config.js
@@ -36,7 +36,7 @@ module.exports = {
     // Install some other useful utilities like `sponge`
     'moreutils',
     'nmap',
-    'openconnect',
+    // 'openconnect',
     'reattach-to-user-namespace',
     // better/more recent version of screen
     'homebrew/dupes/screen',
@@ -65,14 +65,14 @@ module.exports = {
     //'ireadfast',
     'iterm2',
     'little-snitch',
-    'macbreakz',
+    // 'macbreakz',
     'micro-snitch',
-    'signal',
+    // 'signal',
     //'macvim',
     'sizeup',
     //'sketchup',
     'slack',
-    'the-unarchiver',
+    // 'the-unarchiver',
     //'torbrowser',
     //'transmission',
     'visual-studio-code',
diff --git a/homedir/.gitconfig b/homedir/.gitconfig
index d9186aa54..6c2a3025e 100644
--- a/homedir/.gitconfig
+++ b/homedir/.gitconfig
@@ -55,7 +55,7 @@
   co = checkout
   d = diff --color-words
   cam = commit -a -m
-  upm = !git fetch upstream && git merge upstream/master
+  upm = !git fetch upstream && git merge upstream/main
   # new standard to replace the deprecated git-up gem package:
   up = pull --rebase --autostash
 
@@ -95,7 +95,6 @@
   logr2 = log --stat -M -2
   logit = log --stat -M
   scrub = !git reset --hard && git clean -fd
-  pub = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf
   cs = status
   rv = remote -v
   lwr = log --stat -C
@@ -119,7 +118,7 @@
   blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
   slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
   lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
-  ro = !git fetch origin && git reset --hard origin/master
+  ro = !git fetch origin && git reset --hard origin/main
   shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
   pushnotes = !sh -c 'git push $1 refs/notes/*' -
   fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
@@ -166,15 +165,14 @@
 [init]
   templatedir = ~/.dotfiles/.git_template
 
-[mergetool]
-  prompt = false
-  keepBackup = false
-
 [merge]
-  tool = vimdiff
-  # Always show a diffstat at the end of a merge
-  stat = true
-  conflictstyle = diff3
+    tool = vscode
+[mergetool "vscode"]
+    cmd = code --wait $MERGED
+[diff]
+    tool = vscode
+[difftool "vscode"]
+    cmd = code --wait --diff $LOCAL $REMOTE
 
 [branch]
     # Automatically set up pull to be --rebase
@@ -200,3 +198,5 @@
   clean = git-lfs clean %f
   smudge = git-lfs smudge %f
   required = true
+[pull]
+	rebase = true
diff --git a/homedir/.zshrc b/homedir/.zshrc
index fe020e96f..6e6bbd27a 100644
--- a/homedir/.zshrc
+++ b/homedir/.zshrc
@@ -40,6 +40,8 @@ autoload -U add-zsh-hook
 load-nvmrc() {
   if [[ -f .nvmrc && -r .nvmrc ]]; then
     nvm use &> /dev/null
+  else
+    nvm use stable
   fi
 }
 add-zsh-hook chpwd load-nvmrc
diff --git a/install.sh b/install.sh
index 8c4cac25d..148596f5b 100755
--- a/install.sh
+++ b/install.sh
@@ -360,7 +360,7 @@ ok
 sudo defaults write /Library/Preferences/com.apple.alf globalstate -int 1
 
 # Enable firewall stealth mode (no response to ICMP / ping requests)
-# Source: https://support.apple.com/kb/PH18642
+# Source: https://support.apple.com/guide/mac-help/use-stealth-mode-to-keep-your-mac-more-secure-mh17133/mac
 #sudo defaults write /Library/Preferences/com.apple.alf stealthenabled -int 1
 sudo defaults write /Library/Preferences/com.apple.alf stealthenabled -int 1
 
@@ -458,12 +458,12 @@ sudo defaults write /Library/Preferences/com.apple.loginwindow GuestEnabled -boo
 # running "Disable hibernation (speeds up entering sleep mode)"
 # sudo pmset -a hibernatemode 0;ok
 
-running "Remove the sleep image file to save disk space"
-sudo rm -rf /Private/var/vm/sleepimage;ok
-running "Create a zero-byte file instead"
-sudo touch /Private/var/vm/sleepimage;ok
-running "…and make sure it can’t be rewritten"
-sudo chflags uchg /Private/var/vm/sleepimage;ok
+# running "Remove the sleep image file to save disk space"
+# sudo rm -rf /Private/var/vm/sleepimage;ok
+# running "Create a zero-byte file instead"
+# sudo touch /Private/var/vm/sleepimage;ok
+# running "…and make sure it can’t be rewritten"
+# sudo chflags uchg /Private/var/vm/sleepimage;ok
 
 #running "Disable the sudden motion sensor as it’s not useful for SSDs"
 # sudo pmset -a sms 0;ok
@@ -614,8 +614,8 @@ running "Display ASCII control characters using caret notation in standard text
 # Try e.g. `cd /tmp; unidecode "\x{0000}" > cc.txt; open -e cc.txt`
 defaults write NSGlobalDomain NSTextShowsControlCharacters -bool true;ok
 
-running "Disable automatic termination of inactive apps"
-defaults write NSGlobalDomain NSDisableAutomaticTermination -bool true;ok
+# running "Disable automatic termination of inactive apps"
+# defaults write NSGlobalDomain NSDisableAutomaticTermination -bool true;ok
 
 running "Disable the crash reporter"
 defaults write com.apple.CrashReporter DialogType -string "none";ok
@@ -626,11 +626,11 @@ defaults write com.apple.helpviewer DevMode -bool true;ok
 running "Reveal IP, hostname, OS, etc. when clicking clock in login window"
 sudo defaults write /Library/Preferences/com.apple.loginwindow AdminHostInfo HostName;ok
 
-running "Restart automatically if the computer freezes"
-sudo systemsetup -setrestartfreeze on;ok
+# running "Restart automatically if the computer freezes"
+# sudo systemsetup -setrestartfreeze on;ok
 
-running "Never go into computer sleep mode"
-sudo systemsetup -setcomputersleep Off > /dev/null;ok
+# running "Never go into computer sleep mode"
+# sudo systemsetup -setcomputersleep Off > /dev/null;ok
 
 running "Check for software updates daily, not just once per week"
 defaults write com.apple.SoftwareUpdate ScheduleFrequency -int 1;ok
@@ -688,8 +688,8 @@ defaults write NSGlobalDomain AppleLocale -string "en_US@currency=USD"
 defaults write NSGlobalDomain AppleMeasurementUnits -string "Centimeters"
 defaults write NSGlobalDomain AppleMetricUnits -bool true;ok
 
-running "Disable auto-correct"
-defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false;ok
+# running "Disable auto-correct"
+# defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false;ok
 
 ###############################################################################
 bot "Configuring the Screen"
@@ -1169,8 +1169,8 @@ defaults write com.apple.messageshelper.MessageController SOInputLineSettings -d
 running "Disable smart quotes as it’s annoying for messages that contain code"
 defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticQuoteSubstitutionEnabled" -bool false;ok
 
-running "Disable continuous spell checking"
-defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false;ok
+# running "Disable continuous spell checking"
+# defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false;ok
 
 ###############################################################################
 bot "SizeUp.app"
diff --git a/oh-my-zsh b/oh-my-zsh
index 9509fd6a9..12669f29f 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 9509fd6a9193e32e5c2d460786253ba0e98fd741
+Subproject commit 12669f29f0843b8b980dd137f150a74511f88842
diff --git a/package-lock.json b/package-lock.json
index 25ce09df1..23efaf87b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dotfiles",
-  "version": "4.4.3",
+  "version": "5.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 044848d81..dd94f5ca8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dotfiles",
-  "version": "4.4.3",
+  "version": "5.2.0",
   "description": "atomantic dotfiles for macos",
   "main": "index.js",
   "scripts": {