diff --git a/README.md b/README.md
index 6274cb2..17d4150 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,12 @@ labwc-alpine/
├── fonts/ # Шрифты
│ └── Widock TRIAL Bold.otf
│
+├── scripts/ # скрипты
+│ ├── alpine_dark.sh
+│ ├── alpine_light.sh
+│ ├── fuji_dark.sh
+│ └── fuji_light.sh
+│
├── install.sh # Главный установочный скрипт
├── LICENSE # Лицензия
└── README.md # Этот файл
diff --git a/backgrounds/alpine_bg_dark_sign.jpg b/backgrounds/alpine_bg_dark_sign.jpg
new file mode 100644
index 0000000..28bf27e
Binary files /dev/null and b/backgrounds/alpine_bg_dark_sign.jpg differ
diff --git a/backgrounds/alpine_bg_light_sign.jpg b/backgrounds/alpine_bg_light_sign.jpg
new file mode 100644
index 0000000..679cdb0
Binary files /dev/null and b/backgrounds/alpine_bg_light_sign.jpg differ
diff --git a/backgrounds/fuji_dark.jpg b/backgrounds/fuji_dark.jpg
new file mode 100644
index 0000000..03461fd
Binary files /dev/null and b/backgrounds/fuji_dark.jpg differ
diff --git a/backgrounds/fuji_light.jpg b/backgrounds/fuji_light.jpg
new file mode 100644
index 0000000..b266078
Binary files /dev/null and b/backgrounds/fuji_light.jpg differ
diff --git a/backgrounds/voidlinux_bg_dark.png b/backgrounds/voidlinux_bg_dark.png
deleted file mode 100644
index 1e91a4e..0000000
Binary files a/backgrounds/voidlinux_bg_dark.png and /dev/null differ
diff --git a/backgrounds/voidlinux_bg_light.png b/backgrounds/voidlinux_bg_light.png
deleted file mode 100644
index 4c0ffd4..0000000
Binary files a/backgrounds/voidlinux_bg_light.png and /dev/null differ
diff --git a/configs/labwc/labwc/environment b/configs/labwc/environment
similarity index 100%
rename from configs/labwc/labwc/environment
rename to configs/labwc/environment
diff --git a/configs/labwc/labwc/autostart b/configs/labwc/labwc/autostart
deleted file mode 100644
index b4dc0cf..0000000
--- a/configs/labwc/labwc/autostart
+++ /dev/null
@@ -1,23 +0,0 @@
-# синхронизация окружения
-dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=labwc &
-systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
-
-# базовые сервисы
-waybar &
-mako &
-hypridle &
-hyprpolkitagent &
-ironbar &
-
-# буфер обмена
-wl-paste --type text --watch cliphist store &
-wl-paste --type image --watch cliphist store &
-
-# тема и обои
-~/.config/labwc/update_theme.sh &
-
-# аудиоэффекты
-(sleep 2 && easyeffects --gapplication-service) &
-
-# polkit agent
-systemctl --user start hyprpolkitagent.service &
\ No newline at end of file
diff --git a/configs/labwc/labwc/menu.xml b/configs/labwc/labwc/menu.xml
deleted file mode 100644
index 3cbdc6a..0000000
--- a/configs/labwc/labwc/menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/configs/labwc/labwc/themes/DynamicAether/themerc b/configs/labwc/labwc/themes/DynamicAether/themerc
deleted file mode 100644
index dbc39fd..0000000
--- a/configs/labwc/labwc/themes/DynamicAether/themerc
+++ /dev/null
@@ -1,8 +0,0 @@
-window.active.title.bg: #040608
-window.active.title.text: #D4CFCB
-window.active.border.color: #040608
-window.inactive.title.bg: #040608
-window.inactive.title.text: #D4CFCB
-window.inactive.border.color: #040608
-window.active.border.width: 2
-window.inactive.border.width: 1
diff --git a/configs/labwc/labwc/update_theme.sh b/configs/labwc/labwc/update_theme.sh
deleted file mode 100755
index bd3925a..0000000
--- a/configs/labwc/labwc/update_theme.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-TARGET_FILE="$HOME/.config/aether/theme/waybar.css"
-THEME_FILE="$HOME/.config/labwc/themerc-override"
-
-BG_FOLDER="$HOME/.config/aether/theme/backgrounds"
-WALLPAPER=$(find "$BG_FOLDER" -type f | head -n 1)
-
-if [ -f "$TARGET_FILE" ]; then
- BG_COLOR=$(grep "background" "$TARGET_FILE" | awk '{print $3}' | tr -d ';')
- FG_COLOR=$(grep "foreground" "$TARGET_FILE" | awk '{print $3}' | tr -d ';')
-
- if [ ! -z "$BG_COLOR" ] && [ ! -z "$FG_COLOR" ]; then
- cat << EOF > "$THEME_FILE"
-# цвет рамки active и inactive
-window.active.border.color: $FG_COLOR
-window.inactive.border.color: $BG_COLOR
-
-# цвет фона заголовка active и inactive
-window.active.title.bg.color: $BG_COLOR
-window.inactive.title.bg.color: $BG_COLOR
-
-# цвет текста заголовка окна
-window.active.label.text.color: $FG_COLOR
-window.inactive.label.text.color: $FG_COLOR
-
-# цвет иконок кнопок для АКТИВНОГО окна
-window.active.button.unpressed.image.color: $FG_COLOR
-
-# цвет иконок кнопок для НЕАКТИВНОГО окна (ОБЯЗАТЕЛЬНЫЙ КЛЮЧ LABWC)
-window.inactive.button.image.color: $FG_COLOR
-EOF
- fi
-fi
-
-killall swaybg 2>/dev/null
-
-if [ ! -z "$WALLPAPER" ] && [ -f "$WALLPAPER" ]; then
- swaybg -m fill -i "$WALLPAPER" &
-else
- swaybg -c "$BG_COLOR" &
-fi
diff --git a/configs/labwc/labwc/void_labwc b/configs/labwc/labwc/void_labwc
deleted file mode 100644
index f37d8a8..0000000
--- a/configs/labwc/labwc/void_labwc
+++ /dev/null
@@ -1,81 +0,0 @@
-стек:
-labwc
-waybar
-swaylock(замена hyprlock)
-swayidle(замена hypridle)
-polkit-gnome(замена hyprpolkit)
-dolphin
-kate
-google-chrome
-pipewire
-kitty(alacritty)
-v2ray
-v2rayA
-telegram
-htop
-gparted
-pavucontrol
-qdirstat
-easyeffects
-lsp-plugins-lv2
-obsidian
-ristretto
-mpv
-wofi
-cliphist
-sddm
-pango
-xorg-server-xwayland
-mesa-dri
-nvidia-open-dkms
-wl-clipboard
-gtk-layer-shell
-grim
-slurp
-swaybg
-mako
-seatd
-dbus
-polkit
-fontconfig
-noto-fonts-ttf
-ttf-dejavu
-alsa-pipewire
-wireplumber
-xdg-desktop-portal-wlr
-xdg-desktop-portal-gtk
-qt6-wayland
-qt5-wayland
-base-system
-void-repo-nonfree
-fuse
-fuse-common
-ca-certificates
-curl
-xdg-utils
-dhcpcd
-sudo
-acpid
-breeze-icons
-ffmpeg
-libnotify
-ttf-jetbrains-mono
-adwaita-icon-theme
-xdg-desktop-portal-gtk
-unzip
-zip
-p7zip
-qt5ct
-qt6ct
-linux-firmware
-ttf-font-awesome
-
-
-aether(буду писать замену)
-
-установка чистого void linux
-
-обновление системы
-sudo xbps-install -Syu
-sudo xbps-install -u xbps
-
diff --git a/configs/labwc/menu.xml b/configs/labwc/menu.xml
new file mode 100644
index 0000000..b8ac14e
--- /dev/null
+++ b/configs/labwc/menu.xml
@@ -0,0 +1,118 @@
+
+
+
+
\ No newline at end of file
diff --git a/palettes/palette_dark b/configs/labwc/palettes/alpine/palette_dark
similarity index 100%
rename from palettes/palette_dark
rename to configs/labwc/palettes/alpine/palette_dark
diff --git a/palettes/palette_light b/configs/labwc/palettes/alpine/palette_light
similarity index 100%
rename from palettes/palette_light
rename to configs/labwc/palettes/alpine/palette_light
diff --git a/configs/labwc/labwc/rc.xml b/configs/labwc/rc.xml
similarity index 94%
rename from configs/labwc/labwc/rc.xml
rename to configs/labwc/rc.xml
index c658aa9..f72b157 100644
--- a/configs/labwc/labwc/rc.xml
+++ b/configs/labwc/rc.xml
@@ -18,7 +18,7 @@
- DynamicAether
+ labwc-s13bby
@@ -64,12 +64,12 @@
-
+
-
+
@@ -84,24 +84,26 @@
+
-
+
-
+
+
-
+
-
+
@@ -190,5 +192,4 @@
-
diff --git a/configs/labwc/scripts/base_theme_dark.sh b/configs/labwc/scripts/alpine_dark.sh
similarity index 64%
rename from configs/labwc/scripts/base_theme_dark.sh
rename to configs/labwc/scripts/alpine_dark.sh
index 9fa81bd..04ac608 100644
--- a/configs/labwc/scripts/base_theme_dark.sh
+++ b/configs/labwc/scripts/alpine_dark.sh
@@ -1,15 +1,12 @@
-#!/bin/bash
+#!/bin/sh
-PALETTE="$HOME/.config/labwc/palettes/palette-dark.json"
+PALETTE="$HOME/.config/labwc/palettes/alpine/palette-dark"
-FG_COLOR=$(jq -r '.FG_COLOR' "$PALETTE")
-SUB_FG_COLOR=$(jq -r '.SUB_FG_COLOR' "$PALETTE")
-
-BG_COLOR=$(jq -r '.BG_COLOR' "$PALETTE")
-SUB_BG_COLOR=$(jq -r '.SUB_BG_COLOR' "$PALETTE")
-
-ACCENT_COLOR=$(jq -r '.ACCENT_COLOR' "$PALETTE")
-SUB_ACCENT_COLOR=$(jq -r '.SUB_ACCENT_COLOR' "$PALETTE")
+BG_COLOR=$(sed -n '1p' "$PALETTE")
+SUB_BG_COLOR=$(sed -n '2p' "$PALETTE")
+ACCENT_COLOR=$(sed -n '3p' "$PALETTE")
+SUB_FG_COLOR=$(sed -n '4p' "$PALETTE")
+FG_COLOR=$(sed -n '5p' "$PALETTE")
cat << EOF > "$HOME/.config/labwc/themerc-override"
@@ -36,4 +33,6 @@ killall swaybg 2>/dev/null
swaybg \
-m fill \
- -i "$HOME/.config/labwc/backgrounds/voidlinux_bg_dark.png" &
+ -i "$HOME/backgrounds/alpine_bg_dark_sign.jpg" &
+
+sh -c 'labwc --reconfigure; killall waybar; waybar &'
\ No newline at end of file
diff --git a/configs/labwc/scripts/alpine_light.sh b/configs/labwc/scripts/alpine_light.sh
new file mode 100644
index 0000000..e3d63e2
--- /dev/null
+++ b/configs/labwc/scripts/alpine_light.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+PALETTE="$HOME/.config/labwc/palettes/alpine/palette-light"
+
+BG_COLOR=$(sed -n '1p' "$PALETTE")
+SUB_BG_COLOR=$(sed -n '2p' "$PALETTE")
+ACCENT_COLOR=$(sed -n '3p' "$PALETTE")
+SUB_FG_COLOR=$(sed -n '4p' "$PALETTE")
+FG_COLOR=$(sed -n '5p' "$PALETTE")
+
+
+cat << EOF > "$HOME/.config/labwc/themerc-override"
+# цвет рамки active и inactive
+window.active.border.color: $FG_COLOR
+window.inactive.border.color: $BG_COLOR
+
+# цвет фона заголовка active и inactive
+window.active.title.bg.color: $FG_COLOR
+window.inactive.title.bg.color: $FG_COLOR
+
+# цвет текста заголовка окна
+window.active.label.text.color: $BG_COLOR
+window.inactive.label.text.color: $BG_COLOR
+
+# цвет иконок кнопок для АКТИВНОГО окна
+window.active.button.unpressed.image.color: $BG_COLOR
+
+# цвет иконок кнопок для НЕАКТИВНОГО окна
+window.inactive.button.image.color: $BG_COLOR
+EOF
+
+killall swaybg 2>/dev/null
+
+swaybg \
+ -m fill \
+ -i "$HOME/backgrounds/alpine_bg_light_sign.jpg" &
+
+sh -c 'labwc --reconfigure; killall waybar; waybar &'
\ No newline at end of file
diff --git a/configs/labwc/scripts/base_theme_light.sh b/configs/labwc/scripts/base_theme_light.sh
deleted file mode 100644
index 4b27676..0000000
--- a/configs/labwc/scripts/base_theme_light.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-cat << EOF > "$HOME/.config/labwc/themerc-override"
-# цвет рамки active и inactive
-window.active.border.color: #ECE7DD
-window.inactive.border.color: #141414
-
-# цвет фона заголовка active и inactive
-window.active.title.bg.color: #ECE7DD
-window.inactive.title.bg.color: #ECE7DD
-
-# цвет текста заголовка окна
-window.active.label.text.color: #141414
-window.inactive.label.text.color: #141414
-
-# цвет иконок кнопок для АКТИВНОГО окна
-window.active.button.unpressed.image.color: #141414
-
-# цвет иконок кнопок для НЕАКТИВНОГО окна (ОБЯЗАТЕЛЬНЫЙ КЛЮЧ LABWC)
-window.inactive.button.image.color: #141414
-EOF
-
-killall swaybg 2>/dev/null
-
-swaybg -m fill -i "$HOME/.config/labwc/backgrounds/voidlinux_bg_light.png" &
diff --git a/configs/labwc/labwc/shutdown b/configs/labwc/shutdown
similarity index 100%
rename from configs/labwc/labwc/shutdown
rename to configs/labwc/shutdown
diff --git a/configs/labwc/labwc/themerc-override b/configs/labwc/themerc-override
similarity index 100%
rename from configs/labwc/labwc/themerc-override
rename to configs/labwc/themerc-override
diff --git a/palettes/palette_pastel_dark b/palettes/palette_pastel_dark
deleted file mode 100644
index a5813f8..0000000
--- a/palettes/palette_pastel_dark
+++ /dev/null
@@ -1,5 +0,0 @@
-#cbb0e6
-#e6c2c2
-#e6c2c2
-#e6c2c2
-#e6c2c2
diff --git a/palettes/palette_pastel_light b/palettes/palette_pastel_light
deleted file mode 100644
index bdd0f1f..0000000
--- a/palettes/palette_pastel_light
+++ /dev/null
@@ -1,5 +0,0 @@
-#e6c2c2
-#e6c2c2
-#e6c2c2
-#e6c2c2
-#cbb0e6