diff --git a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj
index 2a16c04..e1b12d8 100644
--- a/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj
+++ b/Novetus/Novetus.Bootstrapper/Novetus.Bootstrapper.csproj
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;BASICLAUNCHER;NOVETUS_APPS</DefineConstants>
+    <DefineConstants>TRACE;BASICLAUNCHER;NOVETUS_APPS;NET4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj
index ce5ba5b..778216c 100644
--- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj
+++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj
@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;TESTER;NOVETUS_APPS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TESTER;NOVETUS_APPS;NET4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj
index af8183c..4a6b59d 100644
--- a/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj
+++ b/Novetus/Novetus.ReleasePreparer/Novetus.ReleasePreparer.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PREPARER</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;PREPARER;NET4</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/Novetus/NovetusCore/StorageAndFunctions/Util.cs b/Novetus/NovetusCore/StorageAndFunctions/Util.cs
index b9f5dd4..dbc514c 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/Util.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/Util.cs
@@ -558,9 +558,13 @@ public static class Util
     //http://stevenhollidge.blogspot.com/2012/06/async-taskdelay.html
     public static Task Delay(int milliseconds)
     {
+#if NET4
         var tcs = new TaskCompletionSource<object>();
         new System.Threading.Timer(_ => tcs.SetResult(null)).Change(milliseconds, -1);
         return tcs.Task;
+#elif NET6_0_OR_GREATER
+        return Task.Delay(milliseconds);
+#endif
     }
 
     public static void LogPrint(string text, int type = 1)
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 3ac9187..9f791dc 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -74,6 +74,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>TRACE;LAUNCHER;NOVETUS_APPS;NET4</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj
index 631618c..2ab552a 100644
--- a/Novetus/NovetusURI/Novetus.URI.csproj
+++ b/Novetus/NovetusURI/Novetus.URI.csproj
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;URI;NOVETUS_APPS</DefineConstants>
+    <DefineConstants>TRACE;URI;NOVETUS_APPS;NET4</DefineConstants>
     <ErrorReport>none</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>