diff --git a/Launcher/build.gradle b/Launcher/build.gradle
index 6e1553e9..1cd76ea4 100644
--- a/Launcher/build.gradle
+++ b/Launcher/build.gradle
@@ -39,7 +39,6 @@
 dependencies {
     pack project(':LauncherAuthlib')
     bundle 'com.github.oshi:oshi-core:3.13.0'
-    bundle 'com.jfoenix:jfoenix:8.0.8'
     bundle 'de.jensd:fontawesomefx:8.9'
     bundle 'org.apache.httpcomponents:httpclient:4.5.7'
     pack 'io.netty:netty-codec-http:4.1.36.Final'
diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index acd7ba4b..f1e11f91 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -255,7 +255,7 @@ function verifyLauncher(e) {
             var iter = 0;
             authTypes = {};
             result.list.forEach(function(auth_type, i, arr) {
-                var serverAuth = new com.jfoenix.controls.JFXComboBox();
+                var serverAuth = new javafx.scene.control.ComboBox();
                 serverAuth.getStyleClass().add("authOptions");
                 authOptions.getItems().add(auth_type.displayName);
                 authTypes[auth_type.displayName] = auth_type.name;
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index 89efbb21..9666c28e 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.fxml
+++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXTextArea?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.Pane?>
@@ -16,12 +16,12 @@
     </stylesheets>
 
     <!-- Debug controls -->
-    <JFXTextArea fx:id="output" focusColor="#5fd97a" prefHeight="450.0" prefWidth="693.0">
+    <TextArea fx:id="output" prefHeight="450.0" prefWidth="693.0">
         <padding>
             <Insets left="10.0" right="10.0"/>
         </padding>
-    </JFXTextArea>
-    <JFXButton fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0"
+    </TextArea>
+    <Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0"
                text="Копировать"/>
-    <JFXButton fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить"/>
+    <Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить"/>
 </Pane>
diff --git a/Launcher/runtime/dialog/overlay/processing/processing.fxml b/Launcher/runtime/dialog/overlay/processing/processing.fxml
index ad85211f..fb12c25f 100644
--- a/Launcher/runtime/dialog/overlay/processing/processing.fxml
+++ b/Launcher/runtime/dialog/overlay/processing/processing.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXSpinner?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import java.net.URL?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
@@ -13,7 +13,7 @@
         <!-- Description -->
         <Label fx:id="description" alignment="CENTER" contentDisplay="CENTER" layoutX="205.0" layoutY="328.0"
                prefHeight="87.0" prefWidth="283.0" text="..." textAlignment="CENTER"/>
-        <JFXSpinner fx:id="spinner" layoutX="291.0" layoutY="165.0" prefHeight="120.0" prefWidth="110.0"/>
+        <ProgressIndicator fx:id="spinner" layoutX="291.0" layoutY="165.0" prefHeight="120.0" prefWidth="110.0"/>
     </children>
     <stylesheets>
         <URL value="@processing.css"/>
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml
index 90358a27..6d8f24db 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXCheckBox?>
-<?import com.jfoenix.controls.JFXSlider?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Slider?>
 <?import java.net.URL?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.layout.Pane?>
@@ -17,21 +17,21 @@
     <children>
         <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
             <children>
-                <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" unCheckedColor="#909090" />
+                <CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" />
                 <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
-                <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" unCheckedColor="#909090" />
+                <CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" />
                 <Text fill="#8c8c8c" layoutX="40.0" layoutY="261.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
-                <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="183.0" text="Режим Отладки" unCheckedColor="#909090" />
+                <CheckBox id="debug" layoutX="13.0" layoutY="183.0" text="Режим Отладки" />
                 <Text fill="#8c8c8c" layoutX="40.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="637.0000016447157" y="15.0" />
                 <TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0">
                     <Text fx:id="ramLabel" />
                 </TextFlow>
-                <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
-                <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
+                <Button fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
+                <Button fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
                 <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" />
-                <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
+                <Button fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
                 <Text layoutX="16.0" layoutY="28.0">Выделение памяти:</Text>
-                <JFXSlider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
+                <Slider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
                 <Pane fx:id="transferDialog" prefHeight="425.0" prefWidth="694.0" visible="false">
                     <children>
                         <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
@@ -39,12 +39,12 @@
                                 <Font size="19.0" />
                             </font>
                         </Text>
-                        <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
-                        <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
+                        <Button fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
+                        <Button fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
                     </children>
                 </Pane>
                 <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
-            <JFXCheckBox fx:id="featureStore" checkedColor="#5fd97a" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" unCheckedColor="#909090" />
+            <CheckBox fx:id="featureStore" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" />
             <Text fill="#8c8c8c" layoutX="40.0" layoutY="309.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Используется для экономии вашего трафика, аналогичные файлы будут скопированы с других игровых клиентов" wrappingWidth="636.9999872148037" y="15.0" />
             </children>
         </Pane>
diff --git a/Launcher/runtime/dialog/overlay/update/update.fxml b/Launcher/runtime/dialog/overlay/update/update.fxml
index c44e8bc9..2e60fe23 100644
--- a/Launcher/runtime/dialog/overlay/update/update.fxml
+++ b/Launcher/runtime/dialog/overlay/update/update.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXSpinner?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import java.net.URL?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
@@ -17,7 +17,7 @@
                   <Font name="System Bold" size="20.0" />
                </font>
             </Label>
-            <JFXSpinner fx:id="progress" layoutX="98.0" layoutY="226.0" prefHeight="100.0" prefWidth="100.0" />
+            <ProgressIndicator fx:id="progress" layoutX="98.0" layoutY="226.0" prefHeight="100.0" prefWidth="100.0" />
             <Label fx:id="description" layoutX="216.0" layoutY="226.0" prefHeight="100.0" prefWidth="380.0" text="..." textFill="WHITE">
                <font>
                   <Font name="System Bold" size="16.0" />
diff --git a/Launcher/runtime/dialog/scenes/console/console.fxml b/Launcher/runtime/dialog/scenes/console/console.fxml
index 738a5506..71843dd6 100644
--- a/Launcher/runtime/dialog/scenes/console/console.fxml
+++ b/Launcher/runtime/dialog/scenes/console/console.fxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXTextArea?>
-<?import com.jfoenix.controls.JFXTextField?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
@@ -15,36 +15,36 @@
     <children>
         <Pane fx:id="bar" layoutX="692.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
             <children>
-                <JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464"
+                <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" 
                            text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER"/>
                     </graphic>
-                </JFXButton>
-                <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text=""
+                </Button>
+                <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text=""
                            textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER"/>
                     </graphic>
-                </JFXButton>
+                </Button>
             </children>
         </Pane>
-        <JFXTextArea fx:id="output" focusColor="#d8d8d8" prefHeight="419.0" prefWidth="692.0" unFocusColor="#ffffff00">
+        <TextArea fx:id="output" prefHeight="419.0" prefWidth="692.0">
             <padding>
                 <Insets left="10.0" top="10.0"/>
             </padding>
-        </JFXTextArea>
-        <JFXTextField fx:id="textField" focusColor="#909090" layoutY="420.0" prefHeight="30.0" prefWidth="543.0"
-                      promptText="Введите команду..." unFocusColor="#ffffff00">
+        </TextArea>
+        <TextField fx:id="textField" layoutY="420.0" prefHeight="30.0" prefWidth="543.0"
+                      promptText="Введите команду...">
             <opaqueInsets>
                 <Insets/>
             </opaqueInsets>
             <padding>
                 <Insets left="10.0"/>
             </padding>
-        </JFXTextField>
-        <JFXButton fx:id="send" defaultButton="true" layoutX="542.0" layoutY="420.0" prefHeight="30.0" prefWidth="147.0"
-                   ripplerFill="WHITE" text="Выполнить"/>
+        </TextField>
+        <Button fx:id="send" defaultButton="true" layoutX="542.0" layoutY="420.0" prefHeight="30.0" prefWidth="147.0"
+                    text="Выполнить"/>
         <Line endX="594.0" layoutX="98.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead"/>
     </children>
     <stylesheets>
diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml
index a2db6ff7..b4d7d5a3 100644
--- a/Launcher/runtime/dialog/scenes/login/login.fxml
+++ b/Launcher/runtime/dialog/scenes/login/login.fxml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXCheckBox?>
-<?import com.jfoenix.controls.JFXComboBox?>
-<?import com.jfoenix.controls.JFXMasonryPane?>
-<?import com.jfoenix.controls.JFXPasswordField?>
-<?import com.jfoenix.controls.JFXTextField?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import java.lang.String?>
 <?import java.net.URL?>
@@ -22,40 +21,40 @@
                   <children>
                       <Pane fx:id="logo" layoutX="72.0" layoutY="62.0" prefWidth="124.0" styleClass="logo">
                       </Pane>
-                      <JFXTextField id="login" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="196.0" promptText="Логин" unFocusColor="#dadada" />
-                      <JFXPasswordField id="password" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="249.0" promptText="Пароль" unFocusColor="#dadada" />
-                      <JFXButton id="goAuth" layoutX="34.0" layoutY="370.0" styleClass="auth" text="ВОЙТИ" />
-                      <JFXCheckBox id="rememberchb" fx:id="savePassword" checkedColor="#5fd97a" contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0" text="Сохранить пароль" textFill="#dadada" unCheckedColor="#909090" />
-                      <JFXComboBox id="authOptions" fx:id="authOptions" focusColor="#5fd97a" layoutX="34.0" layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Способ авторизации" unFocusColor="#70666600">
+                      <TextField id="login" alignment="CENTER" layoutX="34.0" layoutY="196.0" promptText="Логин" />
+                      <PasswordField id="password" alignment="CENTER" layoutX="34.0" layoutY="249.0" promptText="Пароль" />
+                      <Button id="goAuth" layoutX="34.0" layoutY="370.0" styleClass="auth" text="ВОЙТИ" />
+                      <CheckBox id="rememberchb" fx:id="savePassword" contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0" text="Сохранить пароль" textFill="#dadada" />
+                      <ComboBox id="authOptions" fx:id="authOptions" layoutX="34.0" layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Способ авторизации">
                           <styleClass>
                               <String fx:value="combologin" />
                               <String fx:value="combologin-popup" />
                           </styleClass>
-                      </JFXComboBox>
+                      </ComboBox>
                       <Hyperlink id="link" fx:id="link" layoutX="94.0" layoutY="422.0" prefHeight="19.0" prefWidth="81.0" textAlignment="CENTER" />
                   </children>
               </Pane>
-              <JFXMasonryPane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" />
+              <Pane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" />
           </children>
       </Pane>
       <Pane id="mask" opacity="0.0" prefHeight="450.0" prefWidth="694.0" visible="false" />
       <Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
           <children>
-              <JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+              <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                   </graphic>
-              </JFXButton>
-              <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
+              </Button>
+              <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                   </graphic>
-              </JFXButton>
-              <JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+              </Button>
+              <Button id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0"  text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" textAlignment="CENTER" />
                   </graphic>
-              </JFXButton>
+              </Button>
           </children>
             </Pane>
         </children>
diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
index 70e6b20c..c5dd660f 100644
--- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
+++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
+<?import javafx.scene.control.Button?>
 <?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import java.net.URL?>
@@ -22,10 +22,10 @@
                         <ScrollPane id="serverlist" hbarPolicy="NEVER" layoutX="1.0" prefHeight="450.0" prefWidth="307.0" visible="true">
                             <content>
                                 <FlowPane focusTraversable="false" prefHeight="446.0" prefWidth="306.0" prefWrapLength="0.0" rowValignment="TOP" vgap="10.0" visible="true">
-                                    <JFXButton id="servercontainer" ripplerFill="#ffffff80" text="">
+                                    <Button id="servercontainer"  text="">
                                         <FlowPane.margin>
                                             <Insets bottom="10.0" />
-                                        </FlowPane.margin></JFXButton>
+                                        </FlowPane.margin></Button>
                                     <padding>
                                         <Insets left="10.0" top="10.0" />
                                     </padding>
@@ -46,15 +46,15 @@
                                         </FlowPane>
                                     </content>
                                 </ScrollPane>
-                                <JFXButton id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
+                                <Button id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
                                     <font>
                                         <Font size="22.0" />
                                     </font>
-                                </JFXButton>
-                                <JFXButton id="clientSettings" alignment="CENTER" centerShape="false" contentDisplay="CENTER" layoutX="305.0" layoutY="380.0" prefHeight="51.0" prefWidth="60.0" ripplerFill="#84da96" styleClass="clientSettings" text="" textAlignment="CENTER">
+                                </Button>
+                                <Button id="clientSettings" alignment="CENTER" centerShape="false" contentDisplay="CENTER" layoutX="305.0" layoutY="380.0" prefHeight="51.0" prefWidth="60.0"  styleClass="clientSettings" text="" textAlignment="CENTER">
                                     <graphic>
                                         <FontAwesomeIconView fill="WHITE" glyphName="SLIDERS" size="30.0" />
-                                    </graphic></JFXButton>
+                                    </graphic></Button>
                                 <Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="165.0" layoutY="12.0" prefHeight="25.0" prefWidth="97.0" text="12/100" textAlignment="RIGHT" textFill="WHITE">
                                     <font>
                                         <Font name="System Bold" size="16.0" />
@@ -65,7 +65,7 @@
                                         <Font name="System Bold" size="18.0" />
                                     </font>
                                 </Label>
-                                <JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0" ripplerFill="#61616100" text="Выйти" textAlignment="CENTER" />
+                                <Button id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0"  text="Выйти" textAlignment="CENTER" />
                             </children>
                         </Pane>
                     </children>
@@ -74,31 +74,31 @@
         </Pane>
         <Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
             <children>
-                <JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+                <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                     </graphic>
-                </JFXButton>
-                <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
+                </Button>
+                <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                     </graphic>
-                </JFXButton>
-                <JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+                </Button>
+                <Button id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0"  text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" smooth="false" textAlignment="CENTER" />
                     </graphic>
-                </JFXButton>
-                <JFXButton id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+                </Button>
+                <Button id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0"  text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="SETTINGS" size="20" textAlignment="CENTER" />
                     </graphic>
-                </JFXButton>
-                <JFXButton id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+                </Button>
+                <Button id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0"  text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CONSOLE" size="20" textAlignment="CENTER" />
                     </graphic>
-                </JFXButton>
+                </Button>
             </children>
         </Pane>
         <Pane id="mask" opacity="0.0" prefHeight="450.0" prefWidth="694.0" visible="false" />
diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml
index a0bb1ef0..4884c670 100644
--- a/Launcher/runtime/dialog/scenes/options/options.fxml
+++ b/Launcher/runtime/dialog/scenes/options/options.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
+<?import javafx.scene.control.Button?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
@@ -38,21 +38,21 @@
        </Pane>
        <Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
            <children>
-               <JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+               <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                    </graphic>
-               </JFXButton>
-               <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
+               </Button>
+               <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                    </graphic>
-               </JFXButton>
-               <JFXButton id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" ripplerFill="#646464" text="" textAlignment="CENTER">
+               </Button>
+               <Button id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0"  text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="CHEVRON_LEFT" size="30" textAlignment="CENTER" />
                    </graphic>
-               </JFXButton>
+               </Button>
            </children>
        </Pane>
    </children>
diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js
index 112c8c9c..98c28232 100644
--- a/Launcher/runtime/dialog/scenes/options/options.js
+++ b/Launcher/runtime/dialog/scenes/options/options.js
@@ -83,7 +83,7 @@ var options = {
             var nodelist = new java.util.ArrayList;
 
             modlist.getChildren().forEach(function(node,i,arr) {
-                if(node instanceof com.jfoenix.controls.JFXCheckBox)
+                if(node instanceof javafx.scene.control.CheckBox)
                     nodelist.add(node);
             });
             nodelist.forEach(function(node,i,arr) {
@@ -109,7 +109,7 @@ var options = {
                             modDescription = modFile.info;
                         if(modFile.subTreeLevel != null && modFile.subTreeLevel > 1)
                             subLevel = modFile.subTreeLevel;
-                         var testMod = new com.jfoenix.controls.JFXCheckBox(modName);
+                         var testMod = new javafx.scene.control.CheckBox(modName);
                          testMod.getStyleClass().add("checkboxOpt");
 
                         if(subLevel > 1)