From bb65f01e18040b8c1bf76f45f32782e569a28a27 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Sun, 19 Sep 2021 10:57:12 -0700
Subject: [PATCH] begin design of stylish layout

---
 .../Stylish/LauncherFormStylishInterface.xaml | 193 +++++++++++++++---
 .../NovetusLauncher/Novetus.Launcher.csproj   |  13 +-
 .../Properties/Resources.Designer.cs          |  10 +-
 .../Graphics => Resources}/BuildSolo2.png     | Bin
 .../Graphics => Resources}/JoinServer.png     | Bin
 .../Graphics => Resources}/PlaySolo.png       | Bin
 .../Graphics => Resources}/StartServer.png    | Bin
 7 files changed, 173 insertions(+), 43 deletions(-)
 rename Novetus/NovetusLauncher/{Forms/LauncherForm/Stylish/Graphics => Resources}/BuildSolo2.png (100%)
 rename Novetus/NovetusLauncher/{Forms/LauncherForm/Stylish/Graphics => Resources}/JoinServer.png (100%)
 rename Novetus/NovetusLauncher/{Forms/LauncherForm/Stylish/Graphics => Resources}/PlaySolo.png (100%)
 rename Novetus/NovetusLauncher/{Forms/LauncherForm/Stylish/Graphics => Resources}/StartServer.png (100%)

diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
index 09a8cbc..d0279d4 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:properties="clr-namespace:NovetusLauncher.Properties"
              mc:Ignorable="d" 
              Height="299.569" Width="695.158">
     <UserControl.Resources>
@@ -168,8 +169,8 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
-                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
-                                <Image HorizontalAlignment="Center" Source="Graphics/JoinServer.png"/>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/JoinServer.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
@@ -201,8 +202,8 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
-                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
-                                <Image HorizontalAlignment="Center" Source="Graphics/StartServer.png"/>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/StartServer.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
@@ -234,8 +235,8 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
-                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
-                                <Image HorizontalAlignment="Center" Source="Graphics/PlaySolo.png"/>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/PlaySolo.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
@@ -267,8 +268,8 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
-                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
-                                <Image HorizontalAlignment="Center" Source="Graphics/BuildSolo2.png"/>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/BuildSolo2.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
@@ -288,6 +289,74 @@
             </Setter>
         </Style>
 
+        <Style x:Key="SearchButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="#FFBBBBBB" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontFamily" Value="Helvetica" />
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/search.png" Stretch="UniformToFill"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#FFEEEEEE" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="#FF575757" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="RefreshButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="#FFBBBBBB" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontFamily" Value="Helvetica" />
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
+                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/refresh.png" Stretch="UniformToFill"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#FFEEEEEE" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="#FF575757" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="{x:Type TextBox}">
             <Setter Property="FontSize" Value="12" />
             <Setter Property="FontFamily" Value="Helvetica" />
@@ -316,6 +385,60 @@
             </Setter>
         </Style>
 
+        <Style TargetType="{x:Type ListBox}">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="FontFamily" Value="Helvetica" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="Background" Value="#FFEDEDED"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBox}">
+                        <Border BorderThickness="2">
+                            <Border.BorderBrush>
+                                <VisualBrush>
+                                    <VisualBrush.Visual>
+                                        <Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="2"
+                                            Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
+                                            Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"
+                                            Fill="#FFEDEDED"/>
+                                    </VisualBrush.Visual>
+                                </VisualBrush>
+                            </Border.BorderBrush>
+                            <ScrollViewer Margin="0" x:Name="PART_ContentHost" Background="#FFEDEDED"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style TargetType="{x:Type TreeView}">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="FontFamily" Value="Helvetica" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="Background" Value="#FFEDEDED"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TreeView}">
+                        <Border BorderThickness="2">
+                            <Border.BorderBrush>
+                                <VisualBrush>
+                                    <VisualBrush.Visual>
+                                        <Rectangle StrokeDashArray="4 2" Stroke="Gray" StrokeThickness="2"
+                                            Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
+                                            Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}"
+                                            Fill="#FFEDEDED"/>
+                                    </VisualBrush.Visual>
+                                </VisualBrush>
+                            </Border.BorderBrush>
+                            <ScrollViewer Margin="0" x:Name="PART_ContentHost" Background="#FFEDEDED"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="{x:Type CheckBox}">
             <Setter Property="FontSize" Value="12" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -326,7 +449,7 @@
     <TabControl x:Name="tabControl" HorizontalAlignment="Center" Height="295" Margin="0,0
                 ,0,0" Width="689" BorderBrush="{x:Null}" Background="#FF294E64">
         <TabItem Header="PLAY" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
-            <Grid Background="#FFEDEDED" Margin="0,0,-2,0">
+            <Grid Background="#FFEDEDED">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="101*"/>
                     <ColumnDefinition Width="584*"/>
@@ -334,56 +457,62 @@
                 <Rectangle x:Name="userInfoGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="120" Margin="6,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="163" Grid.ColumnSpan="2"/>
                 <Button x:Name="buttonTest" Content="Regenerate ID" HorizontalAlignment="Left" Margin="44,104,0,0" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2" Height="21" RenderTransformOrigin="0.42,0.512"/>
                 <TextBox x:Name="userNameBox" HorizontalAlignment="Left" Height="20" Margin="66,53,0,0" TextWrapping="Wrap" Text="Player" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2"/>
-                <Rectangle x:Name="joinServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="120" Margin="9,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="160" Grid.ColumnSpan="2"/>
-                <Rectangle x:Name="joinServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="9,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="160" Grid.ColumnSpan="2"/>
+                <Rectangle x:Name="joinServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="120" Margin="6,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="163" Grid.ColumnSpan="2"/>
+                <Rectangle x:Name="joinServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="6,135,0,0" Stroke="Black" VerticalAlignment="Top" Width="163" Grid.ColumnSpan="2"/>
                 <Rectangle x:Name="userInfoLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="6,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="163" Grid.ColumnSpan="2"/>
                 <Label x:Name="userInfoLabel" Content="User Info" HorizontalAlignment="Left" Margin="44,9,0,0" VerticalAlignment="Top" FontSize="15" Grid.ColumnSpan="2" Width="87"/>
                 <Label x:Name="userName" Content="Name:" HorizontalAlignment="Left" Margin="16,47,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
                 <TextBox x:Name="userIDBox" HorizontalAlignment="Left" Height="20" Margin="66,81,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="95" Grid.ColumnSpan="2"/>
                 <Label x:Name="userID" Content="ID:" HorizontalAlignment="Left" Margin="26,75,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-                <Label x:Name="joinServerLabel" Content="Play Novetus" HorizontalAlignment="Left" Margin="29,135,0,0" VerticalAlignment="Top" FontSize="15" Width="102" Grid.ColumnSpan="2"/>
+                <Label x:Name="joinServerLabel" Content="Join Server" HorizontalAlignment="Left" Margin="37,134,0,0" VerticalAlignment="Top" FontSize="15" Width="102" Grid.ColumnSpan="2"/>
                 <TextBox x:Name="ipAddressBox" HorizontalAlignment="Left" Height="20" Margin="26,186,0,0" TextWrapping="Wrap" Text="localhost" VerticalAlignment="Top" Width="120" Grid.ColumnSpan="2"/>
                 <Label x:Name="ipAddressLabel" Content="Server IP Address:" HorizontalAlignment="Left" Margin="29,165,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.ColumnSpan="2"/>
                 <TextBox x:Name="joinPortBox" HorizontalAlignment="Left" Height="20" Margin="26,221,0,0" TextWrapping="Wrap" Text="53640" VerticalAlignment="Top" Width="120" Grid.ColumnSpan="2"/>
                 <Label x:Name="joinPortLabel" Content="Server Port" HorizontalAlignment="Left" Margin="44,199,0,0" VerticalAlignment="Top" FontSize="12" Height="27" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="86" Grid.ColumnSpan="2"/>
-                <Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="Join Server with IP" HorizontalAlignment="Left" Margin="240,212,0,0" VerticalAlignment="Top" Width="122" Height="42" Grid.Column="1"/>
-                <Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButtonSmall}" Content="Browse Servers" HorizontalAlignment="Left" Margin="421,205,0,0" VerticalAlignment="Top" Width="153" Height="22" Grid.Column="1"/>
+                <Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="" HorizontalAlignment="Left" Margin="238,192,0,0" VerticalAlignment="Top" Width="91" Height="33" Grid.Column="1" RenderTransformOrigin="0.227,0.54"/>
+                <Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButton}" Content="Browse Servers" HorizontalAlignment="Left" Margin="262,229,0,0" VerticalAlignment="Top" Width="156" Height="26" Grid.Column="1" RenderTransformOrigin="0.645,-0.075"/>
                 <Rectangle x:Name="hostServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="245" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1"/>
                 <Rectangle x:Name="hostServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1"/>
-                <Label x:Name="hostServerLabel" Content="Host Server" HorizontalAlignment="Left" Margin="100,10,0,0" VerticalAlignment="Top" FontSize="15" Width="98" Grid.Column="1"/>
-                <Button x:Name="playSoloButton" Style="{DynamicResource ImportantButtonSmall}" Content="Play Solo" HorizontalAlignment="Left" Margin="421,232,0,0" VerticalAlignment="Top" Width="153" Height="22" Grid.Column="1" RenderTransformOrigin="1.3,0.863"/>
-                <Label x:Name="label" Content="MAPS GO HERE" Grid.Column="1" HorizontalAlignment="Left" Margin="367,104,0,0" VerticalAlignment="Top"/>
-                <Label x:Name="label1" Content="OPTIONS GO HERE" Grid.Column="1" HorizontalAlignment="Left" Margin="73,114,0,0" VerticalAlignment="Top"/>
+                <Label x:Name="hostServerLabel" Content="Host Server" HorizontalAlignment="Left" Margin="100,9,0,0" VerticalAlignment="Top" FontSize="15" Width="98" Grid.Column="1" RenderTransformOrigin="0.561,0.175"/>
+                <Button x:Name="playSoloButton" Style="{DynamicResource SoloButton}" Content="" HorizontalAlignment="Left" Margin="348,192,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="1" RenderTransformOrigin="1.3,0.863"/>
+                <TextBox x:Name="ServerInfo" Grid.Column="1" HorizontalAlignment="Left" Height="94" Margin="79,45,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="139"/>
+                <Button x:Name="StudioButton" Style="{DynamicResource StudioButton}" Content="" HorizontalAlignment="Left" Margin="474,192,0,0" VerticalAlignment="Top" Width="90" Height="32" Grid.Column="1" RenderTransformOrigin="1.3,0.863"/>
+                <Button x:Name="ServerButton" Style="{DynamicResource HostButton}" Content="" HorizontalAlignment="Left" Margin="474,224,0,0" VerticalAlignment="Top" Width="90" Height="31" Grid.Column="1" RenderTransformOrigin="1.3,0.863"/>
+                <Rectangle x:Name="mapsGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="179" Margin="230,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="344" Grid.Column="1"/>
+                <Rectangle x:Name="mapsLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="230,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="344" Grid.Column="1"/>
+                <Label x:Name="hostServerLabel_Copy" Content="Maps" HorizontalAlignment="Left" Margin="388,9,0,0" VerticalAlignment="Top" FontSize="15" Width="52" Grid.Column="1"/>
+                <TextBox x:Name="mapsDescBox" Grid.Column="1" HorizontalAlignment="Left" Height="54" Margin="238,128,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="329" IsReadOnly="True" HorizontalContentAlignment="Left" VerticalContentAlignment="Top"/>
+                <TreeView x:Name="mapsBox" Grid.Column="1" HorizontalAlignment="Left" Height="61" Margin="238,64,0,0" VerticalAlignment="Top" Width="329"/>
+                <TextBox x:Name="searchBox" Grid.Column="1" HorizontalAlignment="Left" Height="20" Margin="238,42,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="207" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" IsReadOnly="True"/>
+                <Button x:Name="searchButton" Style="{DynamicResource SearchButton}" Content="" Grid.Column="1" HorizontalAlignment="Left" Margin="450,43,0,0" VerticalAlignment="Top" Width="19" Height="19"/>
+                <Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="1" HorizontalAlignment="Left" Margin="474,45,0,0" VerticalAlignment="Top" Width="16" Height="16"/>
+                <Button x:Name="addMapButton" Content="Add Map..." Grid.Column="1" HorizontalAlignment="Left" Margin="495,45,0,0" VerticalAlignment="Top" Width="72"/>
             </Grid>
         </TabItem>
         <TabItem Header="VERSIONS" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
             <Grid Background="#FFEDEDED">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="274*"/>
+                    <ColumnDefinition Width="37*"/>
+                    <ColumnDefinition Width="237*"/>
                     <ColumnDefinition Width="409*"/>
                 </Grid.ColumnDefinitions>
-                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665" Grid.ColumnSpan="2"/>
+                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="245" Margin="6,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="669" Grid.ColumnSpan="3"/>
+                <ListBox x:Name="clientListBox" HorizontalAlignment="Left" Height="100" Margin="18,21,0,0" VerticalAlignment="Top" Width="646" Grid.ColumnSpan="3"/>
+                <TextBox x:Name="clientWarningBox" HorizontalAlignment="Left" Height="47" Margin="18,126,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="646" Grid.ColumnSpan="3" IsReadOnly="True" Foreground="Red" FontWeight="Bold" Text="THIS IS A TEST"/>
+                <TextBox x:Name="clientDescBox" HorizontalAlignment="Left" Height="65" Margin="18,178,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="646" Grid.ColumnSpan="3" IsReadOnly="True"/>
             </Grid>
         </TabItem>
         <TabItem Header="SAVED" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
-            <Grid Background="#FFEDEDED">
-                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
-            </Grid>
+            <Grid Background="#FFEDEDED"/>
         </TabItem>
         <TabItem Header="CONSOLE" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
-            <Grid Background="#FFEDEDED">
-                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
-            </Grid>
+            <Grid Background="#FFEDEDED"/>
         </TabItem>
         <TabItem Header="CHANGES" Style="{DynamicResource TabItemStyleSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
-            <Grid Background="#FFEDEDED">
-                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
-            </Grid>
+            <Grid Background="#FFEDEDED"/>
         </TabItem>
         <TabItem Header="OPTIONS" Style="{DynamicResource TabItemStyleNoSeperators}" BorderBrush="{x:Null}" Background="#FF294E64" Foreground="White" IsSelected="True" FontSize="18" FontFamily="Comic Sans MS">
-            <Grid Background="#FFEDEDED">
-                <Rectangle Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="237" Margin="10,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="665"/>
-            </Grid>
+            <Grid Background="#FFEDEDED"/>
         </TabItem>
     </TabControl>
 </UserControl>
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 210a7ff..95b935e 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -320,7 +320,7 @@
       <DependentUpon>ServerBrowser.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
@@ -347,11 +347,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="NovetusIcon.ico" />
-    <Resource Include="Forms\LauncherForm\Stylish\Graphics\BuildSolo2.png" />
-    <Resource Include="Forms\LauncherForm\Stylish\Graphics\JoinServer.png" />
-    <Resource Include="Forms\LauncherForm\Stylish\Graphics\PlaySolo.png" />
-    <Resource Include="Forms\LauncherForm\Stylish\Graphics\StartServer.png" />
-    <None Include="Resources\search.png" />
+    <Resource Include="Resources\refresh.png" />
+    <Resource Include="Resources\BuildSolo2.png" />
+    <Resource Include="Resources\JoinServer.png" />
+    <Resource Include="Resources\PlaySolo.png" />
+    <Resource Include="Resources\StartServer.png" />
+    <Resource Include="Resources\search.png" />
     <None Include="Resources\NOVETUS_small.png" />
     <None Include="Resources\N.png" />
   </ItemGroup>
diff --git a/Novetus/NovetusLauncher/Properties/Resources.Designer.cs b/Novetus/NovetusLauncher/Properties/Resources.Designer.cs
index 2189105..1640661 100644
--- a/Novetus/NovetusLauncher/Properties/Resources.Designer.cs
+++ b/Novetus/NovetusLauncher/Properties/Resources.Designer.cs
@@ -22,7 +22,7 @@ namespace NovetusLauncher.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ namespace NovetusLauncher.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NovetusLauncher.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ namespace NovetusLauncher.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ namespace NovetusLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap N {
+        public static System.Drawing.Bitmap N {
             get {
                 object obj = ResourceManager.GetObject("N", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
@@ -73,7 +73,7 @@ namespace NovetusLauncher.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap NOVETUS_small {
+        public static System.Drawing.Bitmap NOVETUS_small {
             get {
                 object obj = ResourceManager.GetObject("NOVETUS_small", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/BuildSolo2.png b/Novetus/NovetusLauncher/Resources/BuildSolo2.png
similarity index 100%
rename from Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/BuildSolo2.png
rename to Novetus/NovetusLauncher/Resources/BuildSolo2.png
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/JoinServer.png b/Novetus/NovetusLauncher/Resources/JoinServer.png
similarity index 100%
rename from Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/JoinServer.png
rename to Novetus/NovetusLauncher/Resources/JoinServer.png
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/PlaySolo.png b/Novetus/NovetusLauncher/Resources/PlaySolo.png
similarity index 100%
rename from Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/PlaySolo.png
rename to Novetus/NovetusLauncher/Resources/PlaySolo.png
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/StartServer.png b/Novetus/NovetusLauncher/Resources/StartServer.png
similarity index 100%
rename from Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/StartServer.png
rename to Novetus/NovetusLauncher/Resources/StartServer.png