diff --git a/files/system/usr/share/hyprland/hyprland.conf b/files/system/usr/share/hypr/hyprland.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf
rename to files/system/usr/share/hypr/hyprland.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/autostart.conf b/files/system/usr/share/hypr/hyprland.conf.d/autostart.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/autostart.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/autostart.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/browser.conf b/files/system/usr/share/hypr/hyprland.conf.d/browser.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/browser.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/browser.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/discord_workspace.conf b/files/system/usr/share/hypr/hyprland.conf.d/discord_workspace.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/discord_workspace.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/discord_workspace.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/env_vars.conf b/files/system/usr/share/hypr/hyprland.conf.d/env_vars.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/env_vars.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/env_vars.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/game_workspace.conf b/files/system/usr/share/hypr/hyprland.conf.d/game_workspace.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/game_workspace.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/game_workspace.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf b/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf
similarity index 88%
rename from files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf
index 0d25b59..d610a2c 100644
--- a/files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf
+++ b/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf
@@ -5,7 +5,7 @@ $fileManager = dolphin
 $menu = rofi -show drun
 #$menu = ags request -i launcher show
 $screenshot = grim -g "$(slurp -d)" - | wl-copy
-$powermenu = /usr/share/hyprland/scripts/local-lua /usr/share/hyprland/scripts/powermenu.lua
+$powermenu = /usr/share/hypr/scripts/local-lua /usr/share/hypr/scripts/powermenu.lua
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf b/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/arrow_move_window.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/media_binds.conf b/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/media_binds.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/media_binds.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/media_binds.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf b/files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/keybinds.conf.d/workspace_binds.conf
diff --git a/files/system/usr/share/hyprland/hyprland.conf.d/terminal.conf b/files/system/usr/share/hypr/hyprland.conf.d/terminal.conf
similarity index 100%
rename from files/system/usr/share/hyprland/hyprland.conf.d/terminal.conf
rename to files/system/usr/share/hypr/hyprland.conf.d/terminal.conf
diff --git a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_close_clients b/files/system/usr/share/hypr/scripts/hypr_power/hypr_close_clients
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/hypr_power/hypr_close_clients
rename to files/system/usr/share/hypr/scripts/hypr_power/hypr_close_clients
diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout b/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout
new file mode 100755
index 0000000..7f43629
--- /dev/null
+++ b/files/system/usr/share/hypr/scripts/hypr_power/hypr_logout
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+/usr/share/hypr/scripts/hypr_power/hypr_close_clients
+
+hyprctl dispatch exit
diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot b/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot
new file mode 100755
index 0000000..dd1cf54
--- /dev/null
+++ b/files/system/usr/share/hypr/scripts/hypr_power/hypr_reboot
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+/usr/share/hypr/scripts/hypr_power/hypr_close_clients
+
+systemctl reboot
diff --git a/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown b/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown
new file mode 100755
index 0000000..8d29831
--- /dev/null
+++ b/files/system/usr/share/hypr/scripts/hypr_power/hypr_shutdown
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+/usr/share/hypr/scripts/hypr_power/hypr_close_clients
+
+systemctl poweroff
diff --git a/files/system/usr/share/hyprland/scripts/load-kwallet-apps.sh b/files/system/usr/share/hypr/scripts/load-kwallet-apps.sh
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/load-kwallet-apps.sh
rename to files/system/usr/share/hypr/scripts/load-kwallet-apps.sh
diff --git a/files/system/usr/share/hyprland/scripts/load-kwallet.sh b/files/system/usr/share/hypr/scripts/load-kwallet.sh
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/load-kwallet.sh
rename to files/system/usr/share/hypr/scripts/load-kwallet.sh
diff --git a/files/system/usr/share/hyprland/scripts/local-lua b/files/system/usr/share/hypr/scripts/local-lua
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/local-lua
rename to files/system/usr/share/hypr/scripts/local-lua
diff --git a/files/system/usr/share/hyprland/scripts/menu.lua b/files/system/usr/share/hypr/scripts/menu.lua
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/menu.lua
rename to files/system/usr/share/hypr/scripts/menu.lua
diff --git a/files/system/usr/share/hyprland/scripts/powermenu.lua b/files/system/usr/share/hypr/scripts/powermenu.lua
similarity index 100%
rename from files/system/usr/share/hyprland/scripts/powermenu.lua
rename to files/system/usr/share/hypr/scripts/powermenu.lua
diff --git a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_logout b/files/system/usr/share/hyprland/scripts/hypr_power/hypr_logout
deleted file mode 100755
index 3abbbe4..0000000
--- a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_logout
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/share/hyprland/scripts/hypr_power/hypr_close_clients
-
-hyprctl dispatch exit
diff --git a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_reboot b/files/system/usr/share/hyprland/scripts/hypr_power/hypr_reboot
deleted file mode 100755
index d39cd0d..0000000
--- a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_reboot
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/usr/share/hyprland/scripts/hypr_power/hypr_close_clients
-
-systemctl reboot
diff --git a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_shutdown b/files/system/usr/share/hyprland/scripts/hypr_power/hypr_shutdown
deleted file mode 100755
index 2b6dd03..0000000
--- a/files/system/usr/share/hyprland/scripts/hypr_power/hypr_shutdown
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-~/bin/hypr_power/hypr_close_clients
-
-systemctl poweroff