diff --git a/cryptlib/config-v5.sh b/cryptlib/config-v7.sh
similarity index 100%
rename from cryptlib/config-v5.sh
rename to cryptlib/config-v7.sh
diff --git a/cryptlib/info-v5.sh b/cryptlib/info-v7.sh
similarity index 100%
rename from cryptlib/info-v5.sh
rename to cryptlib/info-v7.sh
diff --git a/cryptlib/install-v5.sh b/cryptlib/install-v7.sh
similarity index 100%
rename from cryptlib/install-v5.sh
rename to cryptlib/install-v7.sh
diff --git a/cryptlib/prompt-v5.sh b/cryptlib/prompt-v7.sh
similarity index 100%
rename from cryptlib/prompt-v5.sh
rename to cryptlib/prompt-v7.sh
diff --git a/cryptlib/update.sh b/cryptlib/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/cryptlib/update.sh
+++ b/cryptlib/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/dbp/config-v5.sh b/dbp/config-v7.sh
similarity index 100%
rename from dbp/config-v5.sh
rename to dbp/config-v7.sh
diff --git a/dbp/info-v5.sh b/dbp/info-v7.sh
similarity index 100%
rename from dbp/info-v5.sh
rename to dbp/info-v7.sh
diff --git a/dbp/install-v5.sh b/dbp/install-v7.sh
similarity index 100%
rename from dbp/install-v5.sh
rename to dbp/install-v7.sh
diff --git a/dbp/prompt-v5.sh b/dbp/prompt-v7.sh
similarity index 100%
rename from dbp/prompt-v5.sh
rename to dbp/prompt-v7.sh
diff --git a/dbp/update.sh b/dbp/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/dbp/update.sh
+++ b/dbp/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/dosemu2/config-v5.sh b/dosemu2/config-v7.sh
similarity index 100%
rename from dosemu2/config-v5.sh
rename to dosemu2/config-v7.sh
diff --git a/dosemu2/info-v5.sh b/dosemu2/info-v5.sh
deleted file mode 100644
index 0523703..0000000
--- a/dosemu2/info-v5.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ $DOSEMU = "Yes" ]; then
-echo "" >> ${DBP_INFO}
-echo "DosEmu2 Integration with Mystic" >> ${DBP_INFO}
-echo "" >> ${DBP_INFO}
-echo "For the correct DosEmu2 integration follow the Mystic Doors doc ${MYSTIC_DIR}/docs/unix.install.txt" >> ${DBP_INFO}
-echo "" >> ${DBP_INFO}
-echo "==============================================================================================================" >> ${DBP_INFO}
-fi
diff --git a/dosemu2/info-v7.sh b/dosemu2/info-v7.sh
new file mode 100644
index 0000000..46576dc
--- /dev/null
+++ b/dosemu2/info-v7.sh
@@ -0,0 +1,21 @@
+
+if [ "${DOSEMU}" = "Yes" ]; then
+if [ "${DOSEMUVER}" = "dosemu2" ]; then
+echo "" >> ${DBP_INFO}
+echo "DosEmu2 Integration with Mystic" >> ${DBP_INFO}
+echo "" >> ${DBP_INFO}
+echo "For the correct DosEmu2 integration follow the Mystic Doors doc ${MYSTIC_DIR}/docs/unix.install.txt" >> ${DBP_INFO}
+echo "" >> ${DBP_INFO}
+echo "==============================================================================================================" >> ${DBP_INFO}
+fi
+
+if [ "${DOSEMUVER}" = "dosemu" ]; then
+echo "" >> ${DBP_INFO}
+echo "DosEmu Integration with Mystic" >> ${DBP_INFO}
+echo "" >> ${DBP_INFO}
+echo "For the correct DosEmu integration follow the Mystic Doors doc ${MYSTIC_DIR}/docs/unix.install.txt" >> ${DBP_INFO}
+echo "" >> ${DBP_INFO}
+echo "==============================================================================================================" >> ${DBP_INFO}
+fi
+
+fi
diff --git a/dosemu2/install-v5.sh b/dosemu2/install-v5.sh
deleted file mode 100644
index 6c9a5bf..0000000
--- a/dosemu2/install-v5.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ $DOSEMU = "Yes" ]; then
-msg_info "Installing DosEmu2 Dependencies for ${APP}"
-pushd $MSTEMPDIR &>/dev/null
-curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6d9cd73b401a130336ed0a56ebe1b5ded2ad45d6' | tee /etc/apt/trusted.gpg.d/code.launchpad.net-dosemu2.asc &>/dev/null
-echo "deb https://ppa.launchpadcontent.net/dosemu2/ppa/ubuntu $UBUNTU main" | tee /etc/apt/sources.list.d/dosemu2.list &>/dev/null
-apt update &>/dev/null
-apt install -y dosemu2 &>/dev/null
-#apt install -y install-otherdos &>/dev/null
-
-msg_ok "Installing DosEmu2 Dependencies for ${APP}"
-
-fi
diff --git a/dosemu2/install-v7.sh b/dosemu2/install-v7.sh
new file mode 100644
index 0000000..6121162
--- /dev/null
+++ b/dosemu2/install-v7.sh
@@ -0,0 +1,28 @@
+if [ "${DOSEMU}" = "Yes" ]; then
+if [ "${DOSEMUVER}" = "dosemu2" ]; then
+msg_info "Installing DosEmu2 Dependencies for ${APP}"
+pushd $MSTEMPDIR &>/dev/null
+curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6d9cd73b401a130336ed0a56ebe1b5ded2ad45d6' | tee /etc/apt/trusted.gpg.d/code.launchpad.net-dosemu2.asc &>/dev/null
+echo "deb https://ppa.launchpadcontent.net/dosemu2/ppa/ubuntu $UBUNTU main" | tee /etc/apt/sources.list.d/dosemu2.list &>/dev/null
+apt update &>/dev/null
+apt install -y dosemu2 &>/dev/null
+#apt install -y install-otherdos &>/dev/null
+
+msg_ok "Installing DosEmu2 Dependencies for ${APP}"
+
+fi
+
+if [ "${DOSEMUVER}" = "dosemu" ]; then
+msg_info "Installing DosEmu Dependencies for ${APP}"
+pushd $MSTEMPDIR &>/dev/null
+curl 'https://deb.freexian.com/extended-lts/archive-key.gpg' | tee /etc/apt/trusted.gpg.d/freexian-archive-extended-lts.gpg &>/dev/null
+echo "deb http://deb.freexian.com/extended-lts stretch main contrib" | tee /etc/apt/sources.list.d/stretch.list &>/dev/null
+apt update &>/dev/null
+apt install -y dosemu &>/dev/null
+#apt install -y install-otherdos &>/dev/null
+
+msg_ok "Installing DosEmu Dependencies for ${APP}"
+
+fi
+
+fi
\ No newline at end of file
diff --git a/dosemu2/prompt-v5.sh b/dosemu2/prompt-v5.sh
deleted file mode 100644
index f9427e7..0000000
--- a/dosemu2/prompt-v5.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-DOSEMU=$(whiptail --title "Add DosEmu2 to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \
-    "Yes" "Add DosEmu2 Script" ON \
-    "No" "Don't add DosEmu2 Script" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Add DbP Script: ${BGN}$DOSEMU${CL}"
-fi
diff --git a/dosemu2/prompt-v7.sh b/dosemu2/prompt-v7.sh
new file mode 100644
index 0000000..a446af1
--- /dev/null
+++ b/dosemu2/prompt-v7.sh
@@ -0,0 +1,8 @@
+DOSEMU=$(whiptail --title "Add DosEmu2/DosEmu to Mystic" --radiolist --cancel-button Exit-Script "Choose Yes No" 8 58 2 \
+    "Yes" "Add DosEmu2/DosEmu Support" ON \
+    "No" "Don't add DosEmu2/DosEmu Support" OFF \
+    3>&1 1>&2 2>&3)
+  exitstatus=$?
+if [ $exitstatus = 0 ]; then
+    echo -e "${DGN}Add DosEmu2/DosEmu Support: ${BGN}$DOSEMU${CL}"
+fi
diff --git a/dosemu2/update.sh b/dosemu2/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/dosemu2/update.sh
+++ b/dosemu2/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/fail2ban/config-v5.sh b/fail2ban/config-v7.sh
similarity index 100%
rename from fail2ban/config-v5.sh
rename to fail2ban/config-v7.sh
diff --git a/fail2ban/info-v5.sh b/fail2ban/info-v7.sh
similarity index 100%
rename from fail2ban/info-v5.sh
rename to fail2ban/info-v7.sh
diff --git a/fail2ban/install-v5.sh b/fail2ban/install-v7.sh
similarity index 100%
rename from fail2ban/install-v5.sh
rename to fail2ban/install-v7.sh
diff --git a/fail2ban/prompt-v5.sh b/fail2ban/prompt-v7.sh
similarity index 100%
rename from fail2ban/prompt-v5.sh
rename to fail2ban/prompt-v7.sh
diff --git a/fail2ban/update.sh b/fail2ban/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/fail2ban/update.sh
+++ b/fail2ban/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/install-next.sh b/install-next.sh
index 7157644..2037bb4 100644
--- a/install-next.sh
+++ b/install-next.sh
@@ -13,7 +13,7 @@ APP="Mystic BBS"
 MSDIR="/opt/mystic"
 MSTEMPDIR="/usr/local/src/mystic"
 TMP_DIR=$(mktemp -d)
-SCRIPT_VER="v6"
+SCRIPT_VER="v7"
 
 GROUP=$(getent group mystic)
 USER=$(getent shadow mystic)
diff --git a/install.sh b/install.sh
index 3efe91f..7157644 100644
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@ APP="Mystic BBS"
 MSDIR="/opt/mystic"
 MSTEMPDIR="/usr/local/src/mystic"
 TMP_DIR=$(mktemp -d)
-SCRIPT_VER="v5"
+SCRIPT_VER="v6"
 
 GROUP=$(getent group mystic)
 USER=$(getent shadow mystic)
@@ -83,25 +83,25 @@ if [ "${ARCH}" = "x86_64-linux-gnu" ]; then
     MYSTIC_ARCH="l64"
     MYSTIC_EXT="rar"
     RARLAB="rar"
-    DOSEMU="yes"
+    DOSEMUVER="dosemu2"
 elif [ "${ARCH}" = "i386-linux-gnu" ]; then
     INIMOD_ARCH="amd32"
     MYSTIC_ARCH="l32"
     MYSTIC_EXT="rar"
     RARLAB="rar"
-    DOSEMU="no"
+    DOSEMUVER="dosemu"
 elif [ "${ARCH}" = "aarch64-linux-gnu" ]; then
     INIMOD_ARCH="arm64"
     MYSTIC_ARCH="p64"
     MYSTIC_EXT="zip"
     RARLAB=""
-    DOSEMU="yes"
+    DOSEMUVER="dosemu2"
 elif [ "${ARCH}" = "arm-linux-gnueabihf" ]; then
     INIMOD_ARCH="arm32"
     MYSTIC_ARCH="p32"
     MYSTIC_EXT="zip"
     RARLAB=""
-    DOSEMU="no"
+    DOSEMUVER=""
 else
     echo "Architecture not supported: ${ARCH}"
     exit 1
@@ -172,7 +172,7 @@ source $MSTEMPDIR/mystic/dbp/prompt-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/prompt-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ "$DOSEMU" = "yes" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/prompt-${SCRIPT_VER}.sh
 fi
 
@@ -195,7 +195,7 @@ source $MSTEMPDIR/mystic/dbp/install-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/install-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ "$DOSEMU" = "yes" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/install-${SCRIPT_VER}.sh
 fi
 
@@ -218,7 +218,7 @@ source $MSTEMPDIR/mystic/dbp/config-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/config-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ "$DOSEMU" = "yes" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/config-${SCRIPT_VER}.sh
 fi
 
@@ -250,7 +250,7 @@ source $MSTEMPDIR/mystic/dbp/info-${SCRIPT_VER}.sh
 # Add Fail2ban | banip
 source $MSTEMPDIR/mystic/fail2ban/info-${SCRIPT_VER}.sh
 # Add Dosemu2
-if [ "$DOSEMU" = "yes" ]; then
+if [ -n "${DOSEMUVER}" ]; then
 source $MSTEMPDIR/mystic/dosemu2/info-${SCRIPT_VER}.sh
 fi
 
diff --git a/ip2location/config-v5.sh b/ip2location/config-v7.sh
similarity index 100%
rename from ip2location/config-v5.sh
rename to ip2location/config-v7.sh
diff --git a/ip2location/info-v5.sh b/ip2location/info-v7.sh
similarity index 100%
rename from ip2location/info-v5.sh
rename to ip2location/info-v7.sh
diff --git a/ip2location/install-v5.sh b/ip2location/install-v7.sh
similarity index 100%
rename from ip2location/install-v5.sh
rename to ip2location/install-v7.sh
diff --git a/ip2location/prompt-v5.sh b/ip2location/prompt-v7.sh
similarity index 100%
rename from ip2location/prompt-v5.sh
rename to ip2location/prompt-v7.sh
diff --git a/ip2location/update.sh b/ip2location/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/ip2location/update.sh
+++ b/ip2location/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/mrc-client/config-v5.sh b/mrc-client/config-v7.sh
similarity index 100%
rename from mrc-client/config-v5.sh
rename to mrc-client/config-v7.sh
diff --git a/mrc-client/info-v5.sh b/mrc-client/info-v7.sh
similarity index 100%
rename from mrc-client/info-v5.sh
rename to mrc-client/info-v7.sh
diff --git a/mrc-client/install-v5.sh b/mrc-client/install-v7.sh
similarity index 100%
rename from mrc-client/install-v5.sh
rename to mrc-client/install-v7.sh
diff --git a/mrc-client/prompt-v5.sh b/mrc-client/prompt-v7.sh
similarity index 100%
rename from mrc-client/prompt-v5.sh
rename to mrc-client/prompt-v7.sh
diff --git a/mrc-client/update.sh b/mrc-client/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/mrc-client/update.sh
+++ b/mrc-client/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/mrc-server/config-v5.sh b/mrc-server/config-v7.sh
similarity index 100%
rename from mrc-server/config-v5.sh
rename to mrc-server/config-v7.sh
diff --git a/mrc-server/info-v5.sh b/mrc-server/info-v7.sh
similarity index 100%
rename from mrc-server/info-v5.sh
rename to mrc-server/info-v7.sh
diff --git a/mrc-server/install-v5.sh b/mrc-server/install-v7.sh
similarity index 100%
rename from mrc-server/install-v5.sh
rename to mrc-server/install-v7.sh
diff --git a/mrc-server/prompt-v5.sh b/mrc-server/prompt-v7.sh
similarity index 100%
rename from mrc-server/prompt-v5.sh
rename to mrc-server/prompt-v7.sh
diff --git a/mrc-server/update.sh b/mrc-server/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/mrc-server/update.sh
+++ b/mrc-server/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/mystic/config-v5.sh b/mystic/config-v7.sh
similarity index 100%
rename from mystic/config-v5.sh
rename to mystic/config-v7.sh
diff --git a/mystic/importna-v5.sh b/mystic/importna-v7.sh
similarity index 100%
rename from mystic/importna-v5.sh
rename to mystic/importna-v7.sh
diff --git a/mystic/info-v5.sh b/mystic/info-v7.sh
similarity index 100%
rename from mystic/info-v5.sh
rename to mystic/info-v7.sh
diff --git a/mystic/install-v5.sh b/mystic/install-v7.sh
similarity index 100%
rename from mystic/install-v5.sh
rename to mystic/install-v7.sh
diff --git a/mystic/mailin-v5.sh b/mystic/mailin-v7.sh
similarity index 100%
rename from mystic/mailin-v5.sh
rename to mystic/mailin-v7.sh
diff --git a/mystic/mailout-v5.sh b/mystic/mailout-v7.sh
similarity index 100%
rename from mystic/mailout-v5.sh
rename to mystic/mailout-v7.sh
diff --git a/mystic/maint-v5.sh b/mystic/maint-v7.sh
similarity index 100%
rename from mystic/maint-v5.sh
rename to mystic/maint-v7.sh
diff --git a/mystic/prompt-v5.sh b/mystic/prompt-v7.sh
similarity index 100%
rename from mystic/prompt-v5.sh
rename to mystic/prompt-v7.sh
diff --git a/mystic/update.sh b/mystic/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/mystic/update.sh
+++ b/mystic/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh
diff --git a/spellcheck/config-v5.sh b/spellcheck/config-v7.sh
similarity index 100%
rename from spellcheck/config-v5.sh
rename to spellcheck/config-v7.sh
diff --git a/spellcheck/info-v5.sh b/spellcheck/info-v7.sh
similarity index 100%
rename from spellcheck/info-v5.sh
rename to spellcheck/info-v7.sh
diff --git a/spellcheck/install-v5.sh b/spellcheck/install-v7.sh
similarity index 100%
rename from spellcheck/install-v5.sh
rename to spellcheck/install-v7.sh
diff --git a/spellcheck/prompt-v5.sh b/spellcheck/prompt-v7.sh
similarity index 100%
rename from spellcheck/prompt-v5.sh
rename to spellcheck/prompt-v7.sh
diff --git a/spellcheck/update.sh b/spellcheck/update.sh
old mode 100644
new mode 100755
index 29fbfa4..6d59253
--- a/spellcheck/update.sh
+++ b/spellcheck/update.sh
@@ -1,3 +1,5 @@
-for file in $(ls *-v5.sh) ; do
-  cp -- "${file}" "$(echo "${file}" | sed -e 's/v5\.sh/v6\.sh/')"
-done
\ No newline at end of file
+for file in $(ls *-v6.sh) ; do
+  cp -- "${file}" "$(echo "${file}" | sed -e 's/v6\.sh/v7\.sh/')"
+done
+
+git rm *-v5.sh