debloat SkyblockerConfig.java + translate change

removed text.autoconfig. prefix
new way is skyblocker.option.

82 files changed, 330 insertions, 312 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
index e04a30ef..2c958c0a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java
@@ -3,6 +3,8 @@ package de.hysky.skyblocker.skyblock;
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.DungeonsConfig;
+import de.hysky.skyblocker.config.configs.UiAndVisualsConfig;
 import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import de.hysky.skyblocker.mixins.accessors.ScreenAccessor;
 import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
@@ -42,12 +44,12 @@ public class ChestValue {
 				Text title = screen.getTitle();
 				String titleString = title.getString();
 				if (DUNGEON_CHESTS.contains(titleString)) {
-					if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator) {
+					if (SkyblockerConfigManager.get().dungeons.dungeonChestProfit.enableProfitCalculator) {
 						ScreenEvents.afterTick(screen).register(screen_ ->
 								((ScreenAccessor) screen).setTitle(getDungeonChestProfit(genericContainerScreen.getScreenHandler(), title, titleString, client))
 						);
 					}
-				} else if (SkyblockerConfigManager.get().general.chestValue.enableChestValue && !titleString.equals("SkyBlock Menu")) {
+				} else if (SkyblockerConfigManager.get().uiAndVisuals.chestValue.enableChestValue && !titleString.equals("SkyBlock Menu")) {
 					Screens.getButtons(screen).add(ButtonWidget
 							.builder(Text.literal("$"), buttonWidget -> {
 								Screens.getButtons(screen).remove(buttonWidget);
@@ -56,7 +58,7 @@ public class ChestValue {
 								);
 							})
 							.dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12)
-							.tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.general.chestValue.@Tooltip")))
+							.tooltip(Tooltip.of(Text.translatable("skyblocker.option.general.chestValue.@Tooltip")))
 							.build()
 					);
 				}
@@ -95,7 +97,7 @@ public class ChestValue {
 				}
 
 				//Essence price
