Merge pull request #10 from JaKooLit/Beta-v0.4

Hyprland-Dots V2

27 files changed, 259 insertions, 292 deletions

diff --git a/config/hypr/HelpFile.md b/config/hypr/HelpFile.md
index abec965e..e22a5d97 100644
--- a/config/hypr/HelpFile.md
+++ b/config/hypr/HelpFile.md
@@ -7,34 +7,28 @@
   Super = Windows Key
 
 # common operations
-  Super          h        *keyhint* (THIS DOCUMENT)
-  Super          Return   *term* (`foot`)
+  Super Shift    H        *keyhint* (THIS DOCUMENT)
+  Super          Return   *term* (`kitty`)
   Super          q        *quit* (kill focused window)
   Super   Shift  q        *quit* (kill focused window)
-  Super          d        *show app menu* (`wofi small`)
-  Super   Shift  d        *show app menu* (`wofi large`)
+  Super          d        *show app menu* (`rofi`)
 
-# Wofi scripts (Power menu, waybar-layout menu, wallpaper menu, etc, have small box)
-  - edit the scripts which are all located in ~/.config/hypr/scripts. You can set a desired Width and Height to your liking.
+# Scripts (Power menu, waybar-layout menu, wallpaper menu, etc, have small box)
+  - All the scripts all located in ~/.config/hypr/scripts.
   
 # wallpaper / styling stuff
   Super           w       *wallpaper shuffle* (right click on wallpaper   waybar module)
   Super   Shift   w       *waybar style-change* (middle click on wallpaper   waybar module)
-  Super   Ctrl    w       *wallpaper switcher* (click on wallpaper waybar    module)
+  Super   Ctrl    w       *wallpaper select* (click on wallpaper waybar    module) add more wallpaper in ~/Pictures/wallpapers
   
-  - right click on update   waybar module  *wallpaper cycle using swaybg* (no animations)
-  
-  - To change permanently the wallpaper edit the file in *~/.config/hypr/configs/Execs.conf*
+  - right click on update   waybar module  *wallpaper cycle using swww*
   
   - for the wallpaper styles and configurations, you can watch my video about it *https://youtu.be/6ZGzOjMJBe4*
   
-  - scripts for wallpaper stuff are located in *~/.config/hypr/scripts* file names `DarkLight.sh` `DarkLight-swaybg.sh` `Wallpaper.sh` `WallpaperSelect.sh` `WaybarStyles.sh` (last one for waybar)
-
-  - swww is broken if you use fractional scaling. Use swaybg as your wallpaper provider.
-  - Sample of swaybg for wallpaper is located in ~/.config/hypr/configs/Execs.conf
+  - scripts for wallpaper stuff are located in *~/.config/hypr/scripts* file names `DarkLight.sh` `Wallpaper.sh` `WallpaperSelect.sh` `WaybarStyles.sh` (last one for waybar)
 
 # Monitor, executables, keybindings, window rules, 
-  files are located in *~/.config/hypr/configs*
+  files are located in *~/.config/hypr/configs* . View with SUPER E
   Keybindings file is located here *~/.config/hypr/configs/Keybinds.conf*
 
 # screenshot may need to hold down the function (`fn`) key. You can change keybinds in *~/.config/hypr/configs/Keybinds.conf* 
@@ -42,40 +36,42 @@
   Super Shift PrintSrc(button) *active window screenshot*         
   Super CTRL SHIFT PrintScr    *full screenshot + timer (5s)*
   Super Alt PrintScr           *full screenshot + timer (10s)*
-  Super Shift S                *screenshot with swappy*
+  Super Shift S                *screenshot with swappy* (NOT AVAILABLE FOR DEBIAN/UBUNTU)
 
 # clipboard manager (cliphist)
-  Super Alt V   *launch the wofi menu of clipboard manager* 
-    - double click to select the clipboard. And paste as normal
-    - to clean up clipboard manager, launch foot (super enter) then type cliphist wipe
+  Super Alt V   *launch the rofi menu of clipboard manager* 
+    - click to select the clipboard. And paste as normal (CTRL V or right click menu)
+    - to clean up clipboard manager, launch kitty (super enter) then type ```cliphist wipe```
 
 # applications shortcuts
   Super   T		  *file manager* (`thunar`) - if installed
     
 # container layout
   Super   Shift   Space       *toggle tiling/floating mode*
+  Super   Shift   F           *toggle all windows in float mode*
   Super   left mouse button   *move window*
-  Super   right mouse button  *resize window* (note only in float mode)
+  Super   right mouse button  *resize window* (note! only in float mode)
 
 # workspaces
   Super         1 .. 0    *switch to workspace 1 .. 10*
   Super  Shift  1 .. 0    *move container to workspace 1 .. 10*
   Super   Tab             *cycle through workspaces*
+  Super Shift Tab         *cycle previous workspaces*
 
 # waybar customizations
-  - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/waybar/styles/ . By default, it is set to 100%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you.
+  - waybar font too big or too small. Edit the font-size in waybar styles located in ~/.config/waybar/styles/ . By default, it is set to 98%. After adjusting the GTK font scaling to your liking, edit all the waybar styles. Reduce or increase according to your needs. NOTE that its on percent %. You can also change to px whichever suits you. Note: This corresponds well with nwg-look
 
   - if you want 12h format instead of 24H format, edit the ~/.config/waybar/modules look for clock. delete the // and add // or delete the previous one
 
   - CPU Temperature:
     - a.) to change from deg C to deg F , edit the ~/.config/waybar/modules look for "temperature". Change the format to "format": "{temperatureF}°F {icon}",
