diff --git a/packages/e530/pkglist_nondb b/packages/e530/pkglist_nondb
deleted file mode 100644
index 61b18c3..0000000
--- a/packages/e530/pkglist_nondb
+++ /dev/null
@@ -1,6 +0,0 @@
-foo2zjs
-latex-pscyr
-lib32-flashplugin
-liborigin2
-mathmech
-qtiplot
diff --git a/packages/e530/pkglist_other b/packages/e530/pkglist_other
deleted file mode 100644
index 6b4cc50..0000000
--- a/packages/e530/pkglist_other
+++ /dev/null
@@ -1,5 +0,0 @@
-albert
-cov-analysis
-gromacs-4.6-complete
-python-slugify
-vmd
diff --git a/packages/e530/pkglist_repo b/packages/e530/pkglist_repo
deleted file mode 100644
index 1656be8..0000000
--- a/packages/e530/pkglist_repo
+++ /dev/null
@@ -1,734 +0,0 @@
-1pass-hg
-acpi
-acpi_call
-acpi_call-lts
-acpid
-akonadi
-akonadi-calendar-tools
-akonadiconsole
-akregator
-alsa-plugins
-alsa-utils
-ant
-arch-audit
-archey3
-archlinux-artwork
-archlinux-wallpaper
-ark
-aspell-en
-aspell-ru
-at
-atom
-audacity
-aurlist
-autoconf
-automake
-autopep8
-awesome
-bash
-bash-completion
-bbswitch
-bind-tools
-binutils
-bison
-bkchem
-blackarch-keyring
-bluedevil
-bluefish
-bluez-qt
-bluez-utils
-boost
-breeze
-breeze-gtk
-broadcom-wl-dkms
-bumblebee
-bzip2
-bzr
-ca-certificates
-ca-certificates-mozilla
-ca-certificates-utils
-calendarsupport
-calligra
-canorus
-cantata
-cantor
-cdemu-client
-cdrdao
-celt
-cervisia
-check
-chef-dk
-chromium
-classpath
-clion
-cloc
-cmake
-compass-icon-theme
-coreutils
-cower
-cppcheck
-cryptsetup
-cscope
-cups
-cups-filters
-cups-pdf
-curlftpfs
-dash
-datagrip
-datagrip-jre
-device-mapper
-devtools
-dhcpcd
-diffuse
-diffutils
-digikam
-dina-font
-discord-canary
-discount
-djview
-dmidecode
-dolphin-plugins
-dosbox
-dosfstools
-downgrade
-doxygen
-doxygen-docs
-drkonqi
-dropbox
-dvd+rw-tools
-e2fsprogs
-easystroke
-ed
-elinks
-encfs
-eric
-eric-i18n-ru
-espeak
-ethtool
-eventviews
-exempi
-exfat-utils
-extra-cmake-modules
-extundelete
-fakeroot
-festival
-festival-english
-fig2dev
-file
-filelight
-filesystem
-findutils
-fingerprint-gui
-firefox-i18n-ru
-firefox-ublock-origin
-flacon
-flake8
-flashplugin
-flex
-fontconfig
-foomatic-db
-foomatic-db-nonfree
-fping
-franz-bin
-freeciv
-freerdp
-freetype2
-freshplayerplugin
-fuse2
-gawk
-gc
-gdb
-gendesk
-geogebra
-gettext
-git
-git-etc
-glibc
-gnome-breeze-git
-gnu-netcat
-gnuchess
-go
-gobject-introspection-runtime
-gocr
-goldendict
-gonvert
-gperf
-grace
-grantleetheme
-graphviz
-grep
-groff
-gromacs
-gsasl
-gst-plugins-bad
-gst-plugins-base-libs
-gst-plugins-good
-gst-python
-gtk2
-gtk3
-gtkglext
-gvfs-afc
-gwenview
-gzip
-haveged
-hddtemp
-hdparm
-hplip
-hplip-plugin
-hpoj
-htop
-hunspell-en_AU
-hunspell-en_CA
-hunspell-ru
-hwdetect
-hwinfo
-icoutils
-id3v2
-ifuse
-imake
-incidenceeditor
-inetutils
-intel-ucode
-intltool
-iotop
-iproute2
-iptraf-ng
-iputils
-ipython
-ipython2
-iso-codes
-iw
-ix
-java-environment-common
-java-service-wrapper
-jdk
-jdk8
-jemalloc
-jfsutils
-jq
-js185
-k3b
-kaccounts-integration
-kaccounts-providers
-kactivitymanagerd
-kaddressbook
-kalarm
-kalgebra
-kalzium
-kamera
-kapptemplate
-kate
-kcachegrind
-kcharselect
-kchmviewer
-kcolorchooser
-kcron
-kde-dev-utils
-kde-gtk-config
-kdeconnect
-kdegraphics-mobipocket
-kdenetwork-filesharing
-kdenlive
-kdepim-apps-libs
-kdeplasma-addons
-kdevelop
-kdevelop-python
-kdf
-kdialog
-kdnssd
-keditbookmarks
-kfind
-khotkeys
-kid3
-kig
-kile
-kimageformats
-kinfocenter
-kio-extras
-kipi-plugins
-kleopatra
-klickety
-kmag
-kmail
-kmenuedit
-kmix
-kmousetool
-kmouth
-kmplot
-knotes
-knotifyconfig
-kodi
-kolourpaint
-kompare
-konsole
-kontact
-konversation
-korganizer
-kpeople
-krdc
-krename
-krita
-kruler
-krunner
-krusader
-kscreen
-ksshaskpass
-kstars
-ksuperkey
-ksysguard
-ksystemlog
-ktimer
-ktorrent
-ktouch
-kwallet-pam
-kwalletmanager
-kwin
-kwrite
-less
-lib32-alsa-plugins
-lib32-gtk2
-lib32-libpulse
-lib32-libxmu
-lib32-mpg123
-lib32-ncurses
-lib32-nvidia-utils
-lib32-virtualgl
-libaccounts-qt
-libasl
-libc++
-libc++abi
-libc++experimental
-libcoverart
-libetonyek
-libgravatar
-libgtop
-libimobiledevice
-libkdepim
-libkleo
-libkomparediff2
-libksieve
-libkvkontakte
-libnetctlgui
-libodfgen
-libplist
-libpurple
-libreoffice-fresh
-libreoffice-fresh-ru
-librevenge
-libsoxr
-libsrtp
-libstdc++5
-libtool
-libusbmuxd
-libvisio
-libvncserver
-libwpg
-licenses
-lilypond
-linux
-linux-headers
-linux-lts
-linux-lts-headers
-lokalize
-lshw
-lsof
-lua52
-lvm2
-lz4
-m4
-mailcommon
-mailimporter
-make
-man-db
-man-pages
-marble
-mariadb
-mdadm
-mediainfo
-memtest86+
-mencoder
-mercurial
-mesa-demos
-messagelib
-minizip
-mlocate
-moc
-mono
-mpc
-mpd
-mpv
-mtools
-mtr
-musescore
-mypy
-namcap
-nano
-netctl
-netctl-gui
-netctlgui-helper
-nextcloud-client
-nitrux-icon-theme-kde
-nmap
-nodejs
-npm
-ntfs-3g
-ntp
-nvidia
-nvidia-settings
-okteta
-okular
-oniguruma
-opencl-nvidia
-openmpi
-openscenegraph
-openvpn
-p7zip
-pacman
-pacman-contrib
-pacmatic
-pamtester
-pass
-patch
-pavucontrol
-pciutils
-pdfsam
-pepper-flash
-perl
-perl-digest-sha1
-perl-mime-tools
-phonon-qt5-gstreamer
-pianobooster
-pimcommon
-pkgbuild-watch
-pkgconf
-pkgfile
-plasma-desktop
-plasma-framework
-plasma-integration
-plasma-mediacenter
-plasma-pa
-plasma-sdk
-plasma-wayland-session
-plasma-workspace
-plasma-workspace-wallpapers
-plasma5-applet-awesome-widgets
-polkit-qt5
-ponysay
-postgresql
-postgresql-libs
-postgresql-old-upgrade
-powerdevil
-poxml
-ppp
-ppsspp
-premake
-print-manager
-procps-ng
-psmisc
-pulseaudio
-pulseaudio-alsa
-pulseaudio-ctl
-pulseaudio-equalizer
-putty
-pychecker
-pymol
-python-bcrypt
-python-biopython
-python-boto
-python-configobj
-python-dateutil
-python-dbus
-python-gobject
-python-gobject2
-python-lxml
-python-mysql-connector
-python-oauth2client
-python-openbabel
-python-paramiko
-python-pip
-python-pycodestyle
-python-pycountry
-python-pytest
-python-pytz
-python-requests
-python-retrying
-python-scipy
-python-xlrd
-python2-argcomplete
-python2-beaker
-python2-biopython
-python2-cx_freeze
-python2-decorator
-python2-gobject
-python2-mako
-python2-markupsafe
-python2-matplotlib
-python2-opengl
-python2-pip
-python2-pybluez
-python2-pypdf2
-python2-pyqt5
-python2-requests
-python2-requests-oauthlib
-python2-scipy
-qconf
-qmmp
-qmmp-plugin-pack
-qt4
-qt5-3d
-qt5-canvas3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-quickcontrols2
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-svg
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qt5-x11extras
-qtcurve-gtk2
-qtcurve-qt4
-qtcurve-qt5
-qtcurve-utils
-qwt
-qwtplot3d
-r8168
-rarian
-reiserfsprogs
-remmina
-ripgrep
-rocs
-rust
-rxvt-unicode
-s-nail
-s3cmd
-samba
-scala
-scons
-screen
-scrot
-sddm
-sddm-kcm
-sdl_mixer
-sdl_ttf
-sed
-shadow
-shntool
-signon-kwallet-extension
-signon-plugin-oauth2
-signon-ui
-skanlite
-skypeforlinux-bin
-sloccount
-smartmontools
-soundkonverter
-sox
-spectacle
-speedcrunch
-sqlitebrowser
-square-beam-icon-theme
-sshfs
-steam
-step
-strace
-sudo
-sysfsutils
-syslinux
-sysstat
-systemd-sysvcompat
-systemsettings
-tamsyn-font
-tar
-tcpdump
-tcsh
-teamspeak3
-teamviewer
-telegram-desktop
-telepathy-gabble
-telepathy-haze
-telepathy-idle
-telepathy-kde-accounts-kcm
-telepathy-kde-approver
-telepathy-kde-auth-handler
-telepathy-kde-contact-list
-telepathy-kde-contact-runner
-telepathy-kde-desktop-applets
-telepathy-kde-filetransfer-handler
-telepathy-kde-integration-module
-telepathy-kde-send-file
-telepathy-kde-text-ui
-telepathy-qt
-terminus-font
-texinfo
-texlive-bibtexextra
-texlive-fontsextra
-texlive-formatsextra
-texlive-langcyrillic
-texlive-langextra
-texlive-langgreek
-texlive-latexextra
-texlive-pictures
-texlive-pstricks
-texlive-publishers
-texlive-science
-texmacs
-tmux
-tor
-tp_smapi
-tpacpi-bat-git
-traceroute
-transifex-client
-transmission-qt
-tree
-truecrypt
-tslib
-ttf-freefont
-ttf-google-fonts-git
-ttf-liberation
-ttf-literation-mono-powerline-git
-ttf-mac-fonts
-ttf-ms-fonts
-ttf-opensans
-ttf-vista-fonts
-ucsf-chimera
-umbrello
-units
-unrar
-unzip
-urxvt-perls-git
-usb_modeswitch
-usbmuxd
-usbutils
-util-linux
-valgrind
-vcdimager
-vesta
-vi
-vicious
-vid.stab
-vim
-vim-a
-vim-airline
-vim-bufexplorer
-vim-colorschemes
-vim-doxygentoolkit
-vim-fugitive
-vim-guicolorscheme
-vim-indent-object
-vim-latexsuite
-vim-minibufexpl
-vim-nerdtree
-vim-omnicppcomplete
-vim-project
-vim-qml-git
-vim-spell-en
-vim-spell-ru
-vim-supertab
-vim-surround
-vim-tagbar
-vim-taglist
-vim-vcscommand
-vim-workspace
-vimpager
-virtualbox
-wget
-which
-whois
-wine
-wine-mono
-wine_gecko
-winetricks
-wireshark-qt
-wmctrl
-wpa_actiond
-wpa_supplicant
-wvdial
-wxmaxima
-xautoclick
-xaw3d
-xbindkeys
-xboard
-xca
-xcursor-pulse-glass
-xdg-user-dirs
-xdotool
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-synaptics
-xf86-input-void
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-vesa
-xfsprogs
-xorg-appres
-xorg-docs
-xorg-fonts-cyrillic
-xorg-fonts-misc
-xorg-fonts-type1
-xorg-server
-xorg-server-common
-xorg-server-xvfb
-xorg-sessreg
-xorg-setxkbmap
-xorg-x11perf
-xorg-xauth
-xorg-xbacklight
-xorg-xclipboard
-xorg-xcmsdb
-xorg-xconsole
-xorg-xcursorgen
-xorg-xdpyinfo
-xorg-xdriinfo
-xorg-xev
-xorg-xfd
-xorg-xgamma
-xorg-xhost
-xorg-xinit
-xorg-xinput
-xorg-xkbcomp
-xorg-xkbevd
-xorg-xkbutils
-xorg-xkill
-xorg-xlsclients
-xorg-xlsfonts
-xorg-xmodmap
-xorg-xpr
-xorg-xprop
-xorg-xrandr
-xorg-xrdb
-xorg-xrefresh
-xorg-xset
-xorg-xsetroot
-xorg-xvinfo
-xorg-xwd
-xorg-xwininfo
-xorg-xwud
-xsecurelock-git
-xsel
-xterm
-yakuake-frameworks-git
-yasm
-yay
-ycm-generator-git
-zeroconf-ioslave
-zip
-zramswap
-zsh
-zsh-autosuggestions
-zsh-completions
-zsh-syntax-highlighting
diff --git a/packages/repo/pkglist_nondb b/packages/repo/pkglist_nondb
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/repo/pkglist_other b/packages/repo/pkglist_other
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/repo/pkglist_repo b/packages/repo/pkglist_repo
deleted file mode 100644
index 2b30682..0000000
--- a/packages/repo/pkglist_repo
+++ /dev/null
@@ -1,203 +0,0 @@
-abs
-apache
-at
-atk
-autoconf
-automake
-avahi
-bash
-binutils
-bison
-blackarch-keyring
-bzip2
-bzr
-cmake
-compositeproto
-coreutils
-cower
-cryptsetup
-ctags
-damageproto
-device-mapper
-devtools
-dhcpcd
-diffutils
-dosfstools
-e2fsprogs
-easy-rsa
-elfutils
-elinks
-fakeroot
-file
-filesystem
-findutils
-fixesproto
-flex
-gawk
-gcc
-gcc-libs
-gdk-pixbuf2
-gettext
-git
-git-etc
-glibc
-grep
-groff
-gtk-update-icon-cache
-gtk2
-gzip
-hdparm
-hicolor-icon-theme
-htop
-inetutils
-inputproto
-intel-ucode
-iproute2
-iputils
-isl
-ix
-jad
-jasper
-jfsutils
-kbproto
-less
-libcups
-libdaemon
-libdatrie
-libdrm
-libice
-libpciaccess
-libsm
-libthai
-libtiff
-libtool
-libvdpau
-libx11
-libxau
-libxcb
-libxcomposite
-libxcursor
-libxdamage
-libxdmcp
-libxext
-libxfixes
-libxft
-libxi
-libxinerama
-libxrandr
-libxrender
-libxshmfence
-libxt
-libxxf86vm
-libyaml
-licenses
-linux-lts
-linux-lts-headers
-llvm-libs
-lm_sensors
-logrotate
-lvm2
-m4
-mailutils
-make
-man-db
-man-pages
-mdadm
-mercurial
-mtr
-nano
-net-tools
-netctl
-ntfs-3g
-ntp
-openssh
-openvpn
-owncloud
-owncloud-app-bookmarks
-owncloud-app-calendar
-owncloud-app-documents
-owncloud-app-gallery
-p7zip
-pacman
-patch
-pciutils
-pcmciautils
-perl
-php-apache
-php-intl
-php-mcrypt
-php-pgsql
-php-xcache
-pixman
-pkg-config
-pkgfile
-postgresql
-pptpclient
-procps-ng
-psmisc
-python
-python2
-randrproto
-reiserfsprogs
-renderproto
-repo-scripts
-ruby
-s-nail
-screen
-sed
-shadow
-shared-mime-info
-smartmontools
-sqlite
-sudo
-sysfsutils
-syslinux
-systemd-sysvcompat
-tar
-terminus-font
-texinfo
-tmux
-transmission-cli
-tree
-unrar
-unzip
-usbutils
-util-linux
-vi
-vim
-vim-a
-vim-bufexplorer
-vim-colorsamplerpack
-vim-doxygentoolkit
-vim-fugitive
-vim-guicolorscheme
-vim-indent-object
-vim-jad
-vim-jellybeans
-vim-latexsuite
-vim-minibufexpl
-vim-nerdtree
-vim-netrw
-vim-omnicppcomplete
-vim-project
-vim-runtime
-vim-spell-en
-vim-spell-ru
-vim-surround
-vim-taglist
-vim-vcscommand
-vim-workspace
-vimpager
-vsftpd
-wayland
-which
-xcb-proto
-xextproto
-xf86vidmodeproto
-xfsprogs
-xineramaproto
-yaourt
-zabbix-agent
-zsh
-zsh-completions
-zsh-syntax-highlighting
diff --git a/packages/t460s/pkglist_nondb b/packages/t460s/pkglist_nondb
deleted file mode 100644
index 9b7d553..0000000
--- a/packages/t460s/pkglist_nondb
+++ /dev/null
@@ -1,12 +0,0 @@
-foo2zjs
-kde-l10n-ru
-latex-pscyr
-liborigin2
-mathmech
-monodevelop
-otf-texgyre
-python-gobject2
-python2-cx_freeze
-python2-oauth
-qtcurve-qt4
-qtiplot
diff --git a/packages/t460s/pkglist_other b/packages/t460s/pkglist_other
deleted file mode 100644
index 9d83591..0000000
--- a/packages/t460s/pkglist_other
+++ /dev/null
@@ -1,30 +0,0 @@
-automoc4
-chkcrontab
-cov-analysis
-eclipse-mat
-firefox-passff
-franz
-msbuild-stable
-osslsigncode
-pass-audit
-pass-import
-pass-update
-pgloader
-pycharm-professional
-python-aioftp
-python-aiohttp-jinja
-python-base58
-python-kafka
-python-krakenex
-python-pycoin
-python-pysftp
-python-pyswagger
-python-ratelimiter
-python-yahoofinancials
-qxmledit
-skypeforlinux-stable-bin
-textosaurus
-vmd
-websocat
-wpa_actiond
-yourkit
diff --git a/packages/t460s/pkglist_repo b/packages/t490s
similarity index 73%
rename from packages/t460s/pkglist_repo
rename to packages/t490s
index 2af73c4..173f3b7 100644
--- a/packages/t460s/pkglist_repo
+++ b/packages/t490s
@@ -1,7 +1,5 @@
-1pass-hg
 acpi
 acpi_call
