diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.meta
new file mode 100644
index 000000000..0edeb27e1
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ffd1c528be2acf84499c3c58c944fed6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss
new file mode 100644
index 000000000..5b2349b7f
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss
@@ -0,0 +1,50 @@
+.l2-flex-button {
+    flex-grow: 0;
+    width: auto;
+    -unity-slice-left: 6;
+    -unity-slice-top: 6;
+    -unity-slice-right: 6;
+    -unity-slice-bottom: 6;
+    font-size: 12px;
+    -unity-font-definition: resource('Data/UI/Assets/Font/tahoma Light');
+    letter-spacing: 2px;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 0;
+    overflow: visible;
+    background-color: transparent;
+    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity');
+    border-top-width: 0;
+    border-right-width: 0;
+    border-bottom-width: 0;
+    border-left-width: 0;
+    margin-left: 0;
+}
+
+.l2-flex-button:active {
+    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Down');
+}
+
+.l2-flex-button:active:hover {
+    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Down');
+}
+
+.l2-flex-button:hover {
+    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Over');
+}
+
+.l2-flex-button-label {
+    -unity-font: resource('Data/UI/Assets/Font/tahoma');
+    -unity-font-definition: resource('Data/UI/Assets/Font/tahoma Light');
+    color: rgba(255, 249, 227, 0.96);
+    -unity-text-align: middle-center;
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 8px;
+    padding-bottom: 8px;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss.meta
new file mode 100644
index 000000000..e78b3184a
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b1d2114f9ed155f45a3eb16e5ef02441
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uxml
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.uxml
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uxml
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uxml.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.meta
new file mode 100644
index 000000000..fd607d5cd
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d1e92da3262baa4cb12c8be2ce2ab77
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
new file mode 100644
index 000000000..825541836
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss
@@ -0,0 +1,36 @@
+.l2-input-field {
+    -unity-font: resource('Data/UI/Assets/Font/tahoma');
+    background-color: rgba(0, 0, 0, 0);
+    font-size: 12px;
+    margin-left: 6px;
+    letter-spacing: 0;
+    padding-top: 0;
+    margin-bottom: 2px;
+    margin-top: 2px;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+    flex-grow: 0;
+    border-width: 0;
+    -unity-text-align: middle-center;
+    height: 18px;
+    color: white;
+}
+
+.l2-input-field > .unity-label {
+    min-width: 0px;
+    -unity-text-align: middle-right;
+}
+
+.l2-input-field #unity-text-input {
+    background-color: rgba(0, 0, 0, 0);
+    background-image: resource('Data/UI/Assets/Login/CharacterPassword_DF_EditBox_Scaled');
+    border-width: 0;
+    margin: 0;
+    padding-left: 2px;
+    padding-right: 2px;
+    -unity-slice-left: 10;
+    -unity-slice-top: 10;
+    -unity-slice-right: 10;
+    -unity-slice-bottom: 10;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss.meta
new file mode 100644
index 000000000..b97ea977d
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2fa480f78160edf4a8c4381744578912
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
similarity index 51%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.uxml
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
index 15d20116a..04ac8681a 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml
@@ -1,6 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="L2Input" picking-mode="Ignore" class="l2-input" style="flex-grow: 0;">
-        <ui:TextField max-length="64" name="InputField" tabindex="1" class="l2-input-field" />
-    </ui:VisualElement>
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss?fileID=7433441132597879392&amp;guid=2fa480f78160edf4a8c4381744578912&amp;type=3#L2Input" />
+    <ui:TextField max-length="64" name="L2Input" tabindex="1" class="l2-input-field" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uxml.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView.meta
new file mode 100644
index 000000000..42726e49e
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d1e5c563a621264c8cecc4cdf1f6c22
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
new file mode 100644
index 000000000..8fe4bd3ec
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss
@@ -0,0 +1,123 @@
+.l2-scroll-view {
+    flex-grow: 1;
+}
+
+.l2-scroll-view .unity-scroll-view__content-viewport {
+    margin-top: 6px;
+    margin-bottom: 4px;
+    overflow: hidden;
+}
+
+.l2-scroll-view .unity-scroller {
+    width: 14px;
+    margin-left: 4px;
+    margin-right: 0px;
+    margin-top: 0px;
+    margin-bottom: 0;
+}
+
+.l2-scroll-view .unity-slider {
+    margin: 15px 0 15px 0;
+}
+
+.l2-scroll-view .unity-base-slider__drag-container {
+    background-color: transparent;
+    min-width: 14px;
+    width: 14px;
+    padding: 0;
+    border-width: 0;
+    border-radius: 0;
+}
+
+.l2-scroll-view .unity-slider {
+    background-color: transparent;
+    min-width: 14px;
+    width: 14px;
+    padding: 0;
+    border-width: 0;
+    border-radius: 0;
+}
+
+.l2-scroll-view .unity-base-slider__tracker {
+    background-color: transparent;
+    min-width: 14px;
+    width: 14px;
+    padding: 0;
+    border-width: 0;
+    border-radius: 0;
+}
+
+.l2-scroll-view .unity-base-slider__dragger {
+    min-width: 14px;
+    width: 14px;
+    margin-left: -3px;
+    background-image: resource('Data/UI/Assets/Scrollbar/SliderBar');
+    background-color: transparent;
+    -unity-slice-top: 0;
+    -unity-slice-left: 0;
+    -unity-slice-bottom: 2;
+    -unity-slice-right: 2;
+    -unity-slice-scale: 0;
+    border-width: 0;
+}
+
+.l2-scroll-view .unity-scroller__high-button {
+    background-color: transparent;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    -unity-slice-top: 0;
+    -unity-slice-left: 0;
+    -unity-slice-bottom: 2;
+    -unity-slice-right: 2;
+    -unity-slice-scale: 0;
+    width: 14px;
+    height: 14px;
+    border-width: 0;
+}
+
+.l2-scroll-view .unity-scroller__low-button {
+    background-color: transparent;
+    -unity-background-image-tint-color: rgb(255, 255, 255);
+    -unity-slice-top: 0;
+    -unity-slice-left: 0;
+    -unity-slice-bottom: 2;
+    -unity-slice-right: 2;
+    -unity-slice-scale: 0;
+    width: 14px;
+    height: 14px;
+    border-width: 0;
+}
+
+.l2-scroll-view .unity-base-slider__tracker {
+}
+
+.l2-scroll-view .unity-scroller__high-button {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownBtn');
+}
+
+.l2-scroll-view .unity-scroller__high-button:active {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownOnBtn');
+}
+
+.l2-scroll-view .unity-scroller__high-button:active:hover {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownOnBtn');
+}
+
+.l2-scroll-view .unity-scroller__high-button:hover {
+    background-image: resource('Data/UI/Assets/Scrollbar/scrollbardownbtn_over');
+}
+
+.l2-scroll-view .unity-scroller__low-button {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpBtn');
+}
+
+.l2-scroll-view .unity-scroller__low-button:active {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpOnBtn');
+}
+
+.l2-scroll-view .unity-scroller__low-button:active:hover {
+    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpOnBtn');
+}
+
+.l2-scroll-view .unity-scroller__low-button:hover {
+    background-image: resource('Data/UI/Assets/Scrollbar/scrollbarupbtn_over');
+}
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss.meta
new file mode 100644
index 000000000..baaf65e46
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 891520f23c03d384f8e473febe85fe08
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml
new file mode 100644
index 000000000..71708a130
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml
@@ -0,0 +1,5 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns="UnityEngine.UIElements" editor-extension-mode="False">
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss?fileID=7433441132597879392&amp;guid=891520f23c03d384f8e473febe85fe08&amp;type=3#L2Scrollview" />
+    <ui:ScrollView name="L2Scrollview" class="l2-scroll-view" />
+</ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml.meta
new file mode 100644
index 000000000..18b6983b1
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3efe9a3076c785343a58947f43cc0f60
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow.uxml
index ea9232097..3890656e3 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow.uxml
@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns="UnityEngine.UIElements" editor-extension-mode="False">
-    <ui:Template name="WindowTemplate" src="project://database/Assets/Resources/Data/UI/_Elements/Template/WindowTemplate.uxml?fileID=9197481963319205126&amp;guid=5ca840f56ef6f1044b4dc077c7d3e6e6&amp;type=3#WindowTemplate" />
+    <ui:Template name="WindowTemplate" src="project://database/Assets/Resources/Data/UI/_Elements/Components/WindowTemplate.uxml?fileID=9197481963319205126&amp;guid=5ca840f56ef6f1044b4dc077c7d3e6e6&amp;type=3#WindowTemplate" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:Instance template="WindowTemplate" name="WindowTemplate" class="npc-html-window" style="width: 324px; height: 428px;">
-        <ui:VisualElement name="Content" class="html-window-content-container" style="width: 308px; left: 6px; height: 380px;">
+    <ui:Instance template="WindowTemplate" name="WindowTemplate" class="npc-html-window" style="width: 318px; height: 428px;">
+        <ui:VisualElement name="Content" class="html-window-content-container" style="width: 304px; left: 6px; height: 380px;">
             <ui:ScrollView name="HtmlContent" horizontal-scroller-visibility="Hidden" vertical-scroller-visibility="AlwaysVisible" class="l2-scroll-view html-window-content" style="flex-grow: 1;">
                 <ui:VisualElement name="ContentWrapper" class="html-window-content-wrapper" style="display: flex;" />
             </ui:ScrollView>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
index 464903607..6a2629766 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss
@@ -2,7 +2,7 @@
     cursor: resource('Data/UI/Assets/Cursor/Default');
     -unity-font-definition: resource('Data/UI/Assets/Font/tahoma');
     text-shadow: 0.5px 0.5px 3px rgb(0, 0, 0);
-    --unity-cursor-color:white;
+    --unity-cursor-color: white;
 }
 
 .transparent-cursor {
@@ -16,12 +16,15 @@
 .unity-button {
     background-color: transparent;
 }
+
 .unity-button:active:enabled {
     background-color: transparent;
 }
+
 .unity-button:hover:enabled {
     background-color: transparent;
 }
+
 .unity-button:hover:active:enabled {
     background-color: transparent;
 }
@@ -384,130 +387,6 @@
     background-image: resource('Data/UI/Assets/Chat/chatting_fontsize2');
 }
 