-    - b.) to fix the temperature if not showing correctly, comment "thermal zone": 0 by putting // before. Delete the // on the "hwmon path". Refresh waybar by pressing CTRL SHIFT w. If still not showing correctly, navigate to /sys/class/hwmon/ and open each hwmon. Look for k10temp for amd. Not sure about intel cpu. and edit accordingly the hwmon path in the "temperature" waybar module.
+    - b.) to fix the temperature if not showing correctly, comment "thermal zone": 0 by putting // before. Delete the // on the "hwmon path". Refresh waybar by pressing SUPER SHIFT W or SUPER ALT W If still not showing correctly, navigate to /sys/class/hwmon/ and open each hwmon. Look for k10temp for amd. Not sure about intel cpu. and edit accordingly the hwmon path in the "temperature" waybar module.
     - b.1) use this function to easily identify the hwmon path. Ran this in your terminal    ``` for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done ```
   
-  - Weather.sh (Default weather app in waybar) edit ~/.config/hypr/scripts/Weather.sh and add your city. Make sure a major city in your Area. Delete rbn folder in ~/.cache and refresh waybar by either pressing super shift w or choose waybar layout super alt w.
+  - Weather.sh (Default weather app in waybar) edit ~/.config/hypr/scripts/Weather.sh or Weather.py and add your city. Make sure a major city in your Area. Delete rbn folder in ~/.cache and refresh waybar by either pressing SUPER SHIFT W or choose waybar layout SUPER ALT W. If wanted to use Weather.py for weather, edit weather module located in  ~/.config/waybar/modules.
 
 # Hyprland configurations
-  - *Hyprland* configuration files are in `~/.config/hypr/`
+  - *Hyprland* configuration files are in `~/.config/hypr/configs` Can view using SUPER E
   - files located in this folder can be edited using editor of your choice.
 
 # notes for nvidia gpu users
@@ -83,12 +79,9 @@
   
   - a guide on wiki - https://wiki.hyprland.org/Nvidia/
 
-
 # other notes
   - *Multimedia keys* - may not work for every keyboard may need to hold down the function (`fn`) key
   - Follow the wiki - https://wiki.hyprland.org/
   - Follow the github - https://github.com/hyprwm/Hyprland
 
-
-
-TO CLOSE THIS DOCUMENT - (vim) press esc :q!
+# If you dont like kitty or in your tty to get the pywal colors, edit ~/.config/kitty/kitty.conf or .zshrc (for zsh)
diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/configs/ENVariables.conf
index a705aa70..08541a1f 100644
--- a/config/hypr/configs/ENVariables.conf
+++ b/config/hypr/configs/ENVariables.conf
@@ -16,7 +16,7 @@ env = XDG_SESSION_TYPE,wayland
 #env = WLR_RENDERER,vulkan
 
 # firefox
-#env = MOZ_ENABLE_WAYLAND,1
+env = MOZ_ENABLE_WAYLAND,1
 
 # NVIDIA 
 # This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected
@@ -30,3 +30,5 @@ env = XDG_SESSION_TYPE,wayland
 #env = WLR_DRM_NO_ATOMIC,1
 #env = NVD_BACKEND,direct
 
+# FOR VM and POSSIBLY NVIDIA
+#env = WLR_RENDERER_ALLOW_SOFTWARE,1
diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 15bd093a..a5777762 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -3,10 +3,12 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $themes = $HOME/.config/hypr/themes
 $lock = $scriptsDir/LockScreen.sh
 
+# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
+exec-once = $HOME/.config/hypr/initial-boot.sh
+
 # wallpaper stuff
 exec-once = swww query || swww init 
 #exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  #using swww utility
-#exec-once = swaybg -m fill -i $HOME/Pictures/wallpapers/mecha-nostalgia.png #using swaybg
 
 # Startup
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@@ -15,13 +17,16 @@ exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESK
 # Polkit (Polkit Gnome / KDE)
 exec-once = $scriptsDir/Polkit.sh
 
+#gnome polkit for nixos
+#exec-once = $scriptsDir/Polkit-NixOS.sh
+
 # Portal Hyprland
 #exec-once = $scriptsDir/PortalHyprland.sh
 
 # starup apps
 exec-once = waybar &
 exec-once = dunst &
-exec-once = blueman-applet & 
+#exec-once = blueman-applet & 
 exec-once = nm-applet --indicator &
 #exec-once = rog-control-center &
 #exec-once = easyeffects --gapplication-service -l my_own
@@ -41,7 +46,10 @@ exec-once = $scriptsDir/RainbowBorders.sh
 # auto close of apps (timeout 5 secs)
 # exec-once = $scriptsDir/AppAutoClose.sh
 
-# sway-idle with lock
-exec-once = swayidle -w timeout 1200 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
-# without lock
+
+# sway-idle with lock only
+exec-once = swayidle -w timeout 1200 '$lock' timeout 1200
+# sway-idle with lock and sleep
+#exec-once = swayidle -w timeout 1200 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
+# sway idle without lock
 #exec-once = swayidle -w  timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 3c0a00a1..11a2d719 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -3,7 +3,7 @@
 $mainMod = SUPER
 $files = thunar
 $browser = firefox
-$term = foot
+$term = kitty
 $hyprDir = $HOME/.config/hypr
 $scriptsDir = $HOME/.config/hypr/scripts
 
@@ -11,53 +11,42 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $AirplaneMode = $scriptsDir/AirplaneMode.sh
 $backlight = $scriptsDir/Brightness.sh
 $ChangeBlur = $scriptsDir/ChangeBlur.sh
-$ChangeLayout = $scriptsDir/ChangeLayout.sh
-$ChangeLayoutMenu = $scriptsDir/ChangeLayoutMenu.sh
-$Clipboard = $scriptsDir/ClipManager.sh
 $DarkLight = $scriptsDir/DarkLight.sh
