diff --git a/src/main/java/com/gregtechceu/gtceu/common/mui/factory/MachineUIFactory.java b/src/main/java/com/gregtechceu/gtceu/common/mui/factory/MachineUIFactory.java
index dfac6c2d3b..5d0b21eb48 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/mui/factory/MachineUIFactory.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/mui/factory/MachineUIFactory.java
@@ -15,6 +15,8 @@
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -81,6 +83,7 @@ public static MetaMachine getMachine(PosGuiData data) {
     }
 
     @Override
+    @OnlyIn(Dist.CLIENT)
     public ModularScreen createScreen(PosGuiData data, ModularPanel mainPanel) {
         return new GTGuiScreen(MOD_ID, mainPanel, getThemeId(data));
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseAllGuiPacket.java b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseAllGuiPacket.java
index 83ed419fa7..a540fa5198 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseAllGuiPacket.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseAllGuiPacket.java
@@ -1,9 +1,9 @@
 package com.gregtechceu.gtceu.common.network.packets.ui;
 
+import com.gregtechceu.gtceu.api.mui.base.MCHelper;
 import com.gregtechceu.gtceu.common.network.GTNetwork;
 import com.gregtechceu.gtceu.common.network.ModularNetwork;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkDirection;
 import net.minecraftforge.network.NetworkEvent;
@@ -21,7 +21,7 @@ public void encode(FriendlyByteBuf buffer) {}
     @Override
     public void execute(NetworkEvent.Context handler) {
         if (handler.getDirection() == NetworkDirection.PLAY_TO_CLIENT) {
-            ModularNetwork.CLIENT.closeAll(Minecraft.getInstance().player, false);
+            ModularNetwork.CLIENT.closeAll(MCHelper.getPlayer(), false);
         } else {
             ModularNetwork.SERVER.closeAll(handler.getSender(), false);
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseGuiPacket.java b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseGuiPacket.java
index 72bee950af..a67c503985 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseGuiPacket.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/CloseGuiPacket.java
@@ -1,9 +1,9 @@
 package com.gregtechceu.gtceu.common.network.packets.ui;
 
+import com.gregtechceu.gtceu.api.mui.base.MCHelper;
 import com.gregtechceu.gtceu.common.network.GTNetwork;
 import com.gregtechceu.gtceu.common.network.ModularNetwork;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkDirection;
 import net.minecraftforge.network.NetworkEvent;
@@ -32,7 +32,7 @@ public void encode(FriendlyByteBuf buffer) {
     @Override
     public void execute(NetworkEvent.Context handler) {
         if (handler.getDirection() == NetworkDirection.PLAY_TO_CLIENT) {
-            ModularNetwork.CLIENT.closeContainer(this.networkId, this.dispose, Minecraft.getInstance().player, false);
+            ModularNetwork.CLIENT.closeContainer(this.networkId, this.dispose, MCHelper.getPlayer(), false);
         } else {
             ModularNetwork.SERVER.closeContainer(this.networkId, this.dispose, handler.getSender(), false);
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/ReopenGuiPacket.java b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/ReopenGuiPacket.java
index 598922652d..d37959a16a 100644
--- a/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/ReopenGuiPacket.java
+++ b/src/main/java/com/gregtechceu/gtceu/common/network/packets/ui/ReopenGuiPacket.java
@@ -1,9 +1,9 @@
 package com.gregtechceu.gtceu.common.network.packets.ui;
 
+import com.gregtechceu.gtceu.api.mui.base.MCHelper;
 import com.gregtechceu.gtceu.common.network.GTNetwork;
 import com.gregtechceu.gtceu.common.network.ModularNetwork;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkDirection;
 import net.minecraftforge.network.NetworkEvent;
@@ -29,7 +29,7 @@ public void encode(FriendlyByteBuf buffer) {
     @Override
     public void execute(NetworkEvent.Context handler) {
         if (handler.getDirection() == NetworkDirection.PLAY_TO_CLIENT) {
-            ModularNetwork.CLIENT.reopen(Minecraft.getInstance().player, this.networkId, false);
+            ModularNetwork.CLIENT.reopen(MCHelper.getPlayer(), this.networkId, false);
         } else {
             ModularNetwork.SERVER.reopen(handler.getSender(), this.networkId, false);
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java b/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
index 29c7630021..b1d6339271 100644
--- a/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
+++ b/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
@@ -259,7 +259,8 @@ public static void registerReloadListeners(AddReloadListenerEvent event) {
         event.addListener(new GTOreLoader());
         event.addListener(new BedrockFluidLoader());
         event.addListener(new BedrockOreLoader());
-        event.addListener(new ThemeManager());
+        if (GTCEu.isClientThread())
+            event.addListener(new ThemeManager());
     }
 
     @SubscribeEvent