diff --git a/patches/server/0087-Bring-back-the-GUI.patch b/patches/server/0087-Bring-back-the-GUI.patch
new file mode 100644
index 000000000..7714dd0a5
--- /dev/null
+++ b/patches/server/0087-Bring-back-the-GUI.patch
@@ -0,0 +1,83 @@
+From c9f532624c52ae48b4af5280b2dc57298f529e18 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Thu, 16 Jan 2020 14:59:16 -0600
+Subject: [PATCH] Bring back the GUI
+
+---
+ .../net/minecraft/server/MinecraftServer.java     |  3 ++-
+ src/main/java/org/bukkit/craftbukkit/Main.java    |  1 +
+ src/main/resources/log4j2.xml                     | 15 ++++++++++++++-
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index ab00ed8394..fd4fdaaac1 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1367,12 +1367,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+             dedicatedserver.setForceUpgrade(optionset.has(optionspec4));
+             dedicatedserver.setEraseCache(optionset.has(optionspec5));
+             dedicatedserver.c((String) optionset.valueOf(optionspec11));
+-            boolean flag = !optionset.has(optionspec) && !optionset.valuesOf(nonoptionargumentspec).contains("nogui");
++            */ boolean flag = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui"); // Purpur
+ 
+             if (flag && !GraphicsEnvironment.isHeadless()) {
+                 dedicatedserver.bb();
+             }
+ 
++            /* // Purpur
+             dedicatedserver.startServerThread();
+             Thread thread = new Thread("Server Shutdown Thread") {
+                 public void run() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index c9937fb0d6..3423535d1e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -143,6 +143,7 @@ public class Main {
+                         .ofType(File.class)
+                         .defaultsTo(new File("purpur.yml"))
+                         .describedAs("Yml file");
++                accepts("nogui", "Disables the graphical window");
+                 // Purpur end
+ 
+                 // Paper start
+diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
+index 6711e6dff9..65ba664922 100644
+--- a/src/main/resources/log4j2.xml
++++ b/src/main/resources/log4j2.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<Configuration status="WARN">
++<Configuration status="WARN" packages="com.mojang.util">
+     <Appenders>
+         <TerminalConsole name="TerminalConsole">
+             <PatternLayout>
+@@ -11,6 +11,18 @@
+                 </LoggerNamePatternSelector>
+             </PatternLayout>
+         </TerminalConsole>
++        <!-- Purpur start -->
++        <Queue name="ServerGuiConsole">
++            <PatternLayout>
++                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx}">
++                    <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
++                    <!-- Disable prefix for various plugins that bypass the plugin logger -->
++                    <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
++                                  pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
++                </LoggerNamePatternSelector>
++            </PatternLayout>
++        </Queue>
++        <!-- Purpur end -->
+         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+             <PatternLayout>
+                 <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
+@@ -33,6 +45,7 @@
+                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+             </filters>
+             <AppenderRef ref="File"/>
++            <AppenderRef ref="ServerGuiConsole"/> <!-- Purpur -->
+             <AppenderRef ref="TerminalConsole" level="info"/>
+         </Root>
+     </Loggers>
+-- 
+2.24.0
+
diff --git a/patches/server/0087-Double-Click-Jar-Check.patch b/patches/server/0087-Double-Click-Jar-Check.patch
deleted file mode 100644
index e52609ac8..000000000
--- a/patches/server/0087-Double-Click-Jar-Check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c111fde8e661027df0bed942b8878309eabf11b2 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 7 Dec 2019 14:35:43 -0600
-Subject: [PATCH] Double Click Jar Check
-
----
- src/main/java/org/bukkit/craftbukkit/Main.java | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3a4881fb18..5873ad54fa 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -20,6 +20,12 @@ public class Main {
-     public static boolean useConsole = true;
- 
-     public static void main(String[] args) {
-+        // Purpur start
-+        if (System.console() == null && !java.awt.GraphicsEnvironment.isHeadless()) {
-+            javax.swing.JOptionPane.showMessageDialog(null, "Please do not run this server by double clicking the jar!");
-+            return;
-+        }
-+        // Purpur end
-         // Todo: Installation script
-         OptionParser parser = new OptionParser() {
-             {
--- 
-2.24.0.rc1
-
diff --git a/patches/server/0088-Disable-outdated-build-check.patch b/patches/server/0088-Disable-outdated-build-check.patch
index 4ceced90f..0a22ef52d 100644
--- a/patches/server/0088-Disable-outdated-build-check.patch
+++ b/patches/server/0088-Disable-outdated-build-check.patch
@@ -1,4 +1,4 @@
-From c604466694f76c6f4c849478eb52fd5a6faf1e58 Mon Sep 17 00:00:00 2001
+From c037cb674f0ed7d775555d0aabcdaeb291aaab7e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Dec 2019 12:53:59 -0600
 Subject: [PATCH] Disable outdated build check
@@ -8,10 +8,10 @@ Subject: [PATCH] Disable outdated build check
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5873ad54fa..67f88b7fb3 100644
+index 3423535d1e..f5bfbd7aba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -225,7 +225,7 @@ public class Main {
+@@ -220,7 +220,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
@@ -21,5 +21,5 @@ index 5873ad54fa..67f88b7fb3 100644
  
                      Calendar deadline = Calendar.getInstance();
 -- 
-2.24.0.rc1
+2.24.0