diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index c26ba09..5cedb14 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -9,7 +9,7 @@ font_size        16.0
 
 confirm_os_window_close 0
 
-shell nu
+shell xonsh
 
 # BEGIN_KITTY_THEME
 include current-theme.conf
diff --git a/dot_config/xonsh/rc.d/env.xsh b/dot_config/xonsh/rc.d/env.xsh
new file mode 100644
index 0000000..ad9284d
--- /dev/null
+++ b/dot_config/xonsh/rc.d/env.xsh
@@ -0,0 +1,53 @@
+# --- Detect Environment ---
+
+try:
+    import warnings
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        import darkdetect
+
+    dark_mode = darkdetect.isDark()
+except ImportError:
+    dark_mode = False
+
+brew_prefix = $(brew --prefix).strip()
+
+# --- Xonsh Configuration ---
+
+$XONSH_COLOR_STYLE = "stata-dark" if dark_mode else "stata-light"
+
+# --- Path Variables ---
+#> Use MacOS path_helper executable
+source-bash $(/usr/libexec/path_helper -s)
+
+$PATH = [
+    brew_prefix + "/opt/bison/bin",
+    brew_prefix + "/opt/flex/bin",
+    brew_prefix + "/opt/llvm/bin",
+] + $PATH + [
+    $HOME + "/.local/bin",
+    $HOME + "/.cargo/bin",
+]
+
+# --- General Environment ---
+#> Default Editor
+$EDITOR = "nvim"
+$VISUAL = "subl"
+#> Monash Cluster
+$OPTCLUSTER = "compute.optimisation-2020.cloud.edu.au"
+#> CMake settings
+$CMAKE_EXPORT_COMPILE_COMMANDS = "1" # output compile-commands.json for clangd
+$CMAKE_GENERATOR = "Sublime Text 2 - Ninja" # use Ninja generator by default
+#> FZF
+$FZF_DEFAULT_COMMAND = "fd --type f"
+
+# --- Aliases ---
+aliases["brew-backup"] = ("brew", "bundle", "dump", "--global", "--no-lock", "--cask", "--mas", "--tap", "--force")
+aliases["brew-cleanup"] = ("brew", "bundle", "cleanup", "--global", "--no-lock", "--force", "--zap")
+aliases["brew-restore"] = ("brew", "bundle", "install", "--global", "--no-lock")
+aliases["edit"] = $VISUAL
+aliases["less"] = "bat"
+aliases["set-dark-theme"] = ("kitty", "+kitten", "themes", "Mariana")
+aliases["set-light-theme"] = ("kitty", "+kitten", "themes", "Breakers")
+aliases["ssh"] = ("kitty", "+kitten", "ssh")
+aliases["start"] = "open"
diff --git a/dot_config/xonsh/rc.d/plugins.xsh b/dot_config/xonsh/rc.d/plugins.xsh
new file mode 100644
index 0000000..8e11779
--- /dev/null
+++ b/dot_config/xonsh/rc.d/plugins.xsh
@@ -0,0 +1,8 @@
+#> Homebrew integration
+source-bash $(brew shellenv)
+#> Kitty integration
+xontrib load kitty
+#> Starship: smart prompt
+execx($(starship init xonsh))
+#> Zoxide: smart cd
+execx($(zoxide init xonsh), 'exec', __xonsh__.ctx, filename='zoxide')
\ No newline at end of file
diff --git a/private_Library/private_Application Support/private_Sublime Text/private_Packages/private_User/Package Control.sublime-settings b/private_Library/private_Application Support/private_Sublime Text/private_Packages/private_User/Package Control.sublime-settings
index 6128119..85f93a7 100644
--- a/private_Library/private_Application Support/private_Sublime Text/private_Packages/private_User/Package Control.sublime-settings	
+++ b/private_Library/private_Application Support/private_Sublime Text/private_Packages/private_User/Package Control.sublime-settings	
@@ -11,5 +11,6 @@
 		"MiniZinc Language",
 		"Package Control",
 		"Svelte",
+		"xonsh",
 	],
-}
\ No newline at end of file
+}