diff --git a/scripts/backup.sh b/scripts/backup.sh
index f7f5057..2a0f5c2 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -35,9 +35,9 @@ read_bb4u_stat(){
   fi
 }
 
-##############################################################################################
-#********************************************************************************************#
-##############################################################################################
+################################################################################
+#******************************************************************************#
+################################################################################
 
 backup_printer_cfg(){
   check_for_backup_dir
@@ -68,20 +68,31 @@ backup_klipper_config_dir(){
   fi
 }
 
-
-###TODO re-evaluate if this function is still needed (just backup the full klipper_config dir instead?)
-backup_moonraker_conf(){
+backup_moonraker_database(){
   check_for_backup_dir
-  if [ -f ${HOME}/moonraker.conf ]; then
+  if ls -d ${HOME}/.moonraker_database* 2>/dev/null 1>&2; then
     get_date
     status_msg "Timestamp: $current_date"
-    status_msg "Create backup of moonraker.conf ..."
-    cp ${HOME}/moonraker.conf $BACKUP_DIR/moonraker.conf."$current_date".backup && ok_msg "Backup complete!"
+    mkdir -p "$BACKUP_DIR/mr_db_backup/$current_date"
+    for database in $(ls -d ${HOME}/.moonraker_database*)
+    do
+      status_msg "Create backup of $database ..."
+      cp -r $database "$BACKUP_DIR/mr_db_backup/$current_date"
+      ok_msg "Done!"
+    done
+    ok_msg "Backup complete!\n"
   else
-    ok_msg "No moonraker.conf found! Skipping backup ..."
+    ok_msg "No Moonraker database found! Skipping backup ..."
   fi
 }
 
+if ls -d ${HOME}/.octoprint* 2>/dev/null 1>&2; then
+    for folder in $(ls -d ${HOME}/.octoprint*)
+    do
+      status_msg "Removing $folder ..." && rm -rf $folder && ok_msg "Done!"
+    done
+  fi
+
 backup_klipper(){
   if [ -d $KLIPPER_DIR ] && [ -d $KLIPPY_ENV ]; then
     status_msg "Creating Klipper backup ..."
diff --git a/scripts/ui/backup_menu.sh b/scripts/ui/backup_menu.sh
index 83780cd..16755a1 100755
--- a/scripts/ui/backup_menu.sh
+++ b/scripts/ui/backup_menu.sh
@@ -5,15 +5,15 @@ backup_ui(){
   echo -e "|           ${yellow}Backup location: ~/kiauh-backups${default}            | "
   hr
   echo -e "|  Configuration folder: |  Klipper Webinterface:       | "
-  echo -e "|  0) [Klipper configs]  |  3) [Mainsail]               | "
-  echo -e "|                        |  4) [Fluidd]                 | "
+  echo -e "|  0) [Klipper configs]  |  4) [Mainsail]               | "
+  echo -e "|                        |  5) [Fluidd]                 | "
   echo -e "|  Firmware:             |                              | "
   echo -e "|  1) [Klipper]          |  HDMI Screen:                | "
-  echo -e "|                        |  5) [KlipperScreen]          | "
+  echo -e "|                        |  6) [KlipperScreen]          | "
   echo -e "|  Klipper API:          |                              | "
   echo -e "|  2) [Moonraker]        |  Other:                      | "
-  echo -e "|                        |  6) [Duet Web Control]       | "
-  echo -e "|                        |  7) [OctoPrint]              | "
+  echo -e "|  3) [Moonraker DB]     |  7) [Duet Web Control]       | "
+  echo -e "|                        |  8) [OctoPrint]              | "
   quit_footer
 }
 
@@ -29,14 +29,16 @@ backup_menu(){
       2)
         do_action "backup_moonraker" "backup_ui";;
       3)
-        do_action "backup_mainsail" "backup_ui";;
+        do_action "backup_moonraker_database" "backup_ui";;
       4)
-        do_action "backup_fluidd" "backup_ui";;
+        do_action "backup_mainsail" "backup_ui";;
       5)
-        do_action "backup_klipperscreen" "backup_ui";;
+        do_action "backup_fluidd" "backup_ui";;
       6)
-        do_action "backup_dwc2" "backup_ui";;
+        do_action "backup_klipperscreen" "backup_ui";;
       7)
+        do_action "backup_dwc2" "backup_ui";;
+      8)
         do_action "backup_octoprint" "backup_ui";;
       Q|q)
         clear; main_menu; break;;