diff --git a/Emulator/sqlupdates/add_users_background_card_id.sql b/Database Updates/015_add_users_background_card_id.sql
similarity index 100%
rename from Emulator/sqlupdates/add_users_background_card_id.sql
rename to Database Updates/015_add_users_background_card_id.sql
diff --git a/Emulator/sqlupdates/custom_prefixes_setup.sql b/Database Updates/016_custom_prefixes_setup.sql
similarity index 68%
rename from Emulator/sqlupdates/custom_prefixes_setup.sql
rename to Database Updates/016_custom_prefixes_setup.sql
index 7d5b22c5..dd2b857a 100644
--- a/Emulator/sqlupdates/custom_prefixes_setup.sql
+++ b/Database Updates/016_custom_prefixes_setup.sql	
@@ -1,8 +1,3 @@
--- ============================================================
--- Custom Prefix System - Complete Setup
--- ============================================================
-
--- 1. Main user prefixes table
 CREATE TABLE IF NOT EXISTS `user_prefixes` (
     `id` INT(11) NOT NULL AUTO_INCREMENT,
     `user_id` INT(11) NOT NULL,
@@ -46,34 +41,6 @@ INSERT IGNORE INTO `custom_prefix_blacklist` (`word`) VALUES
     ('mod'),
     ('owner');
 
--- 4. Add effect column (if table already exists without it)
--- ALTER TABLE `user_prefixes` ADD COLUMN IF NOT EXISTS `effect` VARCHAR(50) NOT NULL DEFAULT '' AFTER `icon`;
-
--- ============================================================
--- Catalog page for custom prefixes
--- ============================================================
--- NOTE: Adjust parent_id to match your catalog parent category ID.
--- Example: parent_id = -1 for root, or the ID of your "Extra" / "Specials" category
-
-INSERT INTO `catalog_pages` (
-    `parent_id`, `caption`, `caption_save`, `icon_image`, `visible`, `enabled`,
-    `min_rank`, `page_layout`, `page_strings_1`, `page_strings_2`
-) VALUES (
-    -1,
-    'Custom Prefix',
-    'custom_prefix',
-    1,
-    1,
-    1,
-    1,
-    'custom_prefix',
-    'Create your own custom prefix!\rChoose text, colors, icon and effects to stand out in chat.',
-    ''
-);
-
--- ============================================================
--- Command texts (insert into emulator_texts if not present)
--- ============================================================
 INSERT IGNORE INTO `emulator_texts` (`key`, `value`) VALUES
     -- GivePrefix command
     ('commands.keys.cmd_give_prefix', 'giveprefix'),
@@ -105,11 +72,11 @@ INSERT IGNORE INTO `emulator_texts` (`key`, `value`) VALUES
     ('commands.succes.cmd_prefix_blacklist.added', 'Word "%word%" added to prefix blacklist.'),
     ('commands.succes.cmd_prefix_blacklist.removed', 'Word "%word%" removed from prefix blacklist.');
 
--- ============================================================
--- Permissions for prefix commands (add to permissions table)
--- ============================================================
-INSERT IGNORE INTO `permissions` (`id`, `rank_id`, `permission_name`, `setting_type`) VALUES
-    (NULL, 7, 'cmd_give_prefix', '1'),
-    (NULL, 7, 'cmd_list_prefixes', '1'),
-    (NULL, 7, 'cmd_remove_prefix', '1'),
-    (NULL, 7, 'cmd_prefix_blacklist', '1');
+INSERT IGNORE INTO permission_definitions
+(permission_key, max_value, rank_1, rank_2, rank_3, rank_4, rank_5, rank_6, rank_7)
+VALUES
+('cmd_give_prefix', '1', '0', '0', '0', '0', '0', '0', '1'),
+('cmd_list_prefixes', '1', '0', '0', '0', '0', '0', '0', '1'),
+('cmd_remove_prefix', '1', '0', '0', '0', '0', '0', '0', '1'),
+('cmd_prefix_blacklist', '1', '0', '0', '0', '0', '0', '0', '1');
+
diff --git a/Emulator/sqlupdates/catalog_admin_permission.sql b/Emulator/sqlupdates/catalog_admin_permission.sql
deleted file mode 100644
index 65eb459f..00000000
--- a/Emulator/sqlupdates/catalog_admin_permission.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- ============================================================
--- Catalog & Furni Admin Permission
--- Adds acc_catalogfurni permission to the permissions table
--- Required by: CatalogAdmin packet handlers (10050-10059)
--- ============================================================
-
--- 1. Add the column to the permissions table
-ALTER TABLE `permissions`
-    ADD COLUMN `acc_catalogfurni` ENUM('0','1') NOT NULL DEFAULT '0'
-    AFTER `acc_catalog_ids`;
-
--- 2. Enable for Administrator (rank 7) by default
-UPDATE `permissions` SET `acc_catalogfurni` = '1' WHERE `id` = 7;
-
--- Optional: enable for other ranks as needed
--- UPDATE `permissions` SET `acc_catalogfurni` = '1' WHERE `id` = 6; -- Super Mod
--- UPDATE `permissions` SET `acc_catalogfurni` = '1' WHERE `id` = 5; -- Moderator
diff --git a/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar
index 5eb2a3f1..1de4428a 100644
Binary files a/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar differ