diff --git a/build.gradle b/build.gradle
index 438422d9a..952fa137c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,10 +136,21 @@ mixin {
     add sourceSets.main, 'flywheel.refmap.json'
 }
 
+// Fix for SpongePowered/MixinGradle#38
+afterEvaluate {
+    tasks.configureReobfTaskForReobfJar.mustRunAfter(tasks.compileJava)
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
+javadoc {
+    source = [sourceSets.main.allJava]
+    // prevent java 8's strict doclint for javadocs from failing builds
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 jar {
     manifest {
         attributes([
@@ -155,12 +166,6 @@ jar {
     }
 }
 
-javadoc {
-    source = [sourceSets.main.allJava]
-    // prevent java 8's strict doclint for javadocs from failing builds
-    options.addStringOption('Xdoclint:none', '-quiet')
-}
-
 java {
     withSourcesJar()
     withJavadocJar()
diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
index e660fbc83..1a02d5f3f 100644
Binary files a/src/main/resources/logo.png and b/src/main/resources/logo.png differ