diff --git a/01-main/manifest b/01-main/manifest
index ce9191217..fbe7ee407 100644
--- a/01-main/manifest
+++ b/01-main/manifest
@@ -35,7 +35,6 @@ code
 codium
 com.github.tkashkin.gamehub
 copyq
-#corectrl
 cosign
 croc
 cronopete
@@ -43,7 +42,6 @@ crossover
 crow-translate
 cryptomator
 dbeaver-ce
-#deadbeef
 deadbeef-static
 deborah
 deltachat-desktop
@@ -65,7 +63,6 @@ element-desktop
 emby-server
 enpass
 exifcleaner
-#exodus
 expressvpn
 fail2ban
 fastfetch
@@ -84,7 +81,6 @@ franz
 frostwire
 fsearch
 gcm
-#geforcenow-electron
 gh
 git-delta
 github-desktop
@@ -110,7 +106,6 @@ hyper
 hyperfine
 i3
 igdm
-#igdm-pro
 imhex
 indicator-sound-switcher
 influxdb
@@ -164,7 +159,6 @@ minikube
 motrix
 mpdevil
 ms-365-electron
-#ms-office-electron
 mullvad-vpn
 multimc
 nala
@@ -172,7 +166,6 @@ nala-legacy
 nekoray
 nemo-mediainfo-tab
 neo4j
-#neovim
 nextcloud-desktop
 nodejs
 nomad
@@ -196,11 +189,9 @@ p3x-onenote
 pandoc
 papirus-folders
 papirus-icon-theme
-#parsec
 pdfsam-basic
 pdfsam-visual
 peazip
-#picocrypt
 plexmediaserver
 plow
 polychromatic
@@ -229,7 +220,6 @@ rstudio
 rstudio-server
 rustdesk
 sejda-desktop
-#sengi
 shutter-encoder
 signal-desktop
 simplenote
@@ -284,7 +274,6 @@ trivy
 typora
 ubuntu-make
 ulauncher
-#ungoogled-chromium
 urserver
 usbimager
 vagrant
diff --git a/01-main/packages/brave-browser b/01-main/packages/brave-browser
index 5dc010470..d498b1bbb 100644
--- a/01-main/packages/brave-browser
+++ b/01-main/packages/brave-browser
@@ -1,5 +1,5 @@
 DEFVER=1
-ASC_KEY_URL="https://brave-browser-apt-release.s3.brave.com/brave-core.asc"
+GPG_KEY_URL="https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg"
 APT_LIST_NAME="brave-browser-release"
 APT_REPO_URL="https://brave-browser-apt-release.s3.brave.com/ stable main"
 APT_REPO_OPTIONS="arch=amd64"
diff --git a/01-main/packages/corectrl b/01-main/packages/corectrl
deleted file mode 100644
index 7b8657170..000000000
--- a/01-main/packages/corectrl
+++ /dev/null
@@ -1,5 +0,0 @@
-DEFVER=1
-PPA="ppa:ernstp/mesarc"
-PRETTY_NAME="CoreCtrl"
-WEBSITE="https://gitlab.com/corectrl/corectrl"
-SUMMARY="A Free and Open Source GNU/Linux application that allows you to control with ease your computer hardware using application profiles."
diff --git a/01-main/packages/deadbeef b/01-main/packages/deadbeef
deleted file mode 100644
index b531d3e99..000000000
--- a/01-main/packages/deadbeef
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFVER=1
-get_website "https://deadbeef.sourceforge.io/download.html"
-if [ "${ACTION}" != "prettylist" ]; then
-    local REDIR_URL="$(grep "amd64\.deb" "${CACHE_FILE}" | cut -d'"' -f2)"
-    URL=$(unroll_url "${REDIR_URL}")
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'_' -f2)"
-fi
-PRETTY_NAME="DeaDBeeF Player"
-WEBSITE="https://deadbeef.sourceforge.io/"
-SUMMARY="The ultimate music player"
diff --git a/01-main/packages/doublecmd-gtk b/01-main/packages/doublecmd-gtk
index 27c298a21..e06410941 100644
--- a/01-main/packages/doublecmd-gtk
+++ b/01-main/packages/doublecmd-gtk
@@ -1,8 +1,15 @@
-DEFVER=1
-CODENAMES_SUPPORTED="buster bullseye focal jammy kinetic lunar mantic noble"
-ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/Release.key"
+DEFVER=2
+CODENAMES_SUPPORTED="buster bullseye bookworm focal jammy kinetic lunar mantic noble"
+LOCALID=""
+case ${UPSTREAM_ID} in
+    ubuntu)
+        LOCALID="x${UPSTREAM_ID^}" ;; 
+    debian)
+        LOCALID="${UPSTREAM_ID^}" ;; 
+esac
+ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/Release.key"
 APT_LIST_NAME="doublecmd"
-APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/ /"
+APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/ /"
 PRETTY_NAME="doublecmd-gtk"
 WEBSITE="https://doublecmd.sourceforge.io/"
 SUMMARY="Doublecmd is a cross-platform open source file manager with two panels side by side. It is inspired by Total Commander and features new ideas."
diff --git a/01-main/packages/doublecmd-qt b/01-main/packages/doublecmd-qt
index baf9f4ef8..e02c6e61c 100644
--- a/01-main/packages/doublecmd-qt
+++ b/01-main/packages/doublecmd-qt
@@ -1,8 +1,15 @@
-DEFVER=1
-CODENAMES_SUPPORTED="buster bullseye focal jammy kinetic lunar mantic noble"
-ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/Release.key"
+DEFVER=2
+CODENAMES_SUPPORTED="buster bullseye bookworm focal jammy kinetic lunar mantic noble"
+LOCALID=""
+case ${UPSTREAM_ID} in
+    ubuntu)
+        LOCALID="x${UPSTREAM_ID^}" ;; 
+    debian)
+        LOCALID="${UPSTREAM_ID^}" ;; 
+esac
+ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/Release.key"
 APT_LIST_NAME="doublecmd"
-APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/ /"
+APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/ /"
 PRETTY_NAME="doublecmd-qt"
 WEBSITE="https://doublecmd.sourceforge.io/"
 SUMMARY="Doublecmd is a cross-platform open source file manager with two panels side by side. It is inspired by Total Commander and features new ideas."
diff --git a/01-main/packages/geforcenow-electron b/01-main/packages/geforcenow-electron
deleted file mode 100644
index b4612ced8..000000000
--- a/01-main/packages/geforcenow-electron
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFVER=1
-get_github_releases "hmlendea/gfn-electron"
-if [ "${ACTION}" != "prettylist" ]; then
-    URL=$(grep "browser_download_url.*\.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'_' -f2)"
-fi
-PRETTY_NAME="GeForce NOW"
-WEBSITE="https://github.com/hmlendea/gfn-electron"
-SUMMARY="Desktop client for Nvidia's GeForce NOW game streaming service."
diff --git a/01-main/packages/igdm-pro b/01-main/packages/igdm-pro
deleted file mode 100644
index 4e425dba7..000000000
--- a/01-main/packages/igdm-pro
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFVER=1
-get_github_releases "igdmapps/igdm-pro-release"
-if [ "${ACTION}" != "prettylist" ]; then
-    URL="$(grep "browser_download_url.*${HOST_ARCH}\.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)"
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'_' -f2)"
-fi
-PRETTY_NAME="IGdm Pro Messenger"
-WEBSITE="https://pro.igdm.me/"
-SUMMARY="Continue your Instagram direct messages from your phone to your desktop."
diff --git a/01-main/packages/nala b/01-main/packages/nala
index 4ca9cc894..53c38a3da 100644
--- a/01-main/packages/nala
+++ b/01-main/packages/nala
@@ -1,8 +1,8 @@
-DEFVER=1
+DEFVER=2
 ARCHS_SUPPORTED="amd64 arm64 armhf"
 CODENAMES_SUPPORTED="bookworm sid jammy lunar mantic noble"