-acpid
 akonadi
 akonadi-calendar-tools
 akonadi-contacts
@@ -9,60 +7,48 @@ akonadiconsole
 albert
 alsa-plugins
 alsa-utils
-apachedirectorystudio
+ammonite
 appstream
 appstream-qt
-archey3
-archlinux-artwork
-archlinux-wallpaper
 ark
 aspell-en
 aspell-ru
 at
-atom
-audiocd-kio
-aurlist
 autoconf
 automake
 autopep8
-awesome
 aws-cli
-bash
+bandit
+base
+base-devel
 bash-completion
-bind-tools
+bat
+bind
 binutils
 bison
-bkchem
 blackarch-keyring
 bluedevil
 bluefish
 bluez-utils
 boost
 breeze-gtk
-bzip2
-bzr
+breezy
 cairo
-calligra
 canorus
 cantor
 cdemu-client
-cdrdao
-cdrtools
-celt
-cervisia
 check
 chef-dk
 chemtool
+chiaki
 chromium
+chromium-widevine
 clion
 clion-cmake
 clion-jre
-cloc
 cmake
-coreutils
-cower
 cppcheck
-cryptsetup
+cpupower
 cscope
 cups
 cups-filters
@@ -72,19 +58,17 @@ cython
 dash
 datagrip
 datagrip-jre
