diff --git a/.SRCINFO b/.SRCINFO
index a38c979034f6..6291dc4f6875 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,9 +13,10 @@ pkgbase = noctalia-shell
 	depends = brightnessctl
 	depends = ddcutil
 	optdepends = cliphist: For clipboard history support
-	optdepends = swww: Wallpaper animations and effects
 	optdepends = matugen-bin: Material You color scheme generation
 	optdepends = cava: Audio visualizer component
+	optdepends = wlsunset: For supporting NightLight
+	conflicts = noctalia-shell-git
 	source = git+https://github.com/noctalia-dev/noctalia-shell.git#tag=v2.3.1
 	sha256sums = f6a7ce7260500aafec1d12f8de49361624e40351c0bb7fca161378af3974e082
 
diff --git a/PKGBUILD b/PKGBUILD
index abeac7e0b646..758cfe7a3bd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,14 @@
 # Maintainer: Kevin <github@kev314.dev>
+# Co-Maintainer: Lysec <itslysec@gmail.com>
 
 pkgname=noctalia-shell
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell."
 arch=('any')
 url="https://github.com/noctalia-dev/noctalia-shell"
 license=('MIT')
+
 depends=(
   'quickshell-git'
   'ttf-roboto'
@@ -16,12 +18,16 @@ depends=(
   'brightnessctl'
   'ddcutil'
 )
+
 optdepends=(
   'cliphist: For clipboard history support'
-  'swww: Wallpaper animations and effects'
   'matugen-bin: Material You color scheme generation'
   'cava: Audio visualizer component'
+  'wlsunset: For supporting NightLight'
 )
+
+conflicts=('noctalia-shell-git')
+
 source=("git+$url.git#tag=v$pkgver")
 sha256sums=('f6a7ce7260500aafec1d12f8de49361624e40351c0bb7fca161378af3974e082')
 
@@ -29,14 +35,6 @@ package() {
   cd "$srcdir/$pkgname"
 
   # Install shell files to quickshell system config directory
-  install -dm755 "$pkgdir/etc/xdg/quickshell/noctalia"
-  cp -r ./* "$pkgdir/etc/xdg/quickshell/noctalia/"
-  
-  # Create wrapper script
-  install -dm755 "$pkgdir/usr/bin"
-  cat > "$pkgdir/usr/bin/noctalia-shell" << 'EOF'
-#!/bin/bash
-exec qs -c noctalia "$@"
-EOF
-  chmod +x "$pkgdir/usr/bin/noctalia-shell"
+  install -dm755 "$pkgdir/etc/xdg/quickshell/noctalia-shell"
+  cp -r ./* "$pkgdir/etc/xdg/quickshell/noctalia-shell/"
 }