-GPG_KEY_URL="https://deb.volian.org/volian/scar.key"
-APT_REPO_URL="http://deb.volian.org/volian/ scar main"
+GPG_KEY_URL="https://deb.volian.org/volian/nala.key"
+APT_REPO_URL="http://deb.volian.org/volian/ nala main"
 APT_REPO_OPTIONS="arch=${HOST_ARCH}"
 PRETTY_NAME="Nala"
 WEBSITE="https://gitlab.com/volian/nala"
diff --git a/01-main/packages/neovim b/01-main/packages/neovim
deleted file mode 100644
index 01ea78bf1..000000000
--- a/01-main/packages/neovim
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFVER=1
-get_github_releases "neovim/neovim" "latest"
-if [ "${ACTION}" != "prettylist" ]; then
-    URL=$(grep "browser_download_url.*nvim-linux64\.deb[^.]" "${CACHE_FILE}" | cut -d'"' -f4)
-    VERSION_PUBLISHED=$(wget -q https://github.com/neovim/neovim/releases/tag/stable -O- | grep -o -E 'NVIM v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+'|head -1|tr -d 'NVIM v' )
-fi
-PRETTY_NAME="Neovim"
-WEBSITE="https://neovim.io/"
-SUMMARY="Hyperextensible Vim-based text editor"
diff --git a/01-main/packages/parsec b/01-main/packages/parsec
deleted file mode 100644
index 5a2046b7e..000000000
--- a/01-main/packages/parsec
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFVER=1
-URL="https://builds.parsecgaming.com/package/parsec-linux.deb"
-VERSION_PUBLISHED=""
-PRETTY_NAME="Parsec"
-WEBSITE="https://parsec.app/"
-SUMMARY="Simple, low-latency game streaming."
diff --git a/01-main/packages/picocrypt b/01-main/packages/picocrypt
deleted file mode 100644
index 1c2a25437..000000000
--- a/01-main/packages/picocrypt
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFVER=1
-get_github_releases "HACKERALERT/Picocrypt" "latest"
-if [ "${ACTION}" != "prettylist" ]; then
-    URL="$(grep "browser_download_url.*\.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)"
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8)"
-fi
-PRETTY_NAME="Picocrypt"
-WEBSITE="https://github.com/HACKERALERT/Picocrypt/"
-SUMMARY="A very small, very simple, yet very secure encryption tool."
diff --git a/01-main/packages/sengi b/01-main/packages/sengi
deleted file mode 100644
index 8d68203e9..000000000
--- a/01-main/packages/sengi
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFVER=1
-get_github_releases "NicolasConstant/sengi"
-if [ "${ACTION}" != "prettylist" ]; then
-    URL=$(grep "browser_download_url.*linux\.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8)"
-fi
-PRETTY_NAME="Sengi"
-WEBSITE="https://github.com/NicolasConstant/sengi"
-SUMMARY="Tweetdeck inspired Mastodon & Pleroma Multi-account Desktop Client."
diff --git a/01-main/packages/ungoogled-chromium b/01-main/packages/ungoogled-chromium
deleted file mode 100644
index a1d65cdc1..000000000
--- a/01-main/packages/ungoogled-chromium
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFVER=1
-APT_LIST_NAME="home-ungoogled_chromium"
-case "${UPSTREAM_CODENAME}" in
-    focal)
-        ASC_KEY_URL="https://download.opensuse.org/repositories/home:/ungoogled_chromium/Ubuntu_Focal/Release.key"
-        APT_REPO_URL="http://download.opensuse.org/repositories/home:/ungoogled_chromium/Ubuntu_Focal/ /"
-        ;;
-    *)
-        ASC_KEY_URL="https://download.opensuse.org/repositories/home:/ungoogled_chromium/Debian_Sid/Release.key"
-        APT_REPO_URL="http://download.opensuse.org/repositories/home:/ungoogled_chromium/Debian_Sid/ /"
-        ;;
-esac
-PRETTY_NAME="ungoogled-chromium"
-WEBSITE="https://github.com/Eloston/ungoogled-chromium"
-SUMMARY="Google Chromium, sans integration with Google."