diff --git a/update.sh b/update.sh
index 29ac38a..c8793e8 100644
--- a/update.sh
+++ b/update.sh
@@ -99,7 +99,7 @@ exit 0
EOF
######################################### FreeDMR Update ###############################################################
-sudo cat > /opt/conf.txt <<- "EOF"
+sudo cat > /opt/conf.txt <<- "EOFA1"
[D-APRS]
MODE: MASTER
@@ -170,7 +170,7 @@ DEFAULT_UA_TIMER: 999
SINGLE_MODE: True
VOICE_IDENT: False
-EOF
+EOFA1
##
sudo cat > /opt/fdmr-update.sh <<- "EOF"
#!/bin/bash
@@ -230,9 +230,390 @@ sudo systemctl restart fdmr_mon.service
EOF
######################################### FDMR-Monitor Update ###############################################################
-sudo cat > monitor-update.sh <<- "EOF"
+sudo cat > monitor-update.sh <<- "EOFB1"
+#!/bin/bash
+variable1=$(grep "REPORT_NAME =" /opt/FDMR-Monitor/fdmr-mon.cfg)
+variable2=$(grep "THEME_COLOR =" /opt/FDMR-Monitor/fdmr-mon.cfg)
+variable3=$(grep "COLOR_TEXT =" /opt/FDMR-Monitor/fdmr-mon.cfg)
+variable4=$(grep "COLOR_1 =" /opt/FDMR-Monitor/fdmr-mon.cfg)
+variable5=$(grep "COLOR_2 =" /opt/FDMR-Monitor/fdmr-mon.cfg)
+
+sudo systemctl stop fdmr_mon.service
+sudo systemctl stop proxy.service
+
+if [ -d "/var/www/fdmr" ];
+then
+ rm -r /var/www/fdmr/
+ #echo "found file"
+else
+ echo "file not found"
+
+fi
+if [ -d "/opt/FDMR-Monitor" ]
+then
+ rm -r /opt/FDMR-Monitor
+ #echo "found file"
+
+fi
+##
+#FDMR-Monitor
+cd /opt
+sudo git clone https://github.com/yuvelq/FDMR-Monitor.git
+cd FDMR-Monitor
+sudo git checkout Self_Service
+sudo chmod +x install.sh
+
+sudo sed -i 's/RELOAD_TIME = 15/RELOAD_TIME = 1/' /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+sudo sed -i 's/FREQUENCY = 10/FREQUENCY = 120/' /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+sudo chmod 644 /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+sed '33 a ' -i /opt/FDMR-Monitor/html/sysinfo.php
+####
+sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/html/*.*
+sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.*
+####
+sudo sed -i 's/localhost_2-day.png/localhost_1-day.png/' /opt/FDMR-Monitor/html/sysinfo.php
+sudo sed -i "s/HBMonv2/FDMR-Monitor/g" /opt/FDMR-Monitor/sysinfo/*.sh
+sudo chmod +x /opt/FDMR-Monitor/sysinfo/cpu.sh
+sudo chmod +x /opt/FDMR-Monitor/sysinfo/graph.sh
+sudo chmod +x /opt/FDMR-Monitor/sysinfo/rrd-db.sh
+
+sudo sed -i "s/root/emqte1/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+sudo sed -i "s/test/selfcare/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+sudo sed -i "s/PRIVATE_NETWORK = True/PRIVATE_NETWORK = False/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+#sudo sed -i "s/TGID_URL =/#TGID_URL =/g" /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+#sed '63 a #TGID_URL = https://freedmr.cymru/talkgroups/talkgroup_ids_json.php' -i /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+#sed '64 a #TGID_URL = https://freedmr.cymru/talkgroups/talkgroup_ids_flags_json.php' -i /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg
+
+cd /opt/FDMR-Monitor/
+#sudo rm /opt/FDMR-Monitor/install.sh
+################
+sudo apt-get install rrdtool -y
+sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/html/*.*
+sudo sed -i "s/www\/html/www\/fdmr/g" /opt/FDMR-Monitor/sysinfo/*.*
+# Install the required support programs
+pip3 install -r requirements.txt
+pip install pyopenssl --upgrade
+cd /opt/FDMR-Monitor/
+cp /opt/FDMR-Monitor/fdmr-mon_SAMPLE.cfg /opt/FDMR-Monitor/fdmr-mon.cfg
+###############################
+sudo sed -i "s/root/emqte1/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py
+sudo sed -i "s/test/selfcare/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py
+sudo sed -i "s/\/freedmr.cfg/\/config\/FreeDMR.cfg/g" /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py
+sudo sed -i "s/test/selfcare/g" /opt/FDMR-Monitor/proxy/proxy_db.py
+sudo sed -i "s/root/emqte1/g" /opt/FDMR-Monitor/proxy/proxy_db.py
+sudo sed -i "s/root/emqte1/g" /opt/FDMR-Monitor/proxy/proxy.cfg
+sudo sed -i "s/test/selfcare/g" /opt/FDMR-Monitor/proxy/proxy.cfg
+#################
+cp /opt/FDMR-Monitor/proxy/hotspot_proxy_v2.py /opt/FreeDMR/hotspot_proxy_v2.py
+cp /opt/FDMR-Monitor/proxy/proxy.cfg /opt/FreeDMR/proxy.cfg
+cp /opt/FDMR-Monitor/proxy/proxy_db.py /opt/FreeDMR/proxy_db.py
+
+wget https://www.freedmr.uk/wp-content/uploads/2021/04/favicon.ico -O /opt/FDMR-Monitor/html/favicon.ico
+sed '6 a ' -i /opt/FDMR-Monitor/html/index.php
+wget https://www.freedmr.uk/wp-content/uploads/2021/04/Free_DMR_logo_250x141_72.png -O /opt/FDMR-Monitor/html/img/logo.png
+
+#
+sudo cat > /opt/FDMR-Monitor/html/buttons.php <<- "EOF"
+
+Home
+
+
+
+
+
+ SelfService';}?>
+
Login
+ Devices';
+ }
+ ?>
+
+
+
+
+
+
+
+EOF
+
+#
+
+mkdir /var/www/fdmr/
+cp -r /opt/FDMR-Monitor/html/* /var/www/fdmr/
+sudo chown www-data:www-data /var/www/fdmr/ -R
+cp /opt/FDMR-Monitor/utils/logrotate/fdmr_mon /etc/logrotate.d/
+
+cat > /opt/FDMR-Monitor/templates/main_table.html <<- "EOF"
+
+
+
+
+
+
+
+
+{% if _table['SETUP']['LASTHEARD'] == True %}
+
+{% endif %}
+
+