diff --git a/Core/plymouth b/Core/plymouth
new file mode 160000
index 0000000..401a266
--- /dev/null
+++ b/Core/plymouth
@@ -0,0 +1 @@
+Subproject commit 401a266ebf8b170cc02c26a55447800295760ea2
diff --git a/Core/plymouth-git b/Core/plymouth-git
new file mode 160000
index 0000000..4f20c50
--- /dev/null
+++ b/Core/plymouth-git
@@ -0,0 +1 @@
+Subproject commit 4f20c501a8e8f94d0016fa990d677dd414ed23df
diff --git a/Design/Fenek/melawy-kde-theme-fenek/.gitignore b/Design/Fenek/melawy-kde-theme-fenek/.gitignore
new file mode 100644
index 0000000..733ae58
--- /dev/null
+++ b/Design/Fenek/melawy-kde-theme-fenek/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-kde-theme-fenek
diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh b/Design/Fenek/melawy-kde-theme-fenek/00_make.sh
similarity index 100%
rename from Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh
rename to Design/Fenek/melawy-kde-theme-fenek/00_make.sh
diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/01_sign.sh b/Design/Fenek/melawy-kde-theme-fenek/01_sign.sh
similarity index 100%
rename from Design/Fenek/melawy-plasma-look-and-feel-fenek/01_sign.sh
rename to Design/Fenek/melawy-kde-theme-fenek/01_sign.sh
diff --git a/Design/Fenek/melawy-sddm-theme-fenek/PKGBUILD b/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD
similarity index 74%
rename from Design/Fenek/melawy-sddm-theme-fenek/PKGBUILD
rename to Design/Fenek/melawy-kde-theme-fenek/PKGBUILD
index 9259d3b..b9f7d4d 100644
--- a/Design/Fenek/melawy-sddm-theme-fenek/PKGBUILD
+++ b/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Design/$_gitname"
 arch=("any")
 license=("AGPL3")
-depends=("sddm" "plasma-desktop")
+depends=()
 optdepends=()
 makedepends=("git")
 backup=()
@@ -18,9 +18,6 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy-Fenek"
-THEME_PATH="/usr/share/sddm/themes"
-
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
 # 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -32,6 +29,5 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+  cp -vrf --no-dereference --preserve=links --no-preserve=mode "$srcdir/$_gitname/usr" "$pkgdir/"
 }
