Merge pull request #233 from JaKooLit/development

V2.2.10 Changes

109 files changed, 976 insertions, 6134 deletions

diff --git a/README.md b/README.md
index 55cf6c74..7d75dab4 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/4bebe592-ca43-4962-9b5
 - [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_&_Update) 
 > [!Note] 
 > The auto copy script will create backups of intended folders to be copied. However, still a good idea to manually backup just incase script failed to backup!
-- ~/.config (btop cava hypr kitty rofi swappy swaylock swaync waybar wlogout) - These are folders to be copied.
+- ~/.config (btop cava hypr kitty rofi swappy swaync waybar wlogout) - These are folders to be copied.
 - ~/Pictures/wallpapers - Will be backed up
 - clone this repo by using git. Change directory, make executable and run the script
 ```bash
@@ -88,6 +88,7 @@ chmod +x upgrade.sh
 
 + Nvidia Owners. Make sure to edit your `~/.config/hypr/UserConfigs/ENVariables.conf` (recommended). Below env's will be activated if automatic copy is used
 > WLR_NO_CURSORS,1 , LIBVA_DRIVER_NAME,nvidia ,  __GLX_VENDOR_LIBRARY_NAME,nvidia 
+- NVIDIA users / owners, after installation, check [`THIS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Notes_to_remember#--for-nvidia-gpu-users)
 
 + If you have already set your own keybinds, monitors, etc.... Just copy over from backup created before log-out or reboot. (recommended)
 
diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index b9d20480..1d60c24b 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -5,7 +5,8 @@ env = CLUTTER_BACKEND,wayland
 env = GDK_BACKEND,wayland,x11
 env = QT_AUTO_SCREEN_SCALE_FACTOR,1
 env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt5ct  
+env = QT_QPA_PLATFORMTHEME,qt5ct
+env = QT_QPA_PLATFORMTHEME,qt6ct   
 env = QT_SCALE_FACTOR,1
 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
 env = XDG_CURRENT_DESKTOP,Hyprland
diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 86e40ba9..8b5ed9f8 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -32,10 +32,13 @@ exec-once = wl-paste --type text --watch cliphist store
 exec-once = wl-paste --type image --watch cliphist store
 
 # Rainbow borders
-exec-once = $UserScripts/RainbowBorders.sh
+exec-once = $UserScripts/RainbowBorders.sh &
 
 # Starting hypridle to start hyprlock
-exec-once = hypridle
+exec-once = hypridle &
+
+# Start pyprland daemon
+exec-once = pypr &
 
 # Here are list of features available but disabled by default
 # exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 41b61456..7ffd702e 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -12,12 +12,16 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $UserScripts = $HOME/.config/hypr/UserScripts
 
 # rofi App launcher
-bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
+#bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
 bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
 
 bind = $mainMod, Return, exec, $term  # Launch terminal
 bind = $mainMod, T, exec, $files
 
+# pyprland
+bind = $mainMod SHIFT, Return, exec, pypr toggle term # Dropdown terminal
+bind = $mainMod, Z, exec, pypr zoom # Toggle Zoom
+
 # User Added Keybinds
 bind = $mainMod SHIFT, O, exec, $UserScripts/ZshChangeTheme.sh # Change oh-my-zsh theme
 
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 6c801f7f..da8ec4ed 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -52,6 +52,7 @@ decoration {
 
   dim_inactive = true
   dim_strength = 0.1
+  dim_special = 0.8
 
   drop_shadow=true
   shadow_range=6
@@ -65,6 +66,7 @@ decoration {
   passes = 2
   ignore_opacity = true
   new_optimizations = true
+  special = true
   }
 }
     
@@ -100,30 +102,30 @@ input {
   kb_rules=
   repeat_rate=50
   repeat_delay=300
-  numlock_by_default=1
-  left_handed=0
-  follow_mouse=1
-  float_switch_override_focus=0
+  numlock_by_default=true
+  left_handed=false
+  follow_mouse=true
+  float_switch_override_focus=false
 
   touchpad {
-    disable_while_typing=1
-    natural_scroll=0 
-    clickfinger_behavior=0
-    middle_button_emulation=1
-    tap-to-click=1
-    drag_lock=0
+    disable_while_typing=true
+    natural_scroll=false 
+    clickfinger_behavior=false
+    middle_button_emulation=true
+    tap-to-click=true
+    drag_lock=false
           }
 }
 
 gestures {
-  workspace_swipe=1
+  workspace_swipe=true
   workspace_swipe_fingers=3
   workspace_swipe_distance=400
-  workspace_swipe_invert=1
+  workspace_swipe_invert=true
   workspace_swipe_min_speed_to_force=30
   workspace_swipe_cancel_ratio=0.5
-  workspace_swipe_create_new=1 
-  workspace_swipe_forever=1
+  workspace_swipe_create_new=true 
+  workspace_swipe_forever=true
 }
 
 misc {
@@ -139,9 +141,9 @@ misc {
 }
 
 binds {
-  workspace_back_and_forth=1
-  allow_workspace_cycles=1
-  pass_mouse_when_bound=0
+  workspace_back_and_forth=true
+  allow_workspace_cycles=true
+  pass_mouse_when_bound=false
 }
 
 #Could help when scaling and not pixelating
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 720ddf02..68de90e4 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -14,7 +14,6 @@ windowrule = float, yad
 windowrule = float, ^(wihotspot-gui)$ # wifi hotspot
 windowrule = float, ^(evince)$ # document viewer
 windowrule = float, ^(file-roller)$ # archive manager
-
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
 #windowrule = workspace 6 silent,^(gamescope)$
@@ -36,6 +35,15 @@ windowrulev2 = workspace 7 silent, class:^(discord)$
 windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^([Aa]udacious)$
 
+# windowrule v2 - float
+windowrulev2 = float, class:([Tt]hunar), title:(File Operation Progress)
+windowrulev2 = float, class:([Tt]hunar), title:(Confirm to replace files)
+windowrulev2 = float, class:(xdg-desktop-portal-gtk)
+windowrulev2 = float, class:(org.gnome.Calculator), title:(Calculator)
+windowrulev2 = float, class:(codium), title:(Add Folder to Workspace)
+windowrulev2 = float, class:(codium-url-handler), title:(Add Folder to Workspace)
+windowrulev2 = float, class:(VSCodium), title:(Add Folder to Workspace)
+
 #opacity (transparent) #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser)$
@@ -43,6 +51,14 @@ windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser-dev)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox)$
 windowrulev2 = opacity 0.9 0.7, class:^(org.mozilla.firefox)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-stable)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-beta)$
+windowrulev2 = opacity 0.9 0.7, class:^([Mm]icrosoft-edge-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-beta)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-dev)$
+windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-unstable)$
+windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 windowrulev2 = opacity 0.9 0.8, class:^([Tt]hunar)$
 windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
 windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
@@ -55,11 +71,6 @@ windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
 windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 windowrulev2 = opacity 0.9 0.7, class:^(com.obsproject.Studio)$
 windowrulev2 = opacity 0.9 0.7, class:^([Aa]udacious)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-beta)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-dev)$
-windowrulev2 = opacity 0.9 0.8, class:^(google-chrome-unstable)$
-windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.Nautilus)$
 windowrulev2 = opacity 0.9 0.8, class:^(code-url-handler)$
 windowrulev2 = opacity 0.9 0.8, class:^(VSCode)$
@@ -70,6 +81,7 @@ windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks)$
 windowrulev2 = opacity 0.9 0.8, class:^(org.gnome.baobab)$
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
 
+
 #layerrule = unset,class:^([Rr]ofi)$
 #layerrule = blur,class:^([Rr]ofi)$
 #layerrule = ignorezero, <rofi>
diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf
new file mode 100644
index 00000000..8e98244a
--- /dev/null
+++ b/config/hypr/UserConfigs/WorkspaceRules.conf
@@ -0,0 +1,20 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+# You can set workspace rules to achieve workspace-specific behaviors. 
+# For instance, you can define a workspace where all windows are drawn without borders or gaps.
+
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+
+# Assigning workspace to a certain monitor
+# workspace = 1, monitor:eDP-1
+# workspace = 2, monitor:DP-2
+
+
+# example rules (from wiki)
+# workspace = 3, rounding:false, decorate:false
+# workspace = name:coding, rounding:false, decorate:false, gapsin:0, gapsout:0, border:false, decorate:false, monitor:DP-1
+# workspace = 8,bordersize:8
+# workspace = name:Hello, monitor:DP-1, default:true
+# workspace = name:gaming, monitor:desc:Chimei Innolux Corporation 0x150C, default:true
+# workspace = 5, on-created-empty:[float] firefox
+# workspace = special:scratchpad, on-created-empty:foot
\ No newline at end of file
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index 658d7b03..af5c65d2 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -12,8 +12,9 @@ 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() {
@@ -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/Weather.py b/config/hypr/UserScripts/Weather.py
index 2b13a977..14c9cfe0 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -1,122 +1,124 @@
 #!/usr/bin/env python3
-# From https://raw.githubusercontent.com/rxyhn/dotfiles/main/home/rxyhn/modules/desktop/waybar/scripts/waybar-wttr.py
 
-# ensure to insert city inside ""
-city = ""
+import subprocess
+from pyquery import PyQuery  # install using `pip install pyquery`
 import json
-import requests
-from datetime import datetime
 
-WEATHER_CODES = {
-    '113': '',
-    '116': '󰖕',
-    '119': '',
-    '122': '',
-    '143': '',
-    '176': '',
-    '179': '',
-    '182': '',
-    '185': '',
-    '200': '⛈️',
-    '227': '🌨️',
-    '230': '🌨️',
-    '248': '☁️ ',
-    '260': '☁️',
-    '263': '🌧️',
-    '266': '🌧️',
-    '281': '🌧️',
-    '284': '🌧️',
-    '293': '🌧️',
-    '296': '🌧️',
-    '299': '🌧️',
-    '302': '🌧️',
-    '305': '🌧️',
-    '308': '🌧️',
-    '311': '🌧️',
-    '314': '🌧️',
-    '317': '🌧️',
-    '320': '🌨️',
-    '323': '🌨️',
-    '326': '🌨️',
-    '329': '❄️',
-    '332': '❄️',
-    '335': '❄️',
-    '338': '❄️',
-    '350': '🌧️',
-    '353': '🌧️',
-    '356': '🌧️',
-    '359': '🌧️',
-    '362': '🌧️',
-    '365': '🌧️',
-    '368': '🌧️',
-    '371': '❄️',
-    '374': '🌨️',
-    '377': '🌨️',
-    '386': '🌨️',
-    '389': '🌨️',
-    '392': '🌧️',
-    '395': '❄️'
-}
 
-data = {}
+# original code https://gist.github.com/Surendrajat/ff3876fd2166dd86fb71180f4e9342d7
+# weather icons
+weather_icons = {
+    "sunnyDay": "",
+    "clearNight": "",
+    "cloudyFoggyDay": "",
+    "cloudyFoggyNight": "",
+    "rainyDay": "",
+    "rainyNight": "",
+    "snowyIcyDay": "",
+    "snowyIcyNight": "",
+    "severe": "",
+    "default": "",
+}
 
+# get location_id
+# to get your own location_id, go to https://weather.com & search your location.
+# once you choose your location, you can see the location_id in the URL(64 chars long hex string)
+# like this: https://weather.com/en-PH/weather/today/l/bca47d1099e762a012b9a139c36f30a0b1e647f69c0c4ac28b537e7ae9c1c200
+location_id = "bca47d1099e762a012b9a139c36f30a0b1e647f69c0c4ac28b537e7ae9c1c200"  # TODO
 
-weather = requests.get(f"https://wttr.in/{city}?format=j1").json()
+# NOTE to change to deg F, change the URL to your preffered location after weather.com
+# Default is English-Philippines with Busan, South Korea as location_id
+# get html page
+url = "https://weather.com/en-PH/weather/today/l/" + location_id
+html_data = PyQuery(url=url)
 
+# current temperature
+temp = html_data("span[data-testid='TemperatureValue']").eq(0).text()
+# print(temp)
 
-def format_time(time):
-    return time.replace("00", "").zfill(2)
+# current status phrase
+status = html_data("div[data-testid='wxPhrase']").text()
+status = f"{status[:16]}.." if len(status) > 17 else status
+# print(status)
 
+# status code
+status_code = html_data("#regionHeader").attr("class").split(" ")[2].split("-")[2]
+# print(status_code)
 
-def format_temp(temp):
-    return (hour['FeelsLikeC']+"°").ljust(3)
+# status icon
+icon = (
+    weather_icons[status_code]
+    if status_code in weather_icons
+    else weather_icons["default"]
+)
+# print(icon)
 
+# temperature feels like
+temp_feel = html_data(
+    "div[data-testid='FeelsLikeSection'] > span > span[data-testid='TemperatureValue']"
+).text()
+temp_feel_text = f"Feels like {temp_feel}c"
+# print(temp_feel_text)
 
-def format_chances(hour):
-    chances = {
-        "chanceoffog": "Fog",
-        "chanceoffrost": "Frost",
-        "chanceofovercast": "Overcast",
-        "chanceofrain": "Rain",
-        "chanceofsnow": "Snow",
-        "chanceofsunshine": "Sunshine",
-        "chanceofthunder": "Thunder",
-        "chanceofwindy": "Wind"
-    }
+# min-max temperature
+temp_min = (
+    html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
+    .eq(0)
+    .text()
+)
+temp_max = (
+    html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
+    .eq(1)
+    .text()
+)
+temp_min_max = f"  {temp_min}\t\t  {temp_max}"
+# print(temp_min_max)
 
-    conditions = []
-    for event in chances.keys():
-        if int(hour[event]) > 0:
-            conditions.append(chances[event]+" "+hour[event]+"%")
-    return ", ".join(conditions)
+# wind speed
+wind_speed = html_data("span[data-testid='Wind']").text().split("\n")[1]
+wind_text = f"煮  {wind_speed}"
+# print(wind_text)
 
-tempint = int(weather['current_condition'][0]['FeelsLikeC'])
-extrachar = ''
-if tempint > 0 and tempint < 10:
-    extrachar = '+'
+# humidity
+humidity = html_data("span[data-testid='PercentageValue']").text()
+humidity_text = f"  {humidity}"
+# print(humidity_text)
 
+# visibility
+visbility = html_data("span[data-testid='VisibilityValue']").text()
+visbility_text = f"  {visbility}"
+# print(visbility_text)
 
-data['text'] = ' '+WEATHER_CODES[weather['current_condition'][0]['weatherCode']] + \
-    " "+extrachar+weather['current_condition'][0]['FeelsLikeC']+"°"
+# air quality index
+air_quality_index = html_data("text[data-testid='DonutChartValue']").text()
+# print(air_quality_index)
 
-data['tooltip'] = f"<b>{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_C']}°</b>\n"
-data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeC']}°\n"
-data['tooltip'] += f"Wind: {weather['current_condition'][0]['windspeedKmph']}Km/h\n"
-data['tooltip'] += f"Humidity: {weather['current_condition'][0]['humidity']}%\n"
-for i, day in enumerate(weather['weather']):
-    data['tooltip'] += f"\n<b>"
-    if i == 0:
-        data['tooltip'] += "Today, "
-    if i == 1:
-        data['tooltip'] += "Tomorrow, "
-    data['tooltip'] += f"{day['date']}</b>\n"
-    data['tooltip'] += f"⬆️{day['maxtempC']}° ⬇️{day['mintempC']}° "
-    data['tooltip'] += f"🌅{day['astronomy'][0]['sunrise']} 🌇{day['astronomy'][0]['sunset']}\n"
-    for hour in day['hourly']:
-        if i == 0:
-            if int(format_time(hour['time'])) < datetime.now().hour-2:
-                continue
-        data['tooltip'] += f"{format_time(hour['time'])} {WEATHER_CODES[hour['weatherCode']]} {format_temp(hour['FeelsLikeC'])} {hour['weatherDesc'][0]['value']}, {format_chances(hour)}\n"
+# hourly rain prediction
+prediction = html_data("section[aria-label='Hourly Forecast']")(
+    "div[data-testid='SegmentPrecipPercentage'] > span"
+).text()
+prediction = prediction.replace("Chance of Rain", "")
+prediction = f"\n\n (hourly) {prediction}" if len(prediction) > 0 else prediction
+# print(prediction)
 
+# tooltip text
+tooltip_text = str.format(
+    "\t\t{}\t\t\n{}\n{}\n{}\n\n{}\n{}\n{}{}",
+    f'<span size="xx-large">{temp}</span>',
+    f"<big> {icon}</big>",
+    f"<b>{status}</b>",
+    f"<small>{temp_feel_text}</small>",
+    f"<b>{temp_min_max}</b>",
+    f"{wind_text}\t{humidity_text}",
+    f"{visbility_text}\tAQI {air_quality_index}",
+    f"<i> {prediction}</i>",
+)
 
-print(json.dumps(data))
+# print waybar module data
+out_data = {
+    "text": f"{icon} {temp}",
+    "alt": status,
+    "tooltip": tooltip_text,
+    "class": status_code,
+}
+print(json.dumps(out_data))
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 343b887b..a8ae26f4 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -16,4 +16,5 @@ source= $UserConfigs/Laptops.conf
 source= $UserConfigs/LaptopDisplay.conf
 source= $UserConfigs/WindowRules.conf
 source= $UserConfigs/UserKeybinds.conf
-source= $UserConfigs/UserSettings.conf
\ No newline at end of file
+source= $UserConfigs/UserSettings.conf
+source= $UserConfigs/WorkspaceRules.conf
\ No newline at end of file
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index b2a1a163..3aa029d9 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -47,7 +47,7 @@ input-field {
 label {
     monitor =
     text = cmd[update:18000000] echo "<b> "$(date +'%A, %-d %B %Y')" </b>"
-    color = $color5
+    color = $color1
     font_size = 34
     font_family = JetBrains Mono Nerd Font 10
 
@@ -63,7 +63,6 @@ label {
     color = $color7
     font_size = 24
     font_family = JetBrains Mono Nerd Font 10
-
     position = 0, -250
     halign = center
     valign = top
@@ -83,6 +82,7 @@ text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
     valign = center
 }
 
+# User
 label {
     monitor =
     text =    $USER
@@ -95,6 +95,7 @@ label {
     valign = bottom
 }
 
+# uptime
 label {
     monitor =
     text = cmd[update:60000] echo "<b> "$(uptime -p)" </b>"
@@ -106,6 +107,7 @@ label {
     valign = bottom
 }
 
+# weather edit specific location. Note, this cause a 2-4 seconds delay in locking
 label {
     monitor =
     text = cmd[update:3600000] ping -c 1 wttr.in > /dev/null && curl -s 'wttr.in?format=2' # For specific location : wttr.in/busan?format=2
@@ -117,13 +119,14 @@ label {
     valign = bottom
 }
 
+# Put a picture of choice here. Default is the current wallpaper
 image {
     monitor =
     path = $HOME/.config/rofi/.current_wallpaper
     size = 230
     rounding = -1
     border_size = 4
-    border_color = $color12
+    border_color = $color2
     rotate = 0
     reload_time = -1
     position = 0, 300
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index b6c57f3e..f5fe66d7 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -7,7 +7,7 @@
 
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
-wallpaper=$HOME/Pictures/wallpapers/Dark_Nature.png
+wallpaper=$HOME/Pictures/wallpapers/Lofi-Urban-Nightscape.png
 waybar_style="$HOME/.config/waybar/style/[Pywal] Chroma Tally.css"
 kvantum_theme="Catppuccin-Mocha"
 
diff --git a/config/hypr/pyprland.toml b/config/hypr/pyprland.toml
new file mode 100644
index 00000000..2ab74e86
--- /dev/null
+++ b/config/hypr/pyprland.toml
@@ -0,0 +1,12 @@
+[pyprland]
+
+plugins = [
+  "scratchpads",
+  "magnify",
+]
+
+[scratchpads.term]
+animation = "fromTop"
+command = "kitty --class kitty-dropterm"
+class = "kitty-dropterm"
+size = "75% 60%"
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 50b01644..6c9f610f 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -17,7 +17,7 @@ light_rofi_pywal="$HOME/.cache/wal/colors-rofi-light.rasi"
 pkill swaybg
 
 # Initialize swww if needed
-swww query || swww init
+swww query || swww-daemon
 
 # Set swww options
 swww="swww img"
diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh
index 74051403..37afe066 100755
--- a/config/hypr/scripts/GameMode.sh
+++ b/config/hypr/scripts/GameMode.sh
@@ -20,7 +20,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then
     notify-send -e -u low -i "$notif" "gamemode enabled. All animations off"
     exit
 else
-	swww init && swww img "$HOME/.config/rofi/.current_wallpaper"
+	swww-daemon && swww img "$HOME/.config/rofi/.current_wallpaper" &
 	sleep 0.1
 	${SCRIPTSDIR}/PywalSwww.sh
 	sleep 0.5
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 796084b8..d45f2e7e 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -39,11 +39,13 @@ yad --width=$dynamic_width --height=$dynamic_height \
     --timeout-indicator=bottom \
 "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \
 " enter" "Terminal" "(kitty)" \
-" or  D" "App Launcher" "(rofi)" \
+" SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \
+" D" "App Launcher" "(rofi)" \
 " T" "Open File Manager" "(Thunar)" \
 " S" "Google Search" "(rofi)" \
 " Q" "close active window" "(not kill)" \
 " Shift Q " "closes a specified window" "(window)" \
+" Z" "Desktop Zoom" "(pyprland)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(Wallpaper Menu)" \
 "CTRL ALT W" "Random wallpaper" "(via swww)" \
diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/PywalSwww.sh
index fe067611..30a4d980 100755
--- a/config/hypr/scripts/PywalSwww.sh
+++ b/config/hypr/scripts/PywalSwww.sh
@@ -34,5 +34,5 @@ if [ "$ln_success" = true ]; then
     # wal -i "$wallpaper_path"
 	echo 'about to execute wal'
     # execute pywal skipping tty and terminal changes
-    wal -i "$wallpaper_path" -s -t &
+    wal -i "$wallpaper_path" -s -t -n -e &
 fi
diff --git a/config/hypr/scripts/RofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index cf6bec55..c92aec87 100755
--- a/config/hypr/scripts/RofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -3,7 +3,7 @@
 # Rofi Emoticons. Not my own. Cant remember the source
 
 sed '1,/^# # DATA # #$/d' $0 | 
-rofi -i -dmenu -config ~/.config/rofi/config-long.rasi| 
+rofi -i -dmenu -config ~/.config/rofi/config-emoji.rasi| 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
index 1987e285..58e1fd68 100755
--- a/config/hypr/scripts/Wlogout.sh
+++ b/config/hypr/scripts/Wlogout.sh
@@ -8,8 +8,8 @@ A_2160=680
 B_2160=750
 A_1440=500
 B_1440=550
-A_1080=300
-B_1080=380
+A_1080=400
+B_1080=400
 A_720=50
 B_720=50
 
diff --git a/config/hypr/v2.2.9 b/config/hypr/v2.2.10
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.9
+++ b/config/hypr/v2.2.10
diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi
index d0c9549d..60d04149 100644
--- a/config/rofi/config-clipboard.rasi
+++ b/config/rofi/config-clipboard.rasi
@@ -1,217 +1,10 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) */
+/* Clipboard Config (long) - Clipboard */
 
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						700px;
-	/*height:						500px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
- 	
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "message", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview", "mode-switcher" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    6px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "🔎 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
+@import "~/.config/rofi/config-long.rasi" 
 
+/* ---- Entry ---- */
 entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "CTRL Del - Cliphist del || Alt Del - cliphist wipe";
-    placeholder-color:          inherit;
-    background-color:           transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 9;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    2px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    border:						0px;
-    margin:						20px 0px 0px 0px;
-    padding:					0px;
-    spacing:					0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    6px;
-    margin:                     0px;
-    border-radius:              0px;
-    background-color:           transparent;
-    text-color:                 @foreground;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-error-message {
-    padding:                    6px;
-    border-radius:              20px;
-    background-color:           @background;
-    text-color:                 @foreground;
+  width: 45%;
+  placeholder: "🔎 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe";
 }
diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi
index 2d68a6d0..e35ec79d 100644
--- a/config/rofi/config-compact.rasi
+++ b/config/rofi/config-compact.rasi
@@ -1,215 +1,47 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
+/* Main Config (compact) */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Configuration ---- */ 
 configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
+  modi: "drun";
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
 /* ---- Window ---- */
 window {
-    width:						500px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              15px;
-    border-radius:              15px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+  width: 24%;
+  border-radius: 15px;
 }
 
 /* ---- Inputbar ---- */
 inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
+    background-image: url("~/.config/rofi/.current_wallpaper", width);
 }
 
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "";
-    text-color:                 inherit;
-	background-color:			transparent;
+/* ---- Imagebox ---- */
+imagebox {
+  orientation: vertical;
+  children:
+    [ "entry", "listview"];
 }
 
+/* ---- Entry input ---- */
 entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "View / Edit Hyprland Configs";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+  width: 18%;
+  placeholder: "  View / Edit Hyprland Configs";
 }
 
 /* ---- Listview ---- */
 listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
+  columns: 1;
+  lines: 10;
+  spacing: 4px;
+  scrollbar: false;
+  border-radius: 12px;
 }
 
 /* ---- Element ---- */
 element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
+  border-radius: 10px;
 }
diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi
new file mode 100644
index 00000000..53a7ffb7
--- /dev/null
+++ b/config/rofi/config-emoji.rasi
@@ -0,0 +1,10 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config (long) - emoji */
+
+@import "~/.config/rofi/config-long.rasi" 
+
+/* ---- Entry ---- */
+entry {
+  width: 45%;
+  placeholder: "🔎 Search Emoji's  **note** 👀 Click or Return to choose | Ctrl V to Paste";
+}
diff --git a/config/rofi/config-long.rasi b/config/rofi/config-long.rasi
index 9813d7e6..b75d3d5e 100644
--- a/config/rofi/config-long.rasi
+++ b/config/rofi/config-long.rasi
@@ -1,216 +1,20 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config (long) */
 
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Window ---- */
 window {
-    width:						700px;
-	/*height:						500px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    6px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "🔎 ";
-    text-color:                 inherit;
-	background-color:			transparent;
+    width: 50%;
 }
 
+/* ---- Entry ---- */
 entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search";
-    placeholder-color:          inherit;
-    background-color:           transparent;
+  placeholder: "🔎 Search       ";
 }
 
 /* ---- Listview ---- */
 listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 9;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    2px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    border:						0px;
-    margin:						20px 0px 0px 0px;
-    padding:					0px;
-    spacing:					0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    6px;
-    margin:                     0px;
-    border-radius:              0px;
-    background-color:           transparent;
-    text-color:                 @foreground;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-error-message {
-    padding:                    6px;
-    border-radius:              20px;
-    background-color:           @background;
-    text-color:                 @foreground;
-}
+  columns: 1;
+  lines: 10;
+}
\ No newline at end of file
diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi
index e59ace13..efd67033 100644
--- a/config/rofi/config-rofi-Beats.rasi
+++ b/config/rofi/config-rofi-Beats.rasi
@@ -1,216 +1,14 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
+/* Rofi Beats Config (compact) */
 
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						500px;
-	height:						400px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "📻";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
+@import "~/.config/rofi/config-compact.rasi" 
 
+/* ---- Entry ---- */ 
 entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Online Music Station";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+  placeholder: "📻 Choose Online Music Station";
 }
 
 /* ---- Listview ---- */
 listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
