diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 3bfe024e..2f70ac99 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -68,739 +68,751 @@ TOMB_TOX_BOOTSTRAP_SIZE_MB=10
 TOMB_ZERONET_CONFIG_SIZE_MB=10
 TOMB_ZERONET_DATA_SIZE_MB=32
 
+MESH_INSTALL_DIR=/var/lib
+ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
+TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users.html
+
 function create_ram_disk {
-	ramdisk_size_mb=$1
-	if [ ! -d /mnt/ramdisk ]; then
-		mkdir -p /mnt/ramdisk
-	fi
-	if ! grep -q "ramdisk" /etc/fstab; then
-		mount -t tmpfs -o size=${ramdisk_size_mb}m tmpfs /mnt/ramdisk
-		echo "tmpfs       /mnt/ramdisk tmpfs   nodev,nosuid,noexec,nodiratime,size=${ramdisk_size_mb}M   0 0" >> /etc/fstab
-	fi
+    ramdisk_size_mb=$1
+    if [ ! -d /mnt/ramdisk ]; then
+        mkdir -p /mnt/ramdisk
+    fi
+    if ! grep -q "ramdisk" /etc/fstab; then
+        mount -t tmpfs -o size=${ramdisk_size_mb}m tmpfs /mnt/ramdisk
+        echo "tmpfs       /mnt/ramdisk tmpfs   nodev,nosuid,noexec,nodiratime,size=${ramdisk_size_mb}M   0 0" >> /etc/fstab
+    fi
 }
 
 function set_hostname {
-	DEFAULT_DOMAIN_NAME="$1"
+    DEFAULT_DOMAIN_NAME="$1"
 
-	echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
-	hostname $DEFAULT_DOMAIN_NAME
+    echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
+    hostname $DEFAULT_DOMAIN_NAME
 
-	if grep -q "127.0.1.1" /etc/hosts; then
-		sed -i "s/127.0.1.1.*/127.0.1.1       $DEFAULT_DOMAIN_NAME/g" /etc/hosts
-	else
-		echo "127.0.1.1  $DEFAULT_DOMAIN_NAME" >> /etc/hosts
-	fi
+    if grep -q "127.0.1.1" /etc/hosts; then
+        sed -i "s/127.0.1.1.*/127.0.1.1       $DEFAULT_DOMAIN_NAME/g" /etc/hosts
+    else
+        echo "127.0.1.1  $DEFAULT_DOMAIN_NAME" >> /etc/hosts
+    fi
 }
 
 function change_avahi_name {
-	decarray=( 1 2 3 4 5 6 7 8 9 0 )
-	PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
-	sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
-	sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
-	set_hostname P$PEER_ID
-	systemctl restart avahi-daemon
+    decarray=( 1 2 3 4 5 6 7 8 9 0 )
+    PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
+    sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
+    sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
+    set_hostname P$PEER_ID
+    systemctl restart avahi-daemon
 
-	echo "New avahi name for this peer is P$PEER_ID"
-	toilet "mesh-$PEER_ID"
-	echo $"avahi name changed to P${PEER_ID}.local" >> $INSTALL_LOG
+    echo "New avahi name for this peer is P$PEER_ID"
+    toilet "mesh-$PEER_ID"
+    echo $"avahi name changed to P${PEER_ID}.local" >> $INSTALL_LOG
 }
 
 function regenerate_ssh_host_keys {
-	echo $"Regenerating ssh host keys" >> $INSTALL_LOG
-	rm -f /etc/ssh/ssh_host_*
-	dpkg-reconfigure openssh-server
-	echo $'ssh host keys regenerated' >> $INSTALL_LOG
-	# remove small moduli
-	awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
-	mv ~/moduli /etc/ssh/moduli
-	echo $'ssh small moduli removed' >> $INSTALL_LOG
+    echo $"Regenerating ssh host keys" >> $INSTALL_LOG
+    rm -f /etc/ssh/ssh_host_*
+    dpkg-reconfigure openssh-server
+    echo $'ssh host keys regenerated' >> $INSTALL_LOG
+    # remove small moduli
+    awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
+    mv ~/moduli /etc/ssh/moduli
+    echo $'ssh small moduli removed' >> $INSTALL_LOG
 }
 
 function configure_zeronet {
-	sed -i "s|ExecStart=.*|ExecStart=/usr/bin/python zeronet.py --ip_external P${PEER_ID}.local --trackers_file $MESH_INSTALL_DIR/zeronet/bootstrap|g" /etc/systemd/system/zeronet.service
-	echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
+    sed -i "s|ExecStart=.*|ExecStart=/usr/bin/python zeronet.py --ip_external P${PEER_ID}.local --trackers_file $MESH_INSTALL_DIR/zeronet/bootstrap|g" /etc/systemd/system/zeronet.service
+    echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
 }
 
 function configure_zeronet_blog {
-	echo $'Updating ZeroNet Blog' >> $INSTALL_LOG
-	ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
+    echo $'Updating ZeroNet Blog' >> $INSTALL_LOG
+    ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
 
-	cd $MESH_INSTALL_DIR/zeronet
-	python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/blog.txt
-	if [ ! -f $MESH_INSTALL_DIR/zeronet/blog.txt ]; then
-		echo $'Unable to create ZeroNet blog' >> $INSTALL_LOG
-		exit 7386
-	fi
-	blog_address=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site address" | awk -F ':' '{print $2}')
-	blog_private_key=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site private key" | awk -F ':' '{print $2}')
-	ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/}
-	ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
+    cd $MESH_INSTALL_DIR/zeronet
+    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/blog.txt
+    if [ ! -f $MESH_INSTALL_DIR/zeronet/blog.txt ]; then
+        echo $'Unable to create ZeroNet blog' >> $INSTALL_LOG
+        exit 7386
+    fi
+    blog_address=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site address" | awk -F ':' '{print $2}')
+    blog_private_key=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site private key" | awk -F ':' '{print $2}')
+    ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/}
+    ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
 
-	if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
-		echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet blog address' >> $INSTALL_LOG
-		exit 7358
-	fi
+    if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
+        echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet blog address' >> $INSTALL_LOG
+        exit 7358
+    fi
 
-	if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
-		echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet blog private key' >> $INSTALL_LOG
-		exit 1639
-	fi
+    if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
+        echo $"Address:    $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet blog private key' >> $INSTALL_LOG
+        exit 1639
+    fi
 
-	if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" ]; then
-		echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
-		exit 7638
-	fi
+    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" ]; then
+        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
+        exit 7638
+    fi
 
-	echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
-	echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
-	cp -r $MESH_INSTALL_DIR/zeronet/ZeroBlog/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS
+    echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS" >> $INSTALL_LOG
+    echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY" >> $INSTALL_LOG
+    cp -r $MESH_INSTALL_DIR/zeronet/ZeroBlog/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS
 
