diff --git a/profiles/isair/configurations/bashrc b/profiles/isair/configurations/bashrc
index 6539f18..326cbad 100644
--- a/profiles/isair/configurations/bashrc
+++ b/profiles/isair/configurations/bashrc
@@ -1,24 +1,13 @@
 # Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && . "$HOME/.fig/shell/bashrc.pre.bash"
-
-# Source secrets file which holds environment
-# variables for things such as tokens
-source "$HOME/.secrets"
+[[ -f "$HOME/.fig/shell/bashrc.pre.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.pre.bash"
 
 #
 # Setup
 #
 
 source "$HOME"/.dotfiles-shared/shrc-setup-homebrew
-source "$HOME"/.dotfiles-shared/shrc-setup-thefuck
-source "$HOME"/.dotfiles-shared/shrc-setup-nvm
 source "$HOME"/.dotfiles-shared/shrc-setup-android-studio
 
-# Use Java 1.8 by default, because react-native
-if [[ "${OSTYPE}" == darwin* ]]; then
-  export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-fi
-
 #
 # Utility Functions
 #
@@ -26,4 +15,4 @@ fi
 source "$HOME"/.dotfiles-shared/shrc-utility
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && . "$HOME/.fig/shell/bashrc.post.bash"
+[[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"
diff --git a/profiles/isair/configurations/profile b/profiles/isair/configurations/profile
index 48ec08f..a846db3 100644
--- a/profiles/isair/configurations/profile
+++ b/profiles/isair/configurations/profile
@@ -1,7 +1,6 @@
 # Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && . "$HOME/.fig/shell/profile.pre.bash"
-
+[[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && builtin source "$HOME/.fig/shell/profile.pre.bash"
 export LANG=en_GB.UTF-8
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/profile.post.bash" ]] && . "$HOME/.fig/shell/profile.post.bash"
+[[ -f "$HOME/.fig/shell/profile.post.bash" ]] && builtin source "$HOME/.fig/shell/profile.post.bash"
diff --git a/profiles/isair/configurations/zshrc b/profiles/isair/configurations/zshrc
index 5a86a86..c8e0352 100644
--- a/profiles/isair/configurations/zshrc
+++ b/profiles/isair/configurations/zshrc
@@ -1,9 +1,5 @@
 # Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
-
-# Source secrets file which holds environment
-# variables for things such as tokens
-source "$HOME/.secrets"
+[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 
 #
 # Setup
@@ -11,49 +7,24 @@ source "$HOME/.secrets"
 
 source "$HOME"/.dotfiles-shared/shrc-setup-zsh
 source "$HOME"/.dotfiles-shared/shrc-setup-homebrew
-source "$HOME"/.dotfiles-shared/shrc-setup-thefuck
-source "$HOME"/.dotfiles-shared/shrc-setup-nvm
 source "$HOME"/.dotfiles-shared/shrc-setup-chruby
 source "$HOME"/.dotfiles-shared/shrc-setup-android-studio
 
-# Use Java 1.8 by default, because react-native
-if [[ "${OSTYPE}" == darwin* ]]; then
-  export JAVA_HOME="$(/usr/libexec/java_home -v 1.8 | grep jdk)"
-fi
-
-# Set default editors
-export VISUAL=vim
-export EDITOR="${VISUAL}"
-export REACT_EDITOR=code
-
 #
 # Aliases
 #
 
 source "$HOME"/.dotfiles-shared/shrc-alias-git
 
-alias .p="cd ~/projects"
-
-alias .bin="bundle install --path=vendor/bundle"
-alias .bup="bundle update"
-alias .bx="bundle exec"
-
-alias .pin="pod install"
-alias .pup="pod update"
-
-alias .cloud="sudo ifconfig awdl0 down"
-
 #
 # Utility Functions
 #
 
 source "$HOME"/.dotfiles-shared/shrc-utility
 
-#
-# Custom Shell Prompt
-#
-
-eval "$(starship init zsh)"
+# tabtab source for packages
+# uninstall by removing these lines
+[[ -f ~/.config/tabtab/__tabtab.zsh ]] && . ~/.config/tabtab/__tabtab.zsh || true
 
 # Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && . "$HOME/.fig/shell/zshrc.post.zsh"
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
diff --git a/profiles/isair/packages/brew-cask.txt b/profiles/isair/packages/brew-cask.txt
index 335cf66..5bc7fb2 100644
--- a/profiles/isair/packages/brew-cask.txt
+++ b/profiles/isair/packages/brew-cask.txt
@@ -7,7 +7,6 @@ authy
 balenaetcher
 battle-net
 bit-slicer
-brave-browser
 burp-suite
 cd-to
 charles
@@ -28,31 +27,34 @@ imageoptim
 inkscape
 ipfs
 jdownloader
+karabiner-elements
 keepingyouawake
 logisim-evolution
 microsoft-auto-update
 microsoft-edge
+ngrok
 notion
 notunes
+nvidia-geforce-now
 onionshare
 onyx
 openemu
+porting-kit
 postman
 protonvpn
 pycharm-ce-with-anaconda-plugin
 rectangle
 securid
 sidequest
-signal
 steam
 syncthing
 temurin8
 the-unarchiver
 tor-browser
-unofficial-wineskin
 visual-studio-code
 vlc
-warp
+webcatalog
 webstorm
 whatsapp
+zerotier-one
 zoom
diff --git a/profiles/isair/packages/brew.txt b/profiles/isair/packages/brew.txt
index ad0aa88..3b43bdd 100644
--- a/profiles/isair/packages/brew.txt
+++ b/profiles/isair/packages/brew.txt
@@ -2,11 +2,13 @@ automake
 awscli
 bfg
 bison
+cabextract
 chruby
 circleci
 clang-format
 code-server
 dlib
+ffmpeg@4
 firebase-cli
 git
 git-flow
@@ -19,14 +21,18 @@ graphicsmagick
 gum
 imagemagick
 jq
+luajit-openresty
 lynx
+macos-term-size
 mkvtoolnix
 mpv
 nghttp2
+p7zip
 potrace
 ruby-install
 rust
 scrcpy
+shellcheck
 speedtest-cli
 starship
 the_silver_searcher