diff --git a/packages.json b/packages.json
index 9ab39988f5a..b6726226648 100644
--- a/packages.json
+++ b/packages.json
@@ -6,6 +6,7 @@
 				"adw-gtk3-theme",
 				"bash-color-prompt",
 				"bcache-tools",
+				"bluefin-schemas",
 				"borgbackup",
 				"bootc",
 				"ddcutil",
diff --git a/system_files/shared/etc/distrobox/distrobox.conf b/system_files/shared/etc/distrobox/distrobox.conf
deleted file mode 100644
index b2ede369b8c..00000000000
--- a/system_files/shared/etc/distrobox/distrobox.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-container_always_pull="1"
-container_generate_entry=1
-container_manager="podman"
-container_name_default="ubuntu"
-container_image_default="ghcr.io/ublue-os/ubuntu-toolbox:latest"
-non_interactive="1"
diff --git a/system_files/shared/etc/distrobox/distrobox.example b/system_files/shared/etc/distrobox/distrobox.example
deleted file mode 100644
index b4738647aee..00000000000
--- a/system_files/shared/etc/distrobox/distrobox.example
+++ /dev/null
@@ -1,33 +0,0 @@
-[ubuntu]
-image=ghcr.io/ublue-os/ubuntu-toolbox:latest
-#additional_packages=" " 
-#export=" "
-init=false
-nvidia=true
-pull=true
-root=false
-replace=true
-
-# Add more distros and then use: 
-# distrobox assemble create --replace --file /etc/distrobox/distrobox.ini
-# This will replace your distroboxes in place
-# Tip: Use additional_packages as declarative config!
-# See https://distrobox.privatedns.org/usage/distrobox-assemble/
-
-#[fedora]
-#image=ghcr.io/ublue-os/fedora-toolbox:latest
-#additional_packages="ansible lynx chromium neofetch cmus"
-#export="app chromium"
-#init=false
-#nvidia=true
-#pull=true
-#root=false
-#replace=true
-
-#[wolfi]
-#image=ghcr.io/ublue-os/wolfi-toolbox:latest
-#init=false
-#nvidia=true
-#pull=true
-#root=false
-#replace=true
diff --git a/system_files/shared/etc/profile.d/askpass.sh b/system_files/shared/etc/profile.d/askpass.sh
deleted file mode 100644
index 27c4a9c809b..00000000000
--- a/system_files/shared/etc/profile.d/askpass.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/bash
-
-SUDO_ASKPASS='/usr/libexec/openssh/gnome-ssh-askpass'
-export SUDO_ASKPASS
diff --git a/system_files/shared/etc/profile.d/open.sh b/system_files/shared/etc/profile.d/open.sh
deleted file mode 100755
index b53bbd3a037..00000000000
--- a/system_files/shared/etc/profile.d/open.sh
+++ /dev/null
@@ -1 +0,0 @@
-alias open="xdg-open &>/dev/null"
diff --git a/system_files/shared/etc/skel/.config/toolbox/host-welcome-shown b/system_files/shared/etc/skel/.config/toolbox/host-welcome-shown
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.google.Chrome b/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.google.Chrome
deleted file mode 100644
index 3f1fc7ec373..00000000000
--- a/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.google.Chrome
+++ /dev/null
@@ -1,2 +0,0 @@
-[Context]
-filesystems=~/.local/share/applications;~/.local/share/icons
diff --git a/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code b/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code
deleted file mode 100644
index db1a1f75db0..00000000000
--- a/system_files/shared/etc/skel/.local/share/flatpak/overrides/com.visualstudio.code
+++ /dev/null
@@ -1,3 +0,0 @@
-[Context]
-sockets=wayland;
-filesystems=xdg-run/podman;
diff --git a/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette b/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette
deleted file mode 100644
index fcd3bfcd1af..00000000000
--- a/system_files/shared/etc/skel/.local/share/org.gnome.Ptyxis/palettes/catppuccin-dynamic.palette
+++ /dev/null
@@ -1,45 +0,0 @@
-[Palette]
-Name=Catppuccin Dynamic
-Primary=true
-
-[Light]
-Background=#EFF1F5
-Foreground=#4C4F69
-Cursor=#4C4F69
-Color0=#5C5F77
-Color1=#D20F39
-Color2=#40A02B
-Color3=#DF8E1D
-Color4=#1E66F5
-Color5=#EA76CB
-Color6=#179299
-Color7=#ACB0BE
-Color8=#6C6F85
-Color9=#D20F39
-Color10=#40A02B
-Color11=#DF8E1D
-Color12=#1E66F5
-Color13=#EA76CB
-Color14=#179299
-Color15=#BCC0CC
-
-[Dark]
-Background=#1E1E2E
-Foreground=#CDD6F4
-Cursor=#CDD6F4
-Color0=#45475A
-Color1=#F38BA8
-Color2=#A6E3A1
-Color3=#F9E2AF
-Color4=#89B4FA
-Color5=#F5C2E7
-Color6=#94E2D5
-Color7=#BAC2DE
-Color8=#585B70
-Color9=#F38BA8
-Color10=#A6E3A1
-Color11=#F9E2AF
-Color12=#89B4FA
-Color13=#F5C2E7
-Color14=#94E2D5
-Color15=#A6ADC8
diff --git a/system_files/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile b/system_files/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile
deleted file mode 100644
index c496e243d39..00000000000
--- a/system_files/shared/etc/skel/.var/app/io.github.dvlv.boxbuddyrs/config/glib-2.0/settings/keyfile
+++ /dev/null
@@ -1,2 +0,0 @@
-[io/github/dvlv/boxbuddyrs]
-default-terminal='Ptyxis'
diff --git a/system_files/shared/usr/share/applications/Discourse.desktop b/system_files/shared/usr/share/applications/Discourse.desktop
deleted file mode 100644
index a5b21bf8b56..00000000000
--- a/system_files/shared/usr/share/applications/Discourse.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-NoDisplay=false
-Terminal=false
-Exec=xdg-open https://universal-blue.discourse.group/c/bluefin/
-Icon=ublue-discourse
-Name=Community
-Comment=Universal Blue Forums
-Categories=Utility;
diff --git a/system_files/shared/usr/share/applications/system-update.desktop b/system_files/shared/usr/share/applications/system-update.desktop
deleted file mode 100644
index 7971f9b4e0e..00000000000
--- a/system_files/shared/usr/share/applications/system-update.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=System Update
-Comment=Update Bluefin, Flatpaks, Distrobox containers, and more
-Icon=ublue-update
-Categories=ConsoleOnly;System;
-Terminal=true
-Exec=/usr/bin/ujust update
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/01-bluefin-folders b/system_files/silverblue/etc/dconf/db/distro.d/01-bluefin-folders
deleted file mode 100644
index c9edab082c6..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/01-bluefin-folders
+++ /dev/null
@@ -1,43 +0,0 @@
-# Relocatable schemas are located here in dconf
-# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
-
-[org/gnome/desktop/app-folders/folders/GamingUtilities]
-apps=['protontricks.desktop', 'discover_overlay_configure.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.gerbilsoft.rom-properties.rp-config.desktop', 'steamos-nested-desktop.desktop']
-name='Gaming Utilities'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Utilities]
-apps=['com.github.tchx84.Flatseal.desktop', 'io.github.flattool.Warehouse.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'org.gnome.tweaks.desktop', 'firewall-config.desktop', 'ca.desrt.dconf-editor.desktop', 'org.gnome.World.PikaBackup.desktop', 'input-leap.desktop', 'solaar.desktop', 'org.fedoraproject.MediaWriter.desktop', 'input-remapper-gtk.desktop', 'org.gnome.Sysprof.desktop', 'remote-viewer.desktop']
-categories=['X-GNOME-Utilities']
-name='X-GNOME-Utilities.directory'
-translate=true
-
-[org/gnome/desktop/app-folders/folders/Games]
-excluded-apps=['steam.desktop', 'net.lutris.Lutris.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.fastrizwaan.WineZGUI.desktop' ]
-categories=['Game']
-name='Games'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Containers]
-apps=['io.github.dvlv.boxbuddyrs.desktop', 'com.github.marhkb.Pods.desktop']
-categories=['Distrobox']
-name='Containers'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Wine]
-apps=['winetricks.desktop']
-categories=['X-Wine', 'wine-wine']
-name='Wine'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Development]
-apps=['dev-pod.desktop', 'code.desktop', 'virt-manager.desktop', 'io.podman_desktop.PodmanDesktop.desktop']
-excluded-apps=['org.gnome.Sysprof.desktop']
-categories=['Development', 'IDE']
-name='Development'
-translate=false
-
-[org/gnome/desktop/app-folders/folders/Productivity]
-apps=['simple-scan.desktop', 'org.gnome.Papers.desktop', 'org.gnome.Connections.desktop']
-name='Productivity'
-translate=false
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/02-bluefin-keybindings b/system_files/silverblue/etc/dconf/db/distro.d/02-bluefin-keybindings
deleted file mode 100644
index 04f505c5227..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/02-bluefin-keybindings
+++ /dev/null
@@ -1,17 +0,0 @@
-# Relocatable schemas are located here in dconf
-# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
-
-[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
-binding='<Control><Alt>t'
-command='/usr/bin/ptyxis --new-window'
-name='Ptyxis'
-
-[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
-binding='<Control><Alt>Return'
-command='/usr/bin/ptyxis --new-window'
-name='Ptyxis Alt'
-
-[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2]
-binding='<Control><Shift>Escape'
-command="flatpak run io.missioncenter.MissionCenter"
-name='mission-center'
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette b/system_files/silverblue/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette
deleted file mode 100644
index 37c56f0bd5b..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette
+++ /dev/null
@@ -1,5 +0,0 @@
-# Relocatable schemas are located here in dconf
-# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
-
-[org/gnome/Ptyxis/Profiles/2871e8027773ae74d6c87a5f659bbc74]
-palette='catppuccin-dynamic'
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/04-bluefin-logomenu-extension b/system_files/silverblue/etc/dconf/db/distro.d/04-bluefin-logomenu-extension
deleted file mode 100644
index 0c4db687d7f..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/04-bluefin-logomenu-extension
+++ /dev/null
@@ -1,16 +0,0 @@
-# Relocatable schemas are located here in dconf
-# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
-
-[org/gnome/shell/extensions/Logo-menu]
-symbolic-icon=true
-menu-button-icon-image=30
-menu-button-terminal='xdg-terminal-exec'
-menu-button-system-monitor='flatpak run io.missioncenter.MissionCenter'
-menu-button-extensions-app='com.mattjakeman.ExtensionManager.desktop'
-menu-button-software-center='gnome-software'
-show-activities-button=true
-show-lockscreen=false
-show-power-option=false
-show-gamemode=false
-hide-forcequit=true
-show-boxbuddy=true
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/05-bluefin-searchlight-extension b/system_files/silverblue/etc/dconf/db/distro.d/05-bluefin-searchlight-extension
deleted file mode 100644
index ff0513239b7..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/05-bluefin-searchlight-extension
+++ /dev/null
@@ -1,11 +0,0 @@
-# Relocatable schemas are located here in dconf
-# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
-
-[org/gnome/shell/extensions/search-light]
-shortcut-search=['<Super>space']
-scale-width=0.10
-scale-height=0.15
-border-thickness=1
-border-radius=1.65
-border-color=(0.23, 0.23, 0.23, 1.0)
-background-color=(0.0, 0.0, 0.0, 0.8)
diff --git a/system_files/silverblue/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings b/system_files/silverblue/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings
deleted file mode 100644
index 0051a9d1d9f..00000000000
--- a/system_files/silverblue/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings
+++ /dev/null
@@ -1,4 +0,0 @@
-# Lock Gnome Software updates
-/org/gnome/software/allow-updates
-/org/gnome/software/download-updates
-/org/gnome/software/download-updates-notify
diff --git a/system_files/silverblue/usr/share/applications/documentation.desktop b/system_files/silverblue/usr/share/applications/documentation.desktop
deleted file mode 100644
index 917e5d7ae39..00000000000
--- a/system_files/silverblue/usr/share/applications/documentation.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-NoDisplay=false
-Terminal=false
-Exec=xdg-open https://docs.projectbluefin.io/
-Icon=ublue-docs
-Name=Documentation
-Comment=Bluefin documentation
-Categories=Utility;