-	if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data ]; then
-		mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
-	fi
-	cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
-	sed -i "s/MyZeroBlog/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
-	sed -i "s/My ZeroBlog./$ZERONET_DEFAULT_BLOG_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
-	sed -i "s/ZeroBlog Demo/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
-	sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_BLOG_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
-	sed -i "s/Blogging platform Demo/Blogging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/content.json
-	python zeronet.py siteSign $ZERONET_BLOG_ADDRESS $ZERONET_BLOG_PRIVATE_KEY
+    if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data ]; then
+        mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
+    fi
+    cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data
+    sed -i "s/MyZeroBlog/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
+    sed -i "s/My ZeroBlog./$ZERONET_DEFAULT_BLOG_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/data.json
+    sed -i "s/ZeroBlog Demo/$ZERONET_DEFAULT_BLOG_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
+    sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_BLOG_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/index.html
+    sed -i "s/Blogging platform Demo/Blogging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/content.json
+    python zeronet.py siteSign $ZERONET_BLOG_ADDRESS $ZERONET_BLOG_PRIVATE_KEY
 
-	# update the avahi service
-	echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-blog.service
-	echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-blog.service
-	echo '<service-group>' >> /tmp/zeronet-blog.service
-	echo '  <name replace-wildcards="yes">%h ZeroNet Blog</name>' >> /tmp/zeronet-blog.service
-	echo '  <service>' >> /tmp/zeronet-blog.service
-	echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-blog.service
-	echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-blog.service
-	echo "    <txt-record>$ZERONET_URL/$ZERONET_BLOG_ADDRESS</txt-record>" >> /tmp/zeronet-blog.service
-	echo '  </service>' >> /tmp/zeronet-blog.service
-	echo '</service-group>' >> /tmp/zeronet-blog.service
-	cp /tmp/zeronet-blog.service /etc/avahi/services/zeronet-blog.service
+    # update the avahi service
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-blog.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-blog.service
+    echo '<service-group>' >> /tmp/zeronet-blog.service
+    echo '  <name replace-wildcards="yes">%h ZeroNet Blog</name>' >> /tmp/zeronet-blog.service
+    echo '  <service>' >> /tmp/zeronet-blog.service
+    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-blog.service
+    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-blog.service
+    echo "    <txt-record>$ZERONET_URL/$ZERONET_BLOG_ADDRESS</txt-record>" >> /tmp/zeronet-blog.service
+    echo '  </service>' >> /tmp/zeronet-blog.service
+    echo '</service-group>' >> /tmp/zeronet-blog.service
+    cp /tmp/zeronet-blog.service /etc/avahi/services/zeronet-blog.service
 
-	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
-		mkdir -p /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-	fi
-	echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myblog
+    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
+        mkdir -p /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+    fi
+    echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myblog
 
-	sed -i "s|ZeroNet Blog address.*|ZeroNet Blog address: $ZERONET_BLOG_ADDRESS|g" /home/${MY_USERNAME}/README
-	sed -i "s|ZeroNet Blog private key.*|ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Blog address.*|ZeroNet Blog address: $ZERONET_BLOG_ADDRESS|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Blog private key.*|ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 
-	if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
-		chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
-	fi
+    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
+        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
+    fi
 
