From c5e7807d55370cee0b87365189439c10da1ccbb5 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Tue, 21 Mar 2023 11:29:57 -0400
Subject: [PATCH] stage 3 testing

---
 ct/deluge-v5.sh               | 427 -------------------------------
 ct/deluge.sh                  |  70 ++++++
 ct/devuan-v5.sh               | 419 -------------------------------
 ct/devuan.sh                  |  67 +++++
 ct/emby-v5.sh                 | 460 ----------------------------------
 ct/emby.sh                    |  80 ++++++
 ct/emqx-v5.sh                 | 421 -------------------------------
 ct/emqx.sh                    |  69 +++++
 ct/esphome-v5.sh              | 434 --------------------------------
 ct/esphome.sh                 |  77 ++++++
 ct/go2rtc-v5.sh               | 421 -------------------------------
 ct/go2rtc.sh                  |  69 +++++
 ct/grafana-v5.sh              | 427 -------------------------------
 ct/grafana.sh                 |  70 ++++++
 ct/grocy-v5.sh                | 426 -------------------------------
 ct/grocy.sh                   |  69 +++++
 install/deluge-install.sh     |  73 ++++++
 install/deluge-v5-install.sh  | 160 ------------
 install/devuan-install.sh     |  28 +++
 install/devuan-v5-install.sh  |  98 --------
 install/emby-install.sh       |  52 ++++
 install/emby-v5-install.sh    | 140 -----------
 install/emqx-install.sh       |  34 +++
 install/emqx-v5-install.sh    | 121 ---------
 install/esphome-install.sh    |  54 ++++
 install/esphome-v5-install.sh | 142 -----------
 install/go2rtc-install.sh     |  51 ++++
 install/go2rtc-v5-install.sh  | 138 ----------
 install/grafana-install.sh    |  41 +++
 install/grafana-v5-install.sh | 131 ----------
 install/grocy-install.sh      |  72 ++++++
 install/grocy-v5-install.sh   | 160 ------------
 misc/ubuntu.func              |  24 +-
 33 files changed, 997 insertions(+), 4528 deletions(-)
 delete mode 100644 ct/deluge-v5.sh
 create mode 100644 ct/deluge.sh
 delete mode 100644 ct/devuan-v5.sh
 create mode 100644 ct/devuan.sh
 delete mode 100644 ct/emby-v5.sh
 create mode 100644 ct/emby.sh
 delete mode 100644 ct/emqx-v5.sh
 create mode 100644 ct/emqx.sh
 delete mode 100644 ct/esphome-v5.sh
 create mode 100644 ct/esphome.sh
 delete mode 100644 ct/go2rtc-v5.sh
 create mode 100644 ct/go2rtc.sh
 delete mode 100644 ct/grafana-v5.sh
 create mode 100644 ct/grafana.sh
 delete mode 100644 ct/grocy-v5.sh
 create mode 100644 ct/grocy.sh
 create mode 100644 install/deluge-install.sh
 delete mode 100644 install/deluge-v5-install.sh
 create mode 100644 install/devuan-install.sh
 delete mode 100644 install/devuan-v5-install.sh
 create mode 100644 install/emby-install.sh
 delete mode 100644 install/emby-v5-install.sh
 create mode 100644 install/emqx-install.sh
 delete mode 100644 install/emqx-v5-install.sh
 create mode 100644 install/esphome-install.sh
 delete mode 100644 install/esphome-v5-install.sh
 create mode 100644 install/go2rtc-install.sh
 delete mode 100644 install/go2rtc-v5-install.sh
 create mode 100644 install/grafana-install.sh
 delete mode 100644 install/grafana-v5-install.sh
 create mode 100644 install/grocy-install.sh
 delete mode 100644 install/grocy-v5-install.sh

