diff --git a/firefox/user.js b/firefox/user.js
index 15e9d87..ce6d0dc 100644
--- a/firefox/user.js
+++ b/firefox/user.js
@@ -295,7 +295,7 @@ user_pref("security.insecure_password.ui.enabled", true);  // warn on non-secure
 // user_pref("security.mixed_content.block_display_content", true);         // breaks xfinity on demand
 // user_pref("security.mixed_content.block_object_subrequest", true);       // breaks xfinity on demand
 user_pref("security.OCSP.enabled", 1);
-user_pref("security.OCSP.require", true);
+user_pref("security.OCSP.require", false); // TODO: turn back on
 user_pref("security.pki.sha1_enforcement_level", 1);
 user_pref("security.sri.enable", true);
 user_pref("security.ssl.disable_session_identifiers", true);
diff --git a/macos/defaults.sh b/macos/defaults.sh
index 19292af..ff5ddd2 100755
--- a/macos/defaults.sh
+++ b/macos/defaults.sh
@@ -18,7 +18,6 @@ sudo -v
 # Keep-alive: update existing `sudo` time stamp until this script has finished
 while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
 
-
 ###############################################################################
 # General UI/UX                                                               #
 ###############################################################################
@@ -38,18 +37,9 @@ defaults write NSGlobalDomain AppleMetricUnits -bool false
 # Set the timezone (see `sudo systemsetup -listtimezones` for other values)
 sudo systemsetup -settimezone "America/New_York" > /dev/null
 
-# Set standby delay to 24 hours (default is 1 hour)
-sudo pmset -a standbydelay 86400
-
-# Disable Sudden Motion Sensor
-sudo pmset -a sms 0
-
 # Disable audio feedback when volume is changed
 defaults write com.apple.sound.beep.feedback -bool false
 
-# Disable the sound effects on boot
-sudo nvram SystemAudioVolume=" "
-
 # Menu bar: show battery percentage
 defaults write com.apple.menuextra.battery ShowPercent "YES"
 
@@ -61,17 +51,18 @@ defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode2 -bool true
 defaults write NSGlobalDomain PMPrintingExpandedStateForPrint -bool true
 defaults write NSGlobalDomain PMPrintingExpandedStateForPrint2 -bool true
 
-# Save to disk (not to iCloud) by default
-defaults write NSGlobalDomain NSDocumentSaveNewDocumentsToCloud -bool false
-
 # Remove duplicates in the “Open With” menu (also see `lscleanup` alias)
 /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user
 
 # Disable Resume system-wide
 defaults write com.apple.systempreferences NSQuitAlwaysKeepsWindows -bool false
 
-# Restart automatically if the computer freezes
-sudo systemsetup -setrestartfreeze on
+# Disable automatic termination of inactive apps
+defaults write NSGlobalDomain NSDisableAutomaticTermination -bool true
+
+# Reveal IP address, hostname, OS version, etc. when clicking the clock
+# in the login window
+sudo defaults write /Library/Preferences/com.apple.loginwindow AdminHostInfo HostName
 
 ###############################################################################
 # Keyboard & Input                                                            #
@@ -106,7 +97,6 @@ defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 ###############################################################################
 
 # Trackpad: enable tap to click for this user and for the login screen
-defaults write com.apple.AppleMultitouchTrackpad Clicking -bool true
 defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true
 defaults -currentHost write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
 defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
@@ -118,6 +108,19 @@ defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int
 defaults write com.apple.universalaccess closeViewScrollWheelToggle -bool true
 defaults write com.apple.universalaccess HIDScrollZoomModifierMask -int 262144
 
+###############################################################################
+# Energy saving                                                               #
+###############################################################################
+
+# Restart automatically on power loss
+sudo pmset -a autorestart 1
+
+# Restart automatically if the computer freezes
+sudo systemsetup -setrestartfreeze on
+
+# Set standby delay to 24 hours (default is 1 hour)
+sudo pmset -a standbydelay 86400
+
 ###############################################################################
 # Screen                                                                      #
 ###############################################################################
@@ -132,9 +135,6 @@ defaults write com.apple.screencapture location -string "${HOME}/Desktop"
 # Save screenshots in PNG format (other options: BMP, GIF, JPG, PDF, TIFF)
 defaults write com.apple.screencapture type -string "png"
 
-# Disable shadow in screenshots
-defaults write com.apple.screencapture disable-shadow -bool true
-
 ###############################################################################
 # Finder                                                                      #
 ###############################################################################
@@ -188,9 +188,6 @@ defaults write com.apple.finder FXInfoPanesExpanded -dict \
 # Dock                                                                        #
 ###############################################################################
 
-# Show indicator lights for open applications in the Dock
-defaults write com.apple.dock show-process-indicators -bool true
-
 # Automatically hide and show the Dock without delay
 defaults write com.apple.dock autohide -bool true
 defaults write com.apple.dock autohide-delay -float 0
@@ -207,15 +204,20 @@ defaults write com.apple.dock wvous-br-corner -int 0
 # Don't show recently used applications in the Dock
 defaults write com.Apple.Dock show-recents -bool false
 
+# Disable the Launchpad gesture (pinch with thumb and three fingers)
+defaults write com.apple.dock showLaunchpadGestureEnabled -int 0
+
+###############################################################################
+# Mail                                                                        #
+###############################################################################
+
+# Disable inline attachments (just show the icons)
+defaults write com.apple.mail DisableInlineAttachmentViewing -bool true
+
 ###############################################################################
 # Spotlight                                                                   #
 ###############################################################################
 
-# Disable Spotlight indexing for any volume that gets mounted and has not yet
-# been indexed before.
-# Use `sudo mdutil -i off "/Volumes/foo"` to stop indexing any volume.
-sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
-
 # Change indexing order and disable some file types
 defaults write com.apple.spotlight orderedItems -array \
 	'{"enabled" = 1;"name" = "APPLICATIONS";}' \
@@ -292,6 +294,13 @@ defaults write com.apple.TextEdit RichText -int 0
 defaults write com.apple.TextEdit PlainTextEncoding -int 4
 defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4
 
+###############################################################################
+# iTerm 2                                                          #
+###############################################################################
+
+# Don’t display the annoying prompt when quitting iTerm
+defaults write com.googlecode.iterm2 PromptOnQuit -bool false
+
 ###############################################################################
 # GPGMail 2                                                                   #
 ###############################################################################
diff --git a/zsh/plugins/zsh-syntax-highlighting b/zsh/plugins/zsh-syntax-highlighting
index 3a4b212..ea3ae74 160000
--- a/zsh/plugins/zsh-syntax-highlighting
+++ b/zsh/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 3a4b212c7d8263a12bef176b10737748b752a579
+Subproject commit ea3ae74164bdc1f38b23f6b4c339ac637bfb923b