diff --git a/.gitignore b/.gitignore
index ac0dc65..8713f47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ run/
 .gradle/
 build/
 classes/
+temp/
diff --git a/build.gradle b/build.gradle
index c798505..ca6294c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,8 @@ dependencies {
     shade "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }
 minecraft {
-    version = '1.11.2-13.20.0.2232'
-    mappings = 'snapshot_20161210'
+    version = '1.11.2-13.20.1.2386'
+    mappings = 'snapshot_20170612'
     runDir = 'run'
 }
 processResources {
diff --git a/src/main/kotlin/mods/betterfoliage/client/Client.kt b/src/main/kotlin/mods/betterfoliage/client/Client.kt
index c6b8461..228d6c1 100644
--- a/src/main/kotlin/mods/betterfoliage/client/Client.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/Client.kt
@@ -33,7 +33,7 @@ object Client {
 
     val configKey = KeyHandler(BetterFoliageMod.MOD_NAME, 66, "key.betterfoliage.gui") {
         FMLClientHandler.instance().showGuiScreen(
-            ConfigGuiFactory.ConfigGuiBetterFoliage(Minecraft.getMinecraft().currentScreen)
+            ConfigGuiFactory.createBFConfigGui(Minecraft.getMinecraft().currentScreen)
         )
     }
 
diff --git a/src/main/kotlin/mods/betterfoliage/client/gui/ConfigGuiFactory.kt b/src/main/kotlin/mods/betterfoliage/client/gui/ConfigGuiFactory.kt
index af1501a..20fc932 100644
--- a/src/main/kotlin/mods/betterfoliage/client/gui/ConfigGuiFactory.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/gui/ConfigGuiFactory.kt
@@ -9,12 +9,18 @@ import net.minecraftforge.fml.client.config.GuiConfig
 
 class ConfigGuiFactory : IModGuiFactory {
 
-    override fun mainConfigGuiClass() = ConfigGuiBetterFoliage::class.java
-    override fun runtimeGuiCategories() = hashSetOf<IModGuiFactory.RuntimeOptionCategoryElement>()
+    // Deprecated stuff
+    override fun mainConfigGuiClass() = null
     override fun getHandlerFor(element: IModGuiFactory.RuntimeOptionCategoryElement?) = null
-    override fun initialize(minecraftInstance: Minecraft?) { }
 
-    class ConfigGuiBetterFoliage(parentScreen: GuiScreen?) : GuiConfig(
+    override fun initialize(minecraftInstance: Minecraft?) { }
+    override fun hasConfigGui() = true
+    override fun runtimeGuiCategories() = hashSetOf<IModGuiFactory.RuntimeOptionCategoryElement>()
+    override fun createConfigGui(parentScreen: GuiScreen?) = createBFConfigGui(parentScreen)
+
+    companion object {
+        @JvmStatic
+        fun createBFConfigGui(parentScreen: GuiScreen?) = GuiConfig(
             parentScreen,
             Config.rootGuiElements,
             BetterFoliageMod.MOD_ID,
@@ -22,5 +28,6 @@ class ConfigGuiFactory : IModGuiFactory {
             false,
             false,
             BetterFoliageMod.MOD_NAME
-    )
+        )
+    }
 }
diff --git a/src/main/kotlin/mods/octarinecore/client/gui/NonVerboseArrayEntry.kt b/src/main/kotlin/mods/octarinecore/client/gui/NonVerboseArrayEntry.kt
index 0b935f2..3cddf60 100644
--- a/src/main/kotlin/mods/octarinecore/client/gui/NonVerboseArrayEntry.kt
+++ b/src/main/kotlin/mods/octarinecore/client/gui/NonVerboseArrayEntry.kt
@@ -15,7 +15,7 @@ class NonVerboseArrayEntry(
     init {
         stripTooltipDefaultText(toolTip as MutableList<String>)
         val shortDefaults = I18n.format("${configElement.languageKey}.arrayEntry", configElement.defaults.size)
-        toolTip.addAll(mc.fontRendererObj.listFormattedStringToWidth("$AQUA${I18n.format("fml.configgui.tooltip.default", shortDefaults)}", 300))
+        toolTip.addAll(mc.fontRenderer.listFormattedStringToWidth("$AQUA${I18n.format("fml.configgui.tooltip.default", shortDefaults)}", 300))
     }
 
     override fun updateValueButtonText() {