diff --git a/README.md b/README.md
index c414021..09be791 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,12 @@ Custom package repository for Antergos NeXT ISO builds.
 
 | Package | Description | Source |
 |---------|-------------|--------|
-| `cnchi` | Antergos NeXT graphical installer (GTK4) | `Antergos-NeXT/Cnchi` (`cnchi-dev`) |
-| `calamares` | Universal installer framework (experimental, Qt6) | [upstream](https://codeberg.org/calamares/calamares) |
+| `calamares` | Universal installer framework (Qt6) | [upstream](https://codeberg.org/calamares/calamares) |
 | `calamares-branding-antergos-next` | Blue Calamares theme + offline/online installer split + dracut | local |
 | `hal` | HAL 9000 package manager — dual-mode (pacman wrapper + native standalone) | local |
 | `antergos-next-keyring` | GPG keyring for the repo | local |
 | `antergos-next-mirrorlist` | Mirror list for `[antergos-pkgs]` | local |
 | `antergos-next-desktop-settings` | Custom GTK/Plasma theme, dconf defaults | local |
-| `antergos-next-memes` | Audio files for Cnchi easter eggs (channel 666) | local |
 | `antergos-wallpapers` | Antergos desktop wallpapers | local |
 | `yay` | AUR helper | AUR |
 | `downgrade` | Pacman package downgrade tool | AUR |
@@ -32,7 +30,7 @@ Then:
 
 ```
 pacman -Sy
-pacman -S cnchi hal antergos-next-desktop-settings
+pacman -S calamares hal antergos-next-desktop-settings
 ```
 
 ## What is HAL?
@@ -60,7 +58,7 @@ The `calamares-branding-antergos-next` package provides:
 ## Branches
 
 - `master` — package definitions, CI builds + deploys to gh-pages
-- Cnchi sources shipped from `Antergos-NeXT/Cnchi` (`cnchi-dev`)
+- Calamares packages shipped from upstream (with custom branding)
 
 ## License
 
diff --git a/packages.yaml b/packages.yaml
index d16258b..1d7c56d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5,7 +5,6 @@ packages:
   - antergos-next-keyring
   - antergos-next-mirrorlist
   - antergos-next-desktop-settings
-  - cnchi
   - calamares
   - calamares-branding-antergos-next
   - antergos-next-memes
diff --git a/packages/antergos-next-memes/PKGBUILD b/packages/antergos-next-memes/PKGBUILD
index f63da1a..d0b9371 100644
--- a/packages/antergos-next-memes/PKGBUILD
+++ b/packages/antergos-next-memes/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=antergos-next-memes
 pkgver=1.0
 pkgrel=1
-pkgdesc="Cnchi installer audio enhancements"
+pkgdesc="Antergos NeXT welcome audio"
 arch=('any')
 url="https://github.com/Antergos-NeXT"
 license=('custom:fairuse')
@@ -16,8 +16,8 @@ sha256sums=('SKIP'
             'SKIP')
 
 package() {
-  install -dm755 "${pkgdir}/usr/share/cnchi-memes"
-  cp "i-feel-fantastic.opus" "${pkgdir}/usr/share/cnchi-memes/"
-  cp "still-alive.opus" "${pkgdir}/usr/share/cnchi-memes/"
-  cp "its-raining-tacos.opus" "${pkgdir}/usr/share/cnchi-memes/"
+  install -dm755 "${pkgdir}/usr/share/antergos-next-memes"
+  cp "i-feel-fantastic.opus" "${pkgdir}/usr/share/antergos-next-memes/"
+  cp "still-alive.opus" "${pkgdir}/usr/share/antergos-next-memes/"
+  cp "its-raining-tacos.opus" "${pkgdir}/usr/share/antergos-next-memes/"
 }
diff --git a/packages/calamares-branding-antergos-next/show.qml b/packages/calamares-branding-antergos-next/show.qml
index 81a078c..ce2e3a5 100644
--- a/packages/calamares-branding-antergos-next/show.qml
+++ b/packages/calamares-branding-antergos-next/show.qml
@@ -145,7 +145,7 @@ Presentation
 
                 Text { text: "• Welcome app — system info & quick config" ; font.pixelSize: 13 ; color: "#34495E" }
                 Text { text: "• Calamares installer — easy setup" ; font.pixelSize: 13 ; color: "#34495E" }
-                Text { text: "• Cnchi — classic Antergos installer" ; font.pixelSize: 13 ; color: "#34495E" }
+                Text { text: "• Calamares — easy setup with offline & online modes" ; font.pixelSize: 13 ; color: "#34495E" }
                 Text { text: "• Pacman + AUR helper — full package access" ; font.pixelSize: 13 ; color: "#34495E" }
                 Text { text: "• Online documentation and community" ; font.pixelSize: 13 ; color: "#34495E" }
             }
diff --git a/packages/cnchi/PKGBUILD b/packages/cnchi/PKGBUILD
deleted file mode 100644
index af50f4a..0000000
--- a/packages/cnchi/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Maintainer: Celestia Ludenberg <ash8820@proton.me>
-# Contributor: Antergos NeXT Team
-
-pkgname=cnchi
-pkgver=0.17.1
-pkgrel=2
-pkgdesc="Antergos NeXT graphical installer (GTK4)"
-arch=('any')
-url="https://github.com/Antergos-NeXT/cnchi-next"
-license=('GPL3')
-depends=(
-  'gtk4'
-  'python'
-  'python-cairo'
-  'python-gobject'
-  'python-dbus'
-  'python-requests'
-  'python-chardet'
-  'python-feedparser'
-  'python-idna'
-  'python-mako'
-  'python-geoip2'
-  'python-maxminddb'
-  'python-passlib'
-  'pyalpm'
-  'python-pyparted'
-  'parted'
-  'dosfstools'
-  'mtools'
-  'ntfs-3g'
-  'upower'
-  'gocryptfs'
-  'iso-codes'
-  'webkitgtk-6.0'
-)
-optdepends=('python-libnacl: Lembrame settings sync feature')
-makedepends=('git')
-install=cnchi.install
-source=("${pkgname}::git+https://github.com/Antergos-NeXT/cnchi-next.git#branch=cnchi-dev")
-sha256sums=('SKIP')
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  # Install Cnchi Python modules
-  install -dm755 "${pkgdir}/usr/share/cnchi"
-  cp -r src/* "${pkgdir}/usr/share/cnchi/"
-  cp -r data "${pkgdir}/usr/share/cnchi/"
-  cp -r ui "${pkgdir}/usr/share/cnchi/"
-  cp -r scripts "${pkgdir}/usr/share/cnchi/"
-  cp -r po "${pkgdir}/usr/share/cnchi/"
-  cp -r utils "${pkgdir}/usr/share/cnchi/"
-  cp run "${pkgdir}/usr/share/cnchi/"
-  cp cnchi.desktop "${pkgdir}/usr/share/cnchi/"
-  cp requirements.txt "${pkgdir}/usr/share/cnchi/"
-
-  # Create executable wrapper
-  install -dm755 "${pkgdir}/usr/bin"
-  cat > "${pkgdir}/usr/bin/cnchi" << 'EOF'
-#!/bin/bash
-exec /usr/bin/python3 /usr/share/cnchi/cnchi.py "$@"
-EOF
-  chmod 755 "${pkgdir}/usr/bin/cnchi"
-
-  # Desktop file
-  install -dm755 "${pkgdir}/usr/share/applications"
-  cp cnchi.desktop "${pkgdir}/usr/share/applications/"
-
-  # Icons
-  install -dm755 "${pkgdir}/usr/share/icons"
-  cp -r data/icons/* "${pkgdir}/usr/share/icons/" 2>/dev/null || true
-
-  # License  
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  cp COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/packages/cnchi/cnchi.install b/packages/cnchi/cnchi.install
deleted file mode 100644
index 8abb665..0000000
--- a/packages/cnchi/cnchi.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    # Register Cnchi as a potential live session installer
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor 2>/dev/null || true
-}