diff --git a/JFoenixParts b/JFoenixParts
index 149f2f58..47ed3df2 160000
--- a/JFoenixParts
+++ b/JFoenixParts
@@ -1 +1 @@
-Subproject commit 149f2f5884d21af9caaa1c7f6709499f9cab903b
+Subproject commit 47ed3df228fa63b7876eb288a73bb308325bc43f
diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index 631d3744..fc659afc 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -258,7 +258,7 @@ function verifyLauncher(e) {
             var iter = 0;
             authTypes = {};
             result.list.forEach(function(auth_type, i, arr) {
-                var serverAuth = new javafx.scene.control.ComboBox();
+                var serverAuth = new com.jfoenixparts.controls.JFXPComboBox();
                 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.css b/Launcher/runtime/dialog/overlay/debug/debug.css
index 4edf88b4..f3dd4820 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.css
+++ b/Launcher/runtime/dialog/overlay/debug/debug.css
@@ -24,7 +24,7 @@ #overlay > #action.close {
     -fx-background-radius: 0;
     -fx-text-fill: white;
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-color: #2d83ce;
     -fx-pref-width: 150px;
     -fx-pref-height: 25px;
@@ -44,7 +44,7 @@ #overlay > #action.kill {
     -fx-background-radius: 0;
     -fx-text-fill: white;
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-color: #CE5757;
     -fx-pref-width: 150px;
     -fx-pref-height: 25px;
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index 9666c28e..1f5489c0 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 javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
+<?import com.jfoenixparts.controls.JFXPButton?>
+<?import com.jfoenixparts.controls.JFXPTextArea?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.Pane?>
@@ -16,12 +16,12 @@
     </stylesheets>
 
     <!-- Debug controls -->
-    <TextArea fx:id="output" prefHeight="450.0" prefWidth="693.0">
+    <JFXPTextArea fx:id="output" focusColor="#5fd97a" prefHeight="450.0" prefWidth="693.0">
         <padding>
             <Insets left="10.0" right="10.0"/>
         </padding>
-    </TextArea>
-    <Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0"
+    </JFXPTextArea>
+    <JFXPButton fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0"
                text="Копировать"/>
-    <Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить"/>
+    <JFXPButton 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 fb12c25f..607357a4 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 javafx.scene.control.ProgressIndicator?>
+<?import com.jfoenixparts.controls.JFXPSpinner?>
 <?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"/>
-        <ProgressIndicator fx:id="spinner" layoutX="291.0" layoutY="165.0" prefHeight="120.0" prefWidth="110.0"/>
+        <JFXPSpinner 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 6d8f24db..7dbceef3 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 javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Slider?>
+<?import com.jfoenixparts.controls.JFXPButton?>
+<?import com.jfoenixparts.controls.JFXPCheckBox?>
+<?import com.jfoenixparts.controls.JFXPSlider?>
 <?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>
-                <CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" />
+                <JFXPCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" unCheckedColor="#909090" />
                 <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
-                <CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" />
+                <JFXPCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" unCheckedColor="#909090" />
                 <Text fill="#8c8c8c" layoutX="40.0" layoutY="261.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
-                <CheckBox id="debug" layoutX="13.0" layoutY="183.0" text="Режим Отладки" />
+                <JFXPCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="183.0" text="Режим Отладки" unCheckedColor="#909090" />
                 <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>
-                <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" />
+                <JFXPButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
+                <JFXPButton 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" />
-                <Button fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
+                <JFXPButton 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>
-                <Slider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
+                <JFXPSlider 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>
-                        <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="Нет, не нужно." />
+                        <JFXPButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
+                        <JFXPButton 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" />
-            <CheckBox fx:id="featureStore" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" />
+            <JFXPCheckBox fx:id="featureStore" checkedColor="#5fd97a" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" unCheckedColor="#909090" />
             <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 2e60fe23..49169777 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 javafx.scene.control.ProgressIndicator?>
+<?import com.jfoenixparts.controls.JFXPSpinner?>
 <?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>
-            <ProgressIndicator fx:id="progress" layoutX="98.0" layoutY="226.0" prefHeight="100.0" prefWidth="100.0" />
+            <JFXPSpinner 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 71843dd6..417267bb 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 javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
+<?import com.jfoenixparts.controls.JFXPButton?>
+<?import com.jfoenixparts.controls.JFXPTextArea?>
+<?import com.jfoenixparts.controls.JFXPTextField?>
 <?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>
-                <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" 
+                <JFXPButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464"
                            text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER"/>
                     </graphic>
-                </Button>
-                <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text=""
+                </JFXPButton>
+                <JFXPButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text=""
                            textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER"/>
                     </graphic>
-                </Button>
+                </JFXPButton>
             </children>
         </Pane>
-        <TextArea fx:id="output" prefHeight="419.0" prefWidth="692.0">
+        <JFXPTextArea fx:id="output" focusColor="#d8d8d8" prefHeight="419.0" prefWidth="692.0" unFocusColor="#ffffff00">
             <padding>
                 <Insets left="10.0" top="10.0"/>
             </padding>
-        </TextArea>
-        <TextField fx:id="textField" layoutY="420.0" prefHeight="30.0" prefWidth="543.0"
-                      promptText="Введите команду...">
+        </JFXPTextArea>
+        <JFXPTextField fx:id="textField" focusColor="#909090" layoutY="420.0" prefHeight="30.0" prefWidth="543.0"
+                      promptText="Введите команду..." unFocusColor="#ffffff00">
             <opaqueInsets>
                 <Insets/>
             </opaqueInsets>
             <padding>
                 <Insets left="10.0"/>
             </padding>
-        </TextField>
-        <Button fx:id="send" defaultButton="true" layoutX="542.0" layoutY="420.0" prefHeight="30.0" prefWidth="147.0"
-                    text="Выполнить"/>
+        </JFXPTextField>
+        <JFXPButton fx:id="send" defaultButton="true" layoutX="542.0" layoutY="420.0" prefHeight="30.0" prefWidth="147.0"
+                   ripplerFill="WHITE" 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 b4d7d5a3..65d00708 100644
--- a/Launcher/runtime/dialog/scenes/login/login.fxml
+++ b/Launcher/runtime/dialog/scenes/login/login.fxml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?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 com.jfoenixparts.controls.JFXPButton?>
+<?import com.jfoenixparts.controls.JFXPCheckBox?>
+<?import com.jfoenixparts.controls.JFXPComboBox?>
+<?import com.jfoenixparts.controls.JFXPMasonryPane?>
+<?import com.jfoenixparts.controls.JFXPPasswordField?>
+<?import com.jfoenixparts.controls.JFXPTextField?>
 <?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
 <?import java.lang.String?>
 <?import java.net.URL?>
@@ -21,40 +22,40 @@
                   <children>
                       <Pane fx:id="logo" layoutX="72.0" layoutY="62.0" prefWidth="124.0" styleClass="logo">
                       </Pane>
-                      <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="Способ авторизации">
+                      <JFXPTextField id="login" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="196.0" promptText="Логин" unFocusColor="#dadada" />
+                      <JFXPPasswordField id="password" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="249.0" promptText="Пароль" unFocusColor="#dadada" />
+                      <JFXPButton id="goAuth" layoutX="34.0" layoutY="370.0" styleClass="auth" text="ВОЙТИ" />
+                      <JFXPCheckBox id="rememberchb" fx:id="savePassword" checkedColor="#5fd97a" contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0" text="Сохранить пароль" textFill="#dadada" unCheckedColor="#909090" />
+                      <JFXPComboBox id="authOptions" fx:id="authOptions" focusColor="#5fd97a" layoutX="34.0" layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Способ авторизации" unFocusColor="#70666600">
                           <styleClass>
                               <String fx:value="combologin" />
                               <String fx:value="combologin-popup" />
                           </styleClass>
-                      </ComboBox>
+                      </JFXPComboBox>
                       <Hyperlink id="link" fx:id="link" layoutX="94.0" layoutY="422.0" prefHeight="19.0" prefWidth="81.0" textAlignment="CENTER" />
                   </children>
               </Pane>
-              <Pane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" />
+              <JFXPMasonryPane 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>
-              <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
+              <JFXPButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                   </graphic>
-              </Button>
-              <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
+              </JFXPButton>
+              <JFXPButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                   </graphic>
-              </Button>
-              <Button id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0"  text="" textAlignment="CENTER">
+              </JFXPButton>
+              <JFXPButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                   <graphic>
                       <MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" textAlignment="CENTER" />
                   </graphic>
-              </Button>
+              </JFXPButton>
           </children>
             </Pane>
         </children>
diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml
index c5dd660f..a8dec2f4 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 javafx.scene.control.Button?>
+<?import com.jfoenixparts.controls.JFXPButton?>
 <?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">
-                                    <Button id="servercontainer"  text="">
+                                    <JFXPButton id="servercontainer" ripplerFill="#ffffff80" text="">
                                         <FlowPane.margin>
                                             <Insets bottom="10.0" />
-                                        </FlowPane.margin></Button>
+                                        </FlowPane.margin></JFXPButton>
                                     <padding>
                                         <Insets left="10.0" top="10.0" />
                                     </padding>
@@ -46,15 +46,15 @@
                                         </FlowPane>
                                     </content>
                                 </ScrollPane>
-                                <Button id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
+                                <JFXPButton id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
                                     <font>
                                         <Font size="22.0" />
                                     </font>
-                                </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">
+                                </JFXPButton>
+                                <JFXPButton 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">
                                     <graphic>
                                         <FontAwesomeIconView fill="WHITE" glyphName="SLIDERS" size="30.0" />
-                                    </graphic></Button>
+                                    </graphic></JFXPButton>
                                 <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>
-                                <Button id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0"  text="Выйти" textAlignment="CENTER" />
+                                <JFXPButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0" ripplerFill="#61616100" 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>
-                <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
+                <JFXPButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                     </graphic>
-                </Button>
-                <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
+                </JFXPButton>
+                <JFXPButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                     </graphic>
-                </Button>
-                <Button id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0"  text="" textAlignment="CENTER">
+                </JFXPButton>
+                <JFXPButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" smooth="false" textAlignment="CENTER" />
                     </graphic>
-                </Button>
-                <Button id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0"  text="" textAlignment="CENTER">
+                </JFXPButton>
+                <JFXPButton id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="SETTINGS" size="20" textAlignment="CENTER" />
                     </graphic>
-                </Button>
-                <Button id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0"  text="" textAlignment="CENTER">
+                </JFXPButton>
+                <JFXPButton id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                     <graphic>
                         <MaterialDesignIconView fill="WHITE" glyphName="CONSOLE" size="20" textAlignment="CENTER" />
                     </graphic>
-                </Button>
+                </JFXPButton>
             </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 4884c670..d0d45712 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 javafx.scene.control.Button?>
+<?import com.jfoenixparts.controls.JFXPButton?>
 <?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>
-               <Button id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0"  text="" textAlignment="CENTER">
+               <JFXPButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
                    </graphic>
-               </Button>
-               <Button id="close" alignment="CENTER" contentDisplay="CENTER"  text="" textAlignment="CENTER">
+               </JFXPButton>
+               <JFXPButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
                    </graphic>
-               </Button>
-               <Button id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0"  text="" textAlignment="CENTER">
+               </JFXPButton>
+               <JFXPButton id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" ripplerFill="#646464" text="" textAlignment="CENTER">
                    <graphic>
                        <MaterialDesignIconView fill="WHITE" glyphName="CHEVRON_LEFT" size="30" textAlignment="CENTER" />
                    </graphic>
-               </Button>
+               </JFXPButton>
            </children>
        </Pane>
    </children>
diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js
index 98c28232..8ad762d2 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 javafx.scene.control.CheckBox)
+                if(node instanceof com.jfoenixparts.controls.JFXPCheckBox)
                     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 javafx.scene.control.CheckBox(modName);
+                         var testMod = new com.jfoenixparts.controls.JFXPCheckBox(modName);
                          testMod.getStyleClass().add("checkboxOpt");
 
                         if(subLevel > 1)
diff --git a/Launcher/runtime/dialog/servers.css b/Launcher/runtime/dialog/servers.css
index ce53884e..71ee3ca5 100644
--- a/Launcher/runtime/dialog/servers.css
+++ b/Launcher/runtime/dialog/servers.css
@@ -2,7 +2,7 @@
 
 /* Server buttons */
 .server-button {
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-font-weight: bold;
     -fx-font-size: 16pt;
     -fx-background-color: transparent;
diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css
index b2b2f356..3eaa3f22 100644
--- a/Launcher/runtime/dialog/styles.css
+++ b/Launcher/runtime/dialog/styles.css
@@ -1,60 +1,3 @@
-/*-- Without jfoenix --*/
-Button {
-	-fx-background-color: TRANSPARENT, TRANSPARENT, TRANSPARENT, TRANSPARENT;
-    -fx-background-radius: 3px;
-    -fx-background-insets: 0px;
-}
-
-CheckBox .box-container {
-    -fx-shape: "M 400 100 L 400 100 A 50 50 0 1 1 400 250 A 50 50 0 1 1 400 100 ";
-    -fx-padding: 10;
-}
-
-CheckBox .box,
-CheckBox:indeterminate .box,
-CheckBox:indeterminate:selected .box{
-    -fx-pref-width: 18;
-    -fx-pref-height: 18;
-
-    -fx-background-color: TRANSPARENT;
-    -fx-background-radius: 2;
-
-    -fx-border-color: #909090;
-    -fx-border-style: solid;
-    -fx-border-radius: 2;
-    -fx-border-width: 2;
-}
-
-CheckBox:selected .box {
-    -fx-border-color: #5fd97a;
-	-fx-background-color: #5fd97a;
-}
-
-CheckBox .mark {
-	 -fx-background-color: TRANSPARENT;
-}
-
-CheckBox:selected .mark {
-    -fx-shape: "M384 690l452-452 60 60-512 512-238-238 60-60z";
-    -fx-max-width: 15;
-    -fx-max-height: 12;
-
-    -fx-background-color: WHITE;
-
-    -fx-border-color: WHITE;
-    -fx-border-width: 2;
-    -fx-border-radius: 2;
-}
-
-CheckBox .indeterminate-mark{
-    -fx-background-color: #5fd97a;
-    -fx-background-radius: 2;
-    -fx-border-width: 0;
-    -fx-max-width: 10;
-    -fx-max-height: 10;
-}
-
-
 /*-- DrLeonardo Design --*/
 Button, CheckBox, ComboBox, RadioButton {
 	-fx-cursor: hand;
@@ -113,7 +56,7 @@ #bar {
 /** buttons in bar **/
 #close {
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-radius: 0;
     -fx-background-color: #CE5757;
     -fx-pref-width: 46px;
@@ -121,7 +64,7 @@ #close {
 }
 #hide, #back, #goConsole, #settings, #discord {
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-radius: 0;
     -fx-pref-width: 46px;
     -fx-pref-height: 45px;
@@ -148,7 +91,7 @@ #send {
     -fx-background-radius: 0;
     -fx-text-fill: black;
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-color: #ffffff;
     -fx-pref-width: 150px;
     -fx-pref-height: 30px;
@@ -172,7 +115,7 @@ #logo {
 
 /** Buttons & textarea**/
 .auth {
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-font-weight: bold;
     -fx-font-size: 13pt;
     -fx-background-radius: 0;
@@ -291,7 +234,7 @@ .serverentrance {
 
 /** buttons **/
 .clientLaunch{
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-font-weight: bold;
     -fx-font-size: 16pt;
     -fx-background-radius: 0;
@@ -300,7 +243,7 @@ .clientLaunch{
 }
 .clientSettings{
     -fx-background-position: center;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-background-color: #5fd97a;
     -fx-background-radius: 0;
 }
@@ -309,12 +252,12 @@ .clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; }
 
 /* Pressets options */
 .pressetLight, .pressetMedium, .pressetHigh {
-    -jfx-toggle-color: #5fd97a;
-    -jfx-untoggle-color: #FAFAFA;
-    -jfx-toggle-line-color: rgba(116, 192, 133, 0.79);
-    -jfx-untoggle-line-color: #999999;
-    -jfx-size: 10.0;
-    -jfx-disable-visual-focus: false;
+    -jfxp-toggle-color: #5fd97a;
+    -jfxp-untoggle-color: #FAFAFA;
+    -jfxp-toggle-line-color: rgba(116, 192, 133, 0.79);
+    -jfxp-untoggle-line-color: #999999;
+    -jfxp-size: 10.0;
+    -jfxp-disable-visual-focus: false;
 }
 
 /* Scrolls */
@@ -370,6 +313,11 @@ .description-text {
     -fx-font-size: 12px;
 }
 
+.checkboxOpt {
+    -jfxp-checked-color: #5fd97a;
+    -jfxp-unchecked-color: #909090;
+}
+
 .modname {
     -fx-text-fill: #323232;
 }
@@ -407,7 +355,7 @@ #serverinfo > .viewport {
 
 #servercontainer{
     -fx-background-color: transparent;
-    -jfx-button-type: FLAT;
+    -jfxp-button-type: FLAT;
     -fx-pref-width: 282px;
     -fx-pref-height: 75px;
 }