diff --git a/resources/moonraker.service b/resources/moonraker.service
index 8ab0126..01d9ab5 100644
--- a/resources/moonraker.service
+++ b/resources/moonraker.service
@@ -1,16 +1,20 @@
-#Systemd service file for moonraker
+#Systemd Moonraker Service
+
 [Unit]
 Description=Starts Moonraker %INST% on startup
+Documentation=https://moonraker.readthedocs.io/
 After=network.target
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
+Environment=MOONRAKER_CONF=%CFG%
+Environment=MOONRAKER_LOG=%LOG%
 Type=simple
 SupplementaryGroups=moonraker-admin
 User=%USER%
 RemainAfterExit=yes
-ExecStart=%MR_ENV%/bin/python %MR_DIR%/moonraker/moonraker.py -l %MR_LOG% -c %MR_CONF%
+ExecStart=%ENV%/bin/python %DIR%/moonraker/moonraker.py -c ${MOONRAKER_CONF} -l ${MOONRAKER_LOG}
 Restart=always
 RestartSec=10
\ No newline at end of file
diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh
deleted file mode 100755
index 1196ad5..0000000
--- a/scripts/install_moonraker.sh
+++ /dev/null
@@ -1,321 +0,0 @@
-### base variables
-SYSTEMDDIR="/etc/systemd/system"
-MOONRAKER_ENV="${HOME}/moonraker-env"
-MOONRAKER_DIR="${HOME}/moonraker"
-MOONRAKER_REPO="https://github.com/Arksine/moonraker.git"
-
-system_check_moonraker(){
-  ### python 3 check
-  status_msg "Your Python 3 version is: $(python3 --version)"
-  major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1)
-  minor=$(python3 --version | cut -d"." -f2)
-  if [ "$major" -ge 3 ] && [ "$minor" -ge 7 ]; then
-    py_chk_ok="true"
-  else
-    py_chk_ok="false"
-  fi
-}
-
-moonraker_setup_dialog(){
-  ### check for existing moonraker service installations
-  SERVICE_FILES=$(find "$SYSTEMDDIR" -regextype posix-extended -regex "$SYSTEMDDIR/moonraker(-[^0])?[0-9]*.service")
-  if [ -n "$SERVICE_FILES" ]; then
-    ERROR_MSG="At least one Moonraker service is already installed:"
-    for service in $SERVICE_FILES; do
-      ERROR_MSG="${ERROR_MSG}\n ➔ $service"
-    done && return
-  fi
-
-  status_msg "Initializing Moonraker installation ..."
-  ### checking system for python3.7+
-  system_check_moonraker
-  ### exit moonraker setup if python versioncheck fails
-  if [ $py_chk_ok = "false" ]; then
-    ERROR_MSG="Versioncheck failed! Python 3.7 or newer required!\n"
-    ERROR_MSG="${ERROR_MSG} Please upgrade Python."
-    print_msg && clear_msg && return
-  fi
-
-  ### count amount of klipper services
-  SERVICE_FILES=$(find "$SYSTEMDDIR" -regextype posix-extended -regex "$SYSTEMDDIR/klipper(-[^0])+[0-9]*.service")
-  if [ -f /etc/init.d/klipper ] || [ -f /etc/systemd/system/klipper.service ]; then
-    KLIPPER_COUNT=1
-  elif [ -n "$SERVICE_FILES" ]; then
-    KLIPPER_COUNT=$(echo "$SERVICE_FILES" | wc -l)
-  fi
-
-  ### initial moonraker.conf path check
-  check_klipper_cfg_path
-
-  top_border
-  if [[ $KLIPPER_COUNT -eq 1 ]]; then
-    printf "|${green}%-55s${default}|\n" " 1 Klipper instance was found!"
-  elif [[ $KLIPPER_COUNT -gt 1 ]]; then
-    printf "|${green}%-55s${default}|\n" " $KLIPPER_COUNT Klipper instances were found!"
-  else
-    echo -e "| ${yellow}INFO: No existing Klipper installation found!${default}         |"
-  fi
-  echo -e "| Usually you need one Moonraker instance per Klipper   |"
-  echo -e "| instance. Though you can install as many as you wish. |"
-  bottom_border
-  echo
-  count=""
-  while [[ ! ($count =~ ^[1-9]+((0)+)?$) ]]; do
-    read -p "${cyan}###### Number of Moonraker instances to set up:${default} " count
-    if [[ ! ($count =~ ^[1-9]+((0)+)?$) ]]; then
-      warn_msg "Invalid Input!\n"
-    else
-      echo
-      read -p "${cyan}###### Install $count instance(s)? (Y/n):${default} " yn
-      case "$yn" in
-        Y|y|Yes|yes|"")
-          echo -e "###### > Yes"
-          status_msg "Installing Moonraker ...\n"
-          moonraker_setup "$count"
-          break;;
-        N|n|No|no)
-          echo -e "###### > No"
-          warn_msg "Exiting Moonraker setup ...\n"
-          break;;
-        *)
-          print_unkown_cmd
-          print_msg && clear_msg;;
-      esac
-    fi
-  done
-}
-
-moonraker_setup(){
-  INSTANCE_COUNT=$1
-  ### checking dependencies
-  dep=(wget curl unzip dfu-util virtualenv)
-  ### additional deps for kiauh compatibility for armbian
-  dep+=(libjpeg-dev zlib1g-dev)
-  dependency_check
-
-  ### step 1: clone moonraker
-  status_msg "Downloading Moonraker ..."
-  ### force remove existing moonraker dir and clone into fresh moonraker dir
-  [ -d "$MOONRAKER_DIR" ] && rm -rf "$MOONRAKER_DIR"
-  cd "${HOME}" && git clone $MOONRAKER_REPO
-  ok_msg "Download complete!"
-
-  ### step 2: install moonraker dependencies and create python virtualenv
-  status_msg "Installing dependencies ..."
-  install_moonraker_packages
-  create_moonraker_virtualenv
-
-  ### step 3: create moonraker.conf folder and moonraker.confs
-  create_moonraker_conf
-
-  ### step 4: create final moonraker instances
-  create_moonraker_service
-
-  ### step 5: create polkit rules for moonraker
-  moonraker_polkit
-
-  ### confirm message
-  if [[ $INSTANCE_COUNT -eq 1 ]]; then
-    CONFIRM_MSG="Moonraker has been set up!"
-  elif [[ $INSTANCE_COUNT -gt 1 ]]; then
-    CONFIRM_MSG="$INSTANCE_COUNT Moonraker instances have been set up!"
-  fi && print_msg && clear_msg
-
-  ### display moonraker ips to the user
-  print_mr_ip_list; echo
-}
-
-install_moonraker_packages(){
-  ### read PKGLIST from official install script
-  status_msg "Reading dependencies..."
-  install_script="${HOME}/moonraker/scripts/install-moonraker.sh"
-  PKGLIST=$(grep "PKGLIST=" "$install_script" | sed 's/PKGLIST//g; s/[$"{}=]//g; s/\s\s*/ /g' | tr -d '\n')
-  for pkg in $PKGLIST; do
-    echo "${cyan}$pkg${default}"
-  done
-  read -r -a PKGLIST <<< "$PKGLIST"
-
-  ### Update system package info
-  status_msg "Running apt-get update..."
-  sudo apt-get update --allow-releaseinfo-change
-
-  ### Install desired packages
-  status_msg "Installing packages..."
-  sudo apt-get install --yes "${PKGLIST[@]}"
-}
-
-create_moonraker_virtualenv(){
-  status_msg "Installing python virtual environment..."
-
-  ### If venv exists and user prompts a rebuild, then do so
-  if [ -d "$MOONRAKER_ENV" ] && [ "$REBUILD_ENV" = "y" ]; then
-    status_msg "Removing old virtualenv"
-    rm -rf "$MOONRAKER_ENV"
-  fi
-
-  if [ ! -d "$MOONRAKER_ENV" ]; then
-    virtualenv -p /usr/bin/python3 "$MOONRAKER_ENV"
-  fi
-
-  ### Install/update dependencies
-  "$MOONRAKER_ENV"/bin/pip install -r "$MOONRAKER_DIR"/scripts/moonraker-requirements.txt
-}
-
-create_moonraker_service(){
-  ### get config directory
-  source_kiauh_ini
-
-  ### set up default values
-  SINGLE_INST=1
-  CFG_PATH="$klipper_cfg_loc"
-  MR_ENV=$MOONRAKER_ENV
-  MR_DIR=$MOONRAKER_DIR
-  MR_LOG="${HOME}/klipper_logs/moonraker.log"
-  MR_CONF="$CFG_PATH/moonraker.conf"
-  MR_SERV_SRC="${SRCDIR}/kiauh/resources/moonraker.service"
-  MR_SERV_TARGET="$SYSTEMDDIR/moonraker.service"
-
-  write_mr_service(){
-    if [ ! -f $MR_SERV_TARGET ]; then
-      status_msg "Creating Moonraker Service $i ..."
-        sudo cp "$MR_SERV_SRC" $MR_SERV_TARGET
-        sudo sed -i "s|%INST%|$i|" $MR_SERV_TARGET
-        sudo sed -i "s|%USER%|${USER}|" $MR_SERV_TARGET
-        sudo sed -i "s|%MR_ENV%|$MR_ENV|" $MR_SERV_TARGET
-        sudo sed -i "s|%MR_DIR%|$MR_DIR|" $MR_SERV_TARGET
-        sudo sed -i "s|%MR_LOG%|$MR_LOG|" $MR_SERV_TARGET
-        sudo sed -i "s|%MR_CONF%|$MR_CONF|" $MR_SERV_TARGET
-    fi
-  }
-
-  if [[ $SINGLE_INST -eq $INSTANCE_COUNT ]]; then
-    ### write single instance service
-    write_mr_service
-    ### enable instance
-    do_action_service "enable" "moonraker"
-    ok_msg "Single Moonraker instance created!"
-    ### launching instance
-    do_action_service "start" "moonraker"
-  else
-    i=1
-    while [[ $i -le $INSTANCE_COUNT ]]; do
-      ### rewrite default variables for multi instance cases
-      CFG_PATH="$klipper_cfg_loc/printer_$i"
-      MR_SERV_TARGET="$SYSTEMDDIR/moonraker-$i.service"
-      MR_CONF="$CFG_PATH/moonraker.conf"
-      MR_LOG="${HOME}/klipper_logs/moonraker-$i.log"
-      ### write multi instance service
-      write_mr_service
-      ### enable instance
-      do_action_service "enable" "moonraker-$i"
-      ok_msg "Moonraker instance #$i created!"
-      ### launching instance
-      do_action_service "start" "moonraker-$i"
-      ### raise values by 1
-      i=$((i+1))
-    done
-    unset i
-
-    ### enable mainsails remoteMode if mainsail is found
-    if [ -d "$MAINSAIL_DIR" ]; then
-      status_msg "Mainsail installation found!"
-      status_msg "Enabling Mainsail remoteMode ..."
-      enable_mainsail_remotemode
-      ok_msg "Mainsails remoteMode enabled!"
-    fi
-  fi
-}
-
-create_moonraker_conf(){
-  ### get config directory
-  source_kiauh_ini
-
-  ### set up default values
-  SINGLE_INST=1
-  PORT=7125
-  CFG_PATH="$klipper_cfg_loc"
-  LOG_PATH="${HOME}/klipper_logs"
-  MR_CONF="$CFG_PATH/moonraker.conf"
-  MR_DB="${HOME}/.moonraker_database"
-  KLIPPY_UDS="/tmp/klippy_uds"
-  MR_CONF_SRC="${SRCDIR}/kiauh/resources/moonraker.conf"
-  mr_ip_list=()
-  IP=$(hostname -I | cut -d" " -f1)
-  LAN="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-2).0.0/16"
-
-  write_mr_conf(){
-    [ ! -d "$CFG_PATH" ] && mkdir -p "$CFG_PATH"
-    if [ ! -f "$MR_CONF" ]; then
-      status_msg "Creating moonraker.conf in $CFG_PATH ..."
-        cp "$MR_CONF_SRC" "$MR_CONF"
-        sed -i "s|%PORT%|$PORT|" "$MR_CONF"
-        sed -i "s|%CFG%|$CFG_PATH|" "$MR_CONF"
-        sed -i "s|%LOG%|$LOG_PATH|" "$MR_CONF"
-        sed -i "s|%MR_DB%|$MR_DB|" "$MR_CONF"
-        sed -i "s|%UDS%|$KLIPPY_UDS|" "$MR_CONF"
-        # if host ip is not in the default ip ranges, replace placeholder
-        # otherwise remove placeholder from config
-        if ! grep -q "$LAN" "$MR_CONF"; then
-          sed -i "s|%LAN%|$LAN|" "$MR_CONF"
-        else
-          sed -i "/%LAN%/d" "$MR_CONF"
-        fi
-        sed -i "s|%USER%|${USER}|g" "$MR_CONF"
-      ok_msg "moonraker.conf created!"
-    else
-      warn_msg "There is already a file called 'moonraker.conf'!"
-      warn_msg "Skipping..."
-    fi
-  }
-
-  if [[ $SINGLE_INST -eq $INSTANCE_COUNT ]]; then
-    ### write single instance config
-    write_mr_conf
-    mr_ip_list+=("$IP:$PORT")
-  else
-    i=1
-    while [[ $i -le $INSTANCE_COUNT ]]; do
-      ### rewrite default variables for multi instance cases
-      CFG_PATH="$klipper_cfg_loc/printer_$i"
-      MR_CONF="$CFG_PATH/moonraker.conf"
-      MR_DB="${HOME}/.moonraker_database_$i"
-      KLIPPY_UDS="/tmp/klippy_uds-$i"
-
-      ### write multi instance config
-      write_mr_conf
-      mr_ip_list+=("$IP:$PORT")
-
-      ### raise values by 1
-      PORT=$((PORT+1))
-      i=$((i+1))
-    done
-    unset PORT && unset i
-  fi
-}
-
-print_mr_ip_list(){
-  i=1
-  for ip in "${mr_ip_list[@]}"; do
-    echo -e "       ${cyan}● Instance $i:${default} $ip"
-    i=$((i + 1))
-  done
-}
-
-### introduced due to
-### https://github.com/Arksine/moonraker/issues/349
-### https://github.com/Arksine/moonraker/pull/346
-moonraker_polkit(){
-  SYSTEMDDIR="/etc/systemd/system"
-  MOONRAKER_SERVICES=$(find "$SYSTEMDDIR" -regextype posix-extended -regex "$SYSTEMDDIR/moonraker(-[^0])?[0-9]*.service")
-  for service in $MOONRAKER_SERVICES; do
-    HAS_SUPP="$( grep -cm1 "SupplementaryGroups=moonraker-admin" "$service" || true )"
-    if [ "$HAS_SUPP" -eq 0 ]; then
-      status_msg "Adding moonraker-admin supplementary group to $service ..."
-      sudo sed -i "/^Type=simple$/a SupplementaryGroups=moonraker-admin" "$service" \
-      && ok_msg "Adding moonraker-admin supplementary group successfull!"
-    fi
-  done
-  ### execute moonrakers policykit-rules script
-  "${HOME}"/moonraker/scripts/set-policykit-rules.sh
-  sudo systemctl daemon-reload
-}
\ No newline at end of file
diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh
new file mode 100644
index 0000000..491b825
--- /dev/null
+++ b/scripts/moonraker.sh
@@ -0,0 +1,506 @@
+#!/bin/bash
+
+#=======================================================================#
+# Copyright (C) 2020 - 2022 Dominik Willner <th33xitus@gmail.com>       #
+#                                                                       #
+# This file is part of KIAUH - Klipper Installation And Update Helper   #
+# https://github.com/th33xitus/kiauh                                    #
+#                                                                       #
+# This file may be distributed under the terms of the GNU GPLv3 license #
+#=======================================================================#
+
+set -e
+
+### global variables
+SYSTEMD="/etc/systemd/system"
+INITD="/etc/init.d"
+ETCDEF="/etc/default"
+MOONRAKER_ENV="${HOME}/moonraker-env"
+MOONRAKER_DIR="${HOME}/moonraker"
+MOONRAKER_REPO="https://github.com/Arksine/moonraker.git"
+
+#===================================================#
+#================ INSTALL MOONRAKER ================#
+#===================================================#
+
+function system_check_moonraker(){
+  local major minor
+  ### python 3 check
+  status_msg "Your Python 3 version is: $(python3 --version)"
+  major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1)
+  minor=$(python3 --version | cut -d"." -f2)
+  if [ "${major}" -ge 3 ] && [ "${minor}" -ge 7 ]; then
+    echo "true"
+  else
+    echo "false"
+  fi
+}
+
+function moonraker_systemd() {
+  local services
+  services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[^0])?[0-9]*.service")
+  echo "${services}"
+}
+
+function moonraker_setup_dialog(){
+  status_msg "Initializing Moonraker installation ..."
+
+  ### return early if moonraker already exists
+  if [ -n "$(moonraker_systemd)" ]; then
+    ERROR_MSG="At least one Moonraker service is already installed:"
+    for service in $(moonraker_systemd); do
+      ERROR_MSG="${ERROR_MSG}\n ➔ ${service}"
+    done
+    export ERROR_MSG
+    print_error && return
+  fi
+
+  ### return early if python version check fails
+  if [ "$(system_check_moonraker)" == "false" ]; then
+    ERROR_MSG="Versioncheck failed! Python 3.7 or newer required!\n"
+    ERROR_MSG="${ERROR_MSG} Please upgrade Python."
+    export ERROR_MSG
+    print_error && return
+  fi
+
+  top_border
+  if [ -f "${INITD}/klipper" ] || [ -f "${SYSTEMD}/klipper.service" ]; then
+    printf "|${green}%-55s${default}|\n" " 1 Klipper instance was found!"
+  elif [ "$(klipper_systemd | wc -w)" -gt 1 ]; then
+    printf "|${green}%-55s${default}|\n" " $(klipper_systemd | wc -w) Klipper instances were found!"
+  else
+    echo -e "| ${yellow}INFO: No existing Klipper installation found!${default}         |"
+  fi
+  echo -e "| Usually you need one Moonraker instance per Klipper   |"
+  echo -e "| instance. Though you can install as many as you wish. |"
+  bottom_border
+
+  local count
+  while [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; do
+    read -p "${cyan}###### Number of Moonraker instances to set up:${default} " count
+    if [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; then
+      error_msg "Invalid Input!\n"
+    else
+      echo
+      read -p "${cyan}###### Install ${count} instance(s)? (Y/n):${default} " yn
+      case "${yn}" in
+        Y|y|Yes|yes|"")
+          select_msg "Yes"
+          status_msg "Installing ${count} Moonraker instance(s) ... \n"
+          moonraker_setup "${count}"
+          break;;
+        N|n|No|no)
+          select_msg"No"
+          error_msg "Exiting Moonraker setup ...\n"
+          break;;
+        *)
+          invalid_option && print_error
+          ;;
+      esac
+    fi
+  done
+}
+
+function install_moonraker_packages(){
+  local packages
+  local install_script="${HOME}/moonraker/scripts/install-moonraker.sh"
+
+  ### read PKGLIST from official install script
+  status_msg "Reading dependencies..."
+  # shellcheck disable=SC2016
+  packages="$(grep "PKGLIST=" "${install_script}" | cut -d'"' -f2 | sed 's/\${PKGLIST}//g' | tr -d '\n')"
+
+  echo "${cyan}${packages}${white}" | tr '[:space:]' '\n'
+  read -r -a packages <<< "${packages}"
+
+  ### Update system package info
+  status_msg "Updating lists of packages..."
+  sudo apt-get update --allow-releaseinfo-change
+
+  ### Install required packages
+  status_msg "Installing packages..."
+  sudo apt-get install --yes "${packages[@]}"
+}
+
+function create_moonraker_virtualenv(){
+  status_msg "Installing python virtual environment..."
+  ### always create a clean virtualenv
+  [ -d "${MOONRAKER_ENV}" ] && rm -rf "${MOONRAKER_ENV}"
+  virtualenv -p /usr/bin/python3 "${MOONRAKER_ENV}"
+  "${MOONRAKER_ENV}"/bin/pip install -r "${MOONRAKER_DIR}/scripts/moonraker-requirements.txt"
+}
+
+function moonraker_setup(){
+  local instances=${1}
+  ### checking dependencies
+  dep=(wget curl unzip dfu-util virtualenv)
+  ### additional required dependencies on armbian
+  dep+=(libjpeg-dev zlib1g-dev)
+  dependency_check "${dep[@]}"
+
+  ### step 1: clone moonraker
+  status_msg "Downloading Moonraker ..."
+  ### force remove existing moonraker dir and clone into fresh moonraker dir
+  [ -d "${MOONRAKER_DIR}" ] && rm -rf "${MOONRAKER_DIR}"
+  cd "${HOME}" && git clone "${MOONRAKER_REPO}"
+
+  ### step 2: install moonraker dependencies and create python virtualenv
+  status_msg "Installing dependencies ..."
+  install_moonraker_packages
+  create_moonraker_virtualenv
+
+  ### step 3: create moonraker.conf
+  create_moonraker_conf "${instances}"
+
+  ### step 4: create moonraker instances
+  create_moonraker_service "${instances}"
+
+  ### step 5: create polkit rules for moonraker
+  moonraker_polkit
+
+  ### step 6: enable and start all instances
+  do_action_service "enable" "moonraker"
+  do_action_service "start" "moonraker"
+
+  ### confirm message
+  if [[ ${instances} -eq 1 ]]; then
+    CONFIRM_MSG="Moonraker has been set up!"
+  elif [[ ${instances} -gt 1 ]]; then
+    CONFIRM_MSG="${instances} Moonraker instances have been set up!"
+  fi
+  export CONFIRM_MSG
+  print_confirm
+
+  print_mr_ip_list "${mr_ip_list}"
+  return
+}
+
+function write_moonraker_service(){
+  local i=${1} cfg_dir=${2} cfg=${3} log=${4} service=${5}
+  local service_template="${SRCDIR}/kiauh/resources/moonraker.service"
+
+  ### replace all placeholders
+  if [ ! -f "${service}" ]; then
+    status_msg "Creating Moonraker Service ${i} ..."
+      sudo cp "${service_template}" "${service}"
+
+      [ -z "${i}" ] && sudo sed -i "s|instance %INST% ||" "${service}"
+      [ -n "${i}" ] && sudo sed -i "s|%INST%|${i}|" "${service}"
+      sudo sed -i "s|%USER%|${USER}|; s|%ENV%|${MOONRAKER_ENV}|; s|%DIR%|${MOONRAKER_DIR}|" "${service}"
+      sudo sed -i "s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${service}"
+  fi
+  }
+
+function create_moonraker_service(){
+  local instances=${1}
+  if [ "${instances}" -eq 1 ]; then
+    local i=""
+    local cfg_dir="${KLIPPER_CONFIG}"
+    local cfg="${cfg_dir}/moonraker.conf"
+    local log="${HOME}/klipper_logs/moonraker.log"
+    local service="${SYSTEMD}/moonraker.service"
+    ### write single instance service
+    write_moonraker_service "${i}" "${cfg_dir}" "${cfg}" "${log}" "${service}"
+    ok_msg "Single Moonraker instance created!"
+  elif [ "${instances}" -gt 1 ]; then
+    local i=1
+    while [ "${i}" -le "${instances}" ]; do
+      local cfg_dir="${KLIPPER_CONFIG}/printer_${i}"
+      local cfg="${cfg_dir}/moonraker.conf"
+      local log="${HOME}/klipper_logs/moonraker-${i}.log"
+      local service="${SYSTEMD}/moonraker-${i}.service"
+      ### write multi instance service
+      write_moonraker_service "${i}" "${cfg_dir}" "${cfg}" "${log}" "${service}"
+      ok_msg "Moonraker instance #${i} created!"
+      i=$((i+1))
+    done && unset i
+    ### enable mainsails remoteMode if mainsail is found
+    if [ -d "${MAINSAIL_DIR}" ]; then
+      status_msg "Mainsail installation found!"
+      status_msg "Enabling Mainsail remoteMode ..."
+      enable_mainsail_remotemode
+      ok_msg "Mainsails remoteMode enabled!"
+    fi
+  else
+    return 1
+  fi
+}
+
+function write_moonraker_conf(){
+  local cfg_dir=${1} cfg=${2} port=${3} log=${4} db=${5} uds=${6} lan=${7}
+  local conf_template="${SRCDIR}/kiauh/resources/moonraker.conf"
+  [ ! -d "${cfg_dir}" ] && mkdir -p "${cfg_dir}"
+
+  if [ ! -f "${cfg}" ]; then
+    status_msg "Creating moonraker.conf in ${cfg_dir} ..."
+    cp "${conf_template}" "${cfg}"
+    sed -i "s|%USER%|${USER}|g" "${cfg}"
+    sed -i "s|%CFG%|${cfg_dir}|; s|%PORT%|${port}|; s|%LOG%|${log}|; s|%DB%|${db}|; s|%UDS%|${uds}|" "${cfg}"
+    # if host ip is not in the default ip ranges replace placeholder,
+    # otherwise remove placeholder from config
+    if ! grep -q "${lan}" "${cfg}"; then
+      sed -i "s|%LAN%|${lan}|" "${cfg}"
+    else
+      sed -i "/%LAN%/d" "${cfg}"
+    fi
+    ok_msg "moonraker.conf created!"
+  else
+    status_msg "File '${cfg_dir}/moonraker.conf' already exists!\nSkipping..."
+  fi
+}
+
+function create_moonraker_conf(){
+  local instances=${1}
+  local log="${HOME}/klipper_logs"
+  local mr_ip_list=()
+  local ip lan
+
+  ip=$(hostname -I | cut -d" " -f1)
+  lan="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-2).0.0/16"
+
+  if [ "${instances}" -eq 1 ]; then
+    local cfg_dir="${KLIPPER_CONFIG}"
+    local cfg="${cfg_dir}/moonraker.conf"
+    local port=7125
+    local db="${HOME}/.moonraker_database"
+    local uds="/tmp/klippy_uds"
+    ### write single instance config
+    write_moonraker_conf "${cfg_dir}" "${cfg}" "${port}" "${log}" "${db}" "${uds}" "${lan}"
+    mr_ip_list+=("${ip}:${port}")
+  elif [ "${instances}" -gt 1 ]; then
+    local i=1
+    while [ "${i}" -le "${instances}" ]; do
+      local cfg_dir="${KLIPPER_CONFIG}/printer_${i}"
+      local cfg="${cfg_dir}/moonraker.conf"
+      local port=7125
+      local db="${HOME}/.moonraker_database_${i}"
+      local uds="/tmp/klippy_uds-${i}"
+      ### write multi instance config
+      write_moonraker_conf "${cfg_dir}" "${cfg}" "${port}" "${log}" "${db}" "${uds}" "${lan}"
+      mr_ip_list+=("${ip}:${port}")
+      port=$((port+1))
+      i=$((i+1))
+    done && unset port i
+  else
+    return 1
+  fi
+  export mr_ip_list
+}
+
+function print_mr_ip_list(){
+  local ips=${1}
+  local i=0
+  for ip in "${ips[@]}"; do
+    echo -e "       ${cyan}● Instance $((i + 1)):${white} ${ip}"
+  done
+}
+
+### introduced due to
+### https://github.com/Arksine/moonraker/issues/349
+### https://github.com/Arksine/moonraker/pull/346
+function moonraker_polkit(){
+  local has_sup
+  ### check for required SupplementaryGroups entry in service files
+  ### write it to the service if it doesn't exist
+  for service in $(moonraker_systemd); do
+    has_sup="$(grep "SupplementaryGroups=moonraker-admin" "${service}")"
+    if [ -z "${has_sup}" ]; then
+      status_msg "Adding moonraker-admin supplementary group to ${service} ..."
+      sudo sed -i "/^Type=simple$/a SupplementaryGroups=moonraker-admin" "${service}"
+      ok_msg "Adding moonraker-admin supplementary group successfull!"
+    fi
+  done
+  [ -z "${has_sup}" ] && echo "reloading services!!!" && sudo systemctl daemon-reload
+  ### execute moonrakers policykit-rules script
+  /bin/bash "${HOME}/moonraker/scripts/set-policykit-rules.sh"
+}
+
+#==================================================#
+#================ REMOVE MOONRAKER ================#
+#==================================================#
+
+function remove_moonraker_sysvinit() {
+  [ ! -e "${INITD}/moonraker" ] && return
+  status_msg "Removing Moonraker SysVinit service ..."
+  sudo systemctl stop moonraker
+  sudo update-rc.d -f moonraker remove
+  sudo rm -f "${INITD}/moonraker" "${ETCDEF}/moonraker"
+  ok_msg "Moonraker SysVinit service removed!"
+}
+
+function remove_moonraker_systemd() {
+  [ -z "$(moonraker_systemd)" ] && return
+  status_msg "Removing Moonraker Systemd Services ..."
+  local files
+  for service in $(moonraker_systemd | cut -d"/" -f5)
+  do
+    status_msg "Removing ${service} ..."
+    sudo systemctl stop "${service}"
+    sudo systemctl disable "${service}"
+    sudo rm -f "${SYSTEMD}/${service}"
+    ok_msg "Done!"
+  done
+  ### reloading units
+  sudo systemctl daemon-reload
+  sudo systemctl reset-failed
+  ok_msg "Moonraker Services removed!"
+}
+
+function remove_moonraker_logs() {
+  local files
+  files=$(find "${HOME}/klipper_logs" -maxdepth 1 -regextype posix-extended -regex "${HOME}/klipper_logs/moonraker(-[^0])?[0-9]*\.log(.*)?")
+  if [ -n "${files}" ]; then
+    for file in ${files}; do
+      status_msg "Removing ${file} ..."
+      rm -f "${file}"
+      ok_msg "${file} removed!"
+    done
+  fi
+}
+
+function remove_moonraker_api_key() {
+  ### remove legacy api key
+  if [ -e "${HOME}/.klippy_api_key" ]; then
+    status_msg "Removing legacy API Key ..."
+    rm "${HOME}/.klippy_api_key"
+    ok_msg "Done!"
+  fi
+  ### remove api key
+  if [ -e "${HOME}/.moonraker_api_key" ]; then
+    status_msg "Removing API Key ..."
+    rm "${HOME}/.moonraker_api_key"
+    ok_msg "Done!"
+  fi
+}
+
+function remove_moonraker_dir() {
+  [ ! -d "${MOONRAKER_DIR}" ] && return
+  status_msg "Removing Moonraker directory ..."
+  rm -rf "${MOONRAKER_DIR}"
+  ok_msg "Directory removed!"
+}
+
+function remove_moonraker_env() {
+  [ ! -d "${MOONRAKER_ENV}" ] && return
+  status_msg "Removing moonraker-env directory ..."
+  rm -rf "${MOONRAKER_ENV}"
+  ok_msg "Directory removed!"
+}
+
+function remove_moonraker_polkit() {
+  status_msg "Removing all Moonraker PolicyKit rules ..."
+  /bin/bash "${HOME}/moonraker/scripts/set-policykit-rules.sh" --clear
+  ok_msg "Done!"
+}
+
+#TODO this is technically not moonraker but rather webinterface related configs, so this should be refactored.
+function remove_moonraker_nginx() {
+  if [[ -e "${NGINX_CONFD}/upstreams.conf" || -e "${NGINX_CONFD}/common_vars.conf" ]]; then
+    status_msg "Removing Moonraker NGINX configuration ..."
+    sudo rm -f "${NGINX_CONFD}/upstreams.conf" "${NGINX_CONFD}/common_vars.conf"
+    ok_msg "Moonraker NGINX configuration removed!"
+  fi
+}
+
+
+function remove_moonraker(){
+  remove_moonraker_sysvinit
+  remove_moonraker_systemd
+  remove_moonraker_logs
+  remove_moonraker_api_key
+  remove_moonraker_dir
+  remove_moonraker_env
+  remove_moonraker_polkit
+  remove_moonraker_nginx
+
+  confirm="Moonraker was successfully removed!"
+  print_confirm "${confirm}" && return
+}
+
+#==================================================#
+#================ UPDATE MOONRAKER ================#
+#==================================================#
+
+function update_moonraker(){
+  do_action_service "stop" "moonraker"
+  if [ ! -d "${MOONRAKER_DIR}" ]; then
+    cd "${HOME}" && git clone "${MOONRAKER_REPO}"
+  else
+    bb4u "moonraker"
+    status_msg "Updating Moonraker ..."
+    cd "${MOONRAKER_DIR}" && git pull
+    ### read PKGLIST and install possible new dependencies
+    install_moonraker_packages
+    ### install possible new python dependencies
+    "${MOONRAKER_ENV}"/bin/pip install -r "${MOONRAKER_DIR}/scripts/moonraker-requirements.txt"
+  fi
+  ### required due to https://github.com/Arksine/moonraker/issues/349
+  moonraker_polkit
+
+  update_log_paths "moonraker"
+  ok_msg "Update complete!"
+  do_action_service "restart" "moonraker"
+}
+
+#==================================================#
+#================ MOONRAKER STATUS ================#
+#==================================================#
+
+function get_moonraker_status(){
+  local sf_count status
+  sf_count="$(moonraker_systemd | wc -w)"
+
+  ### remove the "SERVICE" entry from the data array if a moonraker service is installed
+  local data_arr=(SERVICE "${MOONRAKER_DIR}" "${MOONRAKER_ENV}")
+  [ "${sf_count}" -gt 0 ] && unset "data_arr[0]"
+
+  ### count+1 for each found data-item from array
+  local filecount=0
+  for data in "${data_arr[@]}"; do
+    [ -e "${data}" ] && filecount=$(("${filecount}" + 1))
+  done
+
+  if [ "${filecount}" == "${#data_arr[*]}" ]; then
+    status="$(printf "${green}Installed: %-5s${white}" "${sf_count}")"
+  elif [ "${filecount}" == 0 ]; then
+    status="${red}Not installed!${white}  "
+  else
+    status="${yellow}Incomplete!${white}     "
+  fi
+  echo "${status}"
+}
+
+function get_local_moonraker_commit(){
+  if [ -d "${MOONRAKER_DIR}" ] && [ -d "${MOONRAKER_DIR}"/.git ]; then
+    cd "${MOONRAKER_DIR}"
+    commit="$(git describe HEAD --always --tags | cut -d "-" -f 1,2)"
+  else
+    commit="${NONE}"
+  fi
+  echo "${commit}"
+}
+
+function get_remote_moonraker_commit(){
+  if [ -d "${MOONRAKER_DIR}" ] && [ -d "${MOONRAKER_DIR}"/.git ]; then
+    cd "${MOONRAKER_DIR}"
+    git fetch origin -q
+    commit=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
+  else
+    commit="${NONE}"
+  fi
+  echo "${commit}"
+}
+
+function compare_moonraker_versions(){
+  unset MOONRAKER_UPDATE_AVAIL
+  if [ "$(get_local_moonraker_commit)" != "$(get_remote_moonraker_commit)" ]; then
+    LOCAL_COMMIT="${yellow}$(printf "%-12s" "$(get_local_moonraker_commit)")${white}"
+    REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remotemoonrakerr_commit)")${white}"
+    # add klipper to the update all array for the update all function in the updater
+    MOONRAKER_UPDATE_AVAIL="true" && update_arr+=(update_moonraker)
+  else
+    LOCAL_COMMIT="${green}$(printf "%-12s" "$(get_remote_moonraker_commit)")${white}"
+    REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remote_moonraker_commit)")${white}"
+    KLIPPER_UPDATE_AVAIL="false"
+  fi
+}
diff --git a/scripts/remove.sh b/scripts/remove.sh
index 9e69bf5..0fd8a37 100755
--- a/scripts/remove.sh
+++ b/scripts/remove.sh
@@ -1,79 +1,6 @@
 ### base variables
 SYSTEMDDIR="/etc/systemd/system"
 