-.l2-scroll-view .unity-scroll-view__content-viewport {
-    margin-top: 6px;
-    margin-bottom: 4px;
-    overflow: hidden;
-}
-
-.l2-scroll-view .unity-scroll-view__content-and-vertical-scroll-container {
-    flex-direction: row-reverse;
-}
-
-.l2-scroll-view .unity-scroller {
-    width: 14px;
-    margin-left: 4px;
-    margin-right: 4px;
-    margin-top: 2px;
-    margin-bottom: 0;
-}
-
-.l2-scroll-view .unity-slider {
-    margin: 15px 0 15px 0;
-}
-
-.l2-scroll-view .unity-base-slider__drag-container {
-    background-color: transparent;
-    min-width: 14px;
-    width: 14px;
-    padding: 0;
-    border-width: 0;
-    border-radius: 0;
-}
-
-.l2-scroll-view .unity-slider {
-    background-color: transparent;
-    min-width: 14px;
-    width: 14px;
-    padding: 0;
-    border-width: 0;
-    border-radius: 0;
-}
-
-.l2-scroll-view .unity-base-slider__tracker {
-    background-color: transparent;
-    min-width: 14px;
-    width: 14px;
-    padding: 0;
-    border-width: 0;
-    border-radius: 0;
-}
-
-.l2-scroll-view .unity-base-slider__dragger {
-    min-width: 14px;
-    width: 14px;
-    margin-left: -3px;
-    background-image: resource('Data/UI/Assets/Scrollbar/SliderBar');
-    background-color: transparent;
-    -unity-slice-top: 0;
-    -unity-slice-left: 0;
-    -unity-slice-bottom: 2;
-    -unity-slice-right: 2;
-    -unity-slice-scale: 0;
-    border-width: 0;
-}
-
-.l2-scroll-view .unity-scroller__high-button {
-    background-color: transparent;
-    -unity-background-image-tint-color: rgb(255, 255, 255);
-    -unity-slice-top: 0;
-    -unity-slice-left: 0;
-    -unity-slice-bottom: 2;
-    -unity-slice-right: 2;
-    -unity-slice-scale: 0;
-    width: 14px;
-    height: 14px;
-    border-width: 0;
-}
-
-.l2-scroll-view .unity-scroller__low-button {
-    background-color: transparent;
-    -unity-background-image-tint-color: rgb(255, 255, 255);
-    -unity-slice-top: 0;
-    -unity-slice-left: 0;
-    -unity-slice-bottom: 2;
-    -unity-slice-right: 2;
-    -unity-slice-scale: 0;
-    width: 14px;
-    height: 14px;
-    border-width: 0;
-}
-
-.l2-scroll-view .unity-base-slider__tracker {
-}
-
-.l2-scroll-view .unity-scroller__high-button {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownBtn');
-}
-
-.l2-scroll-view .unity-scroller__high-button:active {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownOnBtn');
-}
-
-.l2-scroll-view .unity-scroller__high-button:active:hover {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarDownOnBtn');
-}
-
-.l2-scroll-view .unity-scroller__high-button:hover {
-    background-image: resource('Data/UI/Assets/Scrollbar/scrollbardownbtn_over');
-}
-
-.l2-scroll-view .unity-scroller__low-button {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpBtn');
-}
-
-.l2-scroll-view .unity-scroller__low-button:active {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpOnBtn');
-}
-
-.l2-scroll-view .unity-scroller__low-button:active:hover {
-    background-image: resource('Data/UI/Assets/Scrollbar/ScrollBarUpOnBtn');
-}
-
-.l2-scroll-view .unity-scroller__low-button:hover {
-    background-image: resource('Data/UI/Assets/Scrollbar/scrollbarupbtn_over');
-}
-
 .chat-window .unity-base-text-field__input {
     margin: 0;
     padding: 0;
@@ -1018,31 +897,6 @@
     bottom: 0;
 }
 
