From a7c5f0d3df9dcb0dcf109e463929a4cddaef536e Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sat, 21 Feb 2026 19:19:54 +0100
Subject: [PATCH] Fixed font stuff in screens

---
 .../org/saturnclient/ui2/screens/ConfigEditor.java | 14 +++++++-------
 .../saturnclient/ui2/screens/store/CloakStore.java |  5 +++--
 .../saturnclient/ui2/screens/store/HatStore.java   |  5 +++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java b/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java
index e46fcb6..7b00966 100644
--- a/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java
+++ b/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java
@@ -4,6 +4,7 @@ import java.util.Map;
 
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.config.Property;
+import org.saturnclient.saturnclient.config.Theme;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.components.Sidebar;
 import org.saturnclient.ui2.components.inputs.FloatInput;
@@ -59,14 +60,13 @@ public class ConfigEditor extends SaturnScreen {
 
             if (prop.getType() == Property.PropertyType.NAMESPACE) {
                 configScroll.draw(
-                            new Text(
-                                    propName
-                            ).position(Fonts.centerX(520, propName, Text.font.value), modY + 1).scale(0.7f));
+                        new Text(
+                                propName).position(Fonts.centerX(520, propName, Theme.FONT.value), modY + 1)
+                                .scale(0.7f));
             } else {
                 configScroll.draw(
-                                new Text(
-                                        propName
-                                ).position(modX, modY + 1).scale(0.7f));
+                        new Text(
+                                propName).position(modX, modY + 1).scale(0.7f));
             }
 
             switch (prop.getType()) {
@@ -76,7 +76,7 @@ public class ConfigEditor extends SaturnScreen {
                                     .position(modX + (w / 2) - 40, modY)
                                     .scale(0.5f));
                     break;
-                
+
                 case HEX:
                     configScroll.draw(new HexInput((Property<Integer>) prop, this).position(w / 2, modY));
                     break;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
index 1f0a056..d13b099 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java
@@ -3,6 +3,7 @@ package org.saturnclient.ui2.screens.store;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.saturnclient.config.Theme;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.Utils;
@@ -75,10 +76,10 @@ public class CloakStore extends SaturnScreen {
 
                     String t = "100";
 
-                    scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Text.font.value), y + 113).scale(0.5f));
+                    scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113).scale(0.5f));
 
                     scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
-                            .position(x + Fonts.getWidth(t, Text.font.value) - 1, y + 112).scale(0.5f));
+                            .position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112).scale(0.5f));
 
                     if (col == 8) {
                         col = 0;
diff --git a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
index 15f87b8..7a3de0a 100644
--- a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
+++ b/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java
@@ -3,6 +3,7 @@ package org.saturnclient.ui2.screens.store;
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.saturnclient.config.Theme;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.ui2.SaturnScreen;
 import org.saturnclient.ui2.Utils;
@@ -75,10 +76,10 @@ public class HatStore extends SaturnScreen {
 
                     String t = "50";
 
-                    scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Text.font.value), y + 53).scale(0.5f));
+                    scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53).scale(0.5f));
 
                     scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
-                            .position(x + Fonts.getWidth(t, Text.font.value) + 4, y + 52).scale(0.5f));
+                            .position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52).scale(0.5f));
 
                     if (col == 8) {
                         col = 0;