diff --git a/Readme.md b/Readme.md
index 668aca089..945ca4b22 100644
--- a/Readme.md
+++ b/Readme.md
@@ -20,8 +20,5 @@ https://github.com/lz4/lz4-java
 NightConfig for Json & Toml (config handling)\
 https://github.com/TheElectronWill/night-config
 
-SVG Salamander for SVG's\
+SVG Salamander for SVG support\
 https://github.com/blackears/svgSalamander
-
-FlatLaf for theming (for development testing, may remove later)\
-https://www.formdev.com/flatlaf/
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
index f26291865..54befa44a 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/Initializer.java
@@ -29,7 +29,6 @@ public class Initializer
 			Class<?> compressor = LZ4Compressor.class;
 			//Class<?> networking = ByteBuf.class;
 			Class<?> toml = com.electronwill.nightconfig.core.Config.class;
-			Class<?> flatlaf = com.formdev.flatlaf.FlatDarculaLaf.class;
 		}
 		catch (NoClassDefFoundError e)
 		{
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java
index a230fec5e..6d76a904c 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java
@@ -1,8 +1,7 @@
 package com.seibel.distanthorizons.core.jar.gui;
 
-import com.formdev.flatlaf.FlatDarkLaf;
-import com.formdev.flatlaf.FlatLightLaf;
-import com.formdev.flatlaf.extras.FlatSVGIcon;
+import com.kitfox.svg.SVGUniverse;
+import com.kitfox.svg.app.beans.SVGIcon;
 import com.seibel.distanthorizons.core.jar.JarUtils;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
@@ -13,6 +12,7 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.List;
@@ -41,7 +41,7 @@ public class BaseJFrame extends JFrame
 		setTitle(SingletonInjector.INSTANCE.get(ILangWrapper.class).getLang("lod.title"));
 		try
 		{
-			setIconImage(new FlatSVGIcon(JarUtils.accessFile("iconLegacy.svg")).getImage()); // SVG Salamander (the library which we use for svg files) doesn't support css class colors
+			setIconImage(ImageIO.read(JarUtils.accessFile("icon.png")));
 		}
 		catch (Exception e)
 		{
@@ -96,7 +96,8 @@ public class BaseJFrame extends JFrame
 		add(languageBox);
 		
 		
-		// ========== THEMING ==========
+		// ========== THEMING ========== //
+		/**
 		// TODO: Change the theme to a toggle switch rather than having 2 buttons
 		int themeButtonSize = 25;
 		JButton lightMode = null;
@@ -132,6 +133,7 @@ public class BaseJFrame extends JFrame
 		// Finally add the buttons
 		add(lightMode);
 		add(darkMode);
+		 */
 	}
 	
 	public BaseJFrame addLogo()