-$GameMode = $scriptsDir/GameMode.sh
-$Help = $scriptsDir/Help.sh
 $kbacklight = $scriptsDir/BrightnessKbd.sh
 $LidSwitch = $scriptsDir/LidSwitch.sh
 $LockScreen = $scriptsDir/LockScreen.sh
 $Media = $scriptsDir/MediaCtrl.sh
-$QuickEdit = $scriptsDir/QuickEdit.sh
 $screenshot = $scriptsDir/ScreenShot.sh
 $touchpad = $scriptsDir/TouchPad.sh
 $volume = $scriptsDir/Volume.sh
-$wallpaper = $scriptsDir/Wallpaper.sh
-$wallpaperSelect = $scriptsDir/WallpaperSelect.sh
 $waybar = $scriptsDir/Waybar.sh
-$waybarStyle = $scriptsDir/WaybarStyles.sh
-$wlogout = $scriptsDir/Wlogout.sh
-$Wofi = $scriptsDir/Wofi.sh
-$WofiBeats = $scriptsDir/WofiBeats.sh
-$WofiBig = $scriptsDir/WofiBig.sh
-$WofiEmoji = $scriptsDir/WofiEmoji.sh
 
+
+bind = SUPER, Y, exec, rofi -show run -theme
 # see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, C, exec, hyprctl reload
-bind = $mainMod SHIFT, D, exec, $WofiBig
-bind = $mainMod, D, exec, $Wofi
+bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi run,drun,filebrowser
+#bind = CTRL, D, exec, pkill rofi || rofi -dmenu
 bind = $mainMod SHIFT, Q, killactive, 
 bind = $mainMod SHIFT, Space, togglefloating, 
 bind = $mainMod, F, fullscreen
 bind = $mainMod, Q, killactive,
 bind = $mainMod, Return, exec, $term
 bind = $mainMod, T, exec, $files
-bind = CTRL ALT, L, exec, $LockScreen
-bind = CTRL ALT, P, exec, $wlogout
-bind = $mainMod CTRL, S, exec, $WofiBeats
-bind = $mainMod ALT, E, exec, $WofiEmoji
-bind = $mainMod, W, exec, $wallpaper swaybg
-bind = $mainMod SHIFT, W, exec, $waybarStyle
-bind = $mainMod CTRL, W, exec, $wallpaperSelect
-bind = $mainMod ALT, W, exec, $ChangeLayoutMenu
-bind = $mainMod, H, exec, $Help
-bind = $mainMod, E, exec, $QuickEdit
+bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
+bind = CTRL ALT, P, exec, $scriptsDir/Wlogout.sh
+bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh
+bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh
+bind = $mainMod, W, exec, $scriptsDir/Wallpaper.sh swww
+bind = $mainMod SHIFT, W, exec, $scriptsDir/WaybarStyles.sh
+bind = $mainMod CTRL, W, exec, $scriptsDir/WallpaperSelect.sh
+bind = $mainMod ALT, W, exec, $scriptsDir/ChangeLayoutMenu.sh
+bind = $mainMod SHIFT, H, exec, $scriptsDir/Help.sh
+bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh
+bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
 bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar
-bind = $mainMod SHIFT, G, exec, $GameMode
+bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh
 
 #bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 #bind = $mainMod SHIFT, Y, exec, $term --class clock -T clock -e tty-clock -c -C 7 -r -s -f "%A, %B, %d"
@@ -70,9 +59,9 @@ bind = $mainMod, K, layoutmsg, cycleprev
 bind = $mainMod, M, exec, hyprctl dispatch splitratio 0.3
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
-bind = $mainMod, Space, exec, $ChangeLayout
-bind = $mainMod ALT, V, exec, $Clipboard
-
+bind = $mainMod, Space, exec, $scriptsDir/ChangeLayout.sh
+bind = $mainMod ALT, V, exec, $scriptsDir/ClipManager.sh
+bind = $mainMod SHIFT, F, exec, hyprctl dispatch workspaceopt allfloat
 # group
 bind = $mainMod, G, togglegroup
 bind = $mainMod, tab, workspace, m+1
diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf
index 4587d6b0..f7299e6a 100644
--- a/config/hypr/configs/Monitors.conf
+++ b/config/hypr/configs/Monitors.conf
@@ -9,12 +9,11 @@ monitor=,preferred,auto,1
 # my G15 Laptop
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
-#monitor = DP-2, preferred, auto, 1 #my Samsung Odyssey-G7
+#monitor = DP-2, preferred, auto, 1 
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
 
-
-# QEMU
+# QEMU-KVM or any virtual box
 #monitor = Virtual-1, 1920x1080@60,auto,1
 
 # Hi Refresh Rate
diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf
index 13d8bf19..87fb04dc 100644
--- a/config/hypr/configs/Settings.conf
+++ b/config/hypr/configs/Settings.conf
@@ -2,7 +2,7 @@
 ## JaKooLit Github - https://github.com/JaKooLit
 
 # blurls = waybar
-blurls = wofi
+#blurls = rofi
 
 dwindle {
   pseudotile = yes
@@ -134,7 +134,7 @@ misc {
   enable_swallow = true
   no_direct_scanout = true #for fullscreen games
   focus_on_activate = false
-  swallow_regex = ^(foot)$
+  swallow_regex = ^(kitty)$
 }
 
 binds {
diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/configs/WindowRules.conf
index 8ca3396b..42da0e2b 100644
--- a/config/hypr/configs/WindowRules.conf
+++ b/config/hypr/configs/WindowRules.conf
@@ -3,12 +3,14 @@
 
 windowrule = float, org.kde.polkit-kde-authentication-agent-1
 windowrule = float, nm-connection-editor|blueman-manager
-windowrule = float, viewnior|pavucontrol
+windowrule = float, pavucontrol
 windowrule = float, nwg-look|qt5ct|mpv
 windowrule = float, onedriver|onedriver-launcher
-windowrule = float, swayimg|zoom
-windowrule = float, wofi
+windowrule = float, viewnior|swayimg
+windowrule = float, zoom
+windowrule = float, rofi
 windowrule = float, gnome-system-monitor
+windowrule = float, yad
 
 #windowrule = noblur,gamescope
 #windowrule = fullscreen,gamescope
@@ -19,10 +21,13 @@ windowrule = center,^(pavucontrol) # Make sure to delete this line if uncommen t
 #windowrule = size 533 533,^(pavucontrol) # These are optionals. But recommended
 
 # windowrule v2
+
+windowrulev2 = float, class:^([Vv]iewnior)$
+
 windowrulev2 = workspace 1, class:^(thunderbird)$
 windowrulev2 = workspace 2, class:^(firefox)$
 windowrulev2 = workspace 2, class:^(Firefox-esr)$
-windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ #this is on arch
+windowrulev2 = workspace 2, class:^(Microsoft-edge-beta)$ 
 windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5 silent, class:^([Ss]team)$,title:^([Ss]team)$
@@ -33,13 +38,21 @@ windowrulev2 = workspace 7 silent, class:^(WebCord)$
 windowrulev2 = workspace 9 silent, class:^(audacious)$
 
 #opacity (transparent) #enable as desired
+windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(firefox)$
 windowrulev2 = opacity 0.9 0.7, class:^([Tt]hunar)$
+windowrulev2 = opacity 0.8 0.6, class:^(pcmanfm-qt)$
+windowrulev2 = opacity 0.9 0.7, class:^(gedit)$
 #windowrulev2 = opacity 0.8 0.7, class:^(foot)$
+windowrulev2 = opacity 0.8 0.7, class:^(kitty)$
 #windowrulev2 = opacity 0.9 0.7, class:^(mousepad)$
 windowrulev2 = opacity 0.9 0.7, class:^(codium-url-handler)$
 windowrulev2 = opacity 0.9 0.7, class:^(VSCodium)$
+windowrulev2 = opacity 0.9 0.7, class:^(yad)$
 
+#layerrule = unset,class:^([Rr]ofi)$
+#layerrule = blur,class:^([Rr]ofi)$
+#layerrule = ignorezero, <rofi>
 
 #windowrulev2 = bordercolor rgb(EE4B55) rgb(880808), fullscreen:1
 #windowrulev2 = bordercolor rgb(282737) rgb(1E1D2D), floating:1
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
new file mode 100644
index 00000000..d5ce3233
--- /dev/null
+++ b/config/hypr/initial-boot.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# THIS SCRIPT CAN BE DELETED ONCE BOOTED!!
+
+# A bash script designed to ran it only once dotfiles installed
+# Check if a marker file exists.
+if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
+
+	# Check if the ~/.cache/wal directory exists
+	if [ ! -d ~/.cache/wal ]; then
+    	printf " Initializing pywal........\n\n"
+    	# Check if the ~/Pictures/wallpapers directory exists
+    	if [ -d ~/Pictures/wallpapers ]; then
+        	# Run wal with random wallpapers from ~/Pictures/wallpapers
+        	wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 
+        	echo "Pywal initialized"
+		fi
+	fi
+
+	#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"
+	
+	# Initial scripts to load inorder to have a proper wallpaper waybar and pywal themes
+	exec $HOME/.config/hypr/scripts/Wallpaper.sh &
+	
+    # Create a marker file to indicate that the script has been executed.
+    touch ~/.config/hypr/.initial_startup_done
+fi
+
+
diff --git a/config/hypr/scripts/ChangeLayoutMenu.sh b/config/hypr/scripts/ChangeLayoutMenu.sh
index 52e6aa34..bebe0c0f 100755
--- a/config/hypr/scripts/ChangeLayoutMenu.sh
+++ b/config/hypr/scripts/ChangeLayoutMenu.sh
@@ -5,27 +5,6 @@
 CONFIG="$HOME/.config/waybar/configs"
 WCONFIG="$HOME/.config/waybar/config"
 
-#wofi configs
-CONFIGB="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-WOFICONFIGS="$HOME/.config/wofi/configs"
-WOFICONFIG="$HOME/.config/wofi/config"
-
-# wofi window config (in %)
-WIDTH=12
-HEIGHT=40
-
-## Wofi Command
-wofi_command="wofi --show dmenu \
-			--prompt choose...
-			--conf $CONFIGB --style $STYLE --color $COLORS \
-			--width=$WIDTH% --height=$HEIGHT% \
-			--cache-file=/dev/null \
-			--hide-scroll --no-actions \
-			--matching=fuzzy"
-
-
 menu(){
 printf "1. default\n" 
 printf "2. plasma-style\n" 
@@ -44,59 +23,46 @@ printf "14. no panel"
 }
 
 main() {
-    choice=$(menu | ${wofi_command} | cut -d. -f1)
+    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cut -d. -f1)
     case $choice in
     1)
         ln -sf "$CONFIG/config-default" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     2)
         ln -sf "$CONFIG/config-plasma" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-plasma" "$WOFICONFIG"
         ;;
     3)
         ln -sf "$CONFIG/config-gnome" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-gnome" "$WOFICONFIG"
         ;;
     4)
         ln -sf "$CONFIG/config-simple" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     5)
         ln -sf "$CONFIG/config-simple2" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     6)
         ln -sf "$CONFIG/config-dual" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     7)
         ln -sf "$CONFIG/config-left" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     8)
         ln -sf "$CONFIG/config-right" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     9)
         ln -sf "$CONFIG/config-dual-TL" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     10)
         ln -sf "$CONFIG/config-dual-TR" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     11)
         ln -sf "$CONFIG/config-dual-BL" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     12)
         ln -sf "$CONFIG/config-dual-BR" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
     13)
         ln -sf "$CONFIG/config-all" "$WCONFIG"
-        ln -sf "$WOFICONFIGS/config-default" "$WOFICONFIG"
         ;;
 	14)
         if pgrep -x "waybar" >/dev/null; then
@@ -109,9 +75,9 @@ main() {
     esac
 }
 
-# Check if wofi is already running
-if pidof wofi >/dev/null; then
-    pkill wofi
+# Check if rofi is already running
+if pidof rofi >/dev/null; then
+    pkill rofi
     exit 0
 else
     main
diff --git a/config/hypr/scripts/ClipManager.sh b/config/hypr/scripts/ClipManager.sh
index a171b39c..eb717eaa 100755
--- a/config/hypr/scripts/ClipManager.sh
+++ b/config/hypr/scripts/ClipManager.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
+#   
+# Clipboard Manager
 
-# WOFI STYLES
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
-if [[ ! $(pidof wofi) ]]; then
-  cliphist list | wofi --show dmenu --prompt 'Search...' \
-    --conf ${CONFIG} --style ${STYLE} --color ${COLORS} \
-    --width=600 --height=400 | cliphist decode | wl-copy
+if [[ ! $(pidof rofi) ]]; then
+	cliphist list | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cliphist decode | wl-copy
 else
-	pkill wofi
-fi
\ No newline at end of file
+	pkill rofi
+fi
diff --git a/config/hypr/scripts/DarkLight-swaybg.sh b/config/hypr/scripts/DarkLight-swaybg.sh
deleted file mode 100755
index ad8aa199..00000000
--- a/config/hypr/scripts/DarkLight-swaybg.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-set -x
-# Define the path
-wallpaper_path="$HOME/Pictures/wallpapers/Dynamic-Wallpapers"
-hypr_config_path="$HOME/.config/hypr"
-waybar_config="$HOME/.config/waybar"
-dunst_config="$HOME/.config/dunst"
-wofi_config="$HOME/.config/wofi"
-
-# Tokyo Night
-light_gtk_theme="Tokyonight-Light-B"
-dark_gtk_theme="Tokyonight-Dark-B"
-light_icon_theme="TokyoNight-SE"
-dark_icon_theme="TokyoNight-SE"
-
-# Define functions for notifying user and updating symlinks
-notify_user() {
-	notify-send -h string:x-canonical-private-synchronous:sys-notify -u normal "Switching to $1 mode"
-}
-
-# Determine the current wallpaper mode by checking a configuration file
-if [ "$(cat ~/.wallpaper_mode)" = "light" ]; then
-  current_mode="light"
-  next_mode="dark"
-else
-  current_mode="dark"
-  next_mode="light"
-fi
-path_param=$(echo $next_mode | sed 's/.*/\u&/')
-
-notify_user "$next_mode"
-ln -sf "${waybar_config}/style/style-${next_mode}.css" "${waybar_config}/style.css"
-ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/styles/dunstrc"
-ln -sf "${wofi_config}/styles/style-${next_mode}.css" "${wofi_config}/style.css"
-
-gtk_theme="${next_mode}_gtk_theme"
-icon_theme="${next_mode}_icon_theme"
-
-gsettings set org.gnome.desktop.interface gtk-theme "${!gtk_theme}"
-gsettings set org.gnome.desktop.interface icon-theme "${!icon_theme}"
-
-# Find the next wallpaper if one exists
-current_wallpaper="$(cat ~/.current_wallpaper)"
-next_wallpaper="${current_wallpaper/_"$current_mode"/_"$next_mode"}"
-
-if ! [ -f "$next_wallpaper" ]; then
-  next_wallpaper="$(find "${wallpaper_path/"${path_param}"}" -type f -iname "*_"${next_mode}".jpg" -print0 | shuf -n1 -z | xargs -0)"
-fi
-
-swaybg -m fill -i "${next_wallpaper}" &
-
-# Update the configuration file to reflect the new wallpaper mode and current wallpaper
-echo "$next_mode" > ~/.wallpaper_mode
-echo "$next_wallpaper" > ~/.current_wallpaper
-
-sleep 2
-exec ~/.config/hypr/scripts/Refresh.sh &
\ No newline at end of file
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 86c1f111..f20dc337 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -5,7 +5,10 @@ wallpaper_path="$HOME/Pictures/wallpapers/Dynamic-Wallpapers"
 hypr_config_path="$HOME/.config/hypr"
 waybar_config="$HOME/.config/waybar"
 dunst_config="$HOME/.config/dunst"
-wofi_config="$HOME/.config/wofi"
+
+dark_rofi_pywal="$HOME/.cache/wal/colors-rofi-dark.rasi"
+light_rofi_pywal="$HOME/.cache/wal/colors-rofi-light.rasi"
+
 
 # Tokyo Night
 light_gtk_theme="Tokyonight-Light-B"
@@ -28,7 +31,7 @@ notify_user() {
 }
 
 # Determine the current wallpaper mode by checking a configuration file
-if [ "$(cat ~/.wallpaper_mode)" = "light" ]; then
+if [ "$(cat ~/.cache/.wallpaper_mode)" = "light" ]; then
   current_mode="light"
   next_mode="dark"
 else
@@ -38,9 +41,15 @@ fi
 path_param=$(echo $next_mode | sed 's/.*/\u&/')
 
 notify_user "$next_mode"
