diff --git a/core/dracut-initramfs/PKGBUILD b/core/dracut-initramfs/PKGBUILD
index 528b293..5ceeed5 100644
--- a/core/dracut-initramfs/PKGBUILD
+++ b/core/dracut-initramfs/PKGBUILD
@@ -1,26 +1,21 @@
 # Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
 
-pkgname="melawy-dracut-initramfs"
-pkgver=1.7
+_gitname="$(basename $(pwd))"
+pkgname=("melawy-$_gitname")
+pkgver=1.9
 pkgrel=1
-pkgdesc="Integration layer for dracut for Arch Linux. Placing kernels to /ESP_PATH/EFI/Linux"
-url="https://github.com/Valeria-Fadeeva/melawy-dracut-initramfs"
+pkgdesc="$(head -n 2 README.md | tail -n 1)"
+url="https://github.com/Melawy/$_gitname"
 arch=("any")
 license=("AGPL3")
 depends=("dracut" "systemd" "python" "util-linux" "python-pefile")
 optdepends=()
-makedepends=()
+makedepends=("git")
 backup=()
-provides=("dracut-hook")
-conflicts=()
-source=("10-dracut-initramfs-pre-install.hook"
-        "60-dracut-initramfs-remove.hook"
-        "90-dracut-initramfs-install.hook"
-        "dracut-initramfs")
-sha256sums=("4a869624ec1b9078e93ed2a9503f71e86b40c110585332b33262e12f8cd37b03"
-            "f77d94b6eced20b518c68cdc41a6e575ff82a3a78863c96ea6e7ba40f75dbe8e"
-            "6ac56a11338191d4e515426fcd5e332cad44777ff45e6ea58667320343eef998"
-            "3b96f5fadd5c4c8b0ec44da63079a29c01a572f359433419f93ecfea923f8117")
+provides=("${pkgname}")
+conflicts=("${pkgname}")
+source=("git+$url.git")
+sha256sums=("SKIP")
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -33,8 +28,8 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/10-dracut-initramfs-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-initramfs-pre-install.hook"
-  install -Dm644 "${srcdir}/60-dracut-initramfs-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-initramfs-remove.hook"
-  install -Dm644 "${srcdir}/90-dracut-initramfs-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-initramfs-install.hook"
-  install -Dm755 "${srcdir}/dracut-initramfs"                     "${pkgdir}/usr/bin/dracut-initramfs"
+  install -Dm644 "${srcdir}/$_gitname/10-dracut-initramfs-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-initramfs-pre-install.hook"
+  install -Dm644 "${srcdir}/$_gitname/60-dracut-initramfs-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-initramfs-remove.hook"
+  install -Dm644 "${srcdir}/$_gitname/90-dracut-initramfs-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-initramfs-install.hook"
+  install -Dm755 "${srcdir}/$_gitname/dracut-initramfs"                     "${pkgdir}/usr/bin/dracut-initramfs"
 }
diff --git a/core/dracut-ukify/PKGBUILD b/core/dracut-ukify/PKGBUILD
index 675fb14..0b7c81a 100644
--- a/core/dracut-ukify/PKGBUILD
+++ b/core/dracut-ukify/PKGBUILD
@@ -1,26 +1,21 @@
 # Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
 
-pkgname="melawy-dracut-ukify"
-pkgver=1.5
+_gitname="$(basename $(pwd))"
+pkgname=("melawy-$_gitname")
+pkgver=1.7
 pkgrel=1
-pkgdesc="Integration layer for dracut and systemd's ukify tool for Arch Linux. Placing kernels to /ESP_PATH/EFI/Linux"
-url="https://github.com/Valeria-Fadeeva/melawy-dracut-ukify"
+pkgdesc="$(head -n 2 README.md | tail -n 1)"
+url="https://github.com/Melawy/$_gitname"
 arch=("any")
 license=("AGPL3")
 depends=("dracut" "systemd-ukify" "python" "util-linux" "python-pefile")
 optdepends=("sbsigntools: secureboot support")
-makedepends=()
+makedepends=("git")
 backup=()
