diff --git a/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java b/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java
index 50c0349..a092123 100755
--- a/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java
+++ b/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java
@@ -1,6 +1,5 @@
 package eu.midnightdust.core;
 
-import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.AutoCommand;
 import eu.midnightdust.lib.config.MidnightConfig;
 
diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java
similarity index 80%
rename from forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java
rename to forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java
index 4603c8c..36aaa5a 100644
--- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java
+++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java
@@ -13,18 +13,12 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-public class MidnightLibEvents {
+public class MidnightLibClientEvents {
     @SubscribeEvent
     public static void registerLayerDefinition(EntityRenderersEvent.RegisterLayerDefinitions event) {
         event.registerLayerDefinition(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
     }
     @SubscribeEvent
-    public void registerCommands(RegisterCommandsEvent event) {
-        for (LiteralArgumentBuilder<ServerCommandSource> command : AutoCommand.commands){
-            event.getDispatcher().register(command);
-        }
-    }
-    @SubscribeEvent
     public void registerClientTick(TickEvent.ClientTickEvent event) {
         MidnightColorUtil.tick();
     }
diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java
index 809c501..2960e34 100644
--- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java
+++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java
@@ -33,6 +33,7 @@ public class MidnightLibForge {
         );
         ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
                 new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "midnightlib")));
-        MinecraftForge.EVENT_BUS.register(new MidnightLibEvents());
+        MinecraftForge.EVENT_BUS.register(new MidnightLibClientEvents());
+        MinecraftForge.EVENT_BUS.register(new MidnightLibServerEvents());
     }
 }
diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java
new file mode 100644
index 0000000..f5ce3df
--- /dev/null
+++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java
@@ -0,0 +1,23 @@
+package eu.midnightdust.forge;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
+import eu.midnightdust.lib.config.AutoCommand;
+import eu.midnightdust.lib.util.MidnightColorUtil;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.EntityRenderersEvent;
+import net.minecraftforge.event.RegisterCommandsEvent;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.DEDICATED_SERVER)
+public class MidnightLibServerEvents {
+    @SubscribeEvent
+    public void registerCommands(RegisterCommandsEvent event) {
+        for (LiteralArgumentBuilder<ServerCommandSource> command : AutoCommand.commands){
+            event.getDispatcher().register(command);
+        }
+    }
+}
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index f35466c..ea5e9ea 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -7,6 +7,7 @@ license = "MIT License"
 modId = "midnightlib"
 version = "${version}"
 displayName = "MidnightLib"
+logoFile = "midnightlib.png"
 authors = "TeamMidnightDust, Motschen"
 description = '''
 Common Library for Team MidnightDust's mods.
diff --git a/forge/src/main/resources/midnightlib.png b/forge/src/main/resources/midnightlib.png
new file mode 100644
index 0000000..d31b4c4
Binary files /dev/null and b/forge/src/main/resources/midnightlib.png differ