diff --git a/PKGBUILD b/PKGBUILD
index 6fbe124..cddc024 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,11 @@
 # Maintainer: Librewish <librewish@gmail.com>
 
 pkgname=garuda-common-settings
-pkgver=1.4.5
+pkgver=2.0.0
 pkgrel=1
 arch=('any')
 url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname"
 license=('GPL')
-makedepends=('coreutils')
 source=("$pkgname-$pkgver.tar.gz::$url/-/archive/$pkgver/$pkgname-$pkgver.tar.gz")
 sha256sums=('SKIP')
 pkgdesc='Garuda Linux common settings'
@@ -39,8 +38,8 @@ package() {
 
     # Fix permissions
     chmod -R 750 $pkgdir/etc/sudoers.d/
-    chmod -R 750 $pkgdir/etc/polkit-1/rules.d/
-    chown -R root:polkitd $pkgdir/etc/polkit-1/rules.d
+    chmod -R 750 $pkgdir/usr/share/polkit-1/rules.d/
+    chown -R root:polkitd $pkgdir/usr/share/polkit-1/rules.d
 }
 
 
diff --git a/etc/systemd/zram-generator.conf b/etc/systemd/zram-generator.conf.d/zram-generator.conf
similarity index 100%
rename from etc/systemd/zram-generator.conf
rename to etc/systemd/zram-generator.conf.d/zram-generator.conf
diff --git a/etc/sysctl.d/99-sysctl-garuda.conf b/usr/lib/sysctl.d/99-sysctl-garuda.conf
similarity index 100%
rename from etc/sysctl.d/99-sysctl-garuda.conf
rename to usr/lib/sysctl.d/99-sysctl-garuda.conf
diff --git a/etc/udev/rules.d/50-sata.rules b/usr/lib/udev/rules.d/50-sata.rules
similarity index 100%
rename from etc/udev/rules.d/50-sata.rules
rename to usr/lib/udev/rules.d/50-sata.rules
diff --git a/etc/udev/rules.d/60-ioschedulers.rules b/usr/lib/udev/rules.d/60-ioschedulers.rules
similarity index 100%
rename from etc/udev/rules.d/60-ioschedulers.rules
rename to usr/lib/udev/rules.d/60-ioschedulers.rules
diff --git a/etc/polkit-1/rules.d/99-garuda.rules b/usr/share/polkit-1/rules.d/99-garuda.rules
similarity index 100%
rename from etc/polkit-1/rules.d/99-garuda.rules
rename to usr/share/polkit-1/rules.d/99-garuda.rules