From e26d95b93d5ac47e204cdae560e5652e6ed6215d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9B=D0=B5?=
 =?UTF-8?q?=D0=BE?= <bjs4a3wqfigwzedlhsfv5@gmail.com>
Date: Sat, 6 Apr 2019 17:21:38 +0300
Subject: [PATCH] Update design

---
 Launcher/runtime/dialog/console.fxml          |  32 +++++++++
 Launcher/runtime/dialog/dialog.js             |  37 +++++++++-
 .../runtime/dialog/images/icons/forum.png     | Bin 0 -> 547 bytes
 Launcher/runtime/dialog/images/icons/help.png | Bin 0 -> 423 bytes
 .../runtime/dialog/images/icons/server.png    | Bin 0 -> 1102 bytes
 .../runtime/dialog/images/icons/settings1.png | Bin 0 -> 427 bytes
 .../runtime/dialog/images/icons/store.png     | Bin 0 -> 361 bytes
 Launcher/runtime/dialog/images/icons/vk.png   | Bin 0 -> 407 bytes
 Launcher/runtime/dialog/mainmenu.fxml         |   1 +
 .../runtime/dialog/overlay/debug/debug.css    |  34 ++++++----
 .../runtime/dialog/overlay/debug/debug.fxml   |  13 ++--
 .../runtime/dialog/overlay/debug/debug.js     |  11 ---
 .../dialog/overlay/options/options.css        |  64 ++----------------
 .../dialog/overlay/options/options.fxml       |  17 ++---
 .../runtime/dialog/overlay/options/options.js |   9 +--
 .../dialog/overlay/processing/processing.fxml |   6 +-
 .../dialog/overlay/processing/processing.js   |   6 +-
 .../dialog/overlay/settings/settings.css      |  29 +-------
 .../dialog/overlay/settings/settings.fxml     |  50 +++++++-------
 Launcher/runtime/dialog/styles.css            |  20 ++++++
 Launcher/runtime/engine/api.js                |   1 -
 Launcher/runtime/init.js                      |   8 ++-
 22 files changed, 174 insertions(+), 164 deletions(-)
 create mode 100644 Launcher/runtime/dialog/console.fxml
 create mode 100644 Launcher/runtime/dialog/images/icons/forum.png
 create mode 100644 Launcher/runtime/dialog/images/icons/help.png
 create mode 100644 Launcher/runtime/dialog/images/icons/server.png
 create mode 100644 Launcher/runtime/dialog/images/icons/settings1.png
 create mode 100644 Launcher/runtime/dialog/images/icons/store.png
 create mode 100644 Launcher/runtime/dialog/images/icons/vk.png

diff --git a/Launcher/runtime/dialog/console.fxml b/Launcher/runtime/dialog/console.fxml
new file mode 100644
index 00000000..1890848f
--- /dev/null
+++ b/Launcher/runtime/dialog/console.fxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTextArea?>
+<?import java.net.URL?>
+<?import javafx.scene.layout.Pane?>
+
+<!-- DrLeonardo Design -->
+
+<Pane fx:id="layout" prefWidth="740.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
+  <children>
+      <Pane fx:id="consolePane" prefHeight="425.0" prefWidth="693.0" styleClass="consolePane">
+         <children>
+             <!-- Debug controls -->
+             <JFXTextArea fx:id="output" prefHeight="425.0" prefWidth="693.0" />
+             <JFXButton fx:id="copy" defaultButton="true" layoutX="465.0" layoutY="386.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
+             <JFXButton fx:id="action" layoutX="579.0" layoutY="386.0" prefHeight="25.0" prefWidth="100.0" text="Убить" />
+         </children>
+      </Pane>
+      <Pane fx:id="bar" layoutX="693.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
+         <children>
+      	     <JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" text="" textAlignment="CENTER" />
+      	     <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" text="" textAlignment="CENTER" />
+             <JFXButton id="back" fx:id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" text="" textAlignment="CENTER" />
+         </children>
+      </Pane>
+      <Pane id="mask" opacity="0.0" prefHeight="425.0" prefWidth="694.0" visible="false" />
+  </children>
+  <stylesheets>
+    <URL value="@styles.css" />
+  </stylesheets>
+</Pane>
diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index 6b9f2104..a3981c87 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -9,6 +9,7 @@ var loginData;
 function initLauncher() {
     initLoginScene();
     initMenuScene();
+    initConsoleScene();
 
     debug.initOverlay();
     processing.initOverlay();
@@ -34,7 +35,7 @@ function initLoginScene() {
     bar = pane;
     loginPane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()});
     loginPane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)});
-    loginPane.lookup("#discord").setOnAction(function(){ openURL(config.discord_url); });
+    loginPane.lookup("#discord").setOnAction(function(){ openURL(config.discord); });
 
     var pane = loginPane.lookup("#authPane");
     authPane = pane;
@@ -82,6 +83,7 @@ function initMenuScene() {
     menuPane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)});
     menuPane.lookup("#discord").setOnAction(function(){ openURL(config.discord); });
     menuPane.lookup("#settings").setOnAction(goSettings);
+    menuPane.lookup("#goConsole").setOnAction(goConsole);
     menuPane.lookup("#logout").setOnAction(function(){
         setCurrentScene(loginScene);
     });
@@ -103,6 +105,32 @@ function initMenuScene() {
 
 }
 
