diff --git a/Makefile b/Makefile
index 61f042d1..26ec0b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,6 @@ deb64opb:
 	python3 ${PY_PATH}/build_iso.py set e-openbox b-deb64
 dev64opb:
 	python3 ${PY_PATH}/build_iso.py set e-openbox b-dev64
-debloadxf:
-	python3 ${PY_PATH}/build_iso.py set e-loadxf b-deb64
-devloadxf:
-	python3 ${PY_PATH}/build_iso.py set e-loadxf b-dev64
 
 ## 32 bit ISOs
 deb32xfce:
@@ -59,11 +55,17 @@ debarmopb:
 devarmopb:
 	python3 ${PY_PATH}/build_iso.py set e-openbox b-devarm
 
+## loaded isos
+debloadxf:
+	python3 ${PY_PATH}/build_iso.py set e-loadxf b-loadeb
+devloadxf:
+	python3 ${PY_PATH}/build_iso.py set e-loadxf b-loadev
+
 ## server isos
 debserver:
-	python3 ${PY_PATH}/build_iso.py set e-server b-deb64
+	python3 ${PY_PATH}/build_iso.py set e-server b-srvdeb
 devserver:
-	python3 ${PY_PATH}/build_iso.py set e-server b-dev64
+	python3 ${PY_PATH}/build_iso.py set e-server b-srvdev
 
 
 release:
