From 3a7a694db8091d16b12f65fa7510f266e066eda4 Mon Sep 17 00:00:00 2001
From: Downforce Agent <bonkmaykr@protonmail.com>
Date: Fri, 12 Jul 2024 15:02:56 -0500
Subject: [PATCH] UI consistency overhaul

---
 firestar/src/main/java/Bert.form              | 60 +++++++++++++--
 firestar/src/main/java/Clifford.form          | 32 +++++++-
 firestar/src/main/java/Fozzie.form            | 12 ++-
 firestar/src/main/java/Gonzo.form             | 22 +++++-
 firestar/src/main/java/Gonzo.java             |  5 +-
 .../src/main/java/MasterWindowLayout.form     | 76 ++++++++++++-------
 firestar/src/main/java/Rowlf.form             |  8 +-
 firestar/src/main/java/Waldorf.form           | 43 ++++++++++-
 firestar/src/main/java/WilkinsCoffee.form     | 14 ++--
 9 files changed, 217 insertions(+), 55 deletions(-)

diff --git a/firestar/src/main/java/Bert.form b/firestar/src/main/java/Bert.form
index 9aaad35..b21139d 100644
--- a/firestar/src/main/java/Bert.form
+++ b/firestar/src/main/java/Bert.form
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Bert">
   <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="10" left="25" bottom="0" right="25"/>
+    <margin top="10" left="25" bottom="10" right="25"/>
     <constraints>
       <xy x="20" y="20" width="1156" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <grid id="59440" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -13,7 +17,11 @@
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+        </properties>
         <border type="none"/>
         <children>
           <grid id="1a1a9" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -21,7 +29,11 @@
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
               <component id="783ac" class="javax.swing.JLabel">
@@ -29,6 +41,8 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Select your game version below."/>
                 </properties>
               </component>
@@ -37,6 +51,8 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="This will determine what file your mods are deployed to."/>
                 </properties>
               </component>
@@ -45,6 +61,8 @@
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value=" If you add/remove DLC in the future, you will need to change this setting again."/>
                 </properties>
               </component>
@@ -55,7 +73,11 @@
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
               <component id="a94bd" class="javax.swing.JButton" binding="cancelbtn">
@@ -63,6 +85,11 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-2271221"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Cancel"/>
                 </properties>
               </component>
@@ -71,6 +98,11 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-2271221"/>
+                  <borderPainted value="false"/>
+                  <focusPainted value="false"/>
+                  <font name="Exo 2"/>
+                  <foreground color="-1"/>
                   <text value="Download"/>
                 </properties>
               </component>
@@ -81,7 +113,11 @@
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <background color="-15128227"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
+            </properties>
             <border type="none"/>
             <children>
               <component id="11210" class="javax.swing.JRadioButton" binding="baseRad">
@@ -89,6 +125,9 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-15128227"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
                   <horizontalTextPosition value="10"/>
                   <text value="Base game only, no updates"/>
                 </properties>
@@ -98,6 +137,9 @@
                   <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-15128227"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
                   <horizontalTextPosition value="10"/>
                   <text value="HD DLC, without Fury"/>
                 </properties>
@@ -107,6 +149,9 @@
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="10" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-15128227"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
                   <text value="Base game only, 1.04"/>
                 </properties>
               </component>
@@ -115,6 +160,9 @@
                   <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
+                  <background color="-15128227"/>
+                  <focusPainted value="false"/>
+                  <foreground color="-1"/>
                   <horizontalAlignment value="10"/>
                   <horizontalTextPosition value="11"/>
                   <selected value="true"/>
diff --git a/firestar/src/main/java/Clifford.form b/firestar/src/main/java/Clifford.form
index 35458a6..07957a2 100644
--- a/firestar/src/main/java/Clifford.form
+++ b/firestar/src/main/java/Clifford.form
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Clifford">
   <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+    <margin top="10" left="25" bottom="10" right="25"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <component id="3294c" class="javax.swing.JLabel">
@@ -13,6 +17,8 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Name"/>
         </properties>
       </component>
@@ -21,6 +27,8 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Author"/>
         </properties>
       </component>