diff --git a/Design/Fenek/melawy-sddm-theme-fenek/README.md b/Design/Fenek/melawy-kde-theme-fenek/README.md
similarity index 81%
rename from Design/Fenek/melawy-sddm-theme-fenek/README.md
rename to Design/Fenek/melawy-kde-theme-fenek/README.md
index 3860470..de6c428 100644
--- a/Design/Fenek/melawy-sddm-theme-fenek/README.md
+++ b/Design/Fenek/melawy-kde-theme-fenek/README.md
@@ -1,5 +1,5 @@
-# melawy-sddm-theme-fenek
-SDDM theme for theme Fenek
+# melawy-kde-theme-fenek
+KDE theme for Melawy Linux
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/.gitignore b/Design/Fenek/melawy-plasma-look-and-feel-fenek/.gitignore
deleted file mode 100644
index 9a91879..0000000
--- a/Design/Fenek/melawy-plasma-look-and-feel-fenek/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-plasma-look-and-feel-fenek
diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/PKGBUILD b/Design/Fenek/melawy-plasma-look-and-feel-fenek/PKGBUILD
deleted file mode 100644
index 245aca5..0000000
--- a/Design/Fenek/melawy-plasma-look-and-feel-fenek/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
-
-_gitname="$(basename $(pwd))"
-pkgname=("$_gitname")
-pkgver=1.2
-pkgrel=1
-pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
-arch=("any")
-license=("AGPL3")
-depends=("plasma-desktop")
-optdepends=()
-makedepends=("git")
-backup=()
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-source=("git+$url.git")
-sha256sums=("SKIP")
-validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
-
-THEME_NAME="com.github.Melawy.Fenek.desktop"
-THEME_PATH="/usr/share/plasma/look-and-feel"
-
-# pkgver() {
-# 	cd "$srcdir/$_gitname"
-# 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-# }
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	printf "1.%s" "$(git rev-list --count HEAD)"
-}
-
-package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
-}
diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/README.md b/Design/Fenek/melawy-plasma-look-and-feel-fenek/README.md
deleted file mode 100644
index 26f41b8..0000000
--- a/Design/Fenek/melawy-plasma-look-and-feel-fenek/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# melawy-plasma-look-and-feel-fenek
-Splash screen after login for theme Fenek
-
-### Donate
-[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
-
-[YooMoney](https://yoomoney.ru/to/4100115921160758)
-
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
-Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f
diff --git a/Design/Fenek/melawy-sddm-theme-fenek/.gitignore b/Design/Fenek/melawy-sddm-theme-fenek/.gitignore
deleted file mode 100644
index 877d108..0000000
--- a/Design/Fenek/melawy-sddm-theme-fenek/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-sddm-theme-fenek
diff --git a/Design/Fenek/melawy-wallpaper-fenek/.gitignore b/Design/Fenek/melawy-wallpaper-fenek/.gitignore
deleted file mode 100644
index a7f9489..0000000
--- a/Design/Fenek/melawy-wallpaper-fenek/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-wallpaper-fenek
diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore
new file mode 100644
index 0000000..4a94ec7
--- /dev/null
+++ b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-kde-theme-lera-sugar
diff --git a/Design/Fenek/melawy-sddm-theme-fenek/00_make.sh b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh
similarity index 100%
rename from Design/Fenek/melawy-sddm-theme-fenek/00_make.sh
rename to Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh
diff --git a/Design/Fenek/melawy-sddm-theme-fenek/01_sign.sh b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh
similarity index 100%
rename from Design/Fenek/melawy-sddm-theme-fenek/01_sign.sh
rename to Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh
diff --git a/Design/Fenek/melawy-wallpaper-fenek/PKGBUILD b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD
similarity index 73%
rename from Design/Fenek/melawy-wallpaper-fenek/PKGBUILD
rename to Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD
index f195e37..b9f7d4d 100644
--- a/Design/Fenek/melawy-wallpaper-fenek/PKGBUILD
+++ b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD
@@ -2,13 +2,13 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
-pkgver=1.4
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Design/$_gitname"
 arch=("any")
 license=("AGPL3")
-depends=("plasma-desktop")
+depends=()
 optdepends=()
 makedepends=("git")
 backup=()
@@ -18,9 +18,6 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy Fenek"
-THEME_PATH="/usr/share/wallpapers"
-
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
 # 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -32,6 +29,5 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+  cp -vrf --no-dereference --preserve=links --no-preserve=mode "$srcdir/$_gitname/usr" "$pkgdir/"
 }
diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/README.md b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md
similarity index 80%
rename from Design/Nier-A2/melawy-sddm-theme-nier-a2/README.md
rename to Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md
index a49aa25..494b78e 100644
--- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/README.md
+++ b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md
@@ -1,5 +1,5 @@
-# melawy-sddm-theme-nier-a2
-SDDM theme for theme Nier A2
+# melawy-kde-theme-lera-sugar
+KDE theme for Melawy Linux
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/.gitignore b/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/.gitignore
deleted file mode 100644
index 3a8ca3a..0000000
--- a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-plasma-look-and-feel-lera-sugar
diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/PKGBUILD
deleted file mode 100644
index 4df9683..0000000
--- a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
-
-_gitname="$(basename $(pwd))"
-pkgname=("$_gitname")
-pkgver=1.12
-pkgrel=1
-pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
-arch=("any")
-license=("AGPL3")
-depends=("plasma-desktop")
-optdepends=()
-makedepends=("git")
-backup=()
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-source=("git+$url.git")
-sha256sums=("SKIP")
-validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
-
-THEME_NAME="com.github.Melawy.Lera-Sugar.desktop"
-THEME_PATH="/usr/share/plasma/look-and-feel"
-
-# pkgver() {
-# 	cd "$srcdir/$_gitname"
-# 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-# }
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	printf "1.%s" "$(git rev-list --count HEAD)"
-}
-
-package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
-}
diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/README.md b/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/README.md
deleted file mode 100644
index 487e254..0000000
--- a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# melawy-plasma-look-and-feel-lera-sugar
-Splash screen after login for theme Lera Sugar
-
-### Donate
-[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
-
-[YooMoney](https://yoomoney.ru/to/4100115921160758)
-
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
-Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f
diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/.gitignore b/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/.gitignore
deleted file mode 100644
index 9c0cfe8..0000000
--- a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-sddm-theme-lera-sugar
diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/.gitignore b/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/.gitignore
deleted file mode 100644
index cd52804..0000000
--- a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-wallpaper-lera-sugar
diff --git a/Design/Melawy/melawy-color-scheme-konsole/.gitignore b/Design/Melawy/melawy-color-scheme-konsole/.gitignore
deleted file mode 100644
index 1dc6ab0..0000000
--- a/Design/Melawy/melawy-color-scheme-konsole/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-color-scheme-konsole
diff --git a/Design/Melawy/melawy-color-scheme-konsole/00_make.sh b/Design/Melawy/melawy-color-scheme-konsole/00_make.sh
deleted file mode 100755
index 122f2f7..0000000
--- a/Design/Melawy/melawy-color-scheme-konsole/00_make.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-echo "Ready"
diff --git a/Design/Melawy/melawy-color-scheme-konsole/01_sign.sh b/Design/Melawy/melawy-color-scheme-konsole/01_sign.sh
deleted file mode 100755
index 77055f1..0000000
--- a/Design/Melawy/melawy-color-scheme-konsole/01_sign.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
diff --git a/Design/Melawy/melawy-color-scheme-konsole/PKGBUILD b/Design/Melawy/melawy-color-scheme-konsole/PKGBUILD
deleted file mode 100644
index a9b5fb5..0000000
--- a/Design/Melawy/melawy-color-scheme-konsole/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
-
-_gitname="$(basename $(pwd))"
-pkgname=("$_gitname")
-pkgver=1.4
-pkgrel=1
-pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
-arch=("any")
-license=("AGPL3")
-depends=("plasma-desktop")
-optdepends=()
-makedepends=("git")
-backup=()
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-source=("git+$url.git")
-sha256sums=("SKIP")
-validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
-
-THEME_NAME="Melawy"
-THEME_PATH="/usr/share/konsole"
-
-# pkgver() {
-# 	cd "$srcdir/$_gitname"
-# 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-# }
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	printf "1.%s" "$(git rev-list --count HEAD)"
-}
-
-package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME.colorscheme" "$pkgdir$THEME_PATH/"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME.profile" "$pkgdir$THEME_PATH/"
-}
diff --git a/Design/Melawy/melawy-color-scheme-konsole/README.md b/Design/Melawy/melawy-color-scheme-konsole/README.md
deleted file mode 100644
index dd8d4d9..0000000
--- a/Design/Melawy/melawy-color-scheme-konsole/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# melawy-color-scheme-konsole
-Color profile for Konsole for Melawy Linux
-
-### Donate
-[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
-
-[YooMoney](https://yoomoney.ru/to/4100115921160758)
-
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
-Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f
diff --git a/Design/Melawy/melawy-color-scheme/.gitignore b/Design/Melawy/melawy-color-scheme/.gitignore
deleted file mode 100644
index f61b29e..0000000
--- a/Design/Melawy/melawy-color-scheme/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-color-scheme
diff --git a/Design/Melawy/melawy-color-scheme/00_make.sh b/Design/Melawy/melawy-color-scheme/00_make.sh
deleted file mode 100755
index 122f2f7..0000000
--- a/Design/Melawy/melawy-color-scheme/00_make.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-echo "Ready"
diff --git a/Design/Melawy/melawy-color-scheme/01_sign.sh b/Design/Melawy/melawy-color-scheme/01_sign.sh
deleted file mode 100755
index 77055f1..0000000
--- a/Design/Melawy/melawy-color-scheme/01_sign.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
diff --git a/Design/Melawy/melawy-color-scheme/README.md b/Design/Melawy/melawy-color-scheme/README.md
deleted file mode 100644
index 1ea6bbe..0000000
--- a/Design/Melawy/melawy-color-scheme/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# melawy-color-scheme
-Color profile for KDE for Melawy Linux
-
-### Donate
-[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
-
-[YooMoney](https://yoomoney.ru/to/4100115921160758)
-
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
-Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f
diff --git a/Design/Melawy/melawy-theme/.gitignore b/Design/Melawy/melawy-theme/.gitignore
new file mode 100644
index 0000000..f459dac
--- /dev/null
+++ b/Design/Melawy/melawy-theme/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-theme
diff --git a/Design/Fenek/melawy-wallpaper-fenek/00_make.sh b/Design/Melawy/melawy-theme/00_make.sh
similarity index 100%
rename from Design/Fenek/melawy-wallpaper-fenek/00_make.sh
rename to Design/Melawy/melawy-theme/00_make.sh
diff --git a/Design/Fenek/melawy-wallpaper-fenek/01_sign.sh b/Design/Melawy/melawy-theme/01_sign.sh
similarity index 100%
rename from Design/Fenek/melawy-wallpaper-fenek/01_sign.sh
rename to Design/Melawy/melawy-theme/01_sign.sh
diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/PKGBUILD b/Design/Melawy/melawy-theme/PKGBUILD
similarity index 72%
rename from Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/PKGBUILD
rename to Design/Melawy/melawy-theme/PKGBUILD
index 7df976c..7928756 100644
--- a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/PKGBUILD
+++ b/Design/Melawy/melawy-theme/PKGBUILD
@@ -2,13 +2,13 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
-pkgver=1.8
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Design/$_gitname"
 arch=("any")
 license=("AGPL3")
-depends=("sddm" "plasma-desktop")
+depends=()
 optdepends=()
 makedepends=("git")
 backup=()
@@ -18,9 +18,6 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy-Lera-Sugar"
-THEME_PATH="/usr/share/sddm/themes"
-
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
 # 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -32,6 +29,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+  cp -vrf --no-dereference --preserve=links --no-preserve=mode "$srcdir/$_gitname/melawy-gtk-theme/usr" "$pkgdir/"
+  cp -vrf --no-dereference --preserve=links --no-preserve=mode "$srcdir/$_gitname/melawy-kde-theme/usr" "$pkgdir/"
 }
diff --git a/Design/Fenek/melawy-wallpaper-fenek/README.md b/Design/Melawy/melawy-theme/README.md
similarity index 81%
rename from Design/Fenek/melawy-wallpaper-fenek/README.md
rename to Design/Melawy/melawy-theme/README.md
index 48a15a0..61d8c19 100644
--- a/Design/Fenek/melawy-wallpaper-fenek/README.md
+++ b/Design/Melawy/melawy-theme/README.md
@@ -1,5 +1,5 @@
-# melawy-wallpaper-fenek
-Wallpaper for theme Fenek
+# melawy-theme
+KDE, GTK theme for Melawy Linux
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore b/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore
new file mode 100644
index 0000000..4a9e4dc
--- /dev/null
+++ b/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-kde-theme-nier-a2
diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh b/Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh
rename to Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh
diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/01_sign.sh b/Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/01_sign.sh
rename to Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh
diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD
similarity index 73%
rename from Design/Nier-A2/melawy-wallpaper-nier-a2/PKGBUILD
rename to Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD
index f630dce..b9f7d4d 100644
--- a/Design/Nier-A2/melawy-wallpaper-nier-a2/PKGBUILD
+++ b/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD
@@ -2,13 +2,13 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
-pkgver=1.7
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Design/$_gitname"
 arch=("any")
 license=("AGPL3")
-depends=("plasma-desktop")
+depends=()
 optdepends=()
 makedepends=("git")
 backup=()
@@ -18,9 +18,6 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy Nier A2"
-THEME_PATH="/usr/share/wallpapers"
-
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
 # 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -32,6 +29,5 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+  cp -vrf --no-dereference --preserve=links --no-preserve=mode "$srcdir/$_gitname/usr" "$pkgdir/"
 }
diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/README.md b/Design/Nier-A2/melawy-kde-theme-nier-a2/README.md
similarity index 80%
rename from Design/Nier-A2/melawy-wallpaper-nier-a2/README.md
rename to Design/Nier-A2/melawy-kde-theme-nier-a2/README.md
index 9c66fb8..f310ab3 100644
--- a/Design/Nier-A2/melawy-wallpaper-nier-a2/README.md
+++ b/Design/Nier-A2/melawy-kde-theme-nier-a2/README.md
@@ -1,5 +1,5 @@
-# melawy-wallpaper-nier-a2
-Wallpaper for theme Nier A2
+# melawy-kde-theme-nier-a2
+KDE theme for Melawy Linux
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/.gitignore b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/.gitignore
deleted file mode 100644
index 133025a..0000000
--- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-plasma-look-and-feel-nier-a2
diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh
deleted file mode 100755
index 122f2f7..0000000
--- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-echo "Ready"
diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/01_sign.sh b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/01_sign.sh
deleted file mode 100755
index 77055f1..0000000
--- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/01_sign.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/PKGBUILD
deleted file mode 100644
index c091a1c..0000000
--- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
-
-_gitname="$(basename $(pwd))"
-pkgname=("$_gitname")
-pkgver=1.2
-pkgrel=1
-pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
-arch=("any")
-license=("AGPL3")
-depends=("plasma-desktop")
-optdepends=()
-makedepends=("git")
-backup=()
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-source=("git+$url.git")
-sha256sums=("SKIP")
-validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
-
-THEME_NAME="com.github.Melawy.Nier-A2.desktop"
-THEME_PATH="/usr/share/plasma/look-and-feel"
-
-# pkgver() {
-# 	cd "$srcdir/$_gitname"
-# 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-# }
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	printf "1.%s" "$(git rev-list --count HEAD)"
-}
-
-package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
-}
diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/README.md b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/README.md
deleted file mode 100644
index 81532bd..0000000
--- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# melawy-plasma-look-and-feel-nier-a2
-Splash screen after login for theme Nier A2
-
-### Donate
-[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
-
-[YooMoney](https://yoomoney.ru/to/4100115921160758)
-
-[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
-
-Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f
diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/.gitignore b/Design/Nier-A2/melawy-sddm-theme-nier-a2/.gitignore
deleted file mode 100644
index cea3136..0000000
--- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-sddm-theme-nier-a2
diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh b/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh
deleted file mode 100755
index 122f2f7..0000000
--- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-echo "Ready"
diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/01_sign.sh b/Design/Nier-A2/melawy-sddm-theme-nier-a2/01_sign.sh
deleted file mode 100755
index 77055f1..0000000
--- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/01_sign.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-sddm-theme-nier-a2/PKGBUILD
deleted file mode 100644
index 78d5ba8..0000000
--- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
-
-_gitname="$(basename $(pwd))"
-pkgname=("$_gitname")
-pkgver=1.2
-pkgrel=1
-pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
-arch=("any")
-license=("AGPL3")
-depends=("sddm" "plasma-desktop")
-optdepends=()
-makedepends=("git")
-backup=()
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-source=("git+$url.git")
-sha256sums=("SKIP")
-validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
-
-THEME_NAME="Melawy-Nier-A2"
-THEME_PATH="/usr/share/sddm/themes"
-
-# pkgver() {
-# 	cd "$srcdir/$_gitname"
-# 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-# }
-
-pkgver() {
-	cd "$srcdir/$_gitname"
-	printf "1.%s" "$(git rev-list --count HEAD)"
-}
-
-package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
-}
diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/.gitignore b/Design/Nier-A2/melawy-wallpaper-nier-a2/.gitignore
deleted file mode 100644
index 04495bb..0000000
--- a/Design/Nier-A2/melawy-wallpaper-nier-a2/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-pkg/
-src/
-/melawy-wallpaper-nier-a2
diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh b/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh
deleted file mode 100755
index 122f2f7..0000000
--- a/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-echo "Ready"
diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/01_sign.sh b/Design/Nier-A2/melawy-wallpaper-nier-a2/01_sign.sh
deleted file mode 100755
index 77055f1..0000000
--- a/Design/Nier-A2/melawy-wallpaper-nier-a2/01_sign.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-for i in *.pkg.tar.zst;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
-
-for i in *.pkg.tar.xz;
-do
-    if [ -f "${i}" ]; then
-        echo "Удаление подписи $i.sig"
-        rm -f $i.sig
-        echo "Добавление подписи $i.sig"
-        gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
-    fi
-done
diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD b/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD
index 6b3247a..7cb6b1a 100644
--- a/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD
+++ b/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD
@@ -19,7 +19,7 @@ sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
 THEME_NAME="com.github.adhec.DittoMenu"
-THEME_PATH="/usr/share/plasma/plasmoids"
+THEME_PATH="usr/share/plasma/plasmoids"
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -32,6 +32,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+	install -d "$pkgdir/$THEME_PATH"
+	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/"
 }
diff --git a/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD b/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD
index cc9ad39..b31b3f1 100644
--- a/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD
+++ b/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD
@@ -19,7 +19,7 @@ sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
 THEME_NAME="com.github.adhec.Menu11"
-THEME_PATH="/usr/share/plasma/plasmoids"
+THEME_PATH="usr/share/plasma/plasmoids"
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -32,6 +32,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+	install -d "$pkgdir/$THEME_PATH"
+	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/"
 }
diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD b/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD
index 5359436..ff4e1b0 100644
--- a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD
+++ b/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD
@@ -19,7 +19,7 @@ sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
 THEME_NAME="com.github.adhec.OnzeMenuKDE"
-THEME_PATH="/usr/share/plasma/plasmoids"
+THEME_PATH="usr/share/plasma/plasmoids"
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -32,6 +32,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+	install -d "$pkgdir/$THEME_PATH"
+	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/"
 }
diff --git a/Plasmoids/make.sh b/Plasmoids/make.sh
new file mode 100755
index 0000000..608bc65
--- /dev/null
+++ b/Plasmoids/make.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+REPO="/data/github/active/Melawy/REPO/melawy/x86_64/"
+
+echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt
+
+CWD=$(cat pwd.txt)
+
+for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d)
+do
+    cd $CWD/$package_dir
+    makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force
+
+    for i in *.pkg.tar.zst;
+    do
+        if [ -f "${i}" ]; then
+            echo "Удаление подписи $i.sig"
+            rm -f $i.sig
+            echo "Добавление подписи $i.sig"
+            gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
+        fi
+    done
+
+    for i in *.pkg.tar.xz;
+    do
+        if [ -f "${i}" ]; then
+            echo "Удаление подписи $i.sig"
+            rm -f $i.sig
+            echo "Добавление подписи $i.sig"
+            gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i"
+        fi
+    done
+
+    package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst")
+    if [ -f "$CWD/$package_dir/$package_file" ]; then
+        mv -v $CWD/$package_dir/$package_file $REPO/
+    fi
+
+    package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz")
+    if [ -f "$CWD/$package_dir/$package_file" ]; then
+        mv -v $CWD/$package_dir/$package_file $REPO/
+    fi
+
+    package_file=$(ls -1 | grep "pkg.tar.xz.sig")
+    if [ -f "$CWD/$package_dir/$package_file" ]; then
+
+        mv -v $CWD/$package_dir/$package_file $REPO/
+    fi
+
+    package_file=$(ls -1 | grep "pkg.tar.zst.sig")
+    if [ -f "$CWD/$package_dir/$package_file" ]; then
+
+        mv -v $CWD/$package_dir/$package_file $REPO/
+    fi
+
+    cd $CWD
+done
+
+echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
+notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')"
+
+echo "Ready"
diff --git a/Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore b/Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore
new file mode 100644
index 0000000..7f5dcdd
--- /dev/null
+++ b/Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-plasma-plasmoid-presentwindows
diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh b/Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh
rename to Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh
diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/01_sign.sh b/Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/01_sign.sh
rename to Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh
diff --git a/Design/Melawy/melawy-color-scheme/PKGBUILD b/Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD
similarity index 80%
rename from Design/Melawy/melawy-color-scheme/PKGBUILD
rename to Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD
index 098c0ba..ca8a55f 100644
--- a/Design/Melawy/melawy-color-scheme/PKGBUILD
+++ b/Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD
@@ -2,10 +2,10 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
-pkgver=1.4
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
+url="https://git.melawy.ru/Plasmoids/$_gitname"
 arch=("any")
 license=("AGPL3")
 depends=("plasma-desktop")