-ln -sf "${waybar_config}/style/style-${next_mode}.css" "${waybar_config}/style.css"
-ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/dunstrc"
-ln -sf "${wofi_config}/styles/style-${next_mode}.css" "${wofi_config}/style.css"
+ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css"
+ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/styles/dunstrc"
+
+# Symlink for rofi theme
+if [ "$next_mode" = "dark" ]; then
+  ln -sf $dark_rofi_pywal "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
+else
+  ln -sf $light_rofi_pywal "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
+fi
 
 gtk_theme="${next_mode}_gtk_theme"
 icon_theme="${next_mode}_icon_theme"
@@ -49,7 +58,7 @@ gsettings set org.gnome.desktop.interface gtk-theme "${!gtk_theme}"
 gsettings set org.gnome.desktop.interface icon-theme "${!icon_theme}"
 
 # Find the next wallpaper if one exists
-current_wallpaper="$(cat ~/.current_wallpaper)"
+current_wallpaper="$(cat ~/.cache/.current_wallpaper)"
 next_wallpaper="${current_wallpaper/_"$current_mode"/_"$next_mode"}"
 
 if ! [ -f "$next_wallpaper" ]; then
@@ -59,8 +68,9 @@ fi
 $swww "${next_wallpaper}" $effect
 
 # Update the configuration file to reflect the new wallpaper mode and current wallpaper
-echo "$next_mode" > ~/.wallpaper_mode
-echo "$next_wallpaper" > ~/.current_wallpaper
+echo "$next_mode" > ~/.cache/.wallpaper_mode
+echo "$next_wallpaper" > ~/.cache/.current_wallpaper
 
+exec ~/.config/hypr/scripts/PywalSwww.sh &
 sleep 2
 exec ~/.config/hypr/scripts/Refresh.sh &
\ No newline at end of file
diff --git a/config/hypr/scripts/Help.sh b/config/hypr/scripts/Help.sh
index 565e7e52..38bcdec8 100755
--- a/config/hypr/scripts/Help.sh
+++ b/config/hypr/scripts/Help.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-foot -e vim ~/.config/hypr/HelpFile.md
+
+mousepad ~/.config/hypr/HelpFile.md
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
new file mode 100755
index 00000000..d95c16e1
--- /dev/null
+++ b/config/hypr/scripts/KeyHints.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+yad --width=1000 --height=900 \
+--center \
+--title="Keybindings" \
+--no-buttons \
+--list \
+--column=Key: \
+--column=Description: \
+--column=Command: \
+--timeout=30 \
+--timeout-indicator=bottom \
+"ESC" "close this app" "" "=" "SUPER KEY" "(SUPER KEY)" \
+" enter" "Terminal" "(kitty)" \
+" D" "App Launcher" "(rofi)" \
+" T" "Open File Manager" "(Thunar)" \
+" Q or  Shift Q  " "close focused app" "(kill)" \
+" Alt V" "Clipboard Manager" "(cliphist)" \
+" CTRL W" "Choose wallpaper" "(swww)" \
+" W" "Random wallpaper" "(swww)" \
+" ALT W" "Choose waybar layout" "(waybar layout)" \
+" SHIFT W" "cycle waybar styles" "(waybar styles)" \
+" Print" "screenshot" "(grim)" \
+" Shift Print" "screenshot region" "(grim + slurp)" \
+" Shift S" "screenshot region" "(swappy)" \
+"CTRL ALT P" "power-menu" "(wlogout)" \
+"CTRL ALT L" "screen lock" "(swaylock)" \
+"CTRL ALT Del" "Hyprland Exit" "(SAVE YOUR WORK!!!)" \
+" F" "Fullscreen" "Toggles to full screen" \
+" Spacebar" "Toggle Dwindle | Master Layout" "Hyprland Layout" \
+" Shift F" "Toggle all windows to float" "" \
+" SHIFT H" "Launch a small Help File" "" \
+" H" "Launch this app" "" \
+" E" "View or EDIT Keybinds, Settings, Monitor" "" \
+"" "" "" \
+"" "This window will auto-close in 30 secs" ""\
+
+
diff --git a/config/hypr/scripts/Polkit-NixOS.sh b/config/hypr/scripts/Polkit-NixOS.sh
new file mode 100755
index 00000000..ef5e74fd
--- /dev/null
+++ b/config/hypr/scripts/Polkit-NixOS.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Find all polkit-gnome executables in the Nix store
+polkit_gnome_paths=$(find /nix/store -name 'polkit-gnome-authentication-agent-1' -type f 2>/dev/null)
+
+for polkit_gnome_path in $polkit_gnome_paths; do
+  # Extract the directory containing the executable
+  polkit_gnome_dir=$(dirname "$polkit_gnome_path")
+
+  # Check if the executable is valid and exists
+  if [ -x "$polkit_gnome_dir/polkit-gnome-authentication-agent-1" ]; then
+    # Start the Polkit-GNOME Authentication Agent
+    "$polkit_gnome_dir/polkit-gnome-authentication-agent-1" &
+    exit 0
+  fi
+done
+
+# If no valid executable is found, report an error
+echo "No valid Polkit-GNOME Authentication Agent executable found."
\ No newline at end of file
diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh
index 0142e774..70a994ed 100755
--- a/config/hypr/scripts/PortalHyprland.sh
+++ b/config/hypr/scripts/PortalHyprland.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 sleep 1
-pkill xdg-desktop-portal-hyprland
-pkill xdg-desktop-portal-wlr
-pkill xdg-desktop-portal-gnome
-pkill xdg-desktop-portal
+killall xdg-desktop-portal-hyprland
+killall xdg-desktop-portal-wlr
+killall xdg-desktop-portal-gnome
+killall xdg-desktop-portal
 sleep 1
 /usr/lib/xdg-desktop-portal-hyprland &
 /usr/libexec/xdg-desktop-portal-hyprland &
