diff --git a/Demos.Android/Demos.Android.csproj b/Demos.Android/Demos.Android.csproj
index cbf2a26..b5df223 100644
--- a/Demos.Android/Demos.Android.csproj
+++ b/Demos.Android/Demos.Android.csproj
@@ -17,7 +17,7 @@
         <AndroidResgenClass>Resource</AndroidResgenClass>
         <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
         <AndroidStoreUncompressedFileExtensions>.m4a</AndroidStoreUncompressedFileExtensions>
-        <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+        <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
         <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
         <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
         <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -69,10 +69,10 @@
         <None Include="Properties\AndroidManifest.xml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Coroutine" Version="2.0.0" />
-        <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
-        <PackageReference Include="MonoGame.Framework.Android" Version="3.7.1.189" />
-        <PackageReference Include="TextCopy" Version="3.0.2" />
+        <PackageReference Include="Coroutine" Version="2.0.1" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+        <PackageReference Include="MonoGame.Framework.Android" Version="3.8.0.1641" />
+        <PackageReference Include="TextCopy" Version="4.3.0" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Demos\Demos.csproj">
diff --git a/Demos.Android/Properties/AndroidManifest.xml b/Demos.Android/Properties/AndroidManifest.xml
index 5b4220a..00885a3 100644
--- a/Demos.Android/Properties/AndroidManifest.xml
+++ b/Demos.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Demos.Android.Demos.Android" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-  <application android:label="Demos.Android"></application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.ellpeck.mlem.demos.android" android:versionCode="1" android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
+    <application android:label="MLEM Android Demos"/>
 </manifest>
diff --git a/Demos.Android/Properties/AssemblyInfo.cs b/Demos.Android/Properties/AssemblyInfo.cs
index 828b60f..3c42f3b 100644
--- a/Demos.Android/Properties/AssemblyInfo.cs
+++ b/Demos.Android/Properties/AssemblyInfo.cs
@@ -4,12 +4,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Demos.Android")]
+[assembly: AssemblyTitle("MLEM Android Demos")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Demos.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("MLEM Android Demos")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Demos.Android/Resources/Drawable/Icon.png b/Demos.Android/Resources/Drawable/Icon.png
index 25fe044..83ac967 100644
Binary files a/Demos.Android/Resources/Drawable/Icon.png and b/Demos.Android/Resources/Drawable/Icon.png differ
diff --git a/Demos.Android/Resources/Values/Strings.xml b/Demos.Android/Resources/Values/Strings.xml
index a2890aa..c8bc5fe 100644
--- a/Demos.Android/Resources/Values/Strings.xml
+++ b/Demos.Android/Resources/Values/Strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Demos.Android</string>
+  <string name="app_name">MLEM Android Demos</string>
 </resources>
diff --git a/Demos.DesktopGL/Demos.DesktopGL.csproj b/Demos.DesktopGL/Demos.DesktopGL.csproj
index 14808c5..beaae83 100644
--- a/Demos.DesktopGL/Demos.DesktopGL.csproj
+++ b/Demos.DesktopGL/Demos.DesktopGL.csproj
@@ -3,6 +3,8 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+        <ApplicationIcon>Icon.ico</ApplicationIcon>
+        <AssemblyName>MLEM Desktop Demos</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,9 +19,11 @@
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup>    
         <MonoGameContentReference Include="..\Demos\Content\Content.mgcb" />
         <Content Include="..\Demos\Content\*\**" />
+        <EmbeddedResource Include="Icon.ico" />
+        <EmbeddedResource Include="Icon.bmp" />
     </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Demos.DesktopGL/Icon.bmp b/Demos.DesktopGL/Icon.bmp
new file mode 100644
index 0000000..96d7649
Binary files /dev/null and b/Demos.DesktopGL/Icon.bmp differ
diff --git a/Demos.DesktopGL/Icon.ico b/Demos.DesktopGL/Icon.ico
new file mode 100644
index 0000000..49d4b94
Binary files /dev/null and b/Demos.DesktopGL/Icon.ico differ
diff --git a/MLEM.Startup/MLEM.Startup.csproj b/MLEM.Startup/MLEM.Startup.csproj
index 19be7c7..70ce674 100644
--- a/MLEM.Startup/MLEM.Startup.csproj
+++ b/MLEM.Startup/MLEM.Startup.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Coroutine" Version="2.0.0" />
+        <PackageReference Include="Coroutine" Version="2.0.1" />
         <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.bmp b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.bmp
new file mode 100644
index 0000000..96d7649
Binary files /dev/null and b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.bmp differ
diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.ico b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.ico
new file mode 100644
index 0000000..49d4b94
Binary files /dev/null and b/MLEM.Templates/content/MLEM.Templates.DesktopGL/Icon.ico differ
diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
index 1386a0a..a5fa634 100644
--- a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
+++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
@@ -2,26 +2,23 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <PublishReadyToRun>false</PublishReadyToRun>
         <TieredCompilation>false</TieredCompilation>
+        <ApplicationIcon>Icon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Contentless" Version="3.0.*" />
-        <PackageReference Include="MLEM.Startup" Version="4.0.*" />
-        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+        <PackageReference Include="Contentless" Version="3.0.5" />
+        <PackageReference Include="MLEM.Startup" Version="4.3.0" />
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
     </ItemGroup>
 
     <ItemGroup>
         <MonoGameContentReference Include="Content\Content.mgcb" />
         <Content Include="Content\*\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <TrimmerRootAssembly Include="MonoGame.Framework" Visible="false" />
-        <TrimmerRootAssembly Include="MLEM" Visible="false" />
-        <TrimmerRootAssembly Include="MLEM.Ui" Visible="false" />
+        <EmbeddedResource Include="Icon.ico" />
+        <EmbeddedResource Include="Icon.bmp" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
index 5199688..a7038a9 100644
--- a/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
+++ b/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
@@ -5,15 +5,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MLEM.Startup" Version="4.0.*" />
-        <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
+        <PackageReference Include="MLEM.Startup" Version="4.3.0" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
-
-    <ItemGroup>
-        <TrimmerRootAssembly Include="MonoGame.Framework" Visible="false" />
-        <TrimmerRootAssembly Include="MLEM" Visible="false" />
-        <TrimmerRootAssembly Include="MLEM.Ui" Visible="false" />
-    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MLEM.Ui/Elements/TextField.cs b/MLEM.Ui/Elements/TextField.cs
index 2f24612..279a41b 100644
--- a/MLEM.Ui/Elements/TextField.cs
+++ b/MLEM.Ui/Elements/TextField.cs
@@ -220,12 +220,12 @@ namespace MLEM.Ui.Elements {
                 this.CaretPos = this.text.Length;
             } else if (this.Input.IsModifierKeyDown(ModifierKey.Control)) {
                 if (this.Input.IsKeyPressed(Keys.V)) {
-                    var clip = Clipboard.GetText();
+                    var clip = ClipboardService.GetText();
                     if (clip != null)
                         this.InsertText(clip);
                 } else if (this.Input.IsKeyPressed(Keys.C)) {
                     // until there is text selection, just copy the whole content
-                    Clipboard.SetText(this.Text);
+                    ClipboardService.SetText(this.Text);
                 }
             }
 
diff --git a/MLEM.Ui/MLEM.Ui.csproj b/MLEM.Ui/MLEM.Ui.csproj
index 3258f99..74b2a5d 100644
--- a/MLEM.Ui/MLEM.Ui.csproj
+++ b/MLEM.Ui/MLEM.Ui.csproj
@@ -18,7 +18,7 @@
         <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="TextCopy" Version="3.0.2" />
+        <PackageReference Include="TextCopy" Version="4.3.0" />
     </ItemGroup>
 
     <ItemGroup>