diff --git a/docs/TODO.md b/docs/TODO.md
index 19d5e10c..9fcd7a4b 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,3 +1,5 @@
+sysbench rhino platformio emscripten mkvtoolnix ncftp gauge foremost autogen duti multitail testdisk ccat qrencode autoconf-archive tomcat filebeat godep arping lua git-credential-manager rbenv-default-gems source-highlight theora shtool giter8 ipmitool saltstack squid ettercap pidcat calc mongodb wdiff dialog john reaver oath-toolkit xhyve elm icdiff polipo fcrackzip ddrescue pngcrush gitlab-ci-multi-runner tcl-tk flac elinks stunnel caddy tcpreplay fping zenity terragrunt dbus pigz grpc diffutils hping fdupes sonarqube fabric links pinentry augeas haproxy autossh binwalk unzip cabal-install cscope sonar-scanner wakeonlan tmate sshuttle solr tcptraceroute pinentry-mac swiftformat uncrustify hashcat handbrake iproute2mac 2fsprogs hydra you-get cabextract neofetch trash sphinx-doc iftop htop-osx dockutil xctool aspell w3m grc screenfetch moreutils apktool brew-cask-completion openconnect media-info lftp unison logstash pstree rpm opam peco netcat iperf3 libav gifsicle iperf colordiff lmdb mcrypt httprack  aircrack-ng ntfs-3g  glide bower glog parallel cloc mitmproxy bison rename kubernetes-helm gdbm mobile-shell geckodriver socat pv sdl swig pcre winetricks doxygen mtr graphicsmagick dos2unix highlight putty llvm bazel flow  watch hugo sqlite gdb ant mariadb  mercurial nmap pidof autoconf maven readline libtool automake chromedriver pkg-config coreutils
+
 # TODOs
 
 This page outlines various projects and tasks that we are currently working on. Creating a GitHub issue for each of these items would be overkill.
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index e3de359b..6fb86d67 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -745,6 +745,7 @@ softwareGroups:
     - gradle
     - ideviceinstaller
     - ios-deploy
+    - ios-sim
     - java
     - libimobiledevice
     - license
diff --git a/home/dot_config/shell/aliases.sh.tmpl b/home/dot_config/shell/aliases.sh.tmpl
index 56b62757..6e7529d7 100644
--- a/home/dot_config/shell/aliases.sh.tmpl
+++ b/home/dot_config/shell/aliases.sh.tmpl
@@ -142,6 +142,9 @@ alias hash-password='mkpasswd --method=sha-512'
 # Show IP address
 alias ip-address='curl http://ipecho.net/plain; echo'
 
+# Configures Java to use ~/.config/java
+alias java='java -Djava.util.prefs.userRoot="${XDG_CONFIG_HOME:-$HOME/.config}/java"'
+
 # Shows local IP addresses
 alias local-ip-address="ifconfig | grep -Eo 'inet (addr:|adr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1'"
 
diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl
index aa60e5a1..6eadecc2 100644
--- a/home/dot_config/shell/exports.sh.tmpl
+++ b/home/dot_config/shell/exports.sh.tmpl
@@ -223,9 +223,6 @@ export HTTPIE_CONFIG_DIR="$XDG_CONFIG_HOME/httpie"
 ### IPFS
 export IPFS_PATH="$XDG_DATA_HOME/ipfs"
 
-### Java
-export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
-
 ### k9s
 export K9SCONFIG="$XDG_CONFIG_HOME/k9s"
 
diff --git a/software.yml b/software.yml
index b88076fa..0cdec0d6 100644
--- a/software.yml
+++ b/software.yml
@@ -4330,6 +4330,11 @@ softwarePackages:
     _name: null
     brew:darwin: ios-deploy
     npm:darwin: ios-deploy
+  ios-sim:
+    _bin: ios-sim
+    _github: https://github.com/ios-control/ios-sim
+    _name: ios-sim
+    npm:darwin: ios-sim
   ipfs:
     _bin: ipfs
     _desc: A peer-to-peer hypermedia protocol designed to preserve and grow humanity's knowledge by making the web upgradeable, resilient, and more open
@@ -9927,6 +9932,40 @@ softwarePlugins:
     cmd: null
     plugins:
       - https://github.com/BalliAsghar/mailsy-alfred/releases/download/2.0.0/Mailsy.alfredworkflow
+  android-studio:
+    cmd: bash -c 'if ! sdkmanager --list_installed | grep "  {PLUGIN}" > /dev/null; then sdkmanager --install "{PLUGIN}" > /dev/null; fi'
+    plugins:
+      - add-ons;addon-google_apis-google-24
+      - build-tools;33.0.0
+      - cmake;3.22.1
+      - cmdline-tools;latest
+      - emulator
+      - extras;android;m2repository
+      - extras;google;auto
+      - extras;google;google_play_services
+      - extras;google;instantapps
+      - extras;google;m2repository
+      - extras;google;market_apk_expansion
+      - extras;google;market_licensing
+      - extras;google;simulators
+      - extras;google;webdriver
+      - extras;intel;Hardware_Accelerated_Execution_Manager
+      - extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
+      - extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
+      - ndk-bundle
+      - patcher;v4
+      - platform-tools
+      - platforms;android-31
+      - platforms;android-32
+      - platforms;android-33
+      - skiaparser;3
+      - sources;android-33
+      - system-images;android-31;default;x86_64
+      - system-images;android-32;android-desktop;x86_64
+      - system-images;android-33;android-tv;x86
+      - system-images;android-33;google-tv;x86
+      - system-images;android-33;google_apis;x86_64
+      - system-images;android-33;google_apis_playstore;x86_64
   composer:
     cmd: null
     plugins: