diff --git a/Demos.Android/Demos.Android.csproj b/Demos.Android/Demos.Android.csproj
index ea3454a..6344ecd 100644
--- a/Demos.Android/Demos.Android.csproj
+++ b/Demos.Android/Demos.Android.csproj
@@ -69,10 +69,10 @@
         <None Include="Properties\AndroidManifest.xml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Coroutine" Version="1.0.3" />
+        <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="TextCopy" Version="4.2.0" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Demos\Demos.csproj">
diff --git a/Demos/UiDemo.cs b/Demos/UiDemo.cs
index 43fd646..dffcb76 100644
--- a/Demos/UiDemo.cs
+++ b/Demos/UiDemo.cs
@@ -203,7 +203,7 @@ namespace Demos {
 
         // This method is used by the wobbling button (see above)
         // Note that this particular example makes use of the Coroutine package, which is not required but makes demonstration easier
-        private IEnumerator<IWait> WobbleButton(CustomDrawGroup group) {
+        private IEnumerator<Wait> WobbleButton(CustomDrawGroup group) {
             var counter = 0F;
             while (counter < 4 * Math.PI) {
                 // A custom draw group allows the implementation of any sort of custom rendering for all of its child components
@@ -214,12 +214,12 @@ namespace Demos {
                 // be a great way to accomplish feedback animations for buttons and so on.
                 group.Transform = Matrix.CreateTranslation((float) Math.Sin(counter / 2) * 10 * group.Scale, 0, 0);
                 counter += 0.1F;
-                yield return new WaitSeconds(0.01F);
+                yield return new Wait(0.01F);
             }
             group.Transform = Matrix.Identity;
         }
 
-        private IEnumerator<IWait> WobbleProgressBar(ProgressBar bar) {
+        private IEnumerator<Wait> WobbleProgressBar(ProgressBar bar) {
             var reducing = false;
             while (bar.Root != null) {
                 if (reducing) {
@@ -231,7 +231,7 @@ namespace Demos {
                     if (bar.CurrentValue >= bar.MaxValue)
                         reducing = true;
                 }
-                yield return new WaitSeconds(0.01F);
+                yield return new Wait(0.01F);
             }
         }
 
diff --git a/MLEM.Startup/MLEM.Startup.csproj b/MLEM.Startup/MLEM.Startup.csproj
index cd5b1f1..bb401bc 100644
--- a/MLEM.Startup/MLEM.Startup.csproj
+++ b/MLEM.Startup/MLEM.Startup.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Coroutine" Version="1.0.3" />
+        <PackageReference Include="Coroutine" Version="2.0.0" />
         <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
index a2f3cdf..6a5d2bd 100644
--- a/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
+++ b/MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Contentless" Version="2.0.*" />
-        <PackageReference Include="MLEM.Startup" Version="3.3.*" />
+        <PackageReference Include="MLEM.Startup" Version="4.0.*" />
         <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1375-develop" />
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1375-develop" />
     </ItemGroup>
diff --git a/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj b/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
index 4d25cce..0c5fc13 100644
--- a/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
+++ b/MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MLEM.Startup" Version="3.3.*" />
+        <PackageReference Include="MLEM.Startup" Version="4.0.*" />
         <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/MLEM.Ui/Elements/TextField.cs b/MLEM.Ui/Elements/TextField.cs
index 4a0fd57..43bebab 100644
--- a/MLEM.Ui/Elements/TextField.cs
+++ b/MLEM.Ui/Elements/TextField.cs
@@ -210,12 +210,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 0bdf47e..75618e7 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.2.0" />
     </ItemGroup>
 
     <ItemGroup>