diff --git a/iso_configs/grub/server_deb64/grub b/iso_configs/grub/server_deb_64/grub
similarity index 100%
rename from iso_configs/grub/server_deb64/grub
rename to iso_configs/grub/server_deb_64/grub
diff --git a/iso_configs/grub/server_deb_themes/peppermint/background.png b/iso_configs/grub/server_deb_themes/peppermint/background.png
new file mode 100644
index 00000000..bf8fd87b
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/background.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/icons/gnu-linux.png b/iso_configs/grub/server_deb_themes/peppermint/icons/gnu-linux.png
new file mode 100644
index 00000000..db2fcfd8
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/icons/gnu-linux.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/icons/lfs.png b/iso_configs/grub/server_deb_themes/peppermint/icons/lfs.png
new file mode 100644
index 00000000..2c54036d
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/icons/lfs.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/icons/linux.png b/iso_configs/grub/server_deb_themes/peppermint/icons/linux.png
new file mode 100644
index 00000000..348ebdd1
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/icons/linux.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/icons/unknown.png b/iso_configs/grub/server_deb_themes/peppermint/icons/unknown.png
new file mode 100644
index 00000000..4733dc87
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/icons/unknown.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/select_c.png b/iso_configs/grub/server_deb_themes/peppermint/select_c.png
new file mode 100644
index 00000000..b1f8d580
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/select_c.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/select_e.png b/iso_configs/grub/server_deb_themes/peppermint/select_e.png
new file mode 100644
index 00000000..93323686
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/select_e.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/select_w.png b/iso_configs/grub/server_deb_themes/peppermint/select_w.png
new file mode 100644
index 00000000..28f6424e
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/select_w.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_c.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_c.png
new file mode 100644
index 00000000..d0dd52a2
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_c.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_e.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_e.png
new file mode 100644
index 00000000..394cbe4f
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_e.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_n.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_n.png
new file mode 100644
index 00000000..476f8bc6
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_n.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_ne.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_ne.png
new file mode 100644
index 00000000..9e26959b
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_ne.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_nw.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_nw.png
new file mode 100644
index 00000000..5c3cba87
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_nw.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_s.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_s.png
new file mode 100644
index 00000000..85a8901d
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_s.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_se.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_se.png
new file mode 100644
index 00000000..d8627ee5
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_se.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_sw.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_sw.png
new file mode 100644
index 00000000..67c600c8
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_sw.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminal_box_w.png b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_w.png
new file mode 100644
index 00000000..d066e2db
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminal_box_w.png differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminus-12.pf2 b/iso_configs/grub/server_deb_themes/peppermint/terminus-12.pf2
new file mode 100644
index 00000000..60920353
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminus-12.pf2 differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminus-14.pf2 b/iso_configs/grub/server_deb_themes/peppermint/terminus-14.pf2
new file mode 100644
index 00000000..8ab8bd10
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminus-14.pf2 differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminus-16.pf2 b/iso_configs/grub/server_deb_themes/peppermint/terminus-16.pf2
new file mode 100644
index 00000000..6e6b25d3
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminus-16.pf2 differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/terminus-18.pf2 b/iso_configs/grub/server_deb_themes/peppermint/terminus-18.pf2
new file mode 100644
index 00000000..129cef14
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/terminus-18.pf2 differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/theme.txt b/iso_configs/grub/server_deb_themes/peppermint/theme.txt
new file mode 100644
index 00000000..24837958
--- /dev/null
+++ b/iso_configs/grub/server_deb_themes/peppermint/theme.txt
@@ -0,0 +1,42 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 85%
+  height = 65%
+  item_font = "Terminus Regular 14"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "Peppermint will start in %d seconds"
+  color = "#cccccc"
+  font = "Terminus Regular 14"
+}
diff --git a/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_17.pf2 b/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_17.pf2
new file mode 100644
index 00000000..9405954e
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_17.pf2 differ
diff --git a/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_20.pf2 b/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_20.pf2
new file mode 100644
index 00000000..3d903bae
Binary files /dev/null and b/iso_configs/grub/server_deb_themes/peppermint/ubuntu_regular_20.pf2 differ
diff --git a/iso_configs/grub/server_dev64/grub b/iso_configs/grub/server_dev_64/grub
similarity index 100%
rename from iso_configs/grub/server_dev64/grub
rename to iso_configs/grub/server_dev_64/grub
diff --git a/iso_configs/grub/server_dev_themes/peppermint/background.png b/iso_configs/grub/server_dev_themes/peppermint/background.png
new file mode 100644
index 00000000..362b0a68
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/background.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/icons/gnu-linux.png b/iso_configs/grub/server_dev_themes/peppermint/icons/gnu-linux.png
new file mode 100644
index 00000000..db2fcfd8
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/icons/gnu-linux.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/icons/lfs.png b/iso_configs/grub/server_dev_themes/peppermint/icons/lfs.png
new file mode 100644
index 00000000..2c54036d
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/icons/lfs.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/icons/linux.png b/iso_configs/grub/server_dev_themes/peppermint/icons/linux.png
new file mode 100644
index 00000000..348ebdd1
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/icons/linux.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/icons/unknown.png b/iso_configs/grub/server_dev_themes/peppermint/icons/unknown.png
new file mode 100644
index 00000000..4733dc87
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/icons/unknown.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/select_c.png b/iso_configs/grub/server_dev_themes/peppermint/select_c.png
new file mode 100644
index 00000000..b1f8d580
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/select_c.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/select_e.png b/iso_configs/grub/server_dev_themes/peppermint/select_e.png
new file mode 100644
index 00000000..93323686
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/select_e.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/select_w.png b/iso_configs/grub/server_dev_themes/peppermint/select_w.png
new file mode 100644
index 00000000..28f6424e
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/select_w.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_c.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_c.png
new file mode 100644
index 00000000..d0dd52a2
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_c.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_e.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_e.png
new file mode 100644
index 00000000..394cbe4f
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_e.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_n.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_n.png
new file mode 100644
index 00000000..476f8bc6
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_n.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_ne.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_ne.png
new file mode 100644
index 00000000..9e26959b
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_ne.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_nw.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_nw.png
new file mode 100644
index 00000000..5c3cba87
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_nw.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_s.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_s.png
new file mode 100644
index 00000000..85a8901d
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_s.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_se.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_se.png
new file mode 100644
index 00000000..d8627ee5
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_se.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_sw.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_sw.png
new file mode 100644
index 00000000..67c600c8
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_sw.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminal_box_w.png b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_w.png
new file mode 100644
index 00000000..d066e2db
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminal_box_w.png differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminus-12.pf2 b/iso_configs/grub/server_dev_themes/peppermint/terminus-12.pf2
new file mode 100644
index 00000000..60920353
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminus-12.pf2 differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminus-14.pf2 b/iso_configs/grub/server_dev_themes/peppermint/terminus-14.pf2
new file mode 100644
index 00000000..8ab8bd10
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminus-14.pf2 differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminus-16.pf2 b/iso_configs/grub/server_dev_themes/peppermint/terminus-16.pf2
new file mode 100644
index 00000000..6e6b25d3
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminus-16.pf2 differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/terminus-18.pf2 b/iso_configs/grub/server_dev_themes/peppermint/terminus-18.pf2
new file mode 100644
index 00000000..129cef14
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/terminus-18.pf2 differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/theme.txt b/iso_configs/grub/server_dev_themes/peppermint/theme.txt
new file mode 100644
index 00000000..24837958
--- /dev/null
+++ b/iso_configs/grub/server_dev_themes/peppermint/theme.txt
@@ -0,0 +1,42 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 85%
+  height = 65%
+  item_font = "Terminus Regular 14"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "Peppermint will start in %d seconds"
+  color = "#cccccc"
+  font = "Terminus Regular 14"
+}
diff --git a/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_17.pf2 b/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_17.pf2
new file mode 100644
index 00000000..9405954e
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_17.pf2 differ
diff --git a/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_20.pf2 b/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_20.pf2
new file mode 100644
index 00000000..3d903bae
Binary files /dev/null and b/iso_configs/grub/server_dev_themes/peppermint/ubuntu_regular_20.pf2 differ
diff --git a/iso_configs/osrelease/server_deb_64/os-release b/iso_configs/osrelease/server_deb_64/os-release
new file mode 100644
index 00000000..af53259d
--- /dev/null
+++ b/iso_configs/osrelease/server_deb_64/os-release
@@ -0,0 +1,7 @@
+PRETTY_NAME="PeppermintOS"
+NAME="Peppermint"
+ID=peppermint
+VERSION_CODENAME="bookworm"
+HOME_URL="https://peppermintos.com"
+SUPPORT_URL="https://sourceforge.net/p/peppermintos/pepos/"
+BUG_REPORT_URL="https://sourceforge.net/p/peppermintos/pepos/"
\ No newline at end of file
diff --git a/iso_configs/osrelease/server_dev_64/os-release b/iso_configs/osrelease/server_dev_64/os-release
new file mode 100644
index 00000000..3dc0571c
--- /dev/null
+++ b/iso_configs/osrelease/server_dev_64/os-release
@@ -0,0 +1,7 @@
+PRETTY_NAME="PeppermintOS Devuan"
+NAME="Peppermint"
+ID=peppermint
+VERSION_CODENAME="daedalus"
+HOME_URL="https://peppermintos.com"
+SUPPORT_URL="https://forum.peppermintos.com"
+BUG_REPORT_URL="https://forum.peppermintos.com"
diff --git a/iso_configs/sources/server_deb_64/sources.list b/iso_configs/sources/server_deb_64/sources.list
new file mode 100644
index 00000000..696c7b9f
--- /dev/null
+++ b/iso_configs/sources/server_deb_64/sources.list
@@ -0,0 +1,24 @@
+# This system was installed using PeppermintOS removable media
+# (e.g. netinst, live or single CD). The matching "deb cdrom"
+# entries were removed at the end of the installation process.
+# For information about how to configure apt package sources,
+# see the sources.list(5) manual.
+
+# Main Repo - main contrib non-free
+deb http://deb.debian.org/debian/ bookworm main contrib non-free
+deb-src http://deb.debian.org/debian/ bookworm main contrib non-free
+
+# Security Repo - main contrib non-free
+#deb http://security.debian.org/ bookworm-security main contrib non-free
+#deb-src http://security.debian.org/ bookworm-security main contrib non-free
+
+# Updates Repo - main contrib non-free
+#deb http://deb.debian.org/debian bookworm-updates main contrib non-free
+#deb-src http://deb.debian.org/debian bookworm-updates main
+#deb http://deb.debian.org/debian/ bookworm-proposed-updates main contrib non-free
+#deb-src http://deb.debian.org/debian/ bookworm-proposed-updates main contrib non-free
+
+# bookworm-backports, previously on backports.debian.org
+#deb http://deb.debian.org/debian/ bookworm-backports main contrib non-free
+#deb-src http://deb.debian.org/debian/ bookworm-backports main contrib non-free
+
diff --git a/iso_configs/sources/server_dev_64/sources.list b/iso_configs/sources/server_dev_64/sources.list
new file mode 100644
index 00000000..bcd21351
--- /dev/null
+++ b/iso_configs/sources/server_dev_64/sources.list
@@ -0,0 +1,21 @@
+# This system was installed using PeppermintOS removable media
+# (e.g. netinst, live or single CD). The matching "deb cdrom"
+# entries were removed at the end of the installation process.
+# For information about how to configure apt package sources,
+# see the sources.list(5) manual.
+
+# Main Repo - main contrib non-free
+deb http://deb.devuan.org/merged daedalus main contrib non-free
+#deb-src http://deb.devuan.org/merged daedalus main contrib non-free
+
+# Security Repo - main contrib non-free
+#deb http://deb.devuan.org/merged daedalus-security main contrib non-free
+#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free
+
+# Updates Repo - main contrib non-free
+#deb http://deb.devuan.org/merged daedalus-updates main contrib non-free
+#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free
+
+# daedalus-backports, previously on backports.debian.org
+#deb http://deb.devuan.org/merged daedalus-backports main contrib non-free
+#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/background.png b/iso_configs/splash/server_deb_live-theme/live-theme/background.png
new file mode 100644
index 00000000..bf8fd87b
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/background.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/icons/gnu-linux.png b/iso_configs/splash/server_deb_live-theme/live-theme/icons/gnu-linux.png
new file mode 100644
index 00000000..db2fcfd8
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/icons/gnu-linux.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/icons/lfs.png b/iso_configs/splash/server_deb_live-theme/live-theme/icons/lfs.png
new file mode 100644
index 00000000..2c54036d
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/icons/lfs.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/icons/linux.png b/iso_configs/splash/server_deb_live-theme/live-theme/icons/linux.png
new file mode 100644
index 00000000..348ebdd1
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/icons/linux.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/icons/unknown.png b/iso_configs/splash/server_deb_live-theme/live-theme/icons/unknown.png
new file mode 100644
index 00000000..4733dc87
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/icons/unknown.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/select_c.png b/iso_configs/splash/server_deb_live-theme/live-theme/select_c.png
new file mode 100644
index 00000000..b1f8d580
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/select_c.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/select_e.png b/iso_configs/splash/server_deb_live-theme/live-theme/select_e.png
new file mode 100644
index 00000000..93323686
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/select_e.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/select_w.png b/iso_configs/splash/server_deb_live-theme/live-theme/select_w.png
new file mode 100644
index 00000000..28f6424e
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/select_w.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_c.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_c.png
new file mode 100644
index 00000000..d0dd52a2
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_c.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_e.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_e.png
new file mode 100644
index 00000000..394cbe4f
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_e.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_n.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_n.png
new file mode 100644
index 00000000..476f8bc6
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_n.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_ne.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_ne.png
new file mode 100644
index 00000000..9e26959b
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_ne.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_nw.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_nw.png
new file mode 100644
index 00000000..5c3cba87
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_nw.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_s.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_s.png
new file mode 100644
index 00000000..85a8901d
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_s.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_se.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_se.png
new file mode 100644
index 00000000..d8627ee5
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_se.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_sw.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_sw.png
new file mode 100644
index 00000000..67c600c8
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_sw.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_w.png b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_w.png
new file mode 100644
index 00000000..d066e2db
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminal_box_w.png differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminus-12.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-12.pf2
new file mode 100644
index 00000000..60920353
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-12.pf2 differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminus-14.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-14.pf2
new file mode 100644
index 00000000..8ab8bd10
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-14.pf2 differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminus-16.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-16.pf2
new file mode 100644
index 00000000..6e6b25d3
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-16.pf2 differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/terminus-18.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-18.pf2
new file mode 100644
index 00000000..129cef14
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/terminus-18.pf2 differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/theme.txt b/iso_configs/splash/server_deb_live-theme/live-theme/theme.txt
new file mode 100644
index 00000000..c666b67e
--- /dev/null
+++ b/iso_configs/splash/server_deb_live-theme/live-theme/theme.txt
@@ -0,0 +1,42 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 85%
+  height = 65%
+  item_font = "Ubuntu Regular 20"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "Peppermint will start in %d seconds"
+  color = "#cccccc"
+  font = "Ubuntu Regular 17"
+}
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_17.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_17.pf2
new file mode 100644
index 00000000..9405954e
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_17.pf2 differ
diff --git a/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_20.pf2 b/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_20.pf2
new file mode 100644
index 00000000..3d903bae
Binary files /dev/null and b/iso_configs/splash/server_deb_live-theme/live-theme/ubuntu_regular_20.pf2 differ
diff --git a/iso_configs/splash/server_deb_splash/splash.png b/iso_configs/splash/server_deb_splash/splash.png
new file mode 100644
index 00000000..bf8fd87b
Binary files /dev/null and b/iso_configs/splash/server_deb_splash/splash.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/background.png b/iso_configs/splash/server_dev_live-theme/live-theme/background.png
new file mode 100644
index 00000000..362b0a68
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/background.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/icons/gnu-linux.png b/iso_configs/splash/server_dev_live-theme/live-theme/icons/gnu-linux.png
new file mode 100644
index 00000000..db2fcfd8
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/icons/gnu-linux.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/icons/lfs.png b/iso_configs/splash/server_dev_live-theme/live-theme/icons/lfs.png
new file mode 100644
index 00000000..2c54036d
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/icons/lfs.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/icons/linux.png b/iso_configs/splash/server_dev_live-theme/live-theme/icons/linux.png
new file mode 100644
index 00000000..348ebdd1
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/icons/linux.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/icons/unknown.png b/iso_configs/splash/server_dev_live-theme/live-theme/icons/unknown.png
new file mode 100644
index 00000000..4733dc87
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/icons/unknown.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/select_c.png b/iso_configs/splash/server_dev_live-theme/live-theme/select_c.png
new file mode 100644
index 00000000..b1f8d580
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/select_c.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/select_e.png b/iso_configs/splash/server_dev_live-theme/live-theme/select_e.png
new file mode 100644
index 00000000..93323686
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/select_e.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/select_w.png b/iso_configs/splash/server_dev_live-theme/live-theme/select_w.png
new file mode 100644
index 00000000..28f6424e
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/select_w.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_c.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_c.png
new file mode 100644
index 00000000..d0dd52a2
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_c.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_e.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_e.png
new file mode 100644
index 00000000..394cbe4f
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_e.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_n.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_n.png
new file mode 100644
index 00000000..476f8bc6
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_n.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_ne.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_ne.png
new file mode 100644
index 00000000..9e26959b
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_ne.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_nw.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_nw.png
new file mode 100644
index 00000000..5c3cba87
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_nw.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_s.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_s.png
new file mode 100644
index 00000000..85a8901d
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_s.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_se.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_se.png
new file mode 100644
index 00000000..d8627ee5
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_se.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_sw.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_sw.png
new file mode 100644
index 00000000..67c600c8
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_sw.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_w.png b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_w.png
new file mode 100644
index 00000000..d066e2db
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminal_box_w.png differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminus-12.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-12.pf2
new file mode 100644
index 00000000..60920353
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-12.pf2 differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminus-14.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-14.pf2
new file mode 100644
index 00000000..8ab8bd10
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-14.pf2 differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminus-16.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-16.pf2
new file mode 100644
index 00000000..6e6b25d3
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-16.pf2 differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/terminus-18.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-18.pf2
new file mode 100644
index 00000000..129cef14
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/terminus-18.pf2 differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/theme.txt b/iso_configs/splash/server_dev_live-theme/live-theme/theme.txt
new file mode 100644
index 00000000..c666b67e
--- /dev/null
+++ b/iso_configs/splash/server_dev_live-theme/live-theme/theme.txt
@@ -0,0 +1,42 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 85%
+  height = 65%
+  item_font = "Ubuntu Regular 20"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "Peppermint will start in %d seconds"
+  color = "#cccccc"
+  font = "Ubuntu Regular 17"
+}
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_17.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_17.pf2
new file mode 100644
index 00000000..9405954e
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_17.pf2 differ
diff --git a/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_20.pf2 b/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_20.pf2
new file mode 100644
index 00000000..3d903bae
Binary files /dev/null and b/iso_configs/splash/server_dev_live-theme/live-theme/ubuntu_regular_20.pf2 differ
diff --git a/iso_configs/splash/server_dev_splash/splash.png b/iso_configs/splash/server_dev_splash/splash.png
new file mode 100644
index 00000000..362b0a68
Binary files /dev/null and b/iso_configs/splash/server_dev_splash/splash.png differ
diff --git a/python_modules/__pycache__/conf.cpython-311.pyc b/python_modules/__pycache__/conf.cpython-311.pyc
index f6228217..7c0a4109 100644
Binary files a/python_modules/__pycache__/conf.cpython-311.pyc and b/python_modules/__pycache__/conf.cpython-311.pyc differ
diff --git a/python_modules/__pycache__/finish_cleanup.cpython-311.pyc b/python_modules/__pycache__/finish_cleanup.cpython-311.pyc
index a03ba673..0b270ee7 100644
Binary files a/python_modules/__pycache__/finish_cleanup.cpython-311.pyc and b/python_modules/__pycache__/finish_cleanup.cpython-311.pyc differ
diff --git a/python_modules/__pycache__/inflate_bubble.cpython-311.pyc b/python_modules/__pycache__/inflate_bubble.cpython-311.pyc
index bd5dcf14..84419ee1 100644
Binary files a/python_modules/__pycache__/inflate_bubble.cpython-311.pyc and b/python_modules/__pycache__/inflate_bubble.cpython-311.pyc differ
diff --git a/python_modules/__pycache__/infra.cpython-311.pyc b/python_modules/__pycache__/infra.cpython-311.pyc
index 9a42b07f..9db3b62c 100644
Binary files a/python_modules/__pycache__/infra.cpython-311.pyc and b/python_modules/__pycache__/infra.cpython-311.pyc differ
diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py
index cfe55b62..d049906b 100644
--- a/python_modules/build_iso.py
+++ b/python_modules/build_iso.py
@@ -188,8 +188,8 @@ class BuildOpenbox(BuildBase):
                 execute = command + '()'
                 exec(execute)
         return cmd_list
