diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index 2dbf270..25eaeb0 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -8,7 +8,7 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-      <Label layoutX="339.0" layoutY="1.0" text="Home" textFill="WHITE">
+      <Label id="lable" layoutX="339.0" layoutY="1.0" text="Home">
          <font>
             <Font name="Centaur" size="31.0" />
          </font>
diff --git a/src/assets/layout/instance.fxml b/src/assets/layout/instance.fxml
index 34ccae5..e1d8f98 100644
--- a/src/assets/layout/instance.fxml
+++ b/src/assets/layout/instance.fxml
@@ -9,13 +9,13 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="324.0" layoutY="1.0" text="Instances" textFill="WHITE">
+        <Label id="lable" layoutX="324.0" layoutY="1.0" text="Instances">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
       <Button id="Launch-VM" layoutX="34.0" layoutY="105.0" mnemonicParsing="false" text="Launch" />
-      <Label layoutX="34.0" layoutY="79.0" text="Vanilla Minecraft" textFill="WHITE">
+      <Label id="lable" layoutX="34.0" layoutY="79.0" text="Vanilla Minecraft">
          <font>
             <Font name="Centaur" size="21.0" />
          </font>
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index da517de..e90d716 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -10,10 +10,10 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="rectangle" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" text="X" textFill="WHITE" />
-       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-" textFill="WHITE" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" text="X"/>
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-"/>
        <ImageView id="icon" fitHeight="50.0" fitWidth="50.0" layoutX="14.0" />
-       <Label layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
+       <Label id="lable" layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher">
          <font>
             <Font name="Centaur" size="24.0" />
          </font>
@@ -41,7 +41,7 @@
        </Button>
       <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
       <Label id="version" layoutX="17.0" layoutY="455.0" text="Version : $v" textFill="white" />
-      <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
+      <Label id="lable" layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
          <font>
             <Font size="11.0" />
          </font>
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index 7acc3c6..fdbc253 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -9,7 +9,7 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="40.0" layoutY="1.0" text="Modpacks" textFill="WHITE">
+        <Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index 91270c4..d92e53e 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -9,18 +9,18 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
-        <Label layoutX="331.0" layoutY="1.0" text="Settings" textFill="WHITE">
+        <Label id="lable" layoutX="331.0" layoutY="1.0" text="Settings" textFill="WHITE">
             <font>
                 <Font name="Centaur" size="31.0" />
             </font>
         </Label>
       <Rectangle id="rectangle-2" height="40.0" layoutY="40.0" width="750.0" />
-      <Button id="Settings-Gen-btn" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="selected" text="General" textFill="WHITE" />
-      <Button id="Settings-Mine-btn" layoutX="100.0" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="tab" text="Minecraft" textFill="WHITE">
+      <Button id="Settings-Gen-btn" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="selected" text="General" />
+      <Button id="Settings-Mine-btn" layoutX="100.0" layoutY="40.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" styleClass="tab" text="Minecraft">
          <font>
             <Font name="Candara" size="12.0" />
          </font>
       </Button>
-      <Pane id="Settings-Pane" layoutY="90.0" prefHeight="360.0" prefWidth="750.0" />
+      <Pane id="Settings-Pane" layoutY="80.0" prefHeight="370.0" prefWidth="750.0" />
     </children>
 </Pane>
diff --git a/src/assets/layout/settings_generic.fxml b/src/assets/layout/settings_generic.fxml
index f5e093a..fdbdf93 100644
--- a/src/assets/layout/settings_generic.fxml
+++ b/src/assets/layout/settings_generic.fxml
@@ -7,7 +7,7 @@
 
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Label layoutX="22.0" layoutY="14.0" text="General Settings" textFill="WHITE">
+      <Label id="lable" layoutX="22.0" layoutY="14.0" text="General Settings">
          <font>
             <Font name="Centaur" size="25.0" />
          </font>
@@ -15,7 +15,7 @@
       <Button id="light-theme" layoutX="242.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="light" />
       <Button id="dark-theme" layoutX="172.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="dark" />
       <Button id="default-theme" layoutX="100.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="default" />
-      <Label layoutX="35.0" layoutY="75.0" text="Theme:" textFill="WHITE">
+      <Label id="lable" layoutX="35.0" layoutY="75.0" text="Theme:">
          <font>
             <Font name="Centaur" size="17.0" />
          </font>
diff --git a/src/assets/layout/settings_minecraft.fxml b/src/assets/layout/settings_minecraft.fxml
index 3e64daa..b751f25 100644
--- a/src/assets/layout/settings_minecraft.fxml
+++ b/src/assets/layout/settings_minecraft.fxml
@@ -6,7 +6,7 @@
 
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-        <Label layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
+        <Label id="lable" layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
             <font>
                 <Font name="Centaur" size="25.0" />
             </font>
diff --git a/src/assets/style/default-theme.css b/src/assets/style/default-theme.css
index 71fe0f1..39d2e74 100644
--- a/src/assets/style/default-theme.css
+++ b/src/assets/style/default-theme.css
@@ -3,14 +3,17 @@
 }
 #rectangle {
     -fx-fill: #050517;
+    -fx-text-fill: white;
 }
 
 #rectangle-1 {
     -fx-fill: #080920;
+    -fx-text-fill: white;
 }
 
 #rectangle-2 {
     -fx-fill: #0d0d39;
+    -fx-text-fill: white;
 }
 
 #default-theme,#dark-theme, #light-theme {
@@ -37,14 +40,21 @@
     -fx-text-fill: black;
 }
 
+#lable {
+    -fx-text-fill: white;
+}
+
 #Modpack-back {
     -fx-fill: #0a0e2e;
+    -fx-text-fill: white;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: white;
 }
 #min:hover, #exit:hover{
     -fx-background-color: #bf0000;
+    -fx-text-fill: white;
 }
 #search-modpacks {
     -fx-text-inner-color: white;
@@ -52,6 +62,10 @@
     -fx-padding: 10px;
 }
 
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: white;
+}
+
 .tab {
     -fx-background-color: rgba(0, 0, 0, 0);
     -fx-background-radius: 0em;
diff --git a/src/assets/style/light-theme.css b/src/assets/style/light-theme.css
index 94a2f41..fb08e2e 100644
--- a/src/assets/style/light-theme.css
+++ b/src/assets/style/light-theme.css
@@ -23,7 +23,7 @@
     -fx-background-color: #bf0000;
 }
 #search-modpacks {
-    -fx-text-inner-color: white;
+    -fx-text-inner-color: black;
     -fx-background-color: rgba(0, 0, 0, 0.17);
     -fx-padding: 10px;
 }