diff --git a/install_functions.sh b/install_functions.sh
index 98277a3..630b29f 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -889,28 +889,34 @@ function installPyCharmMenu () {
 }
 
 #
-# install Pycharm Apps (headless)
+# install Visual Studio Code Apps (headless)
 #
 function installVisualStudioCode () {
-  msg "Installing PyCharm"
+  msg "Installing Visual Studio Code"
   installAppsFromList code
 }
 
 #
-# install Pycharm Apps (Menu)
+# install Visual Studio Code Apps (Menu)
 #
-function installVisualStudioCode () {
+function installVisualStudioCodeMenu () {
   installAppsFromListMenu code
 }
 
-#TODO:
+#
+# install Android-Studio Apps (headless)
+#
 function installAndroidStudio () {
-  if which umake >/dev/null; then
-    msg "Umake installing : Android-Studio"
-    sudo umake android android-studio
-  fi
+  msg "Installing Android-Studio"
+  installAppsFromList android-studio
 }
 
+#
+# install Android-Studio Apps (Menu)
+#
+function installAndroidStudioMenu () {
+  installAppsFromListMenu android-studio
+
 #
 # install SublimeText Apps (headless)
 #
diff --git a/repo_functions.sh b/repo_functions.sh
index 9e29e26..c691ddb 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -402,7 +402,8 @@ qttools5-doc;apt;qt;qttools5-doc
 qttools5-dev-tools;apt;qt;qttools5-dev-tools
 qttools5-examples;apt;qt;qttools5-examples
 qttools5-doc-html;apt;qt;qttools5-doc-html
-fbreader;apt;ebook;fbreader"
+fbreader;apt;ebook;fbreader
+android-studio;apt;android-studio;android-studio"
 
 #-----------------------------------------------------------------------------#
 # Specific Repo list and functions                                            #
@@ -418,7 +419,8 @@ libreoffice6:addSpecificRepo_Libreoffice6
 winehq-devel:addSpecificRepo_Wine
 mongodb-org;addSpecificRepo_MongoDB3CE
 gyazo;addSpecificRepo_Gyazo
-code;addSpecificRepo_VSCode"
+code;addSpecificRepo_VSCode
+android-studio;addSpecificRepo_AndroidStudio"
 
 #
 # Gyazo
@@ -477,6 +479,10 @@ function addSpecificRepo_VSCode () {
           "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
 }
 
+function addSpecificRepo_AndroidStudio () {
+  addPPA "ppa:maarten-fonville/android-studio"
+}
+
 #-----------------------------------------------------------------------------#
 # Package post install functions list                                         #
 #-----------------------------------------------------------------------------#