-
-
+        
+    
 class BuildLoaded(BuildBase):
     """ This class will ensure the loaded xfce builds are built """
     def __init__(self, sbase, sarch):
@@ -218,6 +218,33 @@ class BuildLoaded(BuildBase):
         return cmd_list
 
 
+#class BuildServer(BuildBase):
+#    """ This class will ensure the Server builds are built """
+#    def __init__(self, sbase, sarch):
+#        """ 
+#            init the building, super will
+#            ensure that the method resolution order (MRO) is followed
+#            correctly, allowing for a smooth inheritance hierarchy
+#        """
+#        super().__init__(sbase, sarch, self.server_helper)
+
+#    def server_helper(self):
+#        """
+#        The helper functions to ensure the server requirements are 
+#        used
+#        """
+#        arch_suffix = self.sarch[1:]
+#        cmd_list = None
+#        if self.sbase in ["deb", "dev"]:
+#            if arch_suffix in ["64"]:
+#                os.system(f'touch {self.sbase.upper()}.{arch_suffix}server')
+#        if arch_suffix in ["64"]:
+#            cmd_list = getattr(conf, f"build{arch_suffix}_server_build", [])
+#            for command in cmd_list:
+#                execute = command + '()'
+#                exec(execute)
+#        return cmd_list
+
 class BuildServer(BuildBase):
     """ This class will ensure the Server builds are built """
     def __init__(self, sbase, sarch):
