diff --git a/README.md b/README.md
index 3bc3618..7f76203 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# 🌌 Zenith OS
+# 🌌 Zenith OS [](https://github.com/Dark4331/Zenith_OS/actions/workflows/build.yml)
Zenith OS is an immutable, containerized operating system based on **Fedora Bootc** and derived from **Origami Linux**. It is engineered to deliver maximum stability, atomic system updates, and native out-of-the-box support for **NVIDIA** GPUs.
diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml
deleted file mode 100644
index c08d0b4..0000000
--- a/artifacthub-repo.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is completely optional, but if you want to index your image on https://artifacthub.io/ you can
-# Sign up and add the Repository ID to the right field. Owners fields are optional.
-# Examples: https://artifacthub.io/packages/search?ts_query_web=ublue&sort=relevance&page=1
-
-repositoryID: my-custom-id-here # Fill in with your own credentials
-owners: # (optional, used to claim repository ownership)
- - name: My Name
- email: my_email@email.com
diff --git a/build_files/branding/bgrt.plymouth b/build_files/branding/bgrt.plymouth
new file mode 100644
index 0000000..c7f593a
--- /dev/null
+++ b/build_files/branding/bgrt.plymouth
@@ -0,0 +1,81 @@
+[Plymouth Theme]
+Name[be]=BGRT
+Name[cs]=BGRT
+Name[da]=BGRT
+Name[de]=BGRT
+Name[eo]=BGRT
+Name[es]=BGRT
+Name[eu]=BGRT
+Name[fr]=BGRT
+Name[fur]=BGRT
+Name[hi]=BGRT (सिस्टम का लोगो)
+Name[hr]=BGRT
+Name[hu]=BGRT
+Name[id]=BGRT
+Name[it]=BGRT
+Name[lt]=BGRT
+Name[ka]=BGRT
+Name[nl]=BGRT
+Name[pa]=BGRT
+Name[pl]=BGRT
+Name[pt_BR]=BGRT
+Name[ro]=BGRT
+Name[ru]=BGRT
+Name[sr]=BGRT
+Name[sv]=BGRT
+Name[uk]=BGRT
+Name[zh_CN]=BGRT
+Name[ms]=BGRT
+Name[he]=BGRT
+Name[fa]=BGRT
+Name[fi]=BGRT
+Name[ie]=BGRT
+Name[gl]=BGRT
+Name[cy]=BGRT
+Name=BGRT
+Description=Jimmac's spinner theme using the ACPI BGRT graphics as background
+ModuleName=script
+
+[script]
+ImageDir=/usr/share/plymouth/themes/hexagon
+ScriptFile=/usr/share/plymouth/themes/hexagon/hexagon.script
+
+[boot-up]
+UseEndAnimation=false
+UseFirmwareBackground=false
+
+[shutdown]
+UseEndAnimation=false
+UseFirmwareBackground=false
+
+[reboot]
+UseEndAnimation=false
+UseFirmwareBackground=false
+
+[updates]
+SuppressMessages=true
+ProgressBarShowPercentComplete=true
+UseProgressBar=true
+Title=Installing Updates...
+SubTitle=Do not turn off your computer
+
+[system-upgrade]
+SuppressMessages=true
+ProgressBarShowPercentComplete=true
+UseProgressBar=true
+Title=Upgrading System...
+SubTitle=Do not turn off your computer
+
+[firmware-upgrade]
+SuppressMessages=true
+ProgressBarShowPercentComplete=true
+UseProgressBar=true
+Title=Upgrading Firmware...
+SubTitle=Do not turn off your computer
+
+[system-reset]
+SuppressMessages=true
+ProgressBarShowPercentComplete=true
+UseProgressBar=true
+Title=Resetting System...
+SubTitle=Do not turn off your computer
diff --git a/build_files/branding/bootlogo_zenith.svg b/build_files/branding/bootlogo_zenith.svg
new file mode 100644
index 0000000..226100a
--- /dev/null
+++ b/build_files/branding/bootlogo_zenith.svg
@@ -0,0 +1,27 @@
+
+
diff --git a/build_files/branding/logo.png b/build_files/branding/logo.png
index a1f2f4d..99d372a 100644
Binary files a/build_files/branding/logo.png and b/build_files/branding/logo.png differ
diff --git a/build_files/branding/mkinitcpio.conf b/build_files/branding/mkinitcpio.conf
new file mode 100644
index 0000000..05c2850
--- /dev/null
+++ b/build_files/branding/mkinitcpio.conf
@@ -0,0 +1 @@
+HOOKS=(base udev plymouth autodetect)
diff --git a/build_files/build.sh b/build_files/build.sh
index 3417c35..2f58805 100755
--- a/build_files/build.sh
+++ b/build_files/build.sh
@@ -29,6 +29,8 @@ curl --output-dir "/etc/yum.repos.d/" \
--remote-name "https://copr.fedorainfracloud.org/coprs/avengemedia/dms/repo/fedora-$(rpm -E %fedora)/avengemedia-dms-fedora-$(rpm -E %fedora).repo"
dnf -y install quickshell dms greetd dms-greeter --allowerasing
+
+
# Install greetd login manager
mkdir -p /etc/greetd/
cat > /etc/greetd/config.toml << EOF
@@ -55,9 +57,9 @@ mkdir -p /etc/fastfetch
mkdir -p /usr/share/backgrounds/zenith
cp -f /ctx/branding/logo.png /usr/share/plymouth/themes/spinner/watermark.png
cp -f /ctx/branding/logo.png /usr/share/pixmaps/origami-logo.png
-cp -f /ctx/branding/logo.png /usr/share/quickshell/dms/assets/danklogonormal.svg
-cp -f /ctx/branding/logo.png /usr/share/quickshell/dms-greeter/assets/danklogonormal.svg
-cp -f /ctx/branding/logo.png /usr/share/pixmaps/origami-logo.svg
+cp -f /ctx/branding/bootlogo_zenith.svg /usr/share/quickshell/dms/assets/danklogonormal.svg
+cp -f /ctx/branding/bootlogo_zenith.svg /usr/share/quickshell/dms-greeter/assets/danklogonormal.svg
+cp -f /ctx/branding/bootlogo_zenith.svg /usr/share/pixmaps/origami-logo.svg
cp /ctx/branding/wallpaper.png /usr/share/backgrounds/zenith/default.jpg
cp /ctx/branding/ascii-logo.txt /etc/fastfetch/zenith_ascii.txt
cp /ctx/branding/config.jsonc /etc/fastfetch/config.jsonc
@@ -66,23 +68,32 @@ mkdir -p /etc/dracut.conf.d
echo 'add_drivers+=" vboxvideo "' > /etc/dracut.conf.d/vbox.conf
#-----------
mkdir -p /etc/plymouth
-cat > /etc/plymouth/plymouthd.conf << EOF
-[Daemon]
-Theme=hexagon
-ShowDelay=0
-DeviceTimeout=8
-EOF
+echo -e "[Daemon]\nTheme=hexagon\nShowDelay=0" > /etc/plymouth/plymouthd.conf
#---------
-
+mkdir -p /usr/share/plymouth/themes/bgrt/
+cp -f /ctx/branding/bgrt.plymouth /usr/share/plymouth/themes/bgrt/bgrt.plymouth
cp -f /ctx/branding/plymouthd.defaults /usr/share/plymouth/plymouthd.defaults
mkdir -p /usr/share/plymouth/themes/hexagon/
+cp -rf /ctx/hexagon/hexagon.plymouth /usr/share/plymouth/themes/hexagon/hexagon.plymouth
cp -rf /ctx/hexagon/. /usr/share/plymouth/themes/hexagon/
ln -sf /usr/share/plymouth/themes/hexagon/hexagon.plymouth /usr/share/plymouth/themes/default.plymouth
-sed -i 's/auto-mode/manual/g' /usr/share/plymouth/themes/bgrt/bgrt.plymouth
+# Plymouth early boot configuration
+mkdir -p /etc/dracut.conf.d
+echo 'add_dracutmodules+=" plymouth "' > /etc/dracut.conf.d/plymouth.conf
+systemctl enable plymouth-start.service
+systemctl enable plymouth-quit.service
+systemctl enable plymouth-quit-wait.service
+plymouth-set-default-theme hexagon
+
# Regenerate dracut for boot changes
dracut --regenerate-all --force || true
+
+# Ensure splash in kernel parameters
echo 'GRUB_DISABLE_OS_PROBER="true"' >> /etc/default/grub
+sed -i 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="splash /' /etc/default/grub
+
+
# Enable podman socket
systemctl enable podman.socket