-provides=("dracut-hook")
-conflicts=("dracut-hook-uefi" "dracut-uefi-hook")
-source=("10-dracut-ukify-pre-install.hook"
-        "60-dracut-ukify-remove.hook"
-        "90-dracut-ukify-install.hook"
-        "dracut-ukify")
-sha256sums=("e9592f4f738e8ac70044db1e3f0c4839bc07f37662d5dbc221230cf1617a6b4d"
-            "341cd01546d840e7401f7bec868a78e2f6ca12563e93d993a07bc51efe674ed0"
-            "08225b2c3f5e2a734561b5fa9a3e84060dfffd85b2898adb0fff0ce3b068b4d0"
-            "45de7b379bca66b96327b0a7957fefce5acc53968828cc412f5e5d0f13c4151f")
+provides=("${pkgname}")
+conflicts=("${pkgname}")
+source=("git+$url.git")
+sha256sums=("SKIP")
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -33,8 +28,8 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/10-dracut-ukify-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-ukify-pre-install.hook"
-  install -Dm644 "${srcdir}/60-dracut-ukify-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-ukify-remove.hook"
-  install -Dm644 "${srcdir}/90-dracut-ukify-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-ukify-install.hook"
-  install -Dm755 "${srcdir}/dracut-ukify"                     "${pkgdir}/usr/bin/dracut-ukify"
+  install -Dm644 "${srcdir}/$_gitname/10-dracut-ukify-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-ukify-pre-install.hook"
+  install -Dm644 "${srcdir}/$_gitname/60-dracut-ukify-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-ukify-remove.hook"
+  install -Dm644 "${srcdir}/$_gitname/90-dracut-ukify-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-ukify-install.hook"
+  install -Dm755 "${srcdir}/$_gitname/dracut-ukify"                     "${pkgdir}/usr/bin/dracut-ukify"
 }
diff --git a/core/refind-menu-generator/PKGBUILD b/core/refind-menu-generator/PKGBUILD
index 43ad11f..2bdf442 100644
--- a/core/refind-menu-generator/PKGBUILD
+++ b/core/refind-menu-generator/PKGBUILD
@@ -1,32 +1,21 @@
 # Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
 
-pkgname="melawy-refind-menu-generator"
-pkgver=1.7
+_gitname="$(basename $(pwd))"
+pkgname=("melawy-$_gitname")
+pkgver=1.9
 pkgrel=1
-pkgdesc="Menu generator for rEFInd loader for kernels in /ESP_PATH/EFI/Linux for Arch Linux"
-url="https://github.com/Valeria-Fadeeva/melawy-refind-menu-generator"
+pkgdesc="$(head -n 2 README.md | tail -n 1)"
+url="https://github.com/Melawy/$_gitname"
 arch=("any")
 license=("AGPL3")
 depends=("refind")
 optdepends=()
-makedepends=()
+makedepends=("git")
 backup=()
-provides=("dracut-hook")
-conflicts=()
-source=("10-refind-menu-pre-install.hook"
-        "60-refind-menu-remove.hook"
-        "90-refind-menu-install.hook"
-        "menu-end.txt"
-        "menu-template.txt"
-        "menu-template-vmlinuz-first.txt"
-        "refind-menu-generator")
-sha256sums=("dc46d6f2030d81a4e5034c1ed84424ce6c4844d933d60eadfacda1e45f17d3cd"
-            "a27533ae3b81575c5497f18fdd28c4c908c5aff3da6af78095f65d5d350e4331"
-            "15152ac9be0ab0c42d343e5f86b2561232e05df2a7bc0cf01bd799494c0ba962"
-            "e1d51fe5b37e42296dc6357fca48f0b68090ffdb1ec0ba2057320ad50e3e9e25"
-            "a7381e88f569160a29d756a7bab2dcde4cc1f1e6d3d6b0c78535b24936989be8"
-            "8703c455516a95a87ff18e1c43ce98d2a1f74fddebfc9c091c75465e3ca185e9"
-            "8e91d5cf0d5bbed8d791acf4485d5c9e4250c8ed3bb13cc6ec1e51edf6ebd5ba")
+provides=("${pkgname}")
+conflicts=("${pkgname}")
+source=("git+$url.git")
+sha256sums=("SKIP")
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -39,12 +28,12 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/10-refind-menu-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-refind-menu-pre-install.hook"
-  install -Dm644 "${srcdir}/60-refind-menu-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-refind-menu-remove.hook"
-  install -Dm644 "${srcdir}/90-refind-menu-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-refind-menu-install.hook"
+  install -Dm644 "${srcdir}/$_gitname/10-refind-menu-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-refind-menu-pre-install.hook"
+  install -Dm644 "${srcdir}/$_gitname/60-refind-menu-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-refind-menu-remove.hook"
+  install -Dm644 "${srcdir}/$_gitname/90-refind-menu-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-refind-menu-install.hook"
   install -dm755 "${pkgdir}/etc/refind-menu-generator"