@@ -245,6 +272,9 @@ class BuildServer(BuildBase):
                 exec(execute)
         return cmd_list
 
+    def build_system(self, desktop_helper):
+        """ Override build_system to use server_helper """
+        self.server_helper()
 
 
 def readybuild():
@@ -259,12 +289,12 @@ def readybuild():
     os.makedirs('fusato')
 
 
-class Decisions:
+class Decsions:
     """
     Aguments used to tell the application what to build
     """
     def __init__(self):
-        """ init the Decisions """
+        """ init the Decsions """
         # Set up the terminal arguments
         self.argument_parser = argparse.ArgumentParser()
         self.argument_parser.add_argument("set",
@@ -366,8 +396,8 @@ class Decisions:
     def dloadxf(self):
         """ Arguments for the loaded xfce """
         build_type_mapping = {
-            'b-deb64': ("deb", "_64"),
-            'b-dev64': ("dev", "_64"),
+            'b-loadeb': ("loaded_deb", "_64"),
+            'b-loadev': ("loaded_dev", "_64"),
         }
 
         build_argument = self.arguments.b
@@ -382,8 +412,8 @@ class Decisions:
     def dserver(self):
         """ Arguments for the Server """
         build_type_mapping = {
-            'b-deb64': ("deb", "_64"),
-            'b-dev64': ("dev", "_64"),
+            'b-srvdeb': ("server_deb", "_64"),
+            'b-srvdev': ("server_dev", "_64"),
         }
 
         build_argument = self.arguments.b
@@ -396,4 +426,4 @@ class Decisions:
 
 
 
-Decisions()
+Decsions()
diff --git a/python_modules/conf.py b/python_modules/conf.py
index 10e4b764..5f134af2 100644
--- a/python_modules/conf.py
+++ b/python_modules/conf.py
@@ -43,7 +43,6 @@ shared_setup_server_cmds = ('inflate_bubble.set_fusato_server_structure',
                             'inflate_bubble.set_fusato_server_installer_structure',
                             'inflate_bubble.set_grub_shared',
                             'inflate_bubble.set_binary_shared',
-                            'infra.shared_server_folders',
                             'infra.shared_server_files',
                             'infra.shared_server_installer_folders',
                             'infra.shared_server_installer_files',
@@ -67,7 +66,7 @@ setup_loaded_cmds = ('inflate_bubble.set_loaded',
                      'infra.loaded_folders'
                      )
 setup_server_cmds = ('inflate_bubble.set_server',
-                     )
+                    )
 
 
 # Setup grub chroot
@@ -81,6 +80,7 @@ setup_binary_grub_64 = ('inflate_bubble.set_binary_64',)
 setup_binary_grub_arm = ('inflate_bubble.set_binary_arm',)
 setup_binary_grub_32 = ('inflate_bubble.set_binary_32',)
 
+
 # Setup Firmware
 setup_fw_64_32 = ('inflate_bubble.set_firmware',)
 setup_fw_arm = ('inflate_bubble.set_firmware_arm',)
@@ -132,7 +132,7 @@ buildarm_opb_build = (shared_setup_cmds + setup_opb_cmds +
                        setup_chroot_grub_arm + setup_binary_grub_arm +
                        setup_fw_arm
                        )
-
+    
 #Xfce_loaded
 build64_loaded_build = (shared_setup_loaded_cmds + setup_loaded_cmds + 
                          setup_chroot_grub_64 + setup_binary_grub_64 +
@@ -297,12 +297,6 @@ SERVER_LIST = ('zonefstoolspep\n'
                'wget\n'
                )
 
-EXTRA_SERVER_LIST = ('cockpit\n'
-                     'cockpit-podman\n'
-                     'cockpit-machines\n'
-                     'cockpit-pcp\n'
-                     'podman\n'
-                     )
 
 KDE_LIST = ('sample1\n'
             'sample2\n'
@@ -547,21 +541,25 @@ LBSET_PRIVATE_DEV64 = (' --image-name "PeppermintOS-Devuan-64"')
 LBSET_PRIVATE_DEBARM = (' --image-name "PeppermintOS-Debian-ARM"')
 LBSET_PRIVATE_DEVARM = (' --debootstrap-options "--merged-usr"'
                         ' --image-name "PeppermintOS-Devuan-ARM"')
-LBSET_PRIVATE_LOADED_DEB64 = (' --image-name "PeppermintOS-Loaded-Debian-64"')
-LBSET_PRIVATE_LOADED_DEV64 = (' --image-name "PeppermintOS-Loaded-Devuan-64"')
-LBSET_PRIVATE_SERVER_DEB64 = (
-' --image-name "PeppermintOS-server-Debian-64"'
-' --debian-installer live'
-' --debian-installer-distribution "bookworm"'
-' --debian-installer-gui true'
-)
-LBSET_PRIVATE_SERVER_DEV64 = (
-' --image-name "PeppermintOS-server-Devuan-64"'
-' --debian-installer live'
-' --debian-installer-distribution "daedalus"'
-' --debian-installer-gui true'
-' --parent-mirror-debian-installer http://deb.devuan.org/devuan'
-)
+
+# Loaded specific
+LBSET_LOADED_DEB64 = (' --image-name "PeppermintOS-Loaded-Debian-64"')
+LBSET_LOADED_DEV64 = (' --image-name "PeppermintOS-Loaded-Devuan-64"')
+
+# Server specific
+LBSET_SERVER_DEB64 = (
+                     ' --image-name "PeppermintOS-server-Debian-64"'
+                     ' --debian-installer live'
+                     ' --debian-installer-distribution "bookworm"'
+                     ' --debian-installer-gui true'
+                     )
+LBSET_SERVER_DEV64 = (
+                     ' --image-name "PeppermintOS-server-Devuan-64"'
+                     ' --debian-installer live'
+                     ' --debian-installer-distribution "daedalus"'
+                     ' --debian-installer-gui true'
+                     ' --parent-mirror-debian-installer http://deb.devuan.org/devuan'
+                     )
 
 # These are the correct order combined LB commands for the builds by ISO name
 # these are used during the pipeline building process. 
@@ -583,15 +581,15 @@ LBSET_DEVarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEVUAN_SHARED
 LBSET_DEBarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEBIAN_SHARED
                + LBSET_PRIVATE_DEBARM
                )
-LBSET_LOADED_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED
-               + LBSET_PRIVATE_LOADED_DEB64
+LBSET_LADDEB = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED
+               + LBSET_LOADED_DEB64
                )
-LBSET_LOADED_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED
-               + LBSET_PRIVATE_LOADED_DEV64
+LBSET_LADDEV = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED
+               + LBSET_LOADED_DEV64
                )
-LBSET_SERVER_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED 
-               + LBSET_PRIVATE_SERVER_DEB64
+LBSET_SRVDEB = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED
+               + LBSET_SERVER_DEB64
                )
-LBSET_SERVER_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED 
-               + LBSET_PRIVATE_SERVER_DEV64
+LBSET_SRVDEV = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED
+               + LBSET_SERVER_DEV64
                )
diff --git a/python_modules/finish_cleanup.py b/python_modules/finish_cleanup.py
index 97a21fa0..bea0f77c 100644
--- a/python_modules/finish_cleanup.py
+++ b/python_modules/finish_cleanup.py
@@ -82,8 +82,6 @@ def check_build_type():
         'DEV.32opb': ('dev', '32', 'OPB'),
         'DEB.64loaded': ('deb', '64', 'LOADED'),
         'DEV.64loaded': ('dev', '64', 'LOADED'),
-        'DEB.64server': ('deb', '64', 'SERVER'),
-        'DEV.64server': ('dev', '64', 'SERVER'),
 
        }
 
@@ -106,7 +104,7 @@ def kill_old_iso():
     """ Delete older ISOs"""
     base_path = BASE_DESTINATION
     arch_list = ['/deb32/', '/deb64/', '/debarm/', '/dev32/', '/dev64/', '/devarm/']
-    de_list = ['gfb', 'opb', 'xfce', 'loaded', 'server']
+    de_list = ['gfb', 'opb', 'xfce', 'loaded']
     for archs in arch_list:
         for desktops in  de_list:
             full_path = []
diff --git a/python_modules/fresh_bubble.py b/python_modules/fresh_bubble.py
index e69356d9..a9499ead 100644
--- a/python_modules/fresh_bubble.py
+++ b/python_modules/fresh_bubble.py
@@ -29,7 +29,7 @@ def set_config_structure():
                 "desktop_base", "database", "calamares_settings",
                 "application", "PepProPixMaps", "PepProTools", "packages", 
                 "loaded-application", "loaded-hooks", "loaded-wallpaper", 
-                "loaded-xfce", "id_files", "server-hooks,", "server-installer", "server-firewall", "server-scripts"
+                "loaded-xfce", "id_files"
                 ]
     for f in folders:
         if os.path.exists(f):
diff --git a/python_modules/infra.py b/python_modules/infra.py
index 497312f4..2890fc4e 100644
--- a/python_modules/infra.py
+++ b/python_modules/infra.py
@@ -105,25 +105,17 @@ class BinaryFolders:
         self.sbase = sbase
         self.sarch = sarch
         src_binary = ('/splash/' + self.sbase + self.sarch + '/boot',
-                      '/splash/' + self.sbase + self.sarch + '/isolinux',
+                      '/splash/' + self.sbase + self.sarch +'/isolinux',
                       '/splash/' + self.sbase + '_live-theme',
                       '/splash/' + self.sbase + '_splash',
                       '/splash/' + self.sbase + '_splash'
+                      )
+        des_binary =('/boot',
+                     '/isolinux',
+                     '/boot/grub',
+                     '/isolinux',
+                     '/boot/grub'
                      )
-        des_binary = ('/boot',
-                      '/isolinux',
-                      '/boot/grub',
-                      '/isolinux',
-                      '/boot/grub'
-                     )
-        print("Source binary:", src_binary)  # Debug print
-        print("Des binary:", des_binary)     # Debug print
-        # Check if it's a server build and adjust paths accordingly
-        if "server" in sbase:
-            src_binary = tuple(path.replace('deb', 'server_deb') for path in src_binary)
-            src_binary = tuple(path.replace('dev', 'server_dev') for path in src_binary)
-            print("Server source binary:", src_binary)  # Debug print
-            print("Server des binary:", des_binary)     # Debug print
         # Binary Folders
         binary_src_q = collections.deque(src_binary)
         binary_des_q = collections.deque(des_binary)
@@ -131,15 +123,14 @@ class BinaryFolders:
         for size_length in range(binary_size_q):
             source = binary_src_q.popleft()
             des = binary_des_q.popleft()
-            logger.info(MSG_COPY + HOME_FOLDER + source)
+            logger.info(MSG_COPY+ HOME_FOLDER + source)
             shutil.copytree(HOME_FOLDER + source,
-                            HOME_FOLDER + BINARYPTH + des,
-                            dirs_exist_ok=True
-                           )
+                             HOME_FOLDER + BINARYPTH + des,
+                             dirs_exist_ok = True
+                             )
             logger.info(MSG_FIN + HOME_FOLDER + BINARYPTH + des)
 
 
-
 class ArchitectureFiles:
     """ 
         Copy all the needed files to CHROOT  Depending on the
@@ -269,30 +260,6 @@ def shared_folders():
                         )
         logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)
 
-def shared_server_folders():
-    """ 
-        This function will get the files that are shared commonly amongst 
-        the server builds, 
-    """
-
-    logger.info("Copy Shared Server folders")
-
-    src_paths = ('/server/grub',
-                 )
-    des_paths =('/boot/grub',
-                )
-    src_q = collections.deque(src_paths)
-    des_q = collections.deque(des_paths)
-    size_q = len(des_q)
-    for size_length in range(size_q):
-        source = src_q.popleft()
-        des = des_q.popleft()
-        logger.info(MSG_COPY+ HOME_FOLDER + source)
-        shutil.copytree(HOME_FOLDER + source,
-                        HOME_FOLDER + WPCHROOT + des,
-                        dirs_exist_ok = True
-                        )
-        logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)
 
 def shared_server_installer_folders():
     """