diff --git a/.gitignore b/.gitignore
index 66f16ea..a9ca9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ bin/
 # fabric
 
 run/
-log/
+logs/
diff --git a/build.gradle b/build.gradle
index 6a443f9..57d8e16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,12 +11,12 @@ version = project.mod_version
 group = project.maven_group
 
 dependencies {
-	minecraft "com.mojang:minecraft:1.16.2"
-	mappings "net.fabricmc:yarn:1.16.2+build.43:v2"
-	modImplementation "net.fabricmc:fabric-loader:0.9.2+build.206"
+	minecraft "com.mojang:minecraft:1.16.1"
+	mappings "net.fabricmc:yarn:1.16.1+build.21:v2"
+	modImplementation "net.fabricmc:fabric-loader:0.9.3+build.207"
 
 	//Fabric api
-	modImplementation "net.fabricmc.fabric-api:fabric-api:0.19.0+build.398-1.16"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:0.18.0+build.387-1.16.1"
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
index 4aa1b07..b5f847c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-    minecraft_version=1.16.2
-    yarn_mappings=1.16.2+build.43
-    loader_version=0.9.2+build.206
+    minecraft_version=1.16.1
+    yarn_mappings=1.16.1+build.21
+    loader_version=0.9.3+build.207
 
 # Mod Properties
 	mod_version = 1.0.0
@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1G
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-    fabric_version=0.19.0+build.398-1.16
+    fabric_version=0.18.0+build.387-1.16.1
\ No newline at end of file
diff --git a/src/main/java/net/autoreconnect/AutoReconnect.java b/src/main/java/net/autoreconnect/AutoReconnect.java
index a64b75b..5f3f87c 100644
--- a/src/main/java/net/autoreconnect/AutoReconnect.java
+++ b/src/main/java/net/autoreconnect/AutoReconnect.java
@@ -47,6 +47,7 @@ public class AutoReconnect implements ModInitializer
 		cancel();
 		attempt = 0;
 		connect = false;
+		System.out.println("reset");
 	}
 
 	public static int getCountdown()
diff --git a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java b/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java
index 3d8517b..52e5ddb 100644
--- a/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java
+++ b/src/main/java/net/autoreconnect/mixin/MixinDisconnectedScreen.java
@@ -1,7 +1,7 @@
 package net.autoreconnect.mixin;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.DisconnectedScreen;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.util.math.MatrixStack;
@@ -27,11 +27,11 @@ public class MixinDisconnectedScreen
 	private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info)
 	{
 		Window window = MinecraftClient.getInstance().getWindow();
-		DrawableHelper.drawCenteredString(matrices,
-			MinecraftClient.getInstance().textRenderer,
-			attempt == -1 ? "Can not reconnect!" : "Reconnecting in " + getCountdown() + "...",
-			window.getScaledWidth() / 2,
-			window.getScaledHeight() / 4,
+		TextRenderer renderer = MinecraftClient.getInstance().textRenderer;
+		String text = attempt == -1 ? "Can not reconnect!" : "Reconnecting in " + getCountdown() + "...";
+		renderer.draw(matrices, text,
+			(window.getScaledWidth() - renderer.getWidth(text)) / 2F,
+			(window.getScaledHeight() - renderer.fontHeight) / 3F,
 			0xFF4422);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java b/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java
index 610aaef..aa65196 100644
--- a/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java
+++ b/src/main/java/net/autoreconnect/mixin/MixinMinecraftClient.java
@@ -30,6 +30,7 @@ public class MixinMinecraftClient
 	{
 		System.out.println(screen == null ? null : screen.getClass().getSimpleName());
 		//TODO interpret disconnect reason
+		//TODO revalidate session if needed
 		if (screen instanceof DisconnectedScreen)
 		{
 			if (attempt < 0) return;
@@ -53,6 +54,7 @@ public class MixinMinecraftClient
 		}
 		else if (screen instanceof MultiplayerScreen || MinecraftClient.getInstance().player != null)
 		{
+			System.out.println(screen == null ? null : screen.getClass().getSimpleName());
 			//TODO find better conditions to reset
 			reset();
 		}
@@ -72,7 +74,7 @@ public class MixinMinecraftClient
 				return;
 			}
 			mc.disconnect();
-			mc.openScreen(new ConnectScreen(new TitleScreen(), mc, lastServerEntry));
+			mc.openScreen(new ConnectScreen(new MultiplayerScreen(new TitleScreen()), mc, lastServerEntry));
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/icon.png b/src/main/resources/assets/icon.png
new file mode 100644
index 0000000..5d030cf
Binary files /dev/null and b/src/main/resources/assets/icon.png differ