diff --git a/configs/.zshrc b/configs/.zshrc
new file mode 100644
index 0000000..3f6f17b
--- /dev/null
+++ b/configs/.zshrc
@@ -0,0 +1,246 @@
+# Evan Pratten's Shell RC file
+#
+# This file is designed to work in *both* ZSH and Bash.
+# This way, I can just drop this on a remote machine if needed
+# without bringing the entirety of ewconfig along.
+#
+# That being said, if you are reading this on a machine I've done that on, you
+# might want to check out the main repository for more information about what
+# you are looking at: https://github.com/ewpratten/ewconfig
+
+
+# Firstly, if this machine has a copy of ewconfig, keep track of its location
+[[ -d "$HOME/.config/ewconfig" ]] && export EWCONFIG_ROOT="$HOME/.config/ewconfig"
+
+# Configure default binary and library paths
+export PATH="$EWCONFIG_ROOT/scripts:$HOME/bin:$HOME/.local/bin:$PATH"
+export LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH"
+[[ -f "$EWCONFIG_ROOT/configs/python/python_startup.py" ]] && export PYTHONSTARTUP="$EWCONFIG_ROOT/configs/python/python_startup.py"
+
+# Display operating system and architecture information
+echo -e "\033[0;32mPlatform:\033[0m $(uname -s) $(uname -r) $(uname -p)"
+
+# Displaying uptime is a little more complicated because only some systems support `uptime -p`.
+# To get around this, we can fall back to using `sed` to get a rough estimate if needed.
+if [ -x "$(command -v uptime)" ]; then
+    if [ "$(uptime -p 2>/dev/null)" ]; then
+        echo -e "\033[0;32mUptime:\033[0m $(uptime -p)"
+    else
+        echo -e "\033[0;32mUptime:\033[0m $(uptime | awk '{print $3 " " $4}' | sed 's/,//g')"
+    fi
+fi
+
+# Get the binary name of the current shell
+SHELL_NAME=$(basename $SHELL)
+[ -n "$ZSH_VERSION" ] && SHELL_NAME="zsh"
+[ -n "$BASH_VERSION" ] && SHELL_NAME="bash"
+
+# If a shell specifier is set, wrap it in brackets
+# Don't show ZSH unless EWP_SHELL_TYPE is also set
+if [ -n "$EWP_SHELL_TYPE" ]; then
+    SHELL_SPECIFIER="($EWP_SHELL_TYPE $SHELL_NAME) "
+else
+    [[ -z "$ZSH_VERSION" ]] && SHELL_SPECIFIER="($SHELL_NAME) "
+fi
+
+# Determine the hostname color based on the current session info
+HOST_COLOR=$'\033[0;32m' # Green
+[[ -n "$SSH_CLIENT" ]] && HOST_COLOR=$'\033[0;33m' # Yellow
+[[ $(id -u) -eq 0 ]] && HOST_COLOR=$'\033[0;31m' # Red
+
+# Set the prompt to display basic info about this session.
+PS1="\[\033[0m\]${SHELL_SPECIFIER}\[${HOST_COLOR}\]\u@\h \[\033[0;36m\]\w \$ \[\033[0m\]"
+if [ -n "$ZSH_VERSION" ]; then
+    PROMPT=$'%{\033[0m%}'"${SHELL_SPECIFIER}%{${HOST_COLOR}%}"$'%n@%m %{\033[0;36m%}%~ \$ %{\033[0m%}'
+fi
+
+# Additionally, add some extra info to the right of the prompt in zsh
+if [ -n "$ZSH_VERSION" ]; then
+    # Configure the vcs_info plugin to show branch info (only if we aren't in ISH on iPadOS)
+    if [ $(uname -r | grep -c "\-ish$") -eq 0 ]; then
+        autoload -Uz vcs_info
+        zstyle ':vcs_info:*' actionformats '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+        zstyle ':vcs_info:*' formats '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{5}]%f '
+        zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+        zstyle ':vcs_info:*' enable git cvs svn
+        vcs_info_wrapper() {
+            vcs_info
+            if [ -n "$vcs_info_msg_0_" ]; then
+                echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del"
+            fi
+        }
+    else
+        vcs_info_wrapper() {
+            echo ""
+        }
+    fi
+    
+    setopt prompt_subst
+    export RPROMPT=$'%T $(vcs_info_wrapper)%?'
+fi
+
+# Set my preferred editor in order of preference if found
+[[ -x "$(command -v nano)" ]] && export EDITOR="nano"
+[[ -x "$(command -v vi)" ]] && export EDITOR="vi"
+[[ -x "$(command -v vim)" ]] && export EDITOR="vim"
+[[ -x "$(command -v nvim)" ]] && export EDITOR="nvim"
+
+# If we have neovim, use it as the manpage viewer
+if type -p nvim > /dev/null; then
+    export MANPAGER="nvim +Man!"
+    export MANWIDTH=80
+fi
+
+# If ls can output color, enable it
+[[ -x "$(command -v dircolors)" ]] && eval "$(dircolors -b)"
+
+# Basic aliases
+alias ll="ls -l"
+alias la="ls -a"
+alias :q=exit
+alias :wq=exit
+alias cls=clear
+alias snvim="sudoedit"
+alias genuuid="python -c 'import uuid; print(uuid.uuid4())'"
+alias nvim-tmp="$EDITOR $(mktemp)"
+
+# Some aliases only make sense if their parent command exists
+[[ -x "$(command -v wg)" ]] && alias wg-easykeys="wg genkey | tee >(wg pubkey)"
+[[ -x "$(command -v systemd-resolve)" ]] && alias flush-dns="sudo systemd-resolve --flush-caches"
+[[ -x "$(command -v ykman)" ]] && alias yk-totp="ykman oath accounts code"
+[[ -x "$(command -v ufw)" ]] && alias ufw-status="sudo ufw status numbered"
+[[ -x "$(command -v xclip)" ]] && alias clipboard="xclip -selection clipboard"
+
+# "Magic" reload commands
+alias ewp-reload-shell-rc="source ~/.${SHELL_NAME}rc"
+alias zshreload=ewp-reload-shell-rc
+alias bashreload=ewp-reload-shell-rc
+
+# A few functions that keep me sane
+mkcd() {
+    if [ $# != 1 ]; then
+        echo "Usage: mkcd <dir>"
+    else
+        mkdir -p $1 && cd $1
+    fi
+}
+source_env() {
+    env=${1:-.env}
+    [ ! -f "${env}" ] && { echo "Env file ${env} doesn't exist"; return 1; }
+    eval $(sed -e '/^\s*$/d' -e '/^\s*#/d' -e 's/=/="/' -e 's/$/"/' -e 's/^/export /' "${env}")
+}
+extract() {
+    if [ -f $1 ]; then
+        case $1 in
+            *.tar.bz2) tar xvjf $1 ;;
+            *.tar.gz) tar xvzf $1 ;;
+            *.bz2) bunzip2 $1 ;;
+            *.rar) unrar x $1 ;;
+            *.gz) gunzip $1 ;;
+            *.tar) tar xvf $1 ;;
+            *.tbz2) tar xvjf $1 ;;
+            *.tgz) tar xvzf $1 ;;
+            *.zip) unzip $1 ;;
+            *.Z) uncompress $1 ;;
+            *.7z) 7z x $1 ;;
+            *.tar.zst) tar --use-compress-program=unzstd -xvf $1 ;;
+            *.zst) zstd -d $1 ;;
+            *.rpm) rpm2cpio $1 | cpio -idmv ;;
+            *) echo "don't know how to extract '$1'..." ;;
+        esac
+    else
+        echo "'$1' is not a valid file!"
+    fi
+}
+proc-grep() {
+    if [ $# != 1 ]; then
+        echo "Usage: proc-grep <regex>"
+    else
+        ps u | head -1
+        ps aux | grep $1
+    fi
+}
+
+# Search for and load any additional modules
+if [ -d "$EWCONFIG_ROOT/modules" ]; then
+    for module in $(find $EWCONFIG_ROOT/modules -maxdepth 1 -mindepth 1 -type d); do
+        [[ -d "$module/bin" ]] && export PATH="$module/bin:$PATH"
+        [[ -f "$module/.zshrc" ]] && source "$module/.zshrc"
+    done
+fi
+
+# Set up a common command history
+HISTFILE="$HOME/.histfile"
+HISTSIZE=100000
+SAVEHIST=100000
+HISTFILESIZE=100000
+
+# Ignore duplicates & instantly append to history
+if [ -n "$ZSH_VERSION" ]; then
+    setopt INC_APPEND_HISTORY
+    setopt HIST_FIND_NO_DUPS
+    setopt HIST_IGNORE_ALL_DUPS
+    setopt HIST_IGNORE_SPACE
+else
+    HISTCONTROL=ignoreboth
+    shopt -s histappend
+    export PROMPT_COMMAND='history -a'
+fi
+
+# Set up the auto-complete directories
+mkdir -p ~/.local/share/bash-completion/completions
+mkdir -p ~/.zfunc
+fpath+=~/.zfunc
+
+# If we have rustup, generate its auto-complete scripts
+if [ -x "$(command -v rustup)" ]; then
+    rustup completions bash > ~/.local/share/bash-completion/completions/rustup
+    rustup completions bash cargo > ~/.local/share/bash-completion/completions/cargo
+    rustup completions zsh > ~/.zfunc/_rustup
+    rustup completions zsh cargo > ~/.zfunc/_cargo
+fi
+
+# Enable ZSH auto-complete
+if [ -n "$ZSH_VERSION" ]; then
+    autoload -Uz compinit && compinit
+    zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+fi
+
+# ZSH keybindings
+if [ -n "$ZSH_VERSION" ]; then
+    # Ctrl + Arrow
+    bindkey "\e[1;5C" forward-word
+    bindkey "\e[1;5D" backward-word
+    
+    # Ctrl + Delete
+    bindkey "\e[3;5~" kill-word
+    
+    # Ctrl + Backspace
+    bindkey '^H' backward-kill-word
+    
+    # Ctrl + Shift + Delete
+    bindkey "\e[3;6~" kill-line
+    
+    # Home & End
+    bindkey  "^[[H"   beginning-of-line
+    bindkey  "^[[F"   end-of-line
+    
+    # Delete
+    bindkey  "^[[3~"  delete-char
+    
+    # Allow up arrow to be used to go back in history based on current line contents
+    autoload -U up-line-or-beginning-search
+    autoload -U down-line-or-beginning-search
+    zle -N up-line-or-beginning-search
+    zle -N down-line-or-beginning-search
+    bindkey "^[[A" up-line-or-beginning-search # Up
+    bindkey "^[[B" down-line-or-beginning-search # Down
+    bindkey "^[OA" up-line-or-beginning-search # Up over SSH connection
+    bindkey "^[OB" down-line-or-beginning-search # Down over SSH connection
+fi
+
+# Various tools think they need to live here too. I shall appease them..
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$SDKMAN_DIR/bin/sdkman-init.sh" ]] && source "$SDKMAN_DIR/bin/sdkman-init.sh"
+[[ -s "$HOME/pkg/flutter/bin" ]] && export PATH="$HOME/pkg/flutter/bin:$PATH"
+[[ -s "$HOME/.rye/env" ]] && source "$HOME/.rye/env"
diff --git a/configs/shells/bash/.bashrc b/configs/shells/bash/.bashrc
deleted file mode 100644
index c641f83..0000000
--- a/configs/shells/bash/.bashrc
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a somewhat hacky bashrc that is used to provide some of the conveniences from my zshrc on machines that I can't get zsh on
-export EWCONFIG_ROOT="$HOME/.config/ewconfig"
-
-# Show some host info
-. $EWCONFIG_ROOT/configs/shells/bash/info.sh
-
-# Load macros
-. $EWCONFIG_ROOT/configs/shells/bash/macros.sh
-
-# I always want my ~/bin to be in my PATH
-export PATH="$HOME/bin:$PATH"
-export PATH="$EWCONFIG_ROOT/scripts:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-
-# I want to be able to load my custom python modules
-export PYTHONPATH="$EWCONFIG_ROOT/python_modules:$PYTHONPATH"
-export PYTHONSTARTUP="$EWCONFIG_ROOT/configs/python/python_startup.py"
-
-# A basic prompt to display user@host dir sign
-export PS1="(${PS1_CTX:-bash}) \[\e[0;32m\]\u@\h \[\e[0;36m\]\w \[\e[0;36m\]\$ \[\e[0m\]"
-
-# Search for ewconfig modules that need to be loaded
-for module in $(find $EWCONFIG_ROOT/modules -maxdepth 1 -mindepth 1 -type d); do
-    # If this module contains a `bin` directory, add it to the PATH
-    if [ -d "$module/bin" ]; then
-        export PATH="$module/bin:$PATH"
-    fi
-done
\ No newline at end of file
diff --git a/configs/shells/bash/info.sh b/configs/shells/bash/info.sh
deleted file mode 100644
index 36c2d67..0000000
--- a/configs/shells/bash/info.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Define red and green based on the shell
-if [ -n "$BASH_VERSION" ]; then
-    red='\033[0;31m'
-    green='\033[0;32m'
-    reset_color='\033[0m'
-    elif [ -n "$ZSH_VERSION" ]; then
-    red="$fg[red]"
-    green="$fg[green]"
-fi
-
-# Different OSes have different ways of displaying info
-if [ $(uname -s | grep -c BSD) -gt 0 ]; then # BSD
-    echo -e "${green}Platform:$reset_color $(uname -s) $(uname -r) $(uname -p)"
-    
-elif [ $(uname -s | grep -c MINGW) -gt 0 ]; then # Windows
-    echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)"
-    
-else # Linux-y things
-    echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)"
-
-    # If the `uptime` binary is *not* busybox, we can show it
-    if [ $(uptime -V 2>&1 | grep -ci busybox) -eq 0 ]; then
-        echo -e "${green}Uptime:$reset_color $(uptime -p)"
-    fi
-fi
-
-# Determine if $EWCONFIG_ROOT contains uncommitted changes
-# Skip this if on Windows
-if [ -d $EWCONFIG_ROOT/.git ]; then
-    if [ $(uname -s | grep -c MINGW) -eq 0 ]; then
-        if [ -n "$(git -C $EWCONFIG_ROOT status --porcelain)" ]; then
-            echo -e "${red}ewconfig contains uncommitted changes$reset_color"
-        fi
-    fi
-fi
-
diff --git a/configs/shells/bash/macros.sh b/configs/shells/bash/macros.sh
deleted file mode 100644
index ff7aebc..0000000
--- a/configs/shells/bash/macros.sh
+++ /dev/null
@@ -1,169 +0,0 @@
-# If ls has `--color` support
-if ls --color > /dev/null 2>&1; then
-    alias ls="ls --color=auto"
-fi
-
-# Main aliases
-alias ll="ls -l"
-alias la="ls -a"
-alias :q="exit"
-alias :wq="exit"
-alias cls=clear
-alias bashreload="source ~/.bashrc"
-alias wg-easykeys="wg genkey | tee >(wg pubkey)"
-alias nvim-tmp="nvim $(mktemp)"
-alias flush-dns="sudo systemd-resolve --flush-caches"
-alias lsgrep="ls | grep"
-alias git-diff-nvim="git diff | nvim -R -d -c 'set filetype=diff' -"
-alias yk-totp="ykman oath accounts code"
-alias flush-dns-cache="sudo systemd-resolve --flush-caches"
-alias ufw-status="sudo ufw status numbered"
-alias genuuid="python -c 'import uuid; print(uuid.uuid4())'"
-alias clipboard="xclip -selection clipboard"
-alias snvim="sudoedit"
-
-# WHOIS macros
-alias whois-afrinic="whois -h whois.afrinic.net"
-alias whois-altdb="whois -h whois.altdb.net"
-alias whois-aoltw="whois -h whois.aoltw.net"
-alias whois-ampr="whois -h whois.ampr.org"
-alias whois-apnic="whois -h whois.apnic.net"
-alias whois-arin="whois -h rr.arin.net"
-alias whois-bell="whois -h whois.in.bell.ca"
-alias whois-bboi="whois -h irr.bboi.net"
-alias whois-bgptools="whois -h bgp.tools"
-alias whois-canarie="whois -h whois.canarie.ca"
-alias whois-epoch="whois -h whois.epoch.net"
-alias whois-jpirr="whois -h jpirr.nic.ad.jp"
-alias whois-lacnic="whois -h irr.lacnic.net"
-alias whois-level3="whois -h rr.level3.net"
-alias whois-nestegg="whois -h whois.nestegg.net"
-alias whois-panix="whois -h rrdb.access.net"
-alias whois-radb="whois -h whois.radb.net"
-alias whois-reach="whois -h rr.telstraglobal.net"
-alias whois-ripe="whois -h whois.ripe.net"
-
-# Neo-aliases
-if [ -x "$(command -v nvim)" ]; then alias vim="nvim"; fi
-if [ -x "$(command -v neomutt)" ]; then alias mutt="neomutt"; fi
-
-# If python exists, configure an alias for python3 if needed
-if [ -x "$(command -v python)" ]; then
-    # If `python --version` starts with `Python 3`
-    if [[ $(python --version) == Python\ 3* ]]; then
-        # If we don't have python3 in our path
-        if ! command -v python3 &> /dev/null; then
-            # Make an alias for python3
-            alias python3=python
-        fi
-    fi
-fi
-
-# If we are running in a studio environment
-if [ ! -z "$EWP_IN_GURU_ENVIRONMENT" ]; then
-    alias guru_launcher3="python $GURU_PYTHON_ROOT/env/guru_launcher3.py"
-    alias cd-dev="cd /s/development/epratten"
-fi
-
-
-# Makes a directory, then moves into it
-mkcd() {
-    if [ $# != 1 ]; then
-        echo "Usage: mkcd <dir>"
-    else
-        mkdir -p $1 && cd $1
-    fi
-}
-
-# Sources a .env
-source_env() {
-    env=${1:-.env}
-    [ ! -f "${env}" ] && { echo "Env file ${env} doesn't exist"; return 1; }
-    eval $(sed -e '/^\s*$/d' -e '/^\s*#/d' -e 's/=/="/' -e 's/$/"/' -e 's/^/export /' "${env}")
-}
-
-# Auto-extract anything
-extract() {
-    if [ -f $1 ]; then
-        case $1 in
-            *.tar.bz2) tar xvjf $1 ;;
-            *.tar.gz) tar xvzf $1 ;;
-            *.bz2) bunzip2 $1 ;;
-            *.rar) unrar x $1 ;;
-            *.gz) gunzip $1 ;;
-            *.tar) tar xvf $1 ;;
-            *.tbz2) tar xvjf $1 ;;
-            *.tgz) tar xvzf $1 ;;
-            *.zip) unzip $1 ;;
-            *.Z) uncompress $1 ;;
-            *.7z) 7z x $1 ;;
-            *.tar.zst) tar --use-compress-program=unzstd -xvf $1 ;;
-            *.zst) zstd -d $1 ;;
-            *.rpm) rpm2cpio $1 | cpio -idmv ;;
-            *) echo "don't know how to extract '$1'..." ;;
-        esac
-    else
-        echo "'$1' is not a valid file!"
-    fi
-}
-
-# Updates ewconfig
-ewconfig-pull() {
-    cwd=$(pwd)
-    cd ~/.config/ewconfig
-    git pull
-    cd $cwd
-}
-
-# Updates the ewconfig on machines that don't have git
-ewconfig-pull-zip(){
-    cwd=$(pwd)
-    # If $EWCONFIG_ROOT/.git exists, don't let the user run this
-    if [ -d $EWCONFIG_ROOT/.git ]; then
-        echo "You can't run this command when ~/.config/ewconfig is a git repo!"
-        return 1
-    fi
-    
-    # Download the latest zip
-    cd ~/Downloads
-    curl -L https://ewp.fyi/config.zip -o ewconfig.zip
-    rm -rf ~/.config/ewconfig
-    unzip ewconfig.zip
-    mv ewconfig-master ~/.config/ewconfig
-    rm ewconfig.zip
-    
-    # Return to the original directory
-    cd $cwd
-}
-
-# Temporairly hop to the ewconfig directory to run a command
-ewconfig-run() {
-    cwd=$(pwd)
-    cd ~/.config/ewconfig
-    $@
-    cd $cwd
-}
-
-# Re-run the install script from anywhere
-ewconfig-reinstall() {
-    # Require an argument (linux, windows)
-    if [ $# != 1 ]; then
-        echo "Usage: ewconfig-reinstall <platform>"
-        return 1
-    fi
-    
-    # Execute through ewconfig-run
-    ewconfig-run sh ./install-$1.sh
-}
-
-# If `gh` is not installed, fake it so that I can save my muscle memory
-if ! command -v gh &> /dev/null; then
-    gh() {
-        if [ $# != 3 ]; then
-            echo "You don't have gh installed. Emulating its functionality."
-            echo "Usage: gh repo clone <user>/<repo>"
-        else
-            git clone https://github.com/$3
-        fi
-    }
-fi
diff --git a/configs/shells/zsh/.zshrc b/configs/shells/zsh/.zshrc
deleted file mode 100644
index 5966072..0000000
--- a/configs/shells/zsh/.zshrc
+++ /dev/null
@@ -1,71 +0,0 @@
-
-# There are some important env vars that need to exist
-export EWCONFIG_ROOT="$HOME/.config/ewconfig"
-
-# Auto-detect if we are running inside of ISH (IOS Shell)
-if [ $(uname -r | grep -c "\-ish$") -gt 0 ]; then
-    export EWCONFIG_IN_ISH=1
-fi
-
-# Load my custom prompt and macros
-. $EWCONFIG_ROOT/configs/shells/zsh/prompt.sh
-. $EWCONFIG_ROOT/configs/shells/zsh/macros.sh
-. $EWCONFIG_ROOT/configs/shells/zsh/keybinds.sh
-. $EWCONFIG_ROOT/configs/shells/zsh/autocomplete.sh
-
-# Load per-host configuration
-if [ -f $EWCONFIG_ROOT/configs/zsh/by_host/$HOSTNAME.sh ]; then
-  . $EWCONFIG_ROOT/configs/shells/zsh/by_host/$HOSTNAME.sh
-fi
-
-# Show some host info
-. $EWCONFIG_ROOT/configs/shells/bash/info.sh
-
-# I always want my ~/bin to be in my PATH
-export PATH="$HOME/bin:$PATH"
-export PATH="$EWCONFIG_ROOT/scripts:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-
-# Make sure libs can be found
-export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH="/usr/local/lib64:$LD_LIBRARY_PATH"
-
-# I want to be able to load my custom python modules
-export PYTHONPATH="$EWCONFIG_ROOT/python_modules:$PYTHONPATH"
-export PYTHONSTARTUP="$EWCONFIG_ROOT/configs/python/python_startup.py"
-
-# Configure a sane default editor
-if type -p nvim > /dev/null; then
-  export EDITOR="nvim"
-elif type -p vim > /dev/null; then
-  export EDITOR="vim"
-elif type -p vi > /dev/null; then
-  export EDITOR="vi"
-elif type -p nano > /dev/null; then
-  export EDITOR="nano"
-fi
-
-# If we have neovim, use it as the manpage viewer
-if type -p nvim > /dev/null; then
-    export MANPAGER="nvim +Man!"
-    export MANWIDTH=80
-fi
-
-# Search for ewconfig modules that need to be loaded
-for module in $(find $EWCONFIG_ROOT/modules -maxdepth 1 -mindepth 1 -type d); do
-    # If this module contains a `bin` directory, add it to the PATH
-    if [ -d "$module/bin" ]; then
-        export PATH="$module/bin:$PATH"
-    fi
-done
-
-# SDKMAN!
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
-
-# Flutter
-[[ -s "$HOME/pkg/flutter/bin" ]] && export PATH="$HOME/pkg/flutter/bin:$PATH"
-
-# Rye
-[[ -s "$HOME/.rye/env" ]] && source "$HOME/.rye/env"
-
diff --git a/configs/shells/zsh/autocomplete.sh b/configs/shells/zsh/autocomplete.sh
deleted file mode 100644
index cc501ed..0000000
--- a/configs/shells/zsh/autocomplete.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-# Allow programs to write their own autocomplete functions to ~/.zfunc
-mkdir -p ~/.zfunc
-fpath+=~/.zfunc
-
-# Make all shells append to history file instantly
-setopt INC_APPEND_HISTORY
-
-# If we have rustup, it can be used to generate completeions for itself and cargo
-if type -p rustup >/dev/null; then
-    # Only generate if the files don't already exist
-    if [[ ! -f ~/.zfunc/_rustup ]]; then
-        rustup completions zsh > ~/.zfunc/_rustup
-    fi
-    if [[ ! -f ~/.zfunc/_cargo ]]; then
-        rustup completions zsh cargo > ~/.zfunc/_cargo
-    fi
-fi
-
-# Enable auto-complete
-autoload -Uz compinit && compinit
-
-# Handles case-insensitive completion
-zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
-
-# Configure command history
-HISTFILE=~/.histfile
-HISTSIZE=100000
-SAVEHIST=100000
-
-# Ignore duplicates in history search, and dont't write them either
-setopt HIST_FIND_NO_DUPS
-setopt HIST_IGNORE_ALL_DUPS
-
-# Ignore commands starting with a space
-setopt HIST_IGNORE_SPACE
-
-# Allow up arrow to be used to go back in history based on current line contents
-autoload -U up-line-or-beginning-search
-autoload -U down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-bindkey "^[[A" up-line-or-beginning-search # Up
-bindkey "^[[B" down-line-or-beginning-search # Down
-bindkey "^[OA" up-line-or-beginning-search # Up over SSH connection
-bindkey "^[OB" down-line-or-beginning-search # Down over SSH connection
-
diff --git a/configs/shells/zsh/keybinds.sh b/configs/shells/zsh/keybinds.sh
deleted file mode 100644
index 9459345..0000000
--- a/configs/shells/zsh/keybinds.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-### ctrl+arrows
-bindkey "\e[1;5C" forward-word
-bindkey "\e[1;5D" backward-word
-# urxvt
-bindkey "\eOc" forward-word
-bindkey "\eOd" backward-word
-
-### ctrl+delete
-bindkey "\e[3;5~" kill-word
-# urxvt
-bindkey "\e[3^" kill-word
-
-### ctrl+backspace
-bindkey '^H' backward-kill-word
-
-### ctrl+shift+delete
-bindkey "\e[3;6~" kill-line
-# urxvt
-bindkey "\e[3@" kill-line
-
-# Home and end
-bindkey  "^[[H"   beginning-of-line
-bindkey  "^[[F"   end-of-line
-
-# Delete
-bindkey  "^[[3~"  delete-char
diff --git a/configs/shells/zsh/macros.sh b/configs/shells/zsh/macros.sh
deleted file mode 100644
index 22a53f6..0000000
--- a/configs/shells/zsh/macros.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# We are compatible with bash, so first load the bash-specific macros
-. $EWCONFIG_ROOT/configs/shells/bash/macros.sh
-
-# Aliases
-alias zshreload="source ~/.zshrc"
-
-# Search for a process
-proc-grep() {
-    if [ $# != 1 ]; then
-        echo "Usage: proc-grep <regex>"
-    else
-        ps aux | { head -1; grep $1 }
-    fi
-}
diff --git a/configs/shells/zsh/prompt.sh b/configs/shells/zsh/prompt.sh
deleted file mode 100644
index a06e713..0000000
--- a/configs/shells/zsh/prompt.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is some kind of dark magic.
-# I have no memory of whats going on here, but this has been my config since 2015-ish, so it shall not be touched.
-# This was origionally written for crosh, so that may be part of the problem...
-
-autoload -U colors && colors
-NEWLINE=$'\n'
-USER_ICON="$"
-
-# Use colors to signal the current connection / user privs
-if [[ $(id -u) = 0 ]]; then
-    HOST_COLOR="red"
-    USER_ICON="#"
-elif [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
-    HOST_COLOR="yellow"
-elif [ "$EWCONFIG_IN_DOCKER" = "1" ]; then
-    HOST_COLOR="blue"
-else
-    HOST_COLOR="green"
-fi
-
-# Clear the prompt
-export PROMPT=""
-
-# If we are *NOT* in Termux, show the host and username
-if ! command -v termux-setup-storage; then
-    export PROMPT="%{$fg[$HOST_COLOR]%}%n@%M "
-fi
-
-# Add the common prompt parts
-export PROMPT="${PROMPT}%{$fg[cyan]%}%~ ${USER_ICON} %{$reset_color%}"
-setopt prompt_subst
-
-# Don't bother rendering VCS info on weak systems. Just fallback to the time and status
-if [ -z "$EWCONFIG_IN_ISH" ]; then
-    autoload -Uz vcs_info
-    zstyle ':vcs_info:*' actionformats \
-        '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
-    zstyle ':vcs_info:*' formats \
-        '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{5}]%f '
-    zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
-
-    zstyle ':vcs_info:*' enable git cvs svn
-
-    # or use pre_cmd, see man zshcontrib
-    vcs_info_wrapper() {
-        vcs_info
-        if [ -n "$vcs_info_msg_0_" ]; then
-            echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del"
-        fi
-    }
-    export RPROMPT=$'%T $(vcs_info_wrapper)%?'
-else
-    export RPROMPT=$'%T %?'
-fi
\ No newline at end of file
diff --git a/install-linux.sh b/install-linux.sh
index 4a60e02..93bb930 100644
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -45,8 +45,8 @@ mkdir -p ~/.local/share/nautilus/scripts/
 # -- Config Linking --
 
 # Configure the shell
-ln -sf $EWCONFIG_ROOT/configs/shells/zsh/.zshrc ~/.zshrc
-ln -sf $EWCONFIG_ROOT/configs/shells/bash/.bashrc ~/.bashrc
+ln -sf $EWCONFIG_ROOT/configs/.zshrc ~/.zshrc
+ln -sf $EWCONFIG_ROOT/configs/.zshrc ~/.bashrc
 
 # Configure Git
 ln -sf $EWCONFIG_ROOT/configs/git/.gitconfig ~/.gitconfig
diff --git a/scripts/ewconfig-pull b/scripts/ewconfig-pull
new file mode 100755
index 0000000..288e1db
--- /dev/null
+++ b/scripts/ewconfig-pull
@@ -0,0 +1,4 @@
+#! /bin/bash
+set -e
+
+ewconfig-run git pull
\ No newline at end of file
diff --git a/scripts/ewconfig-reinstall b/scripts/ewconfig-reinstall
new file mode 100755
index 0000000..040f295
--- /dev/null
+++ b/scripts/ewconfig-reinstall
@@ -0,0 +1,11 @@
+#! /bin/bash
+set -e
+
+# Require an argument (linux, windows)
+if [ $# != 1 ]; then
+    echo "Usage: ewconfig-reinstall <platform>"
+    return 1
+fi
+
+# Execute through ewconfig-run
+ewconfig-run sh ./install-$1.sh
\ No newline at end of file
diff --git a/scripts/ewconfig-run b/scripts/ewconfig-run
new file mode 100755
index 0000000..6e9a1b9
--- /dev/null
+++ b/scripts/ewconfig-run
@@ -0,0 +1,13 @@
+#! /bin/bash
+set -e
+
+# If $EWCONFIG_ROOT is not set, error
+if [ -z "$EWCONFIG_ROOT" ]; then
+    echo "Error: \$EWCONFIG_ROOT is not set"
+    exit 1
+fi
+
+cwd="$(pwd)"
+cd "$EWCONFIG_ROOT"
+$@
+cd "$cwd"
diff --git a/scripts/whois-util b/scripts/whois-util
new file mode 100755
index 0000000..57b85c5
--- /dev/null
+++ b/scripts/whois-util
@@ -0,0 +1,39 @@
+#! /bin/bash
+set -e
+
+# Require at least 2 arguments
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 <database> [whois options]"
+    exit 1
+fi
+
+# Select the correct database
+WHOIS_DB=""
+[[ $1 == "afrinic" ]] && WHOIS_DB="whois -h whois.afrinic.net"
+[[ $1 == "altdb" ]] && WHOIS_DB="whois -h whois.altdb.net"
+[[ $1 == "aoltw" ]] && WHOIS_DB="whois -h whois.aoltw.net"
+[[ $1 == "ampr" ]] && WHOIS_DB="whois -h whois.ampr.org"
+[[ $1 == "apnic" ]] && WHOIS_DB="whois -h whois.apnic.net"
+[[ $1 == "arin" ]] && WHOIS_DB="whois -h rr.arin.net"
+[[ $1 == "bell" ]] && WHOIS_DB="whois -h whois.in.bell.ca"
+[[ $1 == "bboi" ]] && WHOIS_DB="whois -h irr.bboi.net"
+[[ $1 == "bgptools" ]] && WHOIS_DB="whois -h bgp.tools"
+[[ $1 == "canarie" ]] && WHOIS_DB="whois -h whois.canarie.ca"
+[[ $1 == "epoch" ]] && WHOIS_DB="whois -h whois.epoch.net"
+[[ $1 == "jpirr" ]] && WHOIS_DB="whois -h jpirr.nic.ad.jp"
+[[ $1 == "lacnic" ]] && WHOIS_DB="whois -h irr.lacnic.net"
+[[ $1 == "level3" ]] && WHOIS_DB="whois -h rr.level3.net"
+[[ $1 == "nestegg" ]] && WHOIS_DB="whois -h whois.nestegg.net"
+[[ $1 == "panix" ]] && WHOIS_DB="whois -h rrdb.access.net"
+[[ $1 == "radb" ]] && WHOIS_DB="whois -h whois.radb.net"
+[[ $1 == "reach" ]] && WHOIS_DB="whois -h rr.telstraglobal.net"
+[[ $1 == "ripe" ]] && WHOIS_DB="whois -h whois.ripe.net"
+
+# If no database was selected, exit
+if [ -z "$WHOIS_DB" ]; then
+    echo "Unknown database: $1"
+    exit 1
+fi
+
+# Run the whois command
+$WHOIS_DB $2
\ No newline at end of file