diff --git a/autostart/.config/autostart/jetbrains-toolbox.desktop b/autostart/.config/autostart/jetbrains-toolbox.desktop
index 05dac1090..19fe2a9d5 100755
--- a/autostart/.config/autostart/jetbrains-toolbox.desktop
+++ b/autostart/.config/autostart/jetbrains-toolbox.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Icon=/home/repo/.local/share/JetBrains/Toolbox/toolbox.svg
-Exec=/home/repo/.local/share/JetBrains/Toolbox/bin/jetbrains-toolbox --minimize
+Icon=/home/wayne/.local/share/JetBrains/Toolbox/toolbox.svg
+Exec=/home/wayne/.local/share/JetBrains/Toolbox/bin/jetbrains-toolbox --minimize
 Version=1.0
 Type=Application
 Categories=Development
@@ -12,4 +12,4 @@ X-GNOME-Autostart-enabled=true
 StartupNotify=false
 X-GNOME-Autostart-Delay=10
 X-MATE-Autostart-Delay=10
-X-KDE-autostart-after=panel
\ No newline at end of file
+X-KDE-autostart-after=panel
diff --git a/fish/.config/fish/conf.d/00_profile.fish b/fish/.config/fish/conf.d/00_profile.fish
index e55446c9c..6021e70c3 100644
--- a/fish/.config/fish/conf.d/00_profile.fish
+++ b/fish/.config/fish/conf.d/00_profile.fish
@@ -6,7 +6,7 @@ if [ "$XDG_SESSION_TYPE" = x11 ]
 end
 
 set -gx LC_ALL "en_GB.UTF-8"
-set -gx ANDROID_HOME /home/repo/Android/Sdk
+set -gx ANDROID_HOME /home/wayne/Android/Sdk
 set -gx PAGER more
 set -gx AUR_PAGER more
 set -gx EDITOR vim
diff --git a/fish/.config/fish/conf.d/02_paths.fish b/fish/.config/fish/conf.d/02_paths.fish
index 37b15ba8f..9958c3832 100644
--- a/fish/.config/fish/conf.d/02_paths.fish
+++ b/fish/.config/fish/conf.d/02_paths.fish
@@ -1,5 +1,30 @@
 set PATH "$HOME/.local/bin:$PATH"
 
+
+# Adds `/opt/flutter/bin` to $PATH
+# set PATH so it includes user's private bin if it exists
+if test -d "/opt/flutter/bin"
+    set PATH "/opt/flutter/bin:$PATH"
+end
+
+# Adds `ANDROID_HOME/tools` to $PATH
+# set PATH so it includes user's private bin if it exists
+if test -d "$ANDROID_HOME/tools"
+    set PATH "$ANDROID_HOME/tools:$PATH"
+end
+
+# Adds `ANDROID_HOME/tools/bin` to $PATH
+# set PATH so it includes user's private bin if it exists
+if test -d "$ANDROID_HOME/tools/bin"
+    set PATH "$ANDROID_HOME/tools/bin:$PATH"
+end
+
+# Adds `ANDROID_HOME/platform-tools` to $PATH
+# set PATH so it includes user's private bin if it exists
+if test -d "$ANDROID_HOME/platform-tools"
+    set PATH "$ANDROID_HOME/platform-tools:$PATH"
+end
+
 # Adds `~/.config/composer/vendor/bin` to $PATH
 # set PATH so it includes user's private bin if it exists
 if test -d "$HOME/.config/composer/vendor/bin"