diff --git a/data/plugins-and-themes.yml b/data/plugins-and-themes.yml
index 754c361..1075970 100644
--- a/data/plugins-and-themes.yml
+++ b/data/plugins-and-themes.yml
@@ -366,7 +366,7 @@ plugins:
     added_at: '2024-06-01'
     updated_at: '2024-06-26'
   - name: NBT Utils
-    repo: kybe236/rusherhack-nbt-utils
+    repo: KybesRusherhackPlugins/nbt-utils
     description: Rusher nbt paste and copy.
     creator:
       name: kybe236
@@ -380,7 +380,7 @@ plugins:
     added_at: '2024-07-06'
     updated_at: '2024-07-06'
   - name: Rusherhack Executer
-    repo: kybe236/rusherhack-executer
+    repo: KybesRusherhackPlugins/executer
     description: Executes commands and resolves `<player>` to every player online.
     creator:
       name: kybe236
@@ -407,7 +407,7 @@ plugins:
     added_at: '2024-07-15'
     updated_at: '2024-07-15'
   - name: Open Folder
-    repo: kybe236/rusherhack-open-folder
+    repo: KybesRusherhackPlugins/open-folder
     description: Opens the folder for the module with a button click.
     creator:
       name: kybe236
@@ -423,7 +423,7 @@ plugins:
     added_at: '2024-07-23'
     updated_at: '2024-07-23'
   - name: Mace Kill
-    repo: kybe236/rusherhack-mace-kill
+    repo: KybesRusherhackPlugins/mace-kill
     description: One shot pretty much all mobs with a mace.
     creator:
       name: kybe236
@@ -453,7 +453,7 @@ plugins:
     added_at: '2024-07-24'
     updated_at: '2024-07-24'
   - name: Middleclick Wind Charge
-    repo: kybe236/rusherhack-middleclick-wind-charge
+    repo: KybesRusherhackPlugins/middleclick-wind-charge
     description: Allows you to throw windcharges with the middle mouse button and also jump at the same time so you can boost jump.
     creator:
       name: kybe236
@@ -559,7 +559,7 @@ plugins:
     added_at: '2023-10-25'
     updated_at: '2023-10-26'
   - name: Remote Control
-    repo: kybe236/rusherhack-remote-controle
+    repo: KybesRusherhackPlugins/remote-controle
     description: A plugin for remote controlling RusherHacks.
     creator:
       name: kybe236
@@ -587,7 +587,7 @@ plugins:
     added_at: '2024-05-22'
     updated_at: '2024-08-12'
   - name: TNT Bomber
-    repo: kybe236/rusher-tnt-bomber
+    repo: KybesRusherhackPlugins/tnt-bomber
     description: A plugin to automate TNT bombing in Minecraft.
     creator:
       name: kybe236
@@ -710,7 +710,7 @@ plugins:
     added_at: '2024-06-18'
     updated_at: '2024-08-28'
   - name: dc-chat-logger
-    repo: kybe236/dc-chat-logger
+    repo: KybesRusherhackPlugins/dc-chat-logger
     description: A plugin for logging chat messages to discord.
     creator:
       name: kybe236
@@ -780,7 +780,7 @@ plugins:
     added_at: '2024-04-12'
     updated_at: '2024-11-28'
   - name: rusher-elytra-eta
-    repo: kybe236/rusher-elytra-eta
+    repo: KybesRusherhackPlugins/elytra-eta
     description: A rusherhack plugin that allows you to see the ETA of all Elytras in the player's inventory.
     creator:
       name: kybe236
@@ -797,7 +797,7 @@ plugins:
     added_at: '2024-09-01'
     updated_at: '2024-09-01'
   - name: rusher-silent-close
-    repo: kybe236/rusher-silent-close
+    repo: KybesRusherhackPlugins/silent-container-close
     description: Keeps Container GUI open
     creator:
       name: kybe236
