diff --git a/client/src/main/java/AudioThread.java b/client/src/main/java/AudioThread.java
index 07abca3..6d5b8ee 100644
--- a/client/src/main/java/AudioThread.java
+++ b/client/src/main/java/AudioThread.java
@@ -30,10 +30,10 @@ public final class AudioThread implements Runnable {
 					}
 				}
 				Static231.sleep(10L);
-				Static140.method2708(this.aClass213_1, null);
+				GameShell.flush(this.aClass213_1, null);
 			}
 		} catch (@Pc(43) Exception local43) {
-			Static89.method1839(null, local43);
+			Static89.report(null, local43);
 		} finally {
 			this.aBoolean64 = false;
 		}
diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java
index 8f1d29c..b927996 100644
--- a/client/src/main/java/BufferedSocket.java
+++ b/client/src/main/java/BufferedSocket.java
@@ -111,7 +111,7 @@ public final class BufferedSocket implements Runnable {
 				}
 			}
 		} catch (@Pc(124) Exception local124) {
-			Static89.method1839(null, local124);
+			Static89.report(null, local124);
 		}
 	}
 
@@ -156,7 +156,7 @@ public final class BufferedSocket implements Runnable {
 				}
 			}
 			if (this.aClass212_4 == null) {
-				this.aClass212_4 = this.aClass213_5.method5130(3, this);
+				this.aClass212_4 = this.aClass213_5.startThread(3, this);
 			}
 			this.notifyAll();
 		}
diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java
index 5e5974a..5499e38 100644
--- a/client/src/main/java/GameShell.java
+++ b/client/src/main/java/GameShell.java
@@ -1,14 +1,7 @@
 import java.applet.Applet;
 import java.applet.AppletContext;
-import java.awt.Container;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.Insets;
-import java.awt.Rectangle;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
+import java.awt.*;
+import java.awt.event.*;
 import java.lang.reflect.Method;
 import java.net.URL;
 import org.openrs2.deob.annotation.OriginalArg;
@@ -19,45 +12,176 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!rc")
 public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener {
 
+	@OriginalMember(owner = "client!sh", name = "l", descriptor = "[J")
+	public static final long[] logicTimes = new long[32];
+
+	@OriginalMember(owner = "client!ah", name = "k", descriptor = "[J")
+	public static final long[] redrawTimes = new long[32];
+
+	@OriginalMember(owner = "client!fk", name = "l", descriptor = "Lsignlink!ll;")
+	public static SignLink signLink;
+
+	@OriginalMember(owner = "client!d", name = "Y", descriptor = "Ljava/awt/Frame;")
+	public static Frame frame;
+
+	@OriginalMember(owner = "client!t", name = "m", descriptor = "Z")
+	public static volatile boolean focusIn = true;
+
+	@OriginalMember(owner = "client!fh", name = "P", descriptor = "Z")
+	public static volatile boolean fullRedraw = true;
+
+	@OriginalMember(owner = "client!md", name = "L", descriptor = "Ljava/awt/Canvas;")
+	public static Canvas canvas;
+
+	@OriginalMember(owner = "client!fh", name = "Y", descriptor = "Ljava/awt/Frame;")
+	public static Frame fullScreenFrame;
+
+	@OriginalMember(owner = "client!dl", name = "d", descriptor = "I")
+	public static int canvasWidth;
+
+	@OriginalMember(owner = "client!uj", name = "B", descriptor = "I")
+	public static int canvasHeight;
+
+	@OriginalMember(owner = "client!lf", name = "f", descriptor = "I")
+	public static int leftMargin = 0;
+
+	@OriginalMember(owner = "client!od", name = "e", descriptor = "I")
+	public static int topMargin = 0;
+
+	@OriginalMember(owner = "client!ca", name = "ab", descriptor = "Z")
+	public static boolean focus;
+
+	@OriginalMember(owner = "client!cl", name = "bb", descriptor = "Z")
+	public static volatile boolean replaceCanvas = false;
+
+	@OriginalMember(owner = "client!tk", name = "c", descriptor = "J")
+	public static volatile long lastCanvasReplace = 0L;
+
+	@OriginalMember(owner = "client!sj", name = "F", descriptor = "Lclient!rc;")
+	public static GameShell instance = null;
+
+	@OriginalMember(owner = "client!eh", name = "a", descriptor = "Z")
+	public static boolean shutdown = false;
+
+	@OriginalMember(owner = "client!ve", name = "F", descriptor = "I")
+	public static int logicTimePointer;
+
+	@OriginalMember(owner = "client!jh", name = "c", descriptor = "I")
+	public static int frameHeight;
+
+	@OriginalMember(owner = "client!kd", name = "pb", descriptor = "I")
+	public static int anInt3252;
+
+	@OriginalMember(owner = "client!fl", name = "U", descriptor = "I")
+	public static int frameWidth;
+
+	@OriginalMember(owner = "client!tc", name = "f", descriptor = "Z")
+	public static boolean isJava5OrLater = false;
+
+	@OriginalMember(owner = "client!sf", name = "d", descriptor = "I")
+	public static int minimumDelay = 1;
+
+	@OriginalMember(owner = "client!ba", name = "B", descriptor = "I")
+	public static int timePerFrame = 20;
+
+	@OriginalMember(owner = "client!cm", name = "b", descriptor = "Ljava/lang/Thread;")
+	public static Thread thread;
+
+	@OriginalMember(owner = "client!fl", name = "w", descriptor = "J")
+	public static long killTime = 0L;
+
+	@OriginalMember(owner = "client!da", name = "M", descriptor = "Z")
+	public static boolean openWindowJavaScript;
+
+	@OriginalMember(owner = "client!fi", name = "l", descriptor = "I")
+	public static int instances = 0;
+
+	@OriginalMember(owner = "client!qe", name = "v", descriptor = "Lclient!s;")
+	public static Timer timer;
+
+	@OriginalMember(owner = "client!sg", name = "p", descriptor = "I")
+	public static int logicCycles;
+
+	@OriginalMember(owner = "client!ii", name = "i", descriptor = "I")
+	public static int redrawTimePointer;
+
+	@OriginalMember(owner = "client!ol", name = "fb", descriptor = "I")
+	public static int partialRedraws = 500;
+
+	@OriginalMember(owner = "client!tk", name = "v", descriptor = "I")
+	public static int framesPerSecond = 0;
+
+	@OriginalMember(owner = "client!te", name = "C", descriptor = "I")
+	public static int maxMemory = 64;
+
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "Z")
-	private boolean aBoolean71 = false;
+	private boolean error = false;
 
 	@OriginalMember(owner = "client!rc", name = "providesignlink", descriptor = "(Lsignlink!ll;)V")