@@ -45,6 +53,8 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Version"/>
         </properties>
       </component>
@@ -61,6 +71,11 @@
           <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Save"/>
         </properties>
       </component>
@@ -69,6 +84,11 @@
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Cancel"/>
         </properties>
       </component>
@@ -76,7 +96,11 @@
         <constraints>
           <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
+        </properties>
         <border type="none"/>
         <children>
           <component id="4c6b" class="javax.swing.JTextPane" binding="fDescription">
@@ -90,6 +114,8 @@
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Description"/>
         </properties>
       </component>
diff --git a/firestar/src/main/java/Fozzie.form b/firestar/src/main/java/Fozzie.form
index 9b538b3..87f306c 100644
--- a/firestar/src/main/java/Fozzie.form
+++ b/firestar/src/main/java/Fozzie.form
@@ -5,7 +5,11 @@
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <component id="4913b" class="javax.swing.JProgressBar" binding="progressBar">
@@ -16,6 +20,9 @@
           </grid>
         </constraints>
         <properties>
+          <background color="-1"/>
+          <borderPainted value="false"/>
+          <foreground color="-2271221"/>
           <indeterminate value="false"/>
           <stringPainted value="true"/>
           <value value="0"/>
@@ -26,6 +33,9 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-15128227"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Downloading file..."/>
         </properties>
       </component>
diff --git a/firestar/src/main/java/Gonzo.form b/firestar/src/main/java/Gonzo.form
index 6227570..881cd57 100644
--- a/firestar/src/main/java/Gonzo.form
+++ b/firestar/src/main/java/Gonzo.form
@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Gonzo">
   <grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+    <margin top="3" left="3" bottom="3" right="3"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
-    <properties/>
+    <properties>
+      <background color="-15128227"/>
+      <font name="Exo 2"/>
+      <foreground color="-1"/>
+    </properties>
     <border type="none"/>
     <children>
       <scrollpane id="6830c" binding="scrollPane">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
-        <border type="line" title="Please wait a few minutes. Progress is shown above." title-justification="2" title-position="5"/>
+        <properties>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+        </properties>
+        <border type="line" title="Please wait a few minutes. Progress is shown above." title-justification="2" title-position="5">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
           <component id="491c1" class="javax.swing.JTextArea" binding="consoleDisplay">
             <constraints/>
             <properties>
+              <background color="-2271221"/>
+              <font name="Luxi Mono"/>
+              <foreground color="-1"/>
               <text value=""/>
             </properties>
           </component>
diff --git a/firestar/src/main/java/Gonzo.java b/firestar/src/main/java/Gonzo.java
index b66ab9c..cc447bf 100644
--- a/firestar/src/main/java/Gonzo.java
+++ b/firestar/src/main/java/Gonzo.java
@@ -302,10 +302,7 @@ public class Gonzo {
             //ignore
         }
 
-        TitledBorder titledBorder = BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.BLACK), "DONE! Close this pop-up to continue.");
-        titledBorder.setTitlePosition(TitledBorder.BOTTOM);
-        titledBorder.setTitleJustification(TitledBorder.CENTER);
-        scrollPane.setBorder(titledBorder);
+        ((TitledBorder)scrollPane.getBorder()).setTitle("DONE! Close this pop-up to continue.");
         scrollPane.repaint();
 
         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
diff --git a/firestar/src/main/java/MasterWindowLayout.form b/firestar/src/main/java/MasterWindowLayout.form
index 68d849e..a734757 100644
--- a/firestar/src/main/java/MasterWindowLayout.form
+++ b/firestar/src/main/java/MasterWindowLayout.form
@@ -6,8 +6,8 @@
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties>
-      <background color="-1"/>
-      <foreground color="-592129"/>
+      <background color="-15128227"/>
+      <foreground color="-15128227"/>
     </properties>
     <border type="none"/>
     <children>
@@ -21,10 +21,14 @@
           </grid>
         </constraints>
         <properties>
-          <background color="-526337"/>
-          <foreground color="-592129"/>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
         </properties>
-        <border type="line" title="Description"/>
+        <border type="line" title="Description">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
           <component id="a9cee" class="javax.swing.JTextPane" binding="descriptionField">
             <constraints>
