diff --git a/apps/alg-app-store/PKGBUILD b/apps/alg-app-store/PKGBUILD
index abdcd550..2a072b0b 100644
--- a/apps/alg-app-store/PKGBUILD
+++ b/apps/alg-app-store/PKGBUILD
@@ -1,29 +1,71 @@
+#!/bin/bash
 # Maintainer: Harsh Upadhyay amanupadhyay2004@gmail.com
+# Qt6/C++ Version
 
 pkgname=alg-app-store
-pkgver=25.3
+pkgver=0.3.0
 pkgrel=1
-destname="/usr/bin"
-pkgdesc="Package Installer For ALG"
-arch=('x86_64')
+pkgdesc="A modern, native package manager for Arch Linux built with Qt6 and C++"
+arch=('x86_64' 'aarch64')
 url="https://github.com/arch-linux-gui/alg-app-store"
-license=('GPL3')
-depends=('webkit2gtk' 'go' 'nodejs' 'npm')
-source=(${pkgname}::"git+${url}")
+license=('MIT')
+depends=(
+    'qt6-base'
+    'qt6-svg'
+    'pacman'
+    'polkit'
+)
+makedepends=(
+    'cmake'
+    'base-devel'
+    'pkgconf'
+)
+optdepends=(
+    'yay: AUR helper support'
+    'paru: Alternative AUR helper support'
+    'chaotic-keyring: Chaotic-AUR repository support'
+    'chaotic-mirrorlist: Chaotic-AUR repository support'
+)
+source=("git+https://github.com/arch-linux-gui/alg-app-store.git#branch=startup_auth")
 sha256sums=('SKIP')
 
-prepare() {
-   cd $pkgname
-   go get
-   go install github.com/wailsapp/wails/v2/cmd/wails@latest
-   ~/go/bin/wails build
+build() {
+    cd "$pkgname"
+    
+    # Create build directory
+    mkdir -p build
+    cd build
+    
+    # Configure with CMake
+    cmake .. \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_TESTS=OFF
+    
+    # Build
+    make -j$(nproc)
 }
 
 package() {
-
-  install -Dm644 "$srcdir/"${pkgname}"/assets/alg-app-store.png" "$pkgdir/usr/share/pixmaps/alg-app-store.png"
-
-  install -Dm755 "$srcdir/"${pkgname}"/assets/alg-app-store.desktop" "$pkgdir/usr/share/applications/alg-app-store.desktop"
-
-  install -Dm755 "$srcdir/"${pkgname}"/build/bin/alg-app-store" "$pkgdir/usr/bin/alg-app-store"
-}
+    cd "$pkgname/build"
+    
+    # Install binary
+    install -Dm755 alg-app-store "$pkgdir/usr/bin/alg-app-store"
+    
+    # Install desktop file
+    install -Dm644 ../assets/alg-app-store.desktop "$pkgdir/usr/share/applications/alg-app-store.desktop"
+    
+    # Install icon
+    install -Dm644 ../assets/alg-app-store.png "$pkgdir/usr/share/pixmaps/alg-app-store.png"
+    
+    # Install stylesheet
+    install -Dm644 stylesheet.qss "$pkgdir/usr/share/alg-app-store/stylesheet.qss"
+    
+    # Install license (if exists)
+    if [ -f ../LICENSE ]; then
+        install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    fi
+    
+    # Install documentation
+    install -Dm644 ../README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+}
\ No newline at end of file
diff --git a/apps/alg-welcome/PKGBUILD b/apps/alg-welcome/PKGBUILD
deleted file mode 100644
index 960fd7d1..00000000
--- a/apps/alg-welcome/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Harsh Upadhyay <amanupadhyay2004@gmail.com>
-
-pkgname=alg-welcome
-pkgver=25.3
-pkgrel=2
-pkgdesc="Welcome App For ALG (GTK Version)"
-arch=('x86_64')
-url="https://github.com/arch-linux-gui/alg-welcome"
-license=('GPL3')
-depends=('gtk3' 'glib2' 'cairo')
-makedepends=('go' 'git')
-source=(${pkgname}::"git+${url}")
-sha256sums=('SKIP')
-
-prepare() {
-  cd "$pkgname"
-  mkdir -p build
-}
-
-build() {
-  cd "$pkgname"
-
-  go build -o build/welcome ./
-}
-
-package() {
-  cd "$pkgname"
-
-  install -Dm755 "build/welcome" "$pkgdir/usr/bin/welcome"
-  install -Dm644 "assets/welcome.desktop" "$pkgdir/usr/share/applications/welcome.desktop"
-  install -Dm644 "assets/welcome.png" "$pkgdir/usr/share/pixmaps/welcome.png"
-}
diff --git a/apps/alg-welcome/cleanup.sh b/apps/alg-welcome/cleanup.sh
deleted file mode 100755
index 399289f2..00000000
--- a/apps/alg-welcome/cleanup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-rm -rvf pkg/
-rm -rvf src/
-rm -rvf alg-welcome*
diff --git a/apps/custom-installer-modules/PKGBUILD b/apps/custom-installer-modules/PKGBUILD
deleted file mode 100644
index 4691680a..00000000
--- a/apps/custom-installer-modules/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-pkgname=custom-installer-modules
-destname="/usr/lib/calamares"
-pkgver=25.3
-pkgrel=1
-pkgdesc="Custom modules for Arch Linux GUI"
-arch=('any')
-url="https://github.com/arch-linux-gui"
-license=('GPL3')
-makedepends=('git')
-depends=()
-conflicts=()
-provides=("${pkgname}")
-options=(!strip !emptydirs)
-source=(${pkgname}::"git+${url}/${pkgname}#branch=devel")
-sha256sums=('SKIP')
-
-package() {
-	# Create the target directory
-	install -dm755 "${pkgdir}${destname}"
-
-	# Copy the files from the source to the /lib/calamares directory
-	cp -r "${srcdir}/${pkgname}"/* "${pkgdir}${destname}"
-
-	# Set the appropriate permissions for all files
-	find "${pkgdir}${destname}" -type f -exec chmod 644 {} \;
-	find "${pkgdir}${destname}" -type d -exec chmod 755 {} \;
-}
-
diff --git a/apps/custom-installer-modules/cleanup.sh b/apps/custom-installer-modules/cleanup.sh
deleted file mode 100755
index fc10b81b..00000000
--- a/apps/custom-installer-modules/cleanup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-rm -rvf pkg/
-rm -rvf src/
-rm -rvf custom-installer-modules/
diff --git a/cala-configs/alg-theme-cala-config/PKGBUILD b/cala-configs/alg-theme-cala-config/PKGBUILD
index b2d5869a..36db8125 100644
--- a/cala-configs/alg-theme-cala-config/PKGBUILD
+++ b/cala-configs/alg-theme-cala-config/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=alg-theme-cala-config
 destname="/etc"
 pkgver=25.03
-pkgrel=5
+pkgrel=6
 pkgdesc="Calamares config for Arch Linux GUI Themed Editions"
 arch=('any')
 url="https://github.com/arch-linux-gui"
@@ -12,10 +12,11 @@ depends=()
 conflicts=()
 provides=("${pkgname}")
 options=(!strip !emptydirs)
-source=(${pkgname}::"git+${url}/${pkgname}")
+source=(${pkgname}::"git+${url}/${pkgname}#branch=app-store")
 sha256sums=('SKIP')
 package() {
 	install -dm755 ${pkgdir}${destname}
 	cp -r ${srcdir}/${pkgname}${destname}/* ${pkgdir}${destname}
     chmod 755 ${pkgdir}/etc/calamares/launch.sh
 }
+