diff --git a/dependencies.gradle b/dependencies.gradle
index 81d6c92d..7d9e7baa 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -27,7 +27,7 @@ dependencies {
     devOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.29:dev")
     compileOnlyApi("com.github.GTNewHorizons:nei-custom-diagram:1.8.30:dev") { transitive = false }
     devOnlyNonPublishable("com.github.GTNewHorizons:EnhancedLootBags:1.3.4:dev")
-    devOnlyNonPublishable("com.github.GTNewHorizons:BetterQuesting:3.8.74-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:BetterQuesting:3.8.77-GTNH:dev")
     devOnlyNonPublishable("com.github.GTNewHorizons:Angelica:2.1.53:dev")
     devOnlyNonPublishable("com.github.GTNewHorizons:TX-Loader:1.8.11:dev")
     devOnlyNonPublishable("curse.maven:cofh-core-69162:2388751")
diff --git a/src/main/java/com/hfstudio/guidenh/mixins/Mixins.java b/src/main/java/com/hfstudio/guidenh/mixins/Mixins.java
index 605dcf5e..72ee874e 100644
--- a/src/main/java/com/hfstudio/guidenh/mixins/Mixins.java
+++ b/src/main/java/com/hfstudio/guidenh/mixins/Mixins.java
@@ -17,8 +17,9 @@ public enum Mixins implements IMixins {
         "minecraft.AccessorSimpleReloadableResourceManager", "forge.AccessorShapedOreRecipe",
         "forge.AccessorShapelessOreRecipe"),
 
-    BQ_COMPAT(Side.CLIENT, Phase.LATE, Mods.BetterQuesting, "compat.MixinPanelButtonQuest", "compat.MixinPanelTextBox",
-        "compat.AccessorPanelTextBox", "compat.AccessorPanelTextBoxHotZone"),
+    BQ_COMPAT(Side.CLIENT, Phase.LATE, Mods.BetterQuesting, "compat.betterquesting.MixinPanelButtonQuest",
+        "compat.betterquesting.MixinPanelTextBox", "compat.betterquesting.AccessorPanelTextBox",
+        "compat.betterquesting.AccessorPanelTextBoxHotZone"),
 
     GREGTECH_HATCH_BUILDER(Side.CLIENT, Phase.LATE, Mods.GregTech, "compat.gregtech.AccessorHatchElementBuilder"),
 
diff --git a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBox.java b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBox.java
similarity index 84%
rename from src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBox.java
rename to src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBox.java
index 0337de01..1d0c7125 100644
--- a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBox.java
+++ b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBox.java
@@ -1,4 +1,4 @@
-package com.hfstudio.guidenh.mixins.late.compat;
+package com.hfstudio.guidenh.mixins.late.compat.betterquesting;
 
 import java.util.List;
 
diff --git a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBoxHotZone.java b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBoxHotZone.java
similarity index 75%
rename from src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBoxHotZone.java
rename to src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBoxHotZone.java
index 1f6d7caa..36206b57 100644
--- a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/AccessorPanelTextBoxHotZone.java
+++ b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/AccessorPanelTextBoxHotZone.java
@@ -1,4 +1,4 @@
-package com.hfstudio.guidenh.mixins.late.compat;
+package com.hfstudio.guidenh.mixins.late.compat.betterquesting;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -11,6 +11,6 @@ public interface AccessorPanelTextBoxHotZone {
     @Accessor("location")
     IGuiRect guidenh$getLocation();
 
-    @Accessor("url")
-    String guidenh$getUrl();
+    @Accessor("link")
+    Object guidenh$getLink();
 }
diff --git a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelButtonQuest.java b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelButtonQuest.java
similarity index 97%
rename from src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelButtonQuest.java
rename to src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelButtonQuest.java
index b8c01a14..205d8711 100644
--- a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelButtonQuest.java
+++ b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelButtonQuest.java
@@ -1,4 +1,4 @@
-package com.hfstudio.guidenh.mixins.late.compat;
+package com.hfstudio.guidenh.mixins.late.compat.betterquesting;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelTextBox.java b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelTextBox.java
similarity index 79%
rename from src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelTextBox.java
rename to src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelTextBox.java
index eaa0e7cf..32361f8c 100644
--- a/src/main/java/com/hfstudio/guidenh/mixins/late/compat/MixinPanelTextBox.java
+++ b/src/main/java/com/hfstudio/guidenh/mixins/late/compat/betterquesting/MixinPanelTextBox.java
@@ -1,4 +1,4 @@
-package com.hfstudio.guidenh.mixins.late.compat;
+package com.hfstudio.guidenh.mixins.late.compat.betterquesting;
 
 import java.util.List;
 
@@ -33,9 +33,12 @@ public abstract class MixinPanelTextBox {
             AccessorPanelTextBoxHotZone accessor = (AccessorPanelTextBoxHotZone) hotZone;
             if (accessor.guidenh$getLocation()
                 .contains(mxt, myt)) {
-                List<String> tooltip = BqGuidePageLinks.getTooltip(accessor.guidenh$getUrl());
-                if (tooltip != null && !tooltip.isEmpty()) {
-                    cir.setReturnValue(tooltip);
+                Object link = accessor.guidenh$getLink();
+                if (link instanceof String) {
+                    List<String> tooltip = BqGuidePageLinks.getTooltip((String) link);
+                    if (tooltip != null && !tooltip.isEmpty()) {
+                        cir.setReturnValue(tooltip);
+                    }
                 }
                 return;
             }