-device-mapper
+dbus-python
 devtools
 dhcpcd
 dialog
-diffuse
-diffutils
-digikam
-dina-font
+discord
 discount
 djview
 dmenu
 dmidecode
 docker
+docker-buildx
 dolphin
 dolphin-plugins
 dosbox
@@ -93,30 +77,23 @@ double-conversion
 downgrade
 doxygen
 doxygen-docs
+drawio-desktop
 drkonqi
 dropbox
-e2fsprogs
+dsniff
 easystroke
 ecryptfs-utils
-electron2
 elinks
 encfs
-eric
-eric-i18n-ru
-espeak
+etckeeper
 ethtool
 evtest
 exfat-utils
-expac-git
 extra-cmake-modules
-extundelete
 fakeroot
-fbida
 fig2dev
 file
 filelight
-filesystem
-filezilla
 findutils
 firefox
 firefox-i18n-ru
@@ -124,40 +101,32 @@ firefox-ublock-origin
 flacon
 flake8
 flex
-fontconfig
-fping
 freerdp
-freetype2
 freshplayerplugin
-fselect
-gam
+gameconqueror
 gawk
 gcc
 gcc-fortran
-gcc-libs
+gcviewer-bin
 gdb
 gendesk
-geogebra
 gettext
 git
-git-etc
 git-lfs