@@ -33,8 +37,11 @@
               </grid>
             </constraints>
             <properties>
+              <background color="-15128227"/>
               <editable value="false"/>
               <focusable value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
               <text value="Select a mod from the list on the right to view more details, or to make changes to your installation."/>
             </properties>
           </component>
@@ -45,17 +52,23 @@
           <grid row="0" column="1" row-span="2" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <background color="-526337"/>
-          <foreground color="-526337"/>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
         </properties>
         <border type="line" title="Mods List" title-justification="1" title-position="2">
-          <font/>
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
         </border>
         <children>
           <component id="d80ff" class="javax.swing.JList" binding="modList">
             <constraints/>
             <properties>
-              <foreground color="-16777216"/>
+              <background color="-15128227"/>
+              <foreground color="-1"/>
+              <opaque value="true"/>
+              <selectionBackground color="-2271221"/>
+              <selectionForeground color="-1"/>
               <valueIsAdjusting value="false"/>
             </properties>
             <clientProperties>
@@ -74,10 +87,14 @@
           </grid>
         </constraints>
         <properties>
-          <background color="-526337"/>
-          <foreground color="-657921"/>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
         </properties>
-        <border type="line" title="Actions"/>
+        <border type="line" title="Actions">
+          <font name="Exo 2"/>
+          <title-color color="-1"/>
+          <color color="-1"/>
+        </border>
         <children>
           <component id="3cd60" class="javax.swing.JButton" binding="toggleButton" default-binding="true">
             <constraints>
@@ -87,10 +104,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Toggle"/>
             </properties>
           </component>
@@ -102,10 +120,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Move Up"/>
             </properties>
           </component>
@@ -119,10 +138,11 @@
             </constraints>
             <properties>
               <alignmentX value="0.0"/>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Delete"/>
             </properties>
           </component>
@@ -135,10 +155,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Move Down"/>
             </properties>
           </component>
@@ -149,10 +170,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Options"/>
             </properties>
           </component>
@@ -163,10 +185,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-526337"/>
+              <foreground color="-1"/>
               <text value="Import"/>
             </properties>
           </component>
@@ -178,10 +201,11 @@
               </grid>
             </constraints>
             <properties>
-              <background color="-15128227"/>
+              <background color="-2271221"/>
               <borderPainted value="false"/>
+              <focusPainted value="false"/>
               <font name="Exo 2" style="1"/>
-              <foreground color="-657921"/>
+              <foreground color="-1"/>
               <text value="Deploy"/>
             </properties>
           </component>
diff --git a/firestar/src/main/java/Rowlf.form b/firestar/src/main/java/Rowlf.form
index 48fea7b..ea08ffe 100644
--- a/firestar/src/main/java/Rowlf.form
+++ b/firestar/src/main/java/Rowlf.form
@@ -8,7 +8,7 @@
     <properties>
       <background color="-15128227"/>
       <font name="Exo 2"/>
-      <foreground color="-526337"/>
+      <foreground color="-1"/>
     </properties>
     <border type="none"/>
     <children>
@@ -20,7 +20,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Aww fiddlesticks, what now?"/>
         </properties>
       </component>
@@ -50,7 +50,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Version Unknown"/>
         </properties>
       </component>
@@ -63,7 +63,7 @@
         </constraints>
         <properties>
           <font name="Exo 2"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <text value="Platform Unknown"/>
         </properties>
       </component>
diff --git a/firestar/src/main/java/Waldorf.form b/firestar/src/main/java/Waldorf.form
index 28436fc..5954754 100644
--- a/firestar/src/main/java/Waldorf.form
+++ b/firestar/src/main/java/Waldorf.form
@@ -6,6 +6,8 @@
       <xy x="20" y="20" width="500" height="400"/>
     </constraints>
     <properties>
+      <background color="-15128227"/>
+      <foreground color="-1"/>
       <maximumSize width="50" height="100"/>
       <minimumSize width="50" height="100"/>
       <preferredSize width="50" height="100"/>
@@ -17,6 +19,11 @@
           <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Save"/>
         </properties>
       </component>