-.login-window .unity-base-text-field__input {
-    margin: 0;
-    padding: 0;
-    border-width: 0;
-    background-color: transparent;
-    color: rgb(220, 220, 220);
-}
-
-.login-window .unity-base-field__input {
-    margin: 0;
-    padding: 0;
-    border-width: 0;
-    background-color: transparent;
-    color: rgb(220, 220, 220);
-}
-
-.login-window .unity-text-field {
-    --unity-cursor-color: rgb(255, 255, 255);
-    color: rgb(220, 220, 220);
-}
-
-.login-window .transparent-cursor {
-    --unity-cursor-color: rgba(0, 0, 0, 0);
-}
-
 .l2-button {
     flex-grow: 0;
     width: 92px;
@@ -1500,59 +1354,6 @@
     rotate: 180deg;
 }
 
-.license-window .l2-scroll-view .unity-scroll-view__content-and-vertical-scroll-container {
-    flex-direction: row;
-}
-
-.server-element {
-    flex-grow: 0;
-    flex-shrink: 0;
-    width: 100%;
-    height: 18px;
-    position: relative;
-    flex-direction: row;
-    background-color: rgba(0, 0, 0, 0.48);
-}
-
-.server-element.odd {
-    background-color: rgba(0, 0, 0, 0);
-}
-
-.server-element.selected {
-    background-color: rgba(138, 120, 88, 0.18);
-}
-
-.server-element.odd.selected {
-    background-color: rgba(138, 120, 88, 0.18);
-}
-
-.server-element .unity-label {
-    color: rgb(255, 255, 255);
-}
-
-.server-element .unity-label.light {
-    color: rgb(71, 138, 200);
-}
-
-.server-element .unity-label.normal {
-    color: rgb(219, 207, 110);
-}
-
-.server-element .unity-label.heavy {
-    color: rgb(210, 106, 98);
-}
-
-.server-element .unity-label.down {
-    color: rgb(255, 0, 0);
-}
-
-.server-element .unity-label.full {
-    color: rgb(255, 0, 0);
-}
-
-.server-element .unity-label.gm-only {
-    color: rgb(255, 0, 0);
-}
 
 .char-select-col {
     flex-grow: 1;
@@ -3645,57 +3446,6 @@
     padding-bottom: 8px;
 }
 