@@ -825,7 +825,7 @@ plugins:
     added_at: '2024-09-19'
     updated_at: '2024-12-31'
   - name: rusher-gtranslate
-    repo: kybe236/rusher-gtranslate
+    repo: KybesRusherhackPlugins/google-translate
     description: A plugin that integrates Google Translate into RusherHack for translating chat messages.
     creator:
       name: kybe236
@@ -839,7 +839,7 @@ plugins:
     added_at: '2024-09-03'
     updated_at: '2025-05-09'
   - name: rusher-matrix-nofall
-    repo: kybe236/rusher-matrix-nofall
+    repo: KybesRusherhackPlugins/matrix-nofall
     description: No Fall by setting isFalling flag in movement packets to false (tested on 6b6t).
     creator:
       name: kybe236
@@ -853,7 +853,7 @@ plugins:
     added_at: '2024-09-05'
     updated_at: '2024-09-05'
   - name: rusher-autoportal
-    repo: kybe236/rusher-autoportal
+    repo: KybesRusherhackPlugins/auto-portal
     description: Automatically breaks blocks to place obsidian and activate the nether portal.
     creator:
       name: kybe236
@@ -867,7 +867,7 @@ plugins:
     added_at: '2024-09-05'
     updated_at: '2025-05-18'
   - name: rusher-air-place
-    repo: kybe236/rusher-air-place
+    repo: KybesRusherhackPlugins/air-place
     description: A plugin that allows placing blocks in the air in Minecraft.
     creator:
       name: kybe236
@@ -881,7 +881,7 @@ plugins:
     added_at: '2024-09-07'
     updated_at: '2024-09-07'
   - name: rusher-hold-spamm-space
-    repo: kybe236/rusher-hold-spamm-space
+    repo: KybesRusherhackPlugins/space-spammer
     description: A plugin that automatically spams or holds the space bar.
     creator:
       name: kybe236
@@ -895,7 +895,7 @@ plugins:
     added_at: '2024-09-07'
     updated_at: '2024-10-13'
   - name: rusher-auto-bed-bomber
-    repo: kybe236/rusher-auto-bed-bomber
+    repo: KybesRusherhackPlugins/auto-bed-bomber
     description: A plugin that automates bed bombing in Minecraft.
     creator:
       name: kybe236
@@ -909,7 +909,7 @@ plugins:
     added_at: '2024-09-08'
     updated_at: '2024-09-26'
   - name: rusher-crystal-spin
-    repo: kybe236/rusher-crystal-spin
+    repo: KybesRusherhackPlugins/crystal-spin
     description: A plugin that makes end crystals spin faster or slower.
     creator:
       name: kybe236
@@ -940,7 +940,7 @@ plugins:
     added_at: '2024-09-12'
     updated_at: '2024-09-26'
   - name: rusher-autokit
-    repo: kybe236/rusher-autokit
+    repo: KybesRusherhackPlugins/autokit
     description: A plugin that automatically equips your preferred kit.
     creator:
       name: kybe236
@@ -1039,7 +1039,7 @@ plugins:
     added_at: '2024-12-22'
     updated_at: '2024-12-27'
   - name: Rusher Discord Notifications
-    repo: kybe236/rusher-discord-notifications
+    repo: KybesRusherhackPlugins/discord-notifications
     description: Sends notifications from RusherHacks to a Discord channel.
     creator:
       name: kybe236
@@ -1095,7 +1095,7 @@ plugins:
     added_at: '2025-01-26'
     updated_at: '2025-07-03'
   - name: Rusher Item Saver
-    repo: kybe236/rusher-item-saver
+    repo: KybesRusherhackPlugins/item-saver
     description: A RusherHacks plugin that saves items from being lost.
     creator:
       name: kybe236
@@ -1109,7 +1109,7 @@ plugins:
     added_at: '2025-02-08'
     updated_at: '2025-02-08'
   - name: RusherHack Mace Swap