-				if (name.contains("Essence") && SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeEssence) {
+				if (name.contains("Essence") && SkyblockerConfigManager.get().dungeons.dungeonChestProfit.includeEssence) {
 					Matcher matcher = ESSENCE_PATTERN.matcher(name);
 
 					if (matcher.matches()) {
@@ -131,7 +133,7 @@ public class ChestValue {
 				}
 			}
 
-			if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeKismet && usedKismet) {
+			if (SkyblockerConfigManager.get().dungeons.dungeonChestProfit.includeKismet && usedKismet) {
 				LongBooleanPair kismetPriceData = getItemPrice("KISMET_FEATHER");
 
 				if (!kismetPriceData.rightBoolean()) hasIncompleteData = true;
@@ -210,12 +212,12 @@ public class ChestValue {
 	}
 
 	static Text getProfitText(long profit, boolean hasIncompleteData) {
-		SkyblockerConfig.DungeonChestProfit config = SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit;
+		DungeonsConfig.DungeonChestProfit config = SkyblockerConfigManager.get().dungeons.dungeonChestProfit;
 		return Text.literal((profit > 0 ? " +" : ' ') + FORMATTER.format(profit) + " Coins").formatted(hasIncompleteData ? config.incompleteColor : (Math.abs(profit) < config.neutralThreshold) ? config.neutralColor : (profit > 0) ? config.profitColor : config.lossColor);
 	}
 
 	static Text getValueText(long value, boolean hasIncompleteData) {
-		SkyblockerConfig.ChestValue config = SkyblockerConfigManager.get().general.chestValue;
+		UiAndVisualsConfig.ChestValue config = SkyblockerConfigManager.get().uiAndVisuals.chestValue;
 		return Text.literal(' ' + FORMATTER.format(value) + " Coins").formatted(hasIncompleteData ? config.incompleteColor : config.color);
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
index 7676860f..3f4c8269 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
@@ -61,7 +61,7 @@ public class FishingHelper {
 
     public static void onSound(PlaySoundS2CPacket packet) {
         String path = packet.getSound().value().getId().getPath();
-        if (SkyblockerConfigManager.get().general.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) {
+        if (SkyblockerConfigManager.get().helper.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) {
             ClientPlayerEntity player = MinecraftClient.getInstance().player;
             if (player != null && player.fishHook != null) {
                 Vec3d soundToFishHook = player.fishHook.getPos().subtract(packet.getX(), 0, packet.getZ());
@@ -76,15 +76,15 @@ public class FishingHelper {
     }
 
     public static void render(WorldRenderContext context) {
-        if (SkyblockerConfigManager.get().general.fishing.enableFishingTimer && startTime != 0) {
+        if (SkyblockerConfigManager.get().helper.fishing.enableFishingTimer && startTime != 0) {
             ClientPlayerEntity player = MinecraftClient.getInstance().player;
             if (player != null && player.fishHook != null) {
                 float time = (int) ((System.currentTimeMillis() - startTime) / 100f) / 10f; //leave 1dp in seconds
-                float scale = SkyblockerConfigManager.get().general.fishing.fishingTimerScale;
+                float scale = SkyblockerConfigManager.get().helper.fishing.fishingTimerScale;
                 Vec3d pos = player.fishHook.getPos().add(0, 0.4 + scale / 10, 0);
 
                 Text text;
-                if (time >= 20 && SkyblockerConfigManager.get().general.fishing.changeTimerColor) {
+                if (time >= 20 && SkyblockerConfigManager.get().helper.fishing.changeTimerColor) {
                     text = Text.literal(String.valueOf(time)).formatted(Formatting.GREEN);
                 } else {
                     text = Text.literal(String.valueOf(time));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
index c31e2107..46ae9f3e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
@@ -72,7 +72,7 @@ public class StatusBarTracker {
     }
 
     private Text onOverlayMessage(Text text, boolean overlay) {
-        if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.bars.enableBars || Utils.isInTheRift()) {
+        if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || Utils.isInTheRift()) {
             return text;
         }
         return Text.of(update(text.getString(), SkyblockerConfigManager.get().messages.hideMana));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
index f7f9836c..042b126b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java
@@ -25,7 +25,7 @@ public class TeleportOverlay {
     }
 
     private static void render(WorldRenderContext wrc) {
-        if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) {
+        if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) {
             ItemStack heldItem = client.player.getMainHandStack();
             String itemId = ItemTooltip.getInternalNameFromNBT(heldItem, true);
             NbtCompound customData = ItemUtils.getCustomData(heldItem);
@@ -33,34 +33,34 @@ public class TeleportOverlay {
             if (itemId != null) {
                 switch (itemId) {
                     case "ASPECT_OF_THE_LEECH_1" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWeirdTransmission) {
                             render(wrc, 3);
                         }
                     }
                     case "ASPECT_OF_THE_LEECH_2" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWeirdTransmission) {
                             render(wrc, 4);
                         }
                     }
                     case "ASPECT_OF_THE_END", "ASPECT_OF_THE_VOID" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && customData != null && customData.getInt("ethermerge") == 1) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && customData != null && customData.getInt("ethermerge") == 1) {
                             render(wrc, customData, 57);
-                        } else if (SkyblockerConfigManager.get().general.teleportOverlay.enableInstantTransmission) {
+                        } else if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableInstantTransmission) {
                             render(wrc, customData, 8);
                         }
                     }
                     case "ETHERWARP_CONDUIT" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableEtherTransmission) {
                             render(wrc, customData, 57);
                         }
                     }
                     case "SINSEEKER_SCYTHE" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableSinrecallTransmission) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableSinrecallTransmission) {
                             render(wrc, customData, 4);
                         }
                     }
                     case "NECRON_BLADE", "ASTRAEA", "HYPERION", "SCYLLA", "VALKYRIE" -> {
-                        if (SkyblockerConfigManager.get().general.teleportOverlay.enableWitherImpact) {
+                        if (SkyblockerConfigManager.get().uiAndVisuals.teleportOverlay.enableWitherImpact) {
                             render(wrc, 10);
                         }
                     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
index 9b2080a3..8023ae05 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java
@@ -17,7 +17,7 @@ public class NewYearCakeBagHelper extends ContainerSolver {
 
     @Override
     protected boolean isEnabled() {
-        return SkyblockerConfigManager.get().general.enableNewYearCakesHelper;
+        return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java
index 2fdcf3b4..1860dbc9 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java
@@ -50,7 +50,7 @@ public class NewYearCakesHelper extends ContainerSolver {
 
     @Override
     protected boolean isEnabled() {
-        return SkyblockerConfigManager.get().general.enableNewYearCakesHelper;
+        return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper;
     }
 
     public boolean addCake(int year) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java
index 10823418..dc1eade5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/AuctionBrowserScreen.java
@@ -171,7 +171,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI<AuctionHouseS
 
     @Override
     protected void drawSlot(DrawContext context, Slot slot) {
-        if (SkyblockerConfigManager.get().general.fancyAuctionHouse.highlightCheapBIN && slot.hasStack() && isSlotHighlighted.getOrDefault(slot.id, false)) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.highlightCheapBIN && slot.hasStack() && isSlotHighlighted.getOrDefault(slot.id, false)) {
             context.drawBorder(slot.x, slot.y, 16, 16, new Color(0, 255, 0, 100).getRGB());
         }
         super.drawSlot(context, slot);
@@ -284,7 +284,7 @@ public class AuctionBrowserScreen extends AbstractCustomHypixelGUI<AuctionHouseS
                         } else categoryTabWidget.setToggled(false);
                     }
                 } else if (slotId > 9 && slotId < (handler.getRows() - 1) * 9 && slotId % 9 > 1 && slotId % 9 < 8) {
-                    if (!SkyblockerConfigManager.get().general.fancyAuctionHouse.highlightCheapBIN) return;
+                    if (!SkyblockerConfigManager.get().uiAndVisuals.fancyAuctionHouse.highlightCheapBIN) return;
                     List<Text> tooltip = ItemUtils.getLore(stack);
                     for (int k = tooltip.size() - 1; k >= 0; k--) {
                         Text text = tooltip.get(k);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
index 4a0213c1..828b68c3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/HungryHiker.java
@@ -19,7 +19,7 @@ public class HungryHiker extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-    return SkyblockerConfigManager.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+    return SkyblockerConfigManager.get().otherLocations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
index 032c7df9..3b41af31 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/barn/TreasureHunter.java
@@ -18,7 +18,7 @@ public class TreasureHunter extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return SkyblockerConfigManager.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+        return SkyblockerConfigManager.get().otherLocations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
index c99aeed8..634ea932 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleConfigScreen.java
@@ -24,13 +24,13 @@ public class ChatRuleConfigScreen extends Screen {
     private static final int SPACER_Y = 25;
 
     private final Map<MutableText, SoundEvent> soundsLookup = Map.ofEntries(
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT),
-            entry(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND)
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.pling"), SoundEvents.BLOCK_NOTE_BLOCK_PLING.value()),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.cave"), SoundEvents.AMBIENT_CAVE.value()),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.zombie"), SoundEvents.ENTITY_ZOMBIE_AMBIENT),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.crit"), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.arrowHit"), SoundEvents.ENTITY_ARROW_HIT_PLAYER),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.amethyst"), SoundEvents.BLOCK_AMETHYST_BLOCK_HIT),
+            entry(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.anvil"), SoundEvents.BLOCK_ANVIL_LAND)
     );
 
     private int buttonWidth = 75;
@@ -69,7 +69,7 @@ public class ChatRuleConfigScreen extends Screen {
     private final Screen parent;
 
     public ChatRuleConfigScreen(Screen parent, int chatRuleIndex) {
-        super(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen"));
+        super(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen"));
         this.chatRuleIndex = chatRuleIndex;
         this.chatRule = ChatRulesHandler.chatRuleList.get(chatRuleIndex);
         this.parent = parent;
@@ -101,63 +101,63 @@ public class ChatRuleConfigScreen extends Screen {
         int lineXOffset;
 
         nameLabelTextPos = currentPos;
-        lineXOffset  = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name")) + SPACER_X;
+        lineXOffset  = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name")) + SPACER_X;
         nameInput =  new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 100, 20, Text.of(""));
         nameInput.setText(chatRule.getName());
-        nameInput.setTooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name.@Tooltip")));
+        nameInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name.@Tooltip")));
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         inputsLabelTextPos = currentPos;
         currentPos = IntIntPair.of(currentPos.leftInt() + 10, currentPos.rightInt() + SPACER_Y);
 
         filterLabelTextPos = currentPos;
-        lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X;
+        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter")) + SPACER_X;
         filterInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));
         filterInput.setMaxLength(96);
         filterInput.setText(chatRule.getFilter());
-        filterInput.setTooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter.@Tooltip")));
+        filterInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter.@Tooltip")));
         currentPos = IntIntPair.of(currentPos.leftInt(),currentPos.rightInt() + SPACER_Y);
         lineXOffset = 0;
 
         partialMatchTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch")) + SPACER_X;
         partialMatchToggle = ButtonWidget.builder(enabledButtonText(chatRule.getPartialMatch()), a -> {
                     chatRule.setPartialMatch(!chatRule.getPartialMatch());
                     partialMatchToggle.setMessage(enabledButtonText(chatRule.getPartialMatch()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch.@Tooltip")))
                 .build();
         lineXOffset += buttonWidth + SPACER_X;
         regexTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex")) + SPACER_X;
         regexToggle = ButtonWidget.builder(enabledButtonText(chatRule.getRegex()), a -> {
                     chatRule.setRegex(!chatRule.getRegex());
                     regexToggle.setMessage(enabledButtonText(chatRule.getRegex()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex.@Tooltip")))
                 .build();
         lineXOffset += buttonWidth + SPACER_X;
         ignoreCaseTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase")) + SPACER_X;
         ignoreCaseToggle = ButtonWidget.builder(enabledButtonText(chatRule.getIgnoreCase()), a -> {
                     chatRule.setIgnoreCase(!chatRule.getIgnoreCase());
                     ignoreCaseToggle.setMessage(enabledButtonText(chatRule.getIgnoreCase()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase.@Tooltip")))
                 .build();
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         locationLabelTextPos = currentPos;
-        lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X;
+        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations")) + SPACER_X;
         locationsInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));
         locationsInput.setText(chatRule.getValidLocations());
-        MutableText locationToolTip = Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations.@Tooltip");
+        MutableText locationToolTip = Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations.@Tooltip");
         locationToolTip.append("\n");
         ChatRulesHandler.locationsList.forEach(location -> locationToolTip.append(" " + location + ",\n"));
         locationsInput.setTooltip(Tooltip.of(locationToolTip));
@@ -167,42 +167,42 @@ public class ChatRuleConfigScreen extends Screen {
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         hideMessageTextPos = currentPos;
-        lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X;
+        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage")) + SPACER_X;
         hideMessageToggle = ButtonWidget.builder(enabledButtonText(chatRule.getHideMessage()), a -> {
                     chatRule.setHideMessage(!chatRule.getHideMessage());
                     hideMessageToggle.setMessage(enabledButtonText(chatRule.getHideMessage()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage.@Tooltip")))
                 .build();
         lineXOffset += buttonWidth + SPACER_X;
         actionBarTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar")) + SPACER_X;
         actionBarToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowActionBar()), a -> {
                     chatRule.setShowActionBar(!chatRule.getShowActionBar());
                     actionBarToggle.setMessage(enabledButtonText(chatRule.getShowActionBar()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar.@Tooltip")))
                 .build();
         lineXOffset = 0;
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         announcementTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset, currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement")) + SPACER_X;
         announcementToggle = ButtonWidget.builder(enabledButtonText(chatRule.getShowAnnouncement()), a -> {
                     chatRule.setShowAnnouncement(!chatRule.getShowAnnouncement());
                     announcementToggle.setMessage(enabledButtonText(chatRule.getShowAnnouncement()));
                 })
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement.@Tooltip")))
                 .build();
         lineXOffset += buttonWidth + SPACER_X;
         customSoundLabelTextPos = IntIntPair.of(currentPos.leftInt() + lineXOffset,currentPos.rightInt());
-        lineXOffset += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X;
+        lineXOffset += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds")) + SPACER_X;
         soundsToggle = ButtonWidget.builder(getSoundName(), a -> {
                 currentSoundIndex += 1;
                 if (currentSoundIndex == soundsLookup.size()) {
@@ -217,18 +217,18 @@ public class ChatRuleConfigScreen extends Screen {
                 }})
                 .position(currentPos.leftInt() + lineXOffset, currentPos.rightInt())
                 .size(buttonWidth,20)
-                .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.@Tooltip")))
+                .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.@Tooltip")))
                 .build();
         currentPos = IntIntPair.of(currentPos.leftInt(), currentPos.rightInt() + SPACER_Y);
 
         replaceMessageLabelTextPos = currentPos;
-        lineXOffset = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X;
+        lineXOffset = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace")) + SPACER_X;
         replaceMessageInput = new TextFieldWidget(client.textRenderer, currentPos.leftInt() + lineXOffset, currentPos.rightInt(), 200, 20, Text.of(""));
         replaceMessageInput.setMaxLength(96);
-        replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace.@Tooltip")));
+        replaceMessageInput.setTooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace.@Tooltip")));
         replaceMessageInput.setText(chatRule.getReplaceMessage());
 
-        ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.finish"), a -> close())
+        ButtonWidget finishButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.finish"), a -> close())
                 .position(this.width - buttonWidth - SPACER_Y, this.height - SPACER_Y)
                 .size(buttonWidth, 20)
                 .build();
@@ -266,9 +266,9 @@ public class ChatRuleConfigScreen extends Screen {
     private int getMaxUsedWidth() {
         if (client == null) return 0;
         //text
-        int total = client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"));
-        total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"));
-        total += client.textRenderer.getWidth(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"));
+        int total = client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"));
+        total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex"));
+        total += client.textRenderer.getWidth(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"));
         //space
         total += SPACER_X * 6;
         //button width
@@ -287,9 +287,9 @@ public class ChatRuleConfigScreen extends Screen {
 
     private Text enabledButtonText(boolean enabled) {
         if (enabled) {
-            return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());
+            return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());
         } else {
-            return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());
+            return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());
         }
     }
 
@@ -300,19 +300,19 @@ public class ChatRuleConfigScreen extends Screen {
 
         //draw labels ands text
         int yOffset = (SPACER_Y - this.textRenderer.fontHeight) / 2;
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
-        context.drawTextWithShadow(this.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.inputs"), inputsLabelTextPos.leftInt(), inputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.name"), nameLabelTextPos.leftInt(), nameLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.filter"), filterLabelTextPos.leftInt(), filterLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.partialMatch"), partialMatchTextPos.leftInt(), partialMatchTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.regex"), regexTextPos.leftInt(), regexTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.ignoreCase"), ignoreCaseTextPos.leftInt(), ignoreCaseTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.locations"), locationLabelTextPos.leftInt(), locationLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.outputs"), outputsLabelTextPos.leftInt(), outputsLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.hideMessage"), hideMessageTextPos.leftInt(), hideMessageTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.actionBar"), actionBarTextPos.leftInt(), actionBarTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.announcement"), announcementTextPos.leftInt(), announcementTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds"), customSoundLabelTextPos.leftInt(), customSoundLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
+        context.drawTextWithShadow(this.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.replace"), replaceMessageLabelTextPos.leftInt(), replaceMessageLabelTextPos.rightInt() + yOffset, 0xFFFFFFFF);
     }
 
     /**
@@ -337,7 +337,7 @@ public class ChatRuleConfigScreen extends Screen {
 
     private MutableText getSoundName() {
         if (currentSoundIndex == -1) {
-            return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.none");
+            return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.sounds.none");
         }
 
         return soundsLookup.keySet().stream().toList().get(currentSoundIndex);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
index 747e826b..f7a5ba84 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
@@ -82,9 +82,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig
 
         @Override
         public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF);
-            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF);
-            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF);
+            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleName"), width / 2 - 125, y + 5, 0xFFFFFFFF);
+            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.ruleEnabled"), width / 2, y + 5, 0xFFFFFFFF);
+            context.drawCenteredTextWithShadow(client.textRenderer, Text.translatable("skyblocker.option.messages.chatRules.screen.modify"), width / 2 + 100, y + 5, 0xFFFFFFFF);
         }
     }
 
@@ -115,17 +115,17 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig
                     .position(width / 2 - 25, 5)
                     .build();
 
-            openConfigButton = ButtonWidget.builder(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.editRule"), a -> {
+            openConfigButton = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule"), a -> {
                         client.setScreen(new ChatRuleConfigScreen(screen, chatRuleIndex));
                     })
                     .size(50, 20)
                     .position(width / 2 + 45, 5)
-                    .tooltip(Tooltip.of(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.editRule.@Tooltip")))
+                    .tooltip(Tooltip.of(Text.translatable("skyblocker.option.messages.chatRules.screen.editRule.@Tooltip")))
                     .build();
 
             deleteButton = ButtonWidget.builder(Text.translatable("selectServer.delete"), a -> {
                         oldScrollAmount = getScrollAmount();
-                        client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.deleteQuestion"), Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL));
+                        client.setScreen(new ConfirmScreen(this::deleteEntry, Text.translatable("skyblocker.option.messages.chatRules.screen.deleteQuestion"), Text.translatable("skyblocker.option.messages.chatRules.screen.deleteWarning", chatRule.getName()), Text.translatable("selectServer.deleteButton"), ScreenTexts.CANCEL));
                     })
                     .size(50, 20)
                     .position(width / 2 + 105, 5)
@@ -136,9 +136,9 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig
 
         private Text enabledButtonText() {
             if (chatRule.getEnabled()) {
-                return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());
+                return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.true").withColor(Color.GREEN.getRGB());
             } else {
-                return Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());
+                return Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen.false").withColor(Color.RED.getRGB());
             }
         }
         private void toggleEnabled() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java
index 49ef735d..7ca17676 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigScreen.java
@@ -15,7 +15,7 @@ public class ChatRulesConfigScreen extends Screen {
     private final Screen parent;
 
     public ChatRulesConfigScreen(Screen parent) {
-        super(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.ruleScreen"));
+        super(Text.translatable("skyblocker.option.messages.chatRules.screen.ruleScreen"));
         this.parent = parent;
     }
 
@@ -37,7 +37,7 @@ public class ChatRulesConfigScreen extends Screen {
                 close();
             }
         }).build());
-        ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("text.autoconfig.skyblocker.option.messages.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build();
+        ButtonWidget buttonNew1 = ButtonWidget.builder(Text.translatable("skyblocker.option.messages.chatRules.screen.new"), buttonNew -> chatRulesConfigListWidget.addRuleAfterSelected()).build();
         adder.add(buttonNew1);
         ButtonWidget buttonDone = ButtonWidget.builder(ScreenTexts.DONE, button -> {
             chatRulesConfigListWidget.saveRules();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
index 7ddbeb99..7c3c634a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
@@ -4,6 +4,7 @@ import java.util.function.Supplier;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.CrimsonIsleConfig;
 import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra.KuudraPhase;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
@@ -17,7 +18,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 public class ArrowPoisonWarning {
-	private static final Supplier<SkyblockerConfig.Kuudra> CONFIG = () -> SkyblockerConfigManager.get().locations.crimsonIsle.kuudra;
+	private static final Supplier<CrimsonIsleConfig.Kuudra> CONFIG = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra;
 	private static final int THREE_SECONDS = 20 * 3;
 	private static final Title NONE_TITLE = new Title(Text.translatable("skyblocker.crimson.kuudra.noArrowPoison").formatted(Formatting.GREEN));
 	private static final Title LOW_TITLE = new Title(Text.translatable("skyblocker.crimson.kuudra.lowArrowPoison").formatted(Formatting.GREEN));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
index 00cd85a0..1f378dda 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
@@ -2,10 +2,12 @@ package de.hysky.skyblocker.skyblock.crimson.kuudra;
 
 import java.io.BufferedReader;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import de.hysky.skyblocker.config.configs.CrimsonIsleConfig;
 import org.slf4j.Logger;
 
 import com.google.gson.JsonElement;
@@ -36,7 +38,7 @@ public class KuudraWaypoints {
 	private static final float[] SUPPLIES_COLOR = { 255f / 255f, 0f, 0f };
 	private static final float[] PEARL_COLOR = { 57f / 255f, 117f / 255f, 125f / 255f };
 	private static final float[] SAFE_SPOT_COLOR = { 255f / 255f, 85f / 255f, 255f / 255f };
-	private static final Supplier<Type> SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType;
+	private static final Supplier<Type> SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra.suppliesAndFuelWaypointType;
 	private static final ObjectArrayList<Waypoint> SAFE_SPOT_WAYPOINTS = new ObjectArrayList<>();
 	private static final ObjectArrayList<Waypoint> PEARL_WAYPOINTS = new ObjectArrayList<>();
 	private static final Function<float[], Codec<List<Waypoint>>> CODEC = cc -> PosUtils.ALT_BLOCK_POS_CODEC.xmap(
@@ -75,14 +77,14 @@ public class KuudraWaypoints {
 
 	static void tick() {
 		MinecraftClient client = MinecraftClient.getInstance();
-		SkyblockerConfig.Kuudra config = SkyblockerConfigManager.get().locations.crimsonIsle.kuudra;
+		CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
 
-		if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints)) {
+		if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints) && client.player != null) {
 			Box searchBox = client.player.getBoundingBox().expand(500d);
 			ObjectArrayList<Waypoint> supplies = new ObjectArrayList<>();
 			ObjectArrayList<Waypoint> fuelCells = new ObjectArrayList<>();
 
-			if (config.supplyWaypoints || config.fuelWaypoints) {
+			if ((config.supplyWaypoints || config.fuelWaypoints) && client.world != null) {
 				List<GiantEntity> giants = client.world.getEntitiesByClass(GiantEntity.class, searchBox, giant -> giant.getY() < 67);
 
 				for (GiantEntity giant : giants) {
@@ -94,17 +96,17 @@ public class KuudraWaypoints {
 
 					Waypoint waypoint = new Waypoint(BlockPos.ofFloored(x, y, z), SUPPLIES_AND_FUEL_TYPE, SUPPLIES_COLOR, false);
 
-					switch (Kuudra.phase) {
-						case RETRIEVE_SUPPLIES -> supplies.add(waypoint);
-						case DPS -> fuelCells.add(waypoint);
-						default -> supplies.add(waypoint);
-					}
+                    if (Objects.requireNonNull(Kuudra.phase) == Kuudra.KuudraPhase.DPS) {
+                        fuelCells.add(waypoint);
+                    } else {
+                        supplies.add(waypoint);
+                    }
 				}
 			}
 
 			ObjectArrayList<Waypoint> ballistaBuildSpots = new ObjectArrayList<>();
 
-			if (config.ballistaBuildWaypoints) {
+			if (config.ballistaBuildWaypoints && client.world != null) {
 				List<ArmorStandEntity> armorStands = client.world.getEntitiesByClass(ArmorStandEntity.class, searchBox, ArmorStandEntity::hasCustomName);
 
 				for (ArmorStandEntity armorStand : armorStands) {
@@ -123,7 +125,7 @@ public class KuudraWaypoints {
 	}
 
 	static void render(WorldRenderContext context) {
-		SkyblockerConfig.Kuudra config = SkyblockerConfigManager.get().locations.crimsonIsle.kuudra;
+		CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
 
 		if (Utils.isInKuudra() && loaded) {
 			if (config.supplyWaypoints) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
index 0bc34c57..d317a2e8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusHelper.java
@@ -19,7 +19,7 @@ public class CroesusHelper extends ContainerSolver {
 
     @Override
     protected boolean isEnabled() {
-        return SkyblockerConfigManager.get().locations.dungeons.croesusHelper;
+        return SkyblockerConfigManager.get().dungeons.croesusHelper;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
index c6cbe2ce..70e785cb 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CroesusProfit.java
@@ -28,7 +28,7 @@ public class CroesusProfit extends ContainerSolver {
 
     @Override
     protected boolean isEnabled() {
-        return SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit;
+        return SkyblockerConfigManager.get().dungeons.dungeonChestProfit.croesusProfit;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
index 7a6cdcd0..1e896794 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -46,9 +46,9 @@ public class DungeonMap {
         MapState state = FilledMapItem.getMapState(mapId, client.world);
         if (state == null) return;
 
-        int x = SkyblockerConfigManager.get().locations.dungeons.mapX;
-        int y = SkyblockerConfigManager.get().locations.dungeons.mapY;
-        float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling;
+        int x = SkyblockerConfigManager.get().dungeons.dungeonMap.mapX;
+        int y = SkyblockerConfigManager.get().dungeons.dungeonMap.mapY;
+        float scaling = SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling;
         VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers();
         MapRenderer mapRenderer = client.gameRenderer.getMapRenderer();
 
@@ -69,7 +69,7 @@ public class DungeonMap {
     }
 
     private static void render(DrawContext context) {
-        if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && !DungeonManager.isInBoss() && SkyblockerConfigManager.get().locations.dungeons.enableMap) {
+        if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && !DungeonManager.isInBoss() && SkyblockerConfigManager.get().dungeons.dungeonMap.enableMap) {
             render(context.getMatrices());
         }
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index 0f42c495..068510c2 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -11,10 +11,10 @@ import java.awt.*;
 
 public class DungeonMapConfigScreen extends Screen {
 
-	private int mapX = SkyblockerConfigManager.get().locations.dungeons.mapX;
-	private int mapY = SkyblockerConfigManager.get().locations.dungeons.mapY;
-	private int scoreX = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX;
-	private int scoreY = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY;
+	private int mapX = SkyblockerConfigManager.get().dungeons.dungeonMap.mapX;
+	private int mapY = SkyblockerConfigManager.get().dungeons.dungeonMap.mapY;
+	private int scoreX = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreX;
+	private int scoreY = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreY;
 	private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
 	private final Screen parent;
 
@@ -38,8 +38,8 @@ public class DungeonMapConfigScreen extends Screen {
 
 	@Override
 	public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-		int mapSize = (int) (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling);
-		float scoreScaling = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling;
+		int mapSize = (int) (128 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling);
+		float scoreScaling = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreScaling;
 		int scoreWidth = (int) (textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * scoreScaling);
 		int scoreHeight = (int) (textRenderer.fontHeight * scoreScaling);
 		if (RenderHelper.pointIsInArea(mouseX, mouseY, mapX, mapY, mapX + mapSize, mapY + mapSize) && button == 0) {
@@ -57,8 +57,8 @@ public class DungeonMapConfigScreen extends Screen {
 		if (button == 1) {
 			mapX = 2;
 			mapY = 2;
-			scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().locations.dungeons.mapScaling)) - textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling / 2), 0);
-			scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling) + 4);
+			scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling)) - textRenderer.getWidth(DungeonScoreHUD.getFormattedScoreText()) * SkyblockerConfigManager.get().dungeons.dungeonScore.scoreScaling / 2), 0);
+			scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling) + 4);
 		}
 
 		return super.mouseClicked(mouseX, mouseY, button);
@@ -66,17 +66,17 @@ public class DungeonMapConfigScreen extends Screen {
 
 	@Override
 	public void close() {
-		SkyblockerConfigManager.get().locations.dungeons.mapX = mapX;
-		SkyblockerConfigManager.get().locations.dungeons.mapY = mapY;
-		SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX = scoreX;
-		SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY = scoreY;
+		SkyblockerConfigManager.get().dungeons.dungeonMap.mapX = mapX;
+		SkyblockerConfigManager.get().dungeons.dungeonMap.mapY = mapY;
+		SkyblockerConfigManager.get().dungeons.dungeonScore.scoreX = scoreX;
+		SkyblockerConfigManager.get().dungeons.dungeonScore.scoreY = scoreY;
 		SkyblockerConfigManager.save();
 
 		this.client.setScreen(parent);
 	}
 
 	public void renderHUDMap(DrawContext context, int x, int y) {
-		float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling;
+		float scaling = SkyblockerConfigManager.get().dungeons.dungeonMap.mapScaling;
 		int size = (int) (128 * scaling);
 		context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
 	}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
index f9e33410..7a5abed1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.DungeonsConfig;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.utils.Constants;
@@ -27,8 +28,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DungeonScore {
-	private static final SkyblockerConfig.DungeonScore SCORE_CONFIG = SkyblockerConfigManager.get().locations.dungeons.dungeonScore;
-	private static final SkyblockerConfig.MimicMessage MIMIC_MESSAGE_CONFIG = SkyblockerConfigManager.get().locations.dungeons.mimicMessage;
+	private static final DungeonsConfig.DungeonScore SCORE_CONFIG = SkyblockerConfigManager.get().dungeons.dungeonScore;
+	private static final DungeonsConfig.MimicMessage MIMIC_MESSAGE_CONFIG = SkyblockerConfigManager.get().dungeons.mimicMessage;
 	private static final Logger LOGGER = LoggerFactory.getLogger("Skyblocker Dungeon Score");
 	//Scoreboard patterns
 	private static final Pattern CLEARED_PATTERN = Pattern.compile("Cleared: (?<cleared>\\d+)%.*");
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
index 8d402172..1896eb53 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
@@ -21,15 +21,15 @@ public class DungeonScoreHUD {
 	private static final Text extraSpace = Text.literal(" ").append(Text.literal(" ").formatted(Formatting.BOLD));
 
 	private static void render(DrawContext context) {
-		if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && SkyblockerConfigManager.get().locations.dungeons.dungeonScore.enableScoreHUD) {
-			int x = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX;
-			int y = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY;
+		if (Utils.isInDungeons() && DungeonScore.isDungeonStarted() && SkyblockerConfigManager.get().dungeons.dungeonScore.enableScoreHUD) {
+			int x = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreX;
+			int y = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreY;
 			render(context, x, y);
 		}
 	}
 
 	public static void render(DrawContext context, int x, int y) {
-		float scale = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling;
+		float scale = SkyblockerConfigManager.get().dungeons.dungeonScore.scoreScaling;
 		MatrixStack matrixStack = context.getMatrices();
 		matrixStack.push();
 		matrixStack.scale(scale, scale, 0);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/FireFreezeStaffTimer.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/FireFreezeStaffTimer.java
index 7c0aab4c..b2a9b521 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/FireFreezeStaffTimer.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/FireFreezeStaffTimer.java
@@ -24,7 +24,7 @@ public class FireFreezeStaffTimer {
 
         if (client.currentScreen != null) return;
 
-        if (SkyblockerConfigManager.get().locations.dungeons.fireFreezeStaffTimer && fireFreezeTimer != 0) {
+        if (SkyblockerConfigManager.get().dungeons.theProfessor.fireFreezeStaffTimer && fireFreezeTimer != 0) {
             long now = System.currentTimeMillis();
 
             if (now >= fireFreezeTimer + 5000) {
@@ -51,7 +51,7 @@ public class FireFreezeStaffTimer {
     }
 
     private static void onChatMessage(Text text, boolean overlay) {
-        if (!overlay && SkyblockerConfigManager.get().locations.dungeons.fireFreezeStaffTimer && Formatting.strip(text.getString())
+        if (!overlay && SkyblockerConfigManager.get().dungeons.theProfessor.fireFreezeStaffTimer && Formatting.strip(text.getString())
                 .equals("[BOSS] The Professor: Oh? You found my Guardians' one weakness?")) {
             fireFreezeTimer = System.currentTimeMillis() + 5000L;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/GuardianHealth.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/GuardianHealth.java
index e17c490d..288f30ee 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/GuardianHealth.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/GuardianHealth.java
@@ -32,7 +32,7 @@ public class GuardianHealth {
     }
 
     private static void onWorldRender(WorldRenderContext context) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.floor3GuardianHealthDisplay) return;
+        if (!SkyblockerConfigManager.get().dungeons.theProfessor.floor3GuardianHealthDisplay) return;
 
         MinecraftClient client = MinecraftClient.getInstance();
 
@@ -78,7 +78,7 @@ public class GuardianHealth {
     }
 
     private static void onChatMessage(Text text, boolean overlay) {
-        if (Utils.isInDungeons() && SkyblockerConfigManager.get().locations.dungeons.floor3GuardianHealthDisplay && !inBoss) {
+        if (Utils.isInDungeons() && SkyblockerConfigManager.get().dungeons.theProfessor.floor3GuardianHealthDisplay && !inBoss) {
             String unformatted = Formatting.strip(text.getString());
 
             inBoss = unformatted.equals("[BOSS] The Professor: I was burdened with terrible news recently...");
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
index ee9791d5..42810b60 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.dungeon;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.DungeonsConfig;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.Utils;
@@ -42,13 +43,13 @@ public class LividColor {
             "Vendetta Livid", Formatting.WHITE
     );
     public static final Set<String> LIVID_NAMES = Set.copyOf(LIVID_TO_FORMATTING.keySet());
-    public static final SkyblockerConfig.LividColor CONFIG = SkyblockerConfigManager.get().locations.dungeons.lividColor;
+    public static final DungeonsConfig.Livid CONFIG = SkyblockerConfigManager.get().dungeons.livid;
     private static int tenTicks = 0;
     private static Formatting color;
 
     public static void init() {
         ClientReceiveMessageEvents.GAME.register((message, overlay) -> {
-            SkyblockerConfig.LividColor config = SkyblockerConfigManager.get().locations.dungeons.lividColor;
+            DungeonsConfig.Livid config = SkyblockerConfigManager.get().dungeons.livid;
             if ((config.enableLividColorText || config.enableLividColorTitle || config.enableLividColorGlow) && message.getString().equals("[BOSS] Livid: I respect you for making it to here, but I'll be your undoing.")) {
                 tenTicks = 8;
             }
@@ -58,7 +59,7 @@ public class LividColor {
     public static void update() {
         MinecraftClient client = MinecraftClient.getInstance();
         if (tenTicks != 0) {
-            SkyblockerConfig.LividColor config = SkyblockerConfigManager.get().locations.dungeons.lividColor;
+            DungeonsConfig.Livid config = SkyblockerConfigManager.get().dungeons.livid;
             if ((config.enableLividColorText || config.enableLividColorTitle || config.enableLividColorGlow) && Utils.isInDungeons() && client.world != null) {
                 if (tenTicks == 1) {
                     onLividColorFound(client, Blocks.RED_WOOL);
@@ -94,11 +95,11 @@ public class LividColor {
     }
 
     public static boolean allowGlow() {
-        return !SkyblockerConfigManager.get().locations.dungeons.lividColor.enableLividColorGlow || !DungeonManager.getBoss().isFloor(5);
+        return !SkyblockerConfigManager.get().dungeons.livid.enableLividColorGlow || !DungeonManager.getBoss().isFloor(5);
     }
 
     public static boolean shouldGlow(String name) {
-        return SkyblockerConfigManager.get().locations.dungeons.lividColor.enableLividColorGlow && color == LIVID_TO_FORMATTING.get(name);
+        return SkyblockerConfigManager.get().dungeons.livid.enableLividColorGlow && color == LIVID_TO_FORMATTING.get(name);
     }
 
     @SuppressWarnings("DataFlowIssue")
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java
index 6165ac6a..d39be953 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java
@@ -43,7 +43,7 @@ public class Reparty extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return (SkyblockerConfigManager.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+        return (SkyblockerConfigManager.get().dungeons.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java
index 419ce85c..42aec035 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java
@@ -177,7 +177,7 @@ public class CreeperBeams extends DungeonPuzzle {
     public void render(WorldRenderContext wrc) {
 
         // don't render if solved or disabled
-        if (!shouldSolve() || !SkyblockerConfigManager.get().locations.dungeons.creeperSolver) {
+        if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.creeperSolver) {
             return;
         }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java
index fa7f1e92..5c0e8437 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java
@@ -111,7 +111,7 @@ public class DungeonBlaze extends DungeonPuzzle {
     @Override
     public void render(WorldRenderContext wrc) {
         try {
-            if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().locations.dungeons.blazeSolver) {
+            if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().dungeons.puzzleSolver.blazeSolver) {
                 if (highestBlaze.getY() < 69) {
                     renderBlazeOutline(highestBlaze, nextHighestBlaze, wrc);
                 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java
index 57386674..3f1708f1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java
@@ -80,7 +80,7 @@ public class IceFill extends DungeonPuzzle {
 
     @Override
     public void tick(MinecraftClient client) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
             return;
         }
         Room room = DungeonManager.getCurrentRoom();
@@ -150,7 +150,7 @@ public class IceFill extends DungeonPuzzle {
 
     @Override
     public void render(WorldRenderContext context) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveIceFill || !DungeonManager.isCurrentRoomMatched()) {
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || !DungeonManager.isCurrentRoomMatched()) {
             return;
         }
         Room room = DungeonManager.getCurrentRoom();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java
index b5cbc8ee..f3ac927f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java
@@ -65,7 +65,7 @@ public class Silverfish extends DungeonPuzzle {
 
     @Override
     public void tick(MinecraftClient client) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) {
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) {
             return;
         }
         Room room = DungeonManager.getCurrentRoom();
@@ -158,7 +158,7 @@ public class Silverfish extends DungeonPuzzle {
 
     @Override
     public void render(WorldRenderContext context) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) {
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) {
             return;
         }
         Room room = DungeonManager.getCurrentRoom();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
index fd7a8dbf..ae72d3cc 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java
@@ -17,7 +17,7 @@ public class ThreeWeirdos extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return SkyblockerConfigManager.get().locations.dungeons.solveThreeWeirdos ? null : ChatFilterResult.PASS;
+        return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveThreeWeirdos ? null : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java
index 1683276e..088a6e6b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java
@@ -111,7 +111,7 @@ public class TicTacToe extends DungeonPuzzle {
 	@Override
 	public void render(WorldRenderContext context) {
 		try {
-			if (SkyblockerConfigManager.get().locations.dungeons.solveTicTacToe && nextBestMoveToMake != null) {
+			if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTicTacToe && nextBestMoveToMake != null) {
 				RenderHelper.renderOutline(context, nextBestMoveToMake, RED_COLOR_COMPONENTS, 5, false);
 			}
 		} catch (Exception e) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
index eb09cf6e..4dc72cff 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java
@@ -29,7 +29,7 @@ public class Trivia extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return SkyblockerConfigManager.get().locations.dungeons.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+        return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java
index 878c8d0a..24d1331a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java
@@ -43,7 +43,7 @@ public class Boulder extends DungeonPuzzle {
     @Override
     public void tick(MinecraftClient client) {
 
-        if (!shouldSolve() || !SkyblockerConfigManager.get().locations.dungeons.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) {
+        if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) {
             return;
         }
 
@@ -195,7 +195,7 @@ public class Boulder extends DungeonPuzzle {
 
     @Override
     public void render(WorldRenderContext context) {
-        if (!shouldSolve() || !SkyblockerConfigManager.get().locations.dungeons.solveBoulder || !DungeonManager.isCurrentRoomMatched())
+        if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || !DungeonManager.isCurrentRoomMatched())
             return;
         float alpha = 1.0f;
         float lineWidth = 5.0f;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
index 2efadfda..852873ea 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java
@@ -133,7 +133,7 @@ public class Waterboard extends DungeonPuzzle {
 
     @Override
     public void tick(MinecraftClient client) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
             return;
         }
         Room room = DungeonManager.getCurrentRoom();
@@ -337,7 +337,7 @@ public class Waterboard extends DungeonPuzzle {
 
     @Override
     public void render(WorldRenderContext context) {
-        if (!SkyblockerConfigManager.get().locations.dungeons.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return;
+        if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return;
         Room room = DungeonManager.getCurrentRoom();
 
         // Render the best combination.
@@ -377,7 +377,7 @@ public class Waterboard extends DungeonPuzzle {
 
     private ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult blockHitResult) {
         BlockState state = world.getBlockState(blockHitResult.getBlockPos());
-        if (SkyblockerConfigManager.get().locations.dungeons.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) {
+        if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) {
             if (!state.get(LeverBlock.POWERED)) {
                 bestCombinationsUpdated = false;
                 Scheduler.INSTANCE.schedule(() -> waypoints[6].setMissing(), 50);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
index 8bb22e7e..e4504cc9 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonManager.java
@@ -12,7 +12,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.serialization.JsonOps;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.config.configs.DungeonsConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.skyblock.dungeon.DungeonBoss;
@@ -227,7 +227,7 @@ public class DungeonManager {
      */
     public static void init() {
         CUSTOM_WAYPOINTS_DIR = SkyblockerMod.CONFIG_DIR.resolve("custom_secret_waypoints.json");
-        if (!SkyblockerConfigManager.get().locations.dungeons.secretWaypoints.enableRoomMatching) {
+        if (!SkyblockerConfigManager.get().dungeons.secretWaypoints.enableRoomMatching) {
             return;
         }
         // Execute with MinecraftClient as executor since we need to wait for MinecraftClient#resourceManager to be set
@@ -628,7 +628,7 @@ public class DungeonManager {
         }
 
         // Process key found messages for door highlight
-        if (SkyblockerConfigManager.get().locations.dungeons.doorHighlight.enableDoorHighlight) {
+        if (SkyblockerConfigManager.get().dungeons.doorHighlight.enableDoorHighlight) {
             Matcher matcher = KEY_FOUND.matcher(message);
             if (matcher.matches()) {
                 String name = matcher.group("name");
@@ -755,12 +755,12 @@ public class DungeonManager {
     }
 
     /**
-     * Checks if {@link SkyblockerConfig.SecretWaypoints#enableRoomMatching room matching} is enabled and the player is in a dungeon.
+     * Checks if {@link DungeonsConfig.SecretWaypoints#enableRoomMatching room matching} is enabled and the player is in a dungeon.
      *
      * @return whether room matching and dungeon secrets should be processed
      */
     private static boolean shouldProcess() {
-        return SkyblockerConfigManager.get().locations.dungeons.secretWaypoints.enableRoomMatching && Utils.isInDungeons();
+        return SkyblockerConfigManager.get().dungeons.secretWaypoints.enableRoomMatching && Utils.isInDungeons();
     }
 
     /**
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java
index 5b20b48f..e6a8b9d1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java
@@ -310,7 +310,7 @@ public class Room implements Tickable, Renderable {
         }
 
         // Wither and blood door
-        if (SkyblockerConfigManager.get().locations.dungeons.doorHighlight.enableDoorHighlight && doorPos == null) {
+        if (SkyblockerConfigManager.get().dungeons.doorHighlight.enableDoorHighlight && doorPos == null) {
             doorPos = DungeonMapUtils.getWitherBloodDoorPos(client.world, segments);
             if (doorPos != null) {
                 doorBox = new Box(doorPos.getX(), doorPos.getY(), doorPos.getZ(), doorPos.getX() + DOOR_SIZE.getX(), doorPos.getY() + DOOR_SIZE.getY(), doorPos.getZ() + DOOR_SIZE.getZ());
@@ -420,7 +420,7 @@ public class Room implements Tickable, Renderable {
             if (matchState == MatchState.MATCHING) {
                 // If one room matches, load the secrets for that room and set state to double-checking.
                 Triple<Direction, Vector2ic, List<String>> directionRoom = possibleRooms.stream().filter(directionRooms -> directionRooms.getRight().size() == 1).findAny().orElseThrow();
-                name = directionRoom.getRight().get(0);
+                name = directionRoom.getRight().getFirst();
                 direction = directionRoom.getLeft();
                 physicalCornerPos = directionRoom.getMiddle();
                 DungeonManager.LOGGER.info("[Skyblocker Dungeon Secrets] Room {} matched after checking {} block(s), starting double checking", name, checkedBlocks.size());
@@ -526,7 +526,7 @@ public class Room implements Tickable, Renderable {
         }
 
         synchronized (this) {
-            if (SkyblockerConfigManager.get().locations.dungeons.secretWaypoints.enableSecretWaypoints && isMatched()) {
+            if (SkyblockerConfigManager.get().dungeons.secretWaypoints.enableSecretWaypoints && isMatched()) {
                 for (SecretWaypoint secretWaypoint : secretWaypoints.values()) {
                     if (secretWaypoint.shouldRender()) {
                         secretWaypoint.render(context);
@@ -535,11 +535,11 @@ public class Room implements Tickable, Renderable {
             }
         }
 
-        if (!SkyblockerConfigManager.get().locations.dungeons.doorHighlight.enableDoorHighlight || doorPos == null) {
+        if (!SkyblockerConfigManager.get().dungeons.doorHighlight.enableDoorHighlight || doorPos == null) {
             return;
         }
         float[] colorComponents = keyFound ? GREEN_COLOR_COMPONENTS : RED_COLOR_COMPONENTS;
-        switch (SkyblockerConfigManager.get().locations.dungeons.doorHighlight.doorHighlightType) {
+        switch (SkyblockerConfigManager.get().dungeons.doorHighlight.doorHighlightType) {
             case HIGHLIGHT -> RenderHelper.renderFilled(context, doorPos, DOOR_SIZE, colorComponents, 0.5f, true);
             case OUTLINED_HIGHLIGHT -> {
                 RenderHelper.renderFilled(context, doorPos, DOOR_SIZE, colorComponents, 0.5f, true);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
index 44df9d8c..42fe6dbe 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java
@@ -7,6 +7,7 @@ import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.DungeonsConfig;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
@@ -38,7 +39,7 @@ public class SecretWaypoint extends Waypoint {
     ).apply(instance, SecretWaypoint::new));
     public static final Codec<List<SecretWaypoint>> LIST_CODEC = CODEC.listOf();
     static final List<String> SECRET_ITEMS = List.of("Decoy", "Defuse Kit", "Dungeon Chest Key", "Healing VIII", "Inflatable Jerry", "Spirit Leap", "Training Weights", "Trap", "Treasure Talisman");
-    private static final Supplier<SkyblockerConfig.SecretWaypoints> CONFIG = () -> SkyblockerConfigManager.get().locations.dungeons.secretWaypoints;
+    private static final Supplier<DungeonsConfig.SecretWaypoints> CONFIG = () -> SkyblockerConfigManager.get().dungeons.secretWaypoints;
     static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType;
     final int secretIndex;
     final Category category;
@@ -131,10 +132,10 @@ public class SecretWaypoint extends Waypoint {
         DEFAULT("default", secretWaypoints -> secretWaypoints.enableDefaultWaypoints, 190, 255, 252);
         private static final Codec<Category> CODEC = StringIdentifiable.createCodec(Category::values);
         private final String name;
-        private final Predicate<SkyblockerConfig.SecretWaypoints> enabledPredicate;
+        private final Predicate<DungeonsConfig.SecretWaypoints> enabledPredicate;
         private final float[] colorComponents;
 
-        Category(String name, Predicate<SkyblockerConfig.SecretWaypoints> enabledPredicate, int... intColorComponents) {
+        Category(String name, Predicate<DungeonsConfig.SecretWaypoints> enabledPredicate, int... intColorComponents) {
             this.name = name;
             this.enabledPredicate = enabledPredicate;
             colorComponents = new float[intColorComponents.length];
@@ -164,7 +165,7 @@ public class SecretWaypoint extends Waypoint {
         }
 
         boolean isEnabled() {
-            return enabledPredicate.test(SkyblockerConfigManager.get().locations.dungeons.secretWaypoints);
+            return enabledPredicate.test(SkyblockerConfigManager.get().dungeons.secretWaypoints);
         }
 
         @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java
index 2f748792..fd960163 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java
@@ -116,7 +116,7 @@ public class SecretsTracker {
 	}
 
 	private static void onMessage(Text text, boolean overlay) {
-		if (Utils.isInDungeons() && SkyblockerConfigManager.get().locations.dungeons.playerSecretsTracker && !overlay) {
+		if (Utils.isInDungeons() && SkyblockerConfigManager.get().dungeons.playerSecretsTracker && !overlay) {
 			String message = Formatting.strip(text.getString());
 
 			try {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
index 933fefa9..01673f23 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java
@@ -29,7 +29,7 @@ public class ColorTerminal extends ContainerSolver {
     @Override
     protected boolean isEnabled() {
         targetColor = null;
-        return SkyblockerConfigManager.get().locations.dungeons.terminals.solveColor;
+        return SkyblockerConfigManager.get().dungeons.terminals.solveColor;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
index 4789e0f4..d8d9a63a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java
@@ -24,7 +24,7 @@ public class OrderTerminal extends ContainerSolver {
     protected boolean isEnabled() {
         orderedSlots = null;
         currentNum = 0;
-        return SkyblockerConfigManager.get().locations.dungeons.terminals.solveOrder;
+        return SkyblockerConfigManager.get().dungeons.terminals.solveOrder;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
index 0bfb896e..c4cc8e47 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java
@@ -23,7 +23,7 @@ public class StartsWithTerminal extends ContainerSolver {
 
 	@Override
 	protected boolean isEnabled() {
-		return SkyblockerConfigManager.get().locations.dungeons.terminals.solveStartsWith;
+		return SkyblockerConfigManager.get().dungeons.terminals.solveStartsWith;
 	}
 
 	@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
index a4af804c..a74dbc5e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java
@@ -35,18 +35,18 @@ public class CrystalsHud {
                                 .executes(Scheduler.queueOpenScreenCommand(CrystalsHudConfigScreen::new))))));
 
         HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> {
-            if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.enabled
+            if (!SkyblockerConfigManager.get().mining.crystalsHud.enabled
                     || CLIENT.player == null
                     || !visible) {
                 return;
             }
-            render(context, tickDelta, SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.x,
-                    SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.y);
+            render(context, tickDelta, SkyblockerConfigManager.get().mining.crystalsHud.x,
+                    SkyblockerConfigManager.get().mining.crystalsHud.y);
         });
     }
 
     protected static int getDimensionsForConfig() {
-        return (int) (62 * SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.mapScaling);
+        return (int) (62 * SkyblockerConfigManager.get().mining.crystalsHud.mapScaling);
     }
 
 
@@ -59,7 +59,7 @@ public class CrystalsHud {
      * @param hudY Top left Y coordinate of the map
      */
     private static void render(DrawContext context, float tickDelta, int hudX, int hudY) {
-        float scale = SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.mapScaling;
+        float scale = SkyblockerConfigManager.get().mining.crystalsHud.mapScaling;
 
         //make sure the map renders infront of some stuff - improve this in the future with better layering (1.20.5?)
         //and set position and scale
@@ -72,13 +72,13 @@ public class CrystalsHud {
         context.drawTexture(MAP_TEXTURE, 0, 0, 0, 0, 62, 62, 62, 62);
 
         //if enabled add waypoint locations to map
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.showLocations) {
+        if (SkyblockerConfigManager.get().mining.crystalsHud.showLocations) {
             Map<String,CrystalsWaypoint> ActiveWaypoints = CrystalsLocationsManager.activeWaypoints;
 
             for (CrystalsWaypoint waypoint : ActiveWaypoints.values()) {
                 Color waypointColor = waypoint.category.color;
                 Vector2ic renderPos = transformLocation(waypoint.pos.getX(), waypoint.pos.getZ());
-                int locationSize = SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.locationSize;
+                int locationSize = SkyblockerConfigManager.get().mining.crystalsHud.locationSize;
 
                 if (SMALL_LOCATIONS.contains(waypoint.name.getString())) {//if small location half the location size
                     locationSize /= 2;
@@ -150,7 +150,7 @@ public class CrystalsHud {
      *
      */
     public static void update() {
-        if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().locations.dwarvenMines.crystalsHud.enabled) {
+        if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().mining.crystalsHud.enabled) {
             visible = false;
             return;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
index 15e605b9..823a8bcd 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
@@ -26,7 +26,7 @@ public class CrystalsHudConfigScreen extends HudConfigScreen {
     @SuppressWarnings("SuspiciousNameCombination")
     @Override
     protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) {
-        return List.of(IntIntMutablePair.of(config.locations.dwarvenMines.crystalsHud.x, config.locations.dwarvenMines.crystalsHud.y));
+        return List.of(IntIntMutablePair.of(config.mining.crystalsHud.x, config.mining.crystalsHud.y));
     }
 
     @Override
@@ -38,7 +38,7 @@ public class CrystalsHudConfigScreen extends HudConfigScreen {
 
     @Override
     protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
-        configManager.locations.dwarvenMines.crystalsHud.x = widgets.get(0).getX();
-        configManager.locations.dwarvenMines.crystalsHud.y = widgets.get(0).getY();
+        configManager.mining.crystalsHud.x = widgets.getFirst().getX();
+        configManager.mining.crystalsHud.y = widgets.getFirst().getY();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
index 9c37de51..dd13af42 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
@@ -63,7 +63,7 @@ public class CrystalsLocationsManager {
     }
 
     private static void extractLocationFromMessage(Text message, Boolean overlay) {
-        if (!SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows()) {
+        if (!SkyblockerConfigManager.get().mining.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows()) {
             return;
         }
 
@@ -177,7 +177,7 @@ public class CrystalsLocationsManager {
             if (CLIENT.player == null || CLIENT.getNetworkHandler() == null) {
                 return 0;
             }
-            CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false);
+            CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.option.locations.dwarvenMines.crystalsWaypoints.shareFail").formatted(Formatting.RED)), false);
         }
 
         return Command.SINGLE_SUCCESS;
@@ -191,7 +191,7 @@ public class CrystalsLocationsManager {
     }
 
     public static void render(WorldRenderContext context) {
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.enabled) {
+        if (SkyblockerConfigManager.get().mining.crystalsWaypoints.enabled) {
             for (CrystalsWaypoint crystalsWaypoint : activeWaypoints.values()) {
                 if (crystalsWaypoint.shouldRender()) {
                     crystalsWaypoint.render(context);
@@ -205,7 +205,7 @@ public class CrystalsLocationsManager {
     }
 
     public static void update() {
-        if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().locations.dwarvenMines.crystalsWaypoints.enabled || !Utils.isInCrystalHollows()) {
+        if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().mining.crystalsWaypoints.enabled || !Utils.isInCrystalHollows()) {
             return;
         }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java
index fbb43083..0a03e60c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsWaypoint.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.dwarven;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.UiAndVisualsConfig;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
@@ -19,7 +20,7 @@ import java.util.function.Supplier;
 import java.util.function.ToDoubleFunction;
 
 public class CrystalsWaypoint extends Waypoint {
-    private static final Supplier<SkyblockerConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().general.waypoints;
+    private static final Supplier<UiAndVisualsConfig.Waypoints> CONFIG = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints;
     private static final Supplier<Type> TYPE_SUPPLIER = () -> CONFIG.get().waypointType;
     final Category category;
     final Text name;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
index a5b9fa24..936077f1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -62,7 +62,7 @@ public class DwarvenHud {
         ));
 
         HudRenderEvents.AFTER_MAIN_HUD.register((context, tickDelta) -> {
-            if (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder
+            if (!SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder
                     || CLIENT.options.playerListKey.isPressed()
                     || CLIENT.player == null
                     || (!Utils.isInDwarvenMines() && !Utils.isInCrystalHollows())) {
@@ -70,16 +70,16 @@ public class DwarvenHud {
             }
 
             render(HudCommsWidget.INSTANCE, HudPowderWidget.INSTANCE, context,
-                    SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x,
-                    SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y,
-                    SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.powderX,
-                    SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.powderY,
+                    SkyblockerConfigManager.get().mining.dwarvenHud.x,
+                    SkyblockerConfigManager.get().mining.dwarvenHud.y,
+                    SkyblockerConfigManager.get().mining.dwarvenHud.powderX,
+                    SkyblockerConfigManager.get().mining.dwarvenHud.powderY,
                     commissionList);
         });
     }
 
     protected static void render(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        switch (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style) {
+        switch (SkyblockerConfigManager.get().mining.dwarvenHud.style) {
             case SIMPLE -> renderSimple(hcw, hpw, context, comHudX, comHudY, powderHudX, powderHudY, commissions);
             case FANCY -> renderFancy(hcw, hpw, context, comHudX, comHudY, powderHudX, powderHudY, commissions);
             case CLASSIC -> renderClassic(context, comHudX, comHudY, powderHudX, powderHudY, commissions);
@@ -96,11 +96,11 @@ public class DwarvenHud {
      * @param commissions the commissions to render to the commissions hud
      */
     private static void renderClassic(DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        if (SkyblockerConfigManager.get().general.tabHud.enableHudBackground) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground) {
             context.fill(comHudX, comHudY, comHudX + 200, comHudY + (20 * commissions.size()), 0x64000000);
             context.fill(powderHudX, powderHudY, powderHudX + 200, powderHudY + 40, 0x64000000);
         }
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) {
             int y = 0;
             for (Commission commission : commissions) {
                 float percentage;
@@ -118,7 +118,7 @@ public class DwarvenHud {
                 y += 20;
             }
         }
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) {
             //render mithril powder then gemstone
             context.drawTextWithShadow(CLIENT.textRenderer,
                     Text.literal("Mithril: " + mithrilPowder).formatted(Formatting.AQUA),
@@ -130,40 +130,40 @@ public class DwarvenHud {
     }
 
     private static void renderSimple(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) {
             hcw.updateData(commissions, false);
             hcw.update();
             hcw.setX(comHudX);
             hcw.setY(comHudY);
-            hcw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+            hcw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         }
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) {
             hpw.update();
             hpw.setX(powderHudX);
             hpw.setY(powderHudY);
-            hpw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+            hpw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         }
     }
 
     private static void renderFancy(HudCommsWidget hcw, HudPowderWidget hpw, DrawContext context, int comHudX, int comHudY, int powderHudX, int powderHudY, List<Commission> commissions) {
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions) {
             hcw.updateData(commissions, true);
             hcw.update();
             hcw.setX(comHudX);
             hcw.setY(comHudY);
-            hcw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+            hcw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         }
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder) {
             hpw.update();
             hpw.setX(powderHudX);
             hpw.setY(powderHudY);
-            hpw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+            hpw.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         }
     }
 
     public static void update() {
         if (CLIENT.player == null || CLIENT.getNetworkHandler() == null
-                || !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder
+                || !SkyblockerConfigManager.get().mining.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().mining.dwarvenHud.enabledPowder
                 || !Utils.isInCrystalHollows() && !Utils.isInDwarvenMines()) {
             return;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index 79a139f9..3e9c1861 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.dwarven;
 import de.hysky.skyblocker.config.HudConfigScreen;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.MiningConfig;
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
 import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
@@ -23,7 +24,7 @@ public class DwarvenHudConfigScreen extends HudConfigScreen {
 
     public DwarvenHudConfigScreen(Screen parent) {
     	super(Text.literal("Dwarven HUD Config"), parent, List.of(HudCommsWidget.INSTANCE_CFG, HudPowderWidget.INSTANCE_CFG));
-        if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.style == SkyblockerConfig.DwarvenHudStyle.CLASSIC) {
+        if (SkyblockerConfigManager.get().mining.dwarvenHud.style == MiningConfig.DwarvenHudStyle.CLASSIC) {
             HudCommsWidget.INSTANCE_CFG.setWidth(200);
             HudCommsWidget.INSTANCE_CFG.setHeight(20 * CFG_COMMS.size());
             HudPowderWidget.INSTANCE_CFG.setWidth(200);
@@ -35,8 +36,8 @@ public class DwarvenHudConfigScreen extends HudConfigScreen {
     @Override
     protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) {
         return List.of(
-                IntIntMutablePair.of(config.locations.dwarvenMines.dwarvenHud.x, config.locations.dwarvenMines.dwarvenHud.y),
-                IntIntMutablePair.of(config.locations.dwarvenMines.dwarvenHud.powderX, config.locations.dwarvenMines.dwarvenHud.powderY)
+                IntIntMutablePair.of(config.mining.dwarvenHud.x, config.mining.dwarvenHud.y),
+                IntIntMutablePair.of(config.mining.dwarvenHud.powderX, config.mining.dwarvenHud.powderY)
         );
     }
 
@@ -47,9 +48,9 @@ public class DwarvenHudConfigScreen extends HudConfigScreen {
 
     @Override
     protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
-        configManager.locations.dwarvenMines.dwarvenHud.x = widgets.get(0).getX();
-        configManager.locations.dwarvenMines.dwarvenHud.y = widgets.get(0).getY();
-        configManager.locations.dwarvenMines.dwarvenHud.powderX = widgets.get(1).getX();
-        configManager.locations.dwarvenMines.dwarvenHud.powderY = widgets.get(1).getY();
+        configManager.mining.dwarvenHud.x = widgets.get(0).getX();
+        configManager.mining.dwarvenHud.y = widgets.get(0).getY();
+        configManager.mining.dwarvenHud.powderX = widgets.get(1).getX();
+        configManager.mining.dwarvenHud.powderY = widgets.get(1).getY();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
index 2ddaf6b5..08cb381d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Fetchur.java
@@ -23,7 +23,7 @@ public class Fetchur extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return SkyblockerConfigManager.get().locations.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
+        return SkyblockerConfigManager.get().mining.dwarvenMines.solveFetchur ? ChatFilterResult.FILTER : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
index 4d126b7c..dd97e5d1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MetalDetector.java
@@ -101,7 +101,7 @@ public class MetalDetector {
      * @param overlay if the message is an overlay message
      */
     private static void getDistanceMessage(Text text, boolean overlay) {
-        if (!overlay || !SkyblockerConfigManager.get().locations.dwarvenMines.metalDetectorHelper || !Utils.isInCrystalHollows() || !(Utils.getIslandArea().substring(2).equals("Mines of Divan")) || CLIENT.player == null) {
+        if (!overlay || !SkyblockerConfigManager.get().mining.crystalHollows.metalDetectorHelper || !Utils.isInCrystalHollows() || !(Utils.getIslandArea().substring(2).equals("Mines of Divan")) || CLIENT.player == null) {
             checkChestFound(text);
             return;
         }
@@ -236,12 +236,12 @@ public class MetalDetector {
      */
     private static void render(WorldRenderContext context) {
         //only render enabled and if there is a few location options and in the mines of divan
-        if (!SkyblockerConfigManager.get().locations.dwarvenMines.metalDetectorHelper || !Utils.isInCrystalHollows() || possibleBlocks.isEmpty() || possibleBlocks.size() > 8 || !(Utils.getIslandArea().substring(2).equals("Mines of Divan"))) {
+        if (!SkyblockerConfigManager.get().mining.crystalHollows.metalDetectorHelper || !Utils.isInCrystalHollows() || possibleBlocks.isEmpty() || possibleBlocks.size() > 8 || !(Utils.getIslandArea().substring(2).equals("Mines of Divan"))) {
             return;
         }
         //only one location render just that and guiding line to it
         if (possibleBlocks.size() == 1) {
-            Vec3i block = possibleBlocks.get(0).add(0, -1, 0); //the block you are taken to is one block above the chest
+            Vec3i block = possibleBlocks.getFirst().add(0, -1, 0); //the block you are taken to is one block above the chest
             CrystalsWaypoint waypoint = new CrystalsWaypoint(CrystalsWaypoint.Category.CORLEONE, Text.translatable("skyblocker.dwarvenMines.metalDetectorHelper.treasure"), new BlockPos(block.getX(), block.getY(), block.getZ()));
             waypoint.render(context);
             RenderHelper.renderLineFromCursor(context, Vec3d.ofCenter(block), LIGHT_GRAY, 1f, 5f);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
index 1f5c0c90..400f40ff 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java
@@ -18,7 +18,7 @@ public class Puzzler extends ChatPatternListener {
 
     @Override
     public ChatFilterResult state() {
-        return SkyblockerConfigManager.get().locations.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS;
+        return SkyblockerConfigManager.get().mining.dwarvenMines.solvePuzzler ? null : ChatFilterResult.PASS;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
index 659fc79f..4540ce6e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
@@ -17,12 +17,12 @@ public class EndHudConfigScreen extends HudConfigScreen {
     @SuppressWarnings("SuspiciousNameCombination")
     @Override
     protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) {
-        return List.of(IntIntMutablePair.of(config.locations.end.x, config.locations.end.y));
+        return List.of(IntIntMutablePair.of(config.otherLocations.end.x, config.otherLocations.end.y));
     }
 
     @Override
     protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
-        configManager.locations.end.x = widgets.get(0).getX();
-        configManager.locations.end.y = widgets.get(0).getY();
+        configManager.otherLocations.end.x = widgets.getFirst().getX();
+        configManager.otherLocations.end.y = widgets.getFirst().getY();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
index ca3c8cd8..53c4336e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
@@ -37,15 +37,15 @@ public class EndHudWidget extends Widget {
         ENDERMAN_HEAD.set(DataComponentTypes.PROFILE, new ProfileComponent(Optional.of("MHF_Enderman"), Optional.empty(), new PropertyMap()));
         POPPY.addEnchantment(Enchantments.INFINITY, 1);
 
-        INSTANCE.setX(SkyblockerConfigManager.get().locations.end.x);
-        INSTANCE.setY(SkyblockerConfigManager.get().locations.end.y);
+        INSTANCE.setX(SkyblockerConfigManager.get().otherLocations.end.x);
+        INSTANCE.setY(SkyblockerConfigManager.get().otherLocations.end.y);
     }
 
 
     @Override
     public void updateContent() {
         // Zealots
-        if (SkyblockerConfigManager.get().locations.end.zealotKillsEnabled) {
+        if (SkyblockerConfigManager.get().otherLocations.end.zealotKillsEnabled) {
             addComponent(new IcoTextComponent(ENDERMAN_HEAD, Text.literal("Zealots").formatted(Formatting.BOLD)));
             addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsSinceLastEye", TheEnd.zealotsSinceLastEye)));
             addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsTotalKills", TheEnd.zealotsKilled)));
@@ -57,7 +57,7 @@ public class EndHudWidget extends Widget {
         }
 
         // Endstone protector
-        if (SkyblockerConfigManager.get().locations.end.protectorLocationEnabled) {
+        if (SkyblockerConfigManager.get().otherLocations.end.protectorLocationEnabled) {
             addComponent(new IcoTextComponent(POPPY, Text.literal("Endstone Protector").formatted(Formatting.BOLD)));
             if (TheEnd.stage == 5) {
                 addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.stage", "IMMINENT")));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
index b4af7256..b0282a69 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
@@ -98,7 +98,7 @@ public class EnderNodes {
     }
 
     private static boolean shouldProcess() {
-        return SkyblockerConfigManager.get().locations.end.enableEnderNodeHelper && Utils.isInTheEnd();
+        return SkyblockerConfigManager.get().otherLocations.end.enableEnderNodeHelper && Utils.isInTheEnd();
     }
 
     private static void reset() {
@@ -117,7 +117,7 @@ public class EnderNodes {
         private long lastConfirmed;
 
         private EnderNode(BlockPos pos) {
-            super(pos, () -> SkyblockerConfigManager.get().general.waypoints.waypointType, DyeColor.CYAN.getColorComponents(), false);
+            super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, DyeColor.CYAN.getColorComponents(), false);
         }
 
         private void updateParticles() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
index 6f2a0e40..fa36b185 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java
@@ -75,9 +75,9 @@ public class TheEnd {
 
         HudRenderEvents.AFTER_MAIN_HUD.register((drawContext, tickDelta) -> {
             if (!Utils.isInTheEnd()) return;
-            if (!SkyblockerConfigManager.get().locations.end.hudEnabled) return;
+            if (!SkyblockerConfigManager.get().otherLocations.end.hudEnabled) return;
 
-            EndHudWidget.INSTANCE.render(drawContext, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+            EndHudWidget.INSTANCE.render(drawContext, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         });
 
         ClientChunkEvents.CHUNK_LOAD.register((world, chunk) -> {
@@ -261,7 +261,7 @@ public class TheEnd {
     }
 
     private static void renderWaypoint(WorldRenderContext context) {
-        if (!SkyblockerConfigManager.get().locations.end.waypoint) return;
+        if (!SkyblockerConfigManager.get().otherLocations.end.waypoint) return;
         if (currentProtectorLocation == null || stage != 5) return;
         currentProtectorLocation.waypoint().render(context);
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java
index 5522ceca..095c5d10 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobBoundingBoxes.java
@@ -30,11 +30,11 @@ public class MobBoundingBoxes {
 			String name = entity.getName().getString();
 
 			return switch (entity) {
-				case PlayerEntity _p when name.equals("Lost Adventurer") || name.equals("Shadow Assassin") || name.equals("Diamond Guy") -> SkyblockerConfigManager.get().locations.dungeons.starredMobBoundingBoxes;
+				case PlayerEntity _p when name.equals("Lost Adventurer") || name.equals("Shadow Assassin") || name.equals("Diamond Guy") -> SkyblockerConfigManager.get().dungeons.starredMobBoundingBoxes;
 				case ArmorStandEntity _armorStand -> false;
 
 				// Regular Mobs
-				default -> SkyblockerConfigManager.get().locations.dungeons.starredMobBoundingBoxes && MobGlow.isStarred(entity);
+				default -> SkyblockerConfigManager.get().dungeons.starredMobBoundingBoxes && MobGlow.isStarred(entity);
 			};
 		}
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
index 75ba700e..5dc3b768 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
@@ -1,6 +1,5 @@
 package de.hysky.skyblocker.skyblock.entity;
 
-import com.mojang.authlib.properties.Property;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.dungeon.LividColor;
 import de.hysky.skyblocker.skyblock.end.TheEnd;
@@ -8,15 +7,12 @@ import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.SlayerUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.culling.OcclusionCulling;
-import net.minecraft.component.DataComponentTypes;
-import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.mob.EndermanEntity;
 import net.minecraft.entity.passive.BatEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.predicate.entity.EntityPredicates;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Box;
@@ -36,23 +32,23 @@ public class MobGlow {
 			if (Utils.isInDungeons() && !entity.isInvisible()) {
 				return switch (entity) {
 					// Minibosses
-					case PlayerEntity p when name.equals("Lost Adventurer") || name.equals("Shadow Assassin") || name.equals("Diamond Guy") -> SkyblockerConfigManager.get().locations.dungeons.starredMobGlow;
+					case PlayerEntity p when name.equals("Lost Adventurer") || name.equals("Shadow Assassin") || name.equals("Diamond Guy") -> SkyblockerConfigManager.get().dungeons.starredMobGlow;
 					case PlayerEntity p when LividColor.LIVID_NAMES.contains(name) -> LividColor.shouldGlow(name);
 
 					// Bats
-					case BatEntity b -> SkyblockerConfigManager.get().locations.dungeons.starredMobGlow || SkyblockerConfigManager.get().locations.dungeons.starredMobBoundingBoxes;
+					case BatEntity b -> SkyblockerConfigManager.get().dungeons.starredMobGlow || SkyblockerConfigManager.get().dungeons.starredMobBoundingBoxes;
 
 					// Armor Stands
 					case ArmorStandEntity _armorStand -> false;
 
 					// Regular Mobs
-					default -> SkyblockerConfigManager.get().locations.dungeons.starredMobGlow && isStarred(entity);
+					default -> SkyblockerConfigManager.get().dungeons.starredMobGlow && isStarred(entity);
 				};
 			}
 
 			return switch (entity) {
 				// Rift
-				case PlayerEntity p when Utils.isInTheRift() && !entity.isInvisible() && name.equals("Blobbercyst ") -> SkyblockerConfigManager.get().locations.rift.blobbercystGlow;
+				case PlayerEntity p when Utils.isInTheRift() && !entity.isInvisible() && name.equals("Blobbercyst ") -> SkyblockerConfigManager.get().otherLocations.rift.blobbercystGlow;
 
 				// Enderman Slayer
 				// Highlights Nukekubi Heads
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java
index 98738112..f43b1842 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ChronomatronSolver.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.experiment;
 import com.google.common.collect.ImmutableMap;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.config.configs.HelperConfig;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.Screen;
@@ -52,7 +53,7 @@ public class ChronomatronSolver extends ExperimentSolver {
     }
 
     @Override
-    protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) {
+    protected boolean isEnabled(HelperConfig.Experiments experimentsConfig) {
         return experimentsConfig.enableChronomatronSolver;
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
index 6efcd420..4e28e3c1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.experiment;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.HelperConfig;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.gui.screen.Screen;
@@ -37,10 +38,10 @@ public abstract class ExperimentSolver extends ContainerSolver {
 
     @Override
     protected final boolean isEnabled() {
-        return isEnabled(SkyblockerConfigManager.get().general.experiments);
+        return isEnabled(SkyblockerConfigManager.get().helper.experiments);
     }
 
-    protected abstract boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig);
+    protected abstract boolean isEnabled(HelperConfig.Experiments experimentsConfig);
 
     @Override
     protected void start(GenericContainerScreen screen) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
index e7502c89..f4850bf8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.skyblock.experiment;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.config.configs.HelperConfig;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.Screen;
@@ -28,7 +29,7 @@ public class SuperpairsSolver extends ExperimentSolver {
     }
 
     @Override
-    protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) {
+    protected boolean isEnabled(HelperConfig.Experiments experimentsConfig) {
         return experimentsConfig.enableSuperpairsSolver;
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
index 3f1fc72d..88f0e5c3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.skyblock.experiment;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.config.configs.HelperConfig;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.Screen;
@@ -28,7 +29,7 @@ public class UltrasequencerSolver extends ExperimentSolver {
     }
 
     @Override
-    protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) {
+    protected boolean isEnabled(HelperConfig.Experiments experimentsConfig) {
         return experimentsConfig.enableUltrasequencerSolver;
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java
index 2ee119fe..cdd5639b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.UiAndVisualsConfig;
 import de.hysky.skyblocker.skyblock.StatusBarTracker;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
@@ -58,7 +59,7 @@ public class FancyStatusBars {
         // Fetch from old status bar config
         int[] counts = new int[3]; // counts for RIGHT, LAYER1, LAYER2
         StatusBar health = statusBars.get("health");
-        SkyblockerConfig.OldBarPositions barPositions = SkyblockerConfigManager.get().general.bars.barPositions;
+        UiAndVisualsConfig.OldBarPositions barPositions = SkyblockerConfigManager.get().uiAndVisuals.bars.barPositions;
         loadOldBarPosition(health, counts, barPositions.healthBarPosition);
         StatusBar intelligence = statusBars.get("intelligence");
         loadOldBarPosition(intelligence, counts, barPositions.manaBarPosition);
@@ -103,7 +104,7 @@ public class FancyStatusBars {
      * @param counts the counts for each bar position (LAYER1, LAYER2, RIGHT)
      * @param position the position to load
      */
-    private static void loadOldBarPosition(StatusBar bar, int[] counts, SkyblockerConfig.OldBarPosition position) {
+    private static void loadOldBarPosition(StatusBar bar, int[] counts, UiAndVisualsConfig.OldBarPosition position) {
         switch (position) {
             case RIGHT:
                 bar.anchor = BarPositioner.BarAnchor.HOTBAR_RIGHT;
@@ -265,7 +266,7 @@ public class FancyStatusBars {
 
     public boolean render(DrawContext context, int scaledWidth, int scaledHeight) {
         var player = client.player;
-        if (!SkyblockerConfigManager.get().general.bars.enableBars || player == null || Utils.isInTheRift())
+        if (!SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || player == null || Utils.isInTheRift())
             return false;
 
         Collection<StatusBar> barCollection = statusBars.values();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
index cb845254..f284624d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java
@@ -11,7 +11,7 @@ import java.util.regex.Matcher;
 
 public class MimicFilter extends ChatPatternListener {
     public MimicFilter() {
-        super(".*?(?:Mimic dead!?|Mimic Killed!|\\$SKYTILS-DUNGEON-SCORE-MIMIC\\$|\\Q" + SkyblockerConfigManager.get().locations.dungeons.mimicMessage.mimicMessage + "\\E)$");
+        super(".*?(?:Mimic dead!?|Mimic Killed!|\\$SKYTILS-DUNGEON-SCORE-MIMIC\\$|\\Q" + SkyblockerConfigManager.get().dungeons.mimicMessage.mimicMessage + "\\E)$");
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index 43fdf001..201e6716 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -67,7 +67,7 @@ public class FarmingHud {
                 }
 
                 FarmingHudWidget.INSTANCE.update();
-                FarmingHudWidget.INSTANCE.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+                FarmingHudWidget.INSTANCE.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
             }
         });
         ClientPlayerBlockBreakEvents.AFTER.register((world, player, pos, state) -> {
@@ -93,7 +93,7 @@ public class FarmingHud {
     }
 
     private static boolean shouldRender() {
-        return SkyblockerConfigManager.get().locations.garden.farmingHud.enableHud && Utils.getLocation() == Location.GARDEN;
+        return SkyblockerConfigManager.get().farming.garden.farmingHud.enableHud && Utils.getLocation() == Location.GARDEN;
     }
 
     public static int counter() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
index 5384d47a..0271c66a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
@@ -18,13 +18,13 @@ public class FarmingHudConfigScreen extends HudConfigScreen {
     @Override
     protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) {
         return List.of(
-                IntIntMutablePair.of(config.locations.garden.farmingHud.x, config.locations.garden.farmingHud.y)
+                IntIntMutablePair.of(config.farming.garden.farmingHud.x, config.farming.garden.farmingHud.y)
         );
     }
 
     @Override
     protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
-        configManager.locations.garden.farmingHud.x = widgets.get(0).getX();
-        configManager.locations.garden.farmingHud.y = widgets.get(0).getY();
+        configManager.farming.garden.farmingHud.x = widgets.getFirst().getX();
+        configManager.farming.garden.farmingHud.y = widgets.getFirst().getY();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index d03323be..f12f6fa8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -49,8 +49,8 @@ public class FarmingHudWidget extends Widget {
 
     public FarmingHudWidget() {
         super(TITLE, Formatting.YELLOW.getColorValue());
-        setX(SkyblockerConfigManager.get().locations.garden.farmingHud.x);
-        setY(SkyblockerConfigManager.get().locations.garden.farmingHud.y);
+        setX(SkyblockerConfigManager.get().farming.garden.farmingHud.x);
+        setY(SkyblockerConfigManager.get().farming.garden.farmingHud.y);
         update();
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/LowerSensitivity.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/LowerSensitivity.java
index edea50de..ee857618 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/LowerSensitivity.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/LowerSensitivity.java
@@ -18,10 +18,10 @@ public class LowerSensitivity {
                 if (sensitivityLowered) lowerSensitivity(false);
                 return;
             }
-            if (SkyblockerConfigManager.get().locations.garden.lockMouseTool) {
+            if (SkyblockerConfigManager.get().farming.garden.lockMouseTool) {
                 ItemStack mainHandStack = MinecraftClient.getInstance().player.getMainHandStack();
                 String itemId = ItemUtils.getItemId(mainHandStack);
-                boolean shouldLockMouse = FarmingHudWidget.FARMING_TOOLS.containsKey(itemId) && (!SkyblockerConfigManager.get().locations.garden.lockMouseGroundOnly || MinecraftClient.getInstance().player.isOnGround());
+                boolean shouldLockMouse = FarmingHudWidget.FARMING_TOOLS.containsKey(itemId) && (!SkyblockerConfigManager.get().farming.garden.lockMouseGroundOnly || MinecraftClient.getInstance().player.isOnGround());
                 if (shouldLockMouse && !sensitivityLowered) lowerSensitivity(true);
                 else if (!shouldLockMouse && sensitivityLowered) lowerSensitivity(false);
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
index c855c3e3..682933f4 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java
@@ -46,7 +46,7 @@ public class VisitorHelper {
     public static void init() {
         ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
             String title = screen.getTitle().getString();
-            if (SkyblockerConfigManager.get().locations.garden.visitorHelper && screen instanceof HandledScreen<?> handledScreen && (Utils.getLocationRaw().equals("garden") && !title.contains("Logbook") || title.startsWith("Bazaar"))) {
+            if (SkyblockerConfigManager.get().farming.garden.visitorHelper && screen instanceof HandledScreen<?> handledScreen && (Utils.getLocationRaw().equals("garden") && !title.contains("Logbook") || title.startsWith("Bazaar"))) {
                 ScreenEvents.afterRender(screen).register((screen_, context, mouseX, mouseY, delta) -> renderScreen(title, context, client.textRenderer, handledScreen.getScreenHandler(), mouseX, mouseY));
             }
         });
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
index be934810..96c21d22 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java
@@ -75,7 +75,7 @@ public class ItemCooldowns {
     }
 
     public static void afterBlockBreak(World world, PlayerEntity player, BlockPos pos, BlockState state) {
-        if (!SkyblockerConfigManager.get().general.itemCooldown.enableItemCooldowns) return;
+        if (!SkyblockerConfigManager.get().uiAndVisuals.itemCooldown.enableItemCooldowns) return;
         String usedItemId = ItemUtils.getItemId(player.getMainHandStack());
         if (usedItemId.isEmpty()) return;
         if (state.isIn(BlockTags.LOGS)) {
@@ -89,7 +89,7 @@ public class ItemCooldowns {
     }
 
     private static TypedActionResult<ItemStack> onItemInteract(PlayerEntity player, World world, Hand hand) {
-        if (!SkyblockerConfigManager.get().general.itemCooldown.enableItemCooldowns)
+        if (!SkyblockerConfigManager.get().uiAndVisuals.itemCooldown.enableItemCooldowns)
             return TypedActionResult.pass(ItemStack.EMPTY);
         String usedItemId = ItemUtils.getItemId(player.getMainHandStack());
         if (usedItemId.equals(GRAPPLING_HOOK_ID) && player.fishHook != null) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
index 8a23ea6d..c34e8926 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemRarityBackgrounds.java
@@ -10,6 +10,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
@@ -23,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 
 public class ItemRarityBackgrounds {
-	private static final SkyblockerConfig.ItemInfoDisplay CONFIG = SkyblockerConfigManager.get().general.itemInfoDisplay;
+	private static final GeneralConfig.ItemInfoDisplay CONFIG = SkyblockerConfigManager.get().general.itemInfoDisplay;
 	private static final Supplier<Sprite> SPRITE = () -> MinecraftClient.getInstance().getGuiAtlasManager().getSprite(CONFIG.itemRarityBackgroundStyle.tex);
 	public static final ImmutableMap<String, SkyblockItemRarity> LORE_RARITIES = ImmutableMap.ofEntries(
 			Map.entry("ADMIN", SkyblockItemRarity.ADMIN),
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 0cffa05c..d2fda215 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
 import de.hysky.skyblocker.skyblock.item.tooltip.AccessoriesHelper.AccessoryReport;
 import de.hysky.skyblocker.utils.Constants;
@@ -33,7 +34,7 @@ import java.util.concurrent.CompletableFuture;
 public class ItemTooltip {
     protected static final Logger LOGGER = LoggerFactory.getLogger(ItemTooltip.class.getName());
     private static final MinecraftClient client = MinecraftClient.getInstance();
-    protected static final SkyblockerConfig.ItemTooltip config = SkyblockerConfigManager.get().general.itemTooltip;
+    protected static final GeneralConfig.ItemTooltip config = SkyblockerConfigManager.get().general.itemTooltip;
     private static volatile boolean sentNullWarning = false;
 
     public static void getTooltip(ItemStack stack, Item.TooltipContext tooltipContext, TooltipType tooltipType, List<Text> lines) {
@@ -99,10 +100,10 @@ public class ItemTooltip {
                 neuName = getNeuName(internalID, neuName);
 
                 if (!neuName.isEmpty() && lbinExist) {
-                    SkyblockerConfig.Average type = config.avg;
+                    GeneralConfig.Average type = config.avg;
 
                     // "No data" line because of API not keeping old data, it causes NullPointerException
-                    if (type == SkyblockerConfig.Average.ONE_DAY || type == SkyblockerConfig.Average.BOTH) {
+                    if (type == GeneralConfig.Average.ONE_DAY || type == GeneralConfig.Average.BOTH) {
                         lines.add(
                                 Text.literal(String.format("%-19s", "1 Day Avg. Price:"))
                                         .formatted(Formatting.GOLD)
@@ -112,7 +113,7 @@ public class ItemTooltip {
                                         )
                         );
                     }
-                    if (type == SkyblockerConfig.Average.THREE_DAY || type == SkyblockerConfig.Average.BOTH) {
+                    if (type == GeneralConfig.Average.THREE_DAY || type == GeneralConfig.Average.BOTH) {
                         lines.add(
                                 Text.literal(String.format("%-19s", "3 Day Avg. Price:"))
                                         .formatted(Formatting.GOLD)
@@ -139,7 +140,7 @@ public class ItemTooltip {
         	10, "M7"
         );
 
-        if (SkyblockerConfigManager.get().general.dungeonQuality) {
+        if (SkyblockerConfigManager.get().general.itemTooltip.dungeonQuality) {
             NbtCompound customData = ItemUtils.getCustomData(stack);
             if (customData != null && customData.contains("baseStatBoostPercentage")) {
                 int baseStatBoostPercentage = customData.getInt("baseStatBoostPercentage");
@@ -372,7 +373,7 @@ public class ItemTooltip {
     }
 
     private static Text getMotesMessage(int price, int count) {
-        float motesMultiplier = SkyblockerConfigManager.get().locations.rift.mcGrubberStacks * 0.05f + 1;
+        float motesMultiplier = SkyblockerConfigManager.get().otherLocations.rift.mcGrubberStacks * 0.05f + 1;
 
         // Calculate the total price
         int totalPrice = price * count;
@@ -413,14 +414,14 @@ public class ItemTooltip {
             TooltipInfoType.LOWEST_BINS.downloadIfEnabled(futureList);
 
             if (config.enableAvgBIN) {
-                SkyblockerConfig.Average type = config.avg;
+                GeneralConfig.Average type = config.avg;
 
-                if (type == SkyblockerConfig.Average.BOTH || TooltipInfoType.ONE_DAY_AVERAGE.getData() == null || TooltipInfoType.THREE_DAY_AVERAGE.getData() == null || minute % 5 == 0) {
+                if (type == GeneralConfig.Average.BOTH || TooltipInfoType.ONE_DAY_AVERAGE.getData() == null || TooltipInfoType.THREE_DAY_AVERAGE.getData() == null || minute % 5 == 0) {
                     TooltipInfoType.ONE_DAY_AVERAGE.download(futureList);
                     TooltipInfoType.THREE_DAY_AVERAGE.download(futureList);
-                } else if (type == SkyblockerConfig.Average.ONE_DAY) {
+                } else if (type == GeneralConfig.Average.ONE_DAY) {
                     TooltipInfoType.ONE_DAY_AVERAGE.download(futureList);
-                } else if (type == SkyblockerConfig.Average.THREE_DAY) {
+                } else if (type == GeneralConfig.Average.THREE_DAY) {
                     TooltipInfoType.THREE_DAY_AVERAGE.download(futureList);
                 }
             }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
index 6edee8d6..88f09496 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.Utils;
 
@@ -17,10 +18,10 @@ import org.jetbrains.annotations.Nullable;
 
 public enum TooltipInfoType implements Runnable {
     NPC("https://hysky.de/api/npcprice", itemTooltip -> itemTooltip.enableNPCPrice, true),
-    BAZAAR("https://hysky.de/api/bazaar", itemTooltip -> itemTooltip.enableBazaarPrice || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().general.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableBazaarPrice, false),
-    LOWEST_BINS("https://hysky.de/api/auctions/lowestbins", itemTooltip -> itemTooltip.enableLowestBIN || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().general.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableLowestBIN, false),
+    BAZAAR("https://hysky.de/api/bazaar", itemTooltip -> itemTooltip.enableBazaarPrice || SkyblockerConfigManager.get().dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().uiAndVisuals.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableBazaarPrice, false),
+    LOWEST_BINS("https://hysky.de/api/auctions/lowestbins", itemTooltip -> itemTooltip.enableLowestBIN || SkyblockerConfigManager.get().dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().uiAndVisuals.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableLowestBIN, false),
     ONE_DAY_AVERAGE("https://hysky.de/api/auctions/lowestbins/average/1day.json", itemTooltip -> itemTooltip.enableAvgBIN, false),
-    THREE_DAY_AVERAGE("https://hysky.de/api/auctions/lowestbins/average/3day.json", itemTooltip -> itemTooltip.enableAvgBIN || SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse, itemTooltip -> itemTooltip.enableAvgBIN, false),
+    THREE_DAY_AVERAGE("https://hysky.de/api/auctions/lowestbins/average/3day.json", itemTooltip -> itemTooltip.enableAvgBIN || SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableAuctionHouse, itemTooltip -> itemTooltip.enableAvgBIN, false),
     MOTES("https://hysky.de/api/motesprice", itemTooltip -> itemTooltip.enableMotesPrice, itemTooltip -> itemTooltip.enableMotesPrice && Utils.isInTheRift(), true),
     OBTAINED(itemTooltip -> itemTooltip.enableObtainedDate),
     MUSEUM("https://hysky.de/api/museum", itemTooltip -> itemTooltip.enableMuseumInfo, true),
@@ -28,8 +29,8 @@ public enum TooltipInfoType implements Runnable {
     ACCESSORIES("https://hysky.de/api/accessories", itemTooltip -> itemTooltip.enableAccessoriesHelper, true, AccessoriesHelper::refreshData);
 
     private final String address;
-    private final Predicate<SkyblockerConfig.ItemTooltip> dataEnabled;
-    private final Predicate<SkyblockerConfig.ItemTooltip> tooltipEnabled;
+    private final Predicate<GeneralConfig.ItemTooltip> dataEnabled;
+    private final Predicate<GeneralConfig.ItemTooltip> tooltipEnabled;
     private JsonObject data;
     private final boolean cacheable;
     private long hash;
@@ -38,7 +39,7 @@ public enum TooltipInfoType implements Runnable {
     /**
      * Use this for when you're adding tooltip info that has no data associated with it
      */
-    TooltipInfoType(Predicate<SkyblockerConfig.ItemTooltip> enabled) {
+    TooltipInfoType(Predicate<GeneralConfig.ItemTooltip> enabled) {
         this(null, itemTooltip -> false, enabled, false, null);
     }
 
@@ -48,7 +49,7 @@ public enum TooltipInfoType implements Runnable {
      * @param cacheable whether the data should be cached
      * @param callback  called when the {@code data} is refreshed
      */
-    TooltipInfoType(String address, Predicate<SkyblockerConfig.ItemTooltip> enabled, boolean cacheable, Consumer<JsonObject> callback) {
+    TooltipInfoType(String address, Predicate<GeneralConfig.ItemTooltip> enabled, boolean cacheable, Consumer<JsonObject> callback) {
         this(address, enabled, enabled, cacheable, callback);
     }
 
@@ -57,7 +58,7 @@ public enum TooltipInfoType implements Runnable {
      * @param enabled   the predicate to check if the data should be downloaded and the tooltip should be shown
      * @param cacheable whether the data should be cached
      */
-    TooltipInfoType(String address, Predicate<SkyblockerConfig.ItemTooltip> enabled, boolean cacheable) {
+    TooltipInfoType(String address, Predicate<GeneralConfig.ItemTooltip> enabled, boolean cacheable) {
         this(address, enabled, enabled, cacheable, null);
     }
 
@@ -67,7 +68,7 @@ public enum TooltipInfoType implements Runnable {
      * @param tooltipEnabled the predicate to check if the tooltip should be shown
      * @param cacheable      whether the data should be cached
      */
-    TooltipInfoType(String address, Predicate<SkyblockerConfig.ItemTooltip> dataEnabled, Predicate<SkyblockerConfig.ItemTooltip> tooltipEnabled, boolean cacheable) {
+    TooltipInfoType(String address, Predicate<GeneralConfig.ItemTooltip> dataEnabled, Predicate<GeneralConfig.ItemTooltip> tooltipEnabled, boolean cacheable) {
         this(address, dataEnabled, tooltipEnabled, cacheable, null);
     }
 
@@ -75,10 +76,9 @@ public enum TooltipInfoType implements Runnable {
      * @param address        the address to download the data from
      * @param dataEnabled    the predicate to check if data should be downloaded
      * @param tooltipEnabled the predicate to check if the tooltip should be shown
-     * @param data           the data
      * @param cacheable      whether the data should be cached
      */
-    TooltipInfoType(String address, Predicate<SkyblockerConfig.ItemTooltip> dataEnabled, Predicate<SkyblockerConfig.ItemTooltip> tooltipEnabled, boolean cacheable, @Nullable Consumer<JsonObject> callback) {
+    TooltipInfoType(String address, Predicate<GeneralConfig.ItemTooltip> dataEnabled, Predicate<GeneralConfig.ItemTooltip> tooltipEnabled, boolean cacheable, @Nullable Consumer<JsonObject> callback) {
         this.address = address;
         this.dataEnabled = dataEnabled;
         this.tooltipEnabled = tooltipEnabled;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
index 8e203b84..6bb27215 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java
@@ -2,8 +2,8 @@ package de.hysky.skyblocker.skyblock.quicknav;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
-import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.QuickNavConfig;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.datafixer.ItemStackComponentizationFixer;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
@@ -14,6 +14,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +23,7 @@ import java.util.Locale;
 import java.util.regex.PatternSyntaxException;
 
 public class QuickNav {
+    private static final Logger LOGGER = LoggerFactory.getLogger(QuickNav.class);
 
     public static void init() {
         ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
@@ -34,7 +37,7 @@ public class QuickNav {
 
     public static List<QuickNavButton> init(String screenTitle) {
         List<QuickNavButton> buttons = new ArrayList<>();
-        SkyblockerConfig.QuickNav data = SkyblockerConfigManager.get().quickNav;
+        QuickNavConfig data = SkyblockerConfigManager.get().quickNav;
         try {
             if (data.button1.render) buttons.add(parseButton(data.button1, screenTitle, 0));
             if (data.button2.render) buttons.add(parseButton(data.button2, screenTitle, 1));
@@ -49,13 +52,13 @@ public class QuickNav {
             if (data.button11.render) buttons.add(parseButton(data.button11, screenTitle, 10));
             if (data.button12.render) buttons.add(parseButton(data.button12, screenTitle, 11));
         } catch (CommandSyntaxException e) {
-            e.printStackTrace();
+            LOGGER.error("[Skyblocker] Failed to initialize Quick Nav Button", e);
         }
         return buttons;
     }
 
-    private static QuickNavButton parseButton(SkyblockerConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException {
-    	SkyblockerConfig.ItemData itemData = buttonInfo.item;
+    private static QuickNavButton parseButton(QuickNavConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException {
+        QuickNavConfig.ItemData itemData = buttonInfo.item;
         String nbtString = "{id:\"minecraft:" + itemData.itemName.toLowerCase(Locale.ROOT) + "\",Count:1";
         if (itemData.nbt.length() > 2) nbtString += "," + itemData.nbt;
         nbtString += "}";
@@ -63,7 +66,7 @@ public class QuickNav {
         try {
             uiTitleMatches = screenTitle.matches(buttonInfo.uiTitle);
         } catch (PatternSyntaxException e) {
-            e.printStackTrace();
+            LOGGER.error("[Skyblocker] Failed to parse Quick Nav Button", e);
             ClientPlayerEntity player = MinecraftClient.getInstance().player;
             if (player != null) {
                 player.sendMessage(Text.of(Formatting.RED + "[Skyblocker] Invalid regex in quicknav button " + (id + 1) + "!"), false);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
index 8d0c30b8..039d331c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java
@@ -9,6 +9,7 @@ import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.OtherLocationsConfig;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.PosUtils;
 import de.hysky.skyblocker.utils.Utils;
@@ -41,7 +42,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
 
 public class EnigmaSouls {
 	private static final Logger LOGGER = LoggerFactory.getLogger(EnigmaSouls.class);
-	private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().general.waypoints.waypointType;
+	private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType;
 	private static final Identifier WAYPOINTS_JSON = new Identifier(SkyblockerMod.NAMESPACE, "rift/enigma_soul_waypoints.json");
 	private static final Map<BlockPos, ProfileAwareWaypoint> SOUL_WAYPOINTS = new HashMap<>(42);
 	private static final Path FOUND_SOULS_FILE = SkyblockerMod.CONFIG_DIR.resolve("found_enigma_souls.json");
@@ -109,7 +110,7 @@ public class EnigmaSouls {
 	}
 
 	static void render(WorldRenderContext context) {
-		SkyblockerConfig.Rift config = SkyblockerConfigManager.get().locations.rift;
+		OtherLocationsConfig.Rift config = SkyblockerConfigManager.get().otherLocations.rift;
 
 		if (Utils.isInTheRift() && config.enigmaSoulWaypoints && soulsLoaded.isDone()) {
 			for (Waypoint soul : SOUL_WAYPOINTS.values()) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
index 83199e99..7d7d0c34 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java
@@ -64,7 +64,7 @@ public class MirrorverseWaypoints {
 
 	protected static void render(WorldRenderContext wrc) {
 		//I would also check for the mirrorverse location but the scoreboard stuff is not performant at all...
-		if (Utils.isInTheRift() && SkyblockerConfigManager.get().locations.rift.mirrorverseWaypoints && waypointsLoaded.isDone()) {
+		if (Utils.isInTheRift() && SkyblockerConfigManager.get().otherLocations.rift.mirrorverseWaypoints && waypointsLoaded.isDone()) {
 			for (Waypoint waypoint : LAVA_PATH_WAYPOINTS) {
 				waypoint.render(wrc);
 			}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java
index b8907e27..66d817e4 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/OverlayScreen.java
@@ -35,7 +35,7 @@ public class OverlayScreen extends Screen {
         super.init();
         int rowWidth = (int) (this.width * 0.4);
         int startX = (int) (this.width * 0.5) - rowWidth / 2;
-        int startY = (int) ((int) (this.height * 0.5) - (rowHeight * (1 + SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions + 0.75 + SkyblockerConfigManager.get().general.searchOverlay.historyLength)) / 2);
+        int startY = (int) ((int) (this.height * 0.5) - (rowHeight * (1 + SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions + 0.75 + SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.historyLength)) / 2);
 
         // Search field
         this.searchField = new TextFieldWidget(textRenderer, startX, startY, rowWidth - rowHeight, rowHeight, Text.translatable("gui.recipebook.search_hint"));
@@ -50,7 +50,7 @@ public class OverlayScreen extends Screen {
 
         // suggested item buttons
         int rowOffset = rowHeight;
-        int totalSuggestions = SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions;
+        int totalSuggestions = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions;
         this.suggestionButtons = new ButtonWidget[totalSuggestions];
         for (int i = 0; i < totalSuggestions; i++) {
             suggestionButtons[i] = ButtonWidget.builder(Text.literal(SearchOverManager.getSuggestion(i)).setStyle(Style.EMPTY), a -> {
@@ -64,7 +64,7 @@ public class OverlayScreen extends Screen {
         }
         // history item buttons
         rowOffset += (int) (rowHeight * 0.75);
-        int historyLength = SkyblockerConfigManager.get().general.searchOverlay.historyLength;
+        int historyLength = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.historyLength;
         this.historyButtons = new ButtonWidget[historyLength];
         for (int i = 0; i < historyLength; i++) {
             String text = SearchOverManager.getHistory(i);
@@ -106,7 +106,7 @@ public class OverlayScreen extends Screen {
         int renderOffset = (rowHeight - 16) / 2;
         context.drawGuiTexture(SEARCH_ICON_TEXTURE, finishedButton.getX() + renderOffset, finishedButton.getY() + renderOffset, 16, 16);
         if (historyButtons.length > 0 && historyButtons[0] != null) {
-            context.drawText(textRenderer, Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true);
+            context.drawText(textRenderer, Text.translatable("skyblocker.option.general.searchOverlay.historyLabel"), historyButtons[0].getX() + renderOffset, historyButtons[0].getY() - rowHeight / 2, 0xFFFFFFFF, true);
         }
 
         //draw item stacks and tooltip to buttons
@@ -140,7 +140,7 @@ public class OverlayScreen extends Screen {
     public final void tick() {
         super.tick();
         //update suggestion buttons text
-        for (int i = 0; i < SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions; i++) {
+        for (int i = 0; i < SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions; i++) {
             String text = SearchOverManager.getSuggestion(i);
             if (!text.isEmpty()) {
                 suggestionButtons[i].visible = true;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java
index 1d740601..f8c4742d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchoverlay/SearchOverManager.java
@@ -2,13 +2,12 @@ package de.hysky.skyblocker.skyblock.searchoverlay;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.UiAndVisualsConfig;
 import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
-import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
 import io.github.moulberry.repo.data.NEUItem;
@@ -75,7 +74,7 @@ public class SearchOverManager {
     }
 
     private static void registerSearchCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
-        if (SkyblockerConfigManager.get().general.searchOverlay.enableCommands) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.enableCommands) {
             dispatcher.register(literal("ahs").executes(context -> startCommand(true)));
             dispatcher.register(literal("bzs").executes(context -> startCommand(false)));
         }
@@ -199,7 +198,7 @@ public class SearchOverManager {
         SearchOverManager.sign = sign;
         isCommand = false;
         SearchOverManager.isAuction = isAuction;
-        if (SkyblockerConfigManager.get().general.searchOverlay.keepPreviousSearches) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.keepPreviousSearches) {
             Text[] messages = SearchOverManager.sign.getText(signFront).getMessages(CLIENT.shouldFilterText());
             search = messages[0].getString();
             if (!messages[1].getString().isEmpty()) {
@@ -221,7 +220,7 @@ public class SearchOverManager {
     protected static void updateSearch(String newValue) {
         search = newValue;
         //update the suggestion values
-        int totalSuggestions = SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions;
+        int totalSuggestions = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.maxSuggestions;
         if (newValue.isBlank() || totalSuggestions == 0) return; //do not search for empty value
         suggestionsArray = (isAuction ? auctionItems : bazaarItems).stream().filter(item -> item.toLowerCase().contains(search.toLowerCase())).limit(totalSuggestions).toArray(String[]::new);
     }
@@ -248,12 +247,12 @@ public class SearchOverManager {
      */
     protected static String getHistory(int index) {
         if (isAuction) {
-            if (SkyblockerConfigManager.get().general.searchOverlay.auctionHistory.size() > index) {
-                return SkyblockerConfigManager.get().general.searchOverlay.auctionHistory.get(index);
+            if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.auctionHistory.size() > index) {
+                return SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.auctionHistory.get(index);
             }
         } else {
-            if (SkyblockerConfigManager.get().general.searchOverlay.bazaarHistory.size() > index) {
-                return SkyblockerConfigManager.get().general.searchOverlay.bazaarHistory.get(index);
+            if (SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.bazaarHistory.size() > index) {
+                return SkyblockerConfigManager.get().uiAndVisuals.searchOverlay.bazaarHistory.get(index);
             }
         }
         return null;
@@ -268,9 +267,9 @@ public class SearchOverManager {
      */
     private static void saveHistory() {
         //save to history
-        SkyblockerConfig.SearchOverlay config = SkyblockerConfigManager.get().general.searchOverlay;
+        UiAndVisualsConfig.SearchOverlay config = SkyblockerConfigManager.get().uiAndVisuals.searchOverlay;
         if (isAuction) {
-            if (config.auctionHistory.isEmpty() || !config.auctionHistory.get(0).equals(search)) {
+            if (config.auctionHistory.isEmpty() || !config.auctionHistory.getFirst().equals(search)) {
                 config.auctionHistory.add(0, search);
                 if (config.auctionHistory.size() > config.historyLength) {
                     config.auctionHistory = config.auctionHistory.subList(0, config.historyLength);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/ScreenConst.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/ScreenConst.java
index 05f0afa5..9e48e4e6 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/ScreenConst.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/ScreenConst.java
@@ -8,6 +8,6 @@ public class ScreenConst {
     private static final int SCREEN_PAD_BASE = 20;
 
     public static int getScreenPad() {
-        return (int) ((1f/((float)SkyblockerConfigManager.get().general.tabHud.tabHudScale/100f) * SCREEN_PAD_BASE));
+        return (int) ((1f/((float)SkyblockerConfigManager.get().uiAndVisuals.tabHud.tabHudScale/100f) * SCREEN_PAD_BASE));
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
index ba178a5e..b568e3ae 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
@@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.tabhud.widget;
 
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.UiAndVisualsConfig;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlayerComponent;
@@ -51,7 +52,7 @@ public class PlayerListWidget extends Widget {
             list.add(PlayerListMgr.getRaw(i));
         }
 
-        if (SkyblockerConfigManager.get().general.tabHud.nameSorting == SkyblockerConfig.NameSorting.ALPHABETICAL) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.tabHud.nameSorting == UiAndVisualsConfig.NameSorting.ALPHABETICAL) {
             list.sort(Comparator.comparing(o -> o.getProfile().getName().toLowerCase()));
         }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/Widget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/Widget.java
index 01a8720b..2d411c2e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/Widget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/Widget.java
@@ -152,7 +152,7 @@ public abstract class Widget {
         RenderSystem.enableDepthTest();
         ms.push();
 
-        float scale = SkyblockerConfigManager.get().general.tabHud.tabHudScale / 100f;
+        float scale = SkyblockerConfigManager.get().uiAndVisuals.tabHud.tabHudScale / 100f;
         ms.scale(scale, scale, 1);
 
         // move above other UI elements
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
index ab79bb31..4adf97a8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
@@ -20,7 +20,7 @@ public class PlayerComponent extends Component {
 
     public PlayerComponent(PlayerListEntry ple) {
 
-    	boolean plainNames = SkyblockerConfigManager.get().general.tabHud.plainPlayerNames;
+    	boolean plainNames = SkyblockerConfigManager.get().uiAndVisuals.tabHud.plainPlayerNames;
         Team team = ple.getScoreboardTeam();
         String username = ple.getProfile().getName();
         name = (team != null && !plainNames) ? Text.empty().append(team.getPrefix()).append(Text.literal(username).formatted(team.getColor())).append(team.getSuffix()) : Text.of(username);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java
index 7f826b23..f27a5fab 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java
@@ -8,6 +8,7 @@ import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.HelperConfig;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.PosUtils;
@@ -44,7 +45,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
 
 public class FairySouls {
     private static final Logger LOGGER = LoggerFactory.getLogger(FairySouls.class);
-    private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().general.waypoints.waypointType;
+    private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType;
     private static CompletableFuture<Void> fairySoulsLoaded;
     private static int maxSouls = 0;
     private static final Map<String, Map<BlockPos, ProfileAwareWaypoint>> fairySouls = new HashMap<>();
@@ -52,7 +53,7 @@ public class FairySouls {
     @SuppressWarnings("UnusedReturnValue")
     public static CompletableFuture<Void> runAsyncAfterFairySoulsLoad(Runnable runnable) {
         if (fairySoulsLoaded == null) {
-            LOGGER.error("[Skyblocker] Fairy Souls have not being initialized yet! Please ensure the Fairy Souls module is initialized before modules calling this method in SkyblockerMod#onInitializeClient. This error can be safely ignore in a test environment.");
+            LOGGER.error("[Skyblocker] Fairy Souls have not being initialized yet! Please ensure the Fairy Souls configs is initialized before modules calling this method in SkyblockerMod#onInitializeClient. This error can be safely ignore in a test environment.");
             return CompletableFuture.completedFuture(null);
         }
         return fairySoulsLoaded.thenRunAsync(runnable);
@@ -142,7 +143,7 @@ public class FairySouls {
     }
 
     private static void render(WorldRenderContext context) {
-        SkyblockerConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().general.fairySouls;
+        HelperConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().helper.fairySouls;
 
         if (fairySoulsConfig.enableFairySoulsHelper && fairySoulsLoaded.isDone() && fairySouls.containsKey(Utils.getLocationRaw())) {
             for (Waypoint fairySoul : fairySouls.get(Utils.getLocationRaw()).values()) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java
index 45a52388..a82d32ae 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java
@@ -189,7 +189,7 @@ public class MythologicalRitual {
     }
 
     private static boolean isActive() {
-        return SkyblockerConfigManager.get().general.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub");
+        return SkyblockerConfigManager.get().helper.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub");
     }
     
     private static void reset() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Relics.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Relics.java
index 952f2f59..3a9af459 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Relics.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/Relics.java
@@ -6,8 +6,8 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mojang.brigadier.CommandDispatcher;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.configs.OtherLocationsConfig;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.PosUtils;
 import de.hysky.skyblocker.utils.Utils;
@@ -42,7 +42,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit
 
 public class Relics {
     private static final Logger LOGGER = LoggerFactory.getLogger(Relics.class);
-    private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().general.waypoints.waypointType;
+    private static final Supplier<Waypoint.Type> TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType;
     private static CompletableFuture<Void> relicsLoaded;
     @SuppressWarnings({"unused", "FieldCanBeLocal"})
     private static int totalRelics = 0;
@@ -130,7 +130,7 @@ public class Relics {
     }
 
     private static void render(WorldRenderContext context) {
-        SkyblockerConfig.Relics config = SkyblockerConfigManager.get().locations.spidersDen.relics;
+        OtherLocationsConfig.Relics config = SkyblockerConfigManager.get().otherLocations.spidersDen.relics;
 
         if (config.enableRelicsHelper && relicsLoaded.isDone() && Utils.getLocationRaw().equals("combat_1")) {
             for (ProfileAwareWaypoint relic : relics.values()) {