-.l2-flex-button {
-    flex-grow: 0;
-    width: auto;
-    -unity-slice-left: 6;
-    -unity-slice-top: 6;
-    -unity-slice-right: 6;
-    -unity-slice-bottom: 6;
-    font-size: 12px;
-    -unity-font-definition: resource('Data/UI/Assets/Font/tahoma Light');
-    letter-spacing: 2px;
-    padding-top: 0;
-    padding-right: 0;
-    padding-bottom: 0;
-    padding-left: 0;
-    overflow: visible;
-    background-color: transparent;
-    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity');
-    border-top-width: 0;
-    border-right-width: 0;
-    border-bottom-width: 0;
-    border-left-width: 0;
-    margin-left: 0;
-}
-
-.l2-flex-button:active {
-    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Down');
-}
-
-.l2-flex-button:active:hover {
-    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Down');
-}
-
-.l2-flex-button:hover {
-    background-image: resource('Data/UI/Assets/Button/Button_DF_L2Unity_Over');
-}
-
-.l2-flex-button-label {
-    -unity-font: resource('Data/UI/Assets/Font/tahoma');
-    -unity-font-definition: resource('Data/UI/Assets/Font/tahoma Light');
-    color: rgba(255, 249, 227, 0.96);
-    -unity-text-align: middle-center;
-    margin-top: 0;
-    margin-right: 0;
-    margin-bottom: 0;
-    margin-left: 0;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-top: 8px;
-    padding-bottom: 8px;
-}
-
 .html-window-content-wrapper {
     flex-grow: 1;
     flex-direction: row;
@@ -3880,44 +3630,3 @@
 .target-bar-container.visible {
     opacity: 100;
 }
-
-.l2-input {
-    flex-grow: 0;
-    height: 18px;
-}
-
-.l2-input-field {
-    -unity-font: resource('Data/UI/Assets/Font/tahoma');
-    background-color: rgba(0, 0, 0, 0);
-    background-image: resource('Data/UI/Assets/Login/CharacterPassword_DF_EditBox_Scaled');
-    -unity-font-definition: initial;
-    font-size: 12px;
-    margin-left: 6px;
-    letter-spacing: 0;
-    padding-top: 0;
-    margin-bottom: 2px;
-    margin-top: 2px;
-    overflow: hidden;
-    margin: 0;
-    padding: 0;
-    flex-grow: 1;
-    border-width: 0;
-    -unity-text-align: middle-center;
-}
-
-.l2-input-field #unity-text-input {
-    background-color: rgba(0, 0, 0, 0);
-    background-image: none;
-    border-width: 0;
-    margin: 0;
-    padding-left: 2px;
-    padding-right: 2px;
-    color: white;
-}
-
-.l2-input-field {
-    -unity-slice-left: 10;
-    -unity-slice-top: 10;
-    -unity-slice-right: 10;
-    -unity-slice-bottom: 10;
-}
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.meta
new file mode 100644
index 000000000..9a8ab6341
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c7657d3227629e45bf0e6a2eef451f6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
new file mode 100644
index 000000000..71ce8d55a
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss
@@ -0,0 +1,40 @@
+.license-window {
+    flex-grow: 0;
+    flex-shrink: 0;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+}
+
+.license-window .l2-scroll-view {
+    color: white;
+    font-size: 11px;
+}
+
+.license-window-inner {
+    flex-grow: 0;
+    width: 540px;
+    height: 445px;
+    flex-shrink: 0;
+    background-image: resource('Data/UI/Assets/Windows/Windows_DF_Drawer_Bg_Darker');
+    -unity-slice-bottom: 10;
+    -unity-slice-left: 27;
+    -unity-slice-top: 10;
+    -unity-slice-right: 20;
+    margin-top: auto;
+    margin-right: auto;
+    margin-bottom: auto;
+    margin-left: auto;
+    padding-top: 10px;
+    padding-right: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+}
+
+.license-window-button-container {
+    height: 30px;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
+    flex-direction: row;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss.meta
new file mode 100644
index 000000000..0a8c9606f
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d32cbde120ed18a46ae6e93b66100d1d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uxml
similarity index 84%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.uxml
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uxml
index 845c279aa..ff203a1ac 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uxml
@@ -1,11 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="LicenseWindow" class="license-window" style="flex-grow: 0; flex-shrink: 0; width: 100%; height: 100%; position: absolute;">
-        <ui:VisualElement name="Window" tabindex="-1" class="license-window" style="flex-grow: 0; width: 540px; height: 445px; flex-shrink: 0; background-image: resource(&apos;Data/UI/Assets/Windows/Windows_DF_Drawer_Bg_Darker&apos;); -unity-slice-bottom: 10; -unity-slice-left: 27; -unity-slice-top: 10; -unity-slice-right: 20; margin-top: auto; margin-right: auto; margin-bottom: auto; margin-left: auto; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px;">
-            <ui:ScrollView vertical-scroller-visibility="AlwaysVisible" horizontal-page-size="1" name="ScrollView" horizontal-scroller-visibility="Hidden" mouse-wheel-scroll-size="4.833333" touch-scroll-type="Clamped" class="l2-scroll-view" style="-unity-font: resource(&apos;Data/UI/Assets/Font/tahoma&apos;); color: rgb(255, 255, 255); padding-bottom: 6px; font-size: 12px;">
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2ScrollView/L2Scrollview.uss?fileID=7433441132597879392&amp;guid=891520f23c03d384f8e473febe85fe08&amp;type=3#L2Scrollview" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss?fileID=7433441132597879392&amp;guid=b1d2114f9ed155f45a3eb16e5ef02441&amp;type=3#L2Button" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uss?fileID=7433441132597879392&amp;guid=d32cbde120ed18a46ae6e93b66100d1d&amp;type=3#LicenseWindow" />
+    <ui:VisualElement name="LicenseWindow" class="license-window">
+        <ui:VisualElement name="Window" tabindex="-1" class="license-window-inner">
+            <ui:ScrollView name="L2Scrollview" class="l2-scroll-view">
                 <ui:Label text="Lineage 2&#10;&#10;UNITY PROJECT&#10;&#10;LICENSE&#10;&#10;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec enim justo, gravida eget massa et, sollicitudin condimentum nisl. In molestie, lorem non facilisis egestas, elit est vehicula eros, ac maximus nulla nulla sit amet mi. Morbi vel elit non odio mollis mollis quis sit amet orci. Etiam eleifend rhoncus neque eget mollis. Praesent bibendum lacus sagittis eros semper, at finibus purus iaculis. Donec risus mauris, tempor et mauris ac, finibus maximus est. Suspendisse turpis mi, hendrerit vel leo ac, vehicula lobortis ipsum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam ipsum velit, vulputate sit amet ligula in, posuere egestas tortor. Nulla sollicitudin feugiat ante. Proin nec diam pulvinar, semper ex nec, pretium quam. Etiam eu ultricies ligula. Donec hendrerit vel eros a eleifend. Nunc hendrerit pellentesque ullamcorper.&#10;&#10;Sed pharetra mauris magna, eget faucibus libero posuere nec. Donec malesuada dolor orci, a dapibus neque facilisis vel. Vivamus risus nibh, laoreet eu vestibulum a, dictum ac nulla. Suspendisse sollicitudin aliquet nunc sodales hendrerit. Maecenas sagittis laoreet tortor. Aenean nunc massa, scelerisque a vulputate eu, varius eu mauris. Fusce vulputate sagittis elit.&#10;&#10;Morbi felis arcu, aliquam eget sagittis vel, blandit vel nulla. Curabitur quis massa vitae mi ultrices congue. Pellentesque velit nisl, tempus vel scelerisque sit amet, malesuada nec massa. Cras suscipit, urna non commodo iaculis, urna purus faucibus neque, a consequat eros metus sed elit. Morbi ornare dui magna, ut euismod nibh convallis at. Vivamus suscipit metus vel leo faucibus, sed tempor nisl porta. Integer aliquet enim porta magna dignissim imperdiet. Pellentesque tincidunt eros sed urna pretium dictum. Donec scelerisque risus sit amet ultrices ullamcorper. Phasellus vitae risus ac risus aliquam laoreet. Donec vitae porta libero, et suscipit libero. Fusce accumsan ex in faucibus sodales.&#10;&#10;Curabitur tincidunt, lorem sed blandit sodales, libero erat pulvinar urna, vel dictum lectus massa ornare mi. Donec egestas gravida turpis, sagittis eleifend turpis dignissim vitae. Ut sodales consectetur felis, id porta magna hendrerit vel. Fusce maximus ullamcorper neque sit amet mollis. Cras malesuada mauris sit amet tortor accumsan, eget efficitur ligula sollicitudin. In maximus efficitur nisi, ut blandit velit facilisis sed. Cras vestibulum, ex suscipit consectetur consequat, est arcu mattis orci, ac mollis purus enim sed mauris. Phasellus in fermentum nibh. Aliquam malesuada tempus ultrices.&#10;&#10;Fusce ut enim porta, suscipit augue in, mollis lectus. Nullam eget ex eget ipsum convallis molestie sed sed tortor. Sed luctus velit non orci pharetra bibendum nec a nunc. Nulla porta mauris a mi porta, ac faucibus odio facilisis. Vestibulum at ultrices quam. Aliquam consectetur porta magna, ut rutrum dui luctus et. Ut venenatis auctor est et porttitor. Sed luctus justo eget tincidunt tincidunt. Fusce vitae vestibulum tortor, ut consequat lectus. Pellentesque quis pharetra metus. Aliquam condimentum eu urna at eleifend. Donec cursus dignissim arcu a tempor.&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;&#10;END" name="Content" class="chat-content" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 2px; padding-bottom: 0; padding-left: 0; flex-wrap: wrap; text-overflow: clip; white-space: normal;" />
             </ui:ScrollView>
-            <ui:VisualElement name="BottomBar" style="flex-grow: 1; height: 30px; flex-shrink: 0; flex-direction: row; align-items: center; justify-content: center;">
+            <ui:VisualElement name="BottomBar" class="license-window-button-container">
                 <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="AgreeButton" tabindex="-1" focusable="false" class="l2-button" style="height: 25px; width: 80px;">
                     <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 36px;" />
                     <ui:Label tabindex="-1" text="Agree" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/LicenseWindow/LicenseWindow.uxml.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.meta
new file mode 100644
index 000000000..d4319c083
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 083c828b85bccbc49a91d18cafec5792
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.uxml
deleted file mode 100644
index 53571dcff..000000000
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.uxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="LoginWindow" picking-mode="Ignore" class="login-window" style="flex-grow: 0; width: 260px; height: 110px; flex-shrink: 0; background-image: resource(&apos;Data/UI/Assets/Windows/Windows_DF_Drawer_Bg_Darker&apos;); -unity-slice-bottom: 10; -unity-slice-left: 27; -unity-slice-top: 10; -unity-slice-right: 20; margin-top: auto; margin-right: auto; margin-bottom: auto; margin-left: auto; padding-top: 19px; padding-right: 20px; padding-bottom: 16px; padding-left: 20px;">
-        <ui:VisualElement name="ID" picking-mode="Ignore" style="flex-grow: 1; flex-direction: row; height: 15px; flex-shrink: 0;">
-            <ui:VisualElement name="IDLabel" picking-mode="Ignore" style="flex-grow: 0; width: 64px; margin-right: 0; padding-right: 8px;">
-                <ui:Label text="ID" parse-escape-sequences="true" display-tooltip-when-elided="true" picking-mode="Ignore" style="-unity-font: initial; color: rgb(220, 220, 220); -unity-text-align: middle-right; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin-top: 1px; margin-right: 0; margin-bottom: 0; margin-left: 0; font-size: 14px; -unity-font-definition: resource(&apos;Data/UI/Assets/Font/tahoma Light&apos;); letter-spacing: 0;" />
-            </ui:VisualElement>
-            <ui:VisualElement name="IDInput" picking-mode="Ignore" class="login-input-container">
-                <ui:VisualElement name="UserInputBg" picking-mode="Ignore" class="login-input-bg" style="flex-grow: 1; position: absolute; width: 100%; height: 28px;" />
-                <ui:TextField max-length="16" name="UserInputField" tabindex="1" class="login-input" />
-            </ui:VisualElement>
-        </ui:VisualElement>
-        <ui:VisualElement name="Password" picking-mode="Ignore" style="flex-grow: 1; flex-direction: row; margin-top: 6px; flex-shrink: 0;">
-            <ui:VisualElement name="PasswordLabel" picking-mode="Ignore" style="flex-grow: 0; width: 64px; padding-right: 8px;">
-                <ui:Label text="Password" parse-escape-sequences="true" display-tooltip-when-elided="true" picking-mode="Ignore" style="-unity-text-align: lower-right; color: rgb(220, 220, 220); margin-top: 1px; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; font-size: 13px; -unity-font-style: normal; -unity-font-definition: resource(&apos;Data/UI/Assets/Font/tahoma Light&apos;); letter-spacing: 0; -unity-font: resource(&apos;Data/UI/Assets/Font/tahoma&apos;);" />
-            </ui:VisualElement>
-            <ui:VisualElement name="PasswordInput" picking-mode="Ignore" style="flex-grow: 1; -unity-text-align: upper-center; height: 18px;">
-                <ui:VisualElement name="PasswordInputBg" picking-mode="Ignore" class="login-input-bg" style="height: 28px;" />
-                <ui:TextField picking-mode="Ignore" password="true" tabindex="2" max-length="16" name="PasswordInputField" class="login-input" style="-unity-font: resource(&apos;Data/UI/Assets/Font/tahoma&apos;); background-color: rgba(0, 0, 0, 0); -unity-background-image-tint-color: rgb(12, 12, 12); -unity-font-definition: initial; height: auto; font-size: 12px; margin-left: 6px; -unity-text-align: upper-center; padding-top: 0;" />
-            </ui:VisualElement>
-        </ui:VisualElement>
-        <ui:VisualElement name="Buttons" picking-mode="Ignore" style="flex-grow: 1; flex-direction: row; -unity-text-align: upper-left; justify-content: center; margin-top: 10px; flex-shrink: 0;">
-            <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="LoginButton" focusable="false" class="l2-button" style="height: 20px; background-color: rgba(188, 188, 188, 0);">
-                <ui:VisualElement name="ButtonBg" picking-mode="Ignore" class="l2-button-bg" />
-                <ui:Label text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" picking-mode="Ignore" class="button-label" style="letter-spacing: 0;" />
-            </ui:Button>
-            <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ExitButton" focusable="false" class="l2-button" style="height: 20px;">
-                <ui:VisualElement name="ButtonBg" picking-mode="Ignore" class="l2-button-bg" />
-                <ui:Label text="Exit" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" picking-mode="Ignore" class="button-label" style="letter-spacing: 0;" />
-            </ui:Button>
-        </ui:VisualElement>
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss
new file mode 100644
index 000000000..eb323c61b
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss
@@ -0,0 +1,71 @@
+.login-window {
+    flex-grow: 0;
+    width: 260px;
+    height: 110px;
+    flex-shrink: 0;
+    background-image: resource('Data/UI/Assets/Windows/Windows_DF_Drawer_Bg_Darker');
+    -unity-slice-bottom: 10;
+    -unity-slice-left: 27;
+    -unity-slice-top: 10;
+    -unity-slice-right: 20;
+    margin-top: auto;
+    margin-right: auto;
+    margin-bottom: auto;
+    margin-left: auto;
+    padding-top: 19px;
+    padding-right: 20px;
+    padding-bottom: 16px;
+    padding-left: 20px;
+}
+
+.login-window .unity-base-text-field__input {
+    margin: 0;
+    padding: 0;
+    border-width: 0;
+    background-color: transparent;
+    color: rgb(220, 220, 220);
+}
+
+.login-window .unity-base-field__input {
+    margin: 0;
+    padding: 0;
+    border-width: 0;
+    background-color: transparent;
+    color: rgb(220, 220, 220);
+}
+
+.login-window .unity-text-field {
+    --unity-cursor-color: rgb(255, 255, 255);
+    color: rgb(220, 220, 220);
+}
+
+.login-window .transparent-cursor {
+    --unity-cursor-color: rgba(0, 0, 0, 0);
+}
+
+.login-window .l2-input-field {
+    margin-bottom: 4px;
+}
+
+.login-window .l2-input-field > .unity-label {
+    width: 60px;
+}
+
+.login-window .l2-input-field > .unity-label {
+    width: 60px;
+}
+
+.login-window .login-buttons {
+    flex-grow: 1;
+    flex-direction: row;
+    -unity-text-align: upper-left;
+    justify-content: center;
+    margin-top: 0;
+    flex-shrink: 0;
+    height: 25px;
+}
+
+.login-window .l2-flex-button {
+    padding: 0;
+    width: 80px;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss.meta
new file mode 100644
index 000000000..438412a32
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 05ea6159cebbe30449524b6449484bfc
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uxml
new file mode 100644
index 000000000..6e4cbfd03
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uxml
@@ -0,0 +1,18 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uss?fileID=7433441132597879392&amp;guid=05ea6159cebbe30449524b6449484bfc&amp;type=3#LoginWindow" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Input/L2Input.uss?fileID=7433441132597879392&amp;guid=2fa480f78160edf4a8c4381744578912&amp;type=3#L2Input" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss?fileID=7433441132597879392&amp;guid=b1d2114f9ed155f45a3eb16e5ef02441&amp;type=3#L2Button" />
+    <ui:VisualElement name="LoginWindow" picking-mode="Ignore" class="login-window">
+        <ui:TextField max-length="64" name="UserInputField" tabindex="1" label="ID" class="l2-input-field" />
+        <ui:TextField max-length="64" name="PasswordInputField" tabindex="1" password="true" label="Password" class="l2-input-field" />
+        <ui:VisualElement name="Buttons" picking-mode="Ignore" class="login-buttons">
+            <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="LoginButton" tabindex="-1" focusable="false" class="l2-flex-button">
+                <ui:Label tabindex="-1" text="Log in" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="l2-flex-button-label" style="letter-spacing: 0;" />
+            </ui:Button>
+            <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="ExitButton" tabindex="-1" focusable="false" class="l2-flex-button">
+                <ui:Label tabindex="-1" text="Exit" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="l2-flex-button-label" style="letter-spacing: 0;" />
+            </ui:Button>
+        </ui:VisualElement>
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/LoginWindow/LoginWindow.uxml.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uxml
deleted file mode 100644
index ef2467cd8..000000000
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uxml
+++ /dev/null
@@ -1,32 +0,0 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="ServerListWindow" class="serverlist-window" style="flex-grow: 0; flex-shrink: 0; width: 100%; height: 100%; position: absolute;">
-        <ui:VisualElement name="Window" tabindex="-1" class="license-window" style="flex-grow: 0; width: 320px; height: 350px; flex-shrink: 0; background-image: resource(&apos;Data/UI/Assets/Windows/MISC_DF_SERVERSELECT_BACK&apos;); -unity-slice-bottom: 0; -unity-slice-left: 0; -unity-slice-top: 0; -unity-slice-right: 0; margin-top: auto; margin-right: auto; margin-bottom: auto; margin-left: auto; padding-top: 12px; padding-right: 12px; padding-bottom: 12px; padding-left: 10px; -unity-slice-scale: 0;">
-            <ui:VisualElement name="ListHeader" style="flex-grow: 0; flex-direction: row; flex-shrink: 0;">
-                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Name" tabindex="-1" focusable="false" class="l2-button" style="height: 18px; width: 60%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; flex-grow: 1; overflow: hidden; border-right-width: 1px; border-left-color: rgb(105, 98, 86); border-right-color: rgb(105, 98, 86); border-top-color: rgb(105, 98, 86); border-bottom-color: rgb(105, 98, 86);">
-                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 28px; min-height: 0; width: 188%; margin-left: -1px;" />
-                    <ui:Label tabindex="-1" text="Name" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
-                </ui:Button>
-                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Traffic" tabindex="-1" focusable="false" class="l2-button" style="height: 18px; width: 18%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; flex-grow: 1; overflow: hidden; border-left-color: rgb(105, 98, 86); border-right-color: rgb(105, 98, 86); border-top-color: rgb(105, 98, 86); border-bottom-color: rgb(105, 98, 86);">
-                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 28px; min-height: 0; width: 140%; margin-left: -7px;" />
-                    <ui:Label tabindex="-1" text="Traffic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
-                </ui:Button>
-                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Character" tabindex="-1" focusable="false" class="l2-button" style="height: 18px; width: 22%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; flex-grow: 1; overflow: hidden; border-left-width: 1px; border-left-color: rgb(105, 98, 86); border-right-color: rgb(105, 98, 86); border-top-color: rgb(105, 98, 86); border-bottom-color: rgb(105, 98, 86); background-color: rgba(188, 188, 188, 0);">
-                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 28px; min-height: 0; padding-left: 0; margin-left: -6px; width: 123%;" />
-                    <ui:Label tabindex="-1" text="Character" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
-                </ui:Button>
-            </ui:VisualElement>
-            <ui:VisualElement name="ServerContainer" style="flex-grow: 1; overflow: hidden;" />
-            <ui:VisualElement name="BottomBar" style="flex-grow: 0; height: 35px; flex-shrink: 0; flex-direction: row; align-items: center; justify-content: center;">
-                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ConfirmButton" tabindex="-1" focusable="false" class="l2-button" style="height: 25px; width: 80px;">
-                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 36px;" />
-                    <ui:Label tabindex="-1" text="Confirm" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
-                </ui:Button>
-                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="CancelButton" tabindex="-1" focusable="false" class="l2-button" style="height: 25px; width: 80px;">
-                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg" style="height: 36px;" />
-                    <ui:Label tabindex="-1" text="Cancel" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label" style="letter-spacing: 0;" />
-                </ui:Button>
-            </ui:VisualElement>
-        </ui:VisualElement>
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerElement.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerElement.uxml
similarity index 50%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerElement.uxml
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerElement.uxml
index 9e3ff3dc0..23e0fce76 100644
--- a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerElement.uxml
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerElement.uxml
@@ -1,8 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="ServerElement" class="server-element" style="font-size: 12px; -unity-font: resource(&apos;Data/UI/Assets/Font/tahoma&apos;); position: relative;">
-        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ServerName" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 8px; flex-grow: 1; width: 60%; -unity-text-align: middle-left;" />
-        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ServerStatus" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 8px; flex-grow: 1; width: 18%; -unity-text-align: middle-left;" />
-        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="CharacterCount" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 8px; flex-grow: 1; width: 22%; -unity-text-align: middle-left; background-color: rgba(0, 0, 0, 0);" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uss?fileID=7433441132597879392&amp;guid=f34de1f6d64cd8340abe125d042baf40&amp;type=3#ServerListWindow" />
+    <ui:VisualElement name="ServerElement" class="server-element">
+        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ServerName" class="server-name" />
+        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ServerStatus" class="server-status" />
+        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="CharacterCount" class="character-count" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerElement.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerElement.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerElement.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerElement.uxml.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss
new file mode 100644
index 000000000..6944e732e
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss
@@ -0,0 +1,212 @@
+.serverlist-window {
+    flex-grow: 0;
+    flex-shrink: 0;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+}
+
+.server-element {
+    flex-grow: 0;
+    flex-shrink: 0;
+    width: 100%;
+    height: 18px;
+    position: relative;
+    flex-direction: row;
+    background-color: rgba(0, 0, 0, 0.48);
+    font-size: 12px;
+    -unity-font: resource('Data/UI/Assets/Font/tahoma');
+    position: relative;
+}
+
+.server-element .server-name {
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 8px;
+    flex-grow: 1;
+    width: 60%;
+    -unity-text-align: middle-left;
+}
+
+.server-element .server-status {
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 8px;
+    flex-grow: 1;
+    width: 18%;
+    -unity-text-align: middle-left;
+}
+
+.server-element .character-count {
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding-top: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 8px;
+    flex-grow: 1;
+    width: 22%;
+    -unity-text-align: middle-left;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.server-element.odd {
+    background-color: rgba(0, 0, 0, 0);
+}
+
+.server-element.selected {
+    background-color: rgba(138, 120, 88, 0.18);
+}
+
+.server-element.odd.selected {
+    background-color: rgba(138, 120, 88, 0.18);
+}
+
+.server-element .unity-label {
+    color: rgb(255, 255, 255);
+}
+
+.server-element .unity-label.light {
+    color: rgb(71, 138, 200);
+}
+
+.server-element .unity-label.normal {
+    color: rgb(219, 207, 110);
+}
+
+.server-element .unity-label.heavy {
+    color: rgb(210, 106, 98);
+}
+
+.server-element .unity-label.down {
+    color: rgb(255, 0, 0);
+}
+
+.server-element .unity-label.full {
+    color: rgb(255, 0, 0);
+}
+
+.server-element .unity-label.gm-only {
+    color: rgb(255, 0, 0);
+}
+
+.server-list-inner {
+    flex-grow: 0;
+    width: 320px;
+    height: 350px;
+    flex-shrink: 0;
+    background-image: resource('Data/UI/Assets/Windows/MISC_DF_SERVERSELECT_BACK');
+    -unity-slice-bottom: 0;
+    -unity-slice-left: 0;
+    -unity-slice-top: 0;
+    -unity-slice-right: 0;
+    margin-top: auto;
+    margin-right: auto;
+    margin-bottom: auto;
+    margin-left: auto;
+    padding-top: 12px;
+    padding-right: 12px;
+    padding-bottom: 12px;
+    padding-left: 10px;
+    -unity-slice-scale: 0;
+}
+
+.serverlist-header {
+    flex-grow: 0;
+    flex-direction: row;
+    flex-shrink: 0;
+}
+
+.serverlist-header-cat {
+    height: 18px;
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    overflow: hidden;
+    flex-grow: 1;
+    border-width: 0px;
+    background-color: transparent;
+}
+
+.serverlist-header-cat-name {
+    width: 60%;
+    border-right-width: 1px;
+    border-right-color: rgb(105, 98, 86);
+}
+
+.serverlist-header-cat-traffic {
+    height: 18px;
+    width: 18%;
+}
+
+.serverlist-header-cat-character {
+    height: 18px;
+    width: 22%;
+    border-left-width: 1px;
+    border-left-color: rgb(105, 98, 86);
+}
+
+.serverlist-header-cat-bg {
+    height: 31px;
+    min-height: 0;
+}
+
+.serverlist-header-cat-name-bg {
+    width: 188%;
+    margin-left: -1px;
+}
+
+.serverlist-header-cat-traffic-bg {
+    width: 140%;
+    margin-left: -7px;
+}
+
+.serverlist-header-cat-character-bg {
+    padding-left: 0;
+    margin-left: -6px;
+    width: 123%;
+}
+
+.serverlist-header-label {
+    letter-spacing: 0;
+    margin-top: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding-top: 1px;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: 0;
+}
+
+.serverlist-list-container {
+    flex-grow: 1;
+    overflow: hidden;
+}
+
+.serverlist-button-container {
+    flex-grow: 0;
+    height: 35px;
+    flex-shrink: 0;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+}
+
+.serverlist-window .l2-flex-button {
+    padding: 0;
+    width: 80px;
+}
\ No newline at end of file
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss.meta
new file mode 100644
index 000000000..00f8080c3
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f34de1f6d64cd8340abe125d042baf40
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uxml
new file mode 100644
index 000000000..73ee56250
--- /dev/null
+++ b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uxml
@@ -0,0 +1,32 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Components/L2Button/L2Button.uss?fileID=7433441132597879392&amp;guid=b1d2114f9ed155f45a3eb16e5ef02441&amp;type=3#L2Button" />
+    <Style src="project://database/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uss?fileID=7433441132597879392&amp;guid=f34de1f6d64cd8340abe125d042baf40&amp;type=3#ServerListWindow" />
+    <ui:VisualElement name="ServerListWindow" class="serverlist-window">
+        <ui:VisualElement name="Window" tabindex="-1" class="server-list-inner">
+            <ui:VisualElement name="ListHeader" class="serverlist-header">
+                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Name" tabindex="-1" focusable="false" class="l2-button serverlist-header-cat-name serverlist-header-cat">
+                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg serverlist-header-cat-name-bg serverlist-header-cat-bg" />
+                    <ui:Label tabindex="-1" text="Name" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label serverlist-header-label" />
+                </ui:Button>
+                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Traffic" tabindex="-1" focusable="false" class="l2-button serverlist-header-cat-traffic serverlist-header-cat">
+                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg serverlist-header-cat-traffic-bg serverlist-header-cat-bg" />
+                    <ui:Label tabindex="-1" text="Traffic" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label serverlist-header-label" />
+                </ui:Button>
+                <ui:Button text="Log In" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Character" tabindex="-1" focusable="false" class="l2-button serverlist-header-cat-character serverlist-header-cat">
+                    <ui:VisualElement name="ButtonBg" tabindex="-1" class="l2-button-bg serverlist-header-cat-character-bg serverlist-header-cat-bg" />
+                    <ui:Label tabindex="-1" text="Character" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="button-label serverlist-header-label" />
+                </ui:Button>
+            </ui:VisualElement>
+            <ui:VisualElement name="ServerContainer" class="serverlist-list-container" />
+            <ui:VisualElement name="BottomBar" class="serverlist-button-container">
+                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="ConfirmButton" tabindex="-1" focusable="false" class="l2-flex-button">
+                    <ui:Label tabindex="-1" text="Confirm" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="l2-flex-button-label" style="letter-spacing: 0;" />
+                </ui:Button>
+                <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="CancelButton" tabindex="-1" focusable="false" class="l2-flex-button">
+                    <ui:Label tabindex="-1" text="Cancel" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ButtonLabel" class="l2-flex-button-label" style="letter-spacing: 0;" />
+                </ui:Button>
+            </ui:VisualElement>
+        </ui:VisualElement>
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uxml.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uxml.meta
similarity index 100%
rename from l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerList/ServerListWindow.uxml.meta
rename to l2-unity/Assets/Resources/Data/UI/_Elements/Login/ServerListWindow/ServerListWindow.uxml.meta
diff --git a/l2-unity/UserSettings/Layouts/default-6000.dwlt b/l2-unity/UserSettings/Layouts/default-6000.dwlt
index 5f5a6c73c..80a452cb2 100644
--- a/l2-unity/UserSettings/Layouts/default-6000.dwlt
+++ b/l2-unity/UserSettings/Layouts/default-6000.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 997
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: UI Toolkit Debugger
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 39
+  controlID: 16
   draggingID: 0
 --- !u!114 &3
 MonoBehaviour:
@@ -60,22 +60,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: UIElementsDebugger
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1529
+    x: 802
     y: 0
-    width: 391
+    width: 1118
     height: 941
-  m_MinSize: {x: 276, y: 76}
+  m_MinSize: {x: 51, y: 76}
   m_MaxSize: {x: 4001, y: 4026}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 15}
-  - {fileID: 13}
-  m_Selected: 0
+  - {fileID: 16}
+  - {fileID: 14}
+  - {fileID: 12}
+  m_Selected: 2
   m_LastSelected: 1
 --- !u!114 &4
 MonoBehaviour:
@@ -94,13 +95,13 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 424
-    height: 758
+    width: 155
+    height: 529
   m_MinSize: {x: 201, y: 226}
   m_MaxSize: {x: 4001, y: 4026}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &5
@@ -113,23 +114,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 758
-    width: 1529
-    height: 183
-  m_MinSize: {x: 231, y: 276}
-  m_MaxSize: {x: 10001, y: 10026}
-  m_ActualView: {fileID: 14}
+    y: 529
+    width: 802
+    height: 412
+  m_MinSize: {x: 101, y: 126}
+  m_MaxSize: {x: 4001, y: 4026}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 14}
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 1
+  - {fileID: 15}
+  - {fileID: 20}
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -220,12 +221,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1529
+    width: 802
     height: 941
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 40
+  controlID: 17
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -246,12 +247,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1529
-    height: 758
+    width: 802
+    height: 529
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 41
+  controlID: 18
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -268,20 +269,66 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 424
+    x: 155
     y: 0
-    width: 1105
-    height: 758
+    width: 647
+    height: 529
   m_MinSize: {x: 202, y: 226}
   m_MaxSize: {x: 4002, y: 4026}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
   - {fileID: 18}
-  - {fileID: 12}
+  - {fileID: 19}
+  - {fileID: 13}
   m_Selected: 1
-  m_LastSelected: 0
+  m_LastSelected: 2
 --- !u!114 &12
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13956, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 50, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: UI Toolkit Debugger
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+    m_TextWithWhitespace: "UI Toolkit Debugger\u200B"
+  m_Pos:
+    serializedVersion: 2
+    x: 803
+    y: 24
+    width: 1117
+    height: 915
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_ContainerData: []
+    m_OverlaysVisible: 1
+  m_DebuggerImpl:
+    m_LastVisualTreeName: Lineage2
+  m_DebuggerContext:
+    m_SelectedElementIndex: 10
+    m_ShowLayoutBound: 0
+    m_ShowRepaintOverlay: 0
+    m_ShowDrawStats: 0
+    m_BreakBatches: 0
+    m_ShowWireframe: 0
+    m_ShowTextureAtlasViewer: 0
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -302,10 +349,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "UI Builder\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 3026
+    x: 2737
     y: 79
-    width: 1207
-    height: 474
+    width: 863
+    height: 503
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -317,7 +364,7 @@ MonoBehaviour:
     m_SaveData: []
     m_ContainerData: []
     m_OverlaysVisible: 1
---- !u!114 &13
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -338,9 +385,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Lighting\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 4040
+    x: 3220
     y: 79
-    width: 439
+    width: 1259
     height: 915
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -353,7 +400,7 @@ MonoBehaviour:
     m_SaveData: []
     m_ContainerData: []
     m_OverlaysVisible: 1
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -374,10 +421,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "Project\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 782
-    width: 1528
-    height: 157
+    x: 2560
+    y: 608
+    width: 801
+    height: 386
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -400,7 +447,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/Camera
+    - Assets/Resources/Data/UI/Assets/Menu
     m_Globs: []
     m_ProductIds: 
     m_AnyWithAssetOrigin: 0
@@ -410,16 +457,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/Camera
+  - Assets/Resources/Data/UI/Assets/Menu
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\Stock\Projects\L2-Unity\l2-unity\l2-unity
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 200}
-    m_SelectedIDs: 36e90100
-    m_LastClickedID: 125238
-    m_ExpandedIDs: 0000000070e7010072e7010074e7010076e7010078e701007ae701007ce701007ee7010080e7010082e7010084e7010086e7010088e701008ae701008ce701008ee7010090e7010092e7010094e7010096e7010098e701009ae701009ce701009ee70100a0e70100a2e70100a4e70100a6e70100a8e70100aae70100ace70100aee70100b0e70100b2e70100b4e70100b6e70100b8e70100bae70100bce70100bee70100c0e70100c2e70100c4e70100c6e70100c8e70100cae70100cce70100cee70100
+    scrollPos: {x: 0, y: 674}
+    m_SelectedIDs: 5ce30200
+    m_LastClickedID: 189276
+    m_ExpandedIDs: 00000000b4f80000b6f80000b8f80000baf80000bcf80000bef80000c0f80000c2f80000c4f80000c6f80000c8f80000caf80000ccf80000cef80000d0f80000d2f80000d4f80000d6f80000d8f80000daf80000dcf80000def80000e0f80000e2f80000e4f80000e6f80000e8f80000eaf80000ecf80000eef80000f0f80000f2f80000f4f80000f6f80000f8f80000faf80000fcf80000fef8000000f9000002f9000004f9000006f9000008f900000af900000cf900000ef9000010f9000012f9000014f9000016f9000018f900001af900001cf900001ef9000020f9000022f9000024f90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -448,7 +495,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000070e7010072e7010074e7010076e7010078e701007ae701007ce701007ee7010080e7010082e7010084e7010086e7010088e701008ae701008ce701008ee7010090e7010092e7010094e7010096e7010098e701009ae701009ce701009ee70100a0e70100a2e70100a4e70100a6e70100a8e70100aae70100ace70100aee70100b0e70100b2e70100b4e70100b6e70100b8e70100bae70100bce70100bee70100c0e70100c2e70100c4e70100c6e70100c8e70100cae70100cce70100cee70100
+    m_ExpandedIDs: 00000000b4f80000b6f80000b8f80000baf80000bcf80000bef80000c0f80000c2f80000c4f80000c6f80000c8f80000caf80000ccf80000cef80000d0f80000d2f80000d4f80000d6f80000d8f80000daf80000dcf80000def80000e0f80000e2f80000e4f80000e6f80000e8f80000eaf80000ecf80000eef80000f0f80000f2f80000f4f80000f6f80000f8f80000faf80000fcf80000fef8000000f9000002f9000004f9000006f9000008f900000af900000cf900000ef9000010f9000012f9000014f9000016f9000018f900001af900001cf900001ef9000020f9000022f9000024f90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -474,10 +521,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c62300003cbe00008cb80000ccab0000
+    m_SelectedInstanceIDs: 4af60000
+    m_LastClickedInstanceID: 63050
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: c62300003cbe00008cb80000ccab0000b2c70000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -506,7 +553,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 381
---- !u!114 &15
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -527,9 +574,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Inspector\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 1530
-    y: 24
-    width: 390
+    x: 3220
+    y: 79
+    width: 1259
     height: 915
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -548,14 +595,14 @@ MonoBehaviour:
     m_CachedPref: 513
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 63050
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &16
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -578,8 +625,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 24
-    width: 423
-    height: 732
+    width: 154
+    height: 503
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -596,7 +643,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 
+      m_ExpandedIDs: 6867fdfffafaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -621,7 +668,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &17
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -642,10 +689,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "Scene\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 2984
+    x: 2678
     y: 79