+/* ======== init Console ======== */
+function initConsoleScene() {
+    consolePane.setOnMousePressed(function(event){ movePoint = new javafx.geometry.Point2D(event.getSceneX(), event.getSceneY())});
+    consolePane.setOnMouseDragged(function(event) {
+        if(movePoint === null) {
+            return;
+        }
+
+        stage.setX(event.getScreenX() - movePoint.getX());
+        stage.setY(event.getScreenY() - movePoint.getY());
+    });
+
+    var pane = consolePane.lookup("#bar");
+    bar = pane;
+    consolePane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()});
+    consolePane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)});
+    consolePane.lookup("#back").setOnAction(function(){
+        setCurrentScene(menuScene);
+    });
+
+    var pane = consolePane.lookup("#consolePane");
+    consolePane = pane;
+
+
+}
+
 /* ======== init Offline ======== */
 function initOffline() {
     stage.setTitle(config.title + " [Offline]");
@@ -146,6 +174,13 @@ function goAuth(event) {
     doAuth(login, rsaPassword);
 }
 
+/* ======== Console ======== */
+function goConsole(event) {
+    if (overlay.current !== null) {
+        return;
+    }
+}
+
 /* ======== Settings ======== */
 function goSettings(event) {
     // Verify there's no other overlays
diff --git a/Launcher/runtime/dialog/images/icons/forum.png b/Launcher/runtime/dialog/images/icons/forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c5725df4c5bf29c79bfea210816c82bfc6a2c9
GIT binary patch
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000~S000mO1^@s61<xPv0000WV@Og>004R=
z004l4008;_004mK002@5009+P0026d000+n*IFNt00009a7bBm000XR000XR0j(pw
zbpQYW7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNGmRwuX8-^Jg-Jv~R7gv$)VnK2
zaU93-Czm3j-2MZK$)F^~r0h&=21zE97^IZJ#6Teom{4}H7~EozY%Yr;B$vqTcz;fw
z)6ef*dY;3#Ud#7+&i8xH@B91x5{~1fs|2l>$1xu9iD#T(0qrP&?|EM$f(mp)O}-En
zdVve{A{$;EvtX2BOyL3P#4DEJHMI+e8O9aj#0&c1*0KvH)nNvWsKN%~hL-mfZf(0!
zDKzvayg`lYv4g*aX6|cPh&{YRp*L$lIX0Du8LD#*U&AqI$Y%7Q2qU;wB1UM21MoGx
zfxX@J#Wm2`o5VfR2{l_n;4b|@P|TtNdFVna=P((U(93##%!b<tYr2M7WI`KDH_bHm
zq2r?4MoWHxRjfm^yF&{C8#Y4^hJ^}`qZ(N-pS9&cM`{HVKRK8AC+Wm3qCy+%2)axA
z(FUDWyOw02%*>fTN-oZj%8ayRhv<OjYu5^7Cz_xy)b3iu5aytBxQi|5ZXAS`EFX4_
lNOnSnMp21hxBUNb65m}_9hz%laXJ71002ovPDHLkV1mLK;`IOk

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/images/icons/help.png b/Launcher/runtime/dialog/images/icons/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..b099470d6b29db643d0b7413da57388859f557d8
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000~S000mO1^@s61<xPv00004XF*Lt006O%
z3;baP00009a7bBm000XQ000XQ0h0Lxr2qf`7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%hhNGmRwuX8-^JB}qg<R7gwBlrc^MK@^6UMhi^DODrd#1Vil|EGhL0dkYR=M?=F6
zFtLz?k^&nG3uCm<L?JOO-@p6NVX|AysEJ?lC9`Dyx9rTkNn*(JykWz?gO{A+6rb@E
z*Z6=F?Ao-SL$MZK;RfsYzzaOISUeQb%Y5E&RSx$USS$_-Xc^rvd%-R?@dyW~<=yd$
zsl~$~d|j0JW{fAOy_?#cIl2ssa14ZXK<c=&IXC6w7qcQ93c&`t%jNQf9qi+~esEY?
ziEs$(=vQ%xr&#re78VbOu=XmHVsE1$tfsDFg#Llrky$((!fF9EwND$*%HbaOcx>@F
zD4-j}=MnwGB6=2!hav~423J$pp)c#<?_KH?OL2&|xWonOGS9GO)BYPtvIUExoWU$N
R2G;-p002ovPDHLkV1m@Gt)Tz_

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/images/icons/server.png b/Launcher/runtime/dialog/images/icons/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f88f144ceb2c4cfb1f39f47540c5ebc5d8eae2c
GIT binary patch
literal 1102
zcmeAS@N?(olHy`uVBq!ia0vp^%YfL3gAGVtt6!i5q*&4&eH|GXHuiJ>Nn{1`ISV`@
ziy0XB4uLSEsD@VqP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQP|vtm<!?Fz1M?YA
z7srr_xVJZbJwgIS*gpse3JOkF(z~-$pl~@yQ<uiBBIQNarO(|QWwKMcc;0%SJ|nQq
zspZfKll=y#R=VhL_av-f@xAQu_B5NQZ?Vks;`s2&{AV|=Kil#{{zv1#_j`?JAKv@^
zuBB5d^AG-wiVY@aEEA5kF<iPK;2<T<<dN*mkeS1w(96rXgs|iv^^F@h_MJNAl^z{^
zd+xMp({3L<dUX1s!-xBeiW%#gdH>Hk{P4vOzo+~wu3ioGkByCG-_G_x{Kkj%XV0BG
zxAIs_WaLk$uZ8L9>CxYp-GBY{-L0H$ukTnjIB!tYR#JKt5gIzRxTNIE%G+=2Of4;c
zZd$+od}v%;ovOC>>zus2cRwdgm=I-ZZfd&qqwUmpzW;yy`gQA{!~yw)!wQ_7oa*8$
zOXjnRzMV9G_3G8@XI(#X^r)=4{Ci1B$@H_28TKD&6FYhG<Z`><m;Zvcy8qqw`18+i
zU;ewj4dUhDu`yXcciy~t7Z2A>KmB#d!i5jrN=mlewP9~K*e2$;{PVhZy8jOyI#d%G
z85y0FlvG<*_RX@2`F&he)TTE}{{H=|{QLN~6DLm0=;J^2_+yQ(j?Ny5AGQo?IT?<#
zpQ>LC_~P_9lvmQi&o@I_N~&th_V2~aOXps>e(zqLd+*mTUu+BxHQc&$=Z=S`XC}uV
z9fn?B-4`w2R;JCGKfnHXulB2bMHLl4HeM_ZDY=p#9ul%;_4Gw6SFSV%2JZJ468nGl
zdHH|j=i}S8<2;i>PR7QqTfh36Ub=N_*7NfGYr?|9lijWdUfi{I&K#N3-2GLX!>_w%
z#n_6?IL_d6<AT%M3b*BfrlzK)g~cMJQ$>V@9~bPtyZ&oQsqdDkfPjL;dcT^QKb%=U
zkIyVW`+04pZ3Cxt)Rik&VvKk7bj{;6x3;!se;N6CN!7hGr%zkozjLRiyUhOaxlLQQ
zZjJtHVrgz}o~^TBQTpY(z(kY&YDIip+`k3M_InRL)@VPxVWDe8#Epv|KYo0^Yktq7
z*z>E`^}IOWtgUQyEdD}YMa)`HFRxYeXU?o#-QMJNH-Fjk<@5Re=m7(#*~QIGF4+2x
z+0=Jyo1<c4YVx<=Zm#3!=jC1d_U+rf`+;_?TQ0Tqor|}(w?6whc7w#j&aSSmH?Qhj
zsH&>2{rU5!@2eZnp3S`27d;zj{IV4*UIax&MJ>*X$dd#5kHidtoRv7Nl72I$hX|x-
TE(vf4=6wcFS3j3^P6<r_oALq~

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/images/icons/settings1.png b/Launcher/runtime/dialog/images/icons/settings1.png
new file mode 100644
index 0000000000000000000000000000000000000000..628ac06ba29cd1872111e855647d6008f409be88
GIT binary patch
literal 427
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7?
zo^h|r-*lj%GM+AuAr}5?FK^UyaTGcB(Y2lZhJfP<H7<YE$WE@UPKy@YnAF5}GR^kl
zB_TNn0jul(XU{Q~eC}6#c>147C+8Hae?N2Yt*P&4{Z+GDZDnT1-d?>bZ<b`u!OwkB
z@j~WihUu?$kE~cXtI8~A?i1Fq51r{T519?CR(tPp_^P^vZ`OkBypOLJ<X$m4%J?l;
z_A_s+qn(HGd?(g^xjF6MbsosceVvyew)V8%@yoN1?D}S7eq!q;&vy?lT5PQ2@ZTr@
zvDHm_VUOEoi+h_p*egtKNnU#X$amM9PjxoCgnJj8Yw~~Gq8EMa#jNZl&rdf`TiE|b
zP`twVjP|*YELVSL$f{&}*sHU3M7C$WiriW{NnEu4*JU?nnVGU6Ka^enQpez7>T>hR
T8XGNOSTcCJ`njxgN@xNAM^dl>

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/images/icons/store.png b/Launcher/runtime/dialog/images/icons/store.png
new file mode 100644
index 0000000000000000000000000000000000000000..164d36964efa69f9ae8bf750dc865edb9ad51de3
GIT binary patch
literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZA!3HE*&&$6DQVPi)LB0$ORjLdO4b2P;KmP;i
z7YqzR91M)25ey7g(-|1V^RGwAPXMarEbxddW?<kJ0Aa?p%6m(Jf)XXJ5hcO-X(i=}
zMX3x0iJ5sNdU>fO3MP7ndd9sff75|#PJ6mIhIn}Iy|R$&kb}(eLSC`W`3h_oa|C^U
zv88SP<&fsfw)kMWz(ozSkE}dwlMCwdWsV!xZRb7qt=<3UrvJU%(T631wI%0@-@CE!
zZB(X_m8?(U(L-A=rT9cHz9z2sv1M<jVET$;A){qIh3*%BI?SCsA@Ihc7b|N0-4dJS
zyLxVYPZ6owFyHf@%))QBlFD)?W(!_fr=EO7V7pB1idg?+Jia&Nopx;v()BvVQ$5Fk
z{}v1TnI<vS<Tic17i_r<*4i!Sy^O*<kG-04O#aP|u9u6&RyhE@#o+1c=d#Wzp$Pyz
C^nqFc

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/images/icons/vk.png b/Launcher/runtime/dialog/images/icons/vk.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a171c03b4be8ce476cf7a370eb97144edcdee0d
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZA!3HE*&&$6DQY`6?zK#qG8~eHcB(eheoCO|{
z#S9GG0wBz|R(WqJP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQP|vtm<!?Fz1EZ*?
zi(`m~_ui?Df`<%vT-6hWCKzyfI4}uKXkbxMU<5M@3_g|piIbX@TOjlQo$PhB+*>NL
zcP;uhnD#L~OL^Zr`{Jc@6Xsh;6xzRdT3{HZBv4itc|qv&Ep`isWsZKoGk>hxar0_N
z)Z^xNZqH?Bc2r61Qr%+okU6N$C%E$oM|NIilG2IWo2@qIeVVv9<E~IH&zrR+hV8uv
zbPGEssj>=1dTr70uAU~F(;S%eBSGo)jr=2ytNyM&$bISf$vVZUivoCMBD?HDL+w8}
zDy2UbpOq`c?-x1S{iEh=ZD-C~Tu%;WuI$|K*xURZ>)d(%JQEDdng4&7-ZU-$rPL1H
xvo5)ox&^ym&6O-sW1rHW5c_lc58>qREWHnmr`VMrUkwaI22WQ%mvv4FO#q5#oA>|#

literal 0
HcmV?d00001

diff --git a/Launcher/runtime/dialog/mainmenu.fxml b/Launcher/runtime/dialog/mainmenu.fxml
index a3e918bb..2b18fa2b 100644
--- a/Launcher/runtime/dialog/mainmenu.fxml
+++ b/Launcher/runtime/dialog/mainmenu.fxml
@@ -71,6 +71,7 @@
               <JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" styleClass="close" text="" textAlignment="CENTER" />
               <JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" text="" textAlignment="CENTER" />
               <JFXButton id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="92.0" text="" textAlignment="CENTER" />
+              <JFXButton id="goConsole" fx:id="console" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0" text="" textAlignment="CENTER" />
               <JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutY="334.0" text="" />
           </children>
       </Pane>
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.css b/Launcher/runtime/dialog/overlay/debug/debug.css
index ccfc28be..28cf9852 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.css
+++ b/Launcher/runtime/dialog/overlay/debug/debug.css
@@ -1,4 +1,9 @@
-/* Output */
+/*-- DrLeonardo Design --*/
+Button {
+    -fx-cursor: hand;
+}
+
+/* Outputs */
 #overlay > #output {
     -fx-background-color: white;
     -fx-background-radius: 0;
@@ -15,34 +20,37 @@ #overlay > #output .content {
 #overlay > #copy,
 #overlay > #action.close {
     -fx-background-radius: 0;
-    -fx-background-color: rgba(33,133,208,.5);
     -fx-text-fill: white;
+    -fx-background-position: center;
+    -jfx-button-type: FLAT;
+    -fx-background-color: #2d83ce;
+    -fx-pref-width: 100px;
+    -fx-pref-height: 25px;
 }
 
 #overlay > #copy:hover,
 #overlay > #copy:focused,
 #overlay > #action.close:hover,
-#overlay > #action.close:focused {
-    -fx-background-color: rgba(22,120,194,.5);
-}
-
+#overlay > #action.close:focused,
 #overlay > #copy:pressed,
 #overlay > #action.close:pressed {
-    -fx-background-color: rgba(22,105,164,.5);
+    -fx-background-color: #1568ce;
 }
 
 /* Kill button */
 #overlay > #action.kill {
     -fx-background-radius: 0;
-    -fx-background-color: rgba(219,40,40,.5);
     -fx-text-fill: white;
+    -fx-background-position: center;
+    -jfx-button-type: FLAT;
+    -fx-background-color: #CE5757;
+    -fx-pref-width: 100px;
+    -fx-pref-height: 25px;
 }
 
 #overlay > #action.kill:hover,
-#overlay > #action.kill:focused {
-    -fx-background-color: rgba(202,16,16,.5);
-}
-
+#overlay > #action.kill:focused,
 #overlay > #action.kill:pressed {
-    -fx-background-color: rgba(178,30,30,.5);
+    -fx-background-color: #DB5252;
 }
+/*-- DrLeonardo Design --*/
\ No newline at end of file
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index e4e8b77d..8e1d95f4 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.fxml
+++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTextArea?>
 <?import java.net.URL?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.Pane?>
 
 <!-- DrLeonardo Design -->
 
-<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.20">
+<Pane fx:id="overlay" prefHeight="425.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
     <stylesheets>
         <URL value="@debug.css" />
+      <URL value="@../../styles.css" />
     </stylesheets>
 
     <!-- Debug controls -->
-    <TextArea fx:id="output" layoutY="28.0" prefHeight="372.0" prefWidth="600.0" />
-    <Button fx:id="copy" defaultButton="true" layoutX="375.0" layoutY="352.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
-    <Button fx:id="action" layoutX="480.0" layoutY="352.0" prefHeight="30.0" prefWidth="100.0" />
+    <JFXTextArea fx:id="output" prefHeight="425.0" prefWidth="693.0" />
+    <JFXButton fx:id="copy" defaultButton="true" layoutX="465.0" layoutY="386.0" prefHeight="30.0" prefWidth="100.0" text="Копировать" />
+    <JFXButton fx:id="action" layoutX="579.0" layoutY="386.0" prefHeight="25.0" prefWidth="100.0" text="Убить" />
 </Pane>
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.js b/Launcher/runtime/dialog/overlay/debug/debug.js
index 52d6037f..fa9792b0 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.js
+++ b/Launcher/runtime/dialog/overlay/debug/debug.js
@@ -4,22 +4,18 @@ var debug = {
     initOverlay: function() {
         debug.overlay = loadFXML("dialog/overlay/debug/debug.fxml");
 
-        // Lookup output
         debug.output = debug.overlay.lookup("#output");
         debug.output.setEditable(false);
 
-        // Lookup copy button
         debug.copy = debug.overlay.lookup("#copy");
         debug.copy.setOnAction(function(event) {
             var content = new javafx.scene.input.ClipboardContent();
             content.putString(debug.output.getText());
 
-            // Set clipboard content
             javafx.scene.input.Clipboard.getSystemClipboard().
                 setContent(content);
         });
 
-        /// Lookup action button
         debug.action = debug.overlay.lookup("#action");
         debug.action.setOnAction(function(event) {
             var process = debug.process;
@@ -29,7 +25,6 @@ var debug = {
                 return;
             }
 
-            // Hide overlay
             overlay.hide(0, null);
         });
     },
@@ -50,12 +45,10 @@ var debug = {
         var alive = !forceClose &&
             process !== null && process.isAlive();
 
-        // Decide what we update to
         var text = alive ? "Убить" : "Закрыть";
         var addClass = alive ? "kill" : "close";
         var removeClass = alive ? "close" : "kill";
 
-        // Update button
         debug.action.setText(text);
         debug.action.getStyleClass().remove(removeClass);
         debug.action.getStyleClass().add(addClass);
@@ -67,7 +60,6 @@ function debugProcess(process) {
     debug.process = process;
     debug.updateActionButton(false);
 
-    // Create new task
     var task = newTask(function() {
         var buffer = IOHelper.newCharBuffer();
         var reader = IOHelper.newReader(process.getInputStream(),
@@ -78,11 +70,9 @@ function debugProcess(process) {
             appendFunction(new java.lang.String(buffer, 0, length));
         }
 
-        // So we wait for exit code
         return process.waitFor();
     });
 
-    // Set completion handlers
     task.setOnFailed(function(event) {
         debug.updateActionButton(true);
         debug.append(java.lang.System.lineSeparator() + task.getException());
@@ -92,6 +82,5 @@ function debugProcess(process) {
         debug.append(java.lang.System.lineSeparator() + "Exit code " + task.getValue());
     });
 
-    // Gogogo
     startTask(task);
 }
diff --git a/Launcher/runtime/dialog/overlay/options/options.css b/Launcher/runtime/dialog/overlay/options/options.css
index aa677e61..76e337a6 100644
--- a/Launcher/runtime/dialog/overlay/options/options.css
+++ b/Launcher/runtime/dialog/overlay/options/options.css
@@ -9,8 +9,12 @@ #holder > #settingsTitle {
 
 #holder > #apply{
     -fx-background-color: #61B373;
-    -fx-text-fill: #fff;
     -fx-background-radius: 0;
+    -fx-text-fill: white;
+    -fx-background-position: center;
+    -jfx-button-type: FLAT;
+    -fx-pref-width: 100px;
+    -fx-pref-height: 25px;
 }
 #holder > #apply:hover,
 #holder > #apply:focused{
@@ -25,64 +29,6 @@ #holder > #modlist > .viewport {
     -fx-background-color: transparent;
 }
 
-.scroll-pane {
-    -fx-background-color: transparent;
-}
-
-.scroll-bar:horizontal, .scroll-bar:vertical{
-    -fx-background-color:transparent;
-}
-
-.increment-button, .decrement-button, .increment-arrow, .decrement-arrow {
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.scroll-bar:horizontal .track,
-.scroll-bar:vertical .track{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.scroll-bar:horizontal .thumb,
-.scroll-bar:vertical .thumb {
-    -fx-background-color: rgba(0, 0, 0, 0.19);
-    -fx-background-radius: 0;
-}
-
-.scroll-bar{
-    -fx-font-size: 6px;
-}
-
-.scroll-pane > .corner {
-    -fx-background-color: black;
-}
-
-.check-box{
-	-fx-background-color: transparent;
-	-fx-text-fill:#2c2c2c;
-	-fx-font-size: 13px;
-    -fx-background-image: url('../../images/icons/checkbox.png');
-	-fx-background-repeat: no-repeat;
-}
-.check-box .mark {
-    -fx-background-color: transparent;
-}
-.check-box .box {
-    -fx-background-color: transparent;
-}
-.check-box:selected{
-	-fx-background-color: transparent;
-    -fx-background-image: url('../../images/icons/checkbox_checked.png');
-	-fx-background-repeat: no-repeat;
-}
-.check-box:selected .mark {
-    -fx-background-color: transparent;
-}
-.check-box:selected .box {
-    -fx-background-color: transparent;
-}
-
 .description-text {
 	-fx-font-smoothing-type: lcd;
  	-fx-fill: #8c8c8c;
diff --git a/Launcher/runtime/dialog/overlay/options/options.fxml b/Launcher/runtime/dialog/overlay/options/options.fxml
index 9149061a..0d6205d4 100644
--- a/Launcher/runtime/dialog/overlay/options/options.fxml
+++ b/Launcher/runtime/dialog/overlay/options/options.fxml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXScrollPane?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
 <!-- DrLeonardo Design -->
 
-<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.20" xmlns:fx="http://javafx.com/fxml/1">
+<Pane fx:id="overlay" prefHeight="425.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-     <Pane id="holder" layoutX="171.0" layoutY="28.0" prefHeight="371.0" prefWidth="428.0">
+     <Pane id="holder" prefHeight="425.0" prefWidth="693.0">
        <children>
-        <ScrollPane id="modlist" hbarPolicy="NEVER">
+        <JFXScrollPane id="modlist" prefHeight="425.0" prefWidth="693.0">
                <content>
-                  <VBox prefHeight="370.0" prefWidth="428.0">
+                  <VBox prefHeight="424.0" prefWidth="693.0">
 					<children>
 					</children>
                      <padding>
@@ -23,12 +23,13 @@
                      </padding>
 				  </VBox>
                </content>
-        </ScrollPane>
-		<Button fx:id="apply" defaultButton="true" layoutX="318.0" layoutY="336.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
+        </JFXScrollPane>
+		<JFXButton fx:id="apply" defaultButton="true" layoutX="580.0" layoutY="388.0" prefHeight="25.0" prefWidth="100.0" text="Применить" />
         </children>
      </Pane>
    </children>
   <stylesheets>
     <URL value="@options.css" />
+      <URL value="@../../styles.css" />
   </stylesheets>
 </Pane>
diff --git a/Launcher/runtime/dialog/overlay/options/options.js b/Launcher/runtime/dialog/overlay/options/options.js
index 6430b1f7..4dfdd234 100644
--- a/Launcher/runtime/dialog/overlay/options/options.js
+++ b/Launcher/runtime/dialog/overlay/options/options.js
@@ -1,5 +1,5 @@
 var options = {
-    file: DirBridge.dir.resolve("options.bin"), // options file
+    file: DirBridge.dir.resolve("options.bin"),
 
     /* options and overlay functions */
     load: function(profiles) {
@@ -8,7 +8,6 @@ var options = {
             tryWithResources(new HInput(IOHelper.newInput(options.file)), options.read);
         } catch(e) {
             LogHelper.error(e);
-            //options.setDefault();
         }
     },
 
@@ -21,7 +20,6 @@ var options = {
         }
     },
 
-    // Internal functions
     read: function(input) {
         var magic = input.readInt();
         if (magic != config.settingsMagic) {
@@ -89,7 +87,7 @@ var options = {
             var nodelist = new java.util.ArrayList;
 
             holder.getChildren().forEach(function(node,i,arr) {
-                if(node instanceof javafx.scene.control.CheckBox)
+                if(node instanceof com.jfoenix.controls.JFXCheckBox)
                     nodelist.add(node);
             });
             nodelist.forEach(function(node,i,arr) {
@@ -115,7 +113,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.jfoenix.controls.JFXCheckBox(modName);
 
                         if(subLevel > 1)
                             for(var i = 1; i < subLevel; i++)//Выделение субмодификаций сдвигом.
@@ -159,5 +157,4 @@ var options = {
             holder.getChildren().clear();
             holder.getChildren().addAll(checkBoxList);
     }
-
 };
diff --git a/Launcher/runtime/dialog/overlay/processing/processing.fxml b/Launcher/runtime/dialog/overlay/processing/processing.fxml
index d5db2745..64174287 100644
--- a/Launcher/runtime/dialog/overlay/processing/processing.fxml
+++ b/Launcher/runtime/dialog/overlay/processing/processing.fxml
@@ -8,15 +8,15 @@
 
 <!-- DrLeonardo Design | Fixes by Yaroslavik -->
 
-<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.20" xmlns:fx="http://javafx.com/fxml/1">
+<Pane fx:id="overlay" prefHeight="425.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <ImageView id="spinner" fx:id="spinner" fitHeight="161.0" fitWidth="161.0" layoutX="213.0" layoutY="94.0" y="-6.0">
+      <ImageView id="spinner" fx:id="spinner" fitHeight="161.0" fitWidth="161.0" layoutX="266.0" layoutY="93.0" y="-6.0">
          <image>
             <Image url="@../../images/icons/loading.gif" />
          </image>
       </ImageView>
      <!-- Description -->
-     <Label fx:id="description" alignment="CENTER" contentDisplay="CENTER" layoutX="152.0" layoutY="249.0" prefHeight="64.0" prefWidth="283.0" text="..." textAlignment="CENTER" />
+     <Label fx:id="description" alignment="CENTER" contentDisplay="CENTER" layoutX="205.0" layoutY="248.0" prefHeight="64.0" prefWidth="283.0" text="..." textAlignment="CENTER" />
    </children>
   <stylesheets>
     <URL value="@processing.css" />
diff --git a/Launcher/runtime/dialog/overlay/processing/processing.js b/Launcher/runtime/dialog/overlay/processing/processing.js
index 9eb19fa5..fa1de207 100644
--- a/Launcher/runtime/dialog/overlay/processing/processing.js
+++ b/Launcher/runtime/dialog/overlay/processing/processing.js
@@ -80,7 +80,7 @@ function makeLauncherRequest(callback) {
         settings.offline = true;
         overlay.swap(2500, processing.overlay, function() makeLauncherRequest(callback));
     }, false);
-    task.updateMessage("Обновление списка серверов");
+    task.updateMessage("Обновление лаунчера");
     startTask(task);
 }
 function makeProfilesRequest(callback) {
@@ -96,11 +96,11 @@ function makeProfilesRequest(callback) {
         settings.offline = true;
         overlay.swap(2500, processing.overlay, function() makeProfilesRequest(callback));
     }, false);
-    task.updateMessage("Обновление списка серверов");
+    task.updateMessage("Обновление лаунчера");
     startTask(task);
 }
 function makeSetProfileRequest(profile, callback) {
-    var task = newRequestTask(new SetProfileRequest(Launcher.getConfig(), profile));
+    var task = newRequestTask(new SetProfileRequest, profile);
 
     // Set task properties and start
     processing.setTaskProperties(task, callback, function() {
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.css b/Launcher/runtime/dialog/overlay/settings/settings.css
index 1e001ca0..54570186 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.css
+++ b/Launcher/runtime/dialog/overlay/settings/settings.css
@@ -2,7 +2,7 @@ #holder {
 	-fx-background-color: #fff;
 }
 #holder > #transferDialog {
-    -fx-background-color: RGBA(0, 0, 0, 0.9);
+    -fx-background-color: RGBA(0, 0, 0, 0.1);
 }
 /* Labels */
 #holder > #settingsTitle {
@@ -74,29 +74,4 @@ #holder > #apply,#applyTransfer{
 #holder > #apply:hover,#applyTransfer:hover,
 #holder > #apply:focused,#applyTransfer:focused{
     -fx-background-color: #74C085;
-}
-
-.check-box{
-	-fx-background-color: transparent;
-	-fx-text-fill:#2c2c2c;
-	-fx-font-size: 13;
-    -fx-background-image: url('../../images/icons/checkbox.png');
-	-fx-background-repeat: no-repeat;
-}
-.check-box .mark {
-    -fx-background-color: transparent;
-}
-.check-box .box {
-    -fx-background-color: transparent;
-}
-.check-box:selected{
-	-fx-background-color: transparent;
-    -fx-background-image: url('../../images/icons/checkbox_checked.png');
-	-fx-background-repeat: no-repeat;
-}
-.check-box:selected .mark {
-    -fx-background-color: transparent;
-}
-.check-box:selected .box {
-    -fx-background-color: transparent;
-}
+}
\ No newline at end of file
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml
index 70da9aab..91a8aa11 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXCheckBox?>
+<?import com.jfoenix.controls.JFXSlider?>
 <?import java.net.URL?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Separator?>
-<?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
@@ -13,49 +13,50 @@
 
 <!-- DrLeonardo Design -->
 
-<Pane fx:id="overlay" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.20" xmlns:fx="http://javafx.com/fxml/1">
+<Pane fx:id="overlay" prefHeight="425.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-     <Pane id="holder" layoutX="1.0" layoutY="28.0" prefHeight="371.0" prefWidth="598.0">
+     <Pane id="holder" layoutX="1.0" layoutY="-1.0" prefHeight="425.0" prefWidth="693.0">
        <children>
-         <CheckBox fx:id="autoEnter" layoutX="14.0" layoutY="80.0" text="Автовход на сервер" />
-			<Text fill="#8c8c8c" layoutX="38.0" layoutY="95.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="533.0000102519989" y="15.0" />
-         <CheckBox fx:id="fullScreen" layoutX="13.0" layoutY="185.0" text="Клиент в полный экран" />
-            <Text fill="#8c8c8c" layoutX="38.0" layoutY="200.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="533.0000102519989" y="15.0" />
-         <CheckBox id="debug" layoutX="13.0" layoutY="124.0" text="Режим Отладки" />
-			<Text fill="#8c8c8c" layoutX="38.0" layoutY="139.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="533.0000016447157" y="15.0" />
+         <JFXCheckBox fx:id="autoEnter" layoutX="14.0" layoutY="127.0" text="Автовход на сервер" />
+			<Text fill="#8c8c8c" layoutX="38.0" layoutY="143.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
+         <JFXCheckBox fx:id="fullScreen" layoutX="13.0" layoutY="250.0" text="Клиент в полный экран" />
+            <Text fill="#8c8c8c" layoutX="38.0" layoutY="267.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
+         <JFXCheckBox id="debug" layoutX="13.0" layoutY="183.0" text="Режим Отладки" />
+			<Text fill="#8c8c8c" layoutX="38.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="637.0000016447157" y="15.0" />
 		 
          <!-- RAM settings -->
-		<TextFlow layoutX="128.0" layoutY="6.0">
+		<TextFlow layoutX="126.0" layoutY="17.0" prefHeight="16.0" prefWidth="19.0">
 			<Text fx:id="ramLabel" />
 		</TextFlow>
-		 <Slider fx:id="ramSlider" layoutX="18.0" layoutY="26.0" prefHeight="3.0" prefWidth="563.0" />
-		 <Separator layoutY="65.0" prefHeight="1.0" prefWidth="598.0" />
+		 <Separator layoutY="112.0" prefHeight="3.0" prefWidth="693.0" />
          <!-- RAM settings -->
 		 
          <!-- Deldir settings -->
-         <Button fx:id="deleteDir" layoutX="15.0" layoutY="333.0" prefHeight="25.0" prefWidth="245.0" text="Очистить данные игровых клиентов" textAlignment="CENTER" wrapText="true">
+         <JFXButton fx:id="deleteDir" layoutX="328.0" layoutY="365.0" prefHeight="25.0" prefWidth="245.0" text="Очистить данные игровых клиентов" textAlignment="CENTER" wrapText="true">
             <font>
                <Font name="System Bold" size="12.0" />
             </font>
-		 </Button>
+		 </JFXButton>
          <!-- Deldir settings -->
 		 
          <!-- Changedir settings -->
-         <Button fx:id="changeDir" layoutX="14.0" layoutY="229.0" prefHeight="25.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
-         <Hyperlink id="dirLabel" alignment="TOP_LEFT" layoutX="215.0" layoutY="230.0" prefHeight="23.0" prefWidth="371.0" text="C:/Users" wrapText="true" />
+         <JFXButton fx:id="changeDir" layoutY="401.0" prefHeight="25.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
+         <Hyperlink id="dirLabel" alignment="TOP_LEFT" layoutX="199.0" layoutY="402.0" prefHeight="23.0" prefWidth="493.0" text="C:/Users" />
          <!-- Changedir settings -->
 		 
-         <Button fx:id="apply" defaultButton="true" layoutX="486.0" layoutY="335.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
-			<Text layoutX="17.0" layoutY="19.0">Выделение памяти: </Text>
-            <Pane fx:id="transferDialog" prefHeight="371.0" prefWidth="598.0">
+         <JFXButton fx:id="apply" defaultButton="true" layoutX="583.0" layoutY="365.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" />
+            <Separator layoutY="400.0" prefHeight="3.0" prefWidth="693.0" />
+            <Pane fx:id="transferDialog" layoutX="-1.0" layoutY="1.0" prefHeight="425.0" prefWidth="694.0" visible="false">
                <children>
-                  <Text fill="WHITE" layoutX="99.0" layoutY="155.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
+                  <Text fill="WHITE" layoutX="147.0" layoutY="195.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
                      <font>
                         <Font size="19.0" />
                      </font>
                   </Text>
-                  <Button fx:id="applyTransfer" layoutX="130.0" layoutY="186.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
-                  <Button fx:id="cancelTransfer" layoutX="344.0" layoutY="186.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
+                  <JFXButton fx:id="applyTransfer" layoutX="178.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
+                  <JFXButton fx:id="cancelTransfer" layoutX="392.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
                </children>
             </Pane>
 
@@ -64,5 +65,6 @@
    </children>
   <stylesheets>
     <URL value="@settings.css" />
+      <URL value="@../../styles.css" />
   </stylesheets>
 </Pane>
diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css
index c5134cd7..c5754f54 100644
--- a/Launcher/runtime/dialog/styles.css
+++ b/Launcher/runtime/dialog/styles.css
@@ -57,6 +57,26 @@ #hide {
     -fx-pref-width: 45px;
     -fx-pref-height: 45px;
 }
+#back {
+    -fx-background-position: center;
+    -jfx-button-type: FLAT;
+    -fx-background-repeat: no-repeat;
+    -fx-background-color: #CE5757;
+    -fx-background-radius: 0;
+    -fx-background-image: url('images/icons/back.png');
+    -fx-pref-width: 45px;
+    -fx-pref-height: 45px;
+}
+#goConsole {
+    -fx-background-position: center;
+    -jfx-button-type: FLAT;
+    -fx-background-repeat: no-repeat;
+    -fx-background-color: #CE5757;
+    -fx-background-radius: 0;
+    -fx-background-image: url('images/icons/console.png');
+    -fx-pref-width: 45px;
+    -fx-pref-height: 45px;
+}
 #settings {
     -fx-background-position: center;
     -jfx-button-type: FLAT;
diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js
index a1bb7b7a..b29fc735 100644
--- a/Launcher/runtime/engine/api.js
+++ b/Launcher/runtime/engine/api.js
@@ -17,7 +17,6 @@ var ServerPinger = ServerPingerClass.static;
 var Request = RequestClass.static;
 var RequestType = RequestTypeClass.static;
 var RequestException = RequestExceptionClass.static;
-var CustomRequest = CustomRequestClass.static;
 var PingRequest = PingRequestClass.static;
 var AuthRequest = AuthRequestClass.static;
 var JoinServerRequest = JoinServerRequestClass.static;
diff --git a/Launcher/runtime/init.js b/Launcher/runtime/init.js
index a370342d..b073c87c 100644
--- a/Launcher/runtime/init.js
+++ b/Launcher/runtime/init.js
@@ -1,5 +1,5 @@
-var app, stage, scene, loginScene, menuScene;
-var rootPane, loginPane, authPane, menuPane;
+var app, stage, scene, loginScene, menuScene, consoleScene;
+var rootPane, loginPane, authPane, menuPane, consolePane;
 
 var LauncherApp = Java.extend(JSApplication, {
     init: function() {
@@ -20,6 +20,7 @@ var LauncherApp = Java.extend(JSApplication, {
 
         loginPane = loadFXML("dialog/login.fxml");
         menuPane = loadFXML("dialog/mainmenu.fxml");
+        consolePane = loadFXML("dialog/console.fxml");
 
         loginScene = new javafx.scene.Scene(loginPane);
         loginScene.setFill(javafx.scene.paint.Color.TRANSPARENT);
@@ -27,6 +28,9 @@ var LauncherApp = Java.extend(JSApplication, {
         menuScene = new javafx.scene.Scene(menuPane);
         menuScene.setFill(javafx.scene.paint.Color.TRANSPARENT);
 
+        consoleScene = new javafx.scene.Scene(consolePane);
+        consoleScene.setFill(javafx.scene.paint.Color.TRANSPARENT);
+
         setCurrentScene(loginScene);
         initLauncher();