diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs
index cfb7737..df14d8e 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs
@@ -343,7 +343,7 @@ namespace NovetusLauncher
 
 		private void button23_Click(object sender, EventArgs e)
 		{
-			launcherForm.AddNewMap();
+			
 		}
         #endregion
 	}
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
index 7d15786..84f9741 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
@@ -379,7 +379,7 @@ namespace NovetusLauncher
                 }
             }
 
-            if (gameType == ScriptType.Client && GlobalVars.LocalPlayMode)
+            if (gameType == ScriptType.Client && GlobalVars.LocalPlayMode && FormStyle != Settings.Style.Stylish)
             {
                 GeneratePlayerID();
                 GenerateTripcode();
@@ -469,13 +469,11 @@ namespace NovetusLauncher
         }
 
         // FINALLY. https://stackoverflow.com/questions/11530643/treeview-search
-        public void SearchMaps()
+        public TreeNode SearchMapsInternal(string searchText)
         {
-            string searchText = SearchBar.Text;
-
             if (string.IsNullOrWhiteSpace(searchText))
             {
-                return;
+                return null;
             };
 
             try
@@ -493,9 +491,7 @@ namespace NovetusLauncher
                 {
                     TreeNode selectedNode = CurrentNodeMatches[LastNodeIndex];
                     LastNodeIndex++;
-                    Tree.SelectedNode = selectedNode;
-                    Tree.SelectedNode.Expand();
-                    Tree.Select();
+                    return selectedNode;
                 }
                 else
                 {
@@ -506,15 +502,26 @@ namespace NovetusLauncher
                     SearchNodes(searchText, Tree.Nodes[0]);
                     TreeNode selectedNode = CurrentNodeMatches[LastNodeIndex];
                     LastNodeIndex++;
-                    Tree.SelectedNode = selectedNode;
-                    Tree.SelectedNode.Expand();
-                    Tree.Select();
+                    return selectedNode;
                 }
             }
             catch (Exception ex)
             {
                 GlobalFuncs.LogExceptions(ex);
                 MessageBox.Show("The map '" + searchText + "' cannot be found. Please try another term.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return null;
+            }
+        }
+
+        public void SearchMaps()
+        {
+            TreeNode node = SearchMapsInternal(SearchBar.Text);
+
+            if (node != null)
+            {
+                Tree.SelectedNode = node;
+                Tree.SelectedNode.Expand();
+                Tree.Select();
             }
         }
 
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
index 28874dd..bbba1ca 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
@@ -181,19 +181,17 @@
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
                             <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
-                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/JoinServer.png" Stretch="UniformToFill"/>
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/JoinServer.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/JoinServer_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/JoinServer_click.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -214,19 +212,17 @@
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
                             <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
-                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/StartServer.png" Stretch="UniformToFill"/>
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/StartServer.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/StartServer_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/StartServer_click.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -247,19 +243,17 @@
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
                             <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
-                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/PlaySolo.png" Stretch="UniformToFill"/>
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/PlaySolo.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/PlaySolo_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/PlaySolo_click.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -280,19 +274,17 @@
                     <ControlTemplate TargetType="{x:Type Button}">
                         <StackPanel>
                             <StackPanel HorizontalAlignment="Stretch" Background="Transparent">
-                                <Image HorizontalAlignment="Center" Source="/Novetus;component/Resources/BuildSolo2.png" Stretch="UniformToFill"/>
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/BuildSolo2.png" Stretch="UniformToFill"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/BuildSolo2_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="Black" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/BuildSolo2_click.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -313,20 +305,20 @@
                 <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 HorizontalAlignment="Center" Background="Transparent" VerticalAlignment="Center" 
+                                        Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=ActualWidth}"
+                                            Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=ActualHeight}">
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/search.png" Stretch="None" VerticalAlignment="Center"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#FFEEEEEE" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/search_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#FF575757" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/search.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -347,20 +339,20 @@
                 <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 HorizontalAlignment="Center" VerticalAlignment="Center" 
+                                            Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=ActualWidth}"
+                                            Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=ActualHeight}">
+                                <Image x:Name="image" HorizontalAlignment="Center" Source="/Novetus;component/Resources/refresh.png" Stretch="None" VerticalAlignment="Center"/>
                             </StackPanel>
                         </StackPanel>
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#FFEEEEEE" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/refresh_hover.png" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#FF575757" />
-                                <Setter Property="Foreground" Value="Black" />
+                                <Setter TargetName="image" Property="Source" Value="/Novetus;component/Resources/refresh.png" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -538,7 +530,7 @@
                     <ColumnDefinition Width="447*"/>
                 </Grid.ColumnDefinitions>
                 <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="regenerateIDButton" Content="Regen" HorizontalAlignment="Left" Margin="21,82,0,0" VerticalAlignment="Top" Width="39" Height="19" RenderTransformOrigin="0.42,0.512" Grid.Column="1"/>
+                <Button x:Name="regenerateIDButton" Content="Regen" HorizontalAlignment="Left" Margin="21,82,0,0" VerticalAlignment="Top" Width="39" Height="19" RenderTransformOrigin="0.42,0.512" Grid.Column="1" Click="regenerateIDButton_Click"/>
                 <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="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"/>
@@ -552,14 +544,14 @@
                 <Label x:Name="ipAddressLabel" Content="Server IP Address:" HorizontalAlignment="Left" Margin="27,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="Join 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="" HorizontalAlignment="Left" Margin="103.166,192,0,0" VerticalAlignment="Top" Width="91" Height="33" Grid.Column="2" RenderTransformOrigin="0.227,0.54"/>
-                <Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButton}" Content="Browse Servers" HorizontalAlignment="Left" Margin="131.166,229,0,0" VerticalAlignment="Top" Width="156" Height="26" Grid.Column="2" RenderTransformOrigin="0.645,-0.075"/>
+                <Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="" HorizontalAlignment="Left" Margin="103.166,192,0,0" VerticalAlignment="Top" Width="91" Height="33" Grid.Column="2" RenderTransformOrigin="0.227,0.54" Click="joinButton_Click"/>
+                <Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButton}" Content="Browse Servers" HorizontalAlignment="Left" Margin="131.166,229,0,0" VerticalAlignment="Top" Width="156" Height="26" Grid.Column="2" RenderTransformOrigin="0.645,-0.075" Click="serverBrowserButton_Click"/>
                 <Rectangle x:Name="hostServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="130" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <Rectangle x:Name="hostServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <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" Grid.ColumnSpan="2"/>
-                <Button x:Name="playSoloButton" Style="{DynamicResource SoloButton}" Content="" HorizontalAlignment="Left" Margin="213.166,192,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863"/>
-                <Button x:Name="StudioButton" Style="{DynamicResource StudioButton}" Content="" HorizontalAlignment="Left" Margin="339.166,192,0,0" VerticalAlignment="Top" Width="90" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863"/>
-                <Button x:Name="ServerButton" Style="{DynamicResource HostButton}" Content="" HorizontalAlignment="Left" Margin="339.166,227,0,0" VerticalAlignment="Top" Width="90" Height="31" Grid.Column="2" RenderTransformOrigin="1.3,0.863"/>
+                <Button x:Name="playSoloButton" Style="{DynamicResource SoloButton}" Content="" HorizontalAlignment="Left" Margin="213.166,192,0,0" VerticalAlignment="Top" Width="92" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="playSoloButton_Click"/>
+                <Button x:Name="StudioButton" Style="{DynamicResource StudioButton}" Content="" HorizontalAlignment="Left" Margin="339.166,192,0,0" VerticalAlignment="Top" Width="90" Height="32" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="StudioButton_Click"/>
+                <Button x:Name="ServerButton" Style="{DynamicResource HostButton}" Content="" HorizontalAlignment="Left" Margin="339.166,227,0,0" VerticalAlignment="Top" Width="90" Height="31" Grid.Column="2" RenderTransformOrigin="1.3,0.863" Click="ServerButton_Click"/>
                 <Rectangle x:Name="mapsGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="179" Margin="95.166,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="344" Grid.Column="2"/>
                 <Rectangle x:Name="mapsLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="95.166,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="344" Grid.Column="2"/>
                 <Label x:Name="mapsLabel" Content="Places" HorizontalAlignment="Left" Margin="253.166,9,0,0" VerticalAlignment="Top" FontSize="15" Width="52" Grid.Column="2"/>
@@ -567,10 +559,10 @@
                 <WindowsFormsHost Height="120" Margin="103.166,64,154,76" Width="190" Grid.Column="2" FontFamily="Comic Sans MS" FontSize="9" Background="#FFEDEDED">
                     <wf:TreeView x:Name="mapsBox" AfterSelect="mapsBox_AfterSelect" BeforeSelect="mapsBox_BeforeSelect"/>
                 </WindowsFormsHost>
-                <TextBox x:Name="searchBox" Grid.Column="2" HorizontalAlignment="Left" Height="20" Margin="103.166,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="2" HorizontalAlignment="Left" Margin="315.166,43,0,0" VerticalAlignment="Top" Width="19" Height="19"/>
-                <Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="339.166,45,0,0" VerticalAlignment="Top" Width="16" Height="16"/>
-                <Button x:Name="addMapButton" Content="Add Place" Grid.Column="2" HorizontalAlignment="Left" Margin="360.166,45,0,0" VerticalAlignment="Top" Width="72"/>
+                <TextBox x:Name="searchBox" Grid.Column="2" HorizontalAlignment="Left" Height="20" Margin="103.166,42,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="207" HorizontalContentAlignment="Left" VerticalContentAlignment="Top"/>
+                <Button x:Name="searchButton" Style="{DynamicResource SearchButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="310,44,0,0" VerticalAlignment="Top" Width="24" Height="17" Click="searchButton_Click" RenderTransformOrigin="0.598,0.275"/>
+                <Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="334,44,0,0" VerticalAlignment="Top" Width="26" Height="17" Click="refreshButton_Click" RenderTransformOrigin="0.603,0.981"/>
+                <Button x:Name="addMapButton" Content="Add Place" Grid.Column="2" HorizontalAlignment="Left" Margin="365,45,0,0" VerticalAlignment="Top" Width="67" Click="addMapButton_Click"/>
                 <Button x:Name="customizeButton" Style="{DynamicResource ImportantButtonSmall}" Content="Customize Character" HorizontalAlignment="Left" Margin="16,105,0,0" VerticalAlignment="Top" Width="145" Grid.ColumnSpan="2" Click="customizeButton_Click"/>
                 <Label x:Name="serverPortLabel" Content="Host Port:" Grid.Column="1" HorizontalAlignment="Left" Margin="78,43,0,0" VerticalAlignment="Top" Width="68" Grid.ColumnSpan="2"/>
                 <TextBox x:Name="serverPortBox" HorizontalAlignment="Left" Height="20" Margin="16.166,47,0,0" TextWrapping="Wrap" Text="53640" VerticalAlignment="Top" Width="65" Grid.Column="2"/>
@@ -578,7 +570,7 @@
                 <TextBox x:Name="maxPlayersBox" HorizontalAlignment="Left" Height="20" Margin="16.166,71,0,0" TextWrapping="Wrap" Text="12" VerticalAlignment="Top" Width="66" Grid.Column="2" RenderTransformOrigin="0.525,-0.722"/>
                 <CheckBox x:Name="uPnPBox" Content="uPnP" Grid.Column="1" HorizontalAlignment="Left" Margin="78,93,0,0" VerticalAlignment="Top"/>
                 <CheckBox x:Name="NotifBox" Content="Join Alerts" Grid.Column="1" HorizontalAlignment="Left" Margin="134,93,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/>
-                <Button x:Name="serverInfoButton" Content="Server Information" Grid.Column="1" HorizontalAlignment="Left" Margin="78,113,0,0" VerticalAlignment="Top" Width="139" Grid.ColumnSpan="2"/>
+                <Button x:Name="serverInfoButton" Content="Server Information" Grid.Column="1" HorizontalAlignment="Left" Margin="78,113,0,0" VerticalAlignment="Top" Width="139" Grid.ColumnSpan="2" Click="serverInfoButton_Click"/>
                 <Rectangle x:Name="hostServerBrowserGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="110" Margin="72,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <Rectangle x:Name="hostServerBrowserLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="72,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <Label x:Name="hostServerBrowserLabel" Content="Optional Hosting Settings" HorizontalAlignment="Left" Margin="69,147,0,0" VerticalAlignment="Top" Width="156" Grid.Column="1" RenderTransformOrigin="0.561,0.175" FontSize="12" Grid.ColumnSpan="2"/>
@@ -629,7 +621,7 @@
                 <Rectangle x:Name="optionsLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="6,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="669" Grid.ColumnSpan="2"/>
                 <Label x:Name="optionsLabel" Content="Options" HorizontalAlignment="Left" Margin="317,10,0,0" VerticalAlignment="Top" FontSize="15" Width="65" RenderTransformOrigin="0.561,0.175"/>
                 <TextBox x:Name="readmeBox" HorizontalAlignment="Left" Height="115" Margin="6,111,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="667" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" IsReadOnly="True" Grid.ColumnSpan="2" FontFamily="Comic Sans MS"/>
-                <Label x:Name="versionLabel" Content="1.0" HorizontalAlignment="Left" Margin="6,235,0,-4" VerticalAlignment="Top" Width="194" BorderThickness="0" BorderBrush="#FF6E6E6E" VerticalContentAlignment="Top" HorizontalContentAlignment="Center" Height="29"/>
+                <Label x:Name="versionLabel" Content="1.0" HorizontalAlignment="Left" Margin="6,235,0,-4" VerticalAlignment="Top" Width="194" BorderThickness="0" BorderBrush="#FF6E6E6E" VerticalContentAlignment="Top" HorizontalContentAlignment="Center" Height="29" MouseDown="versionLabel_MouseDown"/>
                 <Label x:Name="tripcodeLabel" Content="abcdefghijklmopqrstuvwxyz" HorizontalAlignment="Left" Margin="205,231,0,0" VerticalAlignment="Top" Width="270" Grid.ColumnSpan="2"/>
                 <Label x:Name="codenameLabel" Content="PROJECT STARLIGHT" HorizontalAlignment="Left" Margin="41.096,231,0,0" VerticalAlignment="Top" Width="193" Grid.Column="1"/>
                 <Label x:Name="versionNovetusLabel" Content="novetus 1.0" HorizontalAlignment="Left" Margin="6,220,0,0" VerticalAlignment="Top" Width="194"/>
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
index ba16dd8..81987e6 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
@@ -185,6 +185,69 @@ namespace NovetusLauncher
             CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
             ccustom.Show();
         }
+
+        private void joinButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void playSoloButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void serverBrowserButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void StudioButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void ServerButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void serverInfoButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void regenerateIDButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void addMapButton_Click(object sender, RoutedEventArgs e)
+        {
+            launcherForm.AddNewMap();
+        }
+
+        private void searchButton_Click(object sender, RoutedEventArgs e)
+        {
+            TreeNode node = launcherForm.SearchMapsInternal(searchBox.Text);
+
+            if (node != null)
+            {
+                mapsBox.SelectedNode = node;
+                mapsBox.SelectedNode.Expand();
+                mapsBox.Select();
+            }
+        }
+
+        private void refreshButton_Click(object sender, RoutedEventArgs e)
+        {
+            launcherForm.RefreshMaps();
+            LoadMapDesc();
+        }
+
+        private void versionLabel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            launcherForm.EasterEggLogic();
+        }
     }
 
     public class ClientListItem
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 5627833..5e7b637 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -348,6 +348,16 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="NovetusIcon.ico" />
+    <Resource Include="Resources\BuildSolo2_click.png" />
+    <Resource Include="Resources\BuildSolo2_hover.png" />
+    <Resource Include="Resources\JoinServer_click.png" />
+    <Resource Include="Resources\JoinServer_hover.png" />
+    <Resource Include="Resources\PlaySolo_click.png" />
+    <Resource Include="Resources\PlaySolo_hover.png" />
+    <Resource Include="Resources\refresh_hover.png" />
+    <Resource Include="Resources\search_hover.png" />
+    <Resource Include="Resources\StartServer_click.png" />
+    <Resource Include="Resources\StartServer_hover.png" />
     <Resource Include="Resources\refresh.png" />
     <Resource Include="Resources\BuildSolo2.png" />
     <Resource Include="Resources\JoinServer.png" />
diff --git a/Novetus/NovetusLauncher/Resources/BuildSolo2_click.png b/Novetus/NovetusLauncher/Resources/BuildSolo2_click.png
new file mode 100644
index 0000000..de0d2f6
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/BuildSolo2_click.png differ
diff --git a/Novetus/NovetusLauncher/Resources/BuildSolo2_hover.png b/Novetus/NovetusLauncher/Resources/BuildSolo2_hover.png
new file mode 100644
index 0000000..6b1227e
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/BuildSolo2_hover.png differ
diff --git a/Novetus/NovetusLauncher/Resources/JoinServer_click.png b/Novetus/NovetusLauncher/Resources/JoinServer_click.png
new file mode 100644
index 0000000..aacb5ae
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/JoinServer_click.png differ
diff --git a/Novetus/NovetusLauncher/Resources/JoinServer_hover.png b/Novetus/NovetusLauncher/Resources/JoinServer_hover.png
new file mode 100644
index 0000000..613e77c
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/JoinServer_hover.png differ
diff --git a/Novetus/NovetusLauncher/Resources/PlaySolo_click.png b/Novetus/NovetusLauncher/Resources/PlaySolo_click.png
new file mode 100644
index 0000000..5f60455
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/PlaySolo_click.png differ
diff --git a/Novetus/NovetusLauncher/Resources/PlaySolo_hover.png b/Novetus/NovetusLauncher/Resources/PlaySolo_hover.png
new file mode 100644
index 0000000..d4e7f87
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/PlaySolo_hover.png differ
diff --git a/Novetus/NovetusLauncher/Resources/StartServer_click.png b/Novetus/NovetusLauncher/Resources/StartServer_click.png
new file mode 100644
index 0000000..6e02985
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/StartServer_click.png differ
diff --git a/Novetus/NovetusLauncher/Resources/StartServer_hover.png b/Novetus/NovetusLauncher/Resources/StartServer_hover.png
new file mode 100644
index 0000000..fc2e0a6
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/StartServer_hover.png differ
diff --git a/Novetus/NovetusLauncher/Resources/refresh_hover.png b/Novetus/NovetusLauncher/Resources/refresh_hover.png
new file mode 100644
index 0000000..a6f2825
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/refresh_hover.png differ
diff --git a/Novetus/NovetusLauncher/Resources/search_hover.png b/Novetus/NovetusLauncher/Resources/search_hover.png
new file mode 100644
index 0000000..4df7adf
Binary files /dev/null and b/Novetus/NovetusLauncher/Resources/search_hover.png differ