-	echo $'Update of ZeroNet Blog completed' >> $INSTALL_LOG
+    echo $'Update of ZeroNet Blog completed' >> $INSTALL_LOG
 }
 
 function configure_zeronet_mail {
-	echo $'Updating ZeroNet Mail' >> $INSTALL_LOG
-	ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
+    echo $'Updating ZeroNet Mail' >> $INSTALL_LOG
+    ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
 
-	cd $MESH_INSTALL_DIR/zeronet
-	python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/mail.txt
-	if [ ! -f $MESH_INSTALL_DIR/zeronet/mail.txt ]; then
-		echo $'Unable to create ZeroNet mail' >> $INSTALL_LOG
-		exit 72574
-	fi
-	mail_address=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site address" | awk -F ':' '{print $2}')
-	mail_private_key=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site private key" | awk -F ':' '{print $2}')
-	ZERONET_MAIL_ADDRESS=${mail_address//[[:blank:]]/}
-	ZERONET_MAIL_PRIVATE_KEY=${mail_private_key//[[:blank:]]/}
+    cd $MESH_INSTALL_DIR/zeronet
+    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/mail.txt
+    if [ ! -f $MESH_INSTALL_DIR/zeronet/mail.txt ]; then
+        echo $'Unable to create ZeroNet mail' >> $INSTALL_LOG
+        exit 72574
+    fi
+    mail_address=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site address" | awk -F ':' '{print $2}')
+    mail_private_key=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site private key" | awk -F ':' '{print $2}')
+    ZERONET_MAIL_ADDRESS=${mail_address//[[:blank:]]/}
+    ZERONET_MAIL_PRIVATE_KEY=${mail_private_key//[[:blank:]]/}
 
-	if [ ${#ZERONET_MAIL_ADDRESS} -lt 20 ]; then
-		echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet mail address' >> $INSTALL_LOG
-		exit 7358
-	fi
+    if [ ${#ZERONET_MAIL_ADDRESS} -lt 20 ]; then
+        echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet mail address' >> $INSTALL_LOG
+        exit 7358
+    fi
 
-	if [ ${#ZERONET_MAIL_PRIVATE_KEY} -lt 20 ]; then
-		echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet mail private key' >> $INSTALL_LOG
-		exit 1639
-	fi
+    if [ ${#ZERONET_MAIL_PRIVATE_KEY} -lt 20 ]; then
+        echo $"Address:    $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet mail private key' >> $INSTALL_LOG
+        exit 1639
+    fi
 
-	if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" ]; then
-		echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
-		exit 7638
-	fi
+    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" ]; then
+        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
+        exit 7638
+    fi
 
-	echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
-	echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
-	cp -r $MESH_INSTALL_DIR/zeronet/ZeroMail/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS
+    echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS" >> $INSTALL_LOG
+    echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> $INSTALL_LOG
+    cp -r $MESH_INSTALL_DIR/zeronet/ZeroMail/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS
 
-	if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data ]; then
-		mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
-	fi
-	cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
-	sed -i "s/MyZeroMail/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
-	sed -i "s/My ZeroMail./$ZERONET_DEFAULT_MAIL_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
-	sed -i "s/ZeroMail Demo/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
-	sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_MAIL_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
-	sed -i "s/Mailging platform Demo/Mailging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/content.json
-	python zeronet.py siteSign $ZERONET_MAIL_ADDRESS $ZERONET_MAIL_PRIVATE_KEY
+    if [ ! -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data ]; then
+        mkdir $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
+    fi
+    cp $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data-default/data.json $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data
+    sed -i "s/MyZeroMail/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
+    sed -i "s/My ZeroMail./$ZERONET_DEFAULT_MAIL_TAGLINE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/data.json
+    sed -i "s/ZeroMail Demo/$ZERONET_DEFAULT_MAIL_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
+    sed -i "s|<h3 class=\"description\">.*|<h3 class=\"description\">$ZERONET_DEFAULT_MAIL_TAGLINE</h3>|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/index.html
+    sed -i "s/Mailging platform Demo/Mailging platform/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/content.json
+    python zeronet.py siteSign $ZERONET_MAIL_ADDRESS $ZERONET_MAIL_PRIVATE_KEY
 
-	# Add an avahi service
-	echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-mail.service
-	echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-mail.service
-	echo '<service-group>' >> /tmp/zeronet-mail.service
-	echo '  <name replace-wildcards="yes">%h ZeroNet Mail</name>' >> /tmp/zeronet-mail.service
-	echo '  <service>' >> /tmp/zeronet-mail.service
-	echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-mail.service
-	echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-mail.service
-	echo "    <txt-record>$ZERONET_URL/$ZERONET_MAIL_ADDRESS</txt-record>" >> /tmp/zeronet-mail.service
-	echo '  </service>' >> /tmp/zeronet-mail.service
-	echo '</service-group>' >> /tmp/zeronet-mail.service
-	cp /tmp/zeronet-mail.service /etc/avahi/services/zeronet-mail.service
+    # Add an avahi service
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-mail.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-mail.service
+    echo '<service-group>' >> /tmp/zeronet-mail.service
+    echo '  <name replace-wildcards="yes">%h ZeroNet Mail</name>' >> /tmp/zeronet-mail.service
+    echo '  <service>' >> /tmp/zeronet-mail.service
+    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-mail.service
+    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-mail.service
+    echo "    <txt-record>$ZERONET_URL/$ZERONET_MAIL_ADDRESS</txt-record>" >> /tmp/zeronet-mail.service
+    echo '  </service>' >> /tmp/zeronet-mail.service
+    echo '</service-group>' >> /tmp/zeronet-mail.service
+    cp /tmp/zeronet-mail.service /etc/avahi/services/zeronet-mail.service
 
-	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
-		mkdir -p /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-	fi
-	echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/mymail
+    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
+        mkdir -p /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+    fi
+    echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/mymail
 
-	sed -i "s|ZeroNet Mail address.*|ZeroNet Mail address: $ZERONET_MAIL_ADDRESS|g" /home/${MY_USERNAME}/README
-	sed -i "s|ZeroNet Mail private key.*|ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Mail address.*|ZeroNet Mail address: $ZERONET_MAIL_ADDRESS|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Mail private key.*|ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 
-	if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
-		chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
-	fi
+    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
+        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
+    fi
 
-	echo $'Update of ZeroNet Mail completed' >> $INSTALL_LOG
+    echo $'Update of ZeroNet Mail completed' >> $INSTALL_LOG
 }
 
 function configure_zeronet_forum {
-	echo $'Updating ZeroNet Forum' >> $INSTALL_LOG
-	ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
+    echo $'Updating ZeroNet Forum' >> $INSTALL_LOG
+    ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
 
-	cd $MESH_INSTALL_DIR/zeronet
-	python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/forum.txt
-	if [ ! -f $MESH_INSTALL_DIR/zeronet/forum.txt ]; then
-		echo $'Unable to create ZeroNet forum' >> $INSTALL_LOG
-		exit 47962
-	fi
-	forum_address=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site address" | awk -F ':' '{print $2}')
-	forum_private_key=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site private key" | awk -F ':' '{print $2}')
-	ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/}
-	ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
+    cd $MESH_INSTALL_DIR/zeronet
+    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/forum.txt
+    if [ ! -f $MESH_INSTALL_DIR/zeronet/forum.txt ]; then
+        echo $'Unable to create ZeroNet forum' >> $INSTALL_LOG
+        exit 47962
+    fi
+    forum_address=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site address" | awk -F ':' '{print $2}')
+    forum_private_key=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site private key" | awk -F ':' '{print $2}')
+    ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/}
+    ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
 
-	if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
-		echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet forum address' >> $INSTALL_LOG
-		exit 76352
-	fi
+    if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
+        echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet forum address' >> $INSTALL_LOG
+        exit 76352
+    fi
 
-	if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
-		echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create zeronet forum private key' >> $INSTALL_LOG
-		exit 87356
-	fi
+    if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
+        echo $"Address:    $ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create zeronet forum private key' >> $INSTALL_LOG
+        exit 87356
+    fi
 
-	if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" ]; then
-		echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
-		exit 7638
-	fi
+    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" ]; then
+        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS" >> $INSTALL_LOG
+        exit 7638
+    fi
 
-	echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
-	echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
-	cp -r $MESH_INSTALL_DIR/zeronet/ZeroTalk/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS
-	sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
-	sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
-	sed -i "s|Demo for dynamic, decentralized content publishing.|$ZERONET_DEFAULT_FORUM_TAGLINE|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
-	sed -i 's/Messaging Board Demo/Messaging Board/g' $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
-	sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
-	python zeronet.py siteSign $ZERONET_FORUM_ADDRESS $ZERONET_FORUM_PRIVATE_KEY --inner_path data/users/content.json
+    echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
+    echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
+    cp -r $MESH_INSTALL_DIR/zeronet/ZeroTalk/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS
+    sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
+    sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
+    sed -i "s|Demo for dynamic, decentralized content publishing.|$ZERONET_DEFAULT_FORUM_TAGLINE|g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
+    sed -i 's/Messaging Board Demo/Messaging Board/g' $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
+    sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/content.json
+    python zeronet.py siteSign $ZERONET_FORUM_ADDRESS $ZERONET_FORUM_PRIVATE_KEY --inner_path data/users/content.json
 
-	# Add an avahi service
-	echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-forum.service
-	echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-forum.service
-	echo '<service-group>' >> /tmp/zeronet-forum.service
-	echo '  <name replace-wildcards="yes">%h ZeroNet Forum</name>' >> /tmp/zeronet-forum.service
-	echo '  <service>' >> /tmp/zeronet-forum.service
-	echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-forum.service
-	echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-forum.service
-	echo "    <txt-record>$ZERONET_URL/$ZERONET_FORUM_ADDRESS</txt-record>" >> /tmp/zeronet-forum.service
-	echo '  </service>' >> /tmp/zeronet-forum.service
-	echo '</service-group>' >> /tmp/zeronet-forum.service
-	sudo cp /tmp/zeronet-forum.service /etc/avahi/services/zeronet-forum.service
+    # Add an avahi service
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-forum.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-forum.service
+    echo '<service-group>' >> /tmp/zeronet-forum.service
+    echo '  <name replace-wildcards="yes">%h ZeroNet Forum</name>' >> /tmp/zeronet-forum.service
+    echo '  <service>' >> /tmp/zeronet-forum.service
+    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-forum.service
+    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-forum.service
+    echo "    <txt-record>$ZERONET_URL/$ZERONET_FORUM_ADDRESS</txt-record>" >> /tmp/zeronet-forum.service
+    echo '  </service>' >> /tmp/zeronet-forum.service
+    echo '</service-group>' >> /tmp/zeronet-forum.service
+    sudo cp /tmp/zeronet-forum.service /etc/avahi/services/zeronet-forum.service
 
-	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
-		mkdir -p /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-	fi
-	echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myforum
+    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
+        mkdir -p /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+    fi
+    echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myforum
 
-	sed -i "s|ZeroNet Forum address.*|ZeroNet Forum address: $ZERONET_FORUM_ADDRESS|g" /home/${MY_USERNAME}/README
-	sed -i "s|ZeroNet Forum private key.*|ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Forum address.*|ZeroNet Forum address: $ZERONET_FORUM_ADDRESS|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroNet Forum private key.*|ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 
-	if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
-		chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
-	fi
+    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
+        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
+    fi
 
-	echo $'Update of ZeroNet Forum completed' >> $INSTALL_LOG
+    echo $'Update of ZeroNet Forum completed' >> $INSTALL_LOG
 }
 
 function configure_zeronet_id {
-	echo $'Updating ZeroID' >> $INSTALL_LOG
+    echo $'Updating ZeroID' >> $INSTALL_LOG
 
-	cd $MESH_INSTALL_DIR/zeronet
-	python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/zeroid.txt
-	if [ ! -f $MESH_INSTALL_DIR/zeronet/zeroid.txt ]; then
-		echo $'Unable to create ZeroID' >> $INSTALL_LOG
-		exit 47962
-	fi
-	zeroid_address=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site address" | awk -F ':' '{print $2}')
-	zeroid_private_key=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site private key" | awk -F ':' '{print $2}')
-	ZERONET_ID_ADDRESS=${zeroid_address//[[:blank:]]/}
-	ZERONET_ID_PRIVATE_KEY=${zeroid_private_key//[[:blank:]]/}
+    cd $MESH_INSTALL_DIR/zeronet
+    python zeronet.py --batch siteCreate 2> $MESH_INSTALL_DIR/zeronet/zeroid.txt
+    if [ ! -f $MESH_INSTALL_DIR/zeronet/zeroid.txt ]; then
+        echo $'Unable to create ZeroID' >> $INSTALL_LOG
+        exit 47962
+    fi
+    zeroid_address=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site address" | awk -F ':' '{print $2}')
+    zeroid_private_key=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site private key" | awk -F ':' '{print $2}')
+    ZERONET_ID_ADDRESS=${zeroid_address//[[:blank:]]/}
+    ZERONET_ID_PRIVATE_KEY=${zeroid_private_key//[[:blank:]]/}
 
-	if [ ${#ZERONET_ID_ADDRESS} -lt 20 ]; then
-		echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create ZeroID address' >> $INSTALL_LOG
-		exit 76352
-	fi
+    if [ ${#ZERONET_ID_ADDRESS} -lt 20 ]; then
+        echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create ZeroID address' >> $INSTALL_LOG
+        exit 76352
+    fi
 
-	if [ ${#ZERONET_ID_PRIVATE_KEY} -lt 20 ]; then
-		echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
-		echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
-		echo $'Unable to create ZeroID private key' >> $INSTALL_LOG
-		exit 87356
-	fi
+    if [ ${#ZERONET_ID_PRIVATE_KEY} -lt 20 ]; then
+        echo $"Address:    $ZERONET_ID_ADDRESS" >> $INSTALL_LOG
+        echo $"Public key: $ZERONET_ID_PRIVATE_KEY" >> $INSTALL_LOG
+        echo $'Unable to create ZeroID private key' >> $INSTALL_LOG
+        exit 87356
+    fi
 
-	if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" ]; then
-		echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" >> $INSTALL_LOG
-		exit 378434
-	fi
+    if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" ]; then
+        echo $"Unable to find site directory: $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS" >> $INSTALL_LOG
+        exit 378434
+    fi
 
-	echo $"ZeroID address:     $ZERONET_ID_ADDRESS"
-	echo $"ZeroID private key: $ZERONET_ID_PRIVATE_KEY"
-	cp -r $MESH_INSTALL_DIR/zeronet/ZeroID/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS
-	# TODO
-	sed -i "s///g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS/content.json
-	python zeronet.py siteSign $ZERONET_ID_ADDRESS $ZERONET_ID_PRIVATE_KEY --inner_path data/users/content.json
+    echo $"ZeroID address:     $ZERONET_ID_ADDRESS"
+    echo $"ZeroID private key: $ZERONET_ID_PRIVATE_KEY"
+    cp -r $MESH_INSTALL_DIR/zeronet/ZeroID/* $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS
+    # TODO
+    sed -i "s///g" $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS/content.json
+    python zeronet.py siteSign $ZERONET_ID_ADDRESS $ZERONET_ID_PRIVATE_KEY --inner_path data/users/content.json
 
-	# Add an avahi service
-	echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-id.service
-	echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-id.service
-	echo '<service-group>' >> /tmp/zeronet-id.service
-	echo '  <name replace-wildcards="yes">%h ZeroNet ID Service</name>' >> /tmp/zeronet-id.service
-	echo '  <service>' >> /tmp/zeronet-id.service
-	echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-id.service
-	echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-id.service
-	echo "    <txt-record>$ZERONET_URL/$ZERONET_ID_ADDRESS</txt-record>" >> /tmp/zeronet-id.service
-	echo '  </service>' >> /tmp/zeronet-id.service
-	echo '</service-group>' >> /tmp/zeronet-id.service
-	sudo cp /tmp/zeronet-id.service /etc/avahi/services/zeronet-id.service
+    # Add an avahi service
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /tmp/zeronet-id.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /tmp/zeronet-id.service
+    echo '<service-group>' >> /tmp/zeronet-id.service
+    echo '  <name replace-wildcards="yes">%h ZeroNet ID Service</name>' >> /tmp/zeronet-id.service
+    echo '  <service>' >> /tmp/zeronet-id.service
+    echo '    <type>_zeronet._udp</type>' >> /tmp/zeronet-id.service
+    echo "    <port>$ZERONET_PORT</port>" >> /tmp/zeronet-id.service
+    echo "    <txt-record>$ZERONET_URL/$ZERONET_ID_ADDRESS</txt-record>" >> /tmp/zeronet-id.service
+    echo '  </service>' >> /tmp/zeronet-id.service
+    echo '</service-group>' >> /tmp/zeronet-id.service
+    sudo cp /tmp/zeronet-id.service /etc/avahi/services/zeronet-id.service
 
-	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
-		mkdir -p /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-	fi
-	echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myzeroid
+    if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
+        mkdir -p /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+    fi
+    echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myzeroid
 
-	sed -i "s|ZeroID address.*|ZeroID address: $ZERONET_ID_ADDRESS|g" /home/${MY_USERNAME}/README
-	sed -i "s|ZeroID private key.*|ZeroID private key: $ZERONET_ID_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroID address.*|ZeroID address: $ZERONET_ID_ADDRESS|g" /home/${MY_USERNAME}/README
+    sed -i "s|ZeroID private key.*|ZeroID private key: $ZERONET_ID_PRIVATE_KEY|g" /home/${MY_USERNAME}/README
 
-	if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
-		chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
-	fi
+    if [ -d ${MESH_INSTALL_DIR}/zeronet ]; then
+        chown -R zeronet:zeronet ${MESH_INSTALL_DIR}/zeronet
+    fi
 
-	echo $'Update of ZeroID completed' >> $INSTALL_LOG
+    echo $'Update of ZeroID completed' >> $INSTALL_LOG
 }
 
 function configure_toxcore {
-	echo $'Configuring toxcore' >> $INSTALL_LOG
+    echo $'Configuring toxcore' >> $INSTALL_LOG
 
-	TOXIC_FILE=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
+    TOXIC_FILE=$(cat /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
 
-	if [ -f $MESH_AMNESIC ]; then
-		# change to the amnesic mount
-		sed -i 's|/var/lib/tox-bootstrapd|/media/tox-bootstrapd|g' /etc/tox-bootstrapd.conf
-		systemctl stop tox-bootstrapd.service
-		sed -i 's|WorkingDirectory=.*|WorkingDirectory=/media/tox-bootstrapd|g' /etc/systemd/system/tox-bootstrapd.service
-		systemctl daemon-reload
-		userdel -r tox-bootstrapd
-		useradd --home-dir /media/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
-		chmod 700 /media/tox-bootstrapd
-	fi
+    if [ -f $MESH_AMNESIC ]; then
+        # change to the amnesic mount
+        sed -i 's|/var/lib/tox-bootstrapd|/media/tox-bootstrapd|g' /etc/tox-bootstrapd.conf
+        systemctl stop tox-bootstrapd.service
+        sed -i 's|WorkingDirectory=.*|WorkingDirectory=/media/tox-bootstrapd|g' /etc/systemd/system/tox-bootstrapd.service
+        systemctl daemon-reload
+        userdel -r tox-bootstrapd
+        useradd --home-dir /media/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
+        chmod 700 /media/tox-bootstrapd
+    fi
 
-	echo $'Enabling toxcore daemon' >> $INSTALL_LOG
-	systemctl enable tox-bootstrapd.service
+    echo $'Enabling toxcore daemon' >> $INSTALL_LOG
+    systemctl enable tox-bootstrapd.service
 
-	echo $'Regenerating Tox bootstrap node keys' >> $INSTALL_LOG
-	systemctl stop tox-bootstrapd.service
-	if [ -f /var/lib/tox-bootstrapd/keys ]; then
-		rm /var/lib/tox-bootstrapd/keys
-	fi
-	systemctl start tox-bootstrapd.service
-	# sleep for a while so that the tox keys can be generated
-	sleep 30
-	TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
-	if [ -f $MESH_AMNESIC ]; then
-		TOX_BOOTSTRAP_ID_FILE=/media/tox-bootstrapd/pubkey.txt
-	fi
-	TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
-	if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
-		echo $'WARNING: Could not obtain the tox node public key' >> $INSTALL_LOG
-		exit 46362
-	fi
+    echo $'Regenerating Tox bootstrap node keys' >> $INSTALL_LOG
+    systemctl stop tox-bootstrapd.service
+    if [ -f /var/lib/tox-bootstrapd/keys ]; then
+        rm /var/lib/tox-bootstrapd/keys
+    fi
+    systemctl start tox-bootstrapd.service
+    # sleep for a while so that the tox keys can be generated
+    sleep 30
+    TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
+    if [ -f $MESH_AMNESIC ]; then
+        TOX_BOOTSTRAP_ID_FILE=/media/tox-bootstrapd/pubkey.txt
+    fi
+    TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
+    if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
+        echo $'WARNING: Could not obtain the tox node public key' >> $INSTALL_LOG
+        exit 46362
+    fi
 
-	# save the public key for later reference
-	echo "$TOX_PUBLIC_KEY" > $TOX_BOOTSTRAP_ID_FILE
-	echo $'Configured toxcore' >> $INSTALL_LOG
+    # save the public key for later reference
+    echo "$TOX_PUBLIC_KEY" > $TOX_BOOTSTRAP_ID_FILE
+    echo $'Configured toxcore' >> $INSTALL_LOG
 }
 
 function create_tox_user {
-	if [ ! -f /home/${MY_USERNAME}/.config/tox/data.tox ]; then
-		toxid -u $MY_USERNAME -n data
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/tox
-	fi
+    if [ ! -f /home/${MY_USERNAME}/.config/tox/data.tox ]; then
+        toxid -u $MY_USERNAME -n data
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/tox
+    fi
 
-	if [ ! -d /home/$MY_USERNAME/Desktop ]; then
-		return
-	fi
+    if [ ! -d /home/$MY_USERNAME/Desktop ]; then
+        return
+    fi
 
-	echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'Comment=Chat, VoIP, Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'Icon=qtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
-	echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
+    echo 'Name=Tox Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo 'Comment=Chat, VoIP, Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo "Exec=bash -c 'qtox -p data'" >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo 'Icon=qtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
 
-	chmod +x /home/$MY_USERNAME/Desktop/*
-	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
+    chmod +x /home/$MY_USERNAME/Desktop/*
+    chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
 }
 
 function show_desktop_icons {
-	if [ ! -d /home/$MY_USERNAME/Desktop ]; then
-		return
-	fi
+    if [ ! -d /home/$MY_USERNAME/Desktop ]; then
+        return
+    fi
 
-	echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'Comment=Browse the mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'TryExec=meshweb' >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'Exec=meshweb' >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/mesh.desktop
-	echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/users.desktop
+    echo 'Name=Users' >> /home/$MY_USERNAME/Desktop/users.desktop
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/users.desktop
+    echo 'Comment=Users on the system' >> /home/$MY_USERNAME/Desktop/users.desktop
+    echo "Exec=$BROWSER $TOX_USERS_FILE" >> /home/$MY_USERNAME/Desktop/users.desktop
+    echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/users.desktop
+    echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/users.desktop
 
-	echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Exec=mate-terminal -e freedombone-mesh-reset' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Icon=user-away' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
-	echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'Name=Mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'Comment=Browse the mesh' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'TryExec=meshweb' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'Exec=meshweb' >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo "Icon=$BROWSER" >> /home/$MY_USERNAME/Desktop/mesh.desktop
+    #echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/mesh.desktop
 
-	# set permissions
-	chmod +x /home/$MY_USERNAME/Desktop/*
-	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
-	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
-	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/tox
-	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/zeronet
-	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
-	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
+    echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Exec=mate-terminal -e freedombone-mesh-reset' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Icon=user-away' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
+    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
 
-	# restart caja
-	killall caja
+    # set permissions
+    chmod +x /home/$MY_USERNAME/Desktop/*
+    chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
+    chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
+    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/tox
+    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/zeronet
+    chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
+    chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
+
+    # restart caja
+    killall caja
 }
 
 function disable_password_logins {
-	if [ ! -d /home/$DEFAULT_USERNAME ]; then
-		echo $"Home directory for $DEFAULT_USERNAME not found"
-		exit 3682572
-	fi
+    if [ ! -d /home/$DEFAULT_USERNAME ]; then
+        echo $"Home directory for $DEFAULT_USERNAME not found"
+        exit 3682572
+    fi
 
-	# create an authorized_keys file
-	if [ ! -d /home/$DEFAULT_USERNAME/.ssh ]; then
-		mkdir -p /home/$DEFAULT_USERNAME/.ssh
-	fi
-	if [ ! -f /home/$DEFAULT_USERNAME/.ssh/authorized_keys ]; then
-		touch /home/$DEFAULT_USERNAME/.ssh/authorized_keys
-	fi
-	chown -R $DEFAULT_USERNAME:$DEFAULT_USERNAME /home/$DEFAULT_USERNAME/.ssh
+    # create an authorized_keys file
+    if [ ! -d /home/$DEFAULT_USERNAME/.ssh ]; then
+        mkdir -p /home/$DEFAULT_USERNAME/.ssh
+    fi
+    if [ ! -f /home/$DEFAULT_USERNAME/.ssh/authorized_keys ]; then
+        touch /home/$DEFAULT_USERNAME/.ssh/authorized_keys
+    fi
+    chown -R $DEFAULT_USERNAME:$DEFAULT_USERNAME /home/$DEFAULT_USERNAME/.ssh
 
-	# disable password logins
-	sed -i 's|#PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
-	sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
+    # disable password logins
+    sed -i 's|#PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
+    sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
 }
 
 function enable_batman_daemon {
-	systemctl enable batman
-	systemctl daemon-reload
+    systemctl enable batman
+    systemctl daemon-reload
 }
 
 function mesh_amnesic {
-	if [ ! -f $MESH_AMNESIC ]; then
-		return
-	fi
+    if [ ! -f $MESH_AMNESIC ]; then
+        return
+    fi
 
-	echo '#!/bin/bash' > /usr/bin/amnesic
-	echo '' >> /usr/bin/amnesic
-	echo 'MY_USERNAME=$1' >> /usr/bin/amnesic
-	echo 'tomb slam all' >> /usr/bin/amnesic
-	echo "if [ -f /home/${MY_USERNAME}/.bash_history ]; then" >> /usr/bin/amnesic
-	echo "    shred -zu /home/${MY_USERNAME}/.bash_history" >> /usr/bin/amnesic
-	echo 'fi' >> /usr/bin/amnesic
-	echo "if [ -f /home/${MY_USERNAME}/.ssh/authorized_keys ]; then" >> /usr/bin/amnesic
-	echo "    shred -zu /home/${MY_USERNAME}/.ssh/authorized_keys" >> /usr/bin/amnesic
-	echo "    echo '' > /home/${MY_USERNAME}/.ssh/authorized_keys" >> /usr/bin/amnesic
-	echo 'fi' >> /usr/bin/amnesic
-	echo "if [ -f /home/${MY_USERNAME}/.xsession-errors ]; then" >> /usr/bin/amnesic
-	echo "    shred -zu /home/${MY_USERNAME}/.xsession-errors" >> /usr/bin/amnesic
-	echo 'fi' >> /usr/bin/amnesic
-	echo '' >> /usr/bin/amnesic
-	echo 'exit 0' >> /usr/bin/amnesic
-	chmod +x /usr/bin/amnesic
+    echo '#!/bin/bash' > /usr/bin/amnesic
+    echo '' >> /usr/bin/amnesic
+    echo 'MY_USERNAME=$1' >> /usr/bin/amnesic
+    echo 'tomb slam all' >> /usr/bin/amnesic
+    echo "if [ -f /home/${MY_USERNAME}/.bash_history ]; then" >> /usr/bin/amnesic
+    echo "    shred -zu /home/${MY_USERNAME}/.bash_history" >> /usr/bin/amnesic
+    echo 'fi' >> /usr/bin/amnesic
+    echo "if [ -f /home/${MY_USERNAME}/.ssh/authorized_keys ]; then" >> /usr/bin/amnesic
+    echo "    shred -zu /home/${MY_USERNAME}/.ssh/authorized_keys" >> /usr/bin/amnesic
+    echo "    echo '' > /home/${MY_USERNAME}/.ssh/authorized_keys" >> /usr/bin/amnesic
+    echo 'fi' >> /usr/bin/amnesic
+    echo "if [ -f /home/${MY_USERNAME}/.xsession-errors ]; then" >> /usr/bin/amnesic
+    echo "    shred -zu /home/${MY_USERNAME}/.xsession-errors" >> /usr/bin/amnesic
+    echo 'fi' >> /usr/bin/amnesic
+    echo '' >> /usr/bin/amnesic
+    echo 'exit 0' >> /usr/bin/amnesic
+    chmod +x /usr/bin/amnesic
 
-	if [ ! -f /etc/systemd/system/amnesic.service ]; then
-		echo '[Unit]' > /etc/systemd/system/amnesic.service
-		echo 'Description=Amnesic Mesh' >> /etc/systemd/system/amnesic.service
-		echo '' >> /etc/systemd/system/amnesic.service
-		echo '[Service]' >> /etc/systemd/system/amnesic.service
-		echo 'User=root' >> /etc/systemd/system/amnesic.service
-		echo 'Group=root' >> /etc/systemd/system/amnesic.service
-		echo 'Type=oneshot' >> /etc/systemd/system/amnesic.service
-		echo 'RemainAfterExit=true' >> /etc/systemd/system/amnesic.service
-		echo 'ExecStart=/bin/true' >> /etc/systemd/system/amnesic.service
-		echo "ExecStop=/usr/bin/amnesic $MY_USERNAME" >> /etc/systemd/system/amnesic.service
-		echo '' >> /etc/systemd/system/amnesic.service
-		echo '[Install]' >> /etc/systemd/system/amnesic.service
-		echo 'WantedBy=multi-user.target' >> /etc/systemd/system/amnesic.service
+    if [ ! -f /etc/systemd/system/amnesic.service ]; then
+        echo '[Unit]' > /etc/systemd/system/amnesic.service
+        echo 'Description=Amnesic Mesh' >> /etc/systemd/system/amnesic.service
+        echo '' >> /etc/systemd/system/amnesic.service
+        echo '[Service]' >> /etc/systemd/system/amnesic.service
+        echo 'User=root' >> /etc/systemd/system/amnesic.service
+        echo 'Group=root' >> /etc/systemd/system/amnesic.service
+        echo 'Type=oneshot' >> /etc/systemd/system/amnesic.service
+        echo 'RemainAfterExit=true' >> /etc/systemd/system/amnesic.service
+        echo 'ExecStart=/bin/true' >> /etc/systemd/system/amnesic.service
+        echo "ExecStop=/usr/bin/amnesic $MY_USERNAME" >> /etc/systemd/system/amnesic.service
+        echo '' >> /etc/systemd/system/amnesic.service
+        echo '[Install]' >> /etc/systemd/system/amnesic.service
+        echo 'WantedBy=multi-user.target' >> /etc/systemd/system/amnesic.service
 
-		systemctl daemon-reload
-	fi
-	systemctl enable amnesic
-	systemctl start amnesic
+        systemctl daemon-reload
+    fi
+    systemctl enable amnesic
+    systemctl start amnesic
 }
 
 function mesh_restart_daemons {
-	systemctl restart avahi-daemon
-	systemctl restart ssh
-	systemctl restart tox-bootstrapd
-	systemctl restart zeronet
-	echo $'Daemons restarted' >> $INSTALL_LOG
+    systemctl restart avahi-daemon
+    systemctl restart ssh
+    systemctl restart tox-bootstrapd
+    systemctl restart zeronet
+    echo $'Daemons restarted' >> $INSTALL_LOG
 }
 
 function create_tomb {
-	tomb_name=$1
-	tomb_size=$2
+    tomb_name=$1
+    tomb_size=$2
 
-	if [ -f /tmp/${tomb_name}.tomb ]; then
-		tomb slam /tmp/${tomb_name}.tomb
-	fi
+    if [ -f /tmp/${tomb_name}.tomb ]; then
+        tomb slam /tmp/${tomb_name}.tomb
+    fi
 
-	# make a temporary password
-	tomb dig -s ${tomb_size} /tmp/${tomb_name}.tomb
-	if [ ! -f /tmp/${tomb_name}.tomb ]; then
-		echo "WARNING: ${tomb_name} tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
-		tomb >> /var/log/${PROJECT_NAME}.log
-	fi
-	TOMB_TEMP_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
-	tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
-	tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
-	tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
-	# stop stuff from popping up
-	pkill caja
+    # make a temporary password
+    tomb dig -s ${tomb_size} /tmp/${tomb_name}.tomb
+    if [ ! -f /tmp/${tomb_name}.tomb ]; then
+        echo "WARNING: ${tomb_name} tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
+        tomb >> /var/log/${PROJECT_NAME}.log
+    fi
+    TOMB_TEMP_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
+    tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
+    tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
+    tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
+    # stop stuff from popping up
+    pkill caja
 
-	# clear the temporary password
-	TOMB_TEMP_PASSWORD=
+    # clear the temporary password
+    TOMB_TEMP_PASSWORD=
 }
 
 function setup_amnesic_data {
-	if [ ! -f $MESH_AMNESIC ]; then
-		return
-	fi
-	if [ ! -d /mnt/ramdisk ]; then
-		return
-	fi
+    if [ ! -f $MESH_AMNESIC ]; then
+        return
+    fi
+    if [ ! -d /mnt/ramdisk ]; then
+        return
+    fi
 
-	# clear crypttab
-	if [ -f /etc/crypttab ]; then
-		shred -zu /etc/crypttab
-		touch /etc/crypttab
-	fi
+    # clear crypttab
+    if [ -f /etc/crypttab ]; then
+        shred -zu /etc/crypttab
+        touch /etc/crypttab
+    fi
 
-	tomb_name=log
-	create_tomb ${tomb_name} $TOMB_LOG_SIZE_MB
-	if [ -d /media/${tomb_name} ]; then
-		if [ -d /var/log ]; then
-			if [ ! -d /var/log_base ]; then
-				mv /var/log /var/log_base
-			fi
-		fi
-		ln -s /media/${tomb_name} /var/log
-		if [ -d /var/log_base ]; then
-			cp -rp /var/log_base/* /media/${tomb_name}
-		fi
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
-	else
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
-	fi
+    tomb_name=log
+    create_tomb ${tomb_name} $TOMB_LOG_SIZE_MB
+    if [ -d /media/${tomb_name} ]; then
+        if [ -d /var/log ]; then
+            if [ ! -d /var/log_base ]; then
+                mv /var/log /var/log_base
+            fi
+        fi
+        ln -s /media/${tomb_name} /var/log
+        if [ -d /var/log_base ]; then
+            cp -rp /var/log_base/* /media/${tomb_name}
+        fi
+        echo "${tomb_name} tomb created" >> $INSTALL_LOG
+    else
+        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
+    fi
 
-	tomb_name=tox-bootstrapd
-	if [ -f /etc/systemd/system/${tomb_name}.service ]; then
-		systemctl stop ${tomb_name}
-	fi
-	create_tomb ${tomb_name} $TOMB_TOX_BOOTSTRAP_SIZE_MB
-	if [ -d /media/${tomb_name} ]; then
-		if [ -d /var/lib/tox-bootstrapd ]; then
-			if [ ! -d /var/lib/tox-bootstrapd_base ]; then
-				mv /var/lib/tox-bootstrapd /var/lib/tox-bootstrapd_base
-			fi
-		fi
-		if [ -d /var/lib/tox-bootstrapd ]; then
-			shred -zu /var/lib/tox-bootstrapd/*
-			rm -rf /var/lib/tox-bootstrapd
-		fi
-		ln -s /media/${tomb_name} /var/lib/tox-bootstrapd
-		if [ -d /var/lib/tox-bootstrapd_base ]; then
-			cp -rp /var/lib/tox-bootstrapd_base/* /media/${tomb_name}
-		fi
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
-	else
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
-	fi
+    tomb_name=tox-bootstrapd
+    if [ -f /etc/systemd/system/${tomb_name}.service ]; then
+        systemctl stop ${tomb_name}
+    fi
+    create_tomb ${tomb_name} $TOMB_TOX_BOOTSTRAP_SIZE_MB
+    if [ -d /media/${tomb_name} ]; then
+        if [ -d /var/lib/tox-bootstrapd ]; then
+            if [ ! -d /var/lib/tox-bootstrapd_base ]; then
+                mv /var/lib/tox-bootstrapd /var/lib/tox-bootstrapd_base
+            fi
+        fi
+        if [ -d /var/lib/tox-bootstrapd ]; then
+            shred -zu /var/lib/tox-bootstrapd/*
+            rm -rf /var/lib/tox-bootstrapd
+        fi
+        ln -s /media/${tomb_name} /var/lib/tox-bootstrapd
+        if [ -d /var/lib/tox-bootstrapd_base ]; then
+            cp -rp /var/lib/tox-bootstrapd_base/* /media/${tomb_name}
+        fi
+        echo "${tomb_name} tomb created" >> $INSTALL_LOG
+    else
+        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
+    fi
 
-	tomb_name=tox
-	create_tomb ${tomb_name} $TOMB_TOX_SIZE_MB
-	if [ -d /media/${tomb_name} ]; then
-		if [ ! -d /home/${MY_USERNAME}/.config ]; then
-			mkdir -p /home/${MY_USERNAME}/.config
-			chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-		fi
-		if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
-			rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
-		fi
-		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/${tomb_name}
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/${tomb_name}
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
-	else
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
-	fi
+    tomb_name=tox
+    create_tomb ${tomb_name} $TOMB_TOX_SIZE_MB
+    if [ -d /media/${tomb_name} ]; then
+        if [ ! -d /home/${MY_USERNAME}/.config ]; then
+            mkdir -p /home/${MY_USERNAME}/.config
+            chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+        fi
+        if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
+            rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
+        fi
+        ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/${tomb_name}
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/${tomb_name}
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
+        echo "${tomb_name} tomb created" >> $INSTALL_LOG
+    else
+        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
+    fi
 
-	tomb_name=zeronet-config
-	create_tomb ${tomb_name} $TOMB_ZERONET_CONFIG_SIZE_MB
-	if [ -d /media/${tomb_name} ]; then
-		if [ ! -d /home/${MY_USERNAME}/.config ]; then
-			mkdir -p /home/${MY_USERNAME}/.config
-			chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
-		fi
-		if [ -d /home/${MY_USERNAME}/.config/zeronet ]; then
-			rm -rf /home/${MY_USERNAME}/.config/zeronet
-		fi
-		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
-	else
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
-	fi
+    tomb_name=zeronet-config
+    create_tomb ${tomb_name} $TOMB_ZERONET_CONFIG_SIZE_MB
+    if [ -d /media/${tomb_name} ]; then
+        if [ ! -d /home/${MY_USERNAME}/.config ]; then
+            mkdir -p /home/${MY_USERNAME}/.config
+            chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
+        fi
+        if [ -d /home/${MY_USERNAME}/.config/zeronet ]; then
+            rm -rf /home/${MY_USERNAME}/.config/zeronet
+        fi
+        ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
+        chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
+        echo "${tomb_name} tomb created" >> $INSTALL_LOG
+    else
+        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
+    fi
 
-	tomb_name=zeronet-data
-	create_tomb ${tomb_name} $TOMB_ZERONET_DATA_SIZE_MB
-	if [ -d /media/${tomb_name} ]; then
-		if [ -d /var/lib/zeronet ]; then
-			if [ ! -d /var/lib/zeronet_base ]; then
-				mv /var/lib/zeronet /var/lib/zeronet_base
-			fi
-		fi
-		ln -s /media/${tomb_name} /var/lib/zeronet
-		if [ -d /var/lib/zeronet_base ]; then
-			cp -rp /var/lib/zeronet_base/* /media/${tomb_name}
-		fi
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
-	else
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
-	fi
+    tomb_name=zeronet-data
+    create_tomb ${tomb_name} $TOMB_ZERONET_DATA_SIZE_MB
+    if [ -d /media/${tomb_name} ]; then
+        if [ -d /var/lib/zeronet ]; then
+            if [ ! -d /var/lib/zeronet_base ]; then
+                mv /var/lib/zeronet /var/lib/zeronet_base
+            fi
+        fi
+        ln -s /media/${tomb_name} /var/lib/zeronet
+        if [ -d /var/lib/zeronet_base ]; then
+            cp -rp /var/lib/zeronet_base/* /media/${tomb_name}
+        fi
+        echo "${tomb_name} tomb created" >> $INSTALL_LOG
+    else
+        echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
+    fi
 }
 
 # whether to reset the identity
 set_new_identity=
 if [ $2 ]; then
-	if [[ "$2" == $"new"* ]]; then
-		if [ ! -f $MESH_INSTALL_SETUP ]; then
-			touch $MESH_INSTALL_SETUP
-		fi
-		set_new_identity=1
-	fi
-	if [[ "$2" == $"amnesic"* ]]; then
-		if [ ! -f $MESH_AMNESIC ]; then
-			touch $MESH_AMNESIC
-		fi
-		if [ ! -f $MESH_INSTALL_SETUP ]; then
-			touch $MESH_INSTALL_SETUP
-		fi
-		set_new_identity=1
-	fi
+    if [[ "$2" == $"new"* ]]; then
+        if [ ! -f $MESH_INSTALL_SETUP ]; then
+            touch $MESH_INSTALL_SETUP
+        fi
+        set_new_identity=1
+    fi
+    if [[ "$2" == $"amnesic"* ]]; then
+        if [ ! -f $MESH_AMNESIC ]; then
+            touch $MESH_AMNESIC
+        fi
+        if [ ! -f $MESH_INSTALL_SETUP ]; then
+            touch $MESH_INSTALL_SETUP
+        fi
+        set_new_identity=1
+    fi
 fi
 
 if [ -f $MESH_INSTALL_SETUP ]; then
-	if [ $1 ]; then
-		MY_USERNAME=$1
-	fi
+    if [ $1 ]; then
+        MY_USERNAME=$1
+    fi
 
-	if [ ! $set_new_identity ]; then
-		# sleep in order to allow other daemons to start up
-		sleep 15
-	fi
+    if [ ! $set_new_identity ]; then
+        # sleep in order to allow other daemons to start up
+        sleep 15
+    fi
 
-	# clear the install log
-	if [ -f $INSTALL_LOG ]; then
-		rm $INSTALL_LOG
-	fi
+    # clear the install log
+    if [ -f $INSTALL_LOG ]; then
+        rm $INSTALL_LOG
+    fi
 
-	echo $'Beginning mesh node setup' >> $INSTALL_LOG
+    echo $'Beginning mesh node setup' >> $INSTALL_LOG
 
-	if [ -d /home/$MY_USERNAME/.config ]; then
-		chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
-	fi
+    if [ -d /home/$MY_USERNAME/.config ]; then
+        chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
+    fi
 
-	tomb slam all
-	enable_batman_daemon
-	create_ram_disk 1
-	setup_amnesic_data
-	change_avahi_name
-	regenerate_ssh_host_keys
-	configure_zeronet_blog
-	configure_zeronet_mail
-	configure_zeronet_forum
-	configure_zeronet_id
-	configure_toxcore
-	create_tox_user
-	configure_zeronet
-	disable_password_logins
-	mesh_amnesic
+    tomb slam all
+    enable_batman_daemon
+    create_ram_disk 1
+    setup_amnesic_data
+    change_avahi_name
+    regenerate_ssh_host_keys
+    configure_zeronet_blog
+    configure_zeronet_mail
+    configure_zeronet_forum
+    configure_zeronet_id
+    configure_toxcore
+    create_tox_user
+    configure_zeronet
+    disable_password_logins
+    mesh_amnesic
 
-	if [ ! -f $MESH_AMNESIC ]; then
-		rm $MESH_INSTALL_SETUP
-		systemctl disable mesh-setup.service
-	fi
+    if [ ! -f $MESH_AMNESIC ]; then
+        rm $MESH_INSTALL_SETUP
+        systemctl disable mesh-setup.service
+    fi
 
-	show_desktop_icons
+    show_desktop_icons
 
-	mesh_restart_daemons
-	if [ ! -f $MESH_INSTALL_COMPLETED ]; then
-		echo $'Mesh node setup complete' >> $INSTALL_LOG
-		touch $MESH_INSTALL_COMPLETED
-		reboot
-	fi
+    mesh_restart_daemons
+    if [ ! -f $MESH_INSTALL_COMPLETED ]; then
+        echo $'Mesh node setup complete' >> $INSTALL_LOG
+        touch $MESH_INSTALL_COMPLETED
+        reboot
+    fi
 fi
 
 exit 0
diff --git a/src/zeronetavahi b/src/zeronetavahi
index 31c617f0..98293983 100755
--- a/src/zeronetavahi
+++ b/src/zeronetavahi
@@ -63,7 +63,7 @@ ON_THE_MESH_STR=$'On the Mesh'
 BLOGS_STR=$"Blogs"
 MAIL_STR=$"Mail"
 FORA_STR=$"Fora"
-TOX_STR=$"Tox Users"
+TOX_STR=$"Users on the Mesh"
 ID_STR=$"ID Services"
 NO_USERS_STR=$"No users found"