-glibc
-gmvault
-gnome-breeze-git
 gnu-free-fonts
 gnu-netcat
 gnuplot
+go
 gocr
-goldendict
-gonvert
+google-cloud-cli-gke-gcloud-auth-plugin
+gopass
+gopass-jsonapi
 gperf
 gpsd
 grace
 gradle
 grep
 groff
-gromacs
 gsasl
 gst-plugins-base-libs
 gtest
@@ -167,16 +136,11 @@ gtkglext
 gwenview
 gzip
 haveged
-hddtemp
 hping
 hplip
 hplip-plugin
-hpoj
 htop
 httpie
-hunspell-en_AU
-hunspell-en_CA
-hunspell-ru
 hwdetect
 hwinfo
 hwloc
@@ -185,31 +149,29 @@ iftop
 ifuse
 imake
 inetutils
+intel-ucode
 intellij-idea-ultimate-edition
+intellij-idea-ultimate-edition-jre
 intltool
 iotop
-iproute2
 iptraf-ng
-iputils
 ipython
-ipython2
 iw
 ix
 java-runtime-common
-java-service-wrapper
 jdk
-jdk7
-jdk8
+jdk17-openjdk
 jfsutils
+joplin-desktop
+jprofiler
 jq
-js185
 kaddressbook
+kafka
 kalarm
 kalgebra
 kamera
 kapptemplate
 kate
