diff --git a/dependencies.gradle b/dependencies.gradle
index bb5e0328..23f88bd6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,8 +1,8 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
-    implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.86-GTNH:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.7.1:dev")
+    implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.21-GTNH:dev")
 
     testImplementation(platform('org.junit:junit-bom:5.9.2'))
     testImplementation('org.junit.jupiter:junit-jupiter')
diff --git a/gradle.properties b/gradle.properties
index 1baf9d19..453759b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -96,7 +96,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage = mixins
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
diff --git a/settings.gradle b/settings.gradle
index bc5e0f05..05c912eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.42'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.47'
 }
 
 
diff --git a/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java b/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java
index 6c66c491..8f8dc11c 100644
--- a/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java
+++ b/src/main/java/com/gtnewhorizon/structurelib/block/BlockHint.java
@@ -50,6 +50,10 @@ public class BlockHint extends Block {
 
     @Override
     public IIcon getIcon(int aSide, int aMeta) {
+        // For numbered hints, top and bottom are blank
+        if (aSide <= 1 && aMeta <= 11) {
+            return hint[13];
+        }
         return hint[aMeta];
     }
 
diff --git a/src/main/java/com/gtnewhorizon/structurelib/gui/GuiScreenConfigureChannels.java b/src/main/java/com/gtnewhorizon/structurelib/gui/GuiScreenConfigureChannels.java
index b554bf97..a0015179 100644
--- a/src/main/java/com/gtnewhorizon/structurelib/gui/GuiScreenConfigureChannels.java
+++ b/src/main/java/com/gtnewhorizon/structurelib/gui/GuiScreenConfigureChannels.java
@@ -261,6 +261,11 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
         switch (aKey) {
             case Keyboard.KEY_TAB:
                 if (key.isFocused()) {
+                    if (autoCompleteList.getSelectedElement() != null) {
+                        key.setText(autoCompleteList.getSelectedElement());
+                        return;
+                    }
+
                     key.setFocused(false);
                     value.setFocused(true);
                 } else {
@@ -298,11 +303,10 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
                 }
                 break;
         }
-        if (key.textboxKeyTyped(aChar, aKey)) {
+        if (key.textboxKeyTyped(aChar, aKey) || value.textboxKeyTyped(aChar, aKey)) {
             updateButtons();
             return;
         }
-        if (value.textboxKeyTyped(aChar, aKey)) return;
         super.keyTyped(aChar, aKey);
     }
 
@@ -313,7 +317,8 @@ public class GuiScreenConfigureChannels extends GuiContainer implements IGuiScre
         boolean existing = !StringUtils.isEmpty(keyText) && ChannelDataAccessor.hasSubChannel(trigger, keyText);
         getButtonList().get(ADD_BTN).displayString = existing ? I18n.format(I18N_PREFIX + "set")
                 : I18n.format(I18N_PREFIX + "add");
-        getButtonList().get(ADD_BTN).enabled = !StringUtils.isBlank(value.getText())
+        getButtonList().get(ADD_BTN).enabled = !StringUtils.isBlank(key.getText())
+                && !StringUtils.isBlank(value.getText())
                 && Integer.parseInt(value.getText()) > 0;
         getButtonList().get(UNSET_BTN).enabled = existing && !StringUtils.isBlank(value.getText());
 
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_0.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_0.png
index ad6cc6ea..7c68d81a 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_0.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_0.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_1.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_1.png
index 401b8ba3..a5d9a5d4 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_1.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_1.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_10.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_10.png
index a6d05e41..d5b395f6 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_10.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_10.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_11.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_11.png
index 6642e564..7dee3803 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_11.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_11.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_2.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_2.png
index ba328f6e..d59ad882 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_2.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_2.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_3.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_3.png
index a6dc35f9..be619dee 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_3.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_3.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_4.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_4.png
index ba0d7277..12d26c29 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_4.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_4.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_5.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_5.png
index c4f62763..09979f1f 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_5.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_5.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_6.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_6.png
index cb3aa932..0d6b6eac 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_6.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_6.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_7.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_7.png
index 9a88af8a..f18211b9 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_7.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_7.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_8.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_8.png
index 03c11338..af7ef27a 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_8.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_8.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_9.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_9.png
index e9cbd7d0..a9481d46 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_9.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_9.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_AIR.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_AIR.png
index 9d709ad4..0587cc45 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_AIR.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_AIR.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_DEFAULT.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_DEFAULT.png
index d8f9721b..9d1f0ac5 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_DEFAULT.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_DEFAULT.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_ERROR.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_ERROR.png
index 3313d24d..8cac7171 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_ERROR.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_ERROR.png differ
diff --git a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_NOAIR.png b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_NOAIR.png
index 13102c68..7c22c4a2 100644
Binary files a/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_NOAIR.png and b/src/main/resources/assets/structurelib/textures/blocks/iconsets/HINT_NOAIR.png differ