@@ -18,8 +18,8 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy.colors"
-THEME_PATH="/usr/share/color-schemes"
+THEME_NAME="com.github.zren.presentwindows"
+THEME_PATH="usr/share/plasma/plasmoids"
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -32,6 +32,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
+	install -d "$pkgdir/$THEME_PATH"
 	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/"
 }
diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/README.md b/Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md
similarity index 76%
rename from Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/README.md
rename to Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md
index 5692590..f04673d 100644
--- a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/README.md
+++ b/Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md
@@ -1,5 +1,5 @@
-# melawy-sddm-theme-lera-sugar
-SDDM theme for theme Lera Sugar
+# melawy-plasma-plasmoid-presentwindows
+Show desktop mosaic plasmoid
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore
new file mode 100644
index 0000000..e858ce4
--- /dev/null
+++ b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-plasma-plasmoid-win7showdesktop
diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh
rename to Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh
diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/01_sign.sh b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh
similarity index 100%
rename from Design/Lera-Sugar/melawy-wallpaper-lera-sugar/01_sign.sh
rename to Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh
diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/PKGBUILD b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD
similarity index 76%
rename from Design/Lera-Sugar/melawy-wallpaper-lera-sugar/PKGBUILD
rename to Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD
index 298aadc..f1c979a 100644
--- a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/PKGBUILD
+++ b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD
@@ -2,10 +2,10 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
-pkgver=1.8
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
-url="https://git.melawy.ru/Design/$_gitname"
+url="https://git.melawy.ru/Plasmoids/$_gitname"
 arch=("any")
 license=("AGPL3")
 depends=("plasma-desktop")
@@ -18,8 +18,8 @@ source=("git+$url.git")
 sha256sums=("SKIP")
 validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8')
 
-THEME_NAME="Melawy Lera Sugar"
-THEME_PATH="/usr/share/wallpapers"
+THEME_NAME="com.github.zren.win7showdesktop"
+THEME_PATH="usr/share/plasma/plasmoids"
 
 # pkgver() {
 # 	cd "$srcdir/$_gitname"
@@ -32,6 +32,6 @@ pkgver() {
 }
 
 package() {
-	install -d "$pkgdir$THEME_PATH"
-	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/"
+	install -d "$pkgdir/$THEME_PATH"
+	cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/"
 }
diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/README.md b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md
similarity index 78%
rename from Design/Lera-Sugar/melawy-wallpaper-lera-sugar/README.md
rename to Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md
index 88c2922..c5c7885 100644
--- a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/README.md
+++ b/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md
@@ -1,5 +1,5 @@
-# melawy-wallpaper-lera-sugar
-Wallpaper for theme Lera Sugar
+# melawy-plasma-plasmoid-win7showdesktop
+Show desktop plasmoid
 
 ### Donate
 [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
diff --git a/Plasmoids/pwd.txt b/Plasmoids/pwd.txt
new file mode 100644
index 0000000..961ce15
--- /dev/null
+++ b/Plasmoids/pwd.txt
@@ -0,0 +1 @@
+/data/github/active/Melawy/PKGBUILD-git.melawy.ru/Menu
\ No newline at end of file