diff --git a/.github/workflows/build-x86_64-glibc.yml b/.github/workflows/build-x86_64-glibc.yml
index c413100..b435a6b 100644
--- a/.github/workflows/build-x86_64-glibc.yml
+++ b/.github/workflows/build-x86_64-glibc.yml
@@ -69,6 +69,7 @@ jobs:
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
 
+      # All declared individually for logging purposes
       # Common Deps
       - name: Build tomlplusplus
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg tomlplusplus)
@@ -90,6 +91,9 @@ jobs:
       - name: Build hyprwayland-scanner
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner)
 
+      - name: Build aquamarine
+        run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg aquamarine)
+
       - name: Build hyprland
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland)
 
@@ -108,81 +112,11 @@ jobs:
       - name: Build hyprpaper
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper)
 
-      # Nightly Builds
-      - name: Build hyprutils-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly)
-
-      - name: Build hyprlang-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly)
-
-      - name: Build hyprcursor-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly)
-
-      - name: Build hyprwayland-scanner-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly)
-
-      - name: Build hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly)
-
-      - name: Build hyprland-protocols-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly)
-
-      - name: Build xdg-desktop-portal-hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly)
-
-      - name: Build hypridle-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly)
-
-      - name: Build hyprlock-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly)
-
-      - name: Build hyprpaper-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly)
-
       # Sometimes xbps-src builds a bunch of other junk I don't want to be liable for distributing
       - name: Copy relevant packages to new directory to be packaged
         run: |
           mkdir ~/packages
+          cp ~/hostdir/binpkgs/aquamarine*.xbps ~/packages
           cp ~/hostdir/binpkgs/hypr*.xbps ~/packages
           cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland*.xbps ~/packages
           cp ~/hostdir/binpkgs/sdbus-cpp*.xbps ~/packages
diff --git a/.github/workflows/build-x86_64-musl.yml b/.github/workflows/build-x86_64-musl.yml
index cdcfa1a..c43ba12 100644
--- a/.github/workflows/build-x86_64-musl.yml
+++ b/.github/workflows/build-x86_64-musl.yml
@@ -69,6 +69,7 @@ jobs:
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
 
+      # All declared individually for logging purposes
       # Common Deps
       - name: Build tomlplusplus
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg tomlplusplus)
@@ -89,6 +90,9 @@ jobs:
       - name: Build hyprwayland-scanner
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner)
 
+      - name: Build aquamarine
+        run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg aquamarine)
+
       - name: Build hyprland
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland)
 
@@ -107,81 +111,11 @@ jobs:
       - name: Build hyprpaper
         run: (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper)
 
-      # Nightly Builds
-      - name: Build hyprutils-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly)
-
-      - name: Build hyprlang-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly)
-
-      - name: Build hyprcursor-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly)
-
-      - name: Build hyprwayland-scanner-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly)
-
-      - name: Build hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly)
-
-      - name: Build hyprland-protocols-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly)
-
-      - name: Build xdg-desktop-portal-hyprland-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly)
-
-      - name: Build hypridle-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly)
-
-      - name: Build hyprlock-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly)
-
-      - name: Build hyprpaper-nightly
-        run: |
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          sed -i "/^version/ s/$/.$(git rev-list --count HEAD).$(git show -s --format=%h)/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly)
-
       # Sometimes xbps-src builds a bunch of other junk I don't want to be liable for distributing
       - name: Copy relevant packages to new directory to be packaged
         run: |
           mkdir ~/packages
+          cp ~/hostdir/binpkgs/aquamarine*.xbps ~/packages
           cp ~/hostdir/binpkgs/hypr*.xbps ~/packages
           cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland*.xbps ~/packages
           cp ~/hostdir/binpkgs/sdbus-cpp*.xbps ~/packages