diff --git a/ct/deluge-v5.sh b/ct/deluge-v5.sh
deleted file mode 100644
index 7d95aa64..00000000
--- a/ct/deluge-v5.sh
+++ /dev/null
@@ -1,427 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-    ____       __               
-   / __ \___  / /_v5______ ____ 
-  / / / / _ \/ / / / / __ `/ _ \
- / /_/ /  __/ / /_/ / /_/ /  __/
-/_____/\___/_/\__,_/\__, /\___/ 
-                   /____/       
- 
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Deluge"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating $APP LXC"
-apt-get update &>/dev/null
-pip3 install deluge[all] --upgrade
-msg_ok "Updated $APP LXC"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/systemd/system/deluged.service ]]; then
-  msg_error "No ${APP} Installation Found!"
-  exit 
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8112${CL} \n"
diff --git a/ct/deluge.sh b/ct/deluge.sh
new file mode 100644
index 00000000..60c5c7e7
--- /dev/null
+++ b/ct/deluge.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+    ____       __               
+   / __ \___  / /_  ______ ____ 
+  / / / / _ \/ / / / / __ `/ _ \
+ / /_/ /  __/ / /_/ / /_/ /  __/
+/_____/\___/_/\__,_/\__, /\___/ 
+                   /____/       
+ 
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Deluge"
+var_disk="4"
+var_cpu="2"
+var_ram="2048"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+pip3 install deluge[all] --upgrade
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP}:8112${CL} \n"
diff --git a/ct/devuan-v5.sh b/ct/devuan-v5.sh
deleted file mode 100644
index ac845530..00000000
--- a/ct/devuan-v5.sh
+++ /dev/null
@@ -1,419 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-    ____                            
-   / __ \___ _   ____  ______v5____ 
-  / / / / _ \ | / / / / / __ `/ __ \
- / /_/ /  __/ |/ / /_/ / /_/ / / / /
-/_____/\___/|___/\__,_/\__,_/_/ /_/ 
-                                    
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Devuan"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="devuan"
-var_version="4.0"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}$NSAPP${CL}"
-  PW="-password $NSAPP"
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating $APP LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated $APP LXC"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} ${var_version} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
diff --git a/ct/devuan.sh b/ct/devuan.sh
new file mode 100644
index 00000000..802fc921
--- /dev/null
+++ b/ct/devuan.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+    ____                            
+   / __ \___ _   ____  ______  ____ 
+  / / / / _ \ | / / / / / __ `/ __ \
+ / /_/ /  __/ |/ / /_/ / /_/ / / / /
+/_____/\___/|___/\__,_/\__,_/_/ /_/ 
+                                    
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Devuan"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="devuan"
+var_version="4.0"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
diff --git a/ct/emby-v5.sh b/ct/emby-v5.sh
deleted file mode 100644
index d138f812..00000000
--- a/ct/emby-v5.sh
+++ /dev/null
@@ -1,460 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-    ______          __         
-   / ____/___ v5_  / /_  __  __
-  / __/ / __  __ \/ __ \/ / / /
- / /___/ / / / / / /_/ / /_/ / 
-/_____/_/ /_/ /_/_.___/\__, /  
-                      /____/   
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Emby"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-    "18.04" "Bionic" OFF \
-    "20.04" "Focal" ON \
-    "22.04" "Jammy" OFF \
-    "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"
-else
-    exit-script
-fi
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
-msg_info "Stopping ${APP}"
-systemctl stop emby-server
-msg_ok "Stopped ${APP}"
-
-msg_info "Updating ${APP}"
-wget https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb &>/dev/null
-dpkg -i emby-server-deb_${LATEST}_amd64.deb &>/dev/null
-rm emby-server-deb_${LATEST}_amd64.deb
-msg_ok "Updated ${APP}"
-
-msg_info "Starting ${APP}"
-systemctl start emby-server
-msg_ok "Started ${APP}"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -d /opt/emby-server ]]; then
-  msg_error "No ${APP} Installation Found!"
-  exit 
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 226:0 rwm
-lxc.cgroup2.devices.allow: c 226:128 rwm
-lxc.cgroup2.devices.allow: c 29:0 rwm
-lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file
-lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir
-lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-             ${BL}http://${IP}:8096${CL}\n"
diff --git a/ct/emby.sh b/ct/emby.sh
new file mode 100644
index 00000000..ba3e3575
--- /dev/null
+++ b/ct/emby.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/ubuntu.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+    ______          __         
+   / ____/___ ___  / /_  __  __
+  / __/ / __  __ \/ __ \/ / / /
+ / /___/ / / / / / /_/ / /_/ / 
+/_____/_/ /_/ /_/_.___/\__, /  
+                      /____/   
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Emby"
+var_disk="8"
+var_cpu="2"
+var_ram="2048"
+var_os="ubuntu"
+var_version="20.04"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="0"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
+msg_info "Stopping ${APP}"
+systemctl stop emby-server
+msg_ok "Stopped ${APP}"
+
+msg_info "Updating ${APP}"
+wget https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb &>/dev/null
+dpkg -i emby-server-deb_${LATEST}_amd64.deb &>/dev/null
+rm emby-server-deb_${LATEST}_amd64.deb
+msg_ok "Updated ${APP}"
+
+msg_info "Starting ${APP}"
+systemctl start emby-server
+msg_ok "Started ${APP}"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+             ${BL}http://${IP}:8096${CL}\n"
diff --git a/ct/emqx-v5.sh b/ct/emqx-v5.sh
deleted file mode 100644
index 45bbd9fa..00000000
--- a/ct/emqx-v5.sh
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-    ________  _______v5 _  __
-   / ____/  |/  / __ \ | |/ /
-  / __/ / /|_/ / / / / |   / 
- / /___/ /  / / /_/ / /   |  
-/_____/_/  /_/\___\_\/_/|_|  
-                             
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="EMQX"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}http://${IP}:18083${CL} \n"
diff --git a/ct/emqx.sh b/ct/emqx.sh
new file mode 100644
index 00000000..c3ce1c62
--- /dev/null
+++ b/ct/emqx.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+    ________  _______   _  __
+   / ____/  |/  / __ \ | |/ /
+  / __/ / /|_/ / / / / |   / 
+ / /___/ /  / / /_/ / /   |  
+/_____/_/  /_/\___\_\/_/|_|  
+                             
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="EMQX"
+var_disk="4"
+var_cpu="2"
+var_ram="1024"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} Setup should be reachable by going to the following URL.
+         ${BL}http://${IP}:18083${CL} \n"
diff --git a/ct/esphome-v5.sh b/ct/esphome-v5.sh
deleted file mode 100644
index 5cb1c4f2..00000000
--- a/ct/esphome-v5.sh
+++ /dev/null
@@ -1,434 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-    ___________ ____  __  __                   
-   / ____/ ___// __ \/ / / /___v5____ ___  ___ 
-  / __/  \__ \/ /_/ / /_/ / __ \/ __ `__ \/ _ \
- / /___ ___/ / ____/ __  / /_/ / / / / / /  __/
-/_____//____/_/   /_/ /_/\____/_/ /_/ /_/\___/ 
-                                               
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="ESPHome"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Stopping ESPHome"
-systemctl stop esphomeDashboard
-msg_ok "Stopped ESPHome"
-
-msg_info "Updating ESPHome"
-pip3 install esphome --upgrade &>/dev/null
-msg_ok "Updated ESPHome"
-
-msg_info "Starting ESPHome"
-systemctl start esphomeDashboard
-msg_ok "Started ESPHome"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /usr/local/bin/esphome ]]; then
-  msg_error "No ${APP} Installation Found!"
-  exit 
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:6052${CL} \n"
diff --git a/ct/esphome.sh b/ct/esphome.sh
new file mode 100644
index 00000000..aeca41ed
--- /dev/null
+++ b/ct/esphome.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+    ___________ ____  __  __                   
+   / ____/ ___// __ \/ / / /___  ____ ___  ___ 
+  / __/  \__ \/ /_/ / /_/ / __ \/ __ `__ \/ _ \
+ / /___ ___/ / ____/ __  / /_/ / / / / / /  __/
+/_____//____/_/   /_/ /_/\____/_/ /_/ /_/\___/ 
+                                               
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="ESPHome"
+var_disk="4"
+var_cpu="2"
+var_ram="1024"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Stopping ESPHome"
+systemctl stop esphomeDashboard
+msg_ok "Stopped ESPHome"
+
+msg_info "Updating ESPHome"
+pip3 install esphome --upgrade &>/dev/null
+msg_ok "Updated ESPHome"
+
+msg_info "Starting ESPHome"
+systemctl start esphomeDashboard
+msg_ok "Started ESPHome"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP}:6052${CL} \n"
diff --git a/ct/go2rtc-v5.sh b/ct/go2rtc-v5.sh
deleted file mode 100644
index cf95a685..00000000
--- a/ct/go2rtc-v5.sh
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-               ___        __      
-   ____ _____ |__ \ _____/ /__v5__
-  / __ `/ __ \__/ // ___/ __/ ___/
- / /_/ / /_/ / __// /  / /_/ /__  
- \__, /\____/____/_/   \__/\___/  
-/____/                            
- 
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="go2rtc"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating $APP LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated $APP LXC"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:1984${CL} \n"
diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh
new file mode 100644
index 00000000..4c62a537
--- /dev/null
+++ b/ct/go2rtc.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+               ___        __      
+   ____ _____ |__ \ _____/ /______
+  / __ `/ __ \__/ // ___/ __/ ___/
+ / /_/ / /_/ / __// /  / /_/ /__  
+ \__, /\____/____/_/   \__/\___/  
+/____/                            
+ 
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="go2rtc"
+var_disk="4"
+var_cpu="2"
+var_ram="2048"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating $APP LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated $APP LXC"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP}:1984${CL} \n"
diff --git a/ct/grafana-v5.sh b/ct/grafana-v5.sh
deleted file mode 100644
index 2984483f..00000000
--- a/ct/grafana-v5.sh
+++ /dev/null
@@ -1,427 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-   ______           ____                 
-  / ____/________ _/ __/___ _____v5____ _
- / / __/ ___/ __  / /_/ __  / __ \/ __  /
-/ /_/ / /  / /_/ / __/ /_/ / / / / /_/ / 
-\____/_/   \__,_/_/  \__,_/_/ /_/\__,_/  
- 
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="Grafana"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated ${APP} LXC"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/apt/sources.list.d/grafana.list ]]; then
-  msg_error "No ${APP} Installation Found!"
-  exit 
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:3000${CL} \n"
diff --git a/ct/grafana.sh b/ct/grafana.sh
new file mode 100644
index 00000000..50230988
--- /dev/null
+++ b/ct/grafana.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+   ______           ____                 
+  / ____/________ _/ __/___ _____  ____ _
+ / / __/ ___/ __  / /_/ __  / __ \/ __  /
+/ /_/ / /  / /_/ / __/ /_/ / / / / /_/ / 
+\____/_/   \__,_/_/  \__,_/_/ /_/\__,_/  
+ 
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Grafana"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating ${APP} LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated ${APP} LXC"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP}:3000${CL} \n"
diff --git a/ct/grocy-v5.sh b/ct/grocy-v5.sh
deleted file mode 100644
index ca85cf3f..00000000
--- a/ct/grocy-v5.sh
+++ /dev/null
@@ -1,426 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-
-   ____ __________  _______  __
-  / __  / ___/ __ \/ ___/ / / /
- / /_/ / /  / /_/ / /__/ /_/ / 
- \__, /_/ v5\____/\___/\__, /  
-/____/                /____/   
- 
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="grocy"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-v5-install"
-timezone=$(cat /etc/timezone)
-INTEGER='^[0-9]+([.][0-9]+)?$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-function PVE_CHECK() {
-if [ $(pveversion | grep -c "pve-manager/7\.[0-9]") -eq 0 ]; then
-  echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported"
-  echo -e "Requires PVE Version 7.0 or higher"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-function ARCH_CHECK() {
-if [ "$(dpkg --print-architecture)" != "amd64" ]; then
-  echo -e "\n ${CROSS} This script will not work with PiMox! \n"
-  echo -e "Exiting..."
-  sleep 2
-exit
-fi
-}
-
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Disable IPv6: ${BGN}No${CL}"
-  DISABLEIP6="no"
-  echo -e "${DGN}Using Interface MTU Size: ${BGN}Default${CL}"
-  MTU=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-
-function exit-script() {
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-}
-
-function advanced_settings() {
-if CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3); then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-else
-    exit-script
-fi
-
-if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
-    if [ -z $PW1 ]; then
-        PW1="Automatic Login"
-        PW=" "
-    else
-        PW="-password $PW1"
-    fi
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    exit-script
-fi
-
-if CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_ID" ]; then
-        CT_ID="$NEXTID"
-        echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"
-    else
-        echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-    fi
-else
-    exit
-fi
-
-if CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" 3>&1 1>&2 2>&3); then
-    if [ -z "$CT_NAME" ]; then
-        HN="$NSAPP"
-    else
-        HN=$(echo ${CT_NAME,,} | tr -d ' ')
-    fi
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-else
-    exit-script
-fi
-
-if DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z "$DISK_SIZE" ]; then
-        DISK_SIZE="$var_disk"
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-        else
-        if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-          echo -e "${RD}⚠ DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
-          advanced_settings
-        fi
-        echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" 3>&1 1>&2 2>&3); then
-    if [ -z "$CORE_COUNT" ]; then
-        CORE_COUNT="$var_cpu"
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    else
-        echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-    fi
-else
-    exit-script
-fi
-
-if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
-    if [ -z "$RAM_SIZE" ]; then
-        RAM_SIZE="$var_ram"
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    else
-        echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-    fi
-else
-    exit-script
-fi
-
-if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" 3>&1 1>&2 2>&3); then
-    if [ -z "$BRG" ]; then
-        BRG="vmbr0"
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    else
-        echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-    fi
-else
-    exit-script
-fi
-
-if NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $NET ]; then
-        NET="dhcp"
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    else
-        echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-    fi
-else
-    exit-script
-fi
-if GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" 3>&1 1>&2 2>&3); then
-    if [ -z $GATE1 ]; then
-        GATE1="Default"
-        GATE=""
-    else
-        GATE=",gw=$GATE1"
-    fi
-        echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-    DISABLEIP6="yes"
-else
-    DISABLEIP6="no"
-fi
-    echo -e "${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
-if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
-    if [ -z $MTU1 ]; then
-        MTU1="Default"
-        MTU=""
-    else
-        MTU=",mtu=$MTU1"
-    fi
-        echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}"
-else
-    exit-script
-fi
-
-if SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" 3>&1 1>&2 2>&3); then
-    if [ -z $SD ]; then
-        SX=Host
-        SD=""
-    else
-        SX=$SD
-        SD="-searchdomain=$SD"
-    fi
-        echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-else
-    exit-script
-fi
-
-if NX=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" 3>&1 1>&2 2>&3); then
-    if [ -z $NX ]; then
-        NX=Host    
-        NS=""
-    else
-        NS="-nameserver=$NX"
-    fi
-        echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-else
-    exit-script
-fi
-
-if MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
-    if [ -z $MAC1 ]; then
-        MAC1="Default"
-        MAC=""
-    else
-        MAC=",hwaddr=$MAC1"
-        echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-else
-    exit-script
-fi
-
-if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
-    if [ -z $VLAN1 ]; then
-        VLAN1="Default"
-        VLAN=""
-    else
-        VLAN=",tag=$VLAN1"
-    fi
-        echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    exit-script
-fi
-
-if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-    SSH="yes"
-else
-    SSH="no"
-fi
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
-
-if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-    VERB="yes"
-else
-    VERB="no"
-fi
-    echo -e "${DGN}Enable Verbose Mode: ${BGN}$VERB${CL}"
-
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-fi
-}
-
-function install_script() {
-ARCH_CHECK
-PVE_CHECK
-NEXTID=$(pvesh get /cluster/nextid)
-header_info
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-function update_script() {
-header_info
-msg_info "Updating ${APP}"
-bash /var/www/html/update.sh
-msg_ok "Updated ${APP}"
-msg_ok "Update Successfull"
-exit
-}
-
-if command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  install_script
-fi
-
-if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/apache2/sites-available/grocy.conf ]]; then
-  msg_error "No ${APP} Installation Found!"
-  exit 
-fi
-
-if ! command -v pveversion >/dev/null 2>&1; then
-  if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC.  Proceed?" 10 58); then
-    clear
-    echo -e "⚠  User exited script \n"
-    exit
-  fi
-  update_script
-fi
-
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null 
-export tz=$timezone
-export DISABLEIPV6=$DISABLEIP6
-export APPLICATION=$APP
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN$MTU
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}${CL} \n"
diff --git a/ct/grocy.sh b/ct/grocy.sh
new file mode 100644
index 00000000..43ca9c5a
--- /dev/null
+++ b/ct/grocy.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/next/misc/debian.func)
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+
+   ____ __________  _______  __
+  / __  / ___/ __ \/ ___/ / / /
+ / /_/ / /  / /_/ / /__/ /_/ / 
+ \__, /_/   \____/\___/\__, /  
+/____/                /____/   
+ 
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="grocy"
+var_disk="2"
+var_cpu="1"
+var_ram="512"
+var_os="debian"
+var_version="11"
+varibles
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET=dhcp
+  GATE=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+msg_info "Updating ${APP}"
+bash /var/www/html/update.sh
+msg_ok "Updated ${APP}"
+msg_ok "Update Successfull"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP}${CL} \n"
diff --git a/install/deluge-install.sh b/install/deluge-install.sh
new file mode 100644
index 00000000..1a55fb27
--- /dev/null
+++ b/install/deluge-install.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Python3-pip"
+$STD apt-get install -y python3-pip
+msg_ok "Installed Python3-pip"
+
+msg_info "Installing Deluge"
+$STD pip install deluge[all]
+$STD pip install lbry-libtorrent
+msg_ok "Installed Deluge"
+
+msg_info "Creating Service"
+service_path="/etc/systemd/system/deluged.service"
+echo "[Unit]
+Description=Deluge Bittorrent Client Daemon
+Documentation=man:deluged
+After=network-online.target
+
+[Service]
+Type=simple
+UMask=007
+ExecStart=/usr/local/bin/deluged -d
+Restart=on-failure
+TimeoutStopSec=300
+
+[Install]
+WantedBy=multi-user.target" >$service_path
+
+service_path="/etc/systemd/system/deluge-web.service"
+echo "[Unit]
+Description=Deluge Bittorrent Client Web Interface
+Documentation=man:deluge-web
+After=deluged.service
+Wants=deluged.service
+
+[Service]
+Type=simple
+UMask=027
+ExecStart=/usr/local/bin/deluge-web -d
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target" >$service_path
+systemctl enable --now -q deluged.service
+systemctl enable --now -q deluge-web.service
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/deluge-v5-install.sh b/install/deluge-v5-install.sh
deleted file mode 100644
index dbc85972..00000000
--- a/install/deluge-v5-install.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Python3-pip"
-$STD apt-get install -y python3-pip
-msg_ok "Installed Python3-pip"
-
-msg_info "Installing Deluge"
-$STD pip install deluge[all]
-$STD pip install lbry-libtorrent
-msg_ok "Installed Deluge"
-
-msg_info "Creating Service"
-service_path="/etc/systemd/system/deluged.service"
-echo "[Unit]
-Description=Deluge Bittorrent Client Daemon
-Documentation=man:deluged
-After=network-online.target
-
-[Service]
-Type=simple
-UMask=007
-ExecStart=/usr/local/bin/deluged -d
-Restart=on-failure
-TimeoutStopSec=300
-
-[Install]
-WantedBy=multi-user.target" >$service_path
-
-service_path="/etc/systemd/system/deluge-web.service"
-echo "[Unit]
-Description=Deluge Bittorrent Client Web Interface
-Documentation=man:deluge-web
-After=deluged.service
-Wants=deluged.service
-
-[Service]
-Type=simple
-UMask=027
-ExecStart=/usr/local/bin/deluge-web -d
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target" >$service_path
-systemctl enable --now -q deluged.service
-systemctl enable --now -q deluge-web.service
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/devuan-install.sh b/install/devuan-install.sh
new file mode 100644
index 00000000..eb2b237b
--- /dev/null
+++ b/install/devuan-install.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/devuan-v5-install.sh b/install/devuan-v5-install.sh
deleted file mode 100644
index a8ca650d..00000000
--- a/install/devuan-v5-install.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/emby-install.sh b/install/emby-install.sh
new file mode 100644
index 00000000..668222f7
--- /dev/null
+++ b/install/emby-install.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then
+  msg_info "Setting Up Hardware Acceleration"
+  $STD apt-get -y install \
+    va-driver-all \
+    ocl-icd-libopencl1
+  if [[ ${PCT_OSVERSION} == "20.04" ]]; then 
+  $STD apt-get install -y beignet-opencl-icd
+  else
+  $STD apt-get install -y intel-opencl-icd
+  fi
+  /bin/chgrp video /dev/dri
+  /bin/chmod 755 /dev/dri
+  /bin/chmod 660 /dev/dri/*
+  msg_ok "Set Up Hardware Acceleration"
+fi
+
+LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
+
+msg_info "Installing Emby"
+wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb
+$STD dpkg -i emby-server-deb_${LATEST}_amd64.deb
+msg_ok "Installed Emby"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+rm emby-server-deb_${LATEST}_amd64.deb
+msg_ok "Cleaned"
diff --git a/install/emby-v5-install.sh b/install/emby-v5-install.sh
deleted file mode 100644
index 0a41c2c5..00000000
--- a/install/emby-v5-install.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then
-  msg_info "Setting Up Hardware Acceleration"
-  $STD apt-get -y install \
-    va-driver-all \
-    ocl-icd-libopencl1
-  if [[ ${PCT_OSVERSION} == "20.04" ]]; then 
-  $STD apt-get install -y beignet-opencl-icd
-  else
-  $STD apt-get install -y intel-opencl-icd
-  fi
-  /bin/chgrp video /dev/dri
-  /bin/chmod 755 /dev/dri
-  /bin/chmod 660 /dev/dri/*
-  msg_ok "Set Up Hardware Acceleration"
-fi
-
-LATEST=$(curl -sL https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest | grep '"tag_name":' | cut -d'"' -f4)
-
-msg_info "Installing Emby"
-wget -q https://github.com/MediaBrowser/Emby.Releases/releases/download/${LATEST}/emby-server-deb_${LATEST}_amd64.deb
-$STD dpkg -i emby-server-deb_${LATEST}_amd64.deb
-msg_ok "Installed Emby"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-rm emby-server-deb_${LATEST}_amd64.deb
-msg_ok "Cleaned"
diff --git a/install/emqx-install.sh b/install/emqx-install.sh
new file mode 100644
index 00000000..74b3c2d3
--- /dev/null
+++ b/install/emqx-install.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing EMQX"
+$STD bash <(curl -fsSL https://packagecloud.io/install/repositories/emqx/emqx/script.deb.sh)
+$STD apt-get install -y emqx
+$STD systemctl enable --now emqx
+msg_ok "Installed EMQX"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+apt-get autoremove >/dev/null
+apt-get autoclean >/dev/null
+msg_ok "Cleaned"
diff --git a/install/emqx-v5-install.sh b/install/emqx-v5-install.sh
deleted file mode 100644
index 853a3cdb..00000000
--- a/install/emqx-v5-install.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing EMQX"
-$STD bash <(curl -fsSL https://packagecloud.io/install/repositories/emqx/emqx/script.deb.sh)
-$STD apt-get install -y emqx
-$STD systemctl enable --now emqx
-msg_ok "Installed EMQX"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-apt-get autoremove >/dev/null
-apt-get autoclean >/dev/null
-msg_ok "Cleaned"
diff --git a/install/esphome-install.sh b/install/esphome-install.sh
new file mode 100644
index 00000000..fe8e8e46
--- /dev/null
+++ b/install/esphome-install.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y git
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Python3-pip"
+$STD apt-get install -y python3-pip
+msg_ok "Installed Python3-pip"
+
+msg_info "Installing ESPHome"
+$STD pip3 install esphome
+msg_ok "Installed ESPHome"
+
+msg_info "Installing ESPHome Dashboard"
+$STD pip3 install tornado esptool
+
+service_path="/etc/systemd/system/esphomeDashboard.service"
+echo "[Unit]
+Description=ESPHome Dashboard
+After=network.target
+[Service]
+ExecStart=/usr/local/bin/esphome /root/config/ dashboard
+Restart=always
+User=root
+[Install]
+WantedBy=multi-user.target" >$service_path
+$STD systemctl enable esphomeDashboard.service
+systemctl start esphomeDashboard
+msg_ok "Installed ESPHome Dashboard"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/esphome-v5-install.sh b/install/esphome-v5-install.sh
deleted file mode 100644
index 7bd8b99f..00000000
--- a/install/esphome-v5-install.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Python3-pip"
-$STD apt-get install -y python3-pip
-msg_ok "Installed Python3-pip"
-
-msg_info "Installing ESPHome"
-$STD pip3 install esphome
-msg_ok "Installed ESPHome"
-
-msg_info "Installing ESPHome Dashboard"
-$STD pip3 install tornado esptool
-
-service_path="/etc/systemd/system/esphomeDashboard.service"
-echo "[Unit]
-Description=ESPHome Dashboard
-After=network.target
-[Service]
-ExecStart=/usr/local/bin/esphome /root/config/ dashboard
-Restart=always
-User=root
-[Install]
-WantedBy=multi-user.target" >$service_path
-$STD systemctl enable esphomeDashboard.service
-systemctl start esphomeDashboard
-msg_ok "Installed ESPHome Dashboard"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/go2rtc-install.sh b/install/go2rtc-install.sh
new file mode 100644
index 00000000..75211aeb
--- /dev/null
+++ b/install/go2rtc-install.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing go2rtc"
+mkdir -p /opt/go2rtc
+cd /opt/go2rtc
+wget -q https://github.com/AlexxIT/go2rtc/releases/latest/download/go2rtc_linux_amd64
+chmod +x go2rtc_linux_amd64
+msg_ok "Installed go2rtc"
+
+msg_info "Creating Service"
+service_path="/etc/systemd/system/go2rtc.service"
+echo "[Unit]
+Description=go2rtc service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+ExecStart=/opt/go2rtc/go2rtc_linux_amd64
+
+[Install]
+WantedBy=multi-user.target" >$service_path
+systemctl enable -q --now go2rtc
+msg_ok "Created Service"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/go2rtc-v5-install.sh b/install/go2rtc-v5-install.sh
deleted file mode 100644
index 57577695..00000000
--- a/install/go2rtc-v5-install.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS"
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing go2rtc"
-mkdir -p /opt/go2rtc
-cd /opt/go2rtc
-wget -q https://github.com/AlexxIT/go2rtc/releases/latest/download/go2rtc_linux_amd64
-chmod +x go2rtc_linux_amd64
-msg_ok "Installed go2rtc"
-
-msg_info "Creating Service"
-service_path="/etc/systemd/system/go2rtc.service"
-echo "[Unit]
-Description=go2rtc service
-After=network.target
-
-[Service]
-Type=simple
-User=root
-ExecStart=/opt/go2rtc/go2rtc_linux_amd64
-
-[Install]
-WantedBy=multi-user.target" >$service_path
-systemctl enable -q --now go2rtc
-msg_ok "Created Service"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/grafana-install.sh b/install/grafana-install.sh
new file mode 100644
index 00000000..718cc230
--- /dev/null
+++ b/install/grafana-install.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y gnupg
+$STD apt-get install -y apt-transport-https
+$STD apt-get install -y software-properties-common
+msg_ok "Installed Dependencies"
+
+msg_info "Setting up Grafana Repository"
+wget -q -O /usr/share/keyrings/grafana.key https://apt.grafana.com/gpg.key
+sh -c 'echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" > /etc/apt/sources.list.d/grafana.list'
+msg_ok "Set up Grafana Repository"
+
+msg_info "Installing Grafana"
+$STD apt-get update
+$STD apt-get install -y grafana
+msg_ok "Installed Grafana"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+msg_ok "Cleaned"
diff --git a/install/grafana-v5-install.sh b/install/grafana-v5-install.sh
deleted file mode 100644
index 9b327c23..00000000
--- a/install/grafana-v5-install.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y gnupg
-$STD apt-get install -y apt-transport-https
-$STD apt-get install -y software-properties-common
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Grafana Repository"
-wget -q -O /usr/share/keyrings/grafana.key https://apt.grafana.com/gpg.key
-sh -c 'echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" > /etc/apt/sources.list.d/grafana.list'
-msg_ok "Set up Grafana Repository"
-
-msg_info "Installing Grafana"
-$STD apt-get update
-$STD apt-get install -y grafana
-msg_ok "Installed Grafana"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-systemctl start grafana-server
-$STD systemctl enable grafana-server.service
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-msg_ok "Cleaned"
diff --git a/install/grocy-install.sh b/install/grocy-install.sh
new file mode 100644
index 00000000..b51cfbcc
--- /dev/null
+++ b/install/grocy-install.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2023 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y apache2
+$STD apt-get install -y unzip
+$STD apt-get install -y apt-transport-https
+$STD apt-get install -y lsb-release
+msg_ok "Installed Dependencies"
+
+msg_info "Installing PHP 8.1"
+curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg
+sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+$STD apt-get update
+$STD apt-get install -y php8.1
+$STD apt-get install -y libapache2-mod-php8.1
+$STD apt-get install -y php8.1-sqlite3
+$STD apt-get install -y php8.1-gd
+$STD apt-get install -y php8.1-intl
+$STD apt-get install -y php8.1-mbstring
+msg_ok "Installed PHP 8.1"
+
+msg_info "Installing grocy"
+wget -q https://releases.grocy.info/latest
+$STD unzip latest -d /var/www/html
+chown -R www-data:www-data /var/www/html
+cp /var/www/html/config-dist.php /var/www/html/data/config.php
+chmod +x /var/www/html/update.sh
+
+cat <<EOF >/etc/apache2/sites-available/grocy.conf
+<VirtualHost *:80>
+  ServerAdmin webmaster@localhost
+  DocumentRoot /var/www/html/public
+  ErrorLog /var/log/apache2/error.log
+<Directory /var/www/html/public>
+  Options Indexes FollowSymLinks MultiViews
+  AllowOverride All
+  Order allow,deny
+  allow from all
+</Directory>
+</VirtualHost>
+EOF
+
+$STD a2dissite 000-default.conf
+$STD a2ensite grocy.conf
+$STD a2enmod rewrite
+systemctl reload apache2
+msg_ok "Installed grocy"
+
+motd_ssh
+root
+
+msg_info "Cleaning up"
+$STD apt-get autoremove
+$STD apt-get autoclean
+rm -rf /root/latest
+msg_ok "Cleaned"
diff --git a/install/grocy-v5-install.sh b/install/grocy-v5-install.sh
deleted file mode 100644
index f5bf1469..00000000
--- a/install/grocy-v5-install.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2023 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-if [ "$VERBOSE" = "yes" ]; then set -x; STD=""; else STD="silent"; fi
-silent() { "$@" > /dev/null 2>&1; }
-if [ "$DISABLEIPV6" == "yes" ]; then echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf; $STD sysctl -p; fi
-YW=$(echo "\033[33m")
-RD=$(echo "\033[01;31m")
-BL=$(echo "\033[36m")
-GN=$(echo "\033[1;92m")
-CL=$(echo "\033[m")
-RETRY_NUM=10
-RETRY_EVERY=3
-CM="${GN}✓${CL}"
-CROSS="${RD}✗${CL}"
-BFR="\\r\\033[K"
-HOLD="-"
-set -Eeuo pipefail
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-function error_handler() {
-  local exit_code="$?"
-  local line_number="$1"
-  local command="$2"
-  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  echo -e "\n$error_message\n"
-}
-
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-function msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
-
-msg_info "Setting up Container OS "
-sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
-locale-gen >/dev/null
-echo $tz > /etc/timezone
-ln -sf /usr/share/zoneinfo/$tz /etc/localtime
-for ((i=RETRY_NUM; i>0; i--)); do
-  if [ "$(hostname -I)" != "" ]; then
-    break
-  fi
-  echo 1>&2 -en "${CROSS}${RD} No Network! "
-  sleep $RETRY_EVERY
-done
-if [ "$(hostname -I)" = "" ]; then
-  echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}"
-  echo -e " 🖧  Check Network Settings"
-  exit 1
-fi
-msg_ok "Set up Container OS"
-msg_ok "Network Connected: ${BL}$(hostname -I)"
-
-set +e
-trap - ERR
-if ping -c 1 -W 1 1.1.1.1 &> /dev/null; then msg_ok "Internet Connected"; else
-  msg_error "Internet NOT Connected"
-    read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-      echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
-    else
-      echo -e " 🖧  Check Network Settings"
-      exit 1
-    fi
-fi
-RESOLVEDIP=$(getent hosts github.com | awk '{ print $1 }')
-if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-
-msg_info "Updating Container OS"
-$STD apt-get update
-$STD apt-get -y upgrade
-msg_ok "Updated Container OS"
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y apache2
-$STD apt-get install -y unzip
-$STD apt-get install -y apt-transport-https
-$STD apt-get install -y lsb-release
-msg_ok "Installed Dependencies"
-
-msg_info "Installing PHP 8.1"
-curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg
-sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-$STD apt-get update
-$STD apt-get install -y php8.1
-$STD apt-get install -y libapache2-mod-php8.1
-$STD apt-get install -y php8.1-sqlite3
-$STD apt-get install -y php8.1-gd
-$STD apt-get install -y php8.1-intl
-$STD apt-get install -y php8.1-mbstring
-msg_ok "Installed PHP 8.1"
-
-msg_info "Installing grocy"
-wget -q https://releases.grocy.info/latest
-$STD unzip latest -d /var/www/html
-chown -R www-data:www-data /var/www/html
-cp /var/www/html/config-dist.php /var/www/html/data/config.php
-chmod +x /var/www/html/update.sh
-
-cat <<EOF >/etc/apache2/sites-available/grocy.conf
-<VirtualHost *:80>
-  ServerAdmin webmaster@localhost
-  DocumentRoot /var/www/html/public
-  ErrorLog /var/log/apache2/error.log
-<Directory /var/www/html/public>
-  Options Indexes FollowSymLinks MultiViews
-  AllowOverride All
-  Order allow,deny
-  allow from all
-</Directory>
-</VirtualHost>
-EOF
-
-$STD a2dissite 000-default.conf
-$STD a2ensite grocy.conf
-$STD a2enmod rewrite
-systemctl reload apache2
-msg_ok "Installed grocy"
-
-echo "export TERM='xterm-256color'" >>/root/.bashrc
-echo -e "$APPLICATION LXC provided by https://tteck.github.io/Proxmox/\n" > /etc/motd
-chmod -x /etc/update-motd.d/*
-if ! getent shadow root | grep -q "^root:[^\!*]"; then
-  msg_info "Customizing Container"
-  GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
-  mkdir -p $(dirname $GETTY_OVERRIDE)
-  cat <<EOF >$GETTY_OVERRIDE
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
-EOF
-  systemctl daemon-reload
-  systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
-  msg_ok "Customized Container"
-fi
-if [[ "${SSH_ROOT}" == "yes" ]]; then sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config; systemctl restart sshd; fi
-
-msg_info "Cleaning up"
-$STD apt-get autoremove
-$STD apt-get autoclean
-rm -rf /root/latest
-msg_ok "Cleaned"
diff --git a/misc/ubuntu.func b/misc/ubuntu.func
index 4f7738c1..9c7debf0 100644
--- a/misc/ubuntu.func
+++ b/misc/ubuntu.func
@@ -88,13 +88,13 @@ echo_default() {
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
-function exit-script() {
+exit-script() {
     clear
     echo -e "⚠  User exited script \n"
     exit
 }
 
-function advanced_settings() {
+advanced_settings() {
   if var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
       "18.04" "Bionic" OFF \
       "20.04" "Focal" ON \
@@ -312,7 +312,7 @@ function advanced_settings() {
   fi
 }
 
-function install_script() {
+install_script() {
   arch_check
   pve_check
   NEXTID=$(pvesh get /cluster/nextid)
@@ -380,7 +380,9 @@ build_container() {
     $PW
   "
   bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
+
 if [ "$CT_TYPE" == "0" ]; then
+  if [[ "$APP" != "emby" && "$APP" != "jellyfin" && "$APP" != "plex" ]]; then
 LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
 cat <<EOF >>$LXC_CONFIG
 lxc.cgroup2.devices.allow: a
@@ -393,7 +395,23 @@ lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=
 lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
 lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
 EOF
+  fi
 fi
+
+if [ "$CT_TYPE" == "0" ]; then
+ if [[ "$APP" == "emby" || "$APP" == "jellyfin" || "$APP" == "plex" ]]; then
+LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
+cat <<EOF >>$LXC_CONFIG
+lxc.cgroup2.devices.allow: c 226:0 rwm
+lxc.cgroup2.devices.allow: c 226:128 rwm
+lxc.cgroup2.devices.allow: c 29:0 rwm
+lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file
+lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir
+lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file
+EOF
+  fi
+fi
+
   msg_info "Starting LXC Container"
   pct start $CTID
   msg_ok "Started LXC Container"