diff --git a/src/freedombone b/src/freedombone
index 332c89b4..d9abbe80 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -193,6 +193,7 @@ HUBZILLA_DOMAIN_NAME=
 HUBZILLA_CODE=
 HUBZILLA_ONION_PORT=8085
 HUBZILLA_REPO="https://github.com/redmatrix/hubzilla.git"
+HUBZILLA_THEMES_REPO='https://github.com/DeadSuperHero/redmatrix-themes'
 HUBZILLA_ADDONS_REPO="https://github.com/redmatrix/hubzilla-addons.git"
 HUBZILLA_ADMIN_PASSWORD=
 HUBZILLA_COMMIT='761afd029d97703f2f7609d546b7b5f3d257c601'
@@ -428,6 +429,7 @@ ENABLE_SOCIAL_KEY_MANAGEMENT="no"
 
 TOX_PORT=33445
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
+TOXID_REPO='https://github.com/bashrc/toxid'
 TOX_COMMIT='73b2144edcfd1ca617e9054479b66ab0c0361a14'
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
 # These are some default nodes, but you can replace them with trusted nodes
@@ -6835,7 +6837,7 @@ function tox_avahi {
 
     # install a command to obtain the Tox ID
     cd $INSTALL_DIR
-    git clone https://github.com/bashrc/toxid
+    git clone $TOXID_REPO
     if [ ! -d $INSTALL_DIR/toxid ]; then
         exit 63921
     fi
@@ -8597,7 +8599,7 @@ function install_hubzilla {
         fi
 
         # some extra themes
-        git clone https://github.com/DeadSuperHero/redmatrix-themes /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1
+        git clone $HUBZILLA_THEMES_REPO /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1
         cp -r /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/redmatrix-themes1/* view/theme/
 
         chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
diff --git a/src/freedombone-client b/src/freedombone-client
index d4223234..cb40c17c 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -56,6 +56,8 @@ ZERONET_PORT=15441
 IPFS_PORT=4001
 TRACKER_PORT=6969
 
+TOXID_REPO='https://github.com/bashrc/toxid'
+
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html
 function ssh_remove_small_moduli {
   sudo awk '$5 > 2000' /etc/ssh/moduli > /home/$CURR_USER/moduli
@@ -128,7 +130,7 @@ function mesh_babel {
               mkdir ~/develop
           fi
           cd ~/develop
-          git clone https://github.com/bashrc/toxid
+          git clone $TOXID_REPO
       fi
       cd ~/develop/toxid
       sudo make install
diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index 7f5599aa..a9d0b3e1 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -41,6 +41,7 @@ PEERS_FILE=/tmp/meshpeers.txt
 
 TOX_PORT=33445
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
+TOXID_REPO='https://github.com/bashrc/toxid'
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
 QTOX_INI="/home/$USER/.config/tox/qtox.ini"
 
@@ -143,7 +144,7 @@ function install_toxid {
         return
     fi
     cd ~/develop
-    git clone https://github.com/bashrc/toxid
+    git clone $TOXID_REPO
     cd ~/develop/toxid
     make
     sudo make install