diff --git a/.github/workflows/nightly-x86_64-glibc.yml b/.github/workflows/nightly-x86_64-glibc.yml
deleted file mode 100644
index 3f7b5b5..0000000
--- a/.github/workflows/nightly-x86_64-glibc.yml
+++ /dev/null
@@ -1,347 +0,0 @@
-name: "Nightly Hyprland x86_64 Glibc"
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-  workflow_dispatch:
-
-env:
-  REPO_OWNER: "${{ github.repository_owner }}"
-  REPO_NAME: "${{ github.event.repository.name }}"
-
-jobs:
-  build:
-    name: Build Nightly Packages
-    runs-on: ubuntu-latest
-
-    container:
-      image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
-      options: --platform ${{ matrix.config.platform }}
-      env:
-        PATH: "/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin"
-        ARCH: "${{ matrix.config.arch }}"
-        BOOTSTRAP: "${{ matrix.config.host }}"
-        TEST: "${{ matrix.config.test }}"
-        HOSTREPO: /hostrepo
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-              arch: x86_64,
-              host: x86_64,
-              libc: glibc,
-              platform: linux/amd64,
-              test: 1,
-            }
-
-    steps:
-      - name: Prepare container
-        run: |
-          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
-          ls -la
-          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
-          xbps-install -Syu xbps
-          xbps-install -Syu
-          xbps-install -y tar curl
-          mkdir ~/void-pkgs
-
-      - name: Clone Void-Packages and prepare
-        run: |
-          cd ~/void-pkgs
-          git clone --depth 1 https://github.com/void-linux/void-packages.git
-
-      - name: Clone Hyprland-Void repo and prepare
-        run: |
-          cd ~/void-pkgs
-          git clone https://github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git
-          cd ${{ env.REPO_NAME }}
-          cat common/shlibs >> ../void-packages/common/shlibs
-          cp -r srcpkgs/* ../void-packages/srcpkgs
-
-      - name: Create hostrepo and prepare masterdir
-        run: |
-          cd ~/void-pkgs/void-packages
-          ln -s "$(pwd)" /hostrepo &&
-          common/travis/set_mirror.sh &&
-          common/travis/prepare.sh &&
-          common/travis/fetch-xtools.sh
-
-      - name: Get old packages and index
-        run: |
-          mkdir -v ~/oldpkgs
-          mkdir -v -p ~/hostdir/binpkgs
-          git clone https://github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git
-          cd ${{ env.REPO_NAME }}
-          git checkout repository-x86_64-glibc
-          cp -v *.xbps ~/oldpkgs
-          cp -v *.xbps ~/hostdir/binpkgs
-          cd ~/hostdir/binpkgs
-          xbps-rindex -a *
-          echo "~/oldpkgs"
-          ls ~/oldpkgs
-          echo "~/hostdir/binpkgs"
-          ls ~/hostdir/binpkgs
-
-      # Try to avoid rebuilding packages which are already on the latest commit so we don't waste actions minutes
-      - name: Build hyprutils
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprutils-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprutils-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Revision Number: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly) &&
-            rm ~/oldpkgs/hyprutils-nightly* &&
-            cp ~/hostdir/binpkgs/hyprutils-nightly* ~/oldpkgs ||
-            echo "hyprutils-nightly is up to date"
-
-
-      - name: Build hyprlang
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprlang-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprlang-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly) &&
-            rm ~/oldpkgs/hyprlang-nightly* &&
-            cp ~/hostdir/binpkgs/hyprlang-nightly* ~/oldpkgs ||
-            echo "hyprlang-nightly is up to date"
-
-      - name: Build hyprcursor
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprcursor-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprcursor-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly) &&
-            rm ~/oldpkgs/hyprcursor-nightly* &&
-            cp ~/hostdir/binpkgs/hyprcursor-nightly* ~/oldpkgs ||
-            echo "hyprcursor-nightly is up to date"
-
-      - name: Build hyprwayland-scanner
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprwayland-scanner-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprwayland-scanner-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly) &&
-            rm ~/oldpkgs/hyprwayland-scanner-nightly* &&
-            cp ~/hostdir/binpkgs/hyprwayland-scanner-nightly* ~/oldpkgs ||
-            echo "hyprwayland-scanner-nightly is up to date"
-
-      - name: Build hyprland
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep -v devel | grep '^hyprland-nightly' | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep -v devel | grep '^hyprland-nightly' | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly) &&
-            rm ~/oldpkgs/hyprland-nightly* &&
-            cp ~/hostdir/binpkgs/hyprland-nightly* ~/oldpkgs ||
-            echo "hyprland-nightly is up to date"
-
-      - name: Build hyprland-protocols
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprland-protocols-nightly | cut -d. -f3)
-          export oldhash=$(ls ~/oldpkgs | grep hyprland-protocols-nightly | cut -d. -f4 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly) &&
-            rm ~/oldpkgs/hyprland-protocols-nightly* &&
-            cp ~/hostdir/binpkgs/hyprland-protocols-nightly* ~/oldpkgs ||
-            echo "hyprland-protocols-nightly is up to date"
-
-      - name: Build xdg-desktop-portal-hyprland
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep xdg-desktop-portal-hyprland-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep xdg-desktop-portal-hyprland-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly) &&
-            rm ~/oldpkgs/xdg-desktop-portal-hyprland-nightly* &&
-            cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland-nightly* ~/oldpkgs ||
-            echo "xdg-desktop-portal-hyprland-nightly is up to date"
-
-      - name: Build hypridle
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hypridle-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hypridle-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly) &&
-            rm ~/oldpkgs/hypridle-nightly* &&
-            cp ~/hostdir/binpkgs/hypridle-nightly* ~/oldpkgs ||
-            echo "hypridle-nightly is up to date"
-
-      - name: Build hyprlock
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprlock-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprlock-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly) &&
-            ~/oldpkgs/hyprlock-nightly* &&
-            cp ~/hostdir/binpkgs/hyprlock-nightly* ~/oldpkgs ||
-            echo "hyprlock-nightly is up to date"
-
-      - name: Build hyprpaper
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprpaper-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprpaper-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly) &&
-            rm ~/oldpkgs/hyprpaper-nightly* &&
-            cp ~/hostdir/binpkgs/hyprpaper-nightly* ~/oldpkgs ||
-            echo "hyprpaper-nightly is up to date"
-
-      - name: Index refreshed packages
-        run: |
-          cd ~/oldpkgs
-          xbps-rindex -a *
-
-      # Retrieve the signing key from the separate private repository
-      - name: Retrieve private key
-        run: |
-          cd ~
-          curl -H 'Authorization: token ${{ secrets.PEM_PAT }}' \
-            -H 'Accept: application/vnd.github.v3.raw' \
-            -O -L https://api.github.com/repos/${{ env.REPO_OWNER }}/hyprland-void-private-pem/contents/private.pem
-
-      # We need to sign the packages with our private key so that they will be accepted by xbps remotely
-      # See: https://docs.voidlinux.org/xbps/repositories/signing.html
-      - name: Sign repository
-        run: |
-          export XBPS_PASSPHRASE=${{ secrets.PRIVATE_PEM_PASSPHRASE }}
-          xbps-rindex --privkey ~/private.pem --sign --signedby "${{ env.REPO_NAME }}-github-action" ~/oldpkgs
-          xbps-rindex --privkey ~/private.pem --sign-pkg ~/oldpkgs/*.xbps
-
-      - name: Compress Packages
-        run: |
-          cd ~/oldpkgs
-          tar -czvf hyprland.tar.gz *
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.REPO_NAME }}
-          path: ~/oldpkgs/hyprland.tar.gz
-
-  publish:
-    name: Pack and Publish
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ env.REPO_NAME }}
-          path: ~/
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # We'll blow the size of the repository up very quickly if we do not delete old iterations of the repository
-      - name: Delete old repository and recreate with new packages
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git push origin -d repository-x86_64-glibc
-          git switch --orphan repository-x86_64-glibc
-          tar -xvf ~/hyprland.tar.gz -C ./
-          git add .
-          git commit -m "Upload latest packages to repository"
-          git push origin repository-x86_64-glibc
-
diff --git a/.github/workflows/nightly-x86_64-musl.yml b/.github/workflows/nightly-x86_64-musl.yml
deleted file mode 100644
index 3ac34a2..0000000
--- a/.github/workflows/nightly-x86_64-musl.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-name: "Nightly Hyprland x86_64 Musl"
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-  workflow_dispatch:
-
-env:
-  REPO_OWNER: "${{ github.repository_owner }}"
-  REPO_NAME: "${{ github.event.repository.name }}"
-
-jobs:
-  build:
-    name: Build Nightly Packages
-    runs-on: ubuntu-latest
-
-    container:
-      image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
-      options: --platform ${{ matrix.config.platform }}
-      env:
-        PATH: "/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin"
-        ARCH: "${{ matrix.config.arch }}"
-        BOOTSTRAP: "${{ matrix.config.host }}"
-        TEST: "${{ matrix.config.test }}"
-        HOSTREPO: /hostrepo
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {
-              arch: x86_64,
-              host: x86_64,
-              libc: musl,
-              platform: linux/amd64,
-              test: 1,
-            }
-
-    steps:
-      - name: Prepare container
-        run: |
-          mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
-          ls -la
-          sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
-          xbps-install -Syu xbps
-          xbps-install -Syu
-          xbps-install -y tar curl
-          mkdir ~/void-pkgs
-
-      - name: Clone Void-Packages and prepare
-        run: |
-          cd ~/void-pkgs
-          git clone --depth 1 https://github.com/void-linux/void-packages.git
-
-      - name: Clone Hyprland-Void repo and prepare
-        run: |
-          cd ~/void-pkgs
-          git clone https://github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git
-          cd ${{ env.REPO_NAME }}
-          cat common/shlibs >> ../void-packages/common/shlibs
-          cp -r srcpkgs/* ../void-packages/srcpkgs
-
-      - name: Create hostrepo and prepare masterdir
-        run: |
-          cd ~/void-pkgs/void-packages
-          ln -s "$(pwd)" /hostrepo &&
-          common/travis/set_mirror.sh &&
-          common/travis/prepare.sh &&
-          common/travis/fetch-xtools.sh
-
-      - name: Get old packages and index
-        run: |
-          mkdir -v ~/oldpkgs
-          mkdir -v -p ~/hostdir/binpkgs
-          git clone https://github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git
-          cd ${{ env.REPO_NAME }}
-          git checkout repository-x86_64-musl
-          cp -v *.xbps ~/oldpkgs
-          cp -v *.xbps ~/hostdir/binpkgs
-          cd ~/hostdir/binpkgs
-          xbps-rindex -a *
-          echo "~/oldpkgs"
-          ls ~/oldpkgs
-          echo "~/hostdir/binpkgs"
-          ls ~/hostdir/binpkgs
-
-      # Try to avoid rebuilding packages which are already on the latest commit so we don't waste actions minutes
-      - name: Build hyprutils
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprutils-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprutils-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Revision Number: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprutils.git
-          cd hyprutils
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprutils-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprutils-nightly) &&
-            rm ~/oldpkgs/hyprutils-nightly* &&
-            cp ~/hostdir/binpkgs/hyprutils-nightly* ~/oldpkgs ||
-            echo "hyprutils-nightly is up to date"
-
-
-      - name: Build hyprlang
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprlang-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprlang-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlang.git
-          cd hyprlang
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprlang-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlang-nightly) &&
-            rm ~/oldpkgs/hyprlang-nightly* &&
-            cp ~/hostdir/binpkgs/hyprlang-nightly* ~/oldpkgs ||
-            echo "hyprlang-nightly is up to date"
-
-      - name: Build hyprcursor
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprcursor-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprcursor-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprcursor.git
-          cd hyprcursor
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprcursor-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprcursor-nightly) &&
-            rm ~/oldpkgs/hyprcursor-nightly* &&
-            cp ~/hostdir/binpkgs/hyprcursor-nightly* ~/oldpkgs ||
-            echo "hyprcursor-nightly is up to date"
-
-      - name: Build hyprwayland-scanner
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprwayland-scanner-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprwayland-scanner-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprwayland-scanner.git
-          cd hyprwayland-scanner
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprwayland-scanner-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprwayland-scanner-nightly) &&
-            rm ~/oldpkgs/hyprwayland-scanner-nightly* &&
-            cp ~/hostdir/binpkgs/hyprwayland-scanner-nightly* ~/oldpkgs ||
-            echo "hyprwayland-scanner-nightly is up to date"
-
-      - name: Build hyprland
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep -v devel | grep '^hyprland-nightly' | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep -v devel | grep '^hyprland-nightly' | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland.git
-          cd hyprland
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprland-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-nightly) &&
-            rm ~/oldpkgs/hyprland-nightly* &&
-            cp ~/hostdir/binpkgs/hyprland-nightly* ~/oldpkgs ||
-            echo "hyprland-nightly is up to date"
-
-      - name: Build hyprland-protocols
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprland-protocols-nightly | cut -d. -f3)
-          export oldhash=$(ls ~/oldpkgs | grep hyprland-protocols-nightly | cut -d. -f4 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprland-protocols.git
-          cd hyprland-protocols
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprland-protocols-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprland-protocols-nightly) &&
-            rm ~/oldpkgs/hyprland-protocols-nightly* &&
-            cp ~/hostdir/binpkgs/hyprland-protocols-nightly* ~/oldpkgs ||
-            echo "hyprland-protocols-nightly is up to date"
-
-      - name: Build xdg-desktop-portal-hyprland
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep xdg-desktop-portal-hyprland-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep xdg-desktop-portal-hyprland-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
-          cd xdg-desktop-portal-hyprland
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/xdg-desktop-portal-hyprland-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg xdg-desktop-portal-hyprland-nightly) &&
-            rm ~/oldpkgs/xdg-desktop-portal-hyprland-nightly* &&
-            cp ~/hostdir/binpkgs/xdg-desktop-portal-hyprland-nightly* ~/oldpkgs ||
-            echo "xdg-desktop-portal-hyprland-nightly is up to date"
-
-      - name: Build hypridle
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hypridle-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hypridle-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hypridle.git
-          cd hypridle
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hypridle-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hypridle-nightly) &&
-            rm ~/oldpkgs/hypridle-nightly* &&
-            cp ~/hostdir/binpkgs/hypridle-nightly* ~/oldpkgs ||
-            echo "hypridle-nightly is up to date"
-
-      - name: Build hyprlock
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprlock-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprlock-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprlock.git
-          cd hyprlock
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprlock-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprlock-nightly) &&
-            ~/oldpkgs/hyprlock-nightly* &&
-            cp ~/hostdir/binpkgs/hyprlock-nightly* ~/oldpkgs ||
-            echo "hyprlock-nightly is up to date"
-
-      - name: Build hyprpaper
-        run: |
-          export oldcount=$(ls ~/oldpkgs | grep hyprpaper-nightly | cut -d. -f4)
-          export oldhash=$(ls ~/oldpkgs | grep hyprpaper-nightly | cut -d. -f5 | cut -d_ -f1)
-          echo "Previous Datestamp: $oldcount"
-          echo "Previous Commit Shorthash: $oldhash"
-          git clone --filter=tree:0 https://github.com/hyprwm/hyprpaper.git
-          cd hyprpaper
-          export newcount=$(git rev-list --count HEAD)
-          export newhash=$(git show -s --format=%h)
-          echo "Current Datestamp: $newcount"
-          echo "Current Commit Shorthash: $newhash"
-          sed -i "/^version/ s/$/.${newcount}.${newhash}/" ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template
-          cat ~/void-pkgs/void-packages/srcpkgs/hyprpaper-nightly/template | grep "version="
-          [ $newcount -gt $oldcount ] &&
-            (/hostrepo/xbps-src -j$(nproc) -s -H ~/hostdir pkg hyprpaper-nightly) &&
-            rm ~/oldpkgs/hyprpaper-nightly* &&
-            cp ~/hostdir/binpkgs/hyprpaper-nightly* ~/oldpkgs ||
-            echo "hyprpaper-nightly is up to date"
-
-      - name: Index refreshed packages
-        run: |
-          cd ~/oldpkgs
-          xbps-rindex -a *
-
-      # Retrieve the signing key from the separate private repository
-      - name: Retrieve private key
-        run: |
-          cd ~
-          curl -H 'Authorization: token ${{ secrets.PEM_PAT }}' \
-            -H 'Accept: application/vnd.github.v3.raw' \
-            -O -L https://api.github.com/repos/${{ env.REPO_OWNER }}/hyprland-void-private-pem/contents/private.pem
-
-      # We need to sign the packages with our private key so that they will be accepted by xbps remotely
-      # See: https://docs.voidlinux.org/xbps/repositories/signing.html
-      - name: Sign repository
-        run: |
-          export XBPS_PASSPHRASE=${{ secrets.PRIVATE_PEM_PASSPHRASE }}
-          xbps-rindex --privkey ~/private.pem --sign --signedby "${{ env.REPO_NAME }}-github-action" ~/oldpkgs
-          xbps-rindex --privkey ~/private.pem --sign-pkg ~/oldpkgs/*.xbps
-
-      # We'll blow the size of the repository up very quickly if we do not delete old iterations of the repository
-      - name: Delete old repository and recreate with new packages
-        run: |
-          cd ~/void-pkgs/${{ env.REPO_NAME }}
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git push https://${{ env.REPO_OWNER }}:${{ secrets.ACCESS_GIT }}@github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git -d repository-x86_64-musl
-          git switch --orphan repository-x86_64-musl
-          cp ~/oldpkgs/* ./
-          git add .
-          git commit -m "Upload latest packages to repository"
-          git push https://${{ env.REPO_OWNER }}:${{ secrets.ACCESS_GIT }}@github.com/${{ env.REPO_OWNER }}/${{ env.REPO_NAME }}.git repository-x86_64-musl
-
diff --git a/README.md b/README.md
index f182e72..7745c0f 100644
--- a/README.md
+++ b/README.md
@@ -37,21 +37,13 @@ In order to run Hyprland you will need to install some additional packages which
 
 You may also have to add the user to the `_seatd` group.
 
-### Nightly
-
-There are also binary `-nightly` packages, built automatically at 00:00 UTC directly from git if there is a new commit available. There are templates available for this as well, but you will have to manually force rebuild it every time as XBPS has no built-in means of supporting git packages and upgrading to newer versions from git packages without manually bumping the revision every time.
-
-Note, because of how XBPS is designed, you will have to manually specify `-nightly` dependencies to be installed as it will opt for normal dependencies otherwise:
-
-```
-sudo xbps-install -S hyprland-nightly-devel hyprcursor-nightly hyprlang-nightly hyprutils-nightly
-```
+#### Nvidia
 
-These `-nightly` packages are not particularly recommended - you may be better off building and installing Hyprland manually instead.
+The `hyprland-nvidia` has been removed as it is no longer necessary as of [version 0.33.0](https://github.com/hyprwm/Hyprland/releases/tag/v0.33.0). Nvidia support is still unofficial; refer to the [manual](https://wiki.hyprland.org/hyprland-wiki/pages/Nvidia/).
 
-#### Note for Nvidia Users
+### Nightly
 
-The `hyprland-nvidia` has been removed as it is no longer necessary as of [version 0.33.0](https://github.com/hyprwm/Hyprland/releases/tag/v0.33.0). Nvidia support is still unofficial; refer to the [manual](https://wiki.hyprland.org/hyprland-wiki/pages/Nvidia/).
+Nightly packages have been removed as of 2024/08/13. They were always a bad idea, and with [newer git versions](https://github.com/hyprwm/Hyprland/commit/83a334f97df4389ca30cb63e50317a66a82562b9) of Hyprland after version 0.42.0 requiring GCC 14 which has not yet landed in the hopelessly out of date void-packages repository, it simply doesn't make sense to continue maintaining nightly packages in this repository. If you would like to use git packages for Hypr\*, you would probably be better off building directly [from source](https://wiki.hyprland.org/Getting-Started/Installation/#manual-manual-build), or [use Nix](https://nixos.org/download/).
 
 ### Extra
 There are packages in this repository which may be of interest for:
@@ -61,7 +53,6 @@ There are packages in this repository which may be of interest for:
 - hyprpaper
 - xdg-desktop-portal-hyprland
 
-
 ### Manually Building
 
 You may want to build these templates manually, for example if you have a specific configuration requirement that needs to be set at build time. Void-packages may sometimes have specific packages which are out of date from time to time that need to be updated beforehand in order to update Hyprland, which is why this repository is not simply forked off it. We need to copy the modifications from this repository on top of a fresh void-packages clone in order to build manually.
diff --git a/srcpkgs/hyprcursor-nightly/template b/srcpkgs/hyprcursor-nightly/template
deleted file mode 100644
index 61d28c8..0000000
--- a/srcpkgs/hyprcursor-nightly/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'hyprcursor-nightly'
-pkgname=hyprcursor-nightly
-version=0.1.9
-revision=1
-build_style=cmake
-hostmakedepends="pkgconf cairo-devel git"
-makedepends="hyprlang-nightly librsvg-devel libzip-devel tomlplusplus"
-short_desc="Hyprland cursor format, library and utilities"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprcursor"
-
-conflicts="hyprcursor"
-provides="hyprcursor-0.1.9_1"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprcursor.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/hypridle-nightly/template b/srcpkgs/hypridle-nightly/template
deleted file mode 100644
index cb871f5..0000000
--- a/srcpkgs/hypridle-nightly/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'hypridle-nightly'
-pkgname=hypridle-nightly
-version=0.1.1
-revision=1
-build_style=cmake
-hostmakedepends="cmake git pkgconf"
-makedepends="hyprlang-nightly sdbus-cpp wayland-devel wayland-protocols"
-short_desc="Hyprland's idle daemon"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hypridle"
-changelog="https://github.com/hyprwm/${pkgname}/releases"
-
-conflicts="hypridle"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hypridle.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
diff --git a/srcpkgs/hyprland-nightly-devel b/srcpkgs/hyprland-nightly-devel
deleted file mode 120000
index c487d68..0000000
--- a/srcpkgs/hyprland-nightly-devel
+++ /dev/null
@@ -1 +0,0 @@
-hyprland-nightly
\ No newline at end of file
diff --git a/srcpkgs/hyprland-nightly/template b/srcpkgs/hyprland-nightly/template
deleted file mode 100644
index b14ec6f..0000000
--- a/srcpkgs/hyprland-nightly/template
+++ /dev/null
@@ -1,103 +0,0 @@
-# Template file for 'hyprland-nightly'
-pkgname=hyprland-nightly
-version=0.41.1
-revision=1
-build_style=cmake
-configure_args=" --no-warn-unused-cli \
-	-DCMAKE_BUILD_TYPE:STRING=Release \
-	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	-DNO_SYSTEMD:STRING=true \
-	-G Ninja
-"
-hstmkdeps="
-	cmake
-	cpio
-	gcc
-	git
-	glslang
-	hyprwayland-scanner-nightly
-	jq
-	make
-	meson
-	ninja
-	pkgconf
-	wayland-devel
-"
-hostmakedepends=$hstmkdeps
-makedepends="
-	cairo-devel
-	hwids
-	hyprcursor-nightly
-	hyprlang-nightly
-	hyprutils-nightly
-	libdisplay-info-devel
-	libdrm-devel
-	libgbm-devel
-	libglvnd-devel
-	libinput-devel
-	libliftoff-devel
-	libseat-devel
-	libxcb-devel
-	libxkbcommon-devel
-	pango-devel
-	tomlplusplus
-	wayland-devel
-	wayland-protocols
-	xcb-util-errors-devel
-	xcb-util-renderutil-devel
-	xcb-util-wm-devel
-	xorg-server-xwayland
-"
-short_desc="Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://hyprland.org/"
-changelog="https://github.com/hyprwm/Hyprland/releases"
-
-conflicts="hyprland"
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	configure_args+=" -DCMAKE_CXX_FLAGS=\"-lexecinfo\""
-	makedepends+=" libexecinfo-devel"
-	depends+=" libexecinfo"
-fi
-
-do_fetch() {
-	git clone --depth=1 --recurse-submodules --shallow-submodules https://github.com/hyprwm/Hyprland.git $wrksrc
-}
-
-post_install() {
-	# license
-	vlicense LICENSE
-
-	# headers
-	vmkdir usr/include/hyprland
-	vmkdir usr/include/hyprland/protocols
-	vmkdir usr/include/hyprland/wlr
-	vmkdir usr/share/pkgconfig
-
-	cmake --build ./build --config Release --target generate-protocol-headers
-
-	find src -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland
-
-	pushd subprojects/wlroots-hyprland/include/wlr
-	find . -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland/wlr
-	popd
-
-	pushd subprojects/wlroots-hyprland/build/include
-	find . -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland/wlr
-	popd
-
-	install -Dm0644 protocols/*-protocol.h ${DESTDIR}/usr/include/hyprland/protocols
-	vinstall build/hyprland.pc 644 usr/share/pkgconfig
-}
-
-hyprland-nightly-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} ${hstmkdeps} ${makedepends}"
-	short_desc="Dynamic tiling Wayland compositor - development files"
-	conflicts="hyprland-devel"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share/pkgconfig
-	}
-}
diff --git a/srcpkgs/hyprland-protocols-nightly/template b/srcpkgs/hyprland-protocols-nightly/template
deleted file mode 100644
index 522defe..0000000
--- a/srcpkgs/hyprland-protocols-nightly/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'hyprland-protocols-nightly'
-pkgname=hyprland-protocols-nightly
-version=0.2
-revision=1
-build_style=meson
-hostmakedepends="git wayland-devel"
-makedepends="wayland-devel"
-short_desc="Wayland protocol extensions for Hyprland"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprland-protocols"
-
-conflicts="hyprland-protocols"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprland-protocols.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/hyprland/template b/srcpkgs/hyprland/template
index ef6b1cf..70a119d 100644
--- a/srcpkgs/hyprland/template
+++ b/srcpkgs/hyprland/template
@@ -24,7 +24,7 @@ hstmkdeps="
 "
 hostmakedepends=$hstmkdeps
 makedepends="
-        aquamarine
+	aquamarine
 	cairo-devel
 	hwids
 	hyprcursor
@@ -38,7 +38,7 @@ makedepends="
 	libliftoff-devel
 	libseat-devel
 	libxcb-devel
-        libXcursor-devel
+	libXcursor-devel
 	libxkbcommon-devel
 	pango-devel
 	tomlplusplus
@@ -70,22 +70,12 @@ post_install() {
 	# headers
 	vmkdir usr/include/hyprland
 	vmkdir usr/include/hyprland/protocols
-	#vmkdir usr/include/hyprland/wlr
 	vmkdir usr/share/pkgconfig
 
 	cmake --build ./build --config Release --target generate-protocol-headers
 
 	find src -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland
-
-	#pushd subprojects/wlroots-hyprland/include/wlr
-	#find . -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland/wlr
-	#popd
-
-	#pushd subprojects/wlroots-hyprland/build/include
-	#find . -name '*.h*' -print0 | cpio --quiet -0dump ${DESTDIR}/usr/include/hyprland/wlr
-	#popd
-
-	#install -Dm0644 protocols/*.h ${DESTDIR}/usr/include/hyprland/protocols
+	install -Dm0644 protocols/*.h* ${DESTDIR}/usr/include/hyprland/protocols
 	vinstall build/hyprland.pc 644 usr/share/pkgconfig
 }
 
diff --git a/srcpkgs/hyprlang-nightly/template b/srcpkgs/hyprlang-nightly/template
deleted file mode 100644
index fc5ce72..0000000
--- a/srcpkgs/hyprlang-nightly/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'hyprlang-nightly'
-pkgname=hyprlang-nightly
-version=0.5.2
-revision=1
-build_style=cmake
-hostmakedepends="cmake git pkgconf"
-makedepends="hyprutils-nightly"
-short_desc="Official implementation library for the hypr config language"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="LGPL-3.0-only"
-homepage="https://hyprland.org/hyprlang/index.html"
-changelog="https://github.com/hyprwm/hyprlang/releases"
-
-conflicts="hyprlang"
-provides="hyprlang-0.5.2_1"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprlang.git $wrksrc
-}
-
diff --git a/srcpkgs/hyprlock-nightly/template b/srcpkgs/hyprlock-nightly/template
deleted file mode 100644
index 7d2f662..0000000
--- a/srcpkgs/hyprlock-nightly/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'hyprlock-nightly'
-pkgname=hyprlock-nightly
-version=0.3.0
-revision=1
-build_style=cmake
-hostmakedepends="cmake git pkgconf"
-makedepends="
-	cairo-devel
-	file-devel
-	hyprlang-nightly
-	libdrm-devel
-	libjpeg-turbo-devel
-	libwebp-devel
-	libxkbcommon-devel
-	MesaLib-devel
-	pango-devel
-	pam-devel
-	wayland-devel
-	wayland-protocols
-"
-short_desc="Hyprland's GPU-accelerated screen locking utility"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprlock"
-changelog="https://github.com/hyprwm/${pkgname}/releases"
-
-conflicts="hyprlock"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprlock.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
diff --git a/srcpkgs/hyprlock/template b/srcpkgs/hyprlock/template
index d86227f..4cf0025 100644
--- a/srcpkgs/hyprlock/template
+++ b/srcpkgs/hyprlock/template
@@ -13,10 +13,6 @@ changelog="https://github.com/hyprwm/${pkgname}/releases"
 distfiles="https://github.com/hyprwm/${pkgname}/archive/refs/tags/v${version}.tar.gz"
 checksum=87531a43088cafcadf29115889f37f73ab4a8cb1e4347723dfe8d53fa0aaba60
 
-do_patch() {
-	patch ${wrksrc}/CMakeLists.txt ${wrksrc}/nix/cmake.patch
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/hyprpaper-nightly/template b/srcpkgs/hyprpaper-nightly/template
deleted file mode 100644
index 2fc7733..0000000
--- a/srcpkgs/hyprpaper-nightly/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'hyprpaper-nightly'
-pkgname=hyprpaper-nightly
-version=0.7.0
-revision=1
-hostmakedepends="pkgconf cmake wayland-devel git"
-makedepends="
-	pango-devel
-	cairo-devel
-	libjpeg-turbo-devel
-	wayland-devel
-	wayland-protocols
-	wlroots-devel
-	hyprland-protocols-nightly
-	hyprlang-nightly
-	libwebp-devel
-	file-devel
-"
-short_desc="Fast wallpaper utility for wlroots compositors with IPC controls"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprpaper"
-
-conflicts="hyprpaper"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprpaper.git $wrksrc
-}
-
-do_build() {
-	cmake \
-		--no-warn-unused-cli \
-		-G "Unix Makefiles" \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		-B build
-	make protocols
-	make -C build all
-}
-
-do_install() {
-	vbin build/hyprpaper
-	vlicense LICENSE
-}
diff --git a/srcpkgs/hyprutils-nightly/template b/srcpkgs/hyprutils-nightly/template
deleted file mode 100644
index 7209ae7..0000000
--- a/srcpkgs/hyprutils-nightly/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'hyprutils-nightly'
-pkgname=hyprutils-nightly
-version=0.1.2
-revision=1
-build_style=cmake
-hostmakedepends="git pkgconf"
-makedepends="pixman-devel"
-short_desc="A small C++ library used across the Hypr* ecosystem"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprutils"
-
-conflicts="hyprutils"
-provides="hyprutils-0.1.2_1"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprutils.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
diff --git a/srcpkgs/hyprwayland-scanner-nightly/template b/srcpkgs/hyprwayland-scanner-nightly/template
deleted file mode 100644
index ba7b9dd..0000000
--- a/srcpkgs/hyprwayland-scanner-nightly/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'hyprwayland-scanner-nightly'
-pkgname=hyprwayland-scanner-nightly
-version=0.3.10
-revision=1
-build_style=cmake
-hostmakedepends="git pkgconf"
-makedepends="pugixml-devel"
-short_desc="Hyprland's implementation of wayland-scanner in/for C++"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/hyprwayland-scanner"
-
-conflicts="hyprwayland-scanner"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/hyprwayland-scanner.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
diff --git a/srcpkgs/xdg-desktop-portal-hyprland-nightly/template b/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
deleted file mode 100644
index fad0dfd..0000000
--- a/srcpkgs/xdg-desktop-portal-hyprland-nightly/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'xdg-desktop-portal-hyprland-nightly'
-pkgname=xdg-desktop-portal-hyprland-nightly
-version=1.3.2
-revision=1
-build_style=cmake
-hostmakedepends="
-	pkgconf
-	wayland-devel
-	scdoc
-	cmake
-	git
-"
-makedepends="
-	wayland-devel
-	wayland-protocols
-	hyprland-protocols-nightly
-	pipewire-devel
-	libgbm-devel
-	libdrm-devel
-	elogind-devel
-	qt6-base-devel
-	hyprlang-nightly
-	sdbus-cpp
-"
-depends="
-	xdg-desktop-portal
-	pipewire
-	qt6-base
-	qt6-wayland
-	hyprlang-nightly
-	sdbus-cpp
-"
-short_desc="Backend of xdg-desktop-portal for Hyprland"
-maintainer="Makrennel <makrommel@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
-
-conflicts="xdg-desktop-portal-hyprland"
-
-do_fetch() {
-	git clone --depth=1 https://github.com/hyprwm/xdg-desktop-portal-hyprland.git $wrksrc
-}
-
-post_install() {
-	vlicense LICENSE
-}