-  install -Dm644 "${srcdir}/menu-end.txt"                    "${pkgdir}/etc/refind-menu-generator/menu-end.txt"
-  install -Dm644 "${srcdir}/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template.txt"
-  install -Dm644 "${srcdir}/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template-vmlinuz-first.txt"
-  install -Dm755 "${srcdir}/refind-menu-generator"           "${pkgdir}/usr/bin/refind-menu-generator"
+  install -Dm644 "${srcdir}/$_gitname/menu-end.txt"                    "${pkgdir}/etc/refind-menu-generator/menu-end.txt"
+  install -Dm644 "${srcdir}/$_gitname/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template.txt"
+  install -Dm644 "${srcdir}/$_gitname/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template-vmlinuz-first.txt"
+  install -Dm755 "${srcdir}/$_gitname/refind-menu-generator"           "${pkgdir}/usr/bin/refind-menu-generator"
 }
diff --git a/design/color-scheme-konsole/PKGBUILD b/design/color-scheme-konsole/PKGBUILD
index d306277..af75b9a 100644
--- a/design/color-scheme-konsole/PKGBUILD
+++ b/design/color-scheme-konsole/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/color-scheme/PKGBUILD b/design/color-scheme/PKGBUILD
index 0e0bb46..abb6cf0 100644
--- a/design/color-scheme/PKGBUILD
+++ b/design/color-scheme/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plasma-desktop-theme/PKGBUILD b/design/plasma-desktop-theme/PKGBUILD
index cb081f6..2fd81a5 100644
--- a/design/plasma-desktop-theme/PKGBUILD
+++ b/design/plasma-desktop-theme/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plasma-look-and-feel-lera-sugar/PKGBUILD b/design/plasma-look-and-feel-lera-sugar/PKGBUILD
index ef8116d..6e36688 100644
--- a/design/plasma-look-and-feel-lera-sugar/PKGBUILD
+++ b/design/plasma-look-and-feel-lera-sugar/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plasma-plasmoid-Menu11/PKGBUILD b/design/plasma-plasmoid-Menu11/PKGBUILD
index 0d69375..1c96e84 100644
--- a/design/plasma-plasmoid-Menu11/PKGBUILD
+++ b/design/plasma-plasmoid-Menu11/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plasma-plasmoid-OnzeMenuKDE/PKGBUILD b/design/plasma-plasmoid-OnzeMenuKDE/PKGBUILD
index e1b243c..6ee378d 100644
--- a/design/plasma-plasmoid-OnzeMenuKDE/PKGBUILD
+++ b/design/plasma-plasmoid-OnzeMenuKDE/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plasma-plasmoid-archupdate/PKGBUILD b/design/plasma-plasmoid-archupdate/PKGBUILD
index 3700452..9946e74 100644
--- a/design/plasma-plasmoid-archupdate/PKGBUILD
+++ b/design/plasma-plasmoid-archupdate/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/plymouth-theme-lera-sugar/PKGBUILD b/design/plymouth-theme-lera-sugar/PKGBUILD
index 13922f6..a593f6f 100644
--- a/design/plymouth-theme-lera-sugar/PKGBUILD
+++ b/design/plymouth-theme-lera-sugar/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/refind-theme-lera-sugar/PKGBUILD b/design/refind-theme-lera-sugar/PKGBUILD
index 40343db..9469b34 100644
--- a/design/refind-theme-lera-sugar/PKGBUILD
+++ b/design/refind-theme-lera-sugar/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/sddm-theme-lera-sugar/PKGBUILD b/design/sddm-theme-lera-sugar/PKGBUILD
index 94dfd75..fb15196 100644
--- a/design/sddm-theme-lera-sugar/PKGBUILD
+++ b/design/sddm-theme-lera-sugar/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"
diff --git a/design/wallpaper-lera-sugar/PKGBUILD b/design/wallpaper-lera-sugar/PKGBUILD
index 0e23ed2..f251207 100644
--- a/design/wallpaper-lera-sugar/PKGBUILD
+++ b/design/wallpaper-lera-sugar/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://github.com/Melawy/$_gitname"