@@ -33,6 +40,8 @@
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Mod Export Path"/>
         </properties>
       </component>
@@ -41,6 +50,11 @@
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Cancel"/>
         </properties>
       </component>
@@ -49,6 +63,11 @@
           <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Restore Defaults"/>
         </properties>
       </component>
@@ -57,6 +76,8 @@
           <grid row="1" column="0" row-span="3" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value=".firestar Folder"/>
         </properties>
       </component>
@@ -65,6 +86,11 @@
           <grid row="1" column="1" row-span="3" col-span="2" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <background color="-2271221"/>
+          <borderPainted value="false"/>
+          <focusPainted value="false"/>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <label value="Browse"/>
           <text value="Browse"/>
         </properties>
@@ -74,6 +100,8 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <font name="Exo 2"/>
+          <foreground color="-1"/>
           <text value="Downloads"/>
         </properties>
       </component>
@@ -82,7 +110,10 @@
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <background color="-15128227"/>
+          <foreground color="-1"/>
+        </properties>
         <border type="none">
           <color color="-16777216"/>
         </border>
@@ -92,6 +123,11 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
               <text value="Get Dependencies"/>
             </properties>
           </component>
@@ -100,6 +136,11 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <background color="-2271221"/>
+              <borderPainted value="false"/>
+              <focusPainted value="false"/>
+              <font name="Exo 2"/>
+              <foreground color="-1"/>
               <text value="Auto-Download PSARCs"/>
             </properties>
           </component>
diff --git a/firestar/src/main/java/WilkinsCoffee.form b/firestar/src/main/java/WilkinsCoffee.form
index 111a65c..5c57386 100644
--- a/firestar/src/main/java/WilkinsCoffee.form
+++ b/firestar/src/main/java/WilkinsCoffee.form
@@ -7,6 +7,7 @@
     </constraints>
     <properties>
       <background color="-15128227"/>
+      <foreground color="-1"/>
     </properties>
     <border type="none"/>
     <children>
@@ -18,6 +19,7 @@
           </grid>
         </constraints>
         <properties>
+          <foreground color="-1"/>
           <text value="Image"/>
         </properties>
       </component>
@@ -36,7 +38,7 @@
           <focusCycleRoot value="false"/>
           <focusable value="false"/>
           <font name="Exo 2" size="14"/>
-          <foreground color="-592129"/>
+          <foreground color="-1"/>
           <margin top="0" left="5" bottom="0" right="0"/>
           <text value="&lt;html&gt;&#10;  &lt;head&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p id=&quot;first-p&quot;&gt;&#10;      Welcome to the Firestar Setup.&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      Please read the manual before continuing, and make sure your Vita is &#10;      configured correctly first. You will need enso custom firmware and &#10;      Repatch Reloaded for Firestar to work.&lt;br&gt;&lt;br&gt;Emulator players can skip &#10;      these preparations.&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      Press &amp;quot;Continue&amp;quot; when you are ready.&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;&#10;&lt;/html&gt;&#10;"/>
         </properties>
@@ -49,7 +51,7 @@
           <background color="-2271221"/>
           <borderPainted value="false"/>
           <focusPainted value="false"/>
-          <foreground color="-526337"/>
+          <foreground color="-1"/>
           <text value="Continue"/>
         </properties>
       </component>
@@ -72,7 +74,7 @@
               <background color="-2271221"/>
               <borderPainted value="false"/>
               <focusPainted value="false"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Auto-Download"/>
             </properties>
           </component>
@@ -84,7 +86,7 @@
               <background color="-2271221"/>
               <borderPainted value="false"/>
               <focusPainted value="false"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Import My Own"/>
             </properties>
           </component>
@@ -108,7 +110,7 @@
               <background color="-2271221"/>
               <borderPainted value="false"/>
               <focusPainted value="false"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Select Folder"/>
             </properties>
           </component>
@@ -118,7 +120,7 @@
             </constraints>
             <properties>
               <font name="Exo 2" size="12"/>
-              <foreground color="-592129"/>
+              <foreground color="-1"/>
               <text value="Your Documents folder is selected by default."/>
             </properties>
           </component>