-    width: 1103
-    height: 732
+    width: 558
+    height: 402
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1191,7 +1238,7 @@ MonoBehaviour:
   m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
   m_LastSceneViewOrtho: 0
   m_Viewpoint:
-    m_SceneView: {fileID: 17}
+    m_SceneView: {fileID: 18}
     m_CameraOverscanSettings:
       m_Opacity: 50
       m_Scale: 1
@@ -1201,7 +1248,7 @@ MonoBehaviour:
   m_LastLockedObject: {fileID: 0}
   m_LastDebugDrawMode: 35
   m_ViewIsLockedToObject: 0
---- !u!114 &18
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1222,10 +1269,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "Game\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 425
+    x: 156
     y: 24
-    width: 1103
-    height: 732
+    width: 645
+    height: 503
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1243,7 +1290,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1103, y: 711}
+  m_TargetSize: {x: 645, y: 482}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -1258,10 +1305,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -551.5
-    m_HBaseRangeMax: 551.5
-    m_VBaseRangeMin: -355.5
-    m_VBaseRangeMax: 355.5
+    m_HBaseRangeMin: -322.5
+    m_HBaseRangeMax: 322.5
+    m_VBaseRangeMin: -241
+    m_VBaseRangeMax: 241
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -1270,7 +1317,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -1279,29 +1326,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1103
-      height: 711
+      width: 645
+      height: 482
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 551.5, y: 355.5}
+    m_Translation: {x: 322.5, y: 241}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -551.5
-      y: -355.5
-      width: 1103
-      height: 711
+      x: -322.5
+      y: -241
+      width: 645
+      height: 482
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1103, y: 732}
+  m_LastWindowPixelSize: {x: 645, y: 503}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &19
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1322,10 +1369,10 @@ MonoBehaviour:
     m_TextWithWhitespace: "Console\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 2560
-    y: 579
-    width: 1528
-    height: 415
+    x: 0
+    y: 553
+    width: 801
+    height: 386
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0