-remove_moonraker(){
-  shopt -s extglob # enable extended globbing
-  ### remove "legacy" moonraker init.d service
-  if [ -f /etc/init.d/moonraker ]; then
-    status_msg "Removing Moonraker Service ..."
-    sudo systemctl stop moonraker
-    sudo update-rc.d -f moonraker remove
-    sudo rm -f /etc/init.d/moonraker
-    sudo rm -f /etc/default/moonraker
-    ok_msg "Moonraker Service removed!"
-  fi
-
-  ### remove all moonraker services
-  FILE="$SYSTEMDDIR/moonraker?(-*([0-9])).service"
-  if ls $FILE 2>/dev/null 1>&2; then
-    status_msg "Removing Moonraker Services ..."
-    for service in $(ls $FILE | cut -d"/" -f5)
-    do
-      status_msg "Removing $service ..."
-      sudo systemctl stop $service
-      sudo systemctl disable $service
-      sudo rm -f $SYSTEMDDIR/$service
-      ok_msg "Done!"
-    done
-    ### reloading units
-    sudo systemctl daemon-reload
-    sudo systemctl reset-failed
-    ok_msg "Moonraker Service removed!"
-  fi
-
-  ### remove all logfiles
-  FILE="${HOME}/klipper_logs/moonraker?(-*([0-9])).log"
-  if ls $FILE 2>/dev/null 1>&2; then
-    for log in $(ls $FILE); do
-      status_msg "Removing $log ..."
-      rm -f $log
-      ok_msg "$log removed!"
-    done
-  fi
-
-  ### remove moonraker nginx config
-  if [[ -e $NGINX_CONFD/upstreams.conf || -e $NGINX_CONFD/common_vars.conf ]]; then
-    status_msg "Removing Moonraker NGINX configuration ..."
-    sudo rm -f $NGINX_CONFD/upstreams.conf $NGINX_CONFD/common_vars.conf && ok_msg "Moonraker NGINX configuration removed!"
-  fi
-
-  ### remove legacy api key
-  if [ -e ${HOME}/.klippy_api_key ]; then
-    status_msg "Removing legacy API Key ..." && rm ${HOME}/.klippy_api_key && ok_msg "Done!"
-  fi
-
-  ### remove api key
-  if [ -e ${HOME}/.moonraker_api_key ]; then
-    status_msg "Removing API Key ..." && rm ${HOME}/.moonraker_api_key && ok_msg "Done!"
-  fi
-
-  ### removing moonraker and moonraker-env folder
-  if [ -d $MOONRAKER_DIR ]; then
-    status_msg "Removing Moonraker directory ..."
-    rm -rf $MOONRAKER_DIR && ok_msg "Directory removed!"
-  fi
-  if [ -d $MOONRAKER_ENV ]; then
-    status_msg "Removing moonraker-env directory ..."
-    rm -rf $MOONRAKER_ENV && ok_msg "Directory removed!"
-  fi
-
-  CONFIRM_MSG=" Moonraker was successfully removed!"
-  shopt -u extglob # disable extended globbing
-}
-
-#############################################################
-#############################################################
-
 remove_dwc2(){
   ### remove "legacy" init.d service
   if [ -e /etc/init.d/dwc ]; then
diff --git a/scripts/status.sh b/scripts/status.sh
index cd59d4a..1d3ec35 100755
--- a/scripts/status.sh
+++ b/scripts/status.sh
@@ -54,38 +54,6 @@ dwc2_status(){
   fi
 }
 
-moonraker_status(){
-  mrcount=0
-  moonraker_data=(
-    SERVICE
-    $MOONRAKER_DIR
-    $MOONRAKER_ENV_DIR
-  )
-
-  ### count amount of moonraker service files in /etc/systemd/system
-  SERVICE_FILE_COUNT=$(ls /etc/systemd/system | grep -E "^moonraker(\-[[:digit:]]+)?\.service$" | wc -l)
-
-  ### remove the "SERVICE" entry from the moonraker_data array if a moonraker service is installed
-  [ $SERVICE_FILE_COUNT -gt 0 ] && unset moonraker_data[0]
-
-  ### count+1 for each found data-item from array
-  for mrd in "${moonraker_data[@]}"
-  do
-    if [ -e $mrd ]; then
-      mrcount=$(expr $mrcount + 1)
-    fi
-  done
-
-  ### display status
-  if [ "$mrcount" == "${#moonraker_data[*]}" ]; then
-    MOONRAKER_STATUS="$(printf "${green}Installed: %-5s${default}" $SERVICE_FILE_COUNT)"
-  elif [ "$mrcount" == 0 ]; then
-    MOONRAKER_STATUS="${red}Not installed!${default}  "
-  else
-    MOONRAKER_STATUS="${yellow}Incomplete!${default}     "
-  fi
-}
-
 mainsail_status(){
   mcount=0
   mainsail_data=(
@@ -294,33 +262,6 @@ compare_dwc2_versions(){
 #############################################################
 #############################################################
 
-read_moonraker_versions(){
-  if [ -d $MOONRAKER_DIR ] && [ -d $MOONRAKER_DIR/.git ]; then
-    cd $MOONRAKER_DIR
-    git fetch origin master -q
-    LOCAL_MOONRAKER_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
-    REMOTE_MOONRAKER_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
-  else
-    LOCAL_MOONRAKER_COMMIT=$NONE
-    REMOTE_MOONRAKER_COMMIT=$NONE
-  fi
-}
-
-compare_moonraker_versions(){
-  unset MOONRAKER_UPDATE_AVAIL
-  read_moonraker_versions
-  if [ "$LOCAL_MOONRAKER_COMMIT" != "$REMOTE_MOONRAKER_COMMIT" ]; then
-    LOCAL_MOONRAKER_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
-    REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
-    # add moonraker to the update all array for the update all function in the updater
-    MOONRAKER_UPDATE_AVAIL="true" && update_arr+=(update_moonraker)
-  else
-    LOCAL_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
-    REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
-    MOONRAKER_UPDATE_AVAIL="false"
-  fi
-}
-
 read_local_mainsail_version(){
   unset MAINSAIL_VER_FOUND
   if [ -e $MAINSAIL_DIR/.version ]; then
diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh
index a543f99..f630cb3 100755
--- a/scripts/ui/main_menu.sh
+++ b/scripts/ui/main_menu.sh
@@ -6,7 +6,7 @@ main_ui(){
   echo -e "|  0) [Upload Log]     |       Klipper: $(get_klipper_status)|"
   echo -e "|                      |                                |"
   echo -e "|  1) [Install]        |--------------------------------|"
-  echo -e "|  2) [Update]         |     Moonraker: $MOONRAKER_STATUS|"
+  echo -e "|  2) [Update]         |     Moonraker: $(get_moonraker_status)|"
   echo -e "|  3) [Remove]         |                                |"
   echo -e "|  4) [Advanced]       |      Mainsail: $MAINSAIL_STATUS|"
   echo -e "|  5) [Backup]         |        Fluidd: $FLUIDD_STATUS|"
@@ -48,7 +48,7 @@ main_menu(){
   #check install status
     print_kiauh_version
 #    klipper_status
-    moonraker_status
+#    moonraker_status
     dwc2_status
     fluidd_status
     mainsail_status
diff --git a/scripts/update.sh b/scripts/update.sh
index f33778f..b3cc6d2 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -251,26 +251,6 @@ update_fluidd(){
   symlink_webui_nginx_log "fluidd"
 }
 
-update_moonraker(){
-  do_action_service "stop" "moonraker"
-  bb4u "moonraker"
-  status_msg "Updating Moonraker ..."
-  ### pull latest files from github
-  cd "$MOONRAKER_DIR" && git pull
-  ### read PKGLIST and install possible new dependencies
-  install_moonraker_packages
-  ### install possible new python dependencies
-  MR_REQ_TXT="$MOONRAKER_DIR/scripts/moonraker-requirements.txt"
-  "$MOONRAKER_ENV"/bin/pip install -r "$MR_REQ_TXT"
-  update_log_paths "moonraker"
-
-  ### required due to https://github.com/Arksine/moonraker/issues/349
-  moonraker_polkit
-
-  ok_msg "Update complete!"
-  do_action_service "restart" "moonraker"
-}
-
 update_klipperscreen(){
   stop_klipperscreen
   cd $KLIPPERSCREEN_DIR