-kbreakout
 kcachegrind
 kcharselect
 kchmviewer
@@ -218,27 +180,27 @@ kde-cli-tools
 kde-dev-scripts
 kde-dev-utils
 kde-gtk-config
+kdeconnect
 kdecoration
 kdegraphics-mobipocket
-kdeicons-nouvekdegray
 kdenetwork-filesharing
 kdenlive
 kdeplasma-addons
-kdevelop
 kdf
 kdialog
 keditbookmarks
 kfind
+kgpg
+khotkeys
 kid3
 kig
 kile
 kimageformats
 kinfocenter
 kio-extras
-kipi-plugins
+kio-zeroconf
 kleopatra
 klickety
-kmag
 kmail
 kmix
 kmousetool
@@ -251,28 +213,29 @@ konquest
 kontact
 konversation
 korganizer
-kpatience
+kpat
 krdc
 krename
 krita
-kruler
 krusader
 kscreen
 ksshaskpass
 kstars
 ksuperkey
+ksysguard
 ksystemlog
 ktimer
 ktorrent
+kubectl
 kwallet-pam
 kwalletmanager
+kwave
 kwayland
-kwrite
-lbreakout2
-less
+kyocera-cups
+labplot
 lib32-alsa-lib
 lib32-alsa-plugins
-lib32-freetype2-old-hinting
+lib32-freetype2
 lib32-gcc-libs
 lib32-glibc
 lib32-gst-plugins-base-libs
@@ -284,17 +247,14 @@ lib32-mpg123
 lib32-ncurses
 lib32-openal
 lib32-virtualgl
-libcap-ng
+libertinus-font
 libetonyek
 libkdepim
 libkomparediff2
-libmatio
+libmbim
 libmicrohttpd
-libmmtf
 libodfgen
-libpgf
 libpurple
-libqxt
 libreoffice-fresh
 libreoffice-fresh-ru
 librevenge
@@ -305,17 +265,20 @@ libva-intel-driver
 libvisio
 libvncserver
 libwpg
-licenses
+libxcrypt-compat
 lilypond
 linssid
 linux
+linux-firmware
 linux-headers
 linux-lts
 linux-lts-headers
+lld
 lldb
 lokalize
 lsof
 lua52
+lutris
 lvm2
 lxc
 m4
@@ -335,106 +298,107 @@ mobile-broadband-provider-info
 moc
 moreutils
 mpv
-msgpack-c
 mtools
 mtr
+mumble
+muparser
+musescore
 mypy
 namcap
 nano
+nebula
+neovim
 net-tools
 netctl
 netctl-gui
 netctlgui-helper
 nextcloud-client
-nitrux-icon-theme-kde
+ninja
+nitrux-icon-theme
 nmap
 nodejs
-nodejs-jsdoc
 ntfs-3g
 ntp
 nuget
 numactl
+obs-studio
 okteta
 okular
 openscenegraph
 openvpn
-oxygen-gtk2
-oxygen-icons
 p7zip
 pacman
-pass
-pass-otp
+papirus-icon-theme
+parallel
 patch
 pavucontrol
-pciutils
-pdfsam
+pdftk
 pepper-flash
-perl
 perl-crypt-passwdmd5
 perl-digest-sha1
 perl-image-exiftool
 perl-mime-tools
 pev
-pgadmin4
 phonon-qt5-gstreamer
-php
-pianobooster
-pkgbuild-watch
 pkgconf
 pkgfile
 plasma-browser-integration
 plasma-desktop
-plasma-mediacenter
 plasma-pa
+plasma-pass
 plasma-sdk
+plasma-systemmonitor
 plasma-wayland-session
 plasma-workspace-wallpapers
 plasma5-applet-awesome-widgets
 plasma5-applet-netctl-gui
+plasma5-applets-tiledmenu
 polkit-qt5
 ponysay
 postgresql
 postgresql-libs
 postgresql-old-upgrade
+postman-bin
+powerdevil
 powertop
 poxml
 ppp
 premake
 print-manager
-procps-ng
-psmisc
 pulseaudio
 pulseaudio-alsa
-pulseaudio-ctl
-purple-skypeweb
-putty
+pulseaudio-bluetooth
 pwgen
-pychecker
+pycharm-professional
 pymol
+python-aioauth-client
 python-aiohttp
-python-argcomplete
+python-aiohttp-debugtoolbar
+python-aiohttp-jinja2
+python-aiohttp-security
+python-aiohttp-session
+python-anytree
+python-argparse-manpage
 python-bcrypt
 python-beautifulsoup4
 python-biopython
-python-boto
 python-boto3
+python-build
 python-celery
+python-cerberus
 python-configobj
 python-dateutil
-python-dbus
-python-django
-python-django-rest-framework
 python-dnspython
+python-docker
 python-ecdsa
 python-filelock
-python-flask
+python-gitpython
 python-gobject
-python-gspread
-python-httplib2
-python-jsonpickle
+python-inflection
+python-installer
+python-kafka
 python-lxml
 python-magic
-python-mysql-connector
 python-oauth2client
 python-openpyxl
 python-pandas
@@ -448,44 +412,44 @@ python-psycopg2
 python-pycodestyle
 python-pycountry
 python-pycryptodome
+python-pygraphviz
 python-pyjwt
 python-pylint
 python-pyparsing
+python-pypdf3
+python-pyqt5
 python-pytest
 python-pytest-aiohttp
+python-pytest-cov
+python-pytest-helpers-namespace
+python-pytest-mock
 python-pytest-runner
+python-pytest-xdist
 python-pytz
 python-redis
 python-requests
 python-retrying
 python-schedule
 python-scipy
