diff --git a/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD b/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD
new file mode 100644
index 0000000..c224d89
--- /dev/null
+++ b/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD
@@ -0,0 +1,10 @@
+pkgname=tari-bspwm
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Packages I use specifically for bspwm."
+arch=('any')
+depends=(bspwm
+         sxhkd
+
+         dunst
+         compton)
diff --git a/.archlinux/PKGBUILDs/tari-cli/PKGBUILD b/.archlinux/PKGBUILDs/tari-cli/PKGBUILD
new file mode 100644
index 0000000..d9ed373
--- /dev/null
+++ b/.archlinux/PKGBUILDs/tari-cli/PKGBUILD
@@ -0,0 +1,17 @@
+pkgname=tari-cli
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Packages for CLI programs I use independent of a desktop environment."
+arch=('any')
+depends=(mpd
+         mpc
+         ncmpcpp
+
+         htop
+         neofetch
+
+         fdupes
+         youtube-dl
+
+         ranger
+         weechat)
diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
index 5378006..c41c5a8 100644
--- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
@@ -1,14 +1,23 @@
 pkgname=tari-core
-pkgver=0.1.0
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="Core packages for my Arch setup."
 arch=('any')
-depends=(ttf-hack         ttf-fira-mono   ttf-roboto          ttf-font-awesome    borg
-         bspwm            sxhkd           dunst               rofi                compton
-         mpc              mpd             ncmpcpp             mpv                 feh
-         stow             htop            neofetch            xdo                 alsa-utils
-         zip              unzip           p7zip               unrar               ranger
-         xcape            xorg-xmodmap    xorg-xwininfo       xorg-xrandr         lxdm-gtk3
-         plasma-desktop   kde-gtk-config  plasma-pa           arc-kde             adapta-gtk-theme
-         python-pywal     youtube-dl      fdupes              rng-tools           weechat
-         zathura          zathura-djvu    zathura-pdf-mupdf   kitty               papirus-icon-theme)
+depends=(stow
+         python-pywal
+         rng-tools
+
+         fd
+         exa
+         ripgrep
+         fzf
+         jq
+
+         zip
+         unzip
+         p7zip
+         unrar
+
+         borg
+         openssh
+         openvpn)
diff --git a/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD b/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD
new file mode 100644
index 0000000..8a354bd
--- /dev/null
+++ b/.archlinux/PKGBUILDs/tari-desktop/PKGBUILD
@@ -0,0 +1,41 @@
+pkgname=tari-desktop
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Packages common to all my desktop setups, such as fonts."
+arch=('any')
+depends=(ttf-dejavu
+         ttf-liberation
+
+         noto-fonts
+         noto-fonts-cjk
+         noto-fonts-emoji
+
+         ttf-hack
+         ttf-fira-mono
+         ttf-font-awesome
+
+         arc-solid-gtk-theme
+         arc-kde
+         papirus-icon-theme
+
+         lxdm-gtk3
+
+         xorg-xmodmap
+         xorg-xwininfo
+         xorg-xrandr
+         xorg-xinit
+
+         xdo
+         xcape
+         xdg-user-dirs
+
+         alsa-utils
+
+         mpv
+         feh
+         rofi
+         kitty
+
+         zathura
+         zathura-djvu
+         zathura-pdf-mupdf)