+  lines: 10;
+}
\ No newline at end of file
diff --git a/config/rofi/config-search.rasi b/config/rofi/config-search.rasi
index 9a0c0fd6..2fc2f475 100644
--- a/config/rofi/config-search.rasi
+++ b/config/rofi/config-search.rasi
@@ -1,246 +1,29 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Rofi Config for Google Search) */
 
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Window ---- */
 window {
-    width:						600px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   north;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+	width: 40%;
+    location: north;
 }
 
 /* ---- Inputbar ---- */
 inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
+    enabled: true;
+    padding: 2px;
+    margin: 2px;
 }
 
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           " 󰜏 ";
-    text-color:                 inherit;
-	background-color:			transparent;
+/* ---- Mainbox ---- */
+mainbox {
+	padding: 2px;
+    children: [ "entry"];
 }
 
+/* ---- Entry ---- */ 
 entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Google Search";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
-}
-
-button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						0;
-	spacing:                    2px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+	placeholder: "🔎 Google Search";
 }
 
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
-}
-
-textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 3df1f67b..3cfecc41 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -1,217 +1,50 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config wallpaper */
+/* Main Config (wallpaper) */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Configuration ---- */ 
 configuration {
-    modi:                  "drun,run,filebrowser";
-    font:                  "Fira Code SemiBold 12";
-    show-icons:            true;
-    display-drun:          "";
-	display-run:           "";
-    display-filebrowser:   "";
-    display-window:        "";
-	drun-display-format:   "{name}";
-    hover-select:          true;
-    me-select-entry:       "MouseSecondary";
-    me-accept-entry:       "MousePrimary";
-    window-format:         "{w} · {c} · {t}";
-	dpi:					1;
-    
+  modi: "drun";
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
 window {
-    width:					700px;
-	/*height:				450px;*/
-    x-offset:               0px;
-    y-offset:               0px;
-    spacing:                0px;
-    padding:                2px;
-    margin:                 0px; 
-    border:                 2px;
-    border-color:           @active-background;
-    cursor:                 "default";
-    location:               center;
-    anchor:                 center;
-    fullscreen:             false;
-    enabled:                true;
-    border-radius:          12px;
-    border-radius:          12px;
-	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                true;
-    orientation:            horizontal;
-	padding:				8px;
-    children:               [ "imagebox"];
-    border-radius:          12px;
-    background-color:       transparent;
+  width: 60%;
 }
 
 /* ---- Imagebox ---- */
 imagebox {
-    background-color:       transparent;
-    orientation:            vertical;
-    children:               [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                4px;
-    orientation:            vertical;
-    children:               [ "listview" ];
-    border-radius:          10px;
-    border:                 1px;
-    border-color:           @active-background;
-	background-color:		@background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:       transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                true;
-    text-color:             @foreground;
-    spacing:                10px;
-    padding:                8px;
-    border-radius:          10px;
-    border-color:           @foreground;
-	background-color:		@background;
-    children:               [ "textbox-prompt-colon", "entry" ];
-    border:                 1px;
-    border-color:           @active-background;
+  orientation: vertical;
+  children:
+    [ "entry", "listbox"];
 }
 
-textbox-prompt-colon {
-    enabled:                true;
-    expand:                 false;
-    str:                    "󰸉 ";
-    text-color:             inherit;
-	background-color:		transparent;
-}
 
 entry {
-    enabled:                true;
-    text-color:             inherit;
-    cursor:                 text;
-    placeholder:            "Choose Wallpaper";
-    placeholder-color:      inherit;
-	background-color:		transparent;
+  expand: false;
+  placeholder: "󰸉 Choose Wallpaper";
 }
 
 /* ---- Listview ---- */
 listview {
-	enabled:				true;
-	columns:				4;
-	lines:					3;
-	spacing:                4px;
-	dynamic:                true;
-	cycle:                  true;
-	scrollbar:              true;
-	layout:                 vertical;
-	reverse:                false;
-	fixed-height:           true;
-	fixed-columns:          false;
-	background-color:       transparent;
-	border-radius:          10px;
+  columns: 4;
+  lines: 3;
 }
 
 /* ---- Element ---- */
 element {
-    enabled:                true;
-    padding:                5px;
-    margin:                 2px;
-    cursor:                 pointer;
-	orientation: 			vertical;
-    background-color:       transparent;
-    border-radius:          10px;
-    border:                 0px;
-}
-
-element normal.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element normal.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element normal.active {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element selected.normal {
-    background-color:      @selected-normal-background;
-    text-color:            @foreground;
-}
-
-element selected.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element selected.active {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.normal {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.active {
-    background-color:      inherit;
-    text-color:            @foreground;
+  orientation: vertical;
+  padding: 0px;
+  spacing: 0px;
+  border-radius: 12px;
 }
 
 element-icon {
-    background-color:      transparent;
-    text-color:            inherit;
-    size:                  130px;
-    cursor:                inherit;
+  size: 15%;
 }
 
-
 element-text {
-	font:                  "Fira Code SemiBold 8";
-    background-color:      transparent;
-    text-color:            inherit;
-    cursor:                inherit;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:       @background;
-    margin:				    20px 0px 0px 0px;
-    border-radius: 			10px;
-}
-
-textbox {
-    padding:                15px;
-    background-color:       @background;
-    text-color:             @foreground;
-}
-
-error-message {
-    padding:                15px;
-    border-radius:          20px;
-    background-color:       @background;
-    text-color:             @foreground;
+  font: "Fira Code SemiBold 8";
+  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 18f7b8f9..4b15128f 100644
--- a/config/rofi/config-waybar-layout.rasi
+++ b/config/rofi/config-waybar-layout.rasi
@@ -1,215 +1,10 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
+/* Layout Config (Waybar) */
 
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        " ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
+@import "~/.config/rofi/config-waybar-style.rasi" 
 
+/* ---- Entry ---- */ 
 entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Layout";
-    placeholder-color:          inherit;
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+  placeholder: "󰮫 Choose Waybar Layout";
 }
 
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index b48ef8c7..55c61567 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -1,215 +1,27 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
+/* Main Config (waybar) */
+
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
+  modi: "drun";
 }
 
 /* ---- Mainbox ---- */
 mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰮫 ";
-    text-color:                 inherit;
-	background-color:			transparent;
+  children:
+    [ "inputbar", "listview"];
 }
 
 entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Style";
-    placeholder-color:          inherit;
+  expand: true;
+  placeholder: "󰮫  Choose Waybar Style";
 }
 
 /* ---- Listview ---- */
 listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
+  columns: 2;
+  lines: 8;
+  scrollbar: false;
 }
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index c6aff123..ffa8bd14 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -1,217 +1,60 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* zsh theme switch */
-/* -- submitted by https://github.com/hyprhex -- */  
+/* Main Config (compact) */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Configuration ---- */ 
 configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
+  modi: "drun";
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
 /* ---- Window ---- */
 window {
-    width:						800px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
+  width: 40%;
+  border-radius: 15px;
 }
 
 /* ---- Imagebox ---- */
 imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
+  orientation: vertical;
+  children:
+    [ "inputbar", "listbox"];
 }
 
 /* ---- Listbox ---- */
 listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+  border-radius: 12px;
 }
 
 /* ---- Inputbar ---- */
 inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰸉 ";
-    text-color:                 inherit;
-	background-color:			transparent;
+  padding: 14px;
+  border-radius: 10px;
 }
 
 entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose ZSH theme";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+  placeholder: "󰸉  Choose ZSH theme";
 }
 
 /* ---- Listview ---- */
 listview {
-	enabled:					 true;
-	columns:					 3;
-	lines:						 5;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
+  columns: 3;
+  lines: 4;
+  spacing: 4px;
+  scrollbar: false;
+  border-radius: 10px;
 }
 
 /* ---- Element ---- */
 element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
+  border-radius: 10px;
 }
 
 /*****----- Message -----*****/
 message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
+  border-radius: 10px;
 }
 
 textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
+  padding: 15px;
 }
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index d21800f6..5a161f29 100644..100755
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -1,246 +1,228 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (main) */
+/* Main Config 1080p */
 
 /* ---- Configuration ---- */
+
 configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 12";
+	modi:                       "drun,run,filebrowser";
+	font:                       "Fira Code SemiBold 12";
     show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
+    display-drun:               "Apps";
+    display-run:                "Run";
+    display-filebrowser:        "Files";
+    display-window:             "Windows";
 	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
+	hover-select:               true;
+	me-select-entry:            "MouseSecondary";
     me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
+	window-format:              "{w} · {c} · {t}";
 	dpi:						1;
-    
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+/* ---- Load pywal colors ---- */
+@theme "~/.cache/wal/colors-rofi-dark.rasi"
+
+/* ---- Global Properties ---- */
+* {
+
+    background-alt:              @selected-active-background; // Buttons backgroundr
+    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 {
-    width:						600px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
+    // Default
+    enabled:                    true;
+    fullscreen:                 false;
+    transparency:               "real";
+    cursor:                     "default";
     spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
     border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
+    border-radius:              30px;
     location:                   center;
     anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+
+    // Style Values
+    width:                      50%;
+    background-color:           #00000099;
 }
 
-/* ---- Mainbox ---- */
+/* ----- Main Box ----- */
 mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
+    enabled:                     true;
+    orientation:                 vertical;
+    children:                    [ "inputbar", "listbox" ];
+    background-color:            transparent;
 }
 
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
 
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                     true;
+    padding:                     10px 10px 200px 10px;
+    margin:                      10px;
+    background-color:            transparent;
+    border-radius:               25px;
+    orientation:                 horizontal;
+    children:                    ["entry", "dummy", "mode-switcher" ];
+    background-image:            url("~/.config/rofi/.current_wallpaper", width);
 }
 
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+/* ---- Entry input ---- */
+entry {
+    enabled:                     true;
+    expand:                      false;
+    width:                       300px;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  inherit;
+    cursor:                      text;
+    placeholder:                 "  Search "; // << Search symbol
+    placeholder-color:           inherit;
 }
 
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
+/* ---- Listbox ---- */
+listbox {
+    spacing:                     10px;
+    padding:                     10px;
+    background-color:            transparent;
+    orientation:                 vertical;
+    children:                    [ "message", "listview" ];
 }
 
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           "🐧";
-    text-color:                 inherit;
-	background-color:			transparent;
+/* ---- Listview ---- */
+listview {
+    enabled:                     true;
+    columns:                     2;
+    lines:                       6;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   false;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                true;
+    fixed-columns:               true;    
+    spacing:                     10px;
+    background-color:            transparent;
+
+//  Adapt rofi theme
+    border:                      0px;
 }
 
-entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search (ctrl tab to choose mode)";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+/* ---- Dummy ---- */
+dummy {
+    expand:                      true;
+    background-color:            transparent;
 }
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
+    enabled:                     true;
+    spacing:                     10px;
+    background-color:            transparent;
 }
-
 button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
+    width:                       5%;
+    padding:                     12px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  inherit;
+    cursor:                      pointer;
 }
-
 button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
 
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						5;
-	spacing:                    2px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
 
-/* ---- Element ---- */
+/* ---- Elements ---- */
 element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
+    enabled:                     true;
+    spacing:                     10px;
+    padding:                     4px;
+    border-radius:               10px;
+    background-color:            transparent;
+    cursor:                      pointer;
 }
 
+
 element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            inherit;
+    text-color:                  inherit;
 }
-
 element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @foreground;
 }
-
 element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @active;
+    text-color:                  @foreground;
 }
 
 element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
-
 element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
 element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
+// Adapt rofi theme
 element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        36px;
+    cursor:                      inherit;
 }
-
 element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
+    background-color:            transparent;
+    font:                       "Fira Code SemiBold 14";
+    text-color:                  inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+
 }
 
-/*****----- Message -----*****/
+/* ---- Message ---- */
 message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
+    background-color:            transparent;
+    border:                      0px;
 }
-
 textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               10px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
 }
-
 error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               20px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
 }
diff --git a/config/rofi/resolution/1080p/config-compact.rasi b/config/rofi/resolution/1080p/config-compact.rasi
deleted file mode 100644
index 2d68a6d0..00000000
--- a/config/rofi/resolution/1080p/config-compact.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						500px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              15px;
-    border-radius:              15px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "View / Edit Hyprland Configs";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-long.rasi b/config/rofi/resolution/1080p/config-long.rasi
deleted file mode 100644
index 9813d7e6..00000000
--- a/config/rofi/resolution/1080p/config-long.rasi
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						700px;
-	/*height:						500px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    6px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "🔎 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search";
-    placeholder-color:          inherit;
-    background-color:           transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 9;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    2px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    border:						0px;
-    margin:						20px 0px 0px 0px;
-    padding:					0px;
-    spacing:					0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    6px;
-    margin:                     0px;
-    border-radius:              0px;
-    background-color:           transparent;
-    text-color:                 @foreground;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-error-message {
-    padding:                    6px;
-    border-radius:              20px;
-    background-color:           @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-rofi-Beats.rasi b/config/rofi/resolution/1080p/config-rofi-Beats.rasi
deleted file mode 100644
index e59ace13..00000000
--- a/config/rofi/resolution/1080p/config-rofi-Beats.rasi
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						500px;
-	height:						400px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "📻";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Online Music Station";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-search.rasi b/config/rofi/resolution/1080p/config-search.rasi
deleted file mode 100644
index 9a0c0fd6..00000000
--- a/config/rofi/resolution/1080p/config-search.rasi
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Rofi Config for Google Search) */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						600px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   north;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           " 󰜏 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Google Search";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
-}
-
-button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						0;
-	spacing:                    2px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
-}
-
-textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-wallpaper.rasi b/config/rofi/resolution/1080p/config-wallpaper.rasi
deleted file mode 100644
index 3df1f67b..00000000
--- a/config/rofi/resolution/1080p/config-wallpaper.rasi
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config wallpaper */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                  "drun,run,filebrowser";
-    font:                  "Fira Code SemiBold 12";
-    show-icons:            true;
-    display-drun:          "";
-	display-run:           "";
-    display-filebrowser:   "";
-    display-window:        "";
-	drun-display-format:   "{name}";
-    hover-select:          true;
-    me-select-entry:       "MouseSecondary";
-    me-accept-entry:       "MousePrimary";
-    window-format:         "{w} · {c} · {t}";
-	dpi:					1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:					700px;
-	/*height:				450px;*/
-    x-offset:               0px;
-    y-offset:               0px;
-    spacing:                0px;
-    padding:                2px;
-    margin:                 0px; 
-    border:                 2px;
-    border-color:           @active-background;
-    cursor:                 "default";
-    location:               center;
-    anchor:                 center;
-    fullscreen:             false;
-    enabled:                true;
-    border-radius:          12px;
-    border-radius:          12px;
-	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                true;
-    orientation:            horizontal;
-	padding:				8px;
-    children:               [ "imagebox"];
-    border-radius:          12px;
-    background-color:       transparent;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:       transparent;
-    orientation:            vertical;
-    children:               [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                4px;
-    orientation:            vertical;
-    children:               [ "listview" ];
-    border-radius:          10px;
-    border:                 1px;
-    border-color:           @active-background;
-	background-color:		@background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:       transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                true;
-    text-color:             @foreground;
-    spacing:                10px;
-    padding:                8px;
-    border-radius:          10px;
-    border-color:           @foreground;
-	background-color:		@background;
-    children:               [ "textbox-prompt-colon", "entry" ];
-    border:                 1px;
-    border-color:           @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                true;
-    expand:                 false;
-    str:                    "󰸉 ";
-    text-color:             inherit;
-	background-color:		transparent;
-}
-
-entry {
-    enabled:                true;
-    text-color:             inherit;
-    cursor:                 text;
-    placeholder:            "Choose Wallpaper";
-    placeholder-color:      inherit;
-	background-color:		transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:				true;
-	columns:				4;
-	lines:					3;
-	spacing:                4px;
-	dynamic:                true;
-	cycle:                  true;
-	scrollbar:              true;
-	layout:                 vertical;
-	reverse:                false;
-	fixed-height:           true;
-	fixed-columns:          false;
-	background-color:       transparent;
-	border-radius:          10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                true;
-    padding:                5px;
-    margin:                 2px;
-    cursor:                 pointer;
-	orientation: 			vertical;
-    background-color:       transparent;
-    border-radius:          10px;
-    border:                 0px;
-}
-
-element normal.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element normal.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element normal.active {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element selected.normal {
-    background-color:      @selected-normal-background;
-    text-color:            @foreground;
-}
-
-element selected.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element selected.active {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.normal {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.urgent {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element alternate.active {
-    background-color:      inherit;
-    text-color:            @foreground;
-}
-
-element-icon {
-    background-color:      transparent;
-    text-color:            inherit;
-    size:                  130px;
-    cursor:                inherit;
-}
-
-
-element-text {
-	font:                  "Fira Code SemiBold 8";
-    background-color:      transparent;
-    text-color:            inherit;
-    cursor:                inherit;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:       @background;
-    margin:				    20px 0px 0px 0px;
-    border-radius: 			10px;
-}
-
-textbox {
-    padding:                15px;
-    background-color:       @background;
-    text-color:             @foreground;
-}
-
-error-message {
-    padding:                15px;
-    border-radius:          20px;
-    background-color:       @background;
-    text-color:             @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-waybar-layout.rasi b/config/rofi/resolution/1080p/config-waybar-layout.rasi
deleted file mode 100644
index 18f7b8f9..00000000
--- a/config/rofi/resolution/1080p/config-waybar-layout.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        " ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Layout";
-    placeholder-color:          inherit;
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-waybar-style.rasi b/config/rofi/resolution/1080p/config-waybar-style.rasi
deleted file mode 100644
index b48ef8c7..00000000
--- a/config/rofi/resolution/1080p/config-waybar-style.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰮫 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Style";
-    placeholder-color:          inherit;
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config-zsh-theme.rasi b/config/rofi/resolution/1080p/config-zsh-theme.rasi
deleted file mode 100644
index c6aff123..00000000
--- a/config/rofi/resolution/1080p/config-zsh-theme.rasi
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* zsh theme switch */
-/* -- submitted by https://github.com/hyprhex -- */  
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰸉 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose ZSH theme";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 3;
-	lines:						 5;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index d21800f6..5a161f29 100644..100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -1,246 +1,228 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (main) */
+/* Main Config 1080p */
 
 /* ---- Configuration ---- */
+
 configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 12";
+	modi:                       "drun,run,filebrowser";
+	font:                       "Fira Code SemiBold 12";
     show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
+    display-drun:               "Apps";
+    display-run:                "Run";
+    display-filebrowser:        "Files";
+    display-window:             "Windows";
 	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
+	hover-select:               true;
+	me-select-entry:            "MouseSecondary";
     me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
+	window-format:              "{w} · {c} · {t}";
 	dpi:						1;
-    
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+/* ---- Load pywal colors ---- */
+@theme "~/.cache/wal/colors-rofi-dark.rasi"
+
+/* ---- Global Properties ---- */
+* {
+
+    background-alt:              @selected-active-background; // Buttons backgroundr
+    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 {
-    width:						600px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
+    // Default
+    enabled:                    true;
+    fullscreen:                 false;
+    transparency:               "real";
+    cursor:                     "default";
     spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
     border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
+    border-radius:              30px;
     location:                   center;
     anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+
+    // Style Values
+    width:                      50%;
+    background-color:           #00000099;
 }
 
-/* ---- Mainbox ---- */
+/* ----- Main Box ----- */
 mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
+    enabled:                     true;
+    orientation:                 vertical;
+    children:                    [ "inputbar", "listbox" ];
+    background-color:            transparent;
 }
 
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
 
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                     true;
+    padding:                     10px 10px 200px 10px;
+    margin:                      10px;
+    background-color:            transparent;
+    border-radius:               25px;
+    orientation:                 horizontal;
+    children:                    ["entry", "dummy", "mode-switcher" ];
+    background-image:            url("~/.config/rofi/.current_wallpaper", width);
 }
 
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+/* ---- Entry input ---- */
+entry {
+    enabled:                     true;
+    expand:                      false;
+    width:                       300px;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  inherit;
+    cursor:                      text;
+    placeholder:                 "  Search "; // << Search symbol
+    placeholder-color:           inherit;
 }
 
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
+/* ---- Listbox ---- */
+listbox {
+    spacing:                     10px;
+    padding:                     10px;
+    background-color:            transparent;
+    orientation:                 vertical;
+    children:                    [ "message", "listview" ];
 }
 
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           "🐧";
-    text-color:                 inherit;
-	background-color:			transparent;
+/* ---- Listview ---- */
+listview {
+    enabled:                     true;
+    columns:                     2;
+    lines:                       6;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   false;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                true;
+    fixed-columns:               true;    
+    spacing:                     10px;
+    background-color:            transparent;
+
+//  Adapt rofi theme
+    border:                      0px;
 }
 
-entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search (ctrl tab to choose mode)";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+/* ---- Dummy ---- */
+dummy {
+    expand:                      true;
+    background-color:            transparent;
 }
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
+    enabled:                     true;
+    spacing:                     10px;
+    background-color:            transparent;
 }
-
 button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
+    width:                       5%;
+    padding:                     12px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  inherit;
+    cursor:                      pointer;
 }
-
 button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
 
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						5;
-	spacing:                    2px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
 
-/* ---- Element ---- */
+/* ---- Elements ---- */
 element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
+    enabled:                     true;
+    spacing:                     10px;
+    padding:                     4px;
+    border-radius:               10px;
+    background-color:            transparent;
+    cursor:                      pointer;
 }
 
+
 element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            inherit;
+    text-color:                  inherit;
 }
