diff --git a/.config/hypr/apps.conf b/.config/hypr/apps.conf
index 1867f24..2e8d082 100644
--- a/.config/hypr/apps.conf
+++ b/.config/hypr/apps.conf
@@ -11,4 +11,4 @@ $network-tray = nm-applet
 $bluetooth-tray = blueman-applet
 $clipboardManager = cliphist
 $clipboardManagerOptions =  list | $appMenu -dmenu | cliphist decode | wl-copy
-
+$themeSwitcher = ~/.config/scripts/rofiSelectWallpaper.sh
diff --git a/.config/hypr/keybinds.conf b/.config/hypr/keybinds.conf
index 3645e7b..407864f 100644
--- a/.config/hypr/keybinds.conf
+++ b/.config/hypr/keybinds.conf
@@ -11,6 +11,8 @@ bind = $mainMod, B, exec, $browser
 bind = $mainMod, A, exec, pidof $appMenu || $appMenu $appMenuOptions
 bind = $mainMod, W, exec, pidof $appMenu || $appMenu $windowMenuOptions
 
+bind = $mainMod CTRL, T, exec, $themeSwitcher
+
 bind = $mainMod, BackSpace, exec, pidof $logoutMenu || $logoutMenu $logoutMenuOptions
 
 bind=$mainMod CTRL,C,exec,pidof $clipboardManager || $clipboardManager $clipboardManagerOptions
@@ -67,10 +69,10 @@ bind = $mainMod CTRL, underscore, movetoworkspacesilent, 8
 bind = $mainMod CTRL, ccedilla, movetoworkspacesilent, 9
 bind = $mainMod CTRL, S, movetoworkspacesilent, special
 
-bind = , Print, exec, eval hyprshot -m output -m $($HOME/.config/hypr/getActiveMonitor.sh) --clipboard-only
+bind = , Print, exec, eval hyprshot -m output -m $($HOME/.config/scripts/getActiveMonitor.sh) --clipboard-only
 bind = SHIFT, Print, exec, hyprshot --mode=window --clipboard-only
 bind = CTRL, Print, exec, hyprshot --mode=region --clipboard-only
-bind = $mainMod, Print, exec, eval hyprshot -m output -m $($HOME/.config/hypr/getActiveMonitor.sh)
+bind = $mainMod, Print, exec, eval hyprshot -m output -m $($HOME/.config/scripts/getActiveMonitor.sh)
 bind = $mainMod SHIFT, Print, exec, hyprshot --mode=window
 bind = $mainMod CTRL, Print, exec, hyprshot --mode=region
 
diff --git a/.config/hypr/lastWallpaper.conf b/.config/hypr/lastWallpaper.conf
index aecf290..bb9f4f9 100644
--- a/.config/hypr/lastWallpaper.conf
+++ b/.config/hypr/lastWallpaper.conf
@@ -1 +1 @@
-exec-once = swww img ~/.config/assets/wallpaper/purple-wallpaper.jpg --transition-duration 1 --transition-type grow --transition-fps 60 --transition-pos 0.5,0.9
+exec-once = swww img ~/.config/assets/wallpaper/purple-wallpaper.jpg  --transition-duration 1 --transition-type grow --transition-fps 60 --transition-pos 0.5,0.9
diff --git a/.config/matugen/set-wallpaper.sh b/.config/matugen/set-wallpaper.sh
deleted file mode 100755
index 3737a36..0000000
--- a/.config/matugen/set-wallpaper.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-swww img --transition-duration 1 --transition-type grow --transition-fps 60 --transition-pos 0.5,0.9 $1
-if [ -z $2 ]; then
-  matugen image $1 -m dark
-else
-  matugen image $1 -m $2
-fi
-sed -i "s_\~.*--transition-duration_$1 --transition-duration_" ~/.config/hypr/lastWallpaper.conf
-sed -i "s_/\w*/\w*_\~_" ~/.config/hypr/lastWallpaper.conf
diff --git a/.config/hypr/getActiveMonitor.sh b/.config/scripts/getActiveMonitor.sh
similarity index 100%
rename from .config/hypr/getActiveMonitor.sh
rename to .config/scripts/getActiveMonitor.sh
diff --git a/.config/scripts/rofiSelectWallpaper.sh b/.config/scripts/rofiSelectWallpaper.sh
new file mode 100755
index 0000000..50c845e
--- /dev/null
+++ b/.config/scripts/rofiSelectWallpaper.sh
@@ -0,0 +1,4 @@
+availablewallpaper=$(ls ~/.config/assets/wallpaper/)
+availablewallpaper=$(sed "s_ _\n_g" <<<$availablewallpaper)
+chosenwallpaper=$(echo $availablewallpaper | sed "s_ _\n_g" | rofi -dmenu)
+~/.config/scripts/set-wallpaper.sh ~/.config/assets/wallpaper/$chosenwallpaper
diff --git a/.config/scripts/set-wallpaper.sh b/.config/scripts/set-wallpaper.sh
new file mode 100755
index 0000000..b9e77b9
--- /dev/null
+++ b/.config/scripts/set-wallpaper.sh
@@ -0,0 +1,10 @@
+swww img --transition-duration 1 --transition-type grow --transition-fps 60 --transition-pos 0.5,0.9 $1
+if [ -z $2 ]; then
+  matugen image $1 -m dark
+else
+  matugen image $1 -m $2
+fi
+wallpapername=$(sed "s_-wallpaper\.\w*__" <<<$(sed "s_.*wallpaper/__" <<<"$1"))
+wallpaperextension=$(sed "s_.*-wallpaper\.__" <<<"$1")
+wallpaper=$wallpapername-wallpaper.$wallpaperextension
+sed -i "s_wallpaper/[^ ]*\.\w*_wallpaper/${wallpaper}_" ~/.config/hypr/lastWallpaper.conf