diff --git a/config/hypr/scripts/PywalSwww.sh b/config/hypr/scripts/PywalSwww.sh
new file mode 100755
index 00000000..1532878a
--- /dev/null
+++ b/config/hypr/scripts/PywalSwww.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Define the path to the swww cache directory
+cache_dir="$HOME/.cache/swww/"
+
+# Get a list of monitor outputs
+monitor_outputs=($(ls "$cache_dir"))
+
+# Loop through monitor outputs
+for output in "${monitor_outputs[@]}"; do
+    # Construct the full path to the cache file
+    cache_file="$cache_dir$output"
+
+    # Check if the cache file exists for the current monitor output
+    if [ -f "$cache_file" ]; then
+        # Get the wallpaper path from the cache file
+        wallpaper_path=$(cat "$cache_file")
+
+        # Copy the wallpaper to the location Rofi can access
+        cp "$wallpaper_path" "$HOME/.config/rofi/.current_wallpaper"
+
+        break  # Exit the loop after processing the first found monitor output
+    fi
+done
+
+
+# execute pywal
+
+wal -i $wallpaper_path
\ No newline at end of file
diff --git a/config/hypr/scripts/QuickEdit.sh b/config/hypr/scripts/QuickEdit.sh
index 87380858..36213c54 100755
--- a/config/hypr/scripts/QuickEdit.sh
+++ b/config/hypr/scripts/QuickEdit.sh
@@ -1,25 +1,7 @@
 #!/bin/bash
 
-# WOFI STYLES
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
 hyprDir="$HOME/.config/hypr/configs"
 
-# wofi window config (in %)
-WIDTH=10
-HEIGHT=20
-
-## Wofi Command
-wofi_command="wofi --show dmenu \
-			--prompt choose to view or edit...
-			--conf $CONFIG --style $STYLE --color $COLORS \
-			--width=$WIDTH% --height=$HEIGHT% \
-			--cache-file=/dev/null \
-			--hide-scroll --no-actions \
-			--matching=fuzzy"
-
 menu(){
   printf "1. view Env-variables\n"
   printf "2. view Rules\n"
@@ -30,25 +12,25 @@ menu(){
 }
 
 main() {
-    choice=$(menu | ${wofi_command} | cut -d. -f1)
+    choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
-            foot -e vim "$hyprDir/ENVariables.conf"
+            kitty -e nano "$hyprDir/ENVariables.conf"
             ;;
         2)
-            foot -e vim "$hyprDir/WindowRules.conf"
+            kitty -e nano "$hyprDir/WindowRules.conf"
             ;;
         3)
-            foot -e vim "$hyprDir/Execs.conf"
+            kitty -e nano "$hyprDir/Execs.conf"
             ;;
         4)
-            foot -e vim "$hyprDir/Keybinds.conf"
+            kitty -e nano "$hyprDir/Keybinds.conf"
             ;;
         5)
-            foot -e vim "$hyprDir/Monitors.conf"
+            kitty -e nano "$hyprDir/Monitors.conf"
             ;;
         6)
-            foot -e vim "$hyprDir/Settings.conf"
+            kitty -e nano "$hyprDir/Settings.conf"
             ;;
         *)
             ;;
diff --git a/config/hypr/scripts/Refresh.sh b/config/hypr/scripts/Refresh.sh
index 0d32ba6f..8b9597d1 100755
--- a/config/hypr/scripts/Refresh.sh
+++ b/config/hypr/scripts/Refresh.sh
@@ -3,7 +3,7 @@
 SCRIPTSDIR=$HOME/.config/hypr/scripts
 
 # Kill already running process
-_ps=(waybar mako dunst wofi)
+_ps=(waybar mako dunst rofi)
 for _prs in "${_ps[@]}"; do
 	if [[ $(pidof ${_prs}) ]]; then
 		pkill ${_prs}
diff --git a/config/hypr/scripts/WofiBeats.sh b/config/hypr/scripts/RofiBeats.sh
index 0a3b5739..37c1bba6 100755
--- a/config/hypr/scripts/WofiBeats.sh
+++ b/config/hypr/scripts/RofiBeats.sh
@@ -1,22 +1,7 @@
 #!/bin/bash
 ## Files
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-iDIR="$HOME/.config/dunst/icons"
-
-# wofi window config (in %)
-WIDTH=12
-HEIGHT=30
 
-## Wofi Command
-wofi_command="wofi --show dmenu \
-			--prompt choose...
-			--conf $CONFIG --style $STYLE --color $COLORS \
-			--width=$WIDTH% --height=$HEIGHT% \
-			--cache-file=/dev/null \
-			--hide-scroll --no-actions \
-			--matching=fuzzy"
+iDIR="$HOME/.config/dunst/icons"
 
 notification(){
   notify-send -h string:x-canonical-private-synchronous:sys-notify -u normal -i "$iDIR/music.png" "Playing now: " "$@" 
@@ -34,7 +19,8 @@ printf "8. Youtube Remix\n"
 printf "9. Korean Drama OST"
 }
 main() {
-choice=$(menu | ${wofi_command} | cut -d. -f1)
+choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi | cut -d. -f1)
+
 case $choice in
 1)
 	notification "Lofi Girl ☕️🎶";
diff --git a/config/hypr/scripts/WofiEmoji.sh b/config/hypr/scripts/RofiEmoji.sh
index 88c1b199..4540f577 100755
--- a/config/hypr/scripts/WofiEmoji.sh
+++ b/config/hypr/scripts/RofiEmoji.sh
@@ -1,16 +1,7 @@
 #!/bin/bash
 