-    repo: kybe236/rusherhack-mace-swap
+    repo: KybesRusherhackPlugins/mace-swap
     description: A RusherHacks plugin that automatically swaps to a mace when attacking.
     creator:
       name: kybe236
@@ -1180,7 +1180,7 @@ plugins:
     added_at: '2025-02-15'
     updated_at: '2025-10-29'
   - name: Rusherhack Streamer Mode
-    repo: kybe236/rusherhack-coord-spoofer
+    repo: KybesRusherhackPlugins/streamer-mode
     description: A core plugin for spoofing player coordinates in RusherHack.
     creator:
       name: kybe236
@@ -1194,7 +1194,7 @@ plugins:
     added_at: '2025-02-20'
     updated_at: '2025-08-14'
   - name: Rusher Auto Item Frame Dupe
-    repo: kybe236/rusher-auto-item-frame-dupe
+    repo: KybesRusherhackPlugins/auto-item-frame-dupe
     description: A plugin for automating item frame duplication in RusherHack.
     creator:
       name: kybe236
@@ -1222,7 +1222,7 @@ plugins:
     added_at: '2025-04-15'
     updated_at: '2025-06-10'
   - name: RusherHack Piston Pusher
-    repo: kybe236/rusherhack-piston-pusher
+    repo: KybesRusherhackPlugins/piston-pusher
     description: A plugin that automates pushing end crystals with pistons to attack players in RusherHack.
     creator:
       name: kybe236
@@ -1252,7 +1252,7 @@ plugins:
     added_at: '2025-04-26'
     updated_at: '2025-04-26'
   - name: Rusher Grown ESP
-    repo: kybe236/rusher-grown-esp
+    repo: KybesRusherhackPlugins/crop-esp-nuker
     description: ESP plugin for RusherHack that highlights grown crops and useful farm blocks.
     creator:
       name: kybe236
@@ -1320,7 +1320,7 @@ plugins:
     added_at: '2025-06-06'
     updated_at: '2025-06-06'
   - name: Rusher-Vault-Helper
-    repo: kybe236/rusher-vault-helper
+    repo: KybesRusherhackPlugins/vault-helper
     description: Marks vaults for you and can play a sound when you render a vault.
     creator:
       name: kybe236
@@ -1338,7 +1338,7 @@ plugins:
     added_at: '2025-06-07'
     updated_at: '2025-06-07'
   - name: Rusher-Inventory-Drag
-    repo: kybe236/rusher-inventory-drag
+    repo: KybesRusherhackPlugins/inventory-drag
     description: Allows you to drag items in your inventory while holding shift.
     creator:
       name: kybe236
@@ -1432,7 +1432,7 @@ plugins:
     added_at: '2025-06-24'
     updated_at: '2025-06-25'
   - name: rusherhack-kybes-utils
-    repo: kybe236/rusherhack-kybes-utils
+    repo: KybesRusherhackPlugins/kybes-utils
     description: encrypted chat (CryptoChat) with key management and chunking, auto-mock/quote/reply with regex filters, death-message reactions, random sentence/whisper, and a new in-game User Info window (column view).
     creator:
       name: kybe236
@@ -1463,7 +1463,7 @@ plugins:
     added_at: '2025-06-14'
     updated_at: '2025-06-16'
   - name: rusher-auto-kit-maker
-    repo: kybe236/rusher-auto-kit-maker
+    repo: KybesRusherhackPlugins/auto-kit-maker
     description: Automatically builds kits inside shulkers.
     creator:
       name: kybe236
@@ -1508,7 +1508,7 @@ plugins:
     added_at: '2025-08-04'
     updated_at: '2025-08-23'
   - name: AutoRegear
-    repo: kybe236/auto-regear
+    repo: KybesRusherhackPlugins/auto-regear
     description: Automatically equips a saved kit from a chest, matching items and enchantments with configurable sensitivity. Includes commands for saving, renaming, listing, and removing kits.
     creator:
       name: kybe236