+python-shtab
+python-sphinx
+python-sphinx-autodoc-typehints
+python-srcinfo
+python-sympy
 python-tabulate
 python-text-unidecode
+python-tox
 python-typing_extensions
 python-virtualenv
+python-websocket-client
+python-wheel
 python-xlrd
 python-xlsxwriter
-python2-argcomplete
-python2-boto
-python2-click
-python2-flask
-python2-gdata
-python2-gobject
-python2-ldap
-python2-oauthlib
-python2-opengl
-python2-pip
-python2-pybluez
-python2-pyparsing
-python2-requests
-python2-requests-oauthlib
-python2-scipy
-python2-yaml
+python-xmltodict
 qconf
 qmmp
+qstardict
 qt-gstreamer
-qt4
 qt5-charts
 qt5-connectivity
 qt5-doc
@@ -506,14 +470,14 @@ qt5-webkit
 qt5-websockets
 qt5-webview
 qt5-x11extras
+qt6-scxml
 qtcreator
 qtcurve-gtk2
 qtcurve-kde
 qtcurve-utils
+qv2ray
 qwt
-qwtplot3d
 rarian
-rdiff-backup
 recordmydesktop
 redis
 remmina
@@ -521,9 +485,8 @@ rocs
 rpmextract
 ruby
 ruby-rake
-rxvt-unicode
+rust
 s-nail
-s3cmd
 samba
 samsung-unified-driver
 sbt
@@ -531,46 +494,40 @@ scala
 scala-docs
 scala-sources
 scanmem
+scc
 scons
 screen
-scribus
+screenkey
 sddm
 sddm-kcm
 sdl_mixer
 sdl_ttf
 sed
-shadow
-shellcheck
-shntool
 signond
 simplescreenrecorder
 skanlite
+skypeforlinux-stable-bin
+slack-desktop
 sloccount
 smartmontools
 socat
-solidity
-soundkonverter
 sox
 spectacle
+spotify
 sshfs
 sshpass
+steam
 step
 strace
 stunnel
 sudo
 sysfsutils
 sysstat
-systemd-sysvcompat
 talloc
-tamsyn-font
-tar
 tcpdump
 tcsh
 teamviewer
 telegram-desktop
-telegram-purple
-telepathy-logger-qt
-telepathy-morse
 terminus-font
 texinfo
 texlive-bibtexextra
@@ -587,60 +544,33 @@ texlive-pictures
 texlive-pstricks
 texlive-publishers
 texlive-science
-texmacs
 thefuck
+throttled
 tmux
+tomcat8
 tor
 torsocks
 tpacpi-bat-git
 traceroute
-transifex-client
 tree
-truecrypt
 ttf-ancient-fonts
 ttf-google-fonts-git
 ttf-liberation
-ttf-literation-mono-powerline-git
 ttf-mac-fonts
+ttf-meslo
 ttf-ms-fonts
 ttf-vista-fonts
-umbrello
-units
+twine
 unrar
 unzip
-urxvt-perls-git
 usb_modeswitch
 usbutils
-util-linux
+v2ray
 valgrind
 vcdimager
+veracrypt
 vesta
 vi
-vicious
-vim
-vim-a
-vim-airline
-vim-bufexplorer
-vim-colorschemes
-vim-doxygentoolkit
-vim-fugitive
-vim-guicolorscheme
-vim-indent-object
-vim-latexsuite
-vim-minibufexpl
-vim-nerdtree
-vim-omnicppcomplete
-vim-project
-vim-qml-git
-vim-spell-en
-vim-spell-ru
-vim-supertab
-vim-surround
-vim-tagbar
-vim-taglist
-vim-vcscommand
-vim-workspace
-vimpager
 virtualbox
 virtualbox-ext-oracle
 virtualbox-guest-iso
@@ -648,28 +578,31 @@ visualvm
 vmpk
 vnstat
 w3m
+websocat
 wget
 which
 whois
 wine
+wine-gecko
 wine-mono
-wine_gecko
+wine-nine
 winetricks
 wireshark-qt
+wl-clipboard
 wmctrl
 wpa_supplicant
 wvdial
-wxmaxima
 x264
 xautoclick
 xaw3d
 xbindkeys
-xca
+xboxdrv
+xdg-desktop-portal
+xdg-desktop-portal-kde
 xdg-user-dirs
+xdot
 xdotool
 xf86-input-evdev
-xf86-input-keyboard
-xf86-input-mouse
 xf86-input-synaptics
 xf86-input-void
 xf86-video-fbdev
@@ -692,7 +625,6 @@ xorg-xclipboard
 xorg-xcmsdb
 xorg-xconsole
 xorg-xcursorgen
-xorg-xdpyinfo
 xorg-xdriinfo
 xorg-xev
 xorg-xfd
@@ -718,13 +650,17 @@ xorg-xvinfo
 xorg-xwd
 xorg-xwininfo
 xorg-xwud
+xsane
 xsel
 yakuake
+yarn
 yasm
 yay
 yed
-zeroconf-ioslave
+yourkit
+zgrviewer
 zip
+zoom
 zramswap
 zsh
 zsh-autosuggestions
