diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install
index 06b467af..5fcc8e97 100755
--- a/src/freedombone-mesh-install
+++ b/src/freedombone-mesh-install
@@ -29,7 +29,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PROJECT_NAME='freedombone'
-INSTALL_DIR=/root/build
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
 
 export TEXTDOMAIN=${PROJECT_NAME}-mesh-install
@@ -57,7 +56,9 @@ FRIENDS_MIRRORS_SERVER=
 TOXID_REPO=
 TOX_PORT=
 TOX_REPO=
+TOXIC_REPO=
 TOX_COMMIT=
+TOXIC_COMMIT=
 # These are some default nodes, but you can replace them with trusted nodes
 # as you prefer. See https://wiki.tox.im/Nodes
 TOX_NODES=
@@ -578,15 +579,24 @@ function mesh_tox_client {
     fi 
 
     # obtain commits from the main file
-    if [ -f /usr/local/bin/freedombone ]; then
-        TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
+    if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
+        TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
     else
-        TOXIC_COMMIT_MAIN=$(cat /usr/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
+        TOXIC_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
     fi
     if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
         TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
     fi  
 
+    if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
+        TOXIC_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
+    else
+        TOXIC_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')      
+    fi
+    if [ ${#TOXIC_REPO_MAIN} -gt 5 ]; then
+        TOXIC_REPO=$TOXIC_REPO_MAIN
+    fi  
+	
     $CHROOT_PREFIX apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev
     $CHROOT_PREFIX apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev