diff --git a/files/scripts/example.sh b/files/scripts/example.sh
index 747bec7..1cded87 100644
--- a/files/scripts/example.sh
+++ b/files/scripts/example.sh
@@ -3,7 +3,4 @@
 # Tell this script to exit if there are any errors.
 # You should have this in every custom script, to ensure that your completed
 # builds actually ran successfully without any errors!
-set -oue pipefail
-
-sudo chmod 755 /usr/local/sbin/bls-add-bluefin.sh
-sudo systemctl daemon-reload
\ No newline at end of file
+set -oue pipefail
\ No newline at end of file
diff --git a/files/system/boot/grub2/themes/thinkpad/background.png b/files/system/boot/grub2/themes/thinkpad/background.png
deleted file mode 100644
index 3c7d4a5..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/background.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/arch.png b/files/system/boot/grub2/themes/thinkpad/icons/arch.png
deleted file mode 100644
index 215a3db..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/arch.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/bluefin.png b/files/system/boot/grub2/themes/thinkpad/icons/bluefin.png
deleted file mode 100644
index 3cd982b..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/bluefin.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/debian.png b/files/system/boot/grub2/themes/thinkpad/icons/debian.png
deleted file mode 100644
index 977bd78..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/debian.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/efi.png b/files/system/boot/grub2/themes/thinkpad/icons/efi.png
deleted file mode 100644
index 9006a7c..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/efi.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/fedora.png b/files/system/boot/grub2/themes/thinkpad/icons/fedora.png
deleted file mode 100644
index 0fc2a2f..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/fedora.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/freebsd.png b/files/system/boot/grub2/themes/thinkpad/icons/freebsd.png
deleted file mode 100644
index 786ced9..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/freebsd.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/gentoo.png b/files/system/boot/grub2/themes/thinkpad/icons/gentoo.png
deleted file mode 100644
index 2b10831..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/gentoo.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/gnu-linux.png b/files/system/boot/grub2/themes/thinkpad/icons/gnu-linux.png
deleted file mode 100644
index 113f831..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/gnu-linux.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/gnu.png b/files/system/boot/grub2/themes/thinkpad/icons/gnu.png
deleted file mode 100644
index cb47573..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/gnu.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/kubuntu.png b/files/system/boot/grub2/themes/thinkpad/icons/kubuntu.png
deleted file mode 100644
index 889bdc9..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/kubuntu.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/linuxmint.png b/files/system/boot/grub2/themes/thinkpad/icons/linuxmint.png
deleted file mode 100644
index f3a039a..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/linuxmint.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/memtest.png b/files/system/boot/grub2/themes/thinkpad/icons/memtest.png
deleted file mode 100644
index 12edc90..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/memtest.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/opensuse.png b/files/system/boot/grub2/themes/thinkpad/icons/opensuse.png
deleted file mode 100644
index 89e2b4c..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/opensuse.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/reactos.png b/files/system/boot/grub2/themes/thinkpad/icons/reactos.png
deleted file mode 100644
index ef38d55..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/reactos.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/red.png b/files/system/boot/grub2/themes/thinkpad/icons/red.png
deleted file mode 100644
index 01d679e..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/red.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/restart.png b/files/system/boot/grub2/themes/thinkpad/icons/restart.png
deleted file mode 100644
index 30851ab..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/restart.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/shutdown.png b/files/system/boot/grub2/themes/thinkpad/icons/shutdown.png
deleted file mode 100644
index bda2a93..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/shutdown.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/slackware.png b/files/system/boot/grub2/themes/thinkpad/icons/slackware.png
deleted file mode 100644
index 91f1862..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/slackware.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/ubuntu.png b/files/system/boot/grub2/themes/thinkpad/icons/ubuntu.png
deleted file mode 100644
index 1bf2425..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/ubuntu.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/uefi.png b/files/system/boot/grub2/themes/thinkpad/icons/uefi.png
deleted file mode 100644
index 9006a7c..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/uefi.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/windows.png b/files/system/boot/grub2/themes/thinkpad/icons/windows.png
deleted file mode 100644
index f13c8cd..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/windows.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/xen.png b/files/system/boot/grub2/themes/thinkpad/icons/xen.png
deleted file mode 100644
index c926256..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/xen.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/icons/xubuntu.png b/files/system/boot/grub2/themes/thinkpad/icons/xubuntu.png
deleted file mode 100644
index 723725a..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/icons/xubuntu.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/lenovo_logo.png b/files/system/boot/grub2/themes/thinkpad/lenovo_logo.png
deleted file mode 100644
index e233a16..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/lenovo_logo.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_e.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_e.png
deleted file mode 100644
index 75a62a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_e.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_n.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_n.png
deleted file mode 100644
index 7b6acc3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_n.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_ne.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_ne.png
deleted file mode 100644
index 6817166..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_ne.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_nw.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_nw.png
deleted file mode 100644
index 6817166..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_nw.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_s.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_s.png
deleted file mode 100644
index 7b6acc3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_s.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_se.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_se.png
deleted file mode 100644
index 6817166..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_se.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_sw.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_sw.png
deleted file mode 100644
index 6817166..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_sw.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_inactive_w.png b/files/system/boot/grub2/themes/thinkpad/menu_inactive_w.png
deleted file mode 100644
index 75a62a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_inactive_w.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_e.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_e.png
deleted file mode 100644
index a259302..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_e.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_n.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_n.png
deleted file mode 100644
index a015eb0..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_n.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_ne.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_ne.png
deleted file mode 100644
index 7202352..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_ne.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_nw.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_nw.png
deleted file mode 100644
index d8ed3a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_nw.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_s.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_s.png
deleted file mode 100644
index a015eb0..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_s.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_se.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_se.png
deleted file mode 100644
index d8ed3a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_se.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_sw.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_sw.png
deleted file mode 100644
index d8ed3a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_sw.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/menu_selected_w.png b/files/system/boot/grub2/themes/thinkpad/menu_selected_w.png
deleted file mode 100644
index a259302..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/menu_selected_w.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/progress_active_c.png b/files/system/boot/grub2/themes/thinkpad/progress_active_c.png
deleted file mode 100644
index 404a63a..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/progress_active_c.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/progress_inactive_c.png b/files/system/boot/grub2/themes/thinkpad/progress_inactive_c.png
deleted file mode 100644
index 82020d0..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/progress_inactive_c.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/roboto-20.pf2 b/files/system/boot/grub2/themes/thinkpad/roboto-20.pf2
deleted file mode 100644
index b04f811..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/roboto-20.pf2 and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/roboto-22.pf2 b/files/system/boot/grub2/themes/thinkpad/roboto-22.pf2
deleted file mode 100644
index 71e25df..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/roboto-22.pf2 and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/roboto-42.pf2 b/files/system/boot/grub2/themes/thinkpad/roboto-42.pf2
deleted file mode 100644
index 38cbeeb..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/roboto-42.pf2 and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/separator.png b/files/system/boot/grub2/themes/thinkpad/separator.png
deleted file mode 100644
index 4fc2cab..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/separator.png and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/terminus-ttf-20.pf2 b/files/system/boot/grub2/themes/thinkpad/terminus-ttf-20.pf2
deleted file mode 100644
index 894f321..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/terminus-ttf-20.pf2 and /dev/null differ
diff --git a/files/system/boot/grub2/themes/thinkpad/theme.txt b/files/system/boot/grub2/themes/thinkpad/theme.txt
deleted file mode 100644
index 0382712..0000000
--- a/files/system/boot/grub2/themes/thinkpad/theme.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-title-text: ""
-desktop-image: "background.png"
-desktop-color: "#ffffff"
-terminal-font: "Terminus (TTF) Regular 20"
-terminal-left: "0"
-terminal-top: "0"
-terminal-width: "100%"
-terminal-height: "100%"
-terminal-border: "0"
-
-+ image {
-  file = "thinkpad_logo.png"
-  top = 40
-  left = 40
-}
-+ image {
-  file = "lenovo_logo.png"
-  top = 40
-  left = 100%-296
-}
-+ image {
-  file = "separator.png"
-  top = 100%-106
-  left = 0
-  width = 100%
-  height = 4
-}
-
-+ progress_bar {
-  left = 50%-400
-  top = 79%-20
-  width = 800
-  height = 40
-
-  id = "__timeout__"
-  text = "@TIMEOUT_NOTIFICATION_SHORT@"
-
-  border_color = "white"
-  highlight_style = "progress_active_*.png"
-  bar_style = "progress_inactive_*.png"
-  font = "Roboto Regular 20"
-}
-
-
-+ label {
-  font = "Roboto Regular 42"
-  left = 0
-  top = 4%+125
-  width = 100%
-  color = "#9667cc"
-  align = "center"
-  text = "Select Boot Option"
-}
-
-+ boot_menu {
-  left = 50%-400
-  top = 50%-300
-  width = 800
-  height = 600
-  item_font = "Roboto Regular 22"
-  item_color = "#FFFFFF"
-  selected_item_color = "#FFFFFF"
-  icon_width = 48
-  icon_height = 48
-  item_icon_space = 10
-  item_height = 48
-  item_padding = 20
-  item_spacing = 10
-  item_pixmap_style = "menu_inactive_*.png"
-  selected_item_pixmap_style = "menu_selected_*.png"
-}
-
-
-+ label {
-  font = "Roboto Regular 22"
-  left = 0%
-  top = 100%-66
-  width = 13%-5
-  color = "#398ecd"
-  align = "right"
-  text = "↑↓"
-}
-+ label {
-  font = "Roboto Regular 22"
-  left = 13%+5
-  top = 100%-66
-  color = "#FFFFFF"
-  align = "left"
-  text = "Select"
-}
-
-+ label {
-  font = "Roboto Regular 22"
-  left = 25%
-  top = 100%-66
-  width = 10%-5
-  color = "#398ecd"
-  align = "right"
-  text = "Enter"
-}
-+ label {
-  font = "Roboto Regular 22"
-  left = 35%+5
-  top = 100%-66
-  color = "#FFFFFF"
-  align = "left"
-  text = "Boot"
-}
-
-+ label {
-  font = "Roboto Regular 22"
-  left = 48%
-  top = 100%-66
-  width = 10%-5
-  color = "#398ecd"
-  align = "right"
-  text = "E"
-}
-+ label {
-  font = "Roboto Regular 22"
-  left = 58%+5
-  top = 100%-66
-  color = "#FFFFFF"
-  align = "left"
-  text = "Options"
-}
-
-+ label {
-  font = "Roboto Regular 22"
-  left = 70%
-  top = 100%-66
-  width = 10%-5
-  color = "#398ecd"
-  align = "right"
-  text = "C"
-}
-+ label {
-  font = "Roboto Regular 22"
-  left = 80%+5
-  top = 100%-66
-  color = "#FFFFFF"
-  align = "left"
-  text = "Command Line"
-}
-
-
diff --git a/files/system/boot/grub2/themes/thinkpad/thinkpad_logo.png b/files/system/boot/grub2/themes/thinkpad/thinkpad_logo.png
deleted file mode 100644
index 8c200a3..0000000
Binary files a/files/system/boot/grub2/themes/thinkpad/thinkpad_logo.png and /dev/null differ
diff --git a/files/system/boot/grub2/user.cfg b/files/system/boot/grub2/user.cfg
deleted file mode 100644
index 6e8110a..0000000
--- a/files/system/boot/grub2/user.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-set theme="/boot/grub2/themes/thinkpad/theme.txt"
-set timeout=2
-set gfxmode=1024x768,800x600
diff --git a/files/system/usr/local/sbin/bls-add-bluefin.sh b/files/system/usr/local/sbin/bls-add-bluefin.sh
deleted file mode 100755
index aae1797..0000000
--- a/files/system/usr/local/sbin/bls-add-bluefin.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-shopt -s nullglob
-
-entries_dir="/boot/loader/entries"
-
-for f in "$entries_dir"/ostree-*.conf "$entries_dir"/*-ostree-*.conf; do
-  [ -f "$f" ] || continue
-
-  # Already correct? skip
-  if grep -qxE 'grub_class[[:space:]]+bluefin' "$f"; then
-    continue
-  fi
-
-  tmp="$(mktemp)"
-  if grep -qE '^grub_class[[:space:]]+' "$f"; then
-    sed -E 's/^grub_class[[:space:]].*/grub_class bluefin/' "$f" >"$tmp"
-  else
-    awk '1; /^title[[:space:]]/{print "grub_class bluefin";}' "$f" >"$tmp"
-  fi
-
-  if ! cmp -s "$f" "$tmp"; then
-    chmod --reference="$f" "$tmp"
-    chown --reference="$f" "$tmp"
-    command -v chcon >/dev/null 2>&1 && chcon --reference="$f" "$tmp" 2>/dev/null || true
-    mv -f "$tmp" "$f"
-  else
-    rm -f "$tmp"
-  fi
-done