8 files changed, 20 insertions, 79 deletions
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index 163101e2..af5c65d2 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -12,12 +12,13 @@ menu(){
   printf "5. view Monitors\n"
   printf "6. view Laptop-Keybinds\n"
   printf "7. view User-Settings\n"
-  printf "8. view Default-Settings\n"
-  printf "9. view Default-Keybinds\n"
+  printf "8. view Workspace-Rules\n"
+  printf "9. view Default-Settings\n"
+  printf "10. view Default-Keybinds\n"
 }
 
 main() {
-    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
+    choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
             kitty -e nano "$UserConfigs/ENVariables.conf"
@@ -41,9 +42,12 @@ main() {
             kitty -e nano "$UserConfigs/UserSettings.conf"
             ;;
         8)
+            kitty -e nano "$UserConfigs/WorkspaceRules.conf"
+            ;;
+		9)
             kitty -e nano "$configs/Settings.conf"
             ;;
-        9)
+        10)
             kitty -e nano "$configs/Keybinds.conf"
             ;;
         *)
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 16777f55..e3c79587 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -9,9 +9,11 @@ iDIR="$HOME/.config/swaync/icons"
 # Define menu options as an associative array
 declare -A menu_options=(
   ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio"
-  ["96.3 Easy Rock 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
-  ["Ghibli Music 🎻🎶"]="https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl"
+  ["Easy Rock 96.3 FM 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
+  ["Wish 107.5 FM 📻🎶"]="https://radio-stations-philippines.com/dwnu-1075-wish"
+  ["Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
   ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
+  ["Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
   ["Chillhop ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
   ["SmoothChill ☕️🎶"]="https://media-ssl.musicradio.com/SmoothChill"
   ["Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
@@ -26,7 +28,7 @@ notification() {
 
 # Main function
 main() {
-  choice=$(printf "%s\n" "${!menu_options[@]}" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -i -p "")
+  choice=$(printf "%s\n" "${!menu_options[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -p "")
 
   if [ -z "$choice" ]; then
     exit 1
diff --git a/config/hypr/UserScripts/Sounds.sh b/config/hypr/UserScripts/Sounds.sh
deleted file mode 100755
index 0d2bfff7..00000000
--- a/config/hypr/UserScripts/Sounds.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# This script is used to play system sounds.
-
-theme="freedesktop" # Set the theme for the system sounds.
-mute=false          # Set to true to mute the system sounds.
-
-# Mute individual sounds here.
-muteScreenshots=false
-muteVolume=false
-
-# Exit if the system sounds are muted.
-if [[ "$mute" = true ]]; then
-    exit 0
-fi
-
-# Choose the sound to play.
-if [[ "$1" == "--screenshot" ]]; then
-    if [[ "$muteScreenshots" = true ]]; then
-        exit 0
-    fi
-    soundoption="screen-capture.*"
-elif [[ "$1" == "--volume" ]]; then
-    if [[ "$muteVolume" = true ]]; then
-        exit 0
-    fi
-    soundoption="audio-volume-change.*"
-else
-    echo -e "Available sounds: --screenshot, --volume"
-    exit 0
-fi
-
-# Set the directory defaults for system sounds.
-userDIR="$HOME/.local/share/sounds"
-systemDIR="/usr/share/sounds"
-defaultTheme="freedesktop"
-
-# Prefer the user's theme, but use the system's if it doesn't exist.
-sDIR="$systemDIR/$defaultTheme"
-if [ -d "$userDIR/$theme" ]; then
-    sDIR="$userDIR/$theme"
-elif [ -d "$systemDIR/$theme" ]; then
-    sDIR="$systemDIR/$theme"
-fi
-
-# Get the theme that it inherits.
-iTheme=$(cat "$sDIR/index.theme" | grep -i "inherits" | cut -d "=" -f 2)
-iDIR="$sDIR/../$iTheme"
-
-# Find the sound file and play it.
-sound_file=$(find $sDIR/stereo -name "$soundoption" -print -quit)
-if ! test -f "$sound_file"; then
-    sound_file=$(find $iDIR/stereo -name "$soundoption" -print -quit)
-    if ! test -f "$sound_file"; then
-        sound_file=$(find $userDIR/$defaultTheme/stereo -name "$soundoption" -print -quit)
-        if ! test -f "$sound_file"; then
-            sound_file=$(find $systemDIR/$defaultTheme/stereo -name "$soundoption" -print -quit)
-            if ! test -f "$sound_file"; then
-                echo "Error: Sound file not found."
-                exit 1
-            fi
-        fi
-    fi
-fi
-pw-play "$sound_file"
diff --git a/config/hypr/UserScripts/WallpaperAutoChange.sh b/config/hypr/UserScripts/WallpaperAutoChange.sh
index 56f2ee05..e52b7e90 100755
--- a/config/hypr/UserScripts/WallpaperAutoChange.sh
+++ b/config/hypr/UserScripts/WallpaperAutoChange.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # source https://wiki.archlinux.org/title/Hyprland#Using_a_script_to_change_wallpaper_every_X_minutes
 
 # This script will randomly go through the files of a directory, setting it
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index f8cc54f9..52fc819d 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Script for Random Wallpaper ( CTRL ALT W)
 
 wallDIR="$HOME/Pictures/wallpapers"
@@ -17,7 +17,7 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
 
 
-swww query || swww init && swww img ${RANDOMPICS} $SWWW_PARAMS
+swww query || swww-daemon --format xrgb && swww img ${RANDOMPICS} $SWWW_PARAMS
 
 
 ${scriptsDir}/PywalSwww.sh
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 663fb540..de9c6546 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # This script for selecting wallpapers (SUPER W)
 
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
@@ -25,7 +25,7 @@ RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME="${#PICS[@]}. random"
 
 # Rofi command
-rofi_command="rofi -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
+rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
 menu() {
   for i in "${!PICS[@]}"; do
@@ -40,7 +40,7 @@ menu() {
   printf "$RANDOM_PIC_NAME\n"
 }
 
-swww query || swww init
+swww query || swww-daemon --format xrgb
 
 main() {
   choice=$(menu | ${rofi_command})
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index 413682e1..413682e1 100755..100644
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index 7057ed2e..46d2249e 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -5,7 +5,7 @@ file_extension=".zsh-theme"
 
 themes_array=($(find "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//"))
 
-rofi_command="rofi -dmenu -config ~/.config/rofi/config-zsh-theme.rasi"
+rofi_command="rofi -i -dmenu -config ~/.config/rofi/config-zsh-theme.rasi"
 
 menu() {
     for theme in "${themes_array[@]}"; do