-
 element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @foreground;
 }
-
 element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @active;
+    text-color:                  @foreground;
 }
 
 element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
-
 element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
 element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
+// Adapt rofi theme
 element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        36px;
+    cursor:                      inherit;
 }
-
 element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
+    background-color:            transparent;
+    font:                       "Fira Code SemiBold 14";
+    text-color:                  inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+
 }
 
-/*****----- Message -----*****/
+/* ---- Message ---- */
 message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
+    background-color:            transparent;
+    border:                      0px;
 }
-
 textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               10px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
 }
-
 error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               20px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
 }
diff --git a/config/rofi/resolution/1440p/config-compact.rasi b/config/rofi/resolution/1440p/config-compact.rasi
deleted file mode 100644
index 825fff62..00000000
--- a/config/rofi/resolution/1440p/config-compact.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						500px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              15px;
-    border-radius:              15px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);	
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "View / Edit Hyprland Configs";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-long.rasi b/config/rofi/resolution/1440p/config-long.rasi
deleted file mode 100644
index f8d0b4bf..00000000
--- a/config/rofi/resolution/1440p/config-long.rasi
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						700px;
-	/*height:						500px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
- 	
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    6px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "🔎 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search";
-    placeholder-color:          inherit;
-    background-color:           transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 9;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    2px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    border:						0px;
-    margin:						20px 0px 0px 0px;
-    padding:					0px;
-    spacing:					0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    6px;
-    margin:                     0px;
-    border-radius:              0px;
-    background-color:           transparent;
-    text-color:                 @foreground;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-error-message {
-    padding:                    6px;
-    border-radius:              20px;
-    background-color:           @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-rofi-Beats.rasi b/config/rofi/resolution/1440p/config-rofi-Beats.rasi
deleted file mode 100644
index 141c9ed4..00000000
--- a/config/rofi/resolution/1440p/config-rofi-Beats.rasi
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config compact */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						500px;
-	height:						400px;
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
- 	
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    14px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "📻";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Online Music Station";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 1;
-	lines:						 7;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               true;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-search.rasi b/config/rofi/resolution/1440p/config-search.rasi
deleted file mode 100644
index 9a0c0fd6..00000000
--- a/config/rofi/resolution/1440p/config-search.rasi
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Rofi Config for Google Search) */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						600px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   north;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           " 󰜏 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Google Search";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Mode Switcher ---- */
-mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
-}
-
-button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						0;
-	spacing:                    2px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
-}
-
-textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-wallpaper.rasi b/config/rofi/resolution/1440p/config-wallpaper.rasi
deleted file mode 100644
index 3f01dc0a..00000000
--- a/config/rofi/resolution/1440p/config-wallpaper.rasi
+++ /dev/null
@@ -1,219 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config wallpaper */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                   "drun,run,filebrowser";
-    font:                   "Fira Code SemiBold 14";
-    show-icons:             true;
-    display-drun:           "";
-	display-run:            "";
-    display-filebrowser:   	"";
-    display-window:        	"";
-	drun-display-format: 	"{name}";
-    hover-select:           true;
-    me-select-entry:        "MouseSecondary";
-    me-accept-entry:        "MousePrimary";
-    window-format:          "{w} · {c} · {t}";
-	dpi:					1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:					700px;
-	/*height:				 450px;*/
-    x-offset:               0px;
-    y-offset:               0px;
-    spacing:                0px;
-    padding:                2px;
-    margin:                 0px; 
-    border:                 2px;
-    border-color:           @active-background;
-    cursor:                 "default";
-    location:               center;
-    anchor:                 center;
-    fullscreen:             false;
-    enabled:                true;
-    border-radius:          12px;
-    border-radius:          12px;
-	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                true;
-    orientation:            horizontal;
-	padding:				8px;
-    children:               [ "imagebox"];
-    border-radius:          12px;
-    background-color:       transparent;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:       transparent;
-    orientation:            vertical;
-    children:               [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                4px;
-    orientation:            vertical;
-    children:               [ "listview" ];
-    border-radius:          10px;
-    border:                 1px;
-    border-color:           @active-background;
-	background-color:		@background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:       transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                true;
-    text-color:             @foreground;
-    spacing:                10px;
-    padding:                8px;
-    border-radius:          10px;
-    border-color:           @foreground;
-	background-color:		@background;
-    children:               [ "textbox-prompt-colon", "entry" ];
-    border:                 1px;
-    border-color:           @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                true;
-    expand:                 false;
-    str:                    "󰸉 ";
-    text-color:             inherit;
-	background-color:		transparent;
-}
-
-entry {
-    enabled:                true;
-    text-color:             inherit;
-    cursor:                 text;
-    placeholder:            "Choose Wallpaper";
-    placeholder-color:      inherit;
-	background-color:		transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:				true;
-	columns:				4;
-	lines:					4;
-	spacing:                4px;
-	dynamic:                true;
-	cycle:                  true;
-	scrollbar:              true;
-	layout:                 vertical;
-	reverse:                false;
-	fixed-height:           true;
-	fixed-columns:          false;
-	background-color:       transparent;
-	border-radius:          10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                true;
-    padding:                5px;
-    margin:                 2px;
-    cursor:                 pointer;
-	orientation: 			vertical;
-    background-color:       transparent;
-    border-radius:          10px;
-    border:                 0px;
-}
-
-element normal.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element normal.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element normal.active {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element selected.normal {
-    background-color:       @selected-normal-background;
-    text-color:             @foreground;
-}
-
-element selected.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element selected.active {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element alternate.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element alternate.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element alternate.active {
-    background-color:       inherit;
-    text-color:             @foreground;
-}
-
-element-icon {
-    background-color:       transparent;
-    text-color:             inherit;
-    size:                   130px;
-    cursor:                 inherit;
-}
-
-
-element-text {
-	font:                   "Fira Code SemiBold 10";
-    background-color:       transparent;
-    text-color:             inherit;
-    cursor:                 inherit;
-    vertical-align:         0.5;
-    horizontal-align:       0.5;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:       @background;
-    margin:					20px 0px 0px 0px;
-    border-radius: 			10px;
-}
-
-textbox {
-    padding:                15px;
-    background-color:       @background;
-    text-color:             @foreground;
-}
-
-error-message {
-    padding:                15px;
-    border-radius:          20px;
-    background-color:       @background;
-    text-color:             @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-waybar-layout.rasi b/config/rofi/resolution/1440p/config-waybar-layout.rasi
deleted file mode 100644
index b829de39..00000000
--- a/config/rofi/resolution/1440p/config-waybar-layout.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@backrgound90;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        " ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Layout";
-    placeholder-color:          inherit;
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-waybar-style.rasi b/config/rofi/resolution/1440p/config-waybar-style.rasi
deleted file mode 100644
index de7e6933..00000000
--- a/config/rofi/resolution/1440p/config-waybar-style.rasi
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* config - Waybar */
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						800px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
- 	background-image:    		url("~/.config/rofi/.current_wallpaper", height);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "listbox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:      		transparent;
-    orientation:                vertical;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:			@backrgound90;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰮫 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    background-color:      		transparent;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose Waybar Style";
-    placeholder-color:          inherit;
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                    true;
-    columns:                    2;
-    lines:                      8;
-  	spacing:                    4px;
-  	dynamic:                    true;
-  	cycle:                      true;
-  	scrollbar:                  true;
-  	layout:                     vertical;
-  	reverse:                    false;
-  	fixed-height:               true;
-  	fixed-columns:              true;
-	background-color:           transparent;
-	border-radius:             	10px;
-	border:						0px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:           transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           transparent;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      transparent;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config-zsh-theme.rasi b/config/rofi/resolution/1440p/config-zsh-theme.rasi
deleted file mode 100644
index 9ab3c0a6..00000000
--- a/config/rofi/resolution/1440p/config-zsh-theme.rasi
+++ /dev/null
@@ -1,217 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* zsh theme switch */
-/* -- submitted by https://github.com/hyprhex -- */  
-
-/* ---- Configuration ---- */
-configuration {
-    modi:                       "drun,run";
-    font:                       "Fira Code SemiBold 14";
-    show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "";
-	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-    
-}
-
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
-
-/* ---- Window ---- */
-window {
-    width:						800px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
-    spacing:                    0px;
-    padding:                    2px;
-    margin:                     0px; 
-    border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
-    location:                   center;
-    anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-    border-radius:              12px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Mainbox ---- */
-mainbox {
-    enabled:                    true;
-    orientation:                horizontal;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "imagebox"];
-    border-radius:              12px;
-}
-
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                vertical;
-    children:                   [ "inputbar", "listbox"];
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   [ "listview" ];
-    border-radius:              10px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
-}
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    padding:                    8px;
-    border-radius:              10px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon", "entry" ];
-    border:                     1px;
-    border-color:               @active-background;
-}
-
-textbox-prompt-colon {
-    enabled:                    true;
-    expand:                     false;
-    str:                        "󰸉 ";
-    text-color:                 inherit;
-	background-color:			transparent;
-}
-
-entry {
-    enabled:                    true;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Choose ZSH theme";
-    placeholder-color:          inherit;
-	background-color:			transparent;
-}
-
-/* ---- Listview ---- */
-listview {
-	enabled:					 true;
-	columns:					 3;
-	lines:						 5;
-	spacing:                     4px;
-	dynamic:                     true;
-	cycle:                       true;
-	scrollbar:                   true;
-	layout:                      vertical;
-	reverse:                     false;
-	fixed-height:                true;
-	fixed-columns:               false;
-	background-color:            transparent;
-	border-radius:             	 10px;
-}
-
-/* ---- Element ---- */
-element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         transparent;
-    border-radius:              10px;
-    border:                     0px;
-}
-
-element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
-}
-
-element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
-}
-
-element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
-}
-
-element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0.0;
-}
-
-/*****----- Message -----*****/
-message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				10px;
-}
-
-textbox {
-    padding:                    15px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
-
-error-message {
-    padding:                    15px;
-    border-radius:            20px;
-    background-color:      @background;
-    text-color:                 @foreground;
-}
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index 83c481cf..1ed79730 100644
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -1,247 +1,227 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (main) */
+/* Main Config 1440p */
 
 /* ---- Configuration ---- */
+
 configuration {
-    modi:                       "drun,run,filebrowser";
-    font:                       "Fira Code SemiBold 14";
+	modi:                       "drun,run,filebrowser";
+	font:                       "Fira Code SemiBold 13";
     show-icons:                 true;
-    display-drun:               "";
-	display-run:                "";
-    display-filebrowser:        "";
-    display-window:             "󱂬";
+    display-drun:               "Apps";
+    display-run:                "Run";
+    display-filebrowser:        "Files";
+    display-window:             "Windows";
 	drun-display-format:        "{name}";
-    hover-select:               true;
-    me-select-entry:            "MouseSecondary";
+	hover-select:               true;
+	me-select-entry:            "MouseSecondary";
     me-accept-entry:            "MousePrimary";
-    window-format:              "{w} · {c} · {t}";
+	window-format:              "{w} · {c} · {t}";
 	dpi:						1;
-    
 }
 
-/* ---- Load pywal colors (custom wal template) ---- */
-@import "~/.config/rofi/pywal-color/pywal-theme.rasi"
+/* ---- Load pywal colors ---- */
+@theme "~/.cache/wal/colors-rofi-dark.rasi"
+
+/* ---- Global Properties ---- */
+* {
+
+    background-alt:              @selected-active-background; // Buttons backgroundr
+    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 {
-    width:						650px;
-	/*height:						450px;*/
-    x-offset:                   0px;
-    y-offset:                   0px;
+    // Default
+    enabled:                    true;
+    fullscreen:                 false;
+    transparency:               "real";
+    cursor:                     "default";
     spacing:                    0px;
-    padding:                    1px;
-    margin:                     0px; 
     border:                     2px;
-    border-color:               @active-background;
-    cursor:                     "default";
+    border-radius:              30px;
     location:                   center;
     anchor:                     center;
-    fullscreen:                 false;
-    enabled:                    true;
-    border-radius:              12px;
-	background-image:           url("~/.config/rofi/.current_wallpaper", width);
- 	
+
+    // Style Values
+    width:                      40%;
+    background-color:           #00000099;
 }
 
-/* ---- Mainbox ---- */
+/* ----- Main Box ----- */
 mainbox {
-    enabled:                    true;
-    orientation:                vertical;
-	padding:					8px;
-    background-color:           transparent;
-    children:                   [ "inputbar", "imagebox" ];
-    border-radius:              12px;
+    enabled:                     true;
+    orientation:                 vertical;
+    children:                    [ "inputbar", "listbox" ];
+    background-color:            transparent;
 }
 
-/* ---- Imagebox ---- */
-imagebox {
-    background-color:           transparent;
-    orientation:                horizontal;
-    children:                   [ "mode-switcher",  "listbox"];
-}
 
-/* ---- Listbox ---- */
-listbox {
-    spacing:                    4px;
-    orientation:                vertical;
-    children:                   ["listview" ];
-	padding:					6px;
-    border-radius:              12px;
-    border:                     1px;
-    border-color:               @active-background;
-	background-color:		    @background;
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                     true;
+    padding:                     10px 10px 200px 10px;
+    margin:                      10px;
+    background-color:            transparent;
+    border-radius:               25px;
+    orientation:                 horizontal;
+    children:                    ["entry", "dummy", "mode-switcher" ];
+    background-image:            url("~/.config/rofi/.current_wallpaper", width);
 }
 
-/* ---- Dummy ---- */
-dummy {
-    background-color:           transparent;
+/* ---- Entry input ---- */
+entry {
+    enabled:                     true;
+    expand:                      false;
+    width:                       300px;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  @text-selected;
+    cursor:                      text;
+    placeholder:                 "  Search "; // << Search symbol
+    placeholder-color:           inherit;
 }
 
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                    true;
-    text-color:                 @foreground;
-    spacing:                    10px;
-    border-radius:              12px;
-    border-color:               @foreground;
-	background-color:		    @background;
-    children:                   [ "textbox-prompt-colon","entry" ];
-    border:                     1px;
-    border-color:               @active-background;
+/* ---- Listbox ---- */
+listbox {
+    spacing:                     10px;
+    padding:                     10px;
+    background-color:            transparent;
+    orientation:                 vertical;
+    children:                    [ "message", "listview" ];
 }
 
-textbox-prompt-colon {
-    enabled:                    true;
-	padding:					6px 0px 6px 10px;
-    expand:                     false;
-    str:                           "🐧";
-    text-color:                 inherit;
-	background-color:			transparent;
+/* ---- Listview ---- */
+listview {
+    enabled:                     true;
+    columns:                     2;
+    lines:                       8;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   false;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                true;
+    fixed-columns:               true;    
+    spacing:                     10px;
+    background-color:            transparent;
+
+//  Adapt rofi theme
+    border:                      0px;
 }
 
-entry {
-    enabled:                    true;
-	padding:					6px 0px 0px 0px;
-    text-color:                 inherit;
-    cursor:                     text;
-    placeholder:                "Search (ctrl tab to choose mode)";
-    placeholder-color:          inherit;
-	background-color:			transparent;
+/* ---- Dummy ---- */
+dummy {
+    expand:                      true;
+    background-color:            transparent;
 }
 
 /* ---- Mode Switcher ---- */
 mode-switcher{
-	orientation:				vertical;
-    enabled:                    true;
-    spacing:                    12px;
-    background-color:          	transparent;
-    text-color:                 @foreground;
+    enabled:                     true;
+    spacing:                     10px;
+    background-color:            transparent;
 }
-
 button {
-    padding:                   0px 12px 0px 8px;
-    border-radius:             12px;
-    background-color:          @background;
-    text-color:                inherit;
-    cursor:                    pointer;
-    border:                     1px;
-    border-color:               @active-background;
+    width:                       110px;
+    padding:                     12px;
+    border-radius:               12px;
+    background-color:            @background-alt;
+    text-color:                  inherit;
+    cursor:                      pointer;
 }
-
 button selected {
-    background-color:          @selected-normal-background;
-    text-color:                @foreground;
-    border:                    1px;
-    border-color:              @background;
-	
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
 
-/* ---- Listview ---- */
-listview {
-	enabled:					true;
-	columns:					2;
-	lines:						5;
-	spacing:                    5px;
-	padding:					6px;
-	dynamic:                    true;
-	cycle:                      true;
-	scrollbar:                  false;
-	layout:                     vertical;
-	reverse:                    false;
-	fixed-height:               true;
-	fixed-columns:              false;
-	background-color:           transparent;
-	border-radius:   	        12px;
-	border:						0px;
-}
 
-/* ---- Element ---- */
+/* ---- Elements ---- */
 element {
-    enabled:                    true;
-    padding:                    5px;
-    margin:                     2px;
-    cursor:                     pointer;
-    background-color:         	transparent;
-    border-radius:              12px;
-    border:                     0px;
+    enabled:                     true;
+    spacing:                     10px;
+    padding:                     4px;
+    border-radius:               10px;
+    background-color:            transparent;
+    cursor:                      pointer;
 }
 
+
 element normal.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            inherit;
+    text-color:                  inherit;
 }
-
 element normal.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @foreground;
 }
-
 element normal.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @active;
+    text-color:                  @foreground;
 }
 
 element selected.normal {
-    background-color:           @selected-normal-background;
-    text-color:                 @foreground;
+    background-color:            @selected;
+    text-color:                  @text-selected;
 }
-
 element selected.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
 element selected.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            @urgent;
+    text-color:                  @text-selected;
 }
-
+// Adapt rofi theme
 element alternate.normal {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.urgent {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element alternate.active {
-    background-color:           inherit;
-    text-color:                 @foreground;
+    background-color:            transparent;
+    text-color:                  inherit;
 }
-
 element-icon {
-    background-color:           transparent;
-    text-color:                 inherit;
-    size:                       32px;
-    cursor:                     inherit;
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        36px;
+    cursor:                      inherit;
 }
-
 element-text {
-    background-color:           transparent;
-    text-color:                 inherit;
-    cursor:                     inherit;
-    vertical-align:             0.5;
-    horizontal-align:           0;
+    background-color:            transparent;
+    font:                       "Fira Code SemiBold 16";
+    text-color:                  inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+
 }
 
-/*****----- Message -----*****/
+/* ---- Message ---- */
 message {
-    background-color:           @background;
-    margin:						20px 0px 0px 0px;
-    border-radius: 				12px;
+    background-color:            transparent;
+    border:                      0px;
 }
-
 textbox {
-    padding:                    10px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               10px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
+    vertical-align:              0.5;
 }
-
 error-message {
-    padding:                    15px;
-    border-radius:            	12px;
-    background-color:      		@background;
-    text-color:                 @foreground;
+    padding:                     12px;
+    border-radius:               20px;
+    background-color:            @background-alt;
+    text-color:                  @foreground;
 }
diff --git a/config/swaylock/config b/config/swaylock/config
deleted file mode 100644
index 53e0b0ab..00000000
--- a/config/swaylock/config
+++ /dev/null
@@ -1,59 +0,0 @@
-daemonize
-show-failed-attempts
-clock
-
-# AM/PM formats (American Format)
-#datestr=%a, %B %e
-#timestr=%I:%M %p
-
-#24 HRS clock format and standard Europe Date Format
-timestr=%H:%M:%S
-datestr=%d %B, %a
-
-# Add current display as background
-#screenshots
-
-# Add an image as a background. You need to disable screenshots above
-image=$HOME/.config/rofi/.current_wallpaper
-
-# Effect for background
-# NOTE: if you choose image as wallpaper, you may want to comment (#) these effects 
-# effect-blur=9x5
-# effect-vignette=0.5:0.5
-effect-greyscale
-# effect-pixelate=5
-
-color=1f1d2e80
-font="Fira Code Medium"
-indicator
-indicator-radius=200
-indicator-thickness=20
-
-text-color=e0def4
-text-caps-lock-color=ffffff
-inside-color=000000
-line-color=1f1d2e
-ring-color=191724
-separator-color=00000000
-text-ver-color=ffffff
-inside-ver-color=000000
-line-ver-color=0000ff
-ring-ver-color=2777ff
-text-wrong-color=ff0000
-inside-wrong-color=000000
-line-wrong-color=000000
-ring-wrong-color=ff8000
-text-clear-color=000000
-inside-clear-color=ffffff
-line-clear-color=00ff00
-ring-clear-color=0ffff0
-key-hl-color=ff0000
-bs-hl-color=ffffff
-
-grace=1
-grace-no-mouse
-grace-no-touch
-fade-in=0.2
-ignore-empty-password
-
-
diff --git a/config/swaync/config.json b/config/swaync/config.json
index 64e24561..64e24561 100644..100755
--- a/config/swaync/config.json
+++ b/config/swaync/config.json
diff --git a/config/swaync/icons/backup.png b/config/swaync/icons/backup.png
index a60a495e..a60a495e 100644..100755
--- a/config/swaync/icons/backup.png
+++ b/config/swaync/icons/backup.png
diff --git a/config/swaync/icons/battery-quarter-solid.svg b/config/swaync/icons/battery-quarter-solid.svg
index 450ef3dc..450ef3dc 100644..100755
--- a/config/swaync/icons/battery-quarter-solid.svg
+++ b/config/swaync/icons/battery-quarter-solid.svg
diff --git a/config/swaync/icons/battery-status.png b/config/swaync/icons/battery-status.png
index 07bf8154..07bf8154 100644..100755
--- a/config/swaync/icons/battery-status.png
+++ b/config/swaync/icons/battery-status.png
diff --git a/config/swaync/icons/brightness-100.png b/config/swaync/icons/brightness-100.png
index 1e28ac37..1e28ac37 100644..100755
--- a/config/swaync/icons/brightness-100.png
+++ b/config/swaync/icons/brightness-100.png
diff --git a/config/swaync/icons/brightness-20.png b/config/swaync/icons/brightness-20.png
index aee9c523..aee9c523 100644..100755
--- a/config/swaync/icons/brightness-20.png
+++ b/config/swaync/icons/brightness-20.png
diff --git a/config/swaync/icons/brightness-40.png b/config/swaync/icons/brightness-40.png
index bbedd1c7..bbedd1c7 100644..100755
--- a/config/swaync/icons/brightness-40.png
+++ b/config/swaync/icons/brightness-40.png
diff --git a/config/swaync/icons/brightness-60.png b/config/swaync/icons/brightness-60.png
index 4cd838bd..4cd838bd 100644..100755
--- a/config/swaync/icons/brightness-60.png
+++ b/config/swaync/icons/brightness-60.png
diff --git a/config/swaync/icons/brightness-80.png b/config/swaync/icons/brightness-80.png
index 6684bdb8..6684bdb8 100644..100755
--- a/config/swaync/icons/brightness-80.png
+++ b/config/swaync/icons/brightness-80.png
diff --git a/config/swaync/icons/dropper.png b/config/swaync/icons/dropper.png
index 2e222a35..2e222a35 100644..100755
--- a/config/swaync/icons/dropper.png
+++ b/config/swaync/icons/dropper.png
diff --git a/config/swaync/icons/microphone-mute.png b/config/swaync/icons/microphone-mute.png
index 1780e330..1780e330 100644..100755
--- a/config/swaync/icons/microphone-mute.png
+++ b/config/swaync/icons/microphone-mute.png
diff --git a/config/swaync/icons/microphone.png b/config/swaync/icons/microphone.png
index d1b6d767..d1b6d767 100644..100755
--- a/config/swaync/icons/microphone.png
+++ b/config/swaync/icons/microphone.png
diff --git a/config/swaync/icons/music.png b/config/swaync/icons/music.png
index 92bf4c65..92bf4c65 100644..100755
--- a/config/swaync/icons/music.png
+++ b/config/swaync/icons/music.png
diff --git a/config/swaync/icons/palette.png b/config/swaync/icons/palette.png
index 3ba73d05..3ba73d05 100644..100755
--- a/config/swaync/icons/palette.png
+++ b/config/swaync/icons/palette.png
diff --git a/config/swaync/icons/picture.png b/config/swaync/icons/picture.png
index 4669bc30..4669bc30 100644..100755
--- a/config/swaync/icons/picture.png
+++ b/config/swaync/icons/picture.png
diff --git a/config/swaync/icons/timer.png b/config/swaync/icons/timer.png
index 420d1f15..420d1f15 100644..100755
--- a/config/swaync/icons/timer.png
+++ b/config/swaync/icons/timer.png
diff --git a/config/swaync/icons/uptime.png b/config/swaync/icons/uptime.png
index 9dd08de6..9dd08de6 100644..100755
--- a/config/swaync/icons/uptime.png
+++ b/config/swaync/icons/uptime.png
diff --git a/config/swaync/icons/volume-high.png b/config/swaync/icons/volume-high.png
index 200f17b2..200f17b2 100644..100755
--- a/config/swaync/icons/volume-high.png
+++ b/config/swaync/icons/volume-high.png
diff --git a/config/swaync/icons/volume-low.png b/config/swaync/icons/volume-low.png
index 17cfff78..17cfff78 100644..100755
--- a/config/swaync/icons/volume-low.png
+++ b/config/swaync/icons/volume-low.png
diff --git a/config/swaync/icons/volume-mid.png b/config/swaync/icons/volume-mid.png
index 1a3ad3a3..1a3ad3a3 100644..100755
--- a/config/swaync/icons/volume-mid.png
+++ b/config/swaync/icons/volume-mid.png
diff --git a/config/swaync/icons/volume-mute.png b/config/swaync/icons/volume-mute.png
index 0b9b0c3c..0b9b0c3c 100644..100755
--- a/config/swaync/icons/volume-mute.png
+++ b/config/swaync/icons/volume-mute.png
diff --git a/config/swaync/icons/vpn.png b/config/swaync/icons/vpn.png
index e31acaaa..e31acaaa 100644..100755
--- a/config/swaync/icons/vpn.png
+++ b/config/swaync/icons/vpn.png
diff --git a/config/swaync/images/bell.png b/config/swaync/images/bell.png
index d9fea964..d9fea964 100644..100755
--- a/config/swaync/images/bell.png
+++ b/config/swaync/images/bell.png
diff --git a/config/swaync/style.css b/config/swaync/style.css
index 728e2157..da3746c9 100644..100755
--- a/config/swaync/style.css
+++ b/config/swaync/style.css
@@ -6,13 +6,13 @@
 @define-color noti-bg rgba(0, 0, 0, 0.8);
 @define-color noti-bg-alt #111111;
 @define-color noti-bg-hover @color2;
-@define-color text-color @color2;
-@define-color text-color-alt @color7;
+@define-color text-color @color7;
+@define-color text-color-alt @color2;
 @define-color text-color-disabled rgba(150, 150, 150, 0.8);
 
 * {
-    font-family: FiraCode;
-    font-weight: Bolder;
+    font-family: "JetBrains Mono Nerd Font";
+    font-weight: bold;
 }
 
 .control-center .notification-row:focus,
@@ -36,7 +36,7 @@
     background: @noti-bg;
     padding: 3px 10px 3px 6px;
     border-radius: 10px;
-    border: 2px solid @noti-border-color;
+    border: 1px solid @noti-border-color;
     margin: 0px;
 }
 
@@ -136,7 +136,7 @@
 
 .summary {
     font-size: 1rem;
-    font-weight: 200;
+    font-weight: bold;
     background: transparent;
     color: @text-color-alt;
     text-shadow: none
@@ -144,7 +144,7 @@
 
 .time {
     font-size: 1rem;
-    font-weight: 200;
+    font-weight: bold;
     background: transparent;
     color: @text-color;
     text-shadow: none;
@@ -153,7 +153,7 @@
 
 .body {
     font-size: 1rem;
-    font-weight: 200;
+    font-weight: bold;
     background: transparent;
     color: @text-color;
     text-shadow: none
diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default
index 6cf3dd64..c396277e 100644
--- a/config/waybar/configs/[BOT] Default
+++ b/config/waybar/configs/[BOT] Default
@@ -41,7 +41,7 @@
 	"custom/lock",
 	//],
 	"custom/separator#dot-line",
-	"custom/keybinds",	
+	"custom/hint",	
 	], 
 
 "modules-right": [
diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default
index 8ab71d6c..79ac0995 100644
--- a/config/waybar/configs/[TOP] Default
+++ b/config/waybar/configs/[TOP] Default
@@ -41,7 +41,7 @@
 	"custom/lock",
 	//],
 	"custom/separator#dot-line",
-	"custom/keybinds",	
+	"custom/hint",	
 	], 
 
 "modules-right": [
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 654fe5c6..1521b824 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -41,7 +41,7 @@
 	"custom/lock",
 	//],
 	"custom/separator#dot-line",
-	"custom/keybinds",	
+	"custom/hint",	
 	], 
 
 "modules-right": [
diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
new file mode 100644
index 00000000..31f3d6e5
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -0,0 +1,54 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v2 (Laptop)  - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"group/motherboard",
+	"custom/separator#blank",
+	"group/laptop",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"bluetooth",
+	"group/audio",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2
new file mode 100644
index 00000000..0b4c90d8
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default_v2
@@ -0,0 +1,52 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT v2 - Top ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"custom/menu",
+	"custom/light_dark",
+	"custom/separator#dot-line",
+	"group/motherboard",
+	"custom/separator#line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/swaync",
+	"custom/cava_mviz",
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#line",
+	"hyprland/workspaces#roman",
+	"custom/separator#line",
+	"idle_inhibitor",	
+	"custom/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"custom/separator#line",
+	"tray",
+	"mpris", 
+	"bluetooth",
+	"group/audio",
+	"keyboard-state",
+	"custom/keyboard",
+	"custom/lock",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index fed721be..f42f89d0 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -465,7 +465,7 @@
     "tooltip": true,
 },
       
-"custom/keybinds": {
+"custom/hint": {
     "format":"󰺁 HINT!",
     "exec": "echo ; echo  Key Hints SUPER H",
     "on-click": "~/.config/hypr/scripts/KeyHints.sh",
@@ -499,7 +499,7 @@
 },
     
 "custom/menu": {
-    "format": "{}",
+    "format": "{}",
     "exec": "echo ; echo 󱓟 app launcher",
     "interval" : 86400, // once every day
     "tooltip": true,
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index 187dac2f..3f344079 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -68,7 +68,7 @@ window#waybar.hidden {
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css
index 5f74fe8c..5ce97eac 100644
--- a/config/waybar/style/Catppuccin-Mocha.css
+++ b/config/waybar/style/Catppuccin-Mocha.css
@@ -74,7 +74,7 @@ window#waybar.hidden {
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css
index d08b53fe..89a3b9cf 100644
--- a/config/waybar/style/Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -129,7 +129,7 @@ tooltip {
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Mauve.css b/config/waybar/style/Mauve.css
index 86b64185..685025fc 100644
--- a/config/waybar/style/Mauve.css
+++ b/config/waybar/style/Mauve.css
@@ -151,7 +151,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Purpl.css b/config/waybar/style/Purpl.css
index 2e0e4f8f..0e463834 100644
--- a/config/waybar/style/Purpl.css
+++ b/config/waybar/style/Purpl.css
@@ -140,7 +140,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index bc9b202a..783ea1da 100644
--- a/config/waybar/style/Rose Pine.css
+++ b/config/waybar/style/Rose Pine.css
@@ -118,7 +118,7 @@ tooltip {
 #wireplumber,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index e60e275b..2f41cbb4 100644
--- a/config/waybar/style/Simple Pink.css
+++ b/config/waybar/style/Simple Pink.css
@@ -145,7 +145,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index 6c2af3c7..d4ee32df 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -128,7 +128,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index 5c99c520..04ca9248 100644
--- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
@@ -68,7 +68,7 @@ window#waybar.empty #window {
 #wireplumber,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
@@ -126,7 +126,7 @@ window#waybar.empty #window {
 }
 
 #custom-swaync,
-#custom-keybinds,
+#custom-hint,
 #tray {
 	color: aliceblue;
 }
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index dcb5bbc8..1a995dec 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css
+++ b/config/waybar/style/[Colored] Chroma Glow.css
@@ -116,7 +116,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index 49f8dbf0..5998227a 100644
--- a/config/waybar/style/[Colored] Translucent.css
+++ b/config/waybar/style/[Colored] Translucent.css
@@ -130,7 +130,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index 3dd64b45..9eab49ad 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -117,7 +117,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index c841c906..3c17abfd 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -108,7 +108,7 @@ tooltip label{
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index 8caa5cb8..df8808b4 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -72,7 +72,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
@@ -281,7 +281,7 @@ tooltip label{
 	background-color: #89dceb;
 }
 
-#custom-keybinds,
+#custom-hint,
 #pulseaudio {
 	background-color: #fab387;
 }
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index 75ba82b7..00baff3e 100644
--- a/config/waybar/style/[Dark] Golden Noir.css
+++ b/config/waybar/style/[Dark] Golden Noir.css
@@ -143,7 +143,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css
index be74c6be..a64649f2 100644
--- a/config/waybar/style/[Dark] Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Obsidian Edge.css
@@ -136,7 +136,7 @@ tooltip label {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index 25ccf5c7..9b3d5687 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css
+++ b/config/waybar/style/[Light] Monochrome Contrast.css
@@ -129,7 +129,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index f95daa0f..c245a596 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css
+++ b/config/waybar/style/[Light] Obsidian Glow.css
@@ -105,7 +105,7 @@ tooltip label {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css
index ba4e83ab..600b72d0 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css
+++ b/config/waybar/style/[Pywal] Chroma Edge.css
@@ -109,7 +109,7 @@ tooltip label{
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
index b1006398..90e2e7a5 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css
@@ -68,7 +68,7 @@ window#waybar.empty #window {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
@@ -124,7 +124,7 @@ window#waybar.empty #window {
     color: @rosewater;
 }
 
-#custom-keybinds,
+#custom-hint,
 #tray {
 	color: aliceblue;
 }
diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css
index ace2ea35..41a15f32 100644
--- a/config/waybar/style/[Pywal] Chroma Tally.css
+++ b/config/waybar/style/[Pywal] Chroma Tally.css
@@ -21,34 +21,45 @@ window#waybar {
 	border-color: @color2; 
 }
 
+#workspaces {
+	background: #0F1419;
+	padding: 0px 1px;
+	border-radius: 15px;
+	border: 0px;
+	font-style: normal;
+	color: #0F1419;
+}
+
+#taskbar button,
 #workspaces button {
-    color: #eceff4;
-    box-shadow: none;
-	text-shadow: none;
-    padding: 0px;
-    border-radius: 9px;
-    padding-left: 4px;
-    padding-right: 4px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+	padding: 0px 5px;
+	border-radius: 15px;
+	border: 0px;
+	color: #0F1419;
+	background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
+	opacity: 0.5;
+	transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
+#taskbar button.active,
 #workspaces button.active {
+	padding: 0px 5px;
 	border-radius: 15px;
-	background-color: @color2;
-    padding-left: 8px;
-    padding-right: 8px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+	border: 0px;
+	color: #0F1419;
+	background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+	opacity: 1.0;
+	min-width: 40px;
+	transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #workspaces button:hover {
-	color: @color2;
-	background-color: rgba(0,153,153,0);
-    padding-left: 2px;
-    padding-right: 2px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+	border-radius: 15px;
+	color: #0F1419;
+	background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+	opacity: 0.8;
+	transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+
 }
 
 #backlight,
@@ -74,7 +85,7 @@ window#waybar {
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
@@ -213,20 +224,6 @@ window#waybar {
 	color:#d08770;
 }
 
-#taskbar button.active {
-	background-color: #7f849c;
-    padding-left: 12px;
-    padding-right: 12px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
-    padding-left: 3px;
-    padding-right: 3px;
-    animation: gradient_f 20s ease-in infinite;
-    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
 #pulseaudio-slider slider {
 	min-width: 0px;
 	min-height: 0px;
diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Pywal] Colored.css
index aeccffb9..f52211bf 100644
--- a/config/waybar/style/[Pywal] Colored.css
+++ b/config/waybar/style/[Pywal] Colored.css
@@ -137,7 +137,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Pywal] Simple.css
index 138e926b..835d2cac 100644
--- a/config/waybar/style/[Pywal] Simple.css
+++ b/config/waybar/style/[Pywal] Simple.css
@@ -125,7 +125,7 @@ tooltip {
 #custom-backlight,
 #custom-cava_mviz,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index ea13145e..ca811682 100644
--- a/config/waybar/style/[Retro] Simple Style.css
+++ b/config/waybar/style/[Retro] Simple Style.css
@@ -67,7 +67,7 @@ window#waybar {
 #workspaces,
 #custom-backlight,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index 0f9b1760..430072dd 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Transparent] Crystal Clear.css
@@ -114,7 +114,7 @@ tooltip {
 #wireplumber,
 #workspaces,
 #custom-cycle_wall,
-#custom-keybinds,
+#custom-hint,
 #custom-keyboard,
 #custom-light_dark,
 #custom-lock,
diff --git a/copy.sh b/copy.sh
index 75958a16..2e94494c 100755
--- a/copy.sh
+++ b/copy.sh
@@ -3,7 +3,7 @@
 
 clear
 
-wallpaper=$HOME/Pictures/wallpapers/Fantasy-Landscape.png
+wallpaper=$HOME/Pictures/wallpapers/Lofi-Urban-Nightscape.png
 Waybar_Style="$HOME/.config/waybar/style/[Pywal] Chroma Tally.css"
 
 # Check if running as root. If root, script will exit
@@ -209,7 +209,7 @@ get_backup_dirname() {
   echo "back-up_${timestamp}"
 }
 
-for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync swaylock wal waybar wlogout; do 
+for DIR in btop cava hypr kitty Kvantum qt5ct qt6ct rofi swappy swaync wal waybar wlogout; do 
   DIRPATH=~/.config/"$DIR"
   if [ -d "$DIRPATH" ]; then 
     echo -e "${NOTE} - Config for $DIR found, attempting to back up."
@@ -249,15 +249,17 @@ printf "\n%.0s" {1..3}
 # Detect machine type and set Waybar configurations accordingly, logging the output
 if hostnamectl | grep -q 'Chassis: desktop'; then
     # Configurations for a desktop
-    ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
     rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" 2>&1 | tee -a "$LOG"
 else
     # Configurations for a laptop or any system other than desktop
-    ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
     rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default_v2" 2>&1 | tee -a "$LOG"
 fi
 
-printf "\n%.0s" {1..3}
+printf "\n%.0s" {1..2}
 
 # additional wallpapers
 echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0)"
@@ -296,7 +298,7 @@ done
 ln -sf "$Waybar_Style" "$HOME/.config/waybar/style.css" && \
 
 # initialize pywal to avoid config error on hyprland
-wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG"
+wal -i $wallpaper -s -t -n -e 2>&1 | tee -a "$LOG"
 
 #initial symlink for Pywal Dark and Light for Rofi Themes
 ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
diff --git a/wallpapers/Anime-Landscape2.png b/wallpapers/Anime-Landscape2.png
new file mode 100644
index 00000000..c8681762
--- /dev/null
+++ b/wallpapers/Anime-Landscape2.png
diff --git a/wallpapers/Anime-girl.jpg b/wallpapers/Anime-girl.jpg
deleted file mode 100644
index 092fe7c2..00000000
--- a/wallpapers/Anime-girl.jpg
+++ /dev/null
diff --git a/wallpapers/Fantasy-Landscape.png b/wallpapers/Lofi-Urban-Nightscape.png
index 79e13088..42dc718f 100644
--- a/wallpapers/Fantasy-Landscape.png
+++ b/wallpapers/Lofi-Urban-Nightscape.png