diff --git a/.gitmodules b/.gitmodules
index d64d61e..7633c27 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,8 @@
 
 [submodule "dirs/moonraker"]
 	path = dirs/moonraker
-	url = https://github.com/Arksine/moonraker
\ No newline at end of file
+	url = https://github.com/Arksine/moonraker
+
+[submodule "dirs/mainsail-config"]
+	path = dirs/mainsail-config
+	url = https://github.com/mainsail-crew/mainsail-config
diff --git a/dirs/printer_data/config/moonraker.conf b/dirs/printer_data/config/moonraker.conf
index 17f975e..ff0bcd3 100644
--- a/dirs/printer_data/config/moonraker.conf
+++ b/dirs/printer_data/config/moonraker.conf
@@ -4,7 +4,7 @@ port: 7126
 # The maximum size allowed for a file upload (in MiB).  Default 1024 MiB
 max_upload_size: 1024
 # Path to klippy Unix Domain Socket
-klippy_uds_address: ~/taz/printer_data_taz/comms/klippy.sock
+klippy_uds_address: ~/PRINTERNAME/printer_data/comms/klippy.sock
 
 [file_manager]
 # post processing for object cancel. Not recommended for low resource SBCs such as a Pi Zero. Default False
@@ -45,14 +45,14 @@ enable_auto_refresh: True
 type: web
 channel: stable
 repo: mainsail-crew/mainsail
-path: ~/mainsail
+path: ~/PRINTERNAME/mainsail
 
-[update_manager mainsail-config]
-type: git_repo
-primary_branch: master
-path: ~/taz/mainsail-config
-origin: https://github.com/mainsail-crew/mainsail-config.git
-managed_services: klipper
+# [update_manager mainsail-config]
+# type: git_repo
+# primary_branch: master
+# path: ~/PRINTERNAME/mainsail-config
+# origin: https://github.com/mainsail-crew/mainsail-config.git
+# managed_services: klipper
 
 ### moonraker-timelapse
 ### Don't forget to include timelapse.cfg to your printer.cfg
@@ -73,18 +73,18 @@ managed_services: klipper
 #ffmpeg_binary_path: /usr/bin/ffmpeg
 
 # Crowsnest update_manager entry
-[update_manager crowsnest]
-type: git_repo
-path: ~/crowsnest
-origin: https://github.com/mainsail-crew/crowsnest.git
-managed_services: crowsnest
-install_script: tools/pkglist.sh
+# [update_manager crowsnest]
+# type: git_repo
+# path: ~/crowsnest
+# origin: https://github.com/mainsail-crew/crowsnest.git
+# managed_services: crowsnest
+# install_script: tools/pkglist.sh
 
-# Sonar update_manager entry
-[update_manager sonar]
-type: git_repo
-path: ~/sonar
-origin: https://github.com/mainsail-crew/sonar.git
-primary_branch: main
-managed_services: sonar
-install_script: tools/install.sh
+# # Sonar update_manager entry
+# [update_manager sonar]
+# type: git_repo
+# path: ~/sonar
+# origin: https://github.com/mainsail-crew/sonar.git
+# primary_branch: main
+# managed_services: sonar
+# install_script: tools/install.sh
diff --git a/setup.sh b/setup.sh
index d95c843..c26710f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -32,6 +32,9 @@ done
 DEVICE_INDEX=$(dialog --backtitle "drwho@hackers.town" --title "USB Device Selection" --menu "Select USB Device" --output-fd 1 40 0 1 ${C[@]})
 DEVICE=${DEVICES[$DEVICE_INDEX]}
 
+# Name Printer
+PRINTER_NAME="$(dialog --backtitle \"drwho@hackers.town\" --title \"Printer Name\" --inputbox \"Name This Printer\" 8 40 3>&1 1>&2 2>&3)"
+
 # Build Klipper
 cat ./config/$CONFIG_FILE | sed -e "s/^serial: .\+$/serial: \/dev\/serial\/by-id\/${DEVICE}/" > ./printer.cfg
 make -j$(nproc)
@@ -55,3 +58,5 @@ mkdir -p ~/PRINTER/backup
 cd $ROOT_DIR
 wget -q -O mainsail.zip https://github.com/mainsail-crew/mainsail/releases/latest/download/mainsail.zip
 unzip -o mainsail.zip -d dirs/mainsail
+
+# Install System Services