diff --git a/base/PKGBUILD b/base/PKGBUILD
index 0f3654f..53a3ebe 100644
--- a/base/PKGBUILD
+++ b/base/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eduard Urbach <admin@akyoto.dev>
 pkgname=akyoto-base
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Base system configuration"
 arch=('any')
 url="https://git.akyoto.dev/sys/arch"
@@ -17,6 +17,8 @@ conflicts=(
 depends=(
 	'base'
 	'btop'
+	'cpupower'
+	'curl'
 	'dash'
 	'dua-cli'
 	'exa'
@@ -24,8 +26,6 @@ depends=(
 	'fd'
 	'fish'
 	'git'
-	'git-lfs'
-	'inetutils'
 	'less'
 	'lsof'
 	'neovim'
@@ -48,9 +48,4 @@ md5sums=(
 
 package() {
 	install -Dm 0644 dashbinsh.hook "$pkgdir/etc/pacman.d/hooks/dashbinsh.hook"
-}
-
-post_install() {
-	echo "Relink /usr/bin/sh to dash via:"
-	echo "ln -sfT dash /usr/bin/sh"
 }
\ No newline at end of file
diff --git a/desktop/PKGBUILD b/desktop/PKGBUILD
new file mode 100644
index 0000000..bb1a616
--- /dev/null
+++ b/desktop/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Eduard Urbach <admin@akyoto.dev>
+pkgname=akyoto-desktop
+pkgver=1
+pkgrel=1
+pkgdesc="Desktop packages"
+arch=('any')
+url="https://git.akyoto.dev/sys/arch"
+license=('MIT')
+depends=(
+	'alacritty'
+	'blender'
+	'cava'
+	'code'
+	'cliphist'
+	'eog'
+	'evolution'
+	'ffmpegthumbnailer'
+	'file-roller'
+	'firefox'
+	'fuzzel'
+	'ghex'
+	'gimp'
+	'gnome-keyring'
+	'godot'
+	'greetd'
+	'grim'
+	'linux-zen'
+	'meld'
+	'mpv'
+	'nautilus'
+	'obs-studio'
+	'pipewire'
+	'qemu-desktop'
+	'seahorse'
+	'slurp'
+	'tenacity'
+	'transmission-gtk'
+	'virt-manager'
+)
\ No newline at end of file
diff --git a/devel/PKGBUILD b/devel/PKGBUILD
index be3a597..1ce5c62 100644
--- a/devel/PKGBUILD
+++ b/devel/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eduard Urbach <admin@akyoto.dev>
 pkgname=akyoto-devel
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Development packages"
 arch=('any')
 url="https://git.akyoto.dev/sys/arch"
@@ -10,4 +10,5 @@ depends=(
 	'clang'
 	'go'
 	'gopls'
+	'lua-language-server'
 )
\ No newline at end of file
diff --git a/extra/PKGBUILD b/extra/PKGBUILD
new file mode 100644
index 0000000..a3746d4
--- /dev/null
+++ b/extra/PKGBUILD
@@ -0,0 +1,17 @@
+# Maintainer: Eduard Urbach <admin@akyoto.dev>
+pkgname=akyoto-extra
+pkgver=1
+pkgrel=1
+pkgdesc="Extra packages"
+arch=('any')
+url="https://git.akyoto.dev/sys/arch"
+license=('MIT')
+depends=(
+	'ali'
+	'fdupes'
+	'ffmpeg'
+	'git-lfs'
+	'httpie'
+	'hyperfine'
+	'lostfiles'
+)
\ No newline at end of file
diff --git a/server/PKGBUILD b/server/PKGBUILD
new file mode 100644
index 0000000..9419dcf
--- /dev/null
+++ b/server/PKGBUILD
@@ -0,0 +1,11 @@
+# Maintainer: Eduard Urbach <admin@akyoto.dev>
+pkgname=akyoto-server
+pkgver=1
+pkgrel=1
+pkgdesc="Server packages"
+arch=('any')
+url="https://git.akyoto.dev/sys/arch"
+license=('MIT')
+depends=(
+	'caddy'
+)
\ No newline at end of file