diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 2f7f0e1f..ca7a7592 100755
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -6,8 +6,7 @@ source = ~/.config/hypr/configs/binds.conf
 source = ~/.config/hypr/configs/input.conf
 source = ~/.config/hypr/configs/misc.conf
 
-# Theme (Add the theme you want)
-source = ~/.config/hypr/themes/luna/luna.conf
+source = ~/.config/hypr/theme/theme.conf
 
 # Autostart
 exec-once = $HOME/.config/hypr/scripts/autostart/services
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 89fec7bb..71ad2ff4 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,4 +1,4 @@
-source = ./themes/luna/colors.conf
+source = ./theme/colors.conf
 
 $font = JetBrains Mono Nerd Font 10
 
@@ -8,7 +8,7 @@ general {
 
 background {
     monitor =
-    path = $HOME/.config/hypr/themes/luna/walls/flowers.png
+    path = $HOME/.config/hypr/theme/walls/flowers.png
     color = rgb($lavenderAlpha)
 
     blur_size = 4
@@ -29,9 +29,8 @@ input-field {
     dots_size = 0.2
     dots_spacing = 0.64
     dots_center = true
-    outer_color = rgb($lavenderAlpha)
-    inner_color = rgb($crustAlpha)
-    font_color = rgb($textAlpha)
+    inner_color = rgb($surface0Alpha)
+    font_color = rgb($subtext0Alpha)
     check_color = rgb($textYellow)
     fail_color = rgb($textRed)
     fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
@@ -62,7 +61,7 @@ label {
     monitor = DP-1
     text = Hey $USER!
     shadow_passes = 1
-    color = rgb($textAlpha)
+    color = rgb($subtext0Alpha)
     font_size = 20
     font_family = $font
     position = 0, -102
diff --git a/.config/hypr/plugins/hyprbars.conf b/.config/hypr/plugins/hyprbars.conf
index bc8f93a8..0fdf37ca 100644
--- a/.config/hypr/plugins/hyprbars.conf
+++ b/.config/hypr/plugins/hyprbars.conf
@@ -1,4 +1,4 @@
-source = ../themes/luna/colors.conf
+source = ../theme/colors.conf
 
 # Conf
 plugin {
diff --git a/.config/hypr/plugins/hyprexpo.conf b/.config/hypr/plugins/hyprexpo.conf
index ba4b177e..8e0b4879 100644
--- a/.config/hypr/plugins/hyprexpo.conf
+++ b/.config/hypr/plugins/hyprexpo.conf
@@ -1,4 +1,4 @@
-source = ../themes/luna/colors.conf
+source = ../theme/colors.conf
 
 # Conf
 plugin {
diff --git a/.config/hypr/plugins/hyprspace.conf b/.config/hypr/plugins/hyprspace.conf
index 84a261d4..8cfeabf5 100644
--- a/.config/hypr/plugins/hyprspace.conf
+++ b/.config/hypr/plugins/hyprspace.conf
@@ -1,4 +1,4 @@
-source = ../themes/luna/colors.conf
+source = ../theme/colors.conf
 
 # Conf
 plugin {
@@ -16,7 +16,7 @@ plugin {
         hideTopLayers = true
         hideOverlayLayers = true
         hideRealLayers = true
-        affectStrut = true
+        affectStrut = false
         workspaceBorderSize = 3
 
         # Behaviors
@@ -27,4 +27,4 @@ plugin {
 }
 
 # Keybinds
-bind = ALT, TAB, overview:toggle
+bind = ALT, ESCAPE, overview:toggle
diff --git a/.config/hypr/plugins/hyprtrails.conf b/.config/hypr/plugins/hyprtrails.conf
index 285a2e67..066daf84 100644
--- a/.config/hypr/plugins/hyprtrails.conf
+++ b/.config/hypr/plugins/hyprtrails.conf
@@ -1,4 +1,4 @@
-source = ../themes/luna/colors.conf
+source = ../theme/colors.conf
 
 # Conf
 plugin {
diff --git a/.config/hypr/pyprland.toml b/.config/hypr/pyprland.toml
index 5e607c88..b3c5887e 100644
--- a/.config/hypr/pyprland.toml
+++ b/.config/hypr/pyprland.toml
@@ -50,8 +50,8 @@ margin = 20
 lazy = true
 
 [wallpapers]
-path = "/home/matt/.config/hypr/themes/luna/walls/"
-interval = 60                                                                                                                                                                          # change every hour
-command = "swww img --transition-bezier 0.5,1.19,.8,.4 --transition-type wipe --transition-duration 2 --transition-fps 75 \"[file]\" && notify-send 'Wallpaper Changed' -i \"[file]\""
+path = "/home/matt/.config/hypr/theme/walls/"
+interval = 60                                                                                                                                                                                               # change every hour
+command = "swww img --transition-bezier 0.5,1.19,.8,.4 --transition-type wipe --transition-duration 2 --transition-fps 75 \"[file]\" && notify-send 'Wallpaper Changed' -i \"[file]\" --app-name=Wallpaper"
 clear_command = "swww clear"
 extensions = ["jpg", "png", "gif", "jpeg"]
diff --git a/.config/hypr/themes/luna/animations.conf b/.config/hypr/theme/animations.conf
similarity index 100%
rename from .config/hypr/themes/luna/animations.conf
rename to .config/hypr/theme/animations.conf
diff --git a/.config/hypr/themes/luna/colors.conf b/.config/hypr/theme/colors.conf
similarity index 100%
rename from .config/hypr/themes/luna/colors.conf
rename to .config/hypr/theme/colors.conf
diff --git a/.config/hypr/themes/luna/decoration.conf b/.config/hypr/theme/decoration.conf
similarity index 95%
rename from .config/hypr/themes/luna/decoration.conf
rename to .config/hypr/theme/decoration.conf
index da8d1c6b..f1e7e494 100644
--- a/.config/hypr/themes/luna/decoration.conf
+++ b/.config/hypr/theme/decoration.conf
@@ -12,8 +12,8 @@ general {
 decoration {
     rounding = 7
 
-    active_opacity = 0.95
-    inactive_opacity = 0.9
+    active_opacity = 0.92
+    inactive_opacity = 0.87
 
     blur {
         enabled = yes
diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/theme/rules.conf
similarity index 99%
rename from .config/hypr/themes/luna/rules.conf
rename to .config/hypr/theme/rules.conf
index 6bcb7e15..d5e909a0 100644
--- a/.config/hypr/themes/luna/rules.conf
+++ b/.config/hypr/theme/rules.conf
@@ -126,3 +126,5 @@ layerrule = animation fade, swayosd
 
 layerrule = animation fade, selection
 layerrule = animation fade, hyprlock
+
+layerrule = noanim, hyprpicker
diff --git a/.config/hypr/themes/luna/luna.conf b/.config/hypr/theme/theme.conf
similarity index 100%
rename from .config/hypr/themes/luna/luna.conf
rename to .config/hypr/theme/theme.conf
diff --git a/.config/hypr/themes/luna/walls/abstract.png b/.config/hypr/theme/walls/abstract.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/abstract.png
rename to .config/hypr/theme/walls/abstract.png
diff --git a/.config/hypr/themes/luna/walls/anime-skull.png b/.config/hypr/theme/walls/anime-skull.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/anime-skull.png
rename to .config/hypr/theme/walls/anime-skull.png
diff --git a/.config/hypr/themes/luna/walls/arch-chan.png b/.config/hypr/theme/walls/arch-chan.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/arch-chan.png
rename to .config/hypr/theme/walls/arch-chan.png
diff --git a/.config/hypr/themes/luna/walls/arch-os.png b/.config/hypr/theme/walls/arch-distros.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/arch-os.png
rename to .config/hypr/theme/walls/arch-distros.png
diff --git a/.config/hypr/themes/luna/walls/arch-logo.png b/.config/hypr/theme/walls/arch-logo.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/arch-logo.png
rename to .config/hypr/theme/walls/arch-logo.png
diff --git a/.config/hypr/themes/luna/walls/asteroid-miner.png b/.config/hypr/theme/walls/asteroid-miner.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/asteroid-miner.png
rename to .config/hypr/theme/walls/asteroid-miner.png
diff --git a/.config/hypr/themes/luna/walls/asteroids.png b/.config/hypr/theme/walls/asteroids.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/asteroids.png
rename to .config/hypr/theme/walls/asteroids.png
diff --git a/.config/hypr/themes/luna/walls/astronaut.png b/.config/hypr/theme/walls/astronaut.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/astronaut.png
rename to .config/hypr/theme/walls/astronaut.png
diff --git a/.config/hypr/themes/luna/walls/baby-star.png b/.config/hypr/theme/walls/baby-star.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/baby-star.png
rename to .config/hypr/theme/walls/baby-star.png
diff --git a/.config/hypr/themes/luna/walls/black-hole.png b/.config/hypr/theme/walls/black-hole.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/black-hole.png
rename to .config/hypr/theme/walls/black-hole.png
diff --git a/.config/hypr/themes/luna/walls/bridge.png b/.config/hypr/theme/walls/bridge.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/bridge.png
rename to .config/hypr/theme/walls/bridge.png
diff --git a/.config/hypr/themes/luna/walls/buildings.png b/.config/hypr/theme/walls/buildings.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/buildings.png
rename to .config/hypr/theme/walls/buildings.png
diff --git a/.config/hypr/themes/luna/walls/cafe.jpg b/.config/hypr/theme/walls/cafe.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/cafe.jpg
rename to .config/hypr/theme/walls/cafe.jpg
diff --git a/.config/hypr/themes/luna/walls/car-2.png b/.config/hypr/theme/walls/car-2.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/car-2.png
rename to .config/hypr/theme/walls/car-2.png
diff --git a/.config/hypr/themes/luna/walls/car.jpg b/.config/hypr/theme/walls/car.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/car.jpg
rename to .config/hypr/theme/walls/car.jpg
diff --git a/.config/hypr/themes/luna/walls/city.png b/.config/hypr/theme/walls/city.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/city.png
rename to .config/hypr/theme/walls/city.png
diff --git a/.config/hypr/themes/luna/walls/colorful-planets.jpg b/.config/hypr/theme/walls/colorful-planets.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/colorful-planets.jpg
rename to .config/hypr/theme/walls/colorful-planets.jpg
diff --git a/.config/hypr/themes/luna/walls/crystals.png b/.config/hypr/theme/walls/crystals.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/crystals.png
rename to .config/hypr/theme/walls/crystals.png
diff --git a/.config/hypr/themes/luna/walls/cyberpunk-2.png b/.config/hypr/theme/walls/cyberpunk-2.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/cyberpunk-2.png
rename to .config/hypr/theme/walls/cyberpunk-2.png
diff --git a/.config/hypr/themes/luna/walls/cyberpunk-3.png b/.config/hypr/theme/walls/cyberpunk-3.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/cyberpunk-3.png
rename to .config/hypr/theme/walls/cyberpunk-3.png
diff --git a/.config/hypr/themes/luna/walls/cyberpunk.png b/.config/hypr/theme/walls/cyberpunk.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/cyberpunk.png
rename to .config/hypr/theme/walls/cyberpunk.png
diff --git a/.config/hypr/themes/luna/walls/delorean.png b/.config/hypr/theme/walls/delorean.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/delorean.png
rename to .config/hypr/theme/walls/delorean.png
diff --git a/.config/hypr/themes/luna/walls/doom-slayer.png b/.config/hypr/theme/walls/doom-slayer.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/doom-slayer.png
rename to .config/hypr/theme/walls/doom-slayer.png
diff --git a/.config/hypr/themes/luna/walls/fireskull.png b/.config/hypr/theme/walls/fireskull.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/fireskull.png
rename to .config/hypr/theme/walls/fireskull.png
diff --git a/.config/hypr/themes/luna/walls/flower-camp-2.jpg b/.config/hypr/theme/walls/flower-camp-2.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/flower-camp-2.jpg
rename to .config/hypr/theme/walls/flower-camp-2.jpg
diff --git a/.config/hypr/themes/luna/walls/flower-camp.jpg b/.config/hypr/theme/walls/flower-camp.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/flower-camp.jpg
rename to .config/hypr/theme/walls/flower-camp.jpg
diff --git a/.config/hypr/themes/luna/walls/flowers.png b/.config/hypr/theme/walls/flowers.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/flowers.png
rename to .config/hypr/theme/walls/flowers.png
diff --git a/.config/hypr/themes/luna/walls/fuji-2.png b/.config/hypr/theme/walls/fuji-2.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/fuji-2.png
rename to .config/hypr/theme/walls/fuji-2.png
diff --git a/.config/hypr/themes/luna/walls/fuji.png b/.config/hypr/theme/walls/fuji.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/fuji.png
rename to .config/hypr/theme/walls/fuji.png
diff --git a/.config/hypr/themes/luna/walls/galaxies.png b/.config/hypr/theme/walls/galaxies.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/galaxies.png
rename to .config/hypr/theme/walls/galaxies.png
diff --git a/.config/hypr/themes/luna/walls/galaxy-2.png b/.config/hypr/theme/walls/galaxy-2.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/galaxy-2.png
rename to .config/hypr/theme/walls/galaxy-2.png
diff --git a/.config/hypr/themes/luna/walls/galaxy-3.png b/.config/hypr/theme/walls/galaxy-3.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/galaxy-3.png
rename to .config/hypr/theme/walls/galaxy-3.png
diff --git a/.config/hypr/themes/luna/walls/galaxy.png b/.config/hypr/theme/walls/galaxy.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/galaxy.png
rename to .config/hypr/theme/walls/galaxy.png
diff --git a/.config/hypr/themes/luna/walls/girl.png b/.config/hypr/theme/walls/girl.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/girl.png
rename to .config/hypr/theme/walls/girl.png
diff --git a/.config/hypr/themes/luna/walls/glass-room.png b/.config/hypr/theme/walls/glass-room.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/glass-room.png
rename to .config/hypr/theme/walls/glass-room.png
diff --git a/.config/hypr/themes/luna/walls/glitch.png b/.config/hypr/theme/walls/glitch.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/glitch.png
rename to .config/hypr/theme/walls/glitch.png
diff --git a/.config/hypr/themes/luna/walls/hyprland-logo.png b/.config/hypr/theme/walls/hyprland-logo.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/hyprland-logo.png
rename to .config/hypr/theme/walls/hyprland-logo.png
diff --git a/.config/hypr/themes/luna/walls/japan-city.png b/.config/hypr/theme/walls/japan-city.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/japan-city.png
rename to .config/hypr/theme/walls/japan-city.png
diff --git a/.config/hypr/themes/luna/walls/keyboards.png b/.config/hypr/theme/walls/keyboards.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/keyboards.png
rename to .config/hypr/theme/walls/keyboards.png
diff --git a/.config/hypr/themes/luna/walls/kurz.png b/.config/hypr/theme/walls/kurz.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/kurz.png
rename to .config/hypr/theme/walls/kurz.png
diff --git a/.config/hypr/themes/luna/walls/lake.png b/.config/hypr/theme/walls/lake.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/lake.png
rename to .config/hypr/theme/walls/lake.png
diff --git a/.config/hypr/themes/luna/walls/lifeform.png b/.config/hypr/theme/walls/lifeform.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/lifeform.png
rename to .config/hypr/theme/walls/lifeform.png
diff --git a/.config/hypr/themes/luna/walls/lofi.jpeg b/.config/hypr/theme/walls/lofi.jpeg
similarity index 100%
rename from .config/hypr/themes/luna/walls/lofi.jpeg
rename to .config/hypr/theme/walls/lofi.jpeg
diff --git a/.config/hypr/themes/luna/walls/maze.png b/.config/hypr/theme/walls/maze.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/maze.png
rename to .config/hypr/theme/walls/maze.png
diff --git a/.config/hypr/themes/luna/walls/megumin.png b/.config/hypr/theme/walls/megumin.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/megumin.png
rename to .config/hypr/theme/walls/megumin.png
diff --git a/.config/hypr/themes/luna/walls/montains.png b/.config/hypr/theme/walls/montains.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/montains.png
rename to .config/hypr/theme/walls/montains.png
diff --git a/.config/hypr/themes/luna/walls/nature.png b/.config/hypr/theme/walls/nature.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/nature.png
rename to .config/hypr/theme/walls/nature.png
diff --git a/.config/hypr/themes/luna/walls/nebula.png b/.config/hypr/theme/walls/nebula.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/nebula.png
rename to .config/hypr/theme/walls/nebula.png
diff --git a/.config/hypr/themes/luna/walls/neon-dim.png b/.config/hypr/theme/walls/neon-dim.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/neon-dim.png
rename to .config/hypr/theme/walls/neon-dim.png
diff --git a/.config/hypr/themes/luna/walls/neon-man.png b/.config/hypr/theme/walls/neon-man.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/neon-man.png
rename to .config/hypr/theme/walls/neon-man.png
diff --git a/.config/hypr/themes/luna/walls/neon.png b/.config/hypr/theme/walls/neon.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/neon.png
rename to .config/hypr/theme/walls/neon.png
diff --git a/.config/hypr/themes/luna/walls/night-city.png b/.config/hypr/theme/walls/night-city.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/night-city.png
rename to .config/hypr/theme/walls/night-city.png
diff --git a/.config/hypr/themes/luna/walls/night-lake.jpg b/.config/hypr/theme/walls/night-lake.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/night-lake.jpg
rename to .config/hypr/theme/walls/night-lake.jpg
diff --git a/.config/hypr/themes/luna/walls/night-street.jpg b/.config/hypr/theme/walls/night-street.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/night-street.jpg
rename to .config/hypr/theme/walls/night-street.jpg
diff --git a/.config/hypr/themes/luna/walls/nord-car.gif b/.config/hypr/theme/walls/nord-car.gif
similarity index 100%
rename from .config/hypr/themes/luna/walls/nord-car.gif
rename to .config/hypr/theme/walls/nord-car.gif
diff --git a/.config/hypr/themes/luna/walls/quasar.png b/.config/hypr/theme/walls/quasar.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/quasar.png
rename to .config/hypr/theme/walls/quasar.png
diff --git a/.config/hypr/themes/luna/walls/reaper.png b/.config/hypr/theme/walls/reaper.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/reaper.png
rename to .config/hypr/theme/walls/reaper.png
diff --git a/.config/hypr/themes/luna/walls/relax.jpg b/.config/hypr/theme/walls/relax.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/relax.jpg
rename to .config/hypr/theme/walls/relax.jpg
diff --git a/.config/hypr/themes/luna/walls/retro-mario.png b/.config/hypr/theme/walls/retro-mario.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/retro-mario.png
rename to .config/hypr/theme/walls/retro-mario.png
diff --git a/.config/hypr/themes/luna/walls/s4vitar.png b/.config/hypr/theme/walls/s4vitar.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/s4vitar.png
rename to .config/hypr/theme/walls/s4vitar.png
diff --git a/.config/hypr/themes/luna/walls/sakura.png b/.config/hypr/theme/walls/sakura.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/sakura.png
rename to .config/hypr/theme/walls/sakura.png
diff --git a/.config/hypr/themes/luna/walls/samurai-geralt.png b/.config/hypr/theme/walls/samurai-geralt.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/samurai-geralt.png
rename to .config/hypr/theme/walls/samurai-geralt.png
diff --git a/.config/hypr/themes/luna/walls/saturn.jpg b/.config/hypr/theme/walls/saturn.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/saturn.jpg
rename to .config/hypr/theme/walls/saturn.jpg
diff --git a/.config/hypr/themes/luna/walls/scenery.png b/.config/hypr/theme/walls/scenery.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/scenery.png
rename to .config/hypr/theme/walls/scenery.png
diff --git a/.config/hypr/themes/luna/walls/ship.png b/.config/hypr/theme/walls/ship.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/ship.png
rename to .config/hypr/theme/walls/ship.png
diff --git a/.config/hypr/themes/luna/walls/shore.png b/.config/hypr/theme/walls/shore.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/shore.png
rename to .config/hypr/theme/walls/shore.png
diff --git a/.config/hypr/themes/luna/walls/sky.png b/.config/hypr/theme/walls/sky.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/sky.png
rename to .config/hypr/theme/walls/sky.png
diff --git a/.config/hypr/themes/luna/walls/solar-system.png b/.config/hypr/theme/walls/solar-system.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/solar-system.png
rename to .config/hypr/theme/walls/solar-system.png
diff --git a/.config/hypr/themes/luna/walls/souls.png b/.config/hypr/theme/walls/souls.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/souls.png
rename to .config/hypr/theme/walls/souls.png
diff --git a/.config/hypr/themes/luna/walls/soundwave.png b/.config/hypr/theme/walls/soundwave.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/soundwave.png
rename to .config/hypr/theme/walls/soundwave.png
diff --git a/.config/hypr/themes/luna/walls/space.jpg b/.config/hypr/theme/walls/space.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/space.jpg
rename to .config/hypr/theme/walls/space.jpg
diff --git a/.config/hypr/themes/luna/walls/sparkles.png b/.config/hypr/theme/walls/sparkles.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/sparkles.png
rename to .config/hypr/theme/walls/sparkles.png
diff --git a/.config/hypr/themes/luna/walls/spill.jpg b/.config/hypr/theme/walls/spill.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/spill.jpg
rename to .config/hypr/theme/walls/spill.jpg
diff --git a/.config/hypr/themes/luna/walls/stars.png b/.config/hypr/theme/walls/stars.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/stars.png
rename to .config/hypr/theme/walls/stars.png
diff --git a/.config/hypr/themes/luna/walls/street.jpg b/.config/hypr/theme/walls/street.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/street.jpg
rename to .config/hypr/theme/walls/street.jpg
diff --git a/.config/hypr/themes/luna/walls/switch.png b/.config/hypr/theme/walls/switch.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/switch.png
rename to .config/hypr/theme/walls/switch.png
diff --git a/.config/hypr/themes/luna/walls/sword.jpg b/.config/hypr/theme/walls/sword.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/sword.jpg
rename to .config/hypr/theme/walls/sword.jpg
diff --git a/.config/hypr/themes/luna/walls/tiger.png b/.config/hypr/theme/walls/tiger.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/tiger.png
rename to .config/hypr/theme/walls/tiger.png
diff --git a/.config/hypr/themes/luna/walls/tokyo.png b/.config/hypr/theme/walls/tokyo.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/tokyo.png
rename to .config/hypr/theme/walls/tokyo.png
diff --git a/.config/hypr/themes/luna/walls/trigonometry.png b/.config/hypr/theme/walls/trigonometry.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/trigonometry.png
rename to .config/hypr/theme/walls/trigonometry.png
diff --git a/.config/hypr/themes/luna/walls/underwater.png b/.config/hypr/theme/walls/underwater.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/underwater.png
rename to .config/hypr/theme/walls/underwater.png
diff --git a/.config/hypr/themes/luna/walls/window-room.png b/.config/hypr/theme/walls/window-room.png
similarity index 100%
rename from .config/hypr/themes/luna/walls/window-room.png
rename to .config/hypr/theme/walls/window-room.png
diff --git a/.config/hypr/themes/luna/walls/windows-error.jpg b/.config/hypr/theme/walls/windows-error.jpg
similarity index 100%
rename from .config/hypr/themes/luna/walls/windows-error.jpg
rename to .config/hypr/theme/walls/windows-error.jpg