Initial upload of various rofi themes

37 files changed, 536 insertions, 983 deletions

diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 3975f60f..ebcd2e6d 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -23,6 +23,8 @@ bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview'
 bind = $mainMod, Return, exec, $term  #terminal
 bind = $mainMod, T, exec, $files #file manager
 
+bind = $mainMod CTRL, R, exec, $scriptsDir/RofiThemeSelector.sh # modified Rofi Theme Selector
+
 bind = $mainMod ALT, C, exec, $UserScripts/RofiCalc.sh # calculator (qalculate)
 
 # pyprland
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index e0af9dce..c71fb166 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -9,6 +9,7 @@ tty=kitty
 # Paths to configuration directories
 configs="$HOME/.config/hypr/configs"
 UserConfigs="$HOME/.config/hypr/UserConfigs"
+rofi_theme="~/.config/rofi/config-edit.rasi"
 
 # Function to display the menu options
 menu() {
@@ -29,7 +30,7 @@ EOF
 
 # Main function to handle menu selection
 main() {
-    choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
+    choice=$(menu | rofi -i -dmenu -config $rofi_theme | cut -d. -f1)
     
     # Map choices to corresponding files
     case $choice in
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index 380f6b29..58241256 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -2,11 +2,11 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For Rofi Beats to play online Music or Locally save media files
 
-# Directory local music folder
+# Variables
 mDIR="$HOME/Music/"
-
-# Directory for icons
 iDIR="$HOME/.config/swaync/icons"
+rofi_theme="~/.config/rofi/config-rofi-Beats.rasi"
+rofi_theme_1="~/.config/rofi/config-rofi-Beats-menu.rasi"
 
 # Online Stations. Edit as required
 declare -A online_music=(
@@ -47,7 +47,7 @@ play_local_music() {
   populate_local_music
 
   # Prompt the user to select a song
-  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi)
+  choice=$(printf "%s\n" "${filenames[@]}" | rofi -i -dmenu -config $rofi_theme)
 
   if [ -z "$choice" ]; then
     exit 1
@@ -77,7 +77,7 @@ shuffle_local_music() {
 
 # Main function for playing online music
 play_online_music() {
-  choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi)
+  choice=$(printf "%s\n" "${!online_music[@]}" | rofi -i -dmenu -config $rofi_theme)
 
   if [ -z "$choice" ]; then
     exit 1
@@ -101,7 +101,7 @@ fi
 
 
 # Prompt the user to choose between local and online music
-user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats-menu.rasi)
+user_choice=$(printf "Play from Online Stations\nPlay from Music Folder\nShuffle Play from Music Folder" | rofi -dmenu -config $rofi_theme_1)
 
   case "$user_choice" in
     "Play from Music Folder")
diff --git a/config/hypr/UserScripts/RofiCalc.sh b/config/hypr/UserScripts/RofiCalc.sh
index cef80b81..7bef4b6c 100755
--- a/config/hypr/UserScripts/RofiCalc.sh
+++ b/config/hypr/UserScripts/RofiCalc.sh
@@ -3,7 +3,7 @@
 # /* Calculator (using qalculate) and rofi */
 # /* Submitted by: https://github.com/JosephArmas */
 
-rofi_config="$HOME/.config/rofi/config-calc.rasi"
+rofi_theme="$HOME/.config/rofi/config-calc.rasi"
 
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
@@ -15,8 +15,8 @@ fi
 while true; do
     result=$(
         rofi -i -dmenu \
-            -config "$rofi_config" \
-            -mesg "$result      =    $calc_result"
+            -config $rofi_theme \
+            -mesg "$result = $calc_result"
     )
 
     if [ $? -ne 0 ]; then
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 215fdf6f..2573f5e0 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -8,6 +8,7 @@ wallpaper_current="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current"
 wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
 focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}')
+rofi_theme="~/.config/rofi/config-wallpaper-effect.rasi"
 
 # Directory for swaync
 iDIR="$HOME/.config/swaync/images"
@@ -45,9 +46,7 @@ declare -A effects=(
 # Function to apply no effects
 no-effects() {
     swww img -o "$focused_monitor" "$wallpaper_current" $SWWW_PARAMS &&
-    # Wait for swww command to complete
     wait $!
-    # Run other commands after swww
     wallust run "$wallpaper_current" -s &&
     wait $!
     # Refresh rofi, waybar, wallust palettes
@@ -67,7 +66,7 @@ main() {
         [[ "$effect" != "No Effects" ]] && options+=("$effect")
     done
 
-    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -i -config ~/.config/rofi/config-wallpaper-effect.rasi)
+    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -i -config $rofi_theme)
 
     # Process user choice
     if [[ -n "$choice" ]]; then
@@ -77,16 +76,14 @@ main() {
             # Apply selected effect
             notify-send -u normal -i "$iDIR/ja.png"  "Applying:" "$choice effects"
             eval "${effects[$choice]}"
-            # Wait for effects to be applied
+
             sleep 1
-            # Execute swww command after image conversion
             swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
-            # Wait for swww command to complete
+
             sleep 2
-            # Wait for other commands to finish
+  
             wallust run "$wallpaper_output" -s &
-            # Wait for other commands to finish
-            sleep 0.5
+            sleep 1
             # Refresh rofi, waybar, wallust palettes
             "${SCRIPTSDIR}/Refresh.sh"
             notify-send -u low -i "$iDIR/ja.png" "$choice" "effects applied"
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 19bb145d..61253cb3 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -13,6 +13,7 @@ iDIR="$HOME/.config/swaync/images"
 iDIRi="$HOME/.config/swaync/icons"
 
 # variables
+rofi_theme="~/.config/rofi/config-wallpaper.rasi"
 focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{print name}')
 # swww transition config
 FPS=60
@@ -33,7 +34,7 @@ RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME=". random"
 
 # Rofi command
-rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
+rofi_command="rofi -i -show -dmenu -config $rofi_theme"
 
 # Sorting Wallpapers
 menu() {
diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh
index edfc2ecd..d43b6ff9 100755
--- a/config/hypr/UserScripts/ZshChangeTheme.sh
+++ b/config/hypr/UserScripts/ZshChangeTheme.sh
@@ -8,15 +8,16 @@
 themes_dir="$HOME/.oh-my-zsh/themes"
 file_extension=".zsh-theme"
 
-# Directory for swaync
+# Variables
 iDIR="$HOME/.config/swaync/images"
+rofi_theme="~/.config/rofi/config-zsh-theme.rasi"
 
 themes_array=($(find "$themes_dir" -type f -name "*$file_extension" -exec basename {} \; | sed -e "s/$file_extension//"))
 
 # Add "Random" option to the beginning of the array
 themes_array=("Random" "${themes_array[@]}")
 
-rofi_command="rofi -i -dmenu -config ~/.config/rofi/config-zsh-theme.rasi"
+rofi_command="rofi -i -dmenu -config $rofi_theme"
 
 menu() {
     for theme in "${themes_array[@]}"; do
@@ -29,7 +30,6 @@ main() {
 
     # if nothing selected, script won't change anything
     if [ -z "$choice" ]; then
-        notify-send -u low -i "$iDIR/ja.png" "No theme selected." "No changes made!"
         exit 0
     fi
 
diff --git a/config/hypr/scripts/Animations.sh b/config/hypr/scripts/Animations.sh
index 7789cb05..b4d368e9 100755
--- a/config/hypr/scripts/Animations.sh
+++ b/config/hypr/scripts/Animations.sh
@@ -12,23 +12,19 @@ iDIR="$HOME/.config/swaync/images"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
 animations_dir="$HOME/.config/hypr/animations"
 UserConfigs="$HOME/.config/hypr/UserConfigs"
+rofi_theme="~/.config/rofi/config-Animations.rasi"
 
 # list of animation files, sorted alphabetically with numbers first
 animations_list=$(find "$animations_dir" -maxdepth 1 -type f | sed 's/.*\///' | sed 's/\.conf$//' | sort -V)
 
 # Rofi Menu
-chosen_file=$(echo "$animations_list" | rofi -i -dmenu -config ~/.config/rofi/config-Animations.rasi)
+chosen_file=$(echo "$animations_list" | rofi -i -dmenu -config $rofi_theme)
 
 # Check if a file was selected
 if [[ -n "$chosen_file" ]]; then
-    # Find the full path of the chosen file
-    full_path="$animations_dir/$chosen_file.conf"
-    
-    cp "$full_path" "$UserConfigs/UserAnimations.conf"
-    
+    full_path="$animations_dir/$chosen_file.conf"    
+    cp "$full_path" "$UserConfigs/UserAnimations.conf"    
     notify-send -u low -i "$iDIR/ja.png" "$chosen_file" "Hyprland Animation Loaded"
-else
-    notify-send -u low -i "$iDIR/ja.png" "You chose NOT" "to apply other Hyprland animations"
 fi
 
 sleep 1
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index 13f90a9e..642adb82 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -2,6 +2,9 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Clipboard Manager. This script uses cliphist, rofi, and wl-copy.
 
+# Variables
+rofi_theme="~/.config/rofi/config-clipboard.rasi"
+
 # Actions:
 # CTRL Del to delete an entry
 # ALT Del to wipe clipboard contents
@@ -16,7 +19,7 @@ while true; do
         rofi -i -dmenu \
             -kb-custom-1 "Control-Delete" \
             -kb-custom-2 "Alt-Delete" \
-            -config ~/.config/rofi/config-clipboard.rasi < <(cliphist list)
+            -config $rofi_theme < <(cliphist list)
     )
 
     case "$?" in
diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh
index 9e01a7c3..f80211f5 100755
--- a/config/hypr/scripts/KeyBinds.sh
+++ b/config/hypr/scripts/KeyBinds.sh
@@ -14,6 +14,7 @@ fi
 KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf"
 USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf"
 LAPTOP_CONF="$HOME/.config/hypr/UserConfigs/Laptop.conf"
+rofi_theme="~/.config/rofi/config-keybinds.rasi"
 
 # Combine the contents of the keybinds files and filter for keybinds
 KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|binde|bindm)')
@@ -31,4 +32,4 @@ if [[ -z "$KEYBINDS" ]]; then
 fi
 
 # Use rofi to display the keybinds
-echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi
\ No newline at end of file
+echo "$KEYBINDS" | rofi -dmenu -i -config $rofi_theme
\ No newline at end of file
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index fa27a341..1079bfdd 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -2,13 +2,16 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi Emoticons. Not my own. Cant remember the source
 
+# Variables
+rofi_theme="~/.config/rofi/config-emoji.rasi"
+
 # Check if rofi is already running
 if pidof rofi > /dev/null; then
   pkill rofi
 fi
 
 sed '1,/^# # DATA # #$/d' "$0" | \
-rofi -i -dmenu -config ~/.config/rofi/config-emoji.rasi | \
+rofi -i -dmenu -config $rofi_theme | \
 awk -F'\t' '{print $1}' | \
 tr -d '\n' | \
 wl-copy
diff --git a/config/hypr/scripts/RofiSearch.sh b/config/hypr/scripts/RofiSearch.sh
index faf07865..d9576a1a 100755
--- a/config/hypr/scripts/RofiSearch.sh
+++ b/config/hypr/scripts/RofiSearch.sh
@@ -4,7 +4,7 @@
 
 # Opens rofi in dmenu mod and waits for input. Then pushes the input to the query of the URL.
 
-rofi_config="$HOME/.config/rofi/config-search.rasi"
+rofi_theme="$HOME/.config/rofi/config-search.rasi"
     
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
@@ -13,5 +13,6 @@ if pgrep -x "rofi" >/dev/null; then
 fi
 
 # Open rofi with a dmenu and pass the selected item to xdg-open for Google search
-echo "" | rofi -dmenu -config "$rofi_config" | xargs -I{} xdg-open "https://www.google.com/search?q={}"
+#echo "" | rofi -dmenu -config "$rofi_config" | xargs -I{} xdg-open "https://www.google.com/search?q={}"
 
+echo "" | rofi -dmenu -config $rofi_theme | xargs -I{} xdg-open "https://www.google.com/search?q={}"
diff --git a/config/hypr/scripts/RofiThemeSelector.sh b/config/hypr/scripts/RofiThemeSelector.sh
new file mode 100755
index 00000000..420316bd
--- /dev/null
+++ b/config/hypr/scripts/RofiThemeSelector.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Script for adding a selected theme to the Rofi config
+
+IFS=$'\n\t'
+
+# Define directories and variables
+rofi_theme_dir="$HOME/.local/share/rofi/themes"
+rofi_config_file="$HOME/.config/rofi/config.rasi"
+SED=$(which sed)
+iDIR="$HOME/.config/swaync/images"
+rofi_theme="$HOME/.config/rofi/config-rofi-theme.rasi"
+
+# Function to display menu options
+menu() {
+    options=()
+    while IFS= read -r file; do
+        options+=("$(basename "$file")")
+    done < <(find "$rofi_theme_dir" -maxdepth 1 -type f -exec basename {} \; | sort)
+
+    printf '%s\n' "${options[@]}"
+}
+
+# Function to add or update theme in the config.rasi
+add_theme_to_config() {
+    local theme_name="$1"
+    local theme_path="$rofi_theme_dir/$theme_name"
+    
+    # if config in $HOME to write as $HOME 
+    if [[ "$theme_path" == $HOME/* ]]; then
+        theme_path_with_tilde="~${theme_path#$HOME}"
+    else
+        theme_path_with_tilde="$theme_path"
+    fi
+
+    # If no @theme is in the file, add it
+    if ! grep -q '^\s*@theme' "$rofi_config_file"; then
+        echo -e "\n\n@theme \"$theme_path_with_tilde\"" >> "$rofi_config_file"
+        echo "Added @theme \"$theme_path_with_tilde\" to $rofi_config_file"
+    else
+        $SED -i "s/^\(\s*@theme.*\)/\/\/\1/" "$rofi_config_file"
+        echo -e "@theme \"$theme_path_with_tilde\"" >> "$rofi_config_file"
+        echo "Updated @theme line to $theme_path_with_tilde"
+    fi
+
+    # Ensure no more than max # of lines with //@theme lines
+    max_line="9"
+    total_lines=$(grep -c '^\s*//@theme' "$rofi_config_file")
+
+    if [ "$total_lines" -gt "$max_line" ]; then
+        excess=$((total_lines - max_line))
+        # Remove the oldest or the very top //@theme lines
+        for i in $(seq 1 "$excess"); do
+            $SED -i '0,/^\s*\/\/@theme/ { /^\s*\/\/@theme/ {d; q; }}' "$rofi_config_file"
+        done
+        echo "Removed excess //@theme lines"
+    fi
+}
+
+# Main function
+main() {
+    choice=$(menu | rofi rofi -dmenu -i -config $rofi_theme)
+
+    if [[ -z "$choice" ]]; then
+        exit 0
+    fi
+    add_theme_to_config "$choice"
+    notify-send -i "$iDIR/ja.png" -u low 'Rofi Theme' "$choice applied."
+}
+
+if pgrep -x "rofi" >/dev/null; then
+    pkill rofi
+fi
+
+main
diff --git a/config/hypr/v2.3.10 b/config/hypr/v2.3.11
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.10
+++ b/config/hypr/v2.3.11
diff --git a/config/rofi/config-Animations.rasi b/config/rofi/config-Animations.rasi
index 2064cd1b..7ce1c9f5 100644
--- a/config/rofi/config-Animations.rasi
+++ b/config/rofi/config-Animations.rasi
@@ -1,20 +1,40 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Rofi Beats Config (compact) */
+/* Animations Menu */
+
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
-@import "~/.config/rofi/config-compact.rasi" 
 
 /* ---- Window ---- */
 window {
-  width:	35%;
+  width:	30%;
 }
 
 /* ---- Entry ---- */ 
 entry {
-  width: 25%;
-  placeholder: " ✨ Choose which Animations to load";
+  width: 28%;
+  placeholder: " ✨ Search / Choose which Animations to load";
 }
 
 /* ---- Listview ---- */
 listview {
-  lines: 10;
+    columns: 2;
+    lines: 9;
+    fixed-height: false;
+    margin: 10px;
+}
+
+/* ---- Elements ---- */
+element-icon {
+  	size: 0%;
 }
+element-text {
+    horizontal-align: 0.0;
+    vertical-align: 0.0;
+    margin: 5px 30px 5px 30px;
+}
\ No newline at end of file
diff --git a/config/rofi/config-calc.rasi b/config/rofi/config-calc.rasi
index 54653491..61be7642 100644
--- a/config/rofi/config-calc.rasi
+++ b/config/rofi/config-calc.rasi
@@ -2,21 +2,23 @@
 /* Main Config Calculator */
 /* Submitted by: https://github.com/JosephArmas */
 
-@import "~/.config/rofi/master-config.rasi" 
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Mainbox ---- */
+mainbox {
+  children: [ "entry", "message" ];
+}
+
 
 /* ---- Entry ---- */
 entry {
-  width: 27%;
+  expand: true;
   placeholder: " 🧮 Calculate";
 }
 
-/* ---- Window ---- */
-window {
-    width:	30%;
+textbox {
+    padding: 12px;
+    border-radius: 10px;
 }
 
-/* ---- Message ---- */
-textbox {
-    background-color:            @selected;
-    text-color:                  @background;
-}
\ No newline at end of file
+listview {enable: false;}
\ No newline at end of file
diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi
index 7c6dd91e..648a96af 100644
--- a/config/rofi/config-clipboard.rasi
+++ b/config/rofi/config-clipboard.rasi
@@ -1,16 +1,42 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Clipboard Config - Clipboard */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
+
+/* ---- Window ---- */
+window {
+  width: 45%;
+}
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */
 entry {
-  width: 37%;
-  placeholder: " 📋 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe";
+  width: 42%;
+  placeholder: " 📋 Search  Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe";
 }
 
 /* ---- Listview ---- */
 listview {
   columns: 1;
   lines: 8;
-}
\ No newline at end of file
+  fixed-height: false;
+}
+
+/* ---- Elements ---- */
+element {
+  orientation: horizontal;
+}
+
+element-icon {
+  size: 0%;
+}
+
+element-text {
+  horizontal-align: 0.0;
+  vertical-align: 0.5;
+}
diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi
deleted file mode 100644
index 0887a936..00000000
--- a/config/rofi/config-compact.rasi
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (compact) */
-
-@import "~/.config/rofi/master-config.rasi"  
-
-/* ---- Configuration ---- */ 
-configuration {
-  modi: "drun";
-}
-
-/* ---- Window ---- */
-window {
-  width: 50%;
-  border-radius: 15px;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-  background-image: url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-  orientation: vertical;
-  children: [ "entry", "listview"];
-}
-
-/* ---- Entry input ---- */
-entry {
-  width: 23%;
-  placeholder: " 👀  View / Edit Hyprland Configs";
-}
-
-/* ---- Listview ---- */
-listview {
-  spacing: 4px;
-  border-radius: 12px;
-}
-
-/* ---- Element ---- */
-element {
-  border-radius: 10px;
-}
diff --git a/config/rofi/config-edit.rasi b/config/rofi/config-edit.rasi
new file mode 100644
index 00000000..568de812
--- /dev/null
+++ b/config/rofi/config-edit.rasi
@@ -0,0 +1,49 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config (compact) */
+
+@import "~/.config/rofi/config.rasi"  
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
+
+
+/* ---- Configuration ---- */ 
+configuration {
+  modi: "drun";
+}
+
+/* ---- Window ---- */
+window {
+    width: 45%;
+}
+
+
+/* ---- Listview ---- */
+listview {
+    columns: 2;
+    lines: 6;
+    fixed-height: false;
+}
+
+/* ---- Entry input ---- */
+entry {
+  expand: true;
+  placeholder: " 👀  View / Edit KooL Hyprland Configs";
+}
+
+
+/* ---- Elements ---- */
+element {
+  orientation: horizontal;
+}
+
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align:            0.0;
+    margin: 5px 30px 5px 30px;
+}
\ No newline at end of file
diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi
index 39eab54c..0f98892f 100644
--- a/config/rofi/config-emoji.rasi
+++ b/config/rofi/config-emoji.rasi
@@ -1,16 +1,38 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config - emoji */
 
-@import "~/.config/rofi/master-config.rasi" 
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */
 entry {
   width: 37%;
-  placeholder: " 💫 Search Emoji's  **note** 👀 Click or Return to choose | Ctrl V to Paste";
+  placeholder: " 💫 Search / Choose Emoji's  **note** 👀 Click or Return to choose | Ctrl V to Paste";
+  horizontal-align: 0.0;
 }
 
 /* ---- Listview ---- */
 listview {
   columns: 1;
   lines: 8;
+  fixed-height: false;
+}
+
+/* ---- Elements ---- */
+element {
+  orientation: horizontal;
+}
+
+element-icon {
+  size: 0%;
+}
+
+element-text {
+  horizontal-align: 0.0;
+  vertical-align: 0.5;
 }
\ No newline at end of file
diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi
index 206928cb..6c8e2d5a 100644
--- a/config/rofi/config-keybinds.rasi
+++ b/config/rofi/config-keybinds.rasi
@@ -1,11 +1,18 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config - For Keybinds generation */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
+
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */
 entry {
-  width: 85%;
+  expand: true;
   placeholder: " 🧮 Search Keybinds      ☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function";
 }
 
@@ -13,8 +20,23 @@ entry {
 listview {
   columns: 2;
   lines: 12;
+  fixed-height: false;
 }
 
 window {
-    width: 95%;
+    width: 90%;
+}
+
+/* ---- Elements ---- */
+element {
+  orientation: horizontal;
+}
+
+element-icon {
+  	size: 0%;
+}
+
+element-text {
+    horizontal-align: 0.0;
+    vertical-align: 0.5;
 }
\ No newline at end of file
diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi
index 3e29881e..bcb45ac2 100644
--- a/config/rofi/config-rofi-Beats-menu.rasi
+++ b/config/rofi/config-rofi-Beats-menu.rasi
@@ -1,22 +1,37 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main config Rofi Beats Config (compact) */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */ 
 entry {
-  width: 20%;
+  expand: true;
   placeholder: " 📻 Choose Music Source";
 }
 
 /* ---- Window ---- */
 window {
-  width: 24%;
+  width: 20%;
 }
 
 /* ---- Listview ---- */
 listview {
   fixed-columns: false;
+  scrollbar: false;
   colums: 1;
   lines: 3;
 }
+
+/* ---- Element ---- */
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align: 0.5;
+}
\ No newline at end of file
diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi
index 97bb9643..a674fa3a 100644
--- a/config/rofi/config-rofi-Beats.rasi
+++ b/config/rofi/config-rofi-Beats.rasi
@@ -1,7 +1,13 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Rofi Beats Config (compact) */
 
-@import "~/.config/rofi/config-compact.rasi" 
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */ 
 entry {
@@ -10,5 +16,22 @@ entry {
 
 /* ---- Listview ---- */
 listview {
-  lines: 7;
+    columns: 2;
+    lines: 8;
+    fixed-height: false;
+    margin: 10px;
+}
+
+/* ---- Elements ---- */
+element {
+  orientation: horizontal;
 }
+
+element-icon {
+  size: 0%;
+}
+
+element-text {
+  horizontal-align: 0.0;
+  vertical-align: 0.5;
+}
\ No newline at end of file
diff --git a/config/rofi/config-rofi-theme.rasi b/config/rofi/config-rofi-theme.rasi
new file mode 100644
index 00000000..531a2c2c
--- /dev/null
+++ b/config/rofi/config-rofi-theme.rasi
@@ -0,0 +1,43 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config Rofi Theme */
+
+@import "~/.config/rofi/config.rasi"  
+
+
+/* ---- Window ---- */
+window {
+    width: 45%;
+}
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
+
+/* ---- Listview ---- */
+listview {
+    columns: 2;
+    lines: 8;
+    fixed-height: false;
+}
+
+/* ---- Entry input ---- */
+entry {
+  expand: true;
+  placeholder: " ⬇️  Select Which Rofi Theme wanted to apply";
+}
+
+
+/* ---- Elements ---- */
+element {
+  orientation: vertical;
+}
+
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align: 0.0;
+    margin: 5px 30px 5px 30px;
+}
diff --git a/config/rofi/config-search.rasi b/config/rofi/config-search.rasi
index 70cb08f1..b216d0a6 100644
--- a/config/rofi/config-search.rasi
+++ b/config/rofi/config-search.rasi
@@ -1,28 +1,25 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Rofi Config for Google Search) */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
 
 /* ---- Window ---- */
 window {
 	width: 40%;
+	height: inherit;
+	background-color: inherit;
+	text-color: inherit;
     y-offset: 6px;
     location: north;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled: true;
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-	padding: 0px;
-    children: [ "entry"];
+    children: [ "entry" ];
+    border: 2px;
+    border-color: white/50%;
 }
 
 /* ---- Entry ---- */ 
 entry {
 	placeholder: " 🔎 Google Search via web browser";
+	padding: 15px;
+	border: 0px;
 }
 
diff --git a/config/rofi/config-wallpaper-effect.rasi b/config/rofi/config-wallpaper-effect.rasi
index 684c00a2..0fb534e3 100644
--- a/config/rofi/config-wallpaper-effect.rasi
+++ b/config/rofi/config-wallpaper-effect.rasi
@@ -1,12 +1,19 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Wallpaper Effects */
 
-@import "~/.config/rofi/master-config.rasi" 
+@import "~/.config/rofi/config.rasi" 
+
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */ 
 entry {
   width: 20%;
-  placeholder: " 🏙️ Choose desired wallpaper effect";
+  placeholder: " 🏙️ Search / Choose desired wallpaper effect";
 }
 
 /* ---- Window ---- */
@@ -16,11 +23,23 @@ window {
 
 /* ---- Listview ---- */
 listview {
-  fixed-columns: false;
+  columns: 2;
   lines: 8;
+  fixed-height: false;
 }
 
 /* ---- Inputbar ---- */
 inputbar {
-    background-image: url("~/.config/hypr/wallpaper_effects/.wallpaper_modified", width);
+  background-image: url("~/.config/hypr/wallpaper_effects/.wallpaper_modified", width);
+}
+
+/* ---- Element ---- */
+element-icon {
+  size: 0%;
+}
+
+element-text {
+  horizontal-align: 0.0;
+  vertical-align: 0.0;
+  margin: 5px 30px 5px 30px;
 }
\ No newline at end of file
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 8665f6c0..eab47606 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config (wallpaper) */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
 
 /* ---- Configuration ---- */ 
 configuration {
@@ -12,17 +12,16 @@ window {
   width: 60%;
 }
 
-/* ---- Imagebox ---- */
-imagebox {
-  orientation: vertical;
+/* ---- Mainbox ---- */
+mainbox {
   children:
-    [ "entry", "listbox"];
+    [ "inputbar", "listview"];
 }
 
-
 entry {
-  expand: false;
-  placeholder: " 🎞️ Choose Wallpaper";
+  expand: true;
+  placeholder: " 🎞️ Search / Choose Wallpaper";
+  horizontal-align: 0.0;
 }
 
 /* ---- Listview ---- */
@@ -35,17 +34,13 @@ listview {
 /* ---- Element ---- */
 element {
   orientation: vertical;
-  padding: 0px;
-  spacing: 0px;
-  border-radius: 12px;
 }
 
 element-icon {
-  size: 15%;
+  size: 10%;
 }
 
 element-text {
-  font: "JetBrainsMono Nerd Font SemiBold 12";
   vertical-align: 0.5;
   horizontal-align: 0.5;
 }
diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi
index 4dd06a1c..cc24a170 100644
--- a/config/rofi/config-waybar-layout.rasi
+++ b/config/rofi/config-waybar-layout.rasi
@@ -1,10 +1,40 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Layout Config (Waybar) */
+/* Main Config (Waybar Layout) */
 
-@import "~/.config/rofi/config-waybar-style.rasi" 
+@import "~/.config/rofi/config.rasi" 
+
+
+
+/* ---- Configuration ---- */
+configuration {
+  modi: "drun";
+}
+
+/* ---- Mainbox ---- */
+mainbox {
+  children:
+    [ "inputbar", "listview"];
+}
 
 /* ---- Entry ---- */ 
 entry {
-  placeholder: " 🖼️ Choose Waybar Layout";
+  expand: true;
+  placeholder: " 🖼️ Search / Choose Waybar Layout";
+}
+
+/* ---- Listview ---- */
+listview {
+    columns: 2;
+    lines: 9;
+    fixed-height: false;
+    margin: 10px;
 }
 
+/* ---- Elements ---- */
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align: 0.0;
+    margin: 5px 30px 5px 30px;
+}
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index ee23793f..bfb3829a 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -1,12 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (waybar) */
+/* Main Config (waybar style) */
 
-@import "~/.config/rofi/master-config.rasi" 
-
-/* ---- Configuration ---- */
-configuration {
-  modi: "drun";
-}
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Mainbox ---- */
 mainbox {
@@ -14,8 +9,31 @@ mainbox {
     [ "inputbar", "listview"];
 }
 
+/* ---- Configuration ---- */
+configuration {
+  modi: "drun";
+}
+
+/* ---- Entry ---- */ 
 entry {
   expand: true;
-  placeholder: " 🖼️  Choose Waybar Style";
+  placeholder: " 🖼️  Search / Choose Waybar Style";
 }
 
+
+/* ---- Listview ---- */
+listview {
+    columns: 2;
+    lines: 9;
+    fixed-height: false;
+    margin: 10px;
+}
+
+/* ---- Elements ---- */
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align: 0.0;
+    margin: 5px 30px 5px 30px;
+}
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index b3aff7e8..c2293b4e 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (compact) */
+/* Oh My ZSH Theme */
 
-@import "~/.config/rofi/master-config.rasi"  
+@import "~/.config/rofi/config.rasi"  
 
 /* ---- Configuration ---- */ 
 configuration {
@@ -14,13 +14,11 @@ window {
   border-radius: 15px;
 }
 
-/* ---- Imagebox ---- */
-imagebox {
-  orientation: vertical;
-  children:
-    [ "inputbar", "listbox"];
+mainbox {
+    children: [ "inputbar" , "listview" ];
 }
 
+
 /* ---- Listbox ---- */
 listbox {
   border-radius: 12px;
@@ -33,7 +31,8 @@ inputbar {
 }
 
 entry {
-  placeholder: " 󰸉  Choose ZSH theme";
+  expand: true;
+  placeholder: " 🪟  Search / Choose ZSH theme";
 }
 
 /* ---- Listview ---- */
@@ -46,7 +45,7 @@ listview {
 
 /* ---- Element ---- */
 element {
-  border-radius: 10px;
+  orientation: horizontal;
 }
 
 /* ---- Message ---- */
@@ -57,3 +56,12 @@ message {
 textbox {
   padding: 15px;
 }
+
+/* ---- Element ---- */
+element-icon {
+  	size: 0%;
+}
+element-text {
+    horizontal-align: 0.0;
+    margin: 5px 30px 5px 30px;
+}
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index eca05ea6..51a70f2c 100755..100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -1,31 +1,18 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config 1080p */
+/* Ja KooLit - Default 
 
-@import "~/.config/rofi/master-config.rasi" 
+* All main themes or configs are located in ~/.local/share/rofi/themes 
+* If you want to edit the config, that is where you should edit NOT here 
 
-/* ---- Window ---- */
-window {
-    width:	50%;
-}
-/* ---- Listview ---- */
-listview {
-  columns: 5;
-  lines: 5;
-  fixed-height:	true;
-}
+* To load a new theme, manually edit the file path below or choose desired theme via rofi theme selector 
 
-/* ---- Element ---- */
-element {
-  orientation: vertical;
-  padding: 10px 5px 10px 5px;
-  spacing: 6px;
-}
+* Alternative way to Load (preferred) own cooked by Ja 
+* SUPER CTRL R - Choose style 
 
-element-icon {
-  size: 3%;
-}
+* TIPS 
+* If you have edited a config, rename it with a unique name. During update, the contents of 
+* ~/.local/share/rofi/themes will be replaced. However, it wont overwrite your own config if you
+* renamed with your own unique file name */
 
-element-text {
-  font: "JetBrainsMono Nerd Font SemiBold 10";
-  horizontal-align: 0.5;
-}
\ No newline at end of file
+
+@theme "~/.local/share/rofi/themes/KooL_style-2-Dark.rasi"
diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi
deleted file mode 100644
index 09032268..00000000
--- a/config/rofi/master-config.rasi
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Master Config 1080p*/
-
-/* ---- Configuration ---- */
-
-configuration {
-    font:                       "JetBrainsMono Nerd Font SemiBold 12";
-    modi:                       "drun,run,filebrowser";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-    drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-    dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons background
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     3px 0px 3px 0px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 12px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 50px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 " 🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   true;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    border:       				0;
-    handle-color: 				@background-alt;
-    handle-width: 				2px ;
-    padding:      				0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-  	padding: 					 10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    border:                      0px 3px 0px 3px;
-    border-radius:               16px;
-    border-color:                @selected;
-    background-color:            transparent;
-    text-color:                  @background-alt;
-}
-
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-}
-element-text {
-    font:						"JetBrainsMono Nerd Font SemiBold 12";
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
deleted file mode 100755
index eca05ea6..00000000
--- a/config/rofi/resolution/1080p/config.rasi
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config 1080p */
-
-@import "~/.config/rofi/master-config.rasi" 
-
-/* ---- Window ---- */
-window {
-    width:	50%;
-}
-/* ---- Listview ---- */
-listview {
-  columns: 5;
-  lines: 5;
-  fixed-height:	true;
-}
-
-/* ---- Element ---- */
-element {
-  orientation: vertical;
-  padding: 10px 5px 10px 5px;
-  spacing: 6px;
-}
-
-element-icon {
-  size: 3%;
-}
-
-element-text {
-  font: "JetBrainsMono Nerd Font SemiBold 10";
-  horizontal-align: 0.5;
-}
\ No newline at end of file
diff --git a/config/rofi/resolution/1080p/master-config.rasi b/config/rofi/resolution/1080p/master-config.rasi
deleted file mode 100644
index 09032268..00000000
--- a/config/rofi/resolution/1080p/master-config.rasi
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Master Config 1080p*/
-
-/* ---- Configuration ---- */
-
-configuration {
-    font:                       "JetBrainsMono Nerd Font SemiBold 12";
-    modi:                       "drun,run,filebrowser";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-    drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-    dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons background
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     3px 0px 3px 0px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 12px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 50px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 " 🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   true;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    border:       				0;
-    handle-color: 				@background-alt;
-    handle-width: 				2px ;
-    padding:      				0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-  	padding: 					 10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    border:                      0px 3px 0px 3px;
-    border-radius:               16px;
-    border-color:                @selected;
-    background-color:            transparent;
-    text-color:                  @background-alt;
-}
-
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-}
-element-text {
-    font:						"JetBrainsMono Nerd Font SemiBold 12";
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
deleted file mode 100755
index 768fcec1..00000000
--- a/config/rofi/resolution/1440p/config.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config 1440p */
-
-@import "~/.config/rofi/master-config.rasi" 
-
-/* ---- Window ---- */
-window {
-  width:	50%;
-}
-
-/* ---- Mode Switcher ---- */
-button {
-  width:	110px;
-}
-
-/* ---- Listview ---- */
-listview {
-  columns: 5;
-  lines: 5;
-  fixed-height:	true;
-}
-
-/* ---- Element ---- */
-element {
-  orientation: vertical;
-  padding: 10px 5px 10px 5px;
-  spacing: 6px;
-}
-
-element-icon {
-  size: 3%;
-}
-
-element-text {
-  font: "JetBrainsMono Nerd Font SemiBold 12";
-  horizontal-align: 0.5;
-}
diff --git a/config/rofi/resolution/1440p/master-config.rasi b/config/rofi/resolution/1440p/master-config.rasi
deleted file mode 100644
index 96cb83a1..00000000
--- a/config/rofi/resolution/1440p/master-config.rasi
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Master Config 1440p*/
-
-/* ---- Configuration ---- */
-
-configuration {
-    font:                       "JetBrainsMono Nerd Font SemiBold 12";
-    modi:                       "drun,run,filebrowser";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-    drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-    dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons background
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     3px 0px 3px 0px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 12px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 50px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               20px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 " 🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   true;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    border:       				0;
-    handle-color: 				@background-alt;
-    handle-width: 				2px ;
-    padding:      				0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-  	padding: 					 10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    border:                      0px 3px 0px 3px;
-    border-radius:               16px;
-    border-color:                @selected;
-    background-color:            transparent;
-    text-color:                  @background-alt;
-}
-
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-}
-element-text {
-    font:						"JetBrainsMono Nerd Font SemiBold 14";
-    background-color:            transparent;
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi
index 536bcdc6..b54ab670 100644
--- a/config/rofi/wallust/colors-rofi.rasi
+++ b/config/rofi/wallust/colors-rofi.rasi
@@ -2,30 +2,49 @@
  /* wallust template - colors-rofi */
 
 * {
-active-background: #20211D;
-active-foreground: #ACF2F1;
-normal-background: #1E1516;
-normal-foreground: #ACF2F1;
-urgent-background: #135C7D;
-urgent-foreground: #ACF2F1;
+active-background: #718A90;
+active-foreground: #ABF1E1;
+normal-background: #212826;
+normal-foreground: #ABF1E1;
+urgent-background: #44AE9B;
+urgent-foreground: #ABF1E1;
 
-alternate-active-background: #0D942F;
-alternate-active-foreground: #ACF2F1;
-alternate-normal-background: #1E1516;
-alternate-normal-foreground: #ACF2F1;
-alternate-urgent-background: #1E1516;
-alternate-urgent-foreground: #ACF2F1;
+alternate-active-background: #78858E;
+alternate-active-foreground: #ABF1E1;
+alternate-normal-background: #212826;
+alternate-normal-foreground: #ABF1E1;
+alternate-urgent-background: #212826;
+alternate-urgent-foreground: #ABF1E1;
 
-selected-active-background: #20211D;
-selected-active-foreground: #ACF2F1;
-selected-normal-background: #80E4E2;
-selected-normal-foreground: #ACF2F1;
-selected-urgent-background: #135C7D;
-selected-urgent-foreground: #ACF2F1;
+selected-active-background: #44AE9B;
+selected-active-foreground: #ABF1E1;
+selected-normal-background: #44AE9B;
+selected-normal-foreground: #ABF1E1;
+selected-urgent-background: #718A90;
+selected-urgent-foreground: #ABF1E1;
 
-background-color: #1E1516;
+background-color: #212826;
 background: rgba(0,0,0,0.7);
-foreground: #80E4E2;
-border-color: #20211D;
+foreground: #ABF1E1;
+border-color: #718A90;
+
+color0: #464D4C;
+color1: #02211D;
+color2: #02613F;
+color3: #5A646A;
+color4: #55686C;
+color5: #338375;
+color6: #0CA27F;
+color7: #7FE3CC;
+color8: #599F8E;
+color9: #022C27;
+color10: #028154;
+color11: #78858E;
+color12: #718A90;
+color13: #44AE9B;
+color14: #10D8A9;
+color15: #7FE3CC;
+
+
 }