-# WOFI STYLES
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
-# wofi window config (in %)
-WIDTH=40
-HEIGHT=40
-
 sed '1,/^### DATA ###$/d' $0 | 
-wofi --show dmenu -i --conf ${CONFIG} --style ${STYLE} --color ${COLORS} --width=$WIDTH% --height=$HEIGHT% |
+rofi -dmenu | 
 cut -d ' ' -f 1 | tr -d '\n' | wl-copy
 
 exit
diff --git a/config/hypr/scripts/Wallpaper.sh b/config/hypr/scripts/Wallpaper.sh
index db186269..20c367cc 100755
--- a/config/hypr/scripts/Wallpaper.sh
+++ b/config/hypr/scripts/Wallpaper.sh
@@ -45,4 +45,8 @@ case "$1" in
 	*)
 		change_current
 		;;
-esac
\ No newline at end of file
+esac
+
+exec $HOME/.config/hypr/scripts/PywalSwww.sh &
+sleep 1
+exec $HOME/.config/hypr/scripts/Refresh.sh
\ No newline at end of file
diff --git a/config/hypr/scripts/WallpaperSelect.sh b/config/hypr/scripts/WallpaperSelect.sh
index fbe65d39..f56f6df7 100755
--- a/config/hypr/scripts/WallpaperSelect.sh
+++ b/config/hypr/scripts/WallpaperSelect.sh
@@ -8,10 +8,6 @@ FPS=30
 TYPE="simple"
 DURATION=3
 
-# wofi window config (in %)
-WIDTH=10
-HEIGHT=30
-
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
 PICS=($(ls ${DIR} | grep -e ".jpg$" -e ".jpeg$" -e ".png$" -e ".gif$"))
@@ -20,24 +16,13 @@ PICS=($(ls ${DIR} | grep -e ".jpg$" -e ".jpeg$" -e ".png$" -e ".gif$"))
 RANDOM_PIC=${PICS[ $RANDOM % ${#PICS[@]} ]}
 RANDOM_PIC_NAME="${#PICS[@]}. random"
 
-# WOFI STYLES
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
 # to check if swaybg is running
 if [[ $(pidof swaybg) ]]; then
   pkill swaybg
 fi
 
-## Wofi Command
-wofi_command="wofi --show dmenu \
-			--prompt choose...
-			--conf $CONFIG --style $STYLE --color $COLORS \
-			--width=$WIDTH% --height=$HEIGHT% \
-			--cache-file=/dev/null \
-			--hide-scroll --no-actions \
-			--matching=fuzzy"
+## Rofi Command
+rofi_command="rofi -dmenu -config ~/.config/rofi/config-short.rasi"
 
 menu(){
     # Here we are looping in the PICS array that is composed of all images in the $DIR folder
@@ -56,7 +41,7 @@ menu(){
 swww query || swww init
 
 main() {
-    choice=$(menu | ${wofi_command})
+    choice=$(menu | ${rofi_command})
 
     # no choice case
     if [[ -z $choice ]]; then return; fi
@@ -71,14 +56,18 @@ main() {
     swww img ${DIR}/${PICS[$pic_index]} $SWWW_PARAMS
 }
 
-# Check if wofi is already running
-if pidof wofi >/dev/null; then
-    pkill wofi
+# Check if rofi is already running
+if pidof rofi >/dev/null; then
+    pkill rofi
     exit 0
 else
     main
 fi
 
+exec $HOME/.config/hypr/scripts/PywalSwww.sh &
+
+exec $HOME/.config/hypr/scripts/Refresh.sh
+
 # Uncomment to launch something if a choice was made 
 # if [[ -n "$choice" ]]; then
     # Restart Waybar
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index 3bfb3681..b6819ed5 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -17,7 +17,9 @@ elif [ "$THEMEIS" == "mauve" ]; then
 elif [ "$THEMEIS" == "light" ]; then
     SWITCHTO="-dark"
 elif [ "$THEMEIS" == "dark" ]; then
-    SWITCHTO="-uline"      
+    SWITCHTO="-uline"
+elif [ "$THEMEIS" == "uline" ]; then
+    SWITCHTO="-pywal"      
 else
     SWITCHTO="-default"
 fi
diff --git a/config/hypr/scripts/Weather.py b/config/hypr/scripts/Weather.py
index a364f7e1..154c1589 100755
--- a/config/hypr/scripts/Weather.py
+++ b/config/hypr/scripts/Weather.py
@@ -61,7 +61,7 @@ WEATHER_CODES = {
 data = {}
 
 
-weather = requests.get("https://wttr.in/{city}?format=j1").json()
+weather = requests.get(f"https://wttr.in/{city}?format=j1").json()
 
 
 def format_time(time):
diff --git a/config/hypr/scripts/Wofi.sh b/config/hypr/scripts/Wofi.sh
deleted file mode 100755
index 9b78bee0..00000000
--- a/config/hypr/scripts/Wofi.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-CONFIG="$HOME/.config/wofi/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
-if [[ ! $(pidof wofi) ]]; then
-	wofi --show drun --prompt 'Search...' --conf ${CONFIG} --style ${STYLE} --color ${COLORS}
-else
-	pkill wofi
-fi
diff --git a/config/hypr/scripts/WofiBig.sh b/config/hypr/scripts/WofiBig.sh
deleted file mode 100755
index 31d98900..00000000
--- a/config/hypr/scripts/WofiBig.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-CONFIG="$HOME/.config/wofi/WofiBig/config"
-STYLE="$HOME/.config/wofi/style.css"
-COLORS="$HOME/.config/wofi/colors"
-
-if [[ ! $(pidof wofi) ]]; then
-	wofi --show drun --prompt 'Search...' --conf ${CONFIG} --style ${STYLE} --color ${COLORS}
-else
-	pkill wofi
-fi