diff --git a/dot_config/environment b/dot_config/environment
index 2ed6dc2..0fbda49 100644
--- a/dot_config/environment
+++ b/dot_config/environment
@@ -42,7 +42,7 @@ export NPM_CONFIG_INIT_MODULE="$XDG_CONFIG_HOME"/npm/config/npm-init.js
 export NPM_CONFIG_TMP="$XDG_RUNTIME_DIR"/npm 
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export PATH="$HOME/.local/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin:$ANDROID_HOME/platform-tools:$HOME/platform-tools"
+export PATH="$HOME/.local/bin:$HOME/.rebbletool/rebbletool/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin:$ANDROID_HOME/platform-tools:$HOME/platform-tools"
 export PYTHON_HISTORY="$XDG_STATE_HOME"/python_history
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history
@@ -61,4 +61,8 @@ export XBPS_DISTDIR="$HOME"/repos/void-packages
 # Android build stuff
 export USE_CCACHE=1
 export CCACHE_EXEC=/usr/bin/ccache
-export ANDROID_STUDIO=/opt/android-studio
+if [ -d "$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio ]; then
+  export ANDROID_STUDIO="$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio
+else
+  export ANDROID_STUDIO=/opt/android-studio
+fi