-	public static void providesignlink(@OriginalArg(0) SignLink arg0) {
-		Static71.signLink = arg0;
-		Static69.aClass213_4 = arg0;
+	public static void providesignlink(@OriginalArg(0) SignLink signLink) {
+		GameShell.signLink = signLink;
+		Static69.signLink = signLink;
+	}
+
+	@OriginalMember(owner = "client!sd", name = "e", descriptor = "(I)V")
+	public static void getMaxMemory() {
+		try {
+			@Pc(12) Method method = Runtime.class.getMethod("maxMemory");
+			if (method != null) {
+				try {
+					@Pc(17) Runtime runtime = Runtime.getRuntime();
+					@Pc(24) Long bytes = (Long) method.invoke(runtime, (Object[]) null);
+					maxMemory = (int) (bytes / 1048576L) + 1;
+				} catch (@Pc(34) Throwable ex) {
+				}
+			}
+		} catch (@Pc(36) Exception ex) {
+		}
+	}
+
+	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V")
+	public static void flush(@OriginalArg(0) SignLink signLink, @OriginalArg(1) Object source) {
+		if (signLink.eventQueue == null) {
+			return;
+		}
+		for (@Pc(19) int i = 0; i < 50 && signLink.eventQueue.peekEvent() != null; i++) {
+			Static231.sleep(1L);
+		}
+		if (source != null) {
+			signLink.eventQueue.postEvent(new ActionEvent(source, 1001, "dummy"));
+		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "focusLost", descriptor = "(Ljava/awt/event/FocusEvent;)V")
 	@Override
-	public final void focusLost(@OriginalArg(0) FocusEvent arg0) {
-		Static233.aBoolean253 = false;
+	public final void focusLost(@OriginalArg(0) FocusEvent event) {
+		focusIn = false;
 	}
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(B)V")
-	protected abstract void method921();
+	protected abstract void mainLoop();
 
 	@OriginalMember(owner = "client!rc", name = "windowClosing", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowClosing(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowClosing(@OriginalArg(0) WindowEvent event) {
 		this.destroy();
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowIconified", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowIconified(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowIconified(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowDeactivated", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowDeactivated(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowDeactivated(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "getAppletContext", descriptor = "()Ljava/applet/AppletContext;")
 	@Override
 	public final AppletContext getAppletContext() {
-		if (Static39.aFrame1 == null) {
-			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getAppletContext() : Static71.signLink.anApplet2.getAppletContext();
+		if (frame == null) {
+			return signLink == null || signLink.applet == this ? super.getAppletContext() : signLink.applet.getAppletContext();
 		} else {
 			return null;
 		}
@@ -65,96 +189,96 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "focusGained", descriptor = "(Ljava/awt/event/FocusEvent;)V")
 	@Override
-	public final void focusGained(@OriginalArg(0) FocusEvent arg0) {
-		Static233.aBoolean253 = true;
-		Static69.aBoolean115 = true;
+	public final void focusGained(@OriginalArg(0) FocusEvent event) {
+		focusIn = true;
+		fullRedraw = true;
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowClosed", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowClosed(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowClosed(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "(I)Z")
-	protected final boolean method925() {
+	protected final boolean isHostnameValid() {
 		return true;
 	}
 
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "(B)V")
-	public final synchronized void method926() {
-		if (Static154.canvas != null) {
-			Static154.canvas.removeFocusListener(this);
-			Static154.canvas.getParent().remove(Static154.canvas);
+	public final synchronized void addCanvas() {
+		if (canvas != null) {
+			canvas.removeFocusListener(this);
+			canvas.getParent().remove(canvas);
 		}
-		@Pc(19) Container local19;
-		if (Static69.aFrame2 != null) {
-			local19 = Static69.aFrame2;
-		} else if (Static39.aFrame1 == null) {
-			local19 = Static71.signLink.anApplet2;
+		@Pc(19) Container container;
+		if (fullScreenFrame != null) {
+			container = fullScreenFrame;
+		} else if (frame == null) {
+			container = signLink.applet;
 		} else {
-			local19 = Static39.aFrame1;
+			container = frame;
 		}
-		local19.setLayout(null);
-		Static154.canvas = new GameCanvas(this);
-		local19.add(Static154.canvas);
-		Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
-		Static154.canvas.setVisible(true);
-		if (local19 == Static39.aFrame1) {
-			@Pc(66) Insets local66 = Static39.aFrame1.getInsets();
-			Static154.canvas.setLocation(Static145.anInt3497 + local66.left, local66.top + Static178.anInt4246);
+		container.setLayout(null);
+		canvas = new GameCanvas(this);
+		container.add(canvas);
+		canvas.setSize(canvasWidth, canvasHeight);
+		canvas.setVisible(true);
+		if (container == frame) {
+			@Pc(66) Insets insets = frame.getInsets();
+			canvas.setLocation(leftMargin + insets.left, insets.top + topMargin);
 		} else {
-			Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
+			canvas.setLocation(leftMargin, topMargin);
 		}
-		Static154.canvas.addFocusListener(this);
-		Static154.canvas.requestFocus();
-		Static233.aBoolean253 = true;
-		Static69.aBoolean115 = true;
-		Static26.focus = true;
-		Static35.aBoolean66 = false;
-		Static243.aLong178 = MonotonicClock.currentTimeMillis();
+		canvas.addFocusListener(this);
+		canvas.requestFocus();
+		focusIn = true;
+		fullRedraw = true;
+		focus = true;
+		replaceCanvas = false;
+		lastCanvasReplace = MonotonicClock.currentTimeMillis();
 	}
 
 	@OriginalMember(owner = "client!rc", name = "destroy", descriptor = "()V")
 	@Override
 	public final void destroy() {
-		if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) {
-			Static72.aLong74 = MonotonicClock.currentTimeMillis();
+		if (instance == this && !shutdown) {
+			killTime = MonotonicClock.currentTimeMillis();
 			Static231.sleep(5000L);
-			Static69.aClass213_4 = null;
-			this.method931(false);
+			Static69.signLink = null;
+			this.shutdown(false);
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "update", descriptor = "(Ljava/awt/Graphics;)V")
 	@Override
-	public final void update(@OriginalArg(0) Graphics arg0) {
-		this.paint(arg0);
+	public final void update(@OriginalArg(0) Graphics graphics) {
+		this.paint(graphics);
 	}
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Ljava/lang/String;I)V")
-	protected final void method927(@OriginalArg(0) String arg0) {
-		if (this.aBoolean71) {
+	protected final void error(@OriginalArg(0) String error) {
+		if (this.error) {
 			return;
 		}
-		this.aBoolean71 = true;
-		System.out.println("error_game_" + arg0);
+		this.error = true;
+		System.out.println("error_game_" + error);
 		try {
-			this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + arg0 + ".ws"), "_top");
-		} catch (@Pc(47) Exception local47) {
+			this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + error + ".ws"), "_top");
+		} catch (@Pc(47) Exception ex) {
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "c", descriptor = "(B)V")
-	protected abstract void method928();
+	protected abstract void mainQuit();
 
 	@OriginalMember(owner = "client!rc", name = "c", descriptor = "(I)V")
-	protected abstract void method929();
+	protected abstract void reset();
 
 	@OriginalMember(owner = "client!rc", name = "getDocumentBase", descriptor = "()Ljava/net/URL;")
 	@Override
 	public final URL getDocumentBase() {
-		if (Static39.aFrame1 == null) {
-			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getDocumentBase() : Static71.signLink.anApplet2.getDocumentBase();
+		if (frame == null) {
+			return signLink == null || signLink.applet == this ? super.getDocumentBase() : signLink.applet.getDocumentBase();
 		} else {
 			return null;
 		}
@@ -162,114 +286,114 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "paint", descriptor = "(Ljava/awt/Graphics;)V")
 	@Override
-	public final synchronized void paint(@OriginalArg(0) Graphics arg0) {
-		if (Static230.anApplet_Sub1_1 != this || Static58.aBoolean101) {
+	public final synchronized void paint(@OriginalArg(0) Graphics graphics) {
+		if (instance != this || shutdown) {
 			return;
 		}
-		Static69.aBoolean115 = true;
-		if (Static236.aBoolean256 && !GlRenderer.enabled && MonotonicClock.currentTimeMillis() - Static243.aLong178 > 1000L) {
-			@Pc(29) Rectangle local29 = arg0.getClipBounds();
-			if (local29 == null || local29.width >= Static72.anInt2046 && Static122.anInt3045 <= local29.height) {
-				Static35.aBoolean66 = true;
+		fullRedraw = true;
+		if (isJava5OrLater && !GlRenderer.enabled && MonotonicClock.currentTimeMillis() - lastCanvasReplace > 1000L) {
+			@Pc(29) Rectangle clipBounds = graphics.getClipBounds();
+			if (clipBounds == null || clipBounds.width >= frameWidth && frameHeight <= clipBounds.height) {
+				replaceCanvas = true;
 			}
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowDeiconified", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowDeiconified(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowDeiconified(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(IZ)V")
-	private void method931(@OriginalArg(1) boolean arg0) {
+	private void shutdown(@OriginalArg(1) boolean clean) {
 		synchronized (this) {
-			if (Static58.aBoolean101) {
+			if (shutdown) {
 				return;
 			}
-			Static58.aBoolean101 = true;
+			shutdown = true;
 		}
-		if (Static71.signLink.anApplet2 != null) {
-			Static71.signLink.anApplet2.destroy();
+		if (signLink.applet != null) {
+			signLink.applet.destroy();
 		}
 		try {
-			this.method928();
-		} catch (@Pc(34) Exception local34) {
+			this.mainQuit();
+		} catch (@Pc(34) Exception ex) {
 		}
-		if (Static154.canvas != null) {
+		if (canvas != null) {
 			try {
-				Static154.canvas.removeFocusListener(this);
-				Static154.canvas.getParent().remove(Static154.canvas);
-			} catch (@Pc(45) Exception local45) {
+				canvas.removeFocusListener(this);
+				canvas.getParent().remove(canvas);
+			} catch (@Pc(45) Exception ex) {
 			}
 		}
-		if (Static71.signLink != null) {
+		if (signLink != null) {
 			try {
-				Static71.signLink.method5124();
-			} catch (@Pc(53) Exception local53) {
+				signLink.stop();
+			} catch (@Pc(53) Exception ex) {
 			}
 		}
-		this.method929();
-		if (Static39.aFrame1 != null) {
+		this.reset();
+		if (frame != null) {
 			try {
 				System.exit(0);
-			} catch (@Pc(77) Throwable local77) {
+			} catch (@Pc(77) Throwable ex) {
 			}
 		}
-		System.out.println("Shutdown complete - clean:" + arg0);
+		System.out.println("Shutdown complete - clean:" + clean);
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowActivated", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowActivated(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowActivated(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "(Z)V")
-	private void method932() {
-		@Pc(6) long local6 = MonotonicClock.currentTimeMillis();
-		@Pc(10) long local10 = Static228.aLongArray8[Static261.anInt5741];
-		Static228.aLongArray8[Static261.anInt5741] = local6;
-		Static261.anInt5741 = Static261.anInt5741 + 1 & 0x1F;
+	private void mainLoopWrapper() {
+		@Pc(6) long now = MonotonicClock.currentTimeMillis();
+		@Pc(10) long previous = logicTimes[logicTimePointer];
+		logicTimes[logicTimePointer] = now;
+		logicTimePointer = logicTimePointer + 1 & 0x1F;
 		synchronized (this) {
-			Static26.focus = Static233.aBoolean253;
+			focus = focusIn;
 		}
-		this.method921();
-		if (local10 != 0L && local6 <= local10) {
+		this.mainLoop();
+		if (previous != 0L && now <= previous) {
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "e", descriptor = "(I)V")
-	private void method933() {
-		@Pc(2) long local2 = MonotonicClock.currentTimeMillis();
-		@Pc(6) long local6 = Static7.aLongArray2[Static111.anInt2903];
-		Static7.aLongArray2[Static111.anInt2903] = local2;
-		Static111.anInt2903 = Static111.anInt2903 + 1 & 0x1F;
-		if (local6 != 0L && local2 > local6) {
-			@Pc(41) int local41 = (int) (local2 - local6);
-			Static243.anInt5359 = ((local41 >> 1) + 32000) / local41;
+	private void mainRedrawWrapper() {
+		@Pc(2) long now = MonotonicClock.currentTimeMillis();
+		@Pc(6) long previous = redrawTimes[redrawTimePointer];
+		redrawTimes[redrawTimePointer] = now;
+		redrawTimePointer = redrawTimePointer + 1 & 0x1F;
+		if (previous != 0L && now > previous) {
+			@Pc(41) int duration = (int) (now - previous);
+			framesPerSecond = ((duration >> 1) + 32000) / duration;
 		}
-		if (Static184.anInt4355++ > 50) {
-			Static69.aBoolean115 = true;
-			Static184.anInt4355 -= 50;
-			Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
-			Static154.canvas.setVisible(true);
-			if (Static39.aFrame1 != null && Static69.aFrame2 == null) {
-				@Pc(84) Insets local84 = Static39.aFrame1.getInsets();
-				Static154.canvas.setLocation(local84.left + Static145.anInt3497, Static178.anInt4246 + local84.top);
+		if (partialRedraws++ > 50) {
+			fullRedraw = true;
+			partialRedraws -= 50;
+			canvas.setSize(canvasWidth, canvasHeight);
+			canvas.setVisible(true);
+			if (frame != null && fullScreenFrame == null) {
+				@Pc(84) Insets insets = frame.getInsets();
+				canvas.setLocation(insets.left + leftMargin, topMargin + insets.top);
 			} else {
-				Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
+				canvas.setLocation(leftMargin, topMargin);
 			}
 		}
-		this.method934();
+		this.mainRedraw();
 	}
 
 	@OriginalMember(owner = "client!rc", name = "f", descriptor = "(I)V")
-	protected abstract void method934();
+	protected abstract void mainRedraw();
 
 	@OriginalMember(owner = "client!rc", name = "getCodeBase", descriptor = "()Ljava/net/URL;")
 	@Override
 	public final URL getCodeBase() {
-		if (Static39.aFrame1 == null) {
-			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getCodeBase() : Static71.signLink.anApplet2.getCodeBase();
+		if (frame == null) {
+			return signLink == null || signLink.applet == this ? super.getCodeBase() : signLink.applet.getCodeBase();
 		} else {
 			return null;
 		}
@@ -279,83 +403,83 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final void run() {
 		try {
-			if (SignLink.aString20 != null) {
-				@Pc(12) String local12 = SignLink.aString20.toLowerCase();
-				if (local12.indexOf("sun") != -1 || local12.indexOf("apple") != -1) {
-					@Pc(24) String local24 = SignLink.aString14;
-					if (local24.equals("1.1") || local24.startsWith("1.1.") || local24.equals("1.2") || local24.startsWith("1.2.")) {
-						this.method927("wrongjava");
+			if (SignLink.javaVendor != null) {
+				@Pc(12) String javaVendor = SignLink.javaVendor.toLowerCase();
+				if (javaVendor.contains("sun") || javaVendor.contains("apple")) {
+					@Pc(24) String javaVersion = SignLink.javaVersion;
+					if (javaVersion.equals("1.1") || javaVersion.startsWith("1.1.") || javaVersion.equals("1.2") || javaVersion.startsWith("1.2.")) {
+						this.error("wrongjava");
 						return;
 					}
-					Static226.anInt5081 = 5;
-				} else if (local12.indexOf("ibm") != -1 && (SignLink.aString14 == null || SignLink.aString14.equals("1.4.2"))) {
-					this.method927("wrongjava");
+					minimumDelay = 5;
+				} else if (javaVendor.contains("ibm") && (SignLink.javaVersion == null || SignLink.javaVersion.equals("1.4.2"))) {
+					this.error("wrongjava");
 					return;
 				}
 			}
-			@Pc(76) int local76;
-			if (SignLink.aString14 != null && SignLink.aString14.startsWith("1.")) {
-				local76 = 2;
-				@Pc(78) int local78 = 0;
-				while (local76 < SignLink.aString14.length()) {
-					@Pc(90) char local90 = SignLink.aString14.charAt(local76);
-					if (local90 < '0' || local90 > '9') {
+			@Pc(76) int i;
+			if (SignLink.javaVersion != null && SignLink.javaVersion.startsWith("1.")) {
+				i = 2;
+				@Pc(78) int minorVersion = 0;
+				while (i < SignLink.javaVersion.length()) {
+					@Pc(90) char c = SignLink.javaVersion.charAt(i);
+					if (c < '0' || c > '9') {
 						break;
 					}
-					local78 = local78 * 10 + local90 - 48;
-					local76++;
+					minorVersion = minorVersion * 10 + c - '0';
+					i++;
 				}
-				if (local78 >= 5) {
-					Static236.aBoolean256 = true;
+				if (minorVersion >= 5) {
+					isJava5OrLater = true;
 				}
 			}
-			if (Static71.signLink.anApplet2 != null) {
-				@Pc(125) Method local125 = SignLink.aMethod5;
-				if (local125 != null) {
+			if (signLink.applet != null) {
+				@Pc(125) Method setFocusCycleRoot = SignLink.setFocusCycleRoot;
+				if (setFocusCycleRoot != null) {
 					try {
-						local125.invoke(Static71.signLink.anApplet2, Boolean.TRUE);
-					} catch (@Pc(142) Throwable local142) {
+						setFocusCycleRoot.invoke(signLink.applet, Boolean.TRUE);
+					} catch (@Pc(142) Throwable ex) {
 					}
 				}
 			}
-			Static224.method3888();
-			this.method926();
-			Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.canvas);
-			this.method935();
-			Static200.aClass93_1 = Static70.method1547();
-			while (Static72.aLong74 == 0L || Static72.aLong74 > MonotonicClock.currentTimeMillis()) {
-				Static227.anInt5097 = Static200.aClass93_1.method3391(Static226.anInt5081, Static11.anInt386);
-				for (local76 = 0; local76 < Static227.anInt5097; local76++) {
-					this.method932();
+			getMaxMemory();
+			this.addCanvas();
+			Static260.frameBuffer = Static131.create(canvasHeight, canvasWidth, canvas);
+			this.mainInit();
+			timer = Static70.create();
+			while (killTime == 0L || killTime > MonotonicClock.currentTimeMillis()) {
+				logicCycles = timer.sleep(minimumDelay, timePerFrame);
+				for (i = 0; i < logicCycles; i++) {
+					this.mainLoopWrapper();
 				}
-				this.method933();
-				Static140.method2708(Static71.signLink, Static154.canvas);
+				this.mainRedrawWrapper();
+				flush(signLink, canvas);
 			}
-		} catch (@Pc(198) Exception local198) {
-			Static89.method1839(null, local198);
-			this.method927("crash");
+		} catch (@Pc(198) Exception ex) {
+			Static89.report(null, ex);
+			this.error("crash");
 		}
-		this.method931(true);
+		this.shutdown(true);
 	}
 
 	@OriginalMember(owner = "client!rc", name = "getParameter", descriptor = "(Ljava/lang/String;)Ljava/lang/String;")
 	@Override
-	public final String getParameter(@OriginalArg(0) String arg0) {
-		if (Static39.aFrame1 == null) {
-			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getParameter(arg0) : Static71.signLink.anApplet2.getParameter(arg0);
+	public final String getParameter(@OriginalArg(0) String name) {
+		if (frame == null) {
+			return signLink == null || signLink.applet == this ? super.getParameter(name) : signLink.applet.getParameter(name);
 		} else {
 			return null;
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "g", descriptor = "(I)V")
-	protected abstract void method935();
+	protected abstract void mainInit();
 
 	@OriginalMember(owner = "client!rc", name = "stop", descriptor = "()V")
 	@Override
 	public final void stop() {
-		if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) {
-			Static72.aLong74 = MonotonicClock.currentTimeMillis() + 4000L;
+		if (instance == this && !shutdown) {
+			killTime = MonotonicClock.currentTimeMillis() + 4000L;
 		}
 	}
 
@@ -363,85 +487,85 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	public abstract void init();
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(IIZILjava/lang/String;III)V")
-	protected final void method936(@OriginalArg(0) int arg0, @OriginalArg(4) String arg1) {
+	protected final void startApplication(@OriginalArg(0) int cacheId, @OriginalArg(4) String cacheSubDir) {
 		try {
-			Static254.anInt5554 = 768;
-			Static122.anInt3045 = 768;
-			Static145.anInt3497 = 0;
-			Static131.anInt3252 = 530;
-			Static48.anInt1448 = 1024;
-			Static72.anInt2046 = 1024;
-			Static178.anInt4246 = 0;
-			Static230.anApplet_Sub1_1 = this;
-			Static39.aFrame1 = new Frame();
-			Static39.aFrame1.setTitle("Jagex");
-			Static39.aFrame1.setResizable(true);
-			Static39.aFrame1.addWindowListener(this);
-			Static39.aFrame1.setVisible(true);
-			Static39.aFrame1.toFront();
-			@Pc(44) Insets local44 = Static39.aFrame1.getInsets();
-			Static39.aFrame1.setSize(local44.left + Static72.anInt2046 + local44.right, local44.top + Static122.anInt3045 + local44.bottom);
-			Static69.aClass213_4 = Static71.signLink = new SignLink(null, arg0, arg1, 28);
-			@Pc(76) PrivilegedRequest local76 = Static71.signLink.method5130(1, this);
-			while (local76.status == 0) {
+			canvasHeight = 768;
+			frameHeight = 768;
+			leftMargin = 0;
+			anInt3252 = 530;
+			canvasWidth = 1024;
+			frameWidth = 1024;
+			topMargin = 0;
+			instance = this;
+			frame = new Frame();
+			frame.setTitle("Jagex");
+			frame.setResizable(true);
+			frame.addWindowListener(this);
+			frame.setVisible(true);
+			frame.toFront();
+			@Pc(44) Insets insets = frame.getInsets();
+			frame.setSize(insets.left + frameWidth + insets.right, insets.top + frameHeight + insets.bottom);
+			Static69.signLink = signLink = new SignLink(null, cacheId, cacheSubDir, 28);
+			@Pc(76) PrivilegedRequest request = signLink.startThread(1, this);
+			while (request.status == 0) {
 				Static231.sleep(10L);
 			}
-			Static37.aThread1 = (Thread) local76.result;
-		} catch (@Pc(91) Exception local91) {
-			Static89.method1839(null, local91);
+			thread = (Thread) request.result;
+		} catch (@Pc(91) Exception ex) {
+			Static89.report(null, ex);
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "windowOpened", descriptor = "(Ljava/awt/event/WindowEvent;)V")
 	@Override
-	public final void windowOpened(@OriginalArg(0) WindowEvent arg0) {
+	public final void windowOpened(@OriginalArg(0) WindowEvent event) {
 	}
 
 	@OriginalMember(owner = "client!rc", name = "start", descriptor = "()V")
 	@Override
 	public final void start() {
-		if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) {
-			Static72.aLong74 = 0L;
+		if (instance == this && !shutdown) {
+			killTime = 0L;
 		}
 	}
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(BIIII)V")
-	protected final void method937(@OriginalArg(2) int arg0) {
+	protected final void startApplet(@OriginalArg(2) int cacheId) {
 		try {
-			if (Static230.anApplet_Sub1_1 != null) {
-				Static70.anInt2014++;
-				if (Static70.anInt2014 >= 3) {
-					this.method927("alreadyloaded");
+			if (instance != null) {
+				instances++;
+				if (instances >= 3) {
+					this.error("alreadyloaded");
 					return;
 				}
 				this.getAppletContext().showDocument(this.getDocumentBase(), "_self");
 				return;
 			}
-			Static230.anApplet_Sub1_1 = this;
-			Static178.anInt4246 = 0;
-			Static131.anInt3252 = 1530;
-			Static48.anInt1448 = 765;
-			Static72.anInt2046 = 765;
-			Static145.anInt3497 = 0;
-			Static254.anInt5554 = 503;
-			Static122.anInt3045 = 503;
-			@Pc(54) String local54 = this.getParameter("openwinjs");
-			if (local54 != null && local54.equals("1")) {
-				Static40.aBoolean78 = true;
+			instance = this;
+			topMargin = 0;
+			anInt3252 = 1530;
+			canvasWidth = 765;
+			frameWidth = 765;
+			leftMargin = 0;
+			canvasHeight = 503;
+			frameHeight = 503;
+			@Pc(54) String openWindowJavaScriptStr = this.getParameter("openwinjs");
+			if (openWindowJavaScriptStr != null && openWindowJavaScriptStr.equals("1")) {
+				openWindowJavaScript = true;
 			} else {
-				Static40.aBoolean78 = false;
+				openWindowJavaScript = false;
 			}
-			if (Static71.signLink == null) {
-				Static69.aClass213_4 = Static71.signLink = new SignLink(this, arg0, null, 0);
+			if (signLink == null) {
+				Static69.signLink = signLink = new SignLink(this, cacheId, null, 0);
 			}
-			@Pc(86) PrivilegedRequest local86 = Static71.signLink.method5130(1, this);
-			while (local86.status == 0) {
+			@Pc(86) PrivilegedRequest request = signLink.startThread(1, this);
+			while (request.status == 0) {
 				Static231.sleep(10L);
 			}
-			Static37.aThread1 = (Thread) local86.result;
-		} catch (@Pc(103) Exception local103) {
-			Static89.method1839(null, local103);
-			this.method927("crash");
+			thread = (Thread) request.result;
+		} catch (@Pc(103) Exception ex) {
+			Static89.report(null, ex);
+			this.error("crash");
 		}
 	}
 }
diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java
index 63c9042..4601bf0 100644
--- a/client/src/main/java/Js5CacheQueue.java
+++ b/client/src/main/java/Js5CacheQueue.java
@@ -20,7 +20,7 @@ public final class Js5CacheQueue implements Runnable {
 
 	@OriginalMember(owner = "client!k", name = "<init>", descriptor = "()V")
 	public Js5CacheQueue() {
-		@Pc(20) PrivilegedRequest local20 = Static71.signLink.method5130(5, this);
+		@Pc(20) PrivilegedRequest local20 = GameShell.signLink.startThread(5, this);
 		while (local20.status == 0) {
 			Static231.sleep(10L);
 		}
@@ -126,7 +126,7 @@ public final class Js5CacheQueue implements Runnable {
 					local19.aByteArray11 = local19.aClass49_3.method1701((int) local19.aLong185);
 				}
 			} catch (@Pc(83) Exception local83) {
-				Static89.method1839(null, local83);
+				Static89.report(null, local83);
 			}
 			local19.aBoolean226 = false;
 		}
diff --git a/client/src/main/java/MillisTimer.java b/client/src/main/java/MillisTimer.java
index a75960e..54ac585 100644
--- a/client/src/main/java/MillisTimer.java
+++ b/client/src/main/java/MillisTimer.java
@@ -41,7 +41,7 @@ public final class MillisTimer extends Timer {
 
 	@OriginalMember(owner = "client!lj", name = "a", descriptor = "(III)I")
 	@Override
-	public final int method3391(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+	public final int sleep(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(17) int local17 = this.anInt3552;
 		@Pc(20) int local20 = this.anInt3550;
 		this.anInt3550 = 300;
diff --git a/client/src/main/java/NanoTimer.java b/client/src/main/java/NanoTimer.java
index 21dd438..7b4802a 100644
--- a/client/src/main/java/NanoTimer.java
+++ b/client/src/main/java/NanoTimer.java
@@ -17,7 +17,7 @@ public final class NanoTimer extends Timer {
 
 	@OriginalMember(owner = "client!om", name = "a", descriptor = "(III)I")
 	@Override
-	public final int method3391(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+	public final int sleep(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(9) long local9 = (long) arg0 * 1000000L;
 		@Pc(14) long local14 = this.aLong142 - System.nanoTime();
 		if (local9 > local14) {
diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java
index 40c3f9f..766e908 100644
--- a/client/src/main/java/Player.java
+++ b/client/src/main/java/Player.java
@@ -175,7 +175,7 @@ public final class Player extends PathingEntity {
 		@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().anInt1037 && local25 != null ? null : Static36.method941(this.anInt3366);
 		@Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
 		@Pc(79) int local79 = Static198.method1029();
-		if (GlRenderer.enabled && Static238.anInt5316 < 96 && local79 > 50) {
+		if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
 			Static16.method501();
 		}
 		@Pc(102) int local102;
diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java
index 0f08046..8f7655d 100644
--- a/client/src/main/java/Static1.java
+++ b/client/src/main/java/Static1.java
@@ -557,7 +557,7 @@ public final class Static1 {
 			if (GlRenderer.enabled) {
 				Static129.anIntArray297 = null;
 			} else {
-				Static260.aClass27_2.method4189();
+				Static260.frameBuffer.method4189();
 			}
 		}
 		Static70.aClass3_Sub2_Sub1_2.method1415(arg0, arg3);
diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java
index faaa045..b818b5d 100644
--- a/client/src/main/java/Static10.java
+++ b/client/src/main/java/Static10.java
@@ -83,7 +83,7 @@ public final class Static10 {
 			for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) {
 				local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ",";
 			}
-			Static89.method1839(local61, local19);
+			Static89.report(local61, local19);
 			Static278.method4653();
 			return true;
 		}
diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java
index f47609f..d028a72 100644
--- a/client/src/main/java/Static107.java
+++ b/client/src/main/java/Static107.java
@@ -60,7 +60,7 @@ public final class Static107 {
 			if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
 				Static60.aClass19_1 = new AudioThread();
 				Static60.aClass19_1.aClass213_1 = arg1;
-				arg1.method5130(Static258.anInt5637, Static60.aClass19_1);
+				arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
 			}
 			if (Static60.aClass19_1 != null) {
 				if (Static60.aClass19_1.aClass62Array1[arg3] != null) {
@@ -80,7 +80,7 @@ public final class Static107 {
 				if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
 					Static60.aClass19_1 = new AudioThread();
 					Static60.aClass19_1.aClass213_1 = arg1;
-					arg1.method5130(Static258.anInt5637, Static60.aClass19_1);
+					arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
 				}
 				if (Static60.aClass19_1 != null) {
 					if (Static60.aClass19_1.aClass62Array1[arg3] != null) {
diff --git a/client/src/main/java/Static11.java b/client/src/main/java/Static11.java
index 821f53c..484c68d 100644
--- a/client/src/main/java/Static11.java
+++ b/client/src/main/java/Static11.java
@@ -13,9 +13,6 @@ public final class Static11 {
 	@OriginalMember(owner = "client!ba", name = "x", descriptor = "Z")
 	public static boolean aBoolean15 = true;
 
-	@OriginalMember(owner = "client!ba", name = "B", descriptor = "I")
-	public static int anInt386 = 20;
-
 	@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
 	public static void method443() {
 		Static262.aClass99_35.method3104();
diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java
index 6a61af6..6b01337 100644
--- a/client/src/main/java/Static111.java
+++ b/client/src/main/java/Static111.java
@@ -7,10 +7,7 @@ public final class Static111 {
 	@OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
 	public static int anInt2900;
 
-	@OriginalMember(owner = "client!ii", name = "i", descriptor = "I")
-	public static int anInt2903;
-
-	@OriginalMember(owner = "client!ii", name = "l", descriptor = "I")
+    @OriginalMember(owner = "client!ii", name = "l", descriptor = "I")
 	public static int anInt2905;
 
 	@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index e1c5e31..63d07f2 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -61,10 +61,10 @@ public final class Static114 {
 			GlRenderer.method4153();
 		} else {
 			try {
-				@Pc(159) Graphics local159 = Static154.canvas.getGraphics();
-				Static260.aClass27_2.method4186(local159);
+				@Pc(159) Graphics local159 = GameShell.canvas.getGraphics();
+				Static260.frameBuffer.method4186(local159);
 			} catch (@Pc(167) Exception local167) {
-				Static154.canvas.repaint();
+				GameShell.canvas.repaint();
 			}
 		}
 	}
diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java
index b204075..d974205 100644
--- a/client/src/main/java/Static115.java
+++ b/client/src/main/java/Static115.java
@@ -73,7 +73,7 @@ public final class Static115 {
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(II)V")
 	public static void method2312(@OriginalArg(0) int arg0) {
-		Static11.anInt386 = 1000 / arg0;
+		GameShell.timePerFrame = 1000 / arg0;
 	}
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V")
diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java
index 168f991..ca868ed 100644
--- a/client/src/main/java/Static122.java
+++ b/client/src/main/java/Static122.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static122 {
 
-	@OriginalMember(owner = "client!jh", name = "c", descriptor = "I")
-	public static int anInt3045;
-
-	@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
+    @OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
 	public static Class12 aClass12_1;
 
 	@OriginalMember(owner = "client!jh", name = "p", descriptor = "Lclient!ve;")
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index 26acba3..6b4eaf2 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -287,12 +287,12 @@ public final class Static127 {
 				Static107.js5NetQueue.method2319();
 			}
 			if (arg0.method3111(Static165.aClass100_775)) {
-				Static71.signLink.method5110();
+				GameShell.signLink.method5110();
 				Static124.socket.method2833();
 				Static107.js5NetQueue.method2323();
 			}
 			if (arg0.method3111(Static114.aClass100_1100)) {
-				Static35.aBoolean66 = true;
+				GameShell.replaceCanvas = true;
 			}
 			if (arg0.method3111(Static148.aClass100_677)) {
 				Static196.method3534(25);
@@ -326,7 +326,7 @@ public final class Static127 {
 			}
 			if (arg0.method3138(Static241.aClass100_1088)) {
 				Static76.method1645(arg0.method3136(15).method3132());
-				Static203.method3663(Static71.signLink);
+				Static203.method3663(GameShell.signLink);
 				Static18.sentToServer = false;
 			}
 			if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
diff --git a/client/src/main/java/Static13.java b/client/src/main/java/Static13.java
index 7632c76..a15e3c1 100644
--- a/client/src/main/java/Static13.java
+++ b/client/src/main/java/Static13.java
@@ -52,21 +52,21 @@ public final class Static13 {
 	@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
 	public static void method473(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
 		try {
-			@Pc(6) Graphics local6 = Static154.canvas.getGraphics();
+			@Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
 			if (Static222.aFont1 == null) {
 				Static222.aFont1 = new Font("Helvetica", 1, 13);
-				Static240.aFontMetrics1 = Static154.canvas.getFontMetrics(Static222.aFont1);
+				Static240.aFontMetrics1 = GameShell.canvas.getFontMetrics(Static222.aFont1);
 			}
 			if (arg1) {
 				local6.setColor(Color.black);
-				local6.fillRect(0, 0, Static48.anInt1448, Static254.anInt5554);
+				local6.fillRect(0, 0, GameShell.canvasWidth, GameShell.canvasHeight);
 			}
 			if (arg0 == null) {
 				arg0 = new Color(140, 17, 17);
 			}
 			try {
 				if (Static149.anImage3 == null) {
-					Static149.anImage3 = Static154.canvas.createImage(304, 34);
+					Static149.anImage3 = GameShell.canvas.createImage(304, 34);
 				}
 				@Pc(56) Graphics local56 = Static149.anImage3.getGraphics();
 				local56.setColor(arg0);
@@ -78,10 +78,10 @@ public final class Static13 {
 				local56.setFont(Static222.aFont1);
 				local56.setColor(Color.white);
 				arg2.method3112(22, (304 - arg2.method3155(Static240.aFontMetrics1)) / 2, local56);
-				local6.drawImage(Static149.anImage3, Static48.anInt1448 / 2 - 152, Static254.anInt5554 / 2 + -18, null);
+				local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
 			} catch (@Pc(134) Exception local134) {
-				@Pc(140) int local140 = Static48.anInt1448 / 2 - 152;
-				@Pc(146) int local146 = Static254.anInt5554 / 2 - 18;
+				@Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
+				@Pc(146) int local146 = GameShell.canvasHeight / 2 - 18;
 				local6.setColor(arg0);
 				local6.drawRect(local140, local146, 303, 33);
 				local6.fillRect(local140 + 2, local146 + 2, arg3 * 3, 30);
@@ -95,10 +95,10 @@ public final class Static13 {
 			if (Static278.mainLoadPrimaryText != null) {
 				local6.setFont(Static222.aFont1);
 				local6.setColor(Color.white);
-				Static278.mainLoadPrimaryText.method3112(Static254.anInt5554 / 2 - 26, Static48.anInt1448 / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6);
+				Static278.mainLoadPrimaryText.method3112(GameShell.canvasHeight / 2 - 26, GameShell.canvasWidth / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6);
 			}
 		} catch (@Pc(252) Exception local252) {
-			Static154.canvas.repaint();
+			GameShell.canvas.repaint();
 		}
 	}
 }
diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java
index 370c3c3..9e116b3 100644
--- a/client/src/main/java/Static131.java
+++ b/client/src/main/java/Static131.java
@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static131 {
 
-	@OriginalMember(owner = "client!kd", name = "pb", descriptor = "I")
-	public static int anInt3252;
-
-	@OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
+    @OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
 	public static int anInt3255;
 
 	@OriginalMember(owner = "client!kd", name = "Cb", descriptor = "I")
@@ -136,7 +133,7 @@ public final class Static131 {
 	}
 
 	@OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIZLjava/awt/Component;)Lclient!vk;")
-	public static FrameBuffer method2579(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
+	public static FrameBuffer create(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
 		try {
 			@Pc(12) Class local12 = Class.forName("BufferedImageFrameBuffer");
 			@Pc(16) FrameBuffer local16 = (FrameBuffer) local12.getDeclaredConstructor().newInstance();
diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java
index d735acc..9facf4f 100644
--- a/client/src/main/java/Static136.java
+++ b/client/src/main/java/Static136.java
@@ -125,7 +125,7 @@ public final class Static136 {
 		}
 		if (local21 >= 4) {
 			@Pc(386) int local386 = arg0.g1();
-			if (Static238.anInt5316 < 96) {
+			if (GameShell.maxMemory < 96) {
 				local386 = 0;
 			}
 			Static76.method1645(local386);
diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java
index 7b33a5e..4b35a5c 100644
--- a/client/src/main/java/Static137.java
+++ b/client/src/main/java/Static137.java
@@ -105,7 +105,7 @@ public final class Static137 {
 					if (GlRenderer.enabled) {
 						Static129.anIntArray297 = null;
 					} else {
-						Static260.aClass27_2.method4189();
+						Static260.frameBuffer.method4189();
 					}
 					return false;
 				}
@@ -113,7 +113,7 @@ public final class Static137 {
 					if (GlRenderer.enabled) {
 						Static129.anIntArray297 = null;
 					} else {
-						Static260.aClass27_2.method4189();
+						Static260.frameBuffer.method4189();
 					}
 					return false;
 				}
@@ -134,7 +134,7 @@ public final class Static137 {
 		if (GlRenderer.enabled) {
 			Static129.anIntArray297 = null;
 		} else {
-			Static260.aClass27_2.method4189();
+			Static260.frameBuffer.method4189();
 		}
 		Static56.aClass3_Sub2_Sub1_Sub1_1 = null;
 		return true;
diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java
index 6285124..cf7a370 100644
--- a/client/src/main/java/Static139.java
+++ b/client/src/main/java/Static139.java
@@ -34,42 +34,42 @@ public final class Static139 {
 
 	@OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")
 	public static void method2704() {
-		@Pc(7) int local7 = Static178.anInt4246;
-		@Pc(9) int local9 = Static145.anInt3497;
-		@Pc(16) int local16 = Static122.anInt3045 - Static254.anInt5554 - local7;
-		@Pc(23) int local23 = Static72.anInt2046 - local9 - Static48.anInt1448;
+		@Pc(7) int local7 = GameShell.topMargin;
+		@Pc(9) int local9 = GameShell.leftMargin;
+		@Pc(16) int local16 = GameShell.frameHeight - GameShell.canvasHeight - local7;
+		@Pc(23) int local23 = GameShell.frameWidth - local9 - GameShell.canvasWidth;
 		if (local9 <= 0 && local23 <= 0 && local7 <= 0 && local16 <= 0) {
 			return;
 		}
 		try {
 			@Pc(46) Container local46;
-			if (Static69.aFrame2 != null) {
-				local46 = Static69.aFrame2;
-			} else if (Static39.aFrame1 == null) {
-				local46 = Static71.signLink.anApplet2;
+			if (GameShell.fullScreenFrame != null) {
+				local46 = GameShell.fullScreenFrame;
+			} else if (GameShell.frame == null) {
+				local46 = GameShell.signLink.applet;
 			} else {
-				local46 = Static39.aFrame1;
+				local46 = GameShell.frame;
 			}
 			@Pc(59) int local59 = 0;
 			@Pc(61) int local61 = 0;
-			if (Static39.aFrame1 == local46) {
-				@Pc(68) Insets local68 = Static39.aFrame1.getInsets();
+			if (GameShell.frame == local46) {
+				@Pc(68) Insets local68 = GameShell.frame.getInsets();
 				local61 = local68.left;
 				local59 = local68.top;
 			}
 			@Pc(77) Graphics local77 = local46.getGraphics();
 			local77.setColor(Color.black);
 			if (local9 > 0) {
-				local77.fillRect(local61, local59, local9, Static122.anInt3045);
+				local77.fillRect(local61, local59, local9, GameShell.frameHeight);
 			}
 			if (local7 > 0) {
-				local77.fillRect(local61, local59, Static72.anInt2046, local7);
+				local77.fillRect(local61, local59, GameShell.frameWidth, local7);
 			}
 			if (local23 > 0) {
-				local77.fillRect(local61 + Static72.anInt2046 - local23, local59, local23, Static122.anInt3045);
+				local77.fillRect(local61 + GameShell.frameWidth - local23, local59, local23, GameShell.frameHeight);
 			}
 			if (local16 > 0) {
-				local77.fillRect(local61, local59 + Static122.anInt3045 - local16, Static72.anInt2046, local16);
+				local77.fillRect(local61, local59 + GameShell.frameHeight - local16, GameShell.frameWidth, local16);
 			}
 		} catch (@Pc(132) Exception local132) {
 		}
diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java
index a7cecfb..3833157 100644
--- a/client/src/main/java/Static140.java
+++ b/client/src/main/java/Static140.java
@@ -1,4 +1,3 @@
-import java.awt.event.ActionEvent;
 import java.io.IOException;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
@@ -82,19 +81,6 @@ public final class Static140 {
 		Static6.outboundBuffer.p8(arg0);
 	}
 
-	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V")
-	public static void method2708(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Object arg1) {
-		if (arg0.anEventQueue1 == null) {
-			return;
-		}
-		for (@Pc(19) int local19 = 0; local19 < 50 && arg0.anEventQueue1.peekEvent() != null; local19++) {
-			Static231.sleep(1L);
-		}
-		if (arg1 != null) {
-			arg0.anEventQueue1.postEvent(new ActionEvent(arg1, 1001, "dummy"));
-		}
-	}
-
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;")
 	public static LightType method2709(@OriginalArg(1) int arg0) {
 		@Pc(10) LightType local10 = (LightType) Static220.aClass99_28.method3106((long) arg0);
diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java
index 9571cba..2c46fd3 100644
--- a/client/src/main/java/Static144.java
+++ b/client/src/main/java/Static144.java
@@ -262,7 +262,7 @@ public final class Static144 {
 
 	@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
 	public static int method2736() {
-		if (Static69.aFrame2 != null) {
+		if (GameShell.fullScreenFrame != null) {
 			return 3;
 		} else if (GlRenderer.enabled && Static124.aBoolean156) {
 			return 2;
diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java
index 18ecf7e..9f29c6b 100644
--- a/client/src/main/java/Static145.java
+++ b/client/src/main/java/Static145.java
@@ -16,10 +16,7 @@ public final class Static145 {
 	@OriginalMember(owner = "client!lf", name = "d", descriptor = "[I")
 	public static final int[] anIntArray331 = new int[1000];
 
-	@OriginalMember(owner = "client!lf", name = "f", descriptor = "I")
-	public static int anInt3497 = 0;
-
-	@OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
+    @OriginalMember(owner = "client!lf", name = "k", descriptor = "I")
 	public static int anInt3502 = -1;
 
 	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java
index 986a179..45c33c7 100644
--- a/client/src/main/java/Static154.java
+++ b/client/src/main/java/Static154.java
@@ -1,14 +1,10 @@
-import java.awt.Canvas;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public final class Static154 {
 
-	@OriginalMember(owner = "client!md", name = "L", descriptor = "Ljava/awt/Canvas;")
-	public static Canvas canvas;
-
-	@OriginalMember(owner = "client!md", name = "S", descriptor = "I")
+    @OriginalMember(owner = "client!md", name = "S", descriptor = "I")
 	public static int anInt3709;
 
 	@OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java
index 06faca9..68a701d 100644
--- a/client/src/main/java/Static156.java
+++ b/client/src/main/java/Static156.java
@@ -117,7 +117,7 @@ public final class Static156 {
 
 	@OriginalMember(owner = "client!mf", name = "e", descriptor = "(I)V")
 	public static void init() {
-		if (SignLink.aString20.toLowerCase().indexOf("microsoft") != -1) {
+		if (SignLink.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
 			Static196.anIntArray407[187] = 27;
 			Static196.anIntArray407[223] = 28;
 			Static196.anIntArray407[221] = 43;
diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java
index 1618f7a..102573d 100644
--- a/client/src/main/java/Static158.java
+++ b/client/src/main/java/Static158.java
@@ -46,7 +46,7 @@ public final class Static158 {
 				}
 			}
 			if (Static179.anInt4261 == 1) {
-				Static72.aClass212_3 = Static71.signLink.openSocket(Static60.hostname, Static209.port);
+				Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port);
 				Static179.anInt4261 = 2;
 			}
 			@Pc(120) int local120;
@@ -57,7 +57,7 @@ public final class Static158 {
 				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink);
 				Static72.aClass212_3 = null;
 				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
 				if (Static11.aClass62_1 != null) {
diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java
index 7ed3865..8d52206 100644
--- a/client/src/main/java/Static169.java
+++ b/client/src/main/java/Static169.java
@@ -27,20 +27,20 @@ public final class Static169 {
 	public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) {
 		if (!arg1) {
 			try {
-				Static230.anApplet_Sub1_1.getAppletContext().showDocument(arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()), "_top");
+				GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_top");
 			} catch (@Pc(22) Exception local22) {
 			}
 			return;
 		}
-		if (GlRenderer.enabled && Static40.aBoolean78) {
+		if (GlRenderer.enabled && GameShell.openWindowJavaScript) {
 			try {
-				Static287.method1758(Static71.signLink.anApplet2, "openjs", new Object[] { arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()).toString() });
+				Static287.method1758(GameShell.signLink.applet, "openjs", new Object[] { arg0.method3127(GameShell.instance.getCodeBase()).toString() });
 				return;
 			} catch (@Pc(48) Throwable local48) {
 			}
 		}
 		try {
-			Static230.anApplet_Sub1_1.getAppletContext().showDocument(arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()), "_blank");
+			GameShell.instance.getAppletContext().showDocument(arg0.method3127(GameShell.instance.getCodeBase()), "_blank");
 		} catch (@Pc(59) Exception local59) {
 		}
 	}
diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java
index ec8b03f..a929dd9 100644
--- a/client/src/main/java/Static178.java
+++ b/client/src/main/java/Static178.java
@@ -10,10 +10,7 @@ public final class Static178 {
 	@OriginalMember(owner = "client!od", name = "c", descriptor = "Z")
 	public static boolean highDetailLighting = true;
 
-	@OriginalMember(owner = "client!od", name = "e", descriptor = "I")
-	public static int anInt4246 = 0;
-
-	@OriginalMember(owner = "client!od", name = "g", descriptor = "S")
+    @OriginalMember(owner = "client!od", name = "g", descriptor = "S")
 	public static short aShort25 = 256;
 
 	@OriginalMember(owner = "client!od", name = "i", descriptor = "I")
diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java
index afb47fa..0384cad 100644
--- a/client/src/main/java/Static181.java
+++ b/client/src/main/java/Static181.java
@@ -46,11 +46,11 @@ public final class Static181 {
 			Static129.method2492();
 		}
 		Static78.aClass3_Sub2_Sub1_3 = Static130.method2514(arg0, Static262.anInt5754);
-		@Pc(20) int local20 = Static254.anInt5554;
+		@Pc(20) int local20 = GameShell.canvasHeight;
 		@Pc(26) int local26 = local20 * 956 / 503;
-		Static78.aClass3_Sub2_Sub1_3.method1419((Static48.anInt1448 - local26) / 2, 0, local26, local20);
+		Static78.aClass3_Sub2_Sub1_3.method1419((GameShell.canvasWidth - local26) / 2, 0, local26, local20);
 		Static243.aClass36_1 = Static40.method1010(Static136.anInt3322, arg0);
-		Static243.aClass36_1.method3336(Static48.anInt1448 / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
+		Static243.aClass36_1.method3336(GameShell.canvasWidth / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
 		Static18.aBoolean40 = true;
 	}
 
diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java
index c75fee7..7fb5c5c 100644
--- a/client/src/main/java/Static182.java
+++ b/client/src/main/java/Static182.java
@@ -29,25 +29,25 @@ public final class Static182 {
 	public static void method3359(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) {
 		@Pc(9) int local9;
 		if (GlRenderer.enabled || arg0) {
-			local9 = Static254.anInt5554;
+			local9 = GameShell.canvasHeight;
 			@Pc(15) int local15 = local9 * 956 / 503;
-			Static78.aClass3_Sub2_Sub1_3.method1419((Static48.anInt1448 - local15) / 2, 0, local15, local9);
-			Static243.aClass36_1.method3336(Static48.anInt1448 / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
+			Static78.aClass3_Sub2_Sub1_3.method1419((GameShell.canvasWidth - local15) / 2, 0, local15, local9);
+			Static243.aClass36_1.method3336(GameShell.canvasWidth / 2 - Static243.aClass36_1.anInt4270 / 2, 18);
 		}
-		arg1.method2875(LocalizedText.GAME0_LOADING, Static48.anInt1448 / 2, Static254.anInt5554 / 2 - 26, 16777215, -1);
-		local9 = Static254.anInt5554 / 2 - 18;
+		arg1.method2875(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1);
+		local9 = GameShell.canvasHeight / 2 - 18;
 		if (GlRenderer.enabled) {
-			Static46.method1179(Static48.anInt1448 / 2 - 152, local9, 304, 34, 9179409);
-			Static46.method1179(Static48.anInt1448 / 2 - 151, local9 - -1, 302, 32, 0);
-			Static46.method1186(Static48.anInt1448 / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
-			Static46.method1186(Static48.anInt1448 / 2 + Static199.anInt4670 * 3 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
+			Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
+			Static46.method1179(GameShell.canvasWidth / 2 - 151, local9 - -1, 302, 32, 0);
+			Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
+			Static46.method1186(GameShell.canvasWidth / 2 + Static199.anInt4670 * 3 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
 		} else {
-			Static129.method2483(Static48.anInt1448 / 2 - 152, local9, 304, 34, 9179409);
-			Static129.method2483(Static48.anInt1448 / 2 - 151, local9 + 1, 302, 32, 0);
-			Static129.method2495(Static48.anInt1448 / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
-			Static129.method2495(Static199.anInt4670 * 3 + Static48.anInt1448 / 2 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
+			Static129.method2483(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
+			Static129.method2483(GameShell.canvasWidth / 2 - 151, local9 + 1, 302, 32, 0);
+			Static129.method2495(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
+			Static129.method2495(Static199.anInt4670 * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
 		}
-		arg1.method2875(Static126.aClass100_602, Static48.anInt1448 / 2, Static254.anInt5554 / 2 + 4, 16777215, -1);
+		arg1.method2875(Static126.aClass100_602, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
 	}
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
diff --git a/client/src/main/java/Static184.java b/client/src/main/java/Static184.java
index f5508c1..1258838 100644
--- a/client/src/main/java/Static184.java
+++ b/client/src/main/java/Static184.java
@@ -16,10 +16,7 @@ public final class Static184 {
 	@OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;")
 	public static final JagString aClass100_819 = Static28.parse("<col=00ff80>");
 
-	@OriginalMember(owner = "client!ol", name = "fb", descriptor = "I")
-	public static int anInt4355 = 500;
-
-	@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
+    @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
 	public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) {
 		return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);
 	}
diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java
index cf617ca..60f7ead 100644
--- a/client/src/main/java/Static186.java
+++ b/client/src/main/java/Static186.java
@@ -119,42 +119,42 @@ public final class Static186 {
 			Static41.anInt1309 = 70;
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 70) {
-			Static273.aClass41_7 = new WorldMapFont(11, true, Static154.canvas);
+			Static273.aClass41_7 = new WorldMapFont(11, true, GameShell.canvas);
 			Static41.anInt1309 = 73;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 73) {
-			Static152.aClass41_3 = new WorldMapFont(12, true, Static154.canvas);
+			Static152.aClass41_3 = new WorldMapFont(12, true, GameShell.canvas);
 			Static41.anInt1309 = 76;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 76) {
-			Static169.aClass41_5 = new WorldMapFont(14, true, Static154.canvas);
+			Static169.aClass41_5 = new WorldMapFont(14, true, GameShell.canvas);
 			Static41.anInt1309 = 79;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 79) {
-			Static130.aClass41_1 = new WorldMapFont(17, true, Static154.canvas);
+			Static130.aClass41_1 = new WorldMapFont(17, true, GameShell.canvas);
 			Static41.anInt1309 = 82;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 82) {
-			Static203.aClass41_8 = new WorldMapFont(19, true, Static154.canvas);
+			Static203.aClass41_8 = new WorldMapFont(19, true, GameShell.canvas);
 			Static41.anInt1309 = 85;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 85) {
-			Static130.aClass41_2 = new WorldMapFont(22, true, Static154.canvas);
+			Static130.aClass41_2 = new WorldMapFont(22, true, GameShell.canvas);
 			Static41.anInt1309 = 88;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 88) {
-			Static270.aClass41_9 = new WorldMapFont(26, true, Static154.canvas);
+			Static270.aClass41_9 = new WorldMapFont(26, true, GameShell.canvas);
 			Static41.anInt1309 = 91;
 			Static7.method842(true);
 			Static234.method4020();
 		} else {
-			Static160.aClass41_4 = new WorldMapFont(30, true, Static154.canvas);
+			Static160.aClass41_4 = new WorldMapFont(30, true, GameShell.canvas);
 			Static41.anInt1309 = 100;
 			Static7.method842(true);
 			Static234.method4020();
diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java
index 013ef2c..f9e5f8d 100644
--- a/client/src/main/java/Static197.java
+++ b/client/src/main/java/Static197.java
@@ -49,82 +49,82 @@ public final class Static197 {
 		if (arg2) {
 			GlRenderer.quit();
 		}
-		if (Static69.aFrame2 != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) {
-			Static25.method714(Static69.aFrame2, Static71.signLink);
-			Static69.aFrame2 = null;
+		if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) {
+			Static25.method714(GameShell.fullScreenFrame, GameShell.signLink);
+			GameShell.fullScreenFrame = null;
 		}
-		if (arg1 == 3 && Static69.aFrame2 == null) {
-			Static69.aFrame2 = Static169.method3176(0, arg5, arg4, Static71.signLink);
-			if (Static69.aFrame2 != null) {
+		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
+			GameShell.fullScreenFrame = Static169.method3176(0, arg5, arg4, GameShell.signLink);
+			if (GameShell.fullScreenFrame != null) {
 				Static22.anInt729 = arg5;
 				Static114.anInt5831 = arg4;
-				Static203.method3663(Static71.signLink);
+				Static203.method3663(GameShell.signLink);
 			}
 		}
-		if (arg1 == 3 && Static69.aFrame2 == null) {
+		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
 			method3560(true, Static214.anInt5581, true, arg3, -1, -1);
 			return;
 		}
 		@Pc(85) Container local85;
-		if (Static69.aFrame2 != null) {
-			local85 = Static69.aFrame2;
-		} else if (Static39.aFrame1 == null) {
-			local85 = Static71.signLink.anApplet2;
+		if (GameShell.fullScreenFrame != null) {
+			local85 = GameShell.fullScreenFrame;
+		} else if (GameShell.frame == null) {
+			local85 = GameShell.signLink.applet;
 		} else {
-			local85 = Static39.aFrame1;
+			local85 = GameShell.frame;
 		}
-		Static72.anInt2046 = local85.getSize().width;
-		Static122.anInt3045 = local85.getSize().height;
+		GameShell.frameWidth = local85.getSize().width;
+		GameShell.frameHeight = local85.getSize().height;
 		@Pc(109) Insets local109;
-		if (Static39.aFrame1 == local85) {
-			local109 = Static39.aFrame1.getInsets();
-			Static72.anInt2046 -= local109.right + local109.left;
-			Static122.anInt3045 -= local109.bottom + local109.top;
+		if (GameShell.frame == local85) {
+			local109 = GameShell.frame.getInsets();
+			GameShell.frameWidth -= local109.right + local109.left;
+			GameShell.frameHeight -= local109.bottom + local109.top;
 		}
 		if (arg1 >= 2) {
-			Static48.anInt1448 = Static72.anInt2046;
-			Static254.anInt5554 = Static122.anInt3045;
-			Static145.anInt3497 = 0;
-			Static178.anInt4246 = 0;
+			GameShell.canvasWidth = GameShell.frameWidth;
+			GameShell.canvasHeight = GameShell.frameHeight;
+			GameShell.leftMargin = 0;
+			GameShell.topMargin = 0;
 		} else {
-			Static178.anInt4246 = 0;
-			Static145.anInt3497 = (Static72.anInt2046 - 765) / 2;
-			Static48.anInt1448 = 765;
-			Static254.anInt5554 = 503;
+			GameShell.topMargin = 0;
+			GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
+			GameShell.canvasWidth = 765;
+			GameShell.canvasHeight = 503;
 		}
 		if (arg0) {
-			Static31.method847(Static154.canvas);
-			Static223.method3866(Static154.canvas);
+			Static31.method847(GameShell.canvas);
+			Static223.method3866(GameShell.canvas);
 			if (Static71.mouseWheel != null) {
-				Static71.mouseWheel.method3291(Static154.canvas);
+				Static71.mouseWheel.method3291(GameShell.canvas);
 			}
-			Static215.aClient1.method926();
-			Static19.start(Static154.canvas);
-			Static88.start(Static154.canvas);
+			Static215.aClient1.addCanvas();
+			Static19.start(GameShell.canvas);
+			Static88.start(GameShell.canvas);
 			if (Static71.mouseWheel != null) {
-				Static71.mouseWheel.start(Static154.canvas);
+				Static71.mouseWheel.start(GameShell.canvas);
 			}
 		} else {
 			if (GlRenderer.enabled) {
-				GlRenderer.setCanvasSize(Static48.anInt1448, Static254.anInt5554);
+				GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
 			}
-			Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
-			if (Static39.aFrame1 == local85) {
-				local109 = Static39.aFrame1.getInsets();
-				Static154.canvas.setLocation(local109.left + Static145.anInt3497, local109.top + Static178.anInt4246);
+			GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
+			if (GameShell.frame == local85) {
+				local109 = GameShell.frame.getInsets();
+				GameShell.canvas.setLocation(local109.left + GameShell.leftMargin, local109.top + GameShell.topMargin);
 			} else {
-				Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
+				GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
 			}
 		}
 		if (arg1 == 0 && arg3 > 0) {
-			GlRenderer.createAndDestroyContext(Static154.canvas);
+			GlRenderer.createAndDestroyContext(GameShell.canvas);
 		}
 		if (arg2 && arg1 > 0) {
-			Static154.canvas.setIgnoreRepaint(true);
+			GameShell.canvas.setIgnoreRepaint(true);
 			if (!Static211.aBoolean73) {
 				Static65.method1500();
-				Static260.aClass27_2 = null;
-				Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.canvas);
+				Static260.frameBuffer = null;
+				Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
 				Static129.method2492();
 				if (Static244.anInt5370 == 5) {
 					Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43);
@@ -132,17 +132,17 @@ public final class Static197 {
 					Static114.method4636(false, LocalizedText.LOADING);
 				}
 				try {
-					@Pc(269) Graphics local269 = Static154.canvas.getGraphics();
-					Static260.aClass27_2.method4186(local269);
+					@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
+					Static260.frameBuffer.method4186(local269);
 				} catch (@Pc(277) Exception local277) {
 				}
 				Static139.method2704();
 				if (arg3 == 0) {
-					Static260.aClass27_2 = Static131.method2579(503, 765, Static154.canvas);
+					Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas);
 				} else {
-					Static260.aClass27_2 = null;
+					Static260.frameBuffer = null;
 				}
-				@Pc(300) PrivilegedRequest local300 = Static71.signLink.method5123(Static215.aClient1.getClass());
+				@Pc(300) PrivilegedRequest local300 = GameShell.signLink.method5123(Static215.aClient1.getClass());
 				while (local300.status == 0) {
 					Static231.sleep(100L);
 				}
@@ -151,7 +151,7 @@ public final class Static197 {
 				}
 			}
 			if (Static211.aBoolean73) {
-				GlRenderer.init(Static154.canvas, Static186.anInt4392 * 2);
+				GlRenderer.init(GameShell.canvas, Static186.anInt4392 * 2);
 			}
 		}
 		if (!GlRenderer.enabled && arg1 > 0) {
@@ -159,8 +159,8 @@ public final class Static197 {
 			return;
 		}
 		if (arg1 > 0 && arg3 == 0) {
-			Static37.aThread1.setPriority(5);
-			Static260.aClass27_2 = null;
+			GameShell.thread.setPriority(5);
+			Static260.frameBuffer = null;
 			Static268.method4580();
 			((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(200);
 			if (Static178.highDetailLighting) {
@@ -168,8 +168,8 @@ public final class Static197 {
 			}
 			Static114.method4637();
 		} else if (arg1 == 0 && arg3 > 0) {
-			Static37.aThread1.setPriority(1);
-			Static260.aClass27_2 = Static131.method2579(503, 765, Static154.canvas);
+			GameShell.thread.setPriority(1);
+			Static260.frameBuffer = Static131.create(503, 765, GameShell.canvas);
 			Static268.method4583();
 			Static76.method1643();
 			((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(20);
@@ -208,6 +208,6 @@ public final class Static197 {
 		for (@Pc(466) int local466 = 0; local466 < 100; local466++) {
 			Static186.aBooleanArray100[local466] = true;
 		}
-		Static69.aBoolean115 = true;
+		GameShell.fullRedraw = true;
 	}
 }
diff --git a/client/src/main/java/Static200.java b/client/src/main/java/Static200.java
index bb0b554..4ab91a5 100644
--- a/client/src/main/java/Static200.java
+++ b/client/src/main/java/Static200.java
@@ -6,10 +6,7 @@ public final class Static200 {
 	@OriginalMember(owner = "client!qe", name = "r", descriptor = "[S")
 	public static short[] aShortArray65;
 
-	@OriginalMember(owner = "client!qe", name = "v", descriptor = "Lclient!s;")
-	public static Timer aClass93_1;
-
-	@OriginalMember(owner = "client!qe", name = "t", descriptor = "[I")
+    @OriginalMember(owner = "client!qe", name = "t", descriptor = "[I")
 	public static final int[] anIntArray421 = new int[50];
 
 	@OriginalMember(owner = "client!qe", name = "b", descriptor = "(II)V")
diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java
index 020116b..973c1db 100644
--- a/client/src/main/java/Static203.java
+++ b/client/src/main/java/Static203.java
@@ -27,41 +27,41 @@ public final class Static203 {
 	@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
 	public static void method3662() {
 		@Pc(8) Container local8;
-		if (Static69.aFrame2 != null) {
-			local8 = Static69.aFrame2;
-		} else if (Static39.aFrame1 == null) {
-			local8 = Static71.signLink.anApplet2;
+		if (GameShell.fullScreenFrame != null) {
+			local8 = GameShell.fullScreenFrame;
+		} else if (GameShell.frame == null) {
+			local8 = GameShell.signLink.applet;
 		} else {
-			local8 = Static39.aFrame1;
+			local8 = GameShell.frame;
 		}
-		Static72.anInt2046 = local8.getSize().width;
-		Static122.anInt3045 = local8.getSize().height;
+		GameShell.frameWidth = local8.getSize().width;
+		GameShell.frameHeight = local8.getSize().height;
 		@Pc(35) Insets local35;
-		if (local8 == Static39.aFrame1) {
-			local35 = Static39.aFrame1.getInsets();
-			Static122.anInt3045 -= local35.bottom + local35.top;
-			Static72.anInt2046 -= local35.right + local35.left;
+		if (local8 == GameShell.frame) {
+			local35 = GameShell.frame.getInsets();
+			GameShell.frameHeight -= local35.bottom + local35.top;
+			GameShell.frameWidth -= local35.right + local35.left;
 		}
 		if (Static144.method2736() >= 2) {
-			Static48.anInt1448 = Static72.anInt2046;
-			Static145.anInt3497 = 0;
-			Static178.anInt4246 = 0;
-			Static254.anInt5554 = Static122.anInt3045;
+			GameShell.canvasWidth = GameShell.frameWidth;
+			GameShell.leftMargin = 0;
+			GameShell.topMargin = 0;
+			GameShell.canvasHeight = GameShell.frameHeight;
 		} else {
-			Static178.anInt4246 = 0;
-			Static145.anInt3497 = (Static72.anInt2046 - 765) / 2;
-			Static254.anInt5554 = 503;
-			Static48.anInt1448 = 765;
+			GameShell.topMargin = 0;
+			GameShell.leftMargin = (GameShell.frameWidth - 765) / 2;
+			GameShell.canvasHeight = 503;
+			GameShell.canvasWidth = 765;
 		}
 		if (GlRenderer.enabled) {
-			GlRenderer.setCanvasSize(Static48.anInt1448, Static254.anInt5554);
+			GlRenderer.setCanvasSize(GameShell.canvasWidth, GameShell.canvasHeight);
 		}
-		Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
-		if (local8 == Static39.aFrame1) {
-			local35 = Static39.aFrame1.getInsets();
-			Static154.canvas.setLocation(local35.left + Static145.anInt3497, Static178.anInt4246 + local35.top);
+		GameShell.canvas.setSize(GameShell.canvasWidth, GameShell.canvasHeight);
+		if (local8 == GameShell.frame) {
+			local35 = GameShell.frame.getInsets();
+			GameShell.canvas.setLocation(local35.left + GameShell.leftMargin, GameShell.topMargin + local35.top);
 		} else {
-			Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
+			GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
 		}
 		if (Static154.topLevelInterace != -1) {
 			Static210.method3712(true);
diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java
index c34f03c..821d824 100644
--- a/client/src/main/java/Static207.java
+++ b/client/src/main/java/Static207.java
@@ -93,7 +93,7 @@ public final class Static207 {
 					return 0;
 				}
 				System.out.println(Static208.worldListPort);
-				Static72.aClass212_3 = Static71.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
+				Static72.aClass212_3 = GameShell.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
 				Static15.aLong18 = MonotonicClock.currentTimeMillis();
 				Static82.anInt2231 = 1;
 			}
@@ -109,7 +109,7 @@ public final class Static207 {
 				if (Static72.aClass212_3.status != 1) {
 					return -1;
 				}
-				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink);
 				Static6.outboundBuffer.offset = 0;
 				Static72.aClass212_3 = null;
 				local82 = 0;
diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java
index add9b3d..0d0bd98 100644
--- a/client/src/main/java/Static210.java
+++ b/client/src/main/java/Static210.java
@@ -21,7 +21,7 @@ public final class Static210 {
 
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
 	public static void method3712(@OriginalArg(0) boolean arg0) {
-		Static234.method4017(Static254.anInt5554, arg0, Static154.topLevelInterace, Static48.anInt1448);
+		Static234.method4017(GameShell.canvasHeight, arg0, Static154.topLevelInterace, GameShell.canvasWidth);
 	}
 
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;")
diff --git a/client/src/main/java/Static211.java b/client/src/main/java/Static211.java
index b9787f0..1cac27b 100644
--- a/client/src/main/java/Static211.java
+++ b/client/src/main/java/Static211.java
@@ -45,9 +45,9 @@ public final class Static211 {
 			Static147.aClass62_2.method3575();
 		}
 		Static41.method1045(Static99.aBoolean143);
-		Static11.aClass62_1 = Static107.method2262(22050, Static71.signLink, Static154.canvas, 0);
+		Static11.aClass62_1 = Static107.method2262(22050, GameShell.signLink, GameShell.canvas, 0);
 		Static11.aClass62_1.method3566(Static148.aClass3_Sub3_Sub4_1);
-		Static147.aClass62_2 = Static107.method2262(2048, Static71.signLink, Static154.canvas, 1);
+		Static147.aClass62_2 = Static107.method2262(2048, GameShell.signLink, GameShell.canvas, 1);
 		Static147.aClass62_2.method3566(Static204.aClass3_Sub3_Sub2_1);
 	}
 }
diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java
index cb50e32..5398f2a 100644
--- a/client/src/main/java/Static216.java
+++ b/client/src/main/java/Static216.java
@@ -41,7 +41,7 @@ public final class Static216 {
 				Static276.anInt5816++;
 			}
 			if (Static184.anInt4348 == 1) {
-				Static72.aClass212_3 = Static71.signLink.openSocket(Static60.hostname, Static209.port);
+				Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port);
 				Static184.anInt4348 = 2;
 			}
 			if (Static184.anInt4348 == 2) {
@@ -51,7 +51,7 @@ public final class Static216 {
 				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink);
 				Static72.aClass212_3 = null;
 				@Pc(106) long local106 = Static101.aLong98 = Static186.username.encode37();
 				Static6.outboundBuffer.offset = 0;
@@ -124,8 +124,8 @@ public final class Static216 {
 				Static17.aClass3_Sub15_Sub1_2.p1(Static249.aBoolean282 ? 1 : 0);
 				Static17.aClass3_Sub15_Sub1_2.p1(1);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static144.method2736());
-				Static17.aClass3_Sub15_Sub1_2.p2(Static48.anInt1448);
-				Static17.aClass3_Sub15_Sub1_2.p2(Static254.anInt5554);
+				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasWidth);
+				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasHeight);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static186.anInt4392);
 				Static140.method2705(Static17.aClass3_Sub15_Sub1_2);
 				Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991);
@@ -257,12 +257,12 @@ public final class Static216 {
 				if (!Static249.aBoolean282) {
 					if (Static124.aBoolean157 && !Static25.aBoolean57 || Static202.aBoolean233) {
 						try {
-							Static167.aClass100_781.method3157(Static71.signLink.anApplet2);
+							Static167.aClass100_781.method3157(GameShell.signLink.applet);
 						} catch (@Pc(910) Throwable local910) {
 						}
 					} else {
 						try {
-							Static56.aClass100_380.method3157(Static71.signLink.anApplet2);
+							Static56.aClass100_380.method3157(GameShell.signLink.applet);
 						} catch (@Pc(920) Throwable local920) {
 						}
 					}
diff --git a/client/src/main/java/Static224.java b/client/src/main/java/Static224.java
index f74034f..2834306 100644
--- a/client/src/main/java/Static224.java
+++ b/client/src/main/java/Static224.java
@@ -1,4 +1,3 @@
-import java.lang.reflect.Method;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -50,19 +49,4 @@ public final class Static224 {
 		Static83.aClass99_3.method3103();
 	}
 
-	@OriginalMember(owner = "client!sd", name = "e", descriptor = "(I)V")
-	public static void method3888() {
-		try {
-			@Pc(12) Method local12 = Runtime.class.getMethod("maxMemory");
-			if (local12 != null) {
-				try {
-					@Pc(17) Runtime local17 = Runtime.getRuntime();
-					@Pc(24) Long local24 = (Long) local12.invoke(local17, (Object[]) null);
-					Static238.anInt5316 = (int) (local24 / 1048576L) + 1;
-				} catch (@Pc(34) Throwable local34) {
-				}
-			}
-		} catch (@Pc(36) Exception local36) {
-		}
-	}
 }
diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java
index 7069628..bd7adab 100644
--- a/client/src/main/java/Static226.java
+++ b/client/src/main/java/Static226.java
@@ -16,9 +16,6 @@ public final class Static226 {
 	@OriginalMember(owner = "client!sf", name = "a", descriptor = "I")
 	public static int anInt5079 = 0;
 
-	@OriginalMember(owner = "client!sf", name = "d", descriptor = "I")
-	public static int anInt5081 = 1;
-
 	@OriginalMember(owner = "client!sf", name = "g", descriptor = "Lclient!na;")
 	public static final JagString aClass100_965 = Static28.parse("<col=ffff00>");
 
@@ -76,11 +73,11 @@ public final class Static226 {
 		@Pc(43) int local43 = Static60.anInt1892;
 		local16 += 8;
 		local27 = Static155.anInt3751 - local16 / 2;
-		if (local43 + local18 > Static254.anInt5554) {
-			local43 = Static254.anInt5554 - local18;
+		if (local43 + local18 > GameShell.canvasHeight) {
+			local43 = GameShell.canvasHeight - local18;
 		}
-		if (Static48.anInt1448 < local27 + local16) {
-			local27 = Static48.anInt1448 - local16;
+		if (GameShell.canvasWidth < local27 + local16) {
+			local27 = GameShell.canvasWidth - local16;
 		}
 		if (local27 < 0) {
 			local27 = 0;
diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java
index d5f600b..839bb75 100644
--- a/client/src/main/java/Static227.java
+++ b/client/src/main/java/Static227.java
@@ -14,10 +14,7 @@ public final class Static227 {
 	@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
 	public static int anInt5096;
 
-	@OriginalMember(owner = "client!sg", name = "p", descriptor = "I")
-	public static int anInt5097;
-
-	@OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
+    @OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
 	public static final int[] anIntArray446 = new int[25];
 
 	@OriginalMember(owner = "client!sg", name = "c", descriptor = "I")
diff --git a/client/src/main/java/Static228.java b/client/src/main/java/Static228.java
index 62d0ee4..2771ae8 100644
--- a/client/src/main/java/Static228.java
+++ b/client/src/main/java/Static228.java
@@ -28,9 +28,6 @@ public final class Static228 {
 	@OriginalMember(owner = "client!sh", name = "k", descriptor = "Z")
 	public static final boolean aBoolean248 = false;
 
-	@OriginalMember(owner = "client!sh", name = "l", descriptor = "[J")
-	public static final long[] aLongArray8 = new long[32];
-
 	@OriginalMember(owner = "client!sh", name = "a", descriptor = "(II)[B")
 	public static synchronized byte[] allocate(@OriginalArg(1) int arg0) {
 		@Pc(22) byte[] local22;
diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java
index adb2d41..96be689 100644
--- a/client/src/main/java/Static230.java
+++ b/client/src/main/java/Static230.java
@@ -26,9 +26,6 @@ public final class Static230 {
 	@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
 	public static final JagString aClass100_978 = Static28.parse("<)4col>");
 
-	@OriginalMember(owner = "client!sj", name = "F", descriptor = "Lclient!rc;")
-	public static GameShell anApplet_Sub1_1 = null;
-
 	@OriginalMember(owner = "client!sj", name = "H", descriptor = "I")
 	public static int anInt5161 = 0;
 
@@ -153,19 +150,19 @@ public final class Static230 {
 	@OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V")
 	public static void method3954(@OriginalArg(1) JagString arg0) {
 		Static47.aClass100_991 = arg0;
-		if (Static71.signLink.anApplet2 == null) {
+		if (GameShell.signLink.applet == null) {
 			return;
 		}
 		try {
-			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(Static71.signLink.anApplet2);
-			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(Static71.signLink.anApplet2);
+			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(GameShell.signLink.applet);
+			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(GameShell.signLink.applet);
 			@Pc(48) JagString local48 = Static34.method882(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 });
 			if (arg0.length() == 0) {
 				local48 = Static34.method882(new JagString[] { local48, Static245.aClass100_1018 });
 			} else {
 				local48 = Static34.method882(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
 			}
-			Static34.method882(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(Static71.signLink.anApplet2);
+			Static34.method882(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(GameShell.signLink.applet);
 		} catch (@Pc(124) Throwable local124) {
 		}
 	}
diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java
index 5449280..fefdcfd 100644
--- a/client/src/main/java/Static233.java
+++ b/client/src/main/java/Static233.java
@@ -25,10 +25,7 @@ public final class Static233 {
 	@OriginalMember(owner = "client!t", name = "G", descriptor = "[Lclient!ek;")
 	public static SoftwareIndexedSprite[] aClass36_Sub1Array1;
 
-	@OriginalMember(owner = "client!t", name = "m", descriptor = "Z")
-	public static volatile boolean aBoolean253 = true;
-
-	@OriginalMember(owner = "client!t", name = "p", descriptor = "Lclient!n;")
+    @OriginalMember(owner = "client!t", name = "p", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable aClass99_31 = new SoftLruHashTable(64);
 
 	@OriginalMember(owner = "client!t", name = "v", descriptor = "[Lclient!na;")
diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java
index 8a555ee..8edaeb3 100644
--- a/client/src/main/java/Static234.java
+++ b/client/src/main/java/Static234.java
@@ -164,14 +164,14 @@ public final class Static234 {
 
 	@OriginalMember(owner = "client!ta", name = "a", descriptor = "(Z)V")
 	public static void method4020() {
-		Static200.aClass93_1.method3394();
+		GameShell.timer.method3394();
 		@Pc(10) int local10;
 		for (local10 = 0; local10 < 32; local10++) {
-			Static7.aLongArray2[local10] = 0L;
+			GameShell.redrawTimes[local10] = 0L;
 		}
 		for (local10 = 0; local10 < 32; local10++) {
-			Static228.aLongArray8[local10] = 0L;
+			GameShell.logicTimes[local10] = 0L;
 		}
-		Static227.anInt5097 = 0;
+		GameShell.logicCycles = 0;
 	}
 }
diff --git a/client/src/main/java/Static236.java b/client/src/main/java/Static236.java
index cef41b6..fa2a1c4 100644
--- a/client/src/main/java/Static236.java
+++ b/client/src/main/java/Static236.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static236 {
 
-	@OriginalMember(owner = "client!tc", name = "f", descriptor = "Z")
-	public static boolean aBoolean256 = false;
-
 	@OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I")
 	public static int method4047() {
 		if (Static127.aBoolean160) {
diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java
index 3174e78..82e81ca 100644
--- a/client/src/main/java/Static238.java
+++ b/client/src/main/java/Static238.java
@@ -13,9 +13,6 @@ public final class Static238 {
 	@OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
 	public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 };
 
-	@OriginalMember(owner = "client!te", name = "C", descriptor = "I")
-	public static int anInt5316 = 64;
-
 	@OriginalMember(owner = "client!te", name = "a", descriptor = "(IZ)V")
 	public static void method4142() {
 		Static67.aClass99_20.method3102(5);
diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java
index fce278d..98af418 100644
--- a/client/src/main/java/Static243.java
+++ b/client/src/main/java/Static243.java
@@ -16,12 +16,6 @@ public final class Static243 {
 	@OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;")
 	public static Scenery[] aClass31Array3;
 
-	@OriginalMember(owner = "client!tk", name = "c", descriptor = "J")
-	public static volatile long aLong178 = 0L;
-
-	@OriginalMember(owner = "client!tk", name = "v", descriptor = "I")
-	public static int anInt5359 = 0;
-
 	@OriginalMember(owner = "client!tk", name = "K", descriptor = "[I")
 	public static int[] anIntArray476 = new int[2];
 
@@ -42,7 +36,7 @@ public final class Static243 {
 		Static67.prevFocus = true;
 		Static183.prevClickTime = 0L;
 		Static178.instance.samples = 0;
-		Static26.focus = true;
+		GameShell.focus = true;
 		Static114.method4625();
 		Static49.anInt1462 = -1;
 		Static5.anInt45 = -1;
diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java
index 24a4a5b..18a8f9d 100644
--- a/client/src/main/java/Static254.java
+++ b/client/src/main/java/Static254.java
@@ -7,10 +7,7 @@ public final class Static254 {
 	@OriginalMember(owner = "client!uj", name = "x", descriptor = "[I")
 	public static int[] anIntArray488;
 
-	@OriginalMember(owner = "client!uj", name = "B", descriptor = "I")
-	public static int anInt5554;
-
-	@OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
+    @OriginalMember(owner = "client!uj", name = "E", descriptor = "I")
 	public static int anInt5556;
 
 	@OriginalMember(owner = "client!uj", name = "H", descriptor = "I")
diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java
index 88bd6bf..51b516a 100644
--- a/client/src/main/java/Static26.java
+++ b/client/src/main/java/Static26.java
@@ -10,10 +10,7 @@ public final class Static26 {
 	@OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_16;
 
-	@OriginalMember(owner = "client!ca", name = "ab", descriptor = "Z")
-	public static boolean focus;
-
-	@OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;")
+    @OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;")
 	public static LinkedList aClass69_27 = new LinkedList();
 
 	@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java
index edf5828..01297d0 100644
--- a/client/src/main/java/Static260.java
+++ b/client/src/main/java/Static260.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static260 {
 
 	@OriginalMember(owner = "client!vd", name = "w", descriptor = "Lclient!vk;")
-	public static FrameBuffer aClass27_2;
+	public static FrameBuffer frameBuffer;
 
 	@OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;")
 	public static final JagString aClass100_944 = Static28.parse("hitbar_default");
diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java
index 4bcf9e7..0fc075e 100644
--- a/client/src/main/java/Static261.java
+++ b/client/src/main/java/Static261.java
@@ -10,9 +10,6 @@ public final class Static261 {
 	@OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
 	public static int anInt5731;
 
-	@OriginalMember(owner = "client!ve", name = "F", descriptor = "I")
-	public static int anInt5741;
-
 	@OriginalMember(owner = "client!ve", name = "w", descriptor = "Z")
 	public static boolean aBoolean298 = false;
 
diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java
index bb2a529..d7137f1 100644
--- a/client/src/main/java/Static267.java
+++ b/client/src/main/java/Static267.java
@@ -47,7 +47,7 @@ public final class Static267 {
 	public static boolean method4527() {
 		if (Static150.aBoolean175) {
 			try {
-				return !((Boolean) Static119.aClass100_588.method3157(Static71.signLink.anApplet2));
+				return !((Boolean) Static119.aClass100_588.method3157(GameShell.signLink.applet));
 			} catch (@Pc(21) Throwable local21) {
 			}
 		}
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index e760534..576438d 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -311,7 +311,7 @@ public final class Static269 {
 		}
 		@Pc(405) int local405 = arg1 + arg2 - 8;
 		@Pc(412) int local412 = arg0 + arg3 - 5;
-		Static215.aClass3_Sub2_Sub9_32.method2864(Static34.method882(new JagString[] { Static115.aClass100_579, Static123.method2423(Static243.anInt5359) }), local412, local405, 16776960, -1);
+		Static215.aClass3_Sub2_Sub9_32.method2864(Static34.method882(new JagString[] { Static115.aClass100_579, Static123.method2423(GameShell.framesPerSecond) }), local412, local405, 16776960, -1);
 		@Pc(434) Runtime local434 = Runtime.getRuntime();
 		@Pc(443) int local443 = (int) ((local434.totalMemory() - local434.freeMemory()) / 1024L);
 		@Pc(445) int local445 = 16776960;
diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java
index 441149c..d57e49a 100644
--- a/client/src/main/java/Static3.java
+++ b/client/src/main/java/Static3.java
@@ -46,7 +46,7 @@ public final class Static3 {
 	@OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
 	public static Class114[] method4660() {
 		if (Static105.aClass114Array1 == null) {
-			@Pc(16) Class114[] local16 = Static197.method3558(Static71.signLink);
+			@Pc(16) Class114[] local16 = Static197.method3558(GameShell.signLink);
 			@Pc(20) Class114[] local20 = new Class114[local16.length];
 			@Pc(22) int local22 = 0;
 			label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java
index 6f1fca4..46eb670 100644
--- a/client/src/main/java/Static31.java
+++ b/client/src/main/java/Static31.java
@@ -68,7 +68,7 @@ public final class Static31 {
 				}
 			}
 			if (Static219.anInt4937 == 1) {
-				Static72.aClass212_3 = Static71.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
+				Static72.aClass212_3 = GameShell.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
 				Static219.anInt4937 = 2;
 			}
 			@Pc(126) int local126;
@@ -79,7 +79,7 @@ public final class Static31 {
 				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink);
 				Static72.aClass212_3 = null;
 				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
 				if (Static11.aClass62_1 != null) {
diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java
index 952b6e6..ed3a6d7 100644
--- a/client/src/main/java/Static35.java
+++ b/client/src/main/java/Static35.java
@@ -27,9 +27,6 @@ public final class Static35 {
 	@OriginalMember(owner = "client!cl", name = "ab", descriptor = "[I")
 	public static final int[] anIntArray83 = new int[256];
 
-	@OriginalMember(owner = "client!cl", name = "bb", descriptor = "Z")
-	public static volatile boolean aBoolean66 = false;
-
 	@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IIIBII)V")
 	public static void method898(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(13) int local13 = arg2 * arg2;
diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java
index 13ccdbb..10d718c 100644
--- a/client/src/main/java/Static37.java
+++ b/client/src/main/java/Static37.java
@@ -7,9 +7,6 @@ public final class Static37 {
 	@OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;")
 	public static GlTextureProvider anInterface1_1;
 
-	@OriginalMember(owner = "client!cm", name = "b", descriptor = "Ljava/lang/Thread;")
-	public static Thread aThread1;
-
 	@OriginalMember(owner = "client!cm", name = "c", descriptor = "I")
 	public static int anInt1176;
 
diff --git a/client/src/main/java/Static39.java b/client/src/main/java/Static39.java
index 5d56475..89134af 100644
--- a/client/src/main/java/Static39.java
+++ b/client/src/main/java/Static39.java
@@ -1,4 +1,3 @@
-import java.awt.Frame;
 import java.util.Random;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
@@ -6,10 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static39 {
 
-	@OriginalMember(owner = "client!d", name = "Y", descriptor = "Ljava/awt/Frame;")
-	public static Frame aFrame1;
-
-	@OriginalMember(owner = "client!d", name = "hb", descriptor = "Lclient!ve;")
+    @OriginalMember(owner = "client!d", name = "hb", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_23;
 
 	@OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;")
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index 410f2d4..4b4087e 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -398,7 +398,7 @@ public final class Static4 {
 				return true;
 			} else if (Static164.anInt3985 == 164) {
 				local133 = Static57.aClass3_Sub15_Sub1_3.g4rme();
-				Static232.aClass212_5 = Static71.signLink.method5128(local133);
+				Static232.aClass212_5 = GameShell.signLink.method5128(local133);
 				Static164.anInt3985 = -1;
 				return true;
 			} else if (Static164.anInt3985 == 225) {
@@ -983,7 +983,7 @@ public final class Static4 {
 								Static209.miscTransmitAt = Static119.transmitTimer;
 								return true;
 							} else if (Static164.anInt3985 == 114) {
-								Static202.method3654(Static71.signLink, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028);
+								Static202.method3654(GameShell.signLink, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028);
 								Static164.anInt3985 = -1;
 								return true;
 							} else if (Static164.anInt3985 == 65) {
@@ -1036,18 +1036,18 @@ public final class Static4 {
 								Static164.anInt3985 = -1;
 								return true;
 							} else if (Static164.anInt3985 == 42) {
-								if (Static69.aFrame2 != null) {
+								if (GameShell.fullScreenFrame != null) {
 									Static241.method4540(false, Static214.anInt5581, -1, -1);
 								}
 								@Pc(3848) byte[] local3848 = new byte[Static223.anInt5028];
 								Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028);
 								local156 = Static10.decodeString(local3848, Static223.anInt5028, 0);
-								if (Static39.aFrame1 == null && (SignLink.anInt5928 == 3 || !SignLink.aString15.startsWith("win") || Static178.aBoolean203)) {
+								if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.aString15.startsWith("win") || Static178.aBoolean203)) {
 									Static169.openUrl(local156, true);
 								} else {
 									Static175.url = local156;
 									Static164.newTab = true;
-									Static33.openUrlRequest = Static71.signLink.method5131(new String(local156.method3148(), "ISO-8859-1"));
+									Static33.openUrlRequest = GameShell.signLink.method5131(new String(local156.method3148(), "ISO-8859-1"));
 								}
 								Static164.anInt3985 = -1;
 								return true;
@@ -1584,7 +1584,7 @@ public final class Static4 {
 									Static164.anInt3985 = -1;
 									return true;
 								} else {
-									Static89.method1839("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null);
+									Static89.report("T1 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028, null);
 									Static278.method4653();
 									return true;
 								}
diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java
index 0782c71..9070a05 100644
--- a/client/src/main/java/Static40.java
+++ b/client/src/main/java/Static40.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static40 {
 
-	@OriginalMember(owner = "client!da", name = "M", descriptor = "Z")
-	public static boolean aBoolean78;
-
 	@OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
 	public static int anInt1275;
 
diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java
index 978f9c2..a990d59 100644
--- a/client/src/main/java/Static48.java
+++ b/client/src/main/java/Static48.java
@@ -4,10 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static48 {
 
-	@OriginalMember(owner = "client!dl", name = "d", descriptor = "I")
-	public static int anInt1448;
-
-	@OriginalMember(owner = "client!dl", name = "e", descriptor = "I")
+    @OriginalMember(owner = "client!dl", name = "e", descriptor = "I")
 	public static int anInt1449;
 
 	@OriginalMember(owner = "client!dl", name = "h", descriptor = "[[Z")
diff --git a/client/src/main/java/Static58.java b/client/src/main/java/Static58.java
index bc48447..4175df4 100644
--- a/client/src/main/java/Static58.java
+++ b/client/src/main/java/Static58.java
@@ -10,9 +10,6 @@ public final class Static58 {
 	@OriginalMember(owner = "client!eh", name = "g", descriptor = "[[[I")
 	public static int[][][] anIntArrayArrayArray5;
 
-	@OriginalMember(owner = "client!eh", name = "a", descriptor = "Z")
-	public static boolean aBoolean101 = false;
-
 	@OriginalMember(owner = "client!eh", name = "j", descriptor = "I")
 	public static int wheelRotation = 0;
 
diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java
index 4921b9a..1f4b577 100644
--- a/client/src/main/java/Static59.java
+++ b/client/src/main/java/Static59.java
@@ -45,8 +45,8 @@ public final class Static59 {
 	public static void method1373() {
 		Static6.outboundBuffer.p1isaac(243);
 		Static6.outboundBuffer.p1(Static144.method2736());
-		Static6.outboundBuffer.p2(Static48.anInt1448);
-		Static6.outboundBuffer.p2(Static254.anInt5554);
+		Static6.outboundBuffer.p2(GameShell.canvasWidth);
+		Static6.outboundBuffer.p2(GameShell.canvasHeight);
 		Static6.outboundBuffer.p1(Static186.anInt4392);
 	}
 
diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java
index 291a18a..8d31fe9 100644
--- a/client/src/main/java/Static69.java
+++ b/client/src/main/java/Static69.java
@@ -1,20 +1,13 @@
-import java.awt.Frame;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public final class Static69 {
 
-	@OriginalMember(owner = "client!fh", name = "Y", descriptor = "Ljava/awt/Frame;")
-	public static Frame aFrame2;
-
 	@OriginalMember(owner = "client!fh", name = "cb", descriptor = "Lsignlink!ll;")
-	public static SignLink aClass213_4;
+	public static SignLink signLink;
 
-	@OriginalMember(owner = "client!fh", name = "P", descriptor = "Z")
-	public static volatile boolean aBoolean115 = true;
-
-	@OriginalMember(owner = "client!fh", name = "U", descriptor = "[[Z")
+    @OriginalMember(owner = "client!fh", name = "U", descriptor = "[[Z")
 	public static final boolean[][] aBooleanArrayArray2 = new boolean[][] { new boolean[0], { true, false, true }, { true, false, false, true }, { false, false, true, true }, { true, true, false }, { false, true, true }, { true, false, false, true }, { false, false, false, true, true }, { false, true, true }, { true, false, true, true, true }, { false, true, true, true, true }, { false, true, true, true, true, false } };
 
 	@OriginalMember(owner = "client!fh", name = "ab", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java
index a350ca7..e1ddbd9 100644
--- a/client/src/main/java/Static7.java
+++ b/client/src/main/java/Static7.java
@@ -17,10 +17,7 @@ public final class Static7 {
 	@OriginalMember(owner = "client!ah", name = "j", descriptor = "[I")
 	public static final int[] anIntArray75 = new int[2500];
 
-	@OriginalMember(owner = "client!ah", name = "k", descriptor = "[J")
-	public static final long[] aLongArray2 = new long[32];
-
-	@OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
+    @OriginalMember(owner = "client!ah", name = "n", descriptor = "I")
 	public static int anInt983 = 0;
 
 	@OriginalMember(owner = "client!ah", name = "p", descriptor = "Lclient!ih;")
diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java
index 91452cb..e31e575 100644
--- a/client/src/main/java/Static70.java
+++ b/client/src/main/java/Static70.java
@@ -13,14 +13,11 @@ public final class Static70 {
 	@OriginalMember(owner = "client!fi", name = "k", descriptor = "I")
 	public static int type = 0;
 
-	@OriginalMember(owner = "client!fi", name = "l", descriptor = "I")
-	public static int anInt2014 = 0;
-
 	@OriginalMember(owner = "client!fi", name = "n", descriptor = "I")
 	public static int updatedVarpsWriterIndex = 0;
 
 	@OriginalMember(owner = "client!fi", name = "a", descriptor = "(B)Lclient!s;")
-	public static Timer method1547() {
+	public static Timer create() {
 		try {
 			return (Timer) Class.forName("NanoTimer").getDeclaredConstructor().newInstance();
 		} catch (@Pc(15) Throwable local15) {
diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java
index 99fe2f5..857f8e0 100644
--- a/client/src/main/java/Static71.java
+++ b/client/src/main/java/Static71.java
@@ -10,10 +10,7 @@ public final class Static71 {
 	@OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I")
 	public static int[][] anIntArrayArray10;
 
-	@OriginalMember(owner = "client!fk", name = "l", descriptor = "Lsignlink!ll;")
-	public static SignLink signLink;
-
-	@OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;")
+    @OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;")
 	public static MouseWheel mouseWheel;
 
 	@OriginalMember(owner = "client!fk", name = "g", descriptor = "Z")
diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java
index 69602dc..c3fa527 100644
--- a/client/src/main/java/Static72.java
+++ b/client/src/main/java/Static72.java
@@ -13,16 +13,10 @@ public final class Static72 {
 	@OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
 	public static int[][] anIntArrayArray14;
 
-	@OriginalMember(owner = "client!fl", name = "U", descriptor = "I")
-	public static int anInt2046;
-
-	@OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
+    @OriginalMember(owner = "client!fl", name = "s", descriptor = "I")
 	public static int anInt2031 = 128;
 
-	@OriginalMember(owner = "client!fl", name = "w", descriptor = "J")
-	public static long aLong74 = 0L;
-
-	@OriginalMember(owner = "client!fl", name = "B", descriptor = "I")
+    @OriginalMember(owner = "client!fl", name = "B", descriptor = "I")
 	public static int updatedVarcstrsWriterIndex = 0;
 
 	@OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java
index 7c4fcd3..aa10133 100644
--- a/client/src/main/java/Static74.java
+++ b/client/src/main/java/Static74.java
@@ -62,8 +62,8 @@ public final class Static74 {
 		@Pc(19) int local19;
 		@Pc(17) int local17;
 		if (local7 == null) {
-			local17 = Static254.anInt5554;
-			local19 = Static48.anInt1448;
+			local17 = GameShell.canvasHeight;
+			local19 = GameShell.canvasWidth;
 		} else {
 			local17 = local7.anInt459;
 			local19 = local7.anInt445;
diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java
index ef541ab..d856807 100644
--- a/client/src/main/java/Static78.java
+++ b/client/src/main/java/Static78.java
@@ -278,7 +278,7 @@ public final class Static78 {
 		Static219.method3796();
 		Static217.method3768();
 		Static231.aBoolean252 = false;
-		if (Static39.aFrame1 != null && Static124.socket != null && Static244.anInt5370 == 25) {
+		if (GameShell.frame != null && Static124.socket != null && Static244.anInt5370 == 25) {
 			Static6.outboundBuffer.p1isaac(20);
 			Static6.outboundBuffer.p4(1057001181);
 		}
diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java
index 3fa44bc..3adad7b 100644
--- a/client/src/main/java/Static80.java
+++ b/client/src/main/java/Static80.java
@@ -58,7 +58,7 @@ public final class Static80 {
 		Static186.anInt4392 = 0;
 		@Pc(48) FileOnDisk local48 = null;
 		Static125.anInt3104 = 127;
-		if (Static238.anInt5316 >= 96) {
+		if (GameShell.maxMemory >= 96) {
 			Static76.method1645(2);
 		} else {
 			Static76.method1645(0);
diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java
index 1247a38..f00e9c7 100644
--- a/client/src/main/java/Static81.java
+++ b/client/src/main/java/Static81.java
@@ -41,12 +41,12 @@ public final class Static81 {
 			if (local28 == null) {
 				arg0 = -1;
 			} else {
-				Static71.signLink.method5113(local28.method301(), local28.anInt1860, Static154.canvas, new Point(local24.anInt2852, local24.anInt2850), local28.anInt1866);
+				GameShell.signLink.method5113(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.anInt2852, local24.anInt2850), local28.anInt1866);
 				Static115.anInt2941 = arg0;
 			}
 		}
 		if (arg0 == -1 && Static115.anInt2941 != -1) {
-			Static71.signLink.method5113(null, -1, Static154.canvas, new Point(), -1);
+			GameShell.signLink.method5113(null, -1, GameShell.canvas, new Point(), -1);
 			Static115.anInt2941 = -1;
 		}
 	}
@@ -246,12 +246,12 @@ public final class Static81 {
 			Static6.outboundBuffer.p2add(Static72.anInt2031);
 			Static6.outboundBuffer.p2le(Static57.anInt1747);
 		}
-		if (Static26.focus && !Static67.prevFocus) {
+		if (GameShell.focus && !Static67.prevFocus) {
 			Static67.prevFocus = true;
 			Static6.outboundBuffer.p1isaac(22);
 			Static6.outboundBuffer.p1(1);
 		}
-		if (!Static26.focus && Static67.prevFocus) {
+		if (!GameShell.focus && Static67.prevFocus) {
 			Static67.prevFocus = false;
 			Static6.outboundBuffer.p1isaac(22);
 			Static6.outboundBuffer.p1(0);
@@ -489,7 +489,7 @@ public final class Static81 {
 		// WorldMap.component
 		Static24.component = null;
 		if (Static154.topLevelInterace != -1) {
-			Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.topLevelInterace, 0, Static254.anInt5554);
+			Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterace, 0, GameShell.canvasHeight);
 		}
 		Static119.transmitTimer++;
 		while (true) {
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 756e39d..c629617 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -20,7 +20,7 @@ public final class Static87 {
 	public static boolean method1802() {
 		if (Static150.aBoolean175) {
 			try {
-				Static9.aClass100_35.method3157(Static71.signLink.anApplet2);
+				Static9.aClass100_35.method3157(GameShell.signLink.applet);
 				return true;
 			} catch (@Pc(14) Throwable local14) {
 			}
@@ -308,7 +308,7 @@ public final class Static87 {
 								}
 								local270 = local30.anInt445 + local123;
 								local276 = local114 + 15;
-								Static215.aClass3_Sub2_Sub9_32.method2864(Static34.method882(new JagString[] { Static101.aClass100_539, Static123.method2423(Static243.anInt5359) }), local270, local276, 16776960, -1);
+								Static215.aClass3_Sub2_Sub9_32.method2864(Static34.method882(new JagString[] { Static101.aClass100_539, Static123.method2423(GameShell.framesPerSecond) }), local270, local276, 16776960, -1);
 								local276 += 15;
 								@Pc(795) Runtime local795 = Runtime.getRuntime();
 								local503 = (int) ((local795.totalMemory() - local795.freeMemory()) / 1024L);
diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java
index e9cf5b9..a59bf2b 100644
--- a/client/src/main/java/Static88.java
+++ b/client/src/main/java/Static88.java
@@ -2821,11 +2821,11 @@ public final class Static88 {
 														local803 = Static254.anIntArray487[local28 + 1];
 														local809 = Static254.anIntArray487[local28];
 														Static241.method4540(false, 3, local809, local803);
-														Static254.anIntArray487[local28++] = Static69.aFrame2 == null ? 0 : 1;
+														Static254.anIntArray487[local28++] = GameShell.fullScreenFrame == null ? 0 : 1;
 														continue;
 													}
 													if (local226 == 5301) {
-														if (Static69.aFrame2 != null) {
+														if (GameShell.fullScreenFrame != null) {
 															Static241.method4540(false, Static214.anInt5581, -1, -1);
 														}
 														continue;
@@ -2882,7 +2882,7 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static214.anInt5581 = local809;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														continue;
 													}
 												} else if (local226 < 5500) {
@@ -2940,10 +2940,10 @@ public final class Static88 {
 														continue;
 													}
 													if (local226 == 5411) {
-														if (Static69.aFrame2 != null) {
+														if (GameShell.fullScreenFrame != null) {
 															Static241.method4540(false, Static214.anInt5581, -1, -1);
 														}
-														if (Static39.aFrame1 == null) {
+														if (GameShell.frame == null) {
 															Static169.openUrl(Static15.method479(), false);
 														} else {
 															System.exit(0);
@@ -2970,7 +2970,7 @@ public final class Static88 {
 														continue;
 													}
 													if (local226 == 5421) {
-														if (Static69.aFrame2 != null) {
+														if (GameShell.fullScreenFrame != null) {
 															Static241.method4540(false, Static214.anInt5581, -1, -1);
 														}
 														local28--;
@@ -2978,10 +2978,10 @@ public final class Static88 {
 														local26--;
 														local609 = Static3.aClass100Array176[local26];
 														@Pc(8356) JagString local8356 = Static34.method882(new JagString[] { Static15.method479(), local609 });
-														if (Static39.aFrame1 != null || local1552 && SignLink.anInt5928 != 3 && SignLink.aString15.startsWith("win") && !Static178.aBoolean203) {
+														if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.aString15.startsWith("win") && !Static178.aBoolean203) {
 															Static164.newTab = local1552;
 															Static175.url = local8356;
-															Static33.openUrlRequest = Static71.signLink.method5131(new String(local8356.method3148(), "ISO-8859-1"));
+															Static33.openUrlRequest = GameShell.signLink.method5131(new String(local8356.method3148(), "ISO-8859-1"));
 															continue;
 														}
 														Static169.openUrl(local8356, local1552);
@@ -3224,7 +3224,7 @@ public final class Static88 {
 															}
 														}
 														Static269.method2172();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3234,7 +3234,7 @@ public final class Static88 {
 														Static90.method1854();
 														Static145.method2742();
 														Static269.method2218();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3242,7 +3242,7 @@ public final class Static88 {
 														local28--;
 														Static80.aBoolean231 = Static254.anIntArray487[local28] == 1;
 														Static269.method2218();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3250,7 +3250,7 @@ public final class Static88 {
 														local28--;
 														Static250.aBoolean283 = Static254.anIntArray487[local28] == 1;
 														Static145.method2742();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3258,35 +3258,35 @@ public final class Static88 {
 														local28--;
 														Static53.aBoolean99 = Static254.anIntArray487[local28] == 1;
 														((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3245(!Static53.aBoolean99);
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
 													if (local226 == 6007) {
 														local28--;
 														Static15.aBoolean33 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
 													if (local226 == 6008) {
 														local28--;
 														Static11.aBoolean15 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
 													if (local226 == 6009) {
 														local28--;
 														Static159.aBoolean189 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
 													if (local226 == 6010) {
 														local28--;
 														Static209.aBoolean240 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3297,7 +3297,7 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static139.anInt3451 = local809;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3324,7 +3324,7 @@ public final class Static88 {
 															}
 														}
 														Static145.method2742();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3334,7 +3334,7 @@ public final class Static88 {
 														if (GlRenderer.enabled) {
 															Static145.method2742();
 														}
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3344,7 +3344,7 @@ public final class Static88 {
 														if (GlRenderer.enabled) {
 															Static86.method1799();
 														}
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3352,7 +3352,7 @@ public final class Static88 {
 														local28--;
 														local809 = Static254.anIntArray487[local28];
 														if (GlRenderer.enabled) {
-															Static35.aBoolean66 = true;
+															GameShell.replaceCanvas = true;
 														}
 														if (local809 < 0 || local809 > 2) {
 															local809 = 0;
@@ -3364,7 +3364,7 @@ public final class Static88 {
 														local28--;
 														Static99.aBoolean143 = Static254.anIntArray487[local28] == 1;
 														Static211.method930();
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3378,7 +3378,7 @@ public final class Static88 {
 															local809 = 127;
 														}
 														Static125.anInt3104 = local809;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3403,7 +3403,7 @@ public final class Static88 {
 															}
 															Static12.anInt391 = local809;
 														}
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3417,7 +3417,7 @@ public final class Static88 {
 															local809 = 127;
 														}
 														Static30.anInt978 = local809;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														continue;
 													}
@@ -3437,12 +3437,12 @@ public final class Static88 {
 															local809 = 2;
 														}
 														local1552 = false;
-														if (Static238.anInt5316 < 96) {
+														if (GameShell.maxMemory < 96) {
 															local1552 = true;
 															local809 = 0;
 														}
 														Static76.method1645(local809);
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														Static18.sentToServer = false;
 														Static254.anIntArray487[local28++] = local1552 ? 0 : 1;
 														continue;
@@ -3454,13 +3454,13 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static102.anInt2679 = local809;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														continue;
 													}
 													if (local226 == 6028) {
 														local28--;
 														Static64.aBoolean111 = Static254.anIntArray487[local28] != 0;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														continue;
 													}
 												} else if (local226 < 6200) {
@@ -3738,7 +3738,7 @@ public final class Static88 {
 													if (local226 == 6504) {
 														local28--;
 														Static164.anInt3988 = Static254.anIntArray487[local28];
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														continue;
 													}
 													if (local226 == 6505) {
@@ -3778,7 +3778,7 @@ public final class Static88 {
 													if (local226 == 6600) {
 														local28--;
 														Static33.aBoolean63 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.signLink);
+														Static203.method3663(GameShell.signLink);
 														continue;
 													}
 													if (local226 == 6601) {
@@ -4121,7 +4121,7 @@ public final class Static88 {
 				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.aClass100_447, 0, Static136.aClass100_633);
 				}
-				Static89.method1839("CS2 - scr:" + local14.aLong192 + " op:" + local44, local14378);
+				Static89.report("CS2 - scr:" + local14.aLong192 + " op:" + local44, local14378);
 			} else {
 				@Pc(14385) JagString local14385 = Static87.method1804(30);
 				local14385.method3113(Static219.aClass100_928).method3113(local14.aClass100_880);
@@ -4135,7 +4135,7 @@ public final class Static88 {
 				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.aClass100_447, 0, Static34.method882(new JagString[] { Static167.aClass100_780, local14.aClass100_880 }));
 				}
-				Static89.method1839("CS2 - scr:" + local14.aLong192 + " op:" + local44 + new String(local14385.method3148()), local14378);
+				Static89.report("CS2 - scr:" + local14.aLong192 + " op:" + local44 + new String(local14385.method3148()), local14378);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java
index 3ad0ed0..bc4f1bb 100644
--- a/client/src/main/java/Static89.java
+++ b/client/src/main/java/Static89.java
@@ -110,7 +110,7 @@ public final class Static89 {
 	}
 
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V")
-	public static void method1839(@OriginalArg(0) String arg0, @OriginalArg(1) Throwable arg1) {
+	public static void report(@OriginalArg(0) String arg0, @OriginalArg(1) Throwable arg1) {
 		try {
 			@Pc(13) String local13 = "";
 			if (arg1 != null) {
@@ -127,10 +127,10 @@ public final class Static89 {
 			local13 = Static40.method1014("@", "%40", local13);
 			local13 = Static40.method1014("&", "%26", local13);
 			local13 = Static40.method1014("#", "%23", local13);
-			if (Static69.aClass213_4.anApplet2 == null) {
+			if (Static69.signLink.applet == null) {
 				return;
 			}
-			@Pc(109) PrivilegedRequest local109 = Static69.aClass213_4.method5118(new URL(Static69.aClass213_4.anApplet2.getCodeBase(), "clienterror.ws?c=" + Static131.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.aString20 + "&v2=" + SignLink.aString14 + "&e=" + local13));
+			@Pc(109) PrivilegedRequest local109 = Static69.signLink.method5118(new URL(Static69.signLink.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.javaVendor + "&v2=" + SignLink.javaVersion + "&e=" + local13));
 			while (local109.status == 0) {
 				Static231.sleep(1L);
 			}
diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java
index 686fd8c..7e4d519 100644
--- a/client/src/main/java/Static9.java
+++ b/client/src/main/java/Static9.java
@@ -67,9 +67,9 @@ public final class Static9 {
 	@OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V")
 	public static void method182() {
 		Static241.aClass13Array13 = null;
-		Static6.method86(Static154.topLevelInterace, 0, Static48.anInt1448, 0, -1, Static254.anInt5554, 0, 0);
+		Static6.method86(Static154.topLevelInterace, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0);
 		if (Static241.aClass13Array13 != null) {
-			Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, Static48.anInt1448, -1412584499, 0, Static254.anInt5554, Static4.aClass13_1.anInt517);
+			Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static4.aClass13_1.anInt517);
 			Static241.aClass13Array13 = null;
 		}
 	}
diff --git a/client/src/main/java/Timer.java b/client/src/main/java/Timer.java
index d4a57e4..c920563 100644
--- a/client/src/main/java/Timer.java
+++ b/client/src/main/java/Timer.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public abstract class Timer {
 
 	@OriginalMember(owner = "client!s", name = "a", descriptor = "(III)I")
-	public abstract int method3391(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1);
+	public abstract int sleep(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1);
 
 	@OriginalMember(owner = "client!s", name = "b", descriptor = "(I)V")
 	public abstract void method3394();
diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java
index 6edcc85..b67ae08 100644
--- a/client/src/main/java/WorldMapFont.java
+++ b/client/src/main/java/WorldMapFont.java
@@ -224,7 +224,7 @@ public final class WorldMapFont {
 		@Pc(48) int local48 = arg1.getMaxAscent();
 		@Pc(54) int local54 = arg1.getMaxAscent() + arg1.getMaxDescent();
 		@Pc(57) int local57 = arg1.getHeight();
-		@Pc(62) Image local62 = Static154.canvas.createImage(local3, local54);
+		@Pc(62) Image local62 = GameShell.canvas.createImage(local3, local54);
 		@Pc(65) Graphics local65 = local62.getGraphics();
 		local65.setColor(Color.black);
 		local65.fillRect(0, 0, local3, local54);
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
index 23ad2e2..6ca3621 100644
--- a/client/src/main/java/client.java
+++ b/client/src/main/java/client.java
@@ -67,16 +67,16 @@ public final class client extends GameShell {
 			Static47.aClass100_991 = Static186.aClass100_827;
 			@Pc(146) client local146 = new client();
 			Static215.aClient1 = local146;
-			local146.method936(Static81.modeWhat + 32, "runescape");
-			Static39.aFrame1.setLocation(40, 40);
+			local146.startApplication(Static81.modeWhat + 32, "runescape");
+			GameShell.frame.setLocation(40, 40);
 		} catch (@Pc(167) Exception local167) {
-			Static89.method1839(null, local167);
+			Static89.report(null, local167);
 		}
 	}
 
 	@OriginalMember(owner = "client!client", name = "f", descriptor = "(I)V")
 	@Override
-	protected final void method934() {
+	protected final void mainRedraw() {
 		if (Static244.anInt5370 == 1000) {
 			return;
 		}
@@ -84,39 +84,39 @@ public final class client extends GameShell {
 		if (local15 && Static144.aBoolean173 && Static11.aClass62_1 != null) {
 			Static11.aClass62_1.method3570();
 		}
-		if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (Static35.aBoolean66 || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) {
-			Static241.method4540(Static35.aBoolean66, Static144.method2736(), Static114.anInt5831, Static22.anInt729);
+		if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) {
+			Static241.method4540(GameShell.replaceCanvas, Static144.method2736(), Static114.anInt5831, Static22.anInt729);
 		}
 		@Pc(80) int local80;
 		@Pc(84) int local84;
-		if (Static69.aFrame2 == null) {
+		if (GameShell.fullScreenFrame == null) {
 			@Pc(65) Container local65;
-			if (Static69.aFrame2 != null) {
-				local65 = Static69.aFrame2;
-			} else if (Static39.aFrame1 == null) {
-				local65 = Static71.signLink.anApplet2;
+			if (GameShell.fullScreenFrame != null) {
+				local65 = GameShell.fullScreenFrame;
+			} else if (GameShell.frame == null) {
+				local65 = GameShell.signLink.applet;
 			} else {
-				local65 = Static39.aFrame1;
+				local65 = GameShell.frame;
 			}
 			local80 = local65.getSize().width;
 			local84 = local65.getSize().height;
-			if (local65 == Static39.aFrame1) {
-				@Pc(90) Insets local90 = Static39.aFrame1.getInsets();
+			if (local65 == GameShell.frame) {
+				@Pc(90) Insets local90 = GameShell.frame.getInsets();
 				local80 -= local90.right + local90.left;
 				local84 -= local90.top + local90.bottom;
 			}
-			if (local80 != Static72.anInt2046 || local84 != Static122.anInt3045) {
+			if (local80 != GameShell.frameWidth || local84 != GameShell.frameHeight) {
 				Static203.method3662();
 				Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L;
 			}
 		}
-		if (Static69.aFrame2 != null && !Static26.focus && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) {
+		if (GameShell.fullScreenFrame != null && !GameShell.focus && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) {
 			Static241.method4540(false, Static214.anInt5581, -1, -1);
 		}
 		@Pc(158) boolean local158 = false;
-		if (Static69.aBoolean115) {
+		if (GameShell.fullRedraw) {
 			local158 = true;
-			Static69.aBoolean115 = false;
+			GameShell.fullRedraw = false;
 		}
 		if (local158) {
 			Static139.method2704();
@@ -162,25 +162,25 @@ public final class client extends GameShell {
 			@Pc(388) Graphics local388;
 			if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && Static199.anInt4672 == 0 && !local158) {
 				try {
-					local388 = Static154.canvas.getGraphics();
+					local388 = GameShell.canvas.getGraphics();
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
 						if (Static31.aBooleanArray29[local84]) {
-							Static260.aClass27_2.method4191(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]);
+							Static260.frameBuffer.method4191(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]);
 							Static31.aBooleanArray29[local84] = false;
 						}
 					}
 				} catch (@Pc(423) Exception local423) {
-					Static154.canvas.repaint();
+					GameShell.canvas.repaint();
 				}
 			} else if (Static244.anInt5370 != 0) {
 				try {
-					local388 = Static154.canvas.getGraphics();
-					Static260.aClass27_2.method4186(local388);
+					local388 = GameShell.canvas.getGraphics();
+					Static260.frameBuffer.method4186(local388);
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
 						Static31.aBooleanArray29[local84] = false;
 					}
 				} catch (@Pc(453) Exception local453) {
-					Static154.canvas.repaint();
+					GameShell.canvas.repaint();
 				}
 			}
 		}
@@ -189,22 +189,22 @@ public final class client extends GameShell {
 		}
 		if (Static164.aBoolean191 && Static244.anInt5370 == 10 && Static154.topLevelInterace != -1) {
 			Static164.aBoolean191 = false;
-			Static203.method3663(Static71.signLink);
+			Static203.method3663(GameShell.signLink);
 		}
 	}
 
 	@OriginalMember(owner = "client!client", name = "c", descriptor = "(B)V")
 	@Override
-	protected final void method928() {
+	protected final void mainQuit() {
 		if (GlRenderer.enabled) {
 			GlRenderer.quit();
 		}
-		if (Static69.aFrame2 != null) {
-			Static25.method714(Static69.aFrame2, Static71.signLink);
-			Static69.aFrame2 = null;
+		if (GameShell.fullScreenFrame != null) {
+			Static25.method714(GameShell.fullScreenFrame, GameShell.signLink);
+			GameShell.fullScreenFrame = null;
 		}
-		if (Static71.signLink != null) {
-			Static71.signLink.method5121(this.getClass());
+		if (GameShell.signLink != null) {
+			GameShell.signLink.method5121(this.getClass());
 		}
 		if (Static178.instance != null) {
 			Static178.instance.aBoolean151 = false;
@@ -214,10 +214,10 @@ public final class client extends GameShell {
 			Static124.socket.method2834();
 			Static124.socket = null;
 		}
-		Static31.method847(Static154.canvas);
-		Static223.method3866(Static154.canvas);
+		Static31.method847(GameShell.canvas);
+		Static223.method3866(GameShell.canvas);
 		if (Static71.mouseWheel != null) {
-			Static71.mouseWheel.method3291(Static154.canvas);
+			Static71.mouseWheel.method3291(GameShell.canvas);
 		}
 		Static6.method82();
 		Static251.method4277();
@@ -254,7 +254,7 @@ public final class client extends GameShell {
 	@OriginalMember(owner = "client!client", name = "init", descriptor = "()V")
 	@Override
 	public final void init() {
-		if (!this.method925()) {
+		if (!this.isHostnameValid()) {
 			return;
 		}
 		Static187.worldListId = Integer.parseInt(this.getParameter("worldid"));
@@ -320,19 +320,19 @@ public final class client extends GameShell {
 			Static178.aBoolean203 = false;
 		}
 		Static215.aClient1 = this;
-		this.method937(Static81.modeWhat + 32);
+		this.startApplet(Static81.modeWhat + 32);
 	}
 
 	@OriginalMember(owner = "client!client", name = "g", descriptor = "(I)V")
 	@Override
-	protected final void method935() {
+	protected final void mainInit() {
 		Static203.method3662();
 		Static86.js5CacheQueue = new Js5CacheQueue();
 		Static107.js5NetQueue = new Js5NetQueue();
 		if (Static81.modeWhat != 0) {
 			Static51.aByteArrayArray8 = new byte[50][];
 		}
-		Static80.read(Static71.signLink); // preferences
+		Static80.read(GameShell.signLink); // preferences
 		if (Static83.modeWhere == 0) {
 			Static143.worldListHostname = GlobalConfig.DEFAULT_HOSTNAME; // this.getCodeBase().getHost();
 			Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + 1;
@@ -370,26 +370,26 @@ public final class client extends GameShell {
 			Static125.worldId = Static187.worldListId;
 		}
 		Static156.init(); // keyboard
-		Static19.start(Static154.canvas); // keyboard
-		Static88.start(Static154.canvas); // mouse
+		Static19.start(GameShell.canvas); // keyboard
+		Static88.start(GameShell.canvas); // mouse
 		Static71.mouseWheel = Static44.create();
 		if (Static71.mouseWheel != null) {
-			Static71.mouseWheel.start(Static154.canvas);
+			Static71.mouseWheel.start(GameShell.canvas);
 		}
 		Static7.anInt986 = SignLink.anInt5928;
 		try {
-			if (Static71.signLink.cacheData != null) {
-				Static172.cacheData = new BufferedFile(Static71.signLink.cacheData, 5200, 0);
+			if (GameShell.signLink.cacheData != null) {
+				Static172.cacheData = new BufferedFile(GameShell.signLink.cacheData, 5200, 0);
 				for (@Pc(162) int i = 0; i < 28; i++) {
-					Static47.cacheIndexes[i] = new BufferedFile(Static71.signLink.cacheIndexes[i], 6000, 0);
+					Static47.cacheIndexes[i] = new BufferedFile(GameShell.signLink.cacheIndexes[i], 6000, 0);
 				}
-				Static190.cacheMasterIndex = new BufferedFile(Static71.signLink.cacheMasterIndex, 6000, 0);
+				Static190.cacheMasterIndex = new BufferedFile(GameShell.signLink.cacheMasterIndex, 6000, 0);
 				Static148.masterCache = new Cache(255, Static172.cacheData, Static190.cacheMasterIndex, 500000);
-				Static121.uid = new BufferedFile(Static71.signLink.uid, 24, 0);
-				Static71.signLink.cacheIndexes = null;
-				Static71.signLink.cacheMasterIndex = null;
-				Static71.signLink.uid = null;
-				Static71.signLink.cacheData = null;
+				Static121.uid = new BufferedFile(GameShell.signLink.uid, 24, 0);
+				GameShell.signLink.cacheIndexes = null;
+				GameShell.signLink.cacheMasterIndex = null;
+				GameShell.signLink.uid = null;
+				GameShell.signLink.cacheData = null;
 			}
 		} catch (@Pc(220) IOException ex) {
 			Static121.uid = null;
@@ -405,7 +405,7 @@ public final class client extends GameShell {
 
 	@OriginalMember(owner = "client!client", name = "c", descriptor = "(I)V")
 	@Override
-	protected final void method929() {
+	protected final void reset() {
 	}
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(ZI)V")
@@ -425,7 +425,7 @@ public final class client extends GameShell {
 		}
 		Static178.anInt4247++;
 		if (Static154.topLevelInterace != -1) {
-			Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.topLevelInterace, 0, Static254.anInt5554);
+			Static57.method1320(0, 0, 0, GameShell.canvasWidth, Static154.topLevelInterace, 0, GameShell.canvasHeight);
 		}
 		Static119.transmitTimer++;
 		if (GlRenderer.enabled) {
@@ -554,22 +554,22 @@ public final class client extends GameShell {
 				Static22.js5ConnectDelay = 3000;
 			}
 			if (Static107.js5NetQueue.errors >= 2 && Static107.js5NetQueue.response == 6) {
-				this.method927("js5connect_outofdate");
+				this.error("js5connect_outofdate");
 				Static244.anInt5370 = 1000;
 				return;
 			}
 			if (Static107.js5NetQueue.errors >= 4 && Static107.js5NetQueue.response == -1) {
-				this.method927("js5crc");
+				this.error("js5crc");
 				Static244.anInt5370 = 1000;
 				return;
 			}
 			if (Static107.js5NetQueue.errors >= 4 && (Static244.anInt5370 == 0 || Static244.anInt5370 == 5)) {
 				if (Static107.js5NetQueue.response == 7 || Static107.js5NetQueue.response == 9) {
-					this.method927("js5connect_full");
+					this.error("js5connect_full");
 				} else if (Static107.js5NetQueue.response > 0) {
-					this.method927("js5connect");
+					this.error("js5connect");
 				} else {
-					this.method927("js5io");
+					this.error("js5io");
 				}
 				Static244.anInt5370 = 1000;
 				return;
@@ -582,7 +582,7 @@ public final class client extends GameShell {
 		}
 		try {
 			if (Static4.js5ConnectState == 0) {
-				Static37.js5SocketRequest = Static71.signLink.openSocket(Static60.hostname, Static209.port);
+				Static37.js5SocketRequest = GameShell.signLink.openSocket(Static60.hostname, Static209.port);
 				Static4.js5ConnectState++;
 			}
 			if (Static4.js5ConnectState == 1) {
@@ -595,7 +595,7 @@ public final class client extends GameShell {
 				}
 			}
 			if (Static4.js5ConnectState == 2) {
-				Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.result, Static71.signLink);
+				Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.result, GameShell.signLink);
 				@Pc(194) Buffer buffer = new Buffer(5);
 				buffer.p1(15);
 				buffer.p4(530);
@@ -733,10 +733,10 @@ public final class client extends GameShell {
 			Static41.method1045(Static99.aBoolean143);
 			Static148.aClass3_Sub3_Sub4_1 = new MidiPcmStream();
 			Static148.aClass3_Sub3_Sub4_1.method4420();
-			Static11.aClass62_1 = Static107.method2262(22050, Static71.signLink, Static154.canvas, 0);
+			Static11.aClass62_1 = Static107.method2262(22050, GameShell.signLink, GameShell.canvas, 0);
 			Static11.aClass62_1.method3566(Static148.aClass3_Sub3_Sub4_1);
 			Static34.method876(Static148.aClass3_Sub3_Sub4_1, Static138.aClass153_51, Static137.aClass153_49, Static248.aClass153_75);
-			Static147.aClass62_2 = Static107.method2262(2048, Static71.signLink, Static154.canvas, 1);
+			Static147.aClass62_2 = Static107.method2262(2048, GameShell.signLink, GameShell.canvas, 1);
 			Static204.aClass3_Sub3_Sub2_1 = new MixerPcmStream();
 			Static147.aClass62_2.method3566(Static204.aClass3_Sub3_Sub2_1);
 			Static56.aClass156_1 = new Resampler(22050, Static44.anInt1404);
@@ -866,7 +866,7 @@ public final class client extends GameShell {
 			}
 		} else if (Static166.anInt4051 == 110) {
 			Static178.instance = new MouseRecorder();
-			Static71.signLink.method5130(10, Static178.instance);
+			GameShell.signLink.startThread(10, Static178.instance);
 			Static126.aClass100_602 = LocalizedText.MAINLOAD110B;
 			Static199.anInt4670 = 75;
 			Static166.anInt4051 = 120;
@@ -906,14 +906,14 @@ public final class client extends GameShell {
 				Static199.anInt4670 = 95;
 				Static126.aClass100_602 = LocalizedText.MAINLOAD135;
 			} else if (local98 == 7 || local98 == 9) {
-				this.method927("worldlistfull");
+				this.error("worldlistfull");
 				Static196.method3534(1000);
 			} else if (Static61.aBoolean109) {
 				Static126.aClass100_602 = LocalizedText.MAINLOAD135B;
 				Static166.anInt4051 = 140;
 				Static199.anInt4670 = 96;
 			} else {
-				this.method927("worldlistio_" + local98);
+				this.error("worldlistio_" + local98);
 				Static196.method3534(1000);
 			}
 		} else if (Static166.anInt4051 == 140) {
@@ -937,7 +937,7 @@ public final class client extends GameShell {
 				Static141.anInt3474 = 0;
 			}
 			Static164.aBoolean191 = true;
-			Static203.method3663(Static71.signLink);
+			Static203.method3663(GameShell.signLink);
 			Static241.method4540(false, Static214.anInt5581, -1, -1);
 			Static199.anInt4670 = 100;
 			Static166.anInt4051 = 160;
@@ -949,7 +949,7 @@ public final class client extends GameShell {
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(B)V")
 	@Override
-	protected final void method921() {
+	protected final void mainLoop() {
 		if (Static244.anInt5370 == 1000) {
 			return;
 		}
diff --git a/signlink/src/main/java/SignLink.java b/signlink/src/main/java/SignLink.java
index bfe312c..984e5ea 100644
--- a/signlink/src/main/java/SignLink.java
+++ b/signlink/src/main/java/SignLink.java
@@ -8,13 +8,12 @@ import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.URL;
 import java.util.Hashtable;
-import java.util.Vector;
+
 import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
@@ -25,7 +24,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class SignLink implements Runnable {
 
 	@OriginalMember(owner = "signlink!ll", name = "o", descriptor = "Ljava/lang/String;")
-	public static String aString14;
+	public static String javaVersion;
 
 	@OriginalMember(owner = "signlink!ll", name = "n", descriptor = "Ljava/lang/String;")
 	public static String aString15;
@@ -40,13 +39,13 @@ public final class SignLink implements Runnable {
 	private static String aString18;
 
 	@OriginalMember(owner = "signlink!ll", name = "a", descriptor = "Ljava/lang/String;")
-	public static String aString20;
+	public static String javaVendor;
 
 	@OriginalMember(owner = "signlink!ll", name = "b", descriptor = "Ljava/lang/String;")
 	private static String aString21;
 
 	@OriginalMember(owner = "signlink!ll", name = "u", descriptor = "Ljava/lang/reflect/Method;")
-	public static Method aMethod5;
+	public static Method setFocusCycleRoot;
 
 	@OriginalMember(owner = "signlink!ll", name = "r", descriptor = "Ljava/lang/reflect/Method;")
 	public static Method aMethod6;
@@ -82,7 +81,7 @@ public final class SignLink implements Runnable {
 	private PrivilegedRequest aClass212_8 = null;
 
 	@OriginalMember(owner = "signlink!ll", name = "i", descriptor = "Ljava/applet/Applet;")
-	public Applet anApplet2 = null;
+	public Applet applet = null;
 
 	@OriginalMember(owner = "signlink!ll", name = "x", descriptor = "Ljava/lang/String;")
 	private final String aString19;
@@ -91,7 +90,7 @@ public final class SignLink implements Runnable {
 	private final int anInt5929;
 
 	@OriginalMember(owner = "signlink!ll", name = "k", descriptor = "Ljava/awt/EventQueue;")
-	public EventQueue anEventQueue1;
+	public EventQueue eventQueue;
 
 	@OriginalMember(owner = "signlink!ll", name = "c", descriptor = "[Lsignlink!qm;")
 	public FileOnDisk[] cacheIndexes;
@@ -168,14 +167,14 @@ public final class SignLink implements Runnable {
 
 	@OriginalMember(owner = "signlink!ll", name = "<init>", descriptor = "(Ljava/applet/Applet;ILjava/lang/String;I)V")
 	public SignLink(@OriginalArg(0) Applet arg0, @OriginalArg(1) int arg1, @OriginalArg(2) String arg2, @OriginalArg(3) int arg3) throws Exception {
-		aString14 = "1.1";
+		javaVersion = "1.1";
 		this.aString19 = arg2;
 		this.anInt5929 = arg1;
-		this.anApplet2 = arg0;
-		aString20 = "Unknown";
+		this.applet = arg0;
+		javaVendor = "Unknown";
 		try {
-			aString20 = System.getProperty("java.vendor");
-			aString14 = System.getProperty("java.version");
+			javaVendor = System.getProperty("java.vendor");
+			javaVersion = System.getProperty("java.version");
 		} catch (@Pc(43) Exception local43) {
 		}
 		try {
@@ -205,7 +204,7 @@ public final class SignLink implements Runnable {
 			aString17 = "~/";
 		}
 		try {
-			this.anEventQueue1 = Toolkit.getDefaultToolkit().getSystemEventQueue();
+			this.eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
 		} catch (@Pc(97) Throwable local97) {
 		}
 		try {
@@ -218,9 +217,9 @@ public final class SignLink implements Runnable {
 		}
 		try {
 			if (arg0 == null) {
-				aMethod5 = Class.forName("java.awt.Container").getDeclaredMethod("setFocusCycleRoot", Boolean.TYPE);
+				setFocusCycleRoot = Class.forName("java.awt.Container").getDeclaredMethod("setFocusCycleRoot", Boolean.TYPE);
 			} else {
-				aMethod5 = arg0.getClass().getMethod("setFocusCycleRoot", Boolean.TYPE);
+				setFocusCycleRoot = arg0.getClass().getMethod("setFocusCycleRoot", Boolean.TYPE);
 			}
 		} catch (@Pc(153) Exception local153) {
 		}
@@ -456,7 +455,7 @@ public final class SignLink implements Runnable {
 	}
 
 	@OriginalMember(owner = "signlink!ll", name = "b", descriptor = "(I)V")
-	public final void method5124() {
+	public final void stop() {
 		synchronized (this) {
 			this.aBoolean360 = true;
 			this.notifyAll();
@@ -516,7 +515,7 @@ public final class SignLink implements Runnable {
 	}
 
 	@OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(IILjava/lang/Runnable;)Lsignlink!im;")
-	public final PrivilegedRequest method5130(@OriginalArg(1) int arg0, @OriginalArg(2) Runnable arg1) {
+	public final PrivilegedRequest startThread(@OriginalArg(1) int arg0, @OriginalArg(2) Runnable arg1) {
 		return this.method5114(2, 0, arg1, arg0);
 	}