diff --git a/packages/t580 b/packages/t580
deleted file mode 100644
index 8bcc20b..0000000
--- a/packages/t580
+++ /dev/null
@@ -1,687 +0,0 @@
-acpi
-acpi_call
-acpi_call-lts
-acpid
-akonadi
-akonadi-calendar-tools
-akonadiconsole
-akregator
-albert
-alsa-plugins
-alsa-utils
-ant
-arch-audit
-archey3
-archlinux-wallpaper
-ark
-aspell-en
-aspell-ru
-at
-atom
-audacity
-autoconf
-automake
-autopep8
-awesome
-aws-cli
-bash
-bash-completion
-bind
-binutils
-bison
-blackarch-keyring
-bluedevil
-bluefish
-bluez-qt
-bluez-utils
-boost
-breeze
-breeze-gtk
-breezy
-bzip2
-calendarsupport
-cantata
-cantor
-cdemu-client
-cdrdao
-celt
-cervisia
-check
-chromium
-chromium-widevine
-classpath
-clion
-cloc
-cmake
-coreutils
-cppcheck
-cryptsetup
-cscope
-cups
-cups-filters
-cups-pdf
-curlftpfs
-dash
-device-mapper
-devtools
-dhcpcd
-dialog
-diffuse
-diffutils
-dina-font
-discord
-discount
-djview
-dmidecode
-docker
-dolphin-plugins
-dosbox
-dosfstools
-downgrade
-doxygen
-doxygen-docs
-drkonqi
-dropbox
-dvd+rw-tools
-e2fsprogs
-easystroke
-ed
-elinks
-encfs
-espeak
-etckeeper
-ethtool
-eventviews
-exempi
-exfat-utils
-extra-cmake-modules
-fakepkg
-fakeroot
-festival
-festival-english
-fig2dev
-file
-filelight
-filesystem
-findutils
-firefox-extension-passff
-firefox-i18n-ru
-firefox-ublock-origin
-flacon
-flake8
-flashplugin
-flex
-fontforge
-foomatic-db
-foomatic-db-nonfree
-fping
-freerdp
-freshplayerplugin
-fuse2
-gabedit
-gameconqueror
-gawk
-gcc
-gcc-libs
-gdb
-gendesk
-geogebra
-gettext
-git-etc
-glibc
-gnu-free-fonts
-gnu-netcat
-gnuchess
-go
-gobject-introspection-runtime
-gocr
-goldendict
-gperf
-grace
-grantleetheme
-graphviz
-grep
-groff
-gromacs
-grpc
-grpc-cli
-gsasl
-gst-plugins-bad
-gst-plugins-base-libs
-gst-plugins-good
-gst-python
-gtk2
-gtk3
-gtkglext
-gvfs-afc
-gwenview
-gzip
-haveged
-hdparm
-hplip
-hplip-plugin
-htop
-httrack
-hunspell-ru
-hwdetect
-hwinfo
-iat
-icoutils
-id3v2
-ifuse
-imake
-incidenceeditor
-inetutils
-intel-ucode
-intellij-idea-ultimate-edition
-intltool
-iotop
-iproute2
-iptraf-ng
-iputils
-ipython
-iso-codes
-iw
-ix
-java-environment-common
-jdk-openjdk
-jdk8
-jemalloc
-jfsutils
-jq
-jre11-openjdk
-k3b
-kaccounts-integration
-kaccounts-providers
-kactivitymanagerd
-kaddressbook
-kalarm
-kalgebra
-kalzium
-kamera
-kapptemplate
-kate
-kcachegrind
-kcharselect
-kchmviewer
-kcolorchooser
-kcron
-kde-dev-utils
-kde-gtk-config
-kdegraphics-mobipocket
-kdenetwork-filesharing
-kdeplasma-addons
-kdevelop
-kdevelop-python
-kdf
-kdialog
-kdnssd
-keditbookmarks
-kfind
-khotkeys
-kig
-kile
-kimageformats
-kinfocenter
-kio-extras
-kipi-plugins
-kleopatra
-klickety
-kmag
-kmail
-kmenuedit
-kmix
-kmousetool
-kmouth
-kmplot
-knotes
-knotifyconfig
-kolourpaint
-kompare
-konsole
-kontact
-konversation
-korganizer
-kpeople
-krdc
-krename
-krita
-kruler
-krunner
-krusader
-kscreen
-ksshaskpass
-kstars
-ksuperkey
-ksysguard
-ksystemlog
-ktimer
-ktorrent
-ktouch
-kwallet-pam
-kwalletmanager
-kwin
-kwrite
-labplot
-less
-lib32-alsa-plugins
-lib32-gtk2
-lib32-libpulse
-lib32-libxmu
-lib32-mpg123
-lib32-ncurses
-lib32-simplescreenrecorder
-lib32-virtualgl
-libaccounts-qt
-libcoverart
-libetonyek
-libgravatar
-libgtop
-libimobiledevice
-libkdepim
-libkleo
-libkomparediff2
-libksieve
-libkvkontakte
-libnetctlgui
-libodfgen
-libplist
-libpurple
-libreoffice-fresh
-libreoffice-fresh-ru
-librevenge
-libsoxr
-libsrtp
-libstdc++5
-libtool
-libusbmuxd
-libvisio
-libvncserver
-libwpg
-licenses
-lilypond
-linux
-linux-firmware
-linux-headers
-linux-lts
-linux-lts-headers
-logrotate
-lokalize
-lshw
-lsof
-lua52
-lvm2
-m4
-mailcommon
-mailimporter
-make
-man-db
-man-pages
-marble
-mariadb
-marvin
-materia-kde
-maven
-mdadm
-mediainfo
-memtest86+
-mencoder
-mercurial
-mesa-demos
-messagelib
-minizip
-mlocate
-moc
-mono
-mpc
-mpd
-mpv
-mtools
-mtr
-mumble
-musescore
-mypy
-namcap
-nano
-neovim
-net-tools
-netctl
-netctl-gui
-netctlgui-helper
-netkit-telnet-ssl
-nextcloud-client
-nitrux-icon-theme
-nmap
-nodejs
-npm
-ntfs-3g
-ntp
-okteta
-okular
-oniguruma
-openmpi
-openscenegraph
-openvpn
-p7zip
-pacman
-pacman-contrib
-pacmatic
-paperkey
-pass
-pass-otp
-patch
-pavucontrol
-pciutils
-pepper-flash
-perl
-perl-digest-sha1
-perl-mime-tools
-phonon-qt5-gstreamer
-pimcommon
-pkgconf
-pkgfile
-plasma-desktop
-plasma-framework
-plasma-integration
-plasma-pa
-plasma-pass
-plasma-sdk
-plasma-wayland-session
-plasma-workspace
-plasma-workspace-wallpapers
-plasma5-applet-awesome-widgets
-plasma5-applet-netctl-gui
-plasma5-applets-tiledmenu
-playonlinux
-pokerth
-polkit-qt5
-ponysay
-postgresql
-postgresql-libs
-postgresql-old-upgrade
-powerdevil
-poxml
-ppp
-premake
-print-manager
-procps-ng
-psmisc
-pulseaudio
-pulseaudio-alsa
-pulseaudio-bluetooth
-pulseaudio-equalizer
-putty
-pycharm-professional
-pymol
-python-aiopg
-python-aiosqlite
-python-apispec
-python-aur
-python-bcrypt
-python-biopython
-python-boto
-python-boto3
-python-configobj
-python-dateutil
-python-dbus
-python-dnspython
-python-gobject
-python-internetarchive
-python-jinja
-python-jsonpickle
-python-lxml
-python-matplotlib
-python-mysql-connector
-python-oauth2client
-python-openbabel
-python-paramiko
-python-passlib
-python-pint
-python-pip
-python-pipreqs
-python-psycopg2
-python-pyaml
-python-pycodestyle
-python-pycountry
-python-pycryptodome
-python-pytest
-python-pytest-aiohttp
-python-pytest-asyncio
-python-pytz
-python-requests
-python-retrying
-python-scipy
-python-srcinfo
-python-text-unidecode
-python-typing_extensions
-python-virtualenv
-python-wheel
-python-xlrd
-python-zstandard
-qconf
-qmmp
-qmmp-plugin-pack
-qt5-3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-quickcontrols2
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-svg
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qtcurve-gtk2
-qtcurve-kde
-qtcurve-utils
-qvkbd
-qwt
-rarian
-redream-git
-reiserfsprogs
-ripgrep
-rocs
-ruby
-rust
-rxvt-unicode
-s-nail
-s3cmd
-samba
-sbt
-scala
-scala-docs
-scala-sources
-scons
-screen
-sddm
-sddm-kcm
-sdl_mixer
-sdl_ttf
-sed
-shadow
-shntool
-signon-kwallet-extension
-signon-plugin-oauth2
-signon-ui
-simplescreenrecorder
-skanlite
-skypeforlinux-stable-bin
-slack-desktop
-sloccount
-smartmontools
-soundkonverter
-sox
-spectacle
-speedcrunch
-spotify
-sqlitebrowser
-sshfs
-steam
-step
-strace
-sudo
-sysfsutils
-sysstat
-systemd
-systemd-sysvcompat
-systemsettings
-tamsyn-font
-tar
-tcpdump
-tcsh
-teamspeak3
-teamviewer
-telegram-desktop
-telepathy-gabble
-telepathy-haze
-telepathy-idle
-telepathy-kde-accounts-kcm
-telepathy-kde-approver
-telepathy-kde-auth-handler
-telepathy-kde-contact-list
-telepathy-kde-contact-runner
-telepathy-kde-desktop-applets
-telepathy-kde-filetransfer-handler
-telepathy-kde-integration-module
-telepathy-kde-send-file
-telepathy-kde-text-ui
-telepathy-qt
-terminus-font
-texinfo
-texlive-bibtexextra
-texlive-fontsextra
-texlive-formatsextra
-texlive-langcyrillic
-texlive-langextra
-texlive-langgreek
-texlive-latexextra
-texlive-pictures
-texlive-pstricks
-texlive-publishers
-texlive-science
-texmacs
-throttled
-tmux
-tomcat9
-tor
-tpacpi-bat-git
-traceroute
-transmission-qt
-tree
-truecrypt
-ttf-google-fonts-git
-ttf-liberation
-ttf-mac-fonts
-ttf-ms-fonts
-ttf-vista-fonts
-twine
-ucsf-chimera
-umbrello
-units
-unrar
-unzip
-usb_modeswitch
-usbmuxd
-usbutils
-util-linux
-valgrind
-vcdimager
-vesta
-vhba-module-dkms
-vi
-vicious
-vid.stab
-vim-airline
-virtualbox
-vmd
-volt
-wget
-which
-whois
-wine
-wine-gecko
-wine-mono
-winetricks
-wireshark-qt
-wmctrl
-wpa_supplicant
-wvdial
-wxmaxima
-xautoclick
-xaw3d
-xbindkeys
-xboard
-xca
-xdg-user-dirs
-xdotool
-xf86-input-synaptics
-xf86-input-void
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-vesa
-xfsprogs
-xorg-appres
-xorg-docs
-xorg-fonts-cyrillic
-xorg-fonts-misc
-xorg-fonts-type1
-xorg-server
-xorg-server-xvfb
-xorg-sessreg
-xorg-x11perf
-xorg-xauth
-xorg-xbacklight
-xorg-xclipboard
-xorg-xcmsdb
-xorg-xconsole
-xorg-xcursorgen
-xorg-xdriinfo
-xorg-xev
-xorg-xfd
-xorg-xgamma
-xorg-xhost
-xorg-xinit
-xorg-xinput
-xorg-xkbevd
-xorg-xkbutils
-xorg-xkill
-xorg-xlsclients
-xorg-xlsfonts
-xorg-xmodmap
-xorg-xpr
-xorg-xprop
-xorg-xrandr
-xorg-xrdb
-xorg-xrefresh
-xorg-xsetroot
-xorg-xvinfo
-xorg-xwd
-xorg-xwininfo
-xorg-xwud
-xsel
-xterm
-yakuake
-yasm
-yay
-youtube-dl
-zeroconf-ioslave
-zip
-zoom
-zsh
-zsh-autosuggestions
-zsh-completions
-zsh-syntax-highlighting