diff --git a/Core/etc-skel/PKGBUILD b/Core/etc-skel/PKGBUILD
index e3732ae..5fa0b6f 100644
--- a/Core/etc-skel/PKGBUILD
+++ b/Core/etc-skel/PKGBUILD
@@ -2,14 +2,14 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.3
+pkgver=1.5
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"
 license=('AGPL3')
 
-depends=()
+depends=('bash')
 
 makedepends=('git')
 
@@ -33,13 +33,15 @@ pkgver() {
         printf "1.%s" "$(git rev-list --count HEAD)"
 }
 
+install=ins.install
+
 package() {
     # Clone file structure
-    install -d "${pkgdir}/etc/skel/"
-    cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/etc/skel/"
+    install -d "${pkgdir}/usr/share/skel/"
+    cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/usr/share/skel/"
 
     # Find all scripts
-    readarray -d '' scripts < <(find "${pkgdir}/etc/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0)
+    readarray -d '' scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0)
 
     # Make scripts executable
     for script in "${scripts[@]}";
diff --git a/Core/etc-skel/ins.install b/Core/etc-skel/ins.install
new file mode 100644
index 0000000..90ff68a
--- /dev/null
+++ b/Core/etc-skel/ins.install
@@ -0,0 +1,7 @@
+post_upgrade() {
+    cp -rT --no-preserve=ownership "/usr/share/skel/" "/etc/skel/"
+}
+
+post_install() {
+    post_upgrade
+}
diff --git a/Installer/skel-liveuser/.gitignore b/Core/skel-liveuser/.gitignore
similarity index 100%
rename from Installer/skel-liveuser/.gitignore
rename to Core/skel-liveuser/.gitignore
diff --git a/Installer/calamares-eos/00_make.sh b/Core/skel-liveuser/00_make.sh
similarity index 100%
rename from Installer/calamares-eos/00_make.sh
rename to Core/skel-liveuser/00_make.sh
diff --git a/Installer/calamares-eos/01_sign.sh b/Core/skel-liveuser/01_sign.sh
similarity index 100%
rename from Installer/calamares-eos/01_sign.sh
rename to Core/skel-liveuser/01_sign.sh
diff --git a/Installer/skel-liveuser/PKGBUILD b/Core/skel-liveuser/PKGBUILD
similarity index 100%
rename from Installer/skel-liveuser/PKGBUILD
rename to Core/skel-liveuser/PKGBUILD
diff --git a/Installer/skel-liveuser/README.md b/Core/skel-liveuser/README.md
similarity index 100%
rename from Installer/skel-liveuser/README.md
rename to Core/skel-liveuser/README.md
diff --git a/Installer/skel-liveuser/ins.install b/Core/skel-liveuser/ins.install
similarity index 100%
rename from Installer/skel-liveuser/ins.install
rename to Core/skel-liveuser/ins.install
diff --git a/Installer/calamares-eos/.gitignore b/Installer/melawy-calamares/.gitignore
similarity index 50%
rename from Installer/calamares-eos/.gitignore
rename to Installer/melawy-calamares/.gitignore
index 3376fb3..0ee13a0 100644
--- a/Installer/calamares-eos/.gitignore
+++ b/Installer/melawy-calamares/.gitignore
@@ -1,4 +1,4 @@
 *.tar.*
 pkg/
 src/
-/calamares-eos
+/melawy-calamares
diff --git a/Installer/skel-liveuser/00_make.sh b/Installer/melawy-calamares/00_make.sh
similarity index 100%
rename from Installer/skel-liveuser/00_make.sh
rename to Installer/melawy-calamares/00_make.sh
diff --git a/Installer/skel-liveuser/01_sign.sh b/Installer/melawy-calamares/01_sign.sh
similarity index 100%
rename from Installer/skel-liveuser/01_sign.sh
rename to Installer/melawy-calamares/01_sign.sh
diff --git a/Installer/calamares-eos/PKGBUILD b/Installer/melawy-calamares/PKGBUILD
similarity index 60%
rename from Installer/calamares-eos/PKGBUILD
rename to Installer/melawy-calamares/PKGBUILD
index 5e1e41d..1c6588f 100644
--- a/Installer/calamares-eos/PKGBUILD
+++ b/Installer/melawy-calamares/PKGBUILD
@@ -2,21 +2,24 @@
 # Calamares installer (fork from EndeavourOS) configured for Melawy Linux
 
 _gitname="$(basename $(pwd))"
-pkgname=("melawy-$_gitname")
+pkgname=("$_gitname")
 release_name=$pkgname
-pkgver=3.3.0.10960
+pkgver=3.3.0.10973
 pkgrel=1
-pkgname=("melawy-$_gitname")
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')
 url="https://git.melawy.ru/Melawy/$_gitname"
 license=('GPL3')
-makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk')
-conflicts=('calamares' 'calamares_current')
+
+makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk' 'ninja' 'qt5-tools')
+
 depends=( 'qt5-svg' 'qt5-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons' 'kconfig' 'ki18n' 'kservice' \
 'kwidgetsaddons' 'kpmcore' 'squashfs-tools' 'rsync' 'cryptsetup' 'qt5-xmlpatterns' 'doxygen' 'dmidecode' \
-'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt5' 'python' 'solid' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols2' )
+'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt5' 'python' 'solid' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols' 'qt5-quickcontrols2' )
+
 provides=("calamares")
+conflicts=('calamares' 'calamares_current')
+
 options=(!strip !emptydirs)
 source=("git+https://git.melawy.ru/Melawy/$_gitname.git#branch=calamares")
 
@@ -36,19 +39,18 @@ prepare() {
         print
     }
     '
-    awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/data/eos/branding/endeavouros/branding.desc"
+    awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/data/melawy/branding/branding.desc"
 }
 
 build() {
+    _cpuCount=$(grep -c -w ^processor /proc/cpuinfo)
+
     cmake -B build -S "${srcdir}/$_gitname" \
-    -DWEBVIEW_FORCE_WEBKIT=OFF \
-    -DWITH_PYTHONQT=OFF \
-    -DWITH_KF5DBus=OFF \
-    -DWITH_APPSTREAM=OFF \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DBoost_NO_BOOST_CMAKE=ON \
+    -GNinja \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DWITH_APPSTREAM=OFF \
     -DINSTALL_CONFIG=OFF \
     -DSKIP_MODULES="dracut \
     dummycpp dummyprocess dummypython dummypythonqt \
@@ -56,11 +58,21 @@ build() {
     openrcdmcryptcfg plymouthcfg plasmalnf services-openrc \
     summaryq tracking usersq webview welcomeq"
     export DESTDIR="$srcdir/build"
-    make -C build
+    cmake --build build --parallel $_cpuCount
 }
 
 package() {
-    make -C build DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install
+
     install -dm 755 "${pkgdir}/etc"
-    cp -rp "${srcdir}/$_gitname/data/eos" "${pkgdir}/etc/calamares"
+    cp -rp "${srcdir}/$_gitname/data/melawy" "${pkgdir}/etc/calamares"
+
+    install -dm 750 "${pkgdir}/etc/polkit-1/rules.d"
+    install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules"
+
+    install -dm 755 "${pkgdir}/etc/xdg/autostart"
+    install -Dm644 "${srcdir}/$_gitname/calamares.desktop" "${pkgdir}/etc/xdg/autostart/calamares.desktop"
+
+    install -dm 755 "${pkgdir}/usr/bin"
+    install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit"
 }
diff --git a/Installer/calamares-eos/README.md b/Installer/melawy-calamares/README.md
similarity index 100%
rename from Installer/calamares-eos/README.md
rename to Installer/melawy-calamares/README.md
diff --git a/Updater/arch-linux-updater/PKGBUILD b/Updater/arch-linux-updater/PKGBUILD
index 44faea7..5fbb2b9 100644
--- a/Updater/arch-linux-updater/PKGBUILD
+++ b/Updater/arch-linux-updater/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.7
+pkgver=1.10
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')
@@ -39,4 +39,7 @@ package() {
 
   install -dm755 "${pkgdir}/usr/bin/"
   install -m755 "${srcdir}/$_gitname/target/release/arch-linux-updater" "${pkgdir}/usr/bin/"
+
+  install -dm750 "${pkgdir}/etc/sudoers.d/"
+  install -m644 "${srcdir}/$_gitname/melawy-arch-linux-updater" "${pkgdir}/etc/sudoers.d/"
 }
diff --git a/Updater/plasma-plasmoid-archupdate/PKGBUILD b/Updater/plasma-plasmoid-archupdate/PKGBUILD
index 5e5125a..064e9ee 100644
--- a/Updater/plasma-plasmoid-archupdate/PKGBUILD
+++ b/Updater/plasma-plasmoid-archupdate/PKGBUILD
@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.13
+pkgver=1.15
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"