diff --git a/MetroMed/MetroMed.Designer.vb b/MetroMed/MetroMed.Designer.vb
index 1112891..0dc5e77 100644
--- a/MetroMed/MetroMed.Designer.vb
+++ b/MetroMed/MetroMed.Designer.vb
@@ -86,8 +86,6 @@ Partial Class MetroMed
         Me.MetroLabel1 = New MetroFramework.Controls.MetroLabel()
         Me.MetroLabel2 = New MetroFramework.Controls.MetroLabel()
         Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
-        Me.MetroButton18 = New MetroFramework.Controls.MetroButton()
-        Me.MetroButton17 = New MetroFramework.Controls.MetroButton()
         Me.MetroButton16 = New MetroFramework.Controls.MetroButton()
         Me.MetroButton8 = New MetroFramework.Controls.MetroButton()
         Me.MetroButton7 = New MetroFramework.Controls.MetroButton()
@@ -104,6 +102,8 @@ Partial Class MetroMed
         Me.MetroButton13 = New MetroFramework.Controls.MetroButton()
         Me.MetroButton9 = New MetroFramework.Controls.MetroButton()
         Me.MetroButton10 = New MetroFramework.Controls.MetroButton()
+        Me.MetroButton17 = New MetroFramework.Controls.MetroButton()
+        Me.MetroButton18 = New MetroFramework.Controls.MetroButton()
         Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
         Me.CheckBox2 = New System.Windows.Forms.CheckBox()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
@@ -164,6 +164,7 @@ Partial Class MetroMed
         '
         'SplitContainer2
         '
+        Me.SplitContainer2.BackColor = System.Drawing.Color.Transparent
         Me.SplitContainer2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.SplitContainer2.Location = New System.Drawing.Point(0, 0)
         Me.SplitContainer2.Name = "SplitContainer2"
@@ -1059,34 +1060,6 @@ Partial Class MetroMed
         Me.TableLayoutPanel2.Size = New System.Drawing.Size(547, 38)
         Me.TableLayoutPanel2.TabIndex = 2
         '
-        'MetroButton18
-        '
-        Me.MetroButton18.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.MetroButton18.BackColor = System.Drawing.Color.Transparent
-        Me.MetroButton18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.MetroButton18.Location = New System.Drawing.Point(67, 3)
-        Me.MetroButton18.Name = "MetroButton18"
-        Me.MetroButton18.Size = New System.Drawing.Size(26, 32)
-        Me.MetroButton18.TabIndex = 19
-        Me.MetroButton18.Tag = ""
-        Me.MetroToolTip1.SetToolTip(Me.MetroButton18, "Apple II Folder")
-        Me.MetroButton18.UseSelectable = True
-        Me.MetroButton18.UseStyleColors = True
-        '
-        'MetroButton17
-        '
-        Me.MetroButton17.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.MetroButton17.BackColor = System.Drawing.Color.Transparent
-        Me.MetroButton17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.MetroButton17.Location = New System.Drawing.Point(3, 3)
-        Me.MetroButton17.Name = "MetroButton17"
-        Me.MetroButton17.Size = New System.Drawing.Size(26, 32)
-        Me.MetroButton17.TabIndex = 16
-        Me.MetroButton17.Tag = ""
-        Me.MetroToolTip1.SetToolTip(Me.MetroButton17, "  Favoutite games  ")
-        Me.MetroButton17.UseSelectable = True
-        Me.MetroButton17.UseStyleColors = True
-        '
         'MetroButton16
         '
         Me.MetroButton16.Anchor = System.Windows.Forms.AnchorStyles.None
@@ -1283,6 +1256,34 @@ Partial Class MetroMed
         Me.MetroButton10.UseSelectable = True
         Me.MetroButton10.UseStyleColors = True
         '
+        'MetroButton17
+        '
+        Me.MetroButton17.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.MetroButton17.BackColor = System.Drawing.Color.Transparent
+        Me.MetroButton17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.MetroButton17.Location = New System.Drawing.Point(3, 3)
+        Me.MetroButton17.Name = "MetroButton17"
+        Me.MetroButton17.Size = New System.Drawing.Size(26, 32)
+        Me.MetroButton17.TabIndex = 16
+        Me.MetroButton17.Tag = ""
+        Me.MetroToolTip1.SetToolTip(Me.MetroButton17, "  Favoutite games  ")
+        Me.MetroButton17.UseSelectable = True
+        Me.MetroButton17.UseStyleColors = True
+        '
+        'MetroButton18
+        '
+        Me.MetroButton18.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.MetroButton18.BackColor = System.Drawing.Color.Transparent
+        Me.MetroButton18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.MetroButton18.Location = New System.Drawing.Point(67, 3)
+        Me.MetroButton18.Name = "MetroButton18"
+        Me.MetroButton18.Size = New System.Drawing.Size(26, 32)
+        Me.MetroButton18.TabIndex = 19
+        Me.MetroButton18.Tag = ""
+        Me.MetroToolTip1.SetToolTip(Me.MetroButton18, "Apple II Folder")
+        Me.MetroButton18.UseSelectable = True
+        Me.MetroButton18.UseStyleColors = True
+        '
         'TableLayoutPanel3
         '
         Me.MetroStyleExtender1.SetApplyMetroTheme(Me.TableLayoutPanel3, True)
diff --git a/MetroMed/MetroMed.vb b/MetroMed/MetroMed.vb
index a58f486..e3c95c0 100644
--- a/MetroMed/MetroMed.vb
+++ b/MetroMed/MetroMed.vb
@@ -640,6 +640,7 @@ Public Class MetroMed
     Private Sub MetroContextMenu1_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles MetroContextMenu1.Opening
         MetroListServer_reload()
         ParseMednafenConfig()
+        MetroToolTip1.Active = False
     End Sub
 
     Private Sub MetroTextBox1_KeyUp(sender As Object, e As KeyEventArgs) Handles MetroTextBox1.KeyUp
@@ -686,4 +687,7 @@ Public Class MetroMed
         PopulateNetplay()
     End Sub
 
+    Private Sub MetroContextMenu1_Closing(sender As Object, e As ToolStripDropDownClosingEventArgs) Handles MetroContextMenu1.Closing
+        MetroToolTip1.Active = True
+    End Sub
 End Class
\ No newline at end of file
diff --git a/MetroMed/MetroMed.vbproj b/MetroMed/MetroMed.vbproj
index 338d8f7..c9f9b96 100644
--- a/MetroMed/MetroMed.vbproj
+++ b/MetroMed/MetroMed.vbproj
@@ -47,6 +47,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DocumentationFile>MetroMed.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -60,6 +61,9 @@
   <PropertyGroup>
     <ApplicationIcon>MetroMed.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=MSIL">
       <HintPath>..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.dll</HintPath>
@@ -75,12 +79,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Import Include="MetroMed" />
@@ -137,6 +135,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="My Project\app.manifest" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
diff --git a/MetroMed/My Project/Application.Designer.vb b/MetroMed/My Project/Application.Designer.vb
index d8dec77..0a14e27 100644
--- a/MetroMed/My Project/Application.Designer.vb	
+++ b/MetroMed/My Project/Application.Designer.vb	
@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = MetroMed
+            Me.MainForm = Global.MetroMed.MetroMed
         End Sub
     End Class
 End Namespace
diff --git a/MetroMed/My Project/Resources.Designer.vb b/MetroMed/My Project/Resources.Designer.vb
index 75da87b..bbb33d6 100644
--- a/MetroMed/My Project/Resources.Designer.vb	
+++ b/MetroMed/My Project/Resources.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     Il codice è stato generato da uno strumento.
-'     Versione runtime:4.0.30319.1026
+'     Versione runtime:4.0.30319.42000
 '
 '     Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
 '     il codice viene rigenerato.
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MetroMed.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/MetroMed/My Project/Settings.Designer.vb b/MetroMed/My Project/Settings.Designer.vb
index d71fce3..cd0dd30 100644
--- a/MetroMed/My Project/Settings.Designer.vb	
+++ b/MetroMed/My Project/Settings.Designer.vb	
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     Il codice è stato generato da uno strumento.
-'     Versione runtime:4.0.30319.1026
+'     Versione runtime:4.0.30319.42000
 '
 '     Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
 '     il codice viene rigenerato.
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -29,7 +29,7 @@ Namespace My
     Private Shared addedHandlerLockObject As New Object
 
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
         If My.Application.SaveMySettingsOnExit Then
             My.Settings.Save()
         End If
@@ -62,11 +62,11 @@ Namespace My
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Module MySettingsProperty
-
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
-        Friend ReadOnly Property Settings() As My.MySettings
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.MetroMed.My.MySettings
             Get
-                Return My.MySettings.Default
+                Return Global.MetroMed.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/MetroMed/My Project/app.manifest b/MetroMed/My Project/app.manifest
new file mode 100644
index 0000000..ef7a788
--- /dev/null
+++ b/MetroMed/My Project/app.manifest	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- Opzioni manifesto di Controllo dell'account utente
+             Per modificare il livello di Controllo dell'account utente di Windows, sostituire il 
+             nodo requestedExecutionLevel con uno dei seguenti.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Se si specifica l'elemento requestedExecutionLevel, la funzionalità Virtualizzazione file system e registro di sistema verrà disabilitata. 
+            Rimuovere questo elemento se l'applicazione richiede questa virtualizzazione per
+            compatibilità con le versioni precedenti.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Elenco delle versioni di Windows in cui è stata testata questa applicazione e
+           per cui è stato previsto l'uso. Rimuovere il commento dagli elementi appropriati per
+           fare in modo che Windows selezioni automaticamente l'ambiente più compatibile. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indica che l'applicazione è sensibile ai valori DPI e non verrà scalata automaticamente da Windows in caso di
+       valori DPI maggiori. Le applicazioni Windows Presentation Foundation (WPF) sono automaticamente sensibili ai valori DPI, pertanto non è necessario 
+       acconsentire esplicitamente. Con le applicazioni Windows Form destinate a .NET Framework 4.6 per cui è stato acconsentito esplicitamente a questa impostazione, 
+       è anche necessario impostare 'EnableWindowsFormsHighDpiAutoResizing' su 'true' nel relativo file app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Abilita i temi per finestre di dialogo e controlli comuni di Windows (Windows XP e versioni successive) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>