diff --git a/common/src/main/java/com/leisuretimedock/jsonem/platform/Services.java b/common/src/main/java/com/leisuretimedock/jsonem/platform/Services.java
index 511e18c..74ec952 100644
--- a/common/src/main/java/com/leisuretimedock/jsonem/platform/Services.java
+++ b/common/src/main/java/com/leisuretimedock/jsonem/platform/Services.java
@@ -9,8 +9,8 @@ public class Services {
     public static <T> T load(Class<T> clazz) {
         final T loadedService = ServiceLoader.load(clazz)
                 .findFirst()
-                .orElseThrow(() -> new RuntimeException("Could not find service for " + clazz.getSimpleName()));
-        JsonEm.LOG.debug("Loaded {} service for {}", loadedService, clazz);
+                .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
+        JsonEm.LOG.debug("Loaded {} for service {}", loadedService, clazz);
         return loadedService;
     }
 }
diff --git a/fabric/src/main/resources/assets/jsonem/icon.png b/common/src/main/resources/icon.png
similarity index 100%
rename from fabric/src/main/resources/assets/jsonem/icon.png
rename to common/src/main/resources/icon.png
diff --git a/fabric/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.fabric.platform.FabricPlatformHelper b/fabric/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.platform.IPlatFormHelper
similarity index 100%
rename from fabric/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.fabric.platform.FabricPlatformHelper
rename to fabric/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.platform.IPlatFormHelper
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 6592c56..b9c4ab3 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -12,7 +12,7 @@
     "sources": "${mod_source}"
   },
   "license": "${mod_licence}",
-  "icon": "assets/jsonem/icon.png",
+  "icon": "icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [
diff --git a/forge/build.gradle b/forge/build.gradle
index 1bce9fc..1f9eac2 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -2,17 +2,18 @@ plugins {
     id 'com.github.johnrengelman.shadow'
 }
 
-loom {
-    forge {
-        mixinConfig "jsonem.mixins.json"
-    }
-}
-
 architectury {
     platformSetupLoomIde()
     forge()
 }
 
+loom {
+    forge {
+        mixinConfig "${mod_id}.mixins.json"
+    }
+}
+
+
 configurations {
     common {
         canBeResolved = true
@@ -54,4 +55,6 @@ shadowJar {
 
 remapJar {
     input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    archiveClassifier = null
 }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index eee729a..d4ed17e 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -2,6 +2,7 @@ modLoader = "javafml"
 loaderVersion = "[47,)"
 #issueTrackerURL = ""
 license = "${mod_licence}"
+logoFile = "icon.png"
 
 [[mods]]
 modId = "jsonem"
@@ -12,7 +13,7 @@ authors = "${mod_authors}"
 description = '''
     ${mod_description}
     '''
-logoFile = "assets/jsonem/icon.png"
+
 
 [[dependencies.jsonem]]
 modId = "forge"
diff --git a/forge/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.forge.platform.ForgePlatformHelper b/forge/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.platform.IPlatFormHelper
similarity index 100%
rename from forge/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.forge.platform.ForgePlatformHelper
rename to forge/src/main/resources/META-INF/services/com.leisuretimedock.jsonem.platform.IPlatFormHelper
diff --git a/forge/src/main/resources/assets/jsonem/icon.png b/forge/src/main/resources/assets/jsonem/icon.png
deleted file mode 100644
index 54c2a1f..0000000
Binary files a/forge/src/main/resources/assets/jsonem/icon.png and /dev/null differ