diff --git a/bash/bashrc b/bash/bashrc
index b4640ee7..768ca43a 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -97,9 +97,9 @@ fi
 ## IF MacOS
 if [[ $(uname) == "Darwin" ]]; then
     # PATH
-    if [ -d /opt/homebrew/bin ]; do
-      export PATH="/opt/homebrew/bin:$PATH"
-    fi
+  if [ -d /opt/homebrew/bin ]; then
+    export PATH="/opt/homebrew/bin:$PATH"
+  fi
 fi
 
 # Google Stuff
@@ -139,7 +139,11 @@ function h() {
 
 # Check Starship is installed
 if which starship &>/dev/null; then
-    eval "$(starship init zsh)"
+    if [ $SHELL == '/bin/zsh' ]; then
+      eval "$(starship init zsh)"
+    elif [ $SHELL == '/bin/bash' ]; then
+      eval "$(starship init bash)"
+    fi
 else
     echo "Starship not Installed, Install with: curl -sS https://starship.rs/install.sh | sh"
 fi
@@ -150,7 +154,7 @@ export PATH="$PATH:/Users/errol/.local/bin"
 
 for bcfile in ~/.bash_completion.d/*; do
     [ -f "$bcfile" ] && . $bcfile
-    if [ -d "$bcfile" ]; do
+    if [ -d "$bcfile" ]; then
         for subbc in $bcfile/*; do
             [[ -f "$subbc" ]] && . $subbc
         done
diff --git a/shell/aliasrc b/shell/aliasrc
index 10fa131e..b8278045 100644
--- a/shell/aliasrc
+++ b/shell/aliasrc
@@ -1,52 +1,52 @@
+# ~/.aliasrc - Compatible with Bash and Zsh
+
+# Array containing all alias definitions as strings
 alias_list=(
+    # General Shell Aliases
+    "ll='ls -alF'"
+    "ls='ls -lah --color'"
+    "grep='grep --color=auto'"
+    "vi='vim'"
+    "lpg='cd ~/git/lucidpoint'"
+    "ppg='cd ~/git/personal'"
+    "downloads='cd ~/Downloads'"
+    "desktop='cd ~/Desktop'"
+    "docs='cd ~/Documents'"
+    "pip='pip3'"
+    "python='python3'"
 
-# ZSH
-    ll='ls -alF'
-    ls='ls -lah --color'
-    grep='grep --color=auto'
-    vi='vim'
-    lpg='cd ~/git/lucidpoint'
-    ppg='cd ~/git/personal'
-    downloads='cd ~/Downloads'
-    desktop='cd ~/Desktop'
-    docs='cd ~/Documents'
-    pip='pip3'
-    python='python3'
+    # PYTHON
+    "ve='source venv/bin/activate'"
 
-# PYTHON
-    ve='source venv/bin/activate'
+    # GIT
+    "gaa='git add --all'"
+    "gcm='git commit --all --message'"
+    "glo='git log --oneline --decorate --graph --all'"
+    "gl='git pull'"
+    "gp='git push'"
+    "gpd='git push --dry-run'"
+    "gpv='git push --verbose'"
+    "grb='git rebase'"
+    "grv='git remote --verbose'"
+    "gs='git show --pretty=short'"
+    "gst='git status --short'"
+    "gd='git diff'"
+    "gdca='git diff --cached'"
+    "gdcw='git diff --cached --word-diff'"
+    "gds='git diff --staged'"
+    "gdw='git diff --word-diff'"
 
-# GIT
-    gaa='git add --all'
-    gcm='git commit --all --message'
-    glo='git log --oneline --decorate --graph --all'
-    gl='git pull'
-    gp='git push'
-    gpd='git push --dry-run'
-    gpv='git push --verbose'
-    grb='git rebase'
-    grv='git remote --verbose'
-    gs='git show --pretty=short'
-    gst='git status --short'
-    gd='git diff'
-    gdca='git diff --cached'
-    gdcw='git diff --cached --word-diff'
-    gds='git diff --staged'
-    gdw='git diff --word-diff'
+    # SSH
+    "ed='ssh errol@edesktop.sancaktar.net'"
+    "fs='ssh errol@fs1.sancaktar.net'"
 
-# SSH
-    ed='ssh errol@edesktop.sancaktar.net'
-    fs='ssh errol@fs1.sancaktar.net'
-
-# Kubernetes
-    k='kubectl'
-# Terraform/Tofu
-    t='tofu'
+    # Kubernetes
+    "k='kubectl'"
+    # Terraform/Tofu
+    "t='tofu'"
 )
 
-
 # Alias Functions
-
 gc() {
     git add --all
     if [ -n "$1" ]
@@ -58,10 +58,14 @@ gc() {
     git push --verbose
 }
 
-
-
-
-# Alias Loop
 for alias_def in "${alias_list[@]}"; do
-    alias $alias_def
+    if [ -n "$BASH_VERSION" ]; then
+        eval "alias $alias_def"
+    elif [ -n "$ZSH_VERSION" ]; then
+        alias ${alias_def}
+    else
+        eval "alias $alias_def"
+    fi
 done
+
+unset alias_list alias_def