diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml
index a4a00697..cb78aeda 100644
--- a/config/allthetweaks-common.toml
+++ b/config/allthetweaks-common.toml
@@ -21,5 +21,5 @@
 [packversionminrev]
 	#Pack Minor Version Revision : X
 	#Range: 0 ~ 32768
-	minorrev = 2
+	minorrev = 3
 
diff --git a/config/tombstone-common.toml b/config/tombstone-common.toml
new file mode 100644
index 00000000..66331ae6
--- /dev/null
+++ b/config/tombstone-common.toml
@@ -0,0 +1,229 @@
+
+#Options related to player's death
+[player_death]
+	#Whether to handle player death [false/true|default:true]
+	handle_player_death = true
+	#Whether to restore beneficial effects after a player dies [false/true|default:true]
+	restore_effects_on_death = false
+	#Whether to log the positions of players' graves [false/true|default:true]
+	log_player_grave = true
+	#Whether to require a Grave's Key to access graves [false/true|default:true]
+	player_grave_access = true
+	#The radius in which items should be collected when a grave is spawned [1..10|default:5]
+	#Range: 1 ~ 10
+	sniffer_range = 5
+	#Graveless Areas
+	no_grave_location = ["0, -300, 0, minecraft:overworld, 20"]
+	#The chance that creatures appear after the contents of a grave are retrieved [0..100|default:0]
+	#Range: 0 ~ 100
+	chance_mob_on_grave_recovery = 0
+	#Enables PvP mode, which allows players to open graves of players they kill [false/true|default:false]
+	pvp_mode = true
+	#Percent of stolen experience by killing a player when PvP mode is enabled [0..100|default:30]
+	#Range: 0 ~ 100
+	pvp_stolen_xp = 30
+	#Knowledge of Death loss why dying [0..500|default:0]
+	#Range: 0 ~ 500
+	knowledge_loss = 0
+	#Only abandoned graves can have losses of items (based on the decay_time) [false/true|default:true]
+	loss_on_death_only_for_abandoned_grave = true
+	#Only stackable items can be lost on death [false/true|default:true]
+	loss_on_death_only_for_stackable_items = true
+	#The chance that some items are lost on death [0..100|default:0]
+	#Range: 0 ~ 100
+	chance_loss_on_death = 0
+	#The percentage of items that are lost on death [0..100|default:0]
+	#Range: 0 ~ 100
+	percent_loss_on_death = 0
+	#Prevents death outside of world borders [false/true|default:false]
+	prevent_death_outside_world = true
+	#Whether graves should be allowed to bypass anti-griefing rules [false/true|default:true]
+	graves_bypass_griefing_rules = true
+	#Allows to fill an existing grave instead of creating a new one [false/true|default:true]
+	allow_to_fill_existing_grave = true
+
+#Options related to player's alignment
+[alignment]
+	#Points for freeing a soul in a receptacle [0..50|default:3]
+	#Range: 0 ~ 50
+	points_free_soul_receptacle = 3
+	#Points for plundering a player's grave [-50..0|default:-2]
+	#Range: -50 ~ 0
+	points_plunder_player_grave = -2
+	#Points for zombie villager exorcism [0..50|default:2]
+	#Range: 0 ~ 50
+	points_exorcism_zombie_villager = 2
+	#Points for killing a villager (or minecolonies citizen) [0..50|default:-2]
+	#Range: -50 ~ 0
+	points_kill_villager = -2
+	#Points for killing a raider [0..20|default:1]
+	#Range: 0 ~ 20
+	points_kill_raider = 1
+	#Chance for killing a raider [0..100|default:30]
+	#Range: 0 ~ 100
+	chance_kill_raider = 30
+	#Points for tablet of cupidity [-20..0|default:-1]
+	#Range: -20 ~ 0
+	points_tablet_of_cupidity = -1
+	#Chance for tablet of cupidity [0..100|default:50]
+	#Range: 0 ~ 100
+	chance_tablet_of_cupidity = 50
+	#Points for Pray of Protection [0..50|default:2]
+	#Range: 0 ~ 50
+	points_pray_of_protection = 2
+
+#Miscellaneous options
+[general]
+	#Allows teleportation to other dimensions [false/true|default:true]
+	teleport_dim = true
+	#Whether to cancel the Ghostly Shape effect on breaking a block or opening a chest [false/true|default:false]
+	nerf_ghostly_shape = false
+	#Beneficial effects that can't used by certain features such as ankh of pray, lollipop, scroll of preservation, alchemy perk and magic siphon enchantment
+	unhandled_beneficial_effects = ["extraalchemy", "astralsorcery:potiontimefreeze", "xreliquary:flight_potion"]
+	#Harmful effects that can't used by certain features such as tablet of cupidity and the enchantment plague bringer
+	unhandled_harmful_effects = ["minecraft:nausea"]
+	#Increases the minimum time without sleeping for phantom spawn around player based on their level in Knowledge of Death [false/true|default:true]
+	knowledge_reduce_phantom_spawn = true
+	#Minimum time without sleeping for phantom to spawn around players [1200..MAX|default:72000]
+	#Range: > 1200
+	time_for_phantom_spawn = 72000
+	#The Halloween features also happen outside the dates of the event [false/true|default:false]
+	persistant_halloween = false
+	#Allows players to be hurt by special damages related to some items [false/true|default:true]
+	allow_beyond_the_grave_damage = true
+	#Cooldown in minutes to use the command tbrequestteleport [-1..1440|default:-1]
+	#Range: -1 ~ 1440
+	cooldown_request_teleport = -1
+	#Cooldown in minutes to use the command tbteleportdeath [-1..1440|default:-1]
+	#Range: -1 ~ 1440
+	cooldown_teleport_death = -1
+	#Cooldown in minutes to use the command tbbind [-1..1440|default:-1]
+	#Range: -1 ~ 1440
+	cooldown_teleport_bind = -1
+	#Cooldown in minutes to use the perk Tomb Raider [0..1440|default:0]
+	#Range: 0 ~ 1440
+	cooldown_tomb_raiding = 60
+	#Fishing treasures can only be found in open water [false/true|default:true]
+	fishing_treasure_in_open_water = true
+
+#Allows to define the conditions for a village siege to begin
+[village_siege]
+	#Allows to handle village sieges [false/true|default:true]
+	handle_village_siege = true
+	#Logs the different states of a village siege while searching for an adequate place [false/true|default:false]
+	log_siege_state = false
+	#The creatures of the siege have a glowing effect (only uses this for test purposes) [false/true|default:false]
+	glowing_creature_test = false
+	#Allows to use the positions of creative players to define the siege location [false/true|default:true]
+	allow_creative_players_for_siege = true
+	#Chance for a siege to occur [0..100|default:10]
+	#Range: 0 ~ 100
+	siege_chance = 10
+	#Maximum of creatures appearing in a siege [0..100|default:20]
+	#Range: 0 ~ 100
+	siege_max_creature = 20
+	#Undeads always wear a helm when sieging [false/true|default:false]
+	undead_wear_helm_in_siege = false
+	#Delay in seconds for a second test of siege when the first failed [0..1200|default:200]
+	#Range: 0 ~ 1200
+	delay_siege_test = 200
+	#Mobs in siege are persistent [false/true|default:false]
+	persistent_mob_in_siege = false
+	#Shuffles the list of players before testing the siege location [false/true|default:true]
+	shuffle_players_for_siege = true
+
+#For settings related to decorative tombs and magic items
+[decorative_grave]
+	#Time in minutes to check if a soul appears on a grave [10..10000|default:30]
+	#Range: 10 ~ 10000
+	time_soul = 30
+	#Chance on 1000 that a soul appears on a grave [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_soul = 100
+	#Chance to receive a random beneficial spell effect when praying near a grave [0..100|default:40]
+	#Range: 0 ~ 100
+	chance_pray_reward = 40
+	#Allows to replace a grave plate already set on a grave [false/true|default:true]
+	can_replace_grave_plate = true
+	#Allows lost tablets to find locations outside the current world [false/true|default:true]
+	lost_tablet_search_outside_world = true
+	#Allows lost tablets to find modded structures [false/true|default:true]
+	lost_tablet_modded_structure = true
+	#The structures that can't be discovered by lost tablets
+	lost_tablet_denied_structures = []
+	#The creatures that can't be captured in receptacle
+	black_list_capturable_souls = []
+	#Duration of voodoo poppet's effects in seconds when preventing death [5..60000|default:60]
+	#Range: 5 ~ 60000
+	duration_voodoo_poppet_effects = 60
+
+#Allows to customize or disable the enchantments
+[enchantments]
+	#Restricts the effect of Shadow Step to players [false/true|default:false]
+	restrict_shadow_step_to_player = false
+	#The wearer is also affected by the effect if his alignment is not bad [false/true|default:true]
+	nerf_plague_bringer = true
+	#Maximum duration of stolen effects in minutes [1..MAX|default:60]
+	#Range: > 1
+	max_duration_magic_siphon = 60
+	#Duration of applied effects in seconds [1..MAX|default:10]
+	#Range: > 1
+	duration_plague_bringer = 10
+	#Defines if players can steal effects to others players. If nerfed, the stolen effect duration is limited to 10% of the initial effect [ALLOW/NERFED/DISALLOW|default:ALLOW]
+	#Allowed Values: ALLOW, NERFED, DISALLOW
+	magic_siphon_on_player_rule = "ALLOW"
+
+#Options related to the command recovery and auto-save of players
+[recovery]
+	#Enables to backup automatically players [false/true|default:true]
+	recovery_player_enable = true
+	#Time in minutes between players' backups [10..1000|default:40]
+	#Range: 5 ~ 1000
+	recovery_player_timer = 19
+	#Maximum number of backups per player [5..100|default:15]
+	#Range: 5 ~ 100
+	recovery_player_max_saves = 15
+	#Enables to backup automatically dead familiars [false/true|default:true]
+	recovery_familiar_enable = true
+	#Backup players on death [false/true|default:false]
+	backup_on_death = true
+
+#Allows to change the chance to drop some items
+[loot]
+	#Chance on 1000 to receive a decorative grave on undead boss [0..1000|default:50]
+	#Range: 0 ~ 1000
+	chance_decorative_grave_on_boss = 30
+	#Chance on 1000 to receive a voodoo poppet on undead boss [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_voodoo_poppet_on_boss = 100
+	#Chance on 1000 to receive a random scroll on undead boss [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_random_scroll_on_boss = 100
+	#Chance on 1000 to receive a familiar receptacle on undead boss [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_familiar_receptacle_on_boss = 0
+	#Allows the undeads to have a low chance to drop their skull [false/true|default:true]
+	undead_can_drop_skull = true
+	#Chance on 1000 to receive a Soul Receptacle on undead boss [0..1000|default:50]
+	#Range: 0 ~ 1000
+	chance_soul_receptacle_on_boss = 50
+	#Chance on 1000 for undead mobs to drop Grave's Dust [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_grave_dust = 100
+	#Defines the allowed loottables having a chance to contain a magic item from Tombstone
+	treasure_loot_table = ["minecraft:chests/end_city_treasure", "minecraft:chests/abandoned_mineshaft", "minecraft:chests/nether_bridge", "minecraft:chests/stronghold_library", "minecraft:chests/desert_pyramid", "minecraft:chests/jungle_temple", "minecraft:chests/igloo_chest", "minecraft:chests/woodland_mansion"]
+	#The magic items from Tombstone can only be found as creature loot if the player is the killer [false/true|default:true]
+	drop_only_on_player_kill = true
+	#Minimum life for an undead to be considered as a boss for drop [10..1000|default:100]
+	#Range: > 10
+	undead_boss_life_for_drop = 100
+
+#Allows to enable some features related to others mods
+[compatibility]
+	#Allows to auto-equip the slots from Curio mod [false/true|default:true]
+	allow_curio_auto_equip = true
+	#Keeps the cosmetic armor when you die [false/true|default:true]
+	keep_cosmetic_armor = true
+	#Ensure the potion effects to stay on the player after returning from end conquered [false/true|default:true]
+	preserve_effects_on_return_end_conquered = true
+
diff --git a/config/tombstone-server.toml b/config/tombstone-server.toml
index 7ef45812..f41d7637 100644
--- a/config/tombstone-server.toml
+++ b/config/tombstone-server.toml
@@ -1,4 +1,137 @@
-#Allows to customize or disable the enchantments
-[enchantments]
-	#Enables the enchantment Soulbound [false/true|default:true]
-	enable_enchantment_soulbound = false
\ No newline at end of file
+
+#Allows to customize or disable the enchantments
+[enchantments]
+	#Enables the enchantment Soulbound [false/true|default:true]
+	enable_enchantment_soulbound = false
+	#Shadow Step is only active while sneaking [false/true|default:false]
+	nerf_shadow_step = false
+	#Enables the enchantment Shadow Step [false/true|default:true]
+	enable_enchantment_shadow_step = true
+	#Enables the enchantment Magic Siphon [false/true|default:true]
+	enable_enchantment_magic_siphon = true
+	#Enables the enchantment Plague Bringer [false/true|default:true]
+	enable_enchantment_plague_bringer = true
+	#Enables the enchantment Curse of Bones [false/true|default:true]
+	enable_enchantment_curse_of_bones = true
+	#Enables the enchantment Blessing [false/true|default:true]
+	enable_enchantment_blessing = true
+	#Allows Soulbound at enchanting table [false/true|default:false]
+	soulbound_enchanting_table = true
+	#Allows Shadow Step at enchanting table [false/true|default:false]
+	shadow_step_enchanting_table = false
+	#Allows Magic Siphon at enchanting table [false/true|default:false]
+	magic_siphon_enchanting_table = false
+	#Allows Plague Bringer at enchanting table [false/true|default:false]
+	plague_bringer_enchanting_table = false
+	#Allows Curse of Bones at enchanting table [false/true|default:false]
+	curse_of_bones_enchanting_table = false
+	#Allows Blessing at enchanting table [false/true|default:false]
+	blessing_enchanting_table = false
+	#Allows Plague Bringer to combine with Magic Siphon [false/true|default:false]
+	plague_bringer_combining_magic_siphon = false
+	#Max level for Shadow Step [1..10|default:5]
+	#Range: 1 ~ 10
+	max_level_shadow_step = 5
+	#Max level for Magic Siphon [1..10|default:5]
+	#Range: 1 ~ 10
+	max_level_magic_siphon = 5
+	#Max level for Plague Bringer [1..10|default:5]
+	#Range: 1 ~ 10
+	max_level_plague_bringer = 5
+	#Max level for Curse of Bones [1..10|default:5]
+	#Range: 1 ~ 10
+	max_level_curse_of_bones = 5
+
+#Options related to player's death
+[player_death]
+	#Whether to handle player experience [false/true|default:true]
+	handle_player_xp = true
+	#Experience loss on death (%) [0..100|default:0]
+	#Range: 0 ~ 100
+	xp_loss = 0
+	#The time in minutes before a Grave's Key isn't required to open a grave (-1 = disabled) [-1..MAX|default:-1]
+	#Range: > -1
+	decay_time = -1
+	#Allows players with bad alignment and the perk tomb raider to steal items on abandoned graves [false/true|default:false]
+	allow_tomb_raiding = false
+
+#Miscellaneous options
+[general]
+	#The duration of the Ghostly Shape effect in seconds [0..MAX|default:120]
+	#Range: > 0
+	ghostly_shape_duration = 120
+	#The chance that a player receives an already enchanted Grave's Key on death [-1..100|default:0|disabled:-1]
+	#Range: -1 ~ 100
+	chance_enchanted_grave_key = 0
+	#Required level in Knowledge of Death to craft Familiar Receptacle [0..20|default:10]
+	#Range: 0 ~ 20
+	familiar_receptacle_required_level = 10
+	#Scroll duration [1200..120000|default:12000]
+	#Range: 1200 ~ 120000
+	scroll_duration = 12000
+
+#For settings related to decorative tombs and magic items
+[decorative_grave]
+	#Maximum uses of a tablet [1..20|default:10]
+	#Range: 1 ~ 20
+	tablet_max_use = 10
+	#Cooldown in second after using a tablet other than Tablet of Cupidity [30..1200|default:60]
+	#Range: 30 ~ 1200
+	tablet_cooldown = 60
+	#Cooldown in second after using a Tablet of Cupidity [300..3600|default:900]
+	#Range: 300 ~ 3600
+	tablet_of_cupidity_cooldown = 900
+	#Sets the decorative graves unbreakable [false/true|default:false]
+	unbreakable_decorative_grave = false
+	#The cooldown in hours to pray with the Ânkh [1..10|default:3]
+	#Range: 1 ~ 10
+	cooldown_to_pray = 3
+	#The cooldown in minutes to reset the perks with the ankh of Pray [0..60|default:20]
+	#Range: 0 ~ 60
+	cooldown_reset_perk = 20
+
+#Allows to disable some magic items
+[allowedMagicItems]
+	#Voodoo Poppet [false/true|default:true]
+	allow_voodoo_poppet = true
+	#Familiar Receptacle [false/true|default:true]
+	allow_familiar_receptacle = true
+	#Book of Disenchantment [false/true|default:true]
+	allow_book_of_disenchantment = true
+	#Scroll of Preservation [false/true|default:true]
+	allow_scroll_of_preservation = true
+	#Grave's Key [false/true|default:true]
+	allow_grave_key = true
+	#Scroll of Knowledge [false/true|default:true]
+	allow_scroll_of_knowledge = true
+	#Tablet of Recall [false/true|default:true]
+	allow_tablet_of_recall = true
+	#Tablet of Home [false/true|default:true]
+	allow_tablet_of_home = true
+	#Tablet of Assistance [false/true|default:true]
+	allow_tablet_of_assistance = true
+	#Tablet of Cupidity [false/true|default:true]
+	allow_tablet_of_cupidity = true
+	#Scroll of Unstable Intangibleness [false/true|default:true]
+	allow_scroll_of_unstable_intangibleness = true
+	#Scroll of Feather Fall [false/true|default:true]
+	allow_scroll_of_feather_fall = true
+	#Scroll of Purification [false/true|default:true]
+	allow_scroll_of_purification = true
+	#Scroll of True Sight [false/true|default:true]
+	allow_scroll_of_true_sight = true
+	#Lost Tablet [false/true|default:true]
+	allow_lost_tablet = true
+	#Scroll of Reach [false/true|default:true]
+	allow_scroll_of_reach = true
+	#Scroll of Lightning Resistance [false/true|default:true]
+	allow_scroll_of_lightning_resistance = true
+	#Dust of Vanishing [false/true|default:true]
+	allow_dust_of_vanishing = true
+
+#Allows to change the chance to drop some items
+[loot]
+	#Chance to loot a Lost Tablet by fishing [0..1000|default:100]
+	#Range: 0 ~ 1000
+	chance_loot_lost_tablet = 100
+
diff --git a/kubejs/client_scripts/client_scripts.js b/kubejs/client_scripts/client_scripts.js
index cfe22d46..78b7804b 100644
--- a/kubejs/client_scripts/client_scripts.js
+++ b/kubejs/client_scripts/client_scripts.js
@@ -167,10 +167,6 @@ onEvent(`jei.hide.items`, e => {
 
         `twilightforest:uncrafting_table`,
 
-        `mob_grinding_utils:mob_swab`,
-        `mob_grinding_utils:mob_swab_used`,
-        `mob_grinding_utils:gm_chicken_feed`,
-
         `solarflux:sp_6`,
         `solarflux:sp_7`,
         `solarflux:sp_8`,
diff --git a/kubejs/server_scripts/RBees/comb_recipes.js b/kubejs/server_scripts/RBees/comb_recipes.js
index 2681d912..d458fa4e 100644
--- a/kubejs/server_scripts/RBees/comb_recipes.js
+++ b/kubejs/server_scripts/RBees/comb_recipes.js
@@ -1,136 +1,225 @@
 onEvent('recipes', e => {
-    const colors = [
-        'white',
-        'light_gray',
-        'gray',
-        'black',
-        'red',
-        'orange',
-        'yellow',
-        'lime',
-        'green',
-        'light_blue',
-        'cyan',
-        'blue',
-        'purple',
-        'magenta',
-        'pink',
-        'brown'
+  const cuShaped = e.recipes.cucumber.shaped_no_mirror
+  const colors = [`white`, `light_gray`, `gray`, `black`, `red`, `orange`, `yellow`, `lime`, `green`, `light_blue`, `cyan`, `blue`, `purple`, `magenta`, `pink`, `brown`]
+  const craftingShapes = [
+    //vertical
+    [
+      '  C',
+      '  C',
+      '  C'
+    ], [
+      ' C ',
+      ' C ',
+      ' C '
+    ], [
+      'C  ',
+      'C  ',
+      'C  '
+    ],
+    //horizontal 
+    [
+      'CCC',
+      '   ',
+      '   '
+    ], [
+      '   ',
+      'CCC',
+      '   '
+    ], [
+      '   ',
+      '   ',
+      'CCC'
+    ],
+    //diagonal
+    [
+      '  C',
+      ' C ',
+      'C  '
+    ], [
+      'C  ',
+      ' C ',
+      '  C'
+    ],
+    //misc
+    [
+      '  C',
+      ' C ',
+      ' C '
+    ], [
+      ' C ',
+      'C  ',
+      'C  '
+    ], [
+      '  C',
+      'CC ',
+      '   '
+    ], [
+      '   ',
+      '  C',
+      'CC '
+    ], [
+      '  C',
+      '  C',
+      ' C '
+    ], [
+      ' C ',
+      ' C ',
+      'C  '
+    ], [
+      'C C',
+      ' C ',
+      '   '
+    ], [
+      '   ',
+      'C C',
+      ' C '
+    ], [
+      ' C ',
+      ' C ',
+      '  C'
+    ], [
+      'C  ',
+      'C  ',
+      ' C '
+    ], [
+      '   ',
+      ' C ',
+      'C C'
+    ], [
+      ' C ',
+      'C C',
+      '   '
+    ], [
+      '  C',
+      ' C ',
+      '  C'
+    ], [
+      ' C ',
+      'C  ',
+      ' C '
+    ], [
+      '   ',
+      'CC ',
+      '  C'
+    ], [
+      'CC ',
+      '  C',
+      '   '
     ]
+  ] // 25 now
+  const dyes = []
+  const botaniaFlowers = []
+  colors.forEach(color => {
+    dyes.push(`minecraft:${color}_dye`)
+    botaniaFlowers.push(`botania:${color}_mystical_flower`)
+  })
+  const crops = [
+    `minecraft:wheat`,
+    `minecraft:beetroot`,
+    `minecraft:carrot`,
+    `minecraft:potato`,
+    `minecraft:melon_slice`,
+    `minecraft:pumpkin`,
+    `minecraft:bamboo`,
+    `minecraft:sweet_berries`,
+    `minecraft:brown_mushroom`,
+    `minecraft:red_mushroom`
+  ]
+  const meat = [
+    `minecraft:porkchop`,
+    `minecraft:beef`,
+    `minecraft:cod`,
+    `minecraft:salmon`,
+    `minecraft:chicken`,
+    `minecraft:rabbit`,
+    `minecraft:mutton`
+  ]
+  const stones = [
+    `minecraft:andesite`,
+    `minecraft:diorite`,
+    `minecraft:granite`,
+    `minecraft:basalt`,
+    `create:gabbro`,
+    `create:dolomite`,
+    `create:weathered_limestone`,
+    `create:limestone`,
+    `create:scoria`,
+    `create:dark_scoria`,
+    `quark:brimstone`,
+    `quark:slate`,
+    `quark:jasper`,
+    `quark:limestone`,
+    `quark:basalt`,
+    `astralsorcery:marble_raw`
+  ]
+  const honey = [
+    'resourcefulbees:honey',
+    'cyclic:honey',
+    'create:honey',
+  ]
+  const customHoney = [
+    'resourcefulbees:rainbow_honey',
+    'resourcefulbees:catnip_honey',
+  ]
 
-    const craftingShapes = [
-        //vertical
-        ['  C', '  C', '  C'],
-        [' C ', ' C ', ' C '],
-        ['C  ', 'C  ', 'C  '],
-        //horizontal
-        ['CCC', '   ', '   '],
-        ['   ', 'CCC', '   '],
-        ['   ', '   ', 'CCC'],
-        //diagonal
-        ['  C', ' C ', 'C  '],
-        ['C  ', ' C ', '  C'],
-        //misc
-        ['  C', ' C ', ' C '],
-        [' C ', 'C  ', 'C  '],
-        ['  C', 'CC ', '   '],
-        ['   ', '  C', 'CC '],
-        ['  C', '  C', ' C '],
-        [' C ', ' C ', 'C  '],
-        ['C C', ' C ', '   '],
-        ['   ', 'C C', ' C '],
-        [' C ', ' C ', '  C'],
-        ['C  ', 'C  ', ' C '],
-        ['   ', ' C ', 'C C'],
-        [' C ', 'C C', '   '],
-        ['  C', ' C ', '  C'],
-        [' C ', 'C  ', ' C '],
-        ['   ', 'CC ', '  C'],
-        ['CC ', '  C', '   ']
-    ]
-
-    function combRecipes(entries) {
-        entries.forEach(([output, input, amount1, amount2]) => {
-            const length = Math.min(craftingShapes.length, output.length)
-            for (let i = 0; i < length; i++) {
-                e.shaped(Item.of(output[i], amount1), craftingShapes[i], {
-                    C: input
-                }).id(`kubejs:combs/${output[i].substring(output[i].indexOf(':') + 1)}`)
-                if (!amount2) continue
-                e.shaped(Item.of(output[i], amount2), craftingShapes[i], {
-                    C: `${input}_block`
-                }).id(`kubejs:combs/block/${output[i].substring(output[i].indexOf(':') + 1)}`)
-            }
-        })
+  function shapedRecipe(results_, craftingItem_, itemCount_) {
+    const maxLength = Math.min(craftingShapes.length, results_.length)
+    for (let i = 0; i < maxLength; i++) {
+      cuShaped({
+        pattern: craftingShapes[i],
+        key: {
+          C: {
+            item: craftingItem_
+          }
+        },
+        result: {
+          item: results_[i],
+          count: itemCount_
+        }
+      })
     }
+  }
+
+  //Comb to Bucket
+  e.shaped('minecraft:water_bucket', [
+    ' C ',
+    'CBC',
+    ' C '
+  ], {
+    'C': 'resourcefulbees:water_honeycomb',
+    'B': 'minecraft:bucket'
+  }).id(`kubejs:water_comb_bucket`)
+  e.shaped('minecraft:lava_bucket', [
+    ' C ',
+    'CBC',
+    ' C '
+  ], {
+    'C': 'resourcefulbees:lava_honeycomb',
+    'B': 'minecraft:bucket'
+  }).id(`kubejs:lava_comb_bucket`)
 
-    // Comb to Bucket
-    e.shaped('minecraft:water_bucket', [' C ', 'CBC', ' C '], {
-        C: 'resourcefulbees:water_honeycomb',
-        B: 'minecraft:bucket'
-    }).id('kubejs:combs/water_bucket')
-    e.shaped('minecraft:lava_bucket', [' C ', 'CBC', ' C '], {
-        C: 'resourcefulbees:lava_honeycomb',
-        B: 'minecraft:bucket'
-    }).id('kubejs:combs/lava_bucket')
+  //Honey Compatibility
+  honey.forEach(type => {
+    e.recipes.thermal.chiller('minecraft:honey_block', fluid.of(`${type}`, 1000))
+  })
+  customHoney.forEach(type => {
+    e.recipes.thermal.chiller(`${type}_block`, fluid.of(`${type}`, 1000))
+    e.shaped('compressium:honey_1', [
+      'AAA',
+      'AAA',
+      'AAA'
+    ], {
+      A: `${type}_block`
+    })
+  })
 
-    // Comb Recipes
-    combRecipes([
-        [colors.map(color => `minecraft:${color}_dye`), 'resourcefulbees:rainbow_honey_block', 32],
-        [colors.map(color => `botania:${color}_mystical_flower`), 'resourcefulbees:mystical_honeycomb', 2, 18],
-        [
-            [
-                'minecraft:wheat',
-                'minecraft:beetroot',
-                'minecraft:carrot',
-                'minecraft:potato',
-                'minecraft:melon_slice',
-                'minecraft:pumpkin',
-                'minecraft:bamboo',
-                'minecraft:sweet_berries',
-                'minecraft:brown_mushroom',
-                'minecraft:red_mushroom'
-            ],
-            'resourcefulbees:cropy_honeycomb',
-            3,
-            27
-        ],
-        [
-            [
-                'minecraft:porkchop',
-                'minecraft:beef',
-                'minecraft:cod',
-                'minecraft:salmon',
-                'minecraft:chicken',
-                'minecraft:rabbit',
-                'minecraft:mutton'
-            ],
-            'resourcefulbees:kobee_beef_honeycomb',
-            3,
-            27
-        ],
-        [
-            [
-                'minecraft:andesite',
-                'minecraft:diorite',
-                'minecraft:granite',
-                'minecraft:basalt',
-                'create:gabbro',
-                'create:dolomite',
-                'create:weathered_limestone',
-                'create:limestone',
-                'create:scoria',
-                'create:dark_scoria',
-                'quark:brimstone',
-                'quark:slate',
-                'quark:jasper',
-                'quark:limestone',
-                'quark:basalt',
-                'astralsorcery:marble_raw'
-            ],
-            'resourcefulbees:stan_honeycomb',
-            2,
-            18
-        ]
-    ])
+  shapedRecipe(dyes, `resourcefulbees:rainbow_honey_block`, 32)
+  shapedRecipe(botaniaFlowers, `resourcefulbees:mystical_honeycomb`, 2)
+  shapedRecipe(botaniaFlowers, `resourcefulbees:mystical_honeycomb_block`, 18)
+  shapedRecipe(crops, `resourcefulbees:cropy_honeycomb`, 3)
+  shapedRecipe(crops, `resourcefulbees:cropy_honeycomb_block`, 27)
+  shapedRecipe(meat, `resourcefulbees:kobee_beef_honeycomb`, 3)
+  shapedRecipe(meat, `resourcefulbees:kobee_beef_honeycomb_block`, 27)
+  shapedRecipe(stones, `resourcefulbees:stan_honeycomb`, 2)
+  shapedRecipe(stones, `resourcefulbees:stan_honeycomb_block`, 18)
 })
diff --git a/kubejs/server_scripts/RBees/valid_apiary.js b/kubejs/server_scripts/RBees/valid_apiary.js
index 8a0d624d..07cf903f 100644
--- a/kubejs/server_scripts/RBees/valid_apiary.js
+++ b/kubejs/server_scripts/RBees/valid_apiary.js
@@ -51,7 +51,8 @@ const whitelistVA = [
   '#minecraft:wart_blocks',
   '#forge:soul_sand',
   '#minecraft:nylium',
-  // 'minecraft:soul_soil',
+  'minecraft:soul_soil',
+  'minecraft:soul_sand',
   'minecraft:glowstone',
 
   /create:.+_window/,
diff --git a/kubejs/server_scripts/removals.js b/kubejs/server_scripts/removals.js
index 1fd2c58f..98a7fc5b 100644
--- a/kubejs/server_scripts/removals.js
+++ b/kubejs/server_scripts/removals.js
@@ -153,7 +153,6 @@ onEvent('recipes', e => {
         'rftoolsbuilder:builder',
         'extrastorage:iron_crafter',
         'twilightforest:uncrafting_table',
-        'mob_grinding_utils:recipe_mob_swab',
         'creativecrafter:creative_crafter',
         'creativewirelesstransmitter:creative_wireless_transmitter',
         'thermal:machine/pyrolyzer/pyrolyzer_coal',
diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js
index 505a6aa1..8b936d23 100644
--- a/kubejs/server_scripts/tags.js
+++ b/kubejs/server_scripts/tags.js
@@ -343,12 +343,16 @@ onEvent('block.tags', e => {
 
 //Entity tags
 onEvent('entity_type.tags', e => {
-    e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [
+    e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [    
+        /resourcefulbees:.+_bee/,
+        /iceandfire:.+_dragon/,
         'iceandfire:dragon_multipart',
-        'iceandfire:dragon_egg',
-        /iceandfire:.+_dragon/
-    ])
-    e.add('industrialforegoing:mob_imprisonment_tool_blacklist', [/resourcefulbees:.+_bee/])
+        'iceandfire:dragon_egg',])
+    e.add('mob_grinding_utils:noswab', [    
+        /resourcefulbees:.+_bee/,
+        /iceandfire:.+_dragon/,
+        'iceandfire:dragon_multipart',
+        'iceandfire:dragon_egg',])
 })
 
 //Fluid tags