diff --git a/APIs/MixItUp.API/MixItUp.API.csproj b/APIs/MixItUp.API/MixItUp.API.csproj
index 8e5d95c2b..c67437935 100644
--- a/APIs/MixItUp.API/MixItUp.API.csproj
+++ b/APIs/MixItUp.API/MixItUp.API.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net10.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<AssemblyTitle>MixItUp.API</AssemblyTitle>
diff --git a/MixItUp.Base/MixItUp.Base.csproj b/MixItUp.Base/MixItUp.Base.csproj
index 11035e2c0..878333470 100644
--- a/MixItUp.Base/MixItUp.Base.csproj
+++ b/MixItUp.Base/MixItUp.Base.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   	<PropertyGroup>
-		<TargetFramework>net10.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AssemblyTitle>MixItUp.Base</AssemblyTitle>
 		<AssemblyVersion>1.6.0.0</AssemblyVersion>
 		<FileVersion>1.6.0.0</FileVersion>
diff --git a/MixItUp.Base/Util/ListExtensions.cs b/MixItUp.Base/Util/ListExtensions.cs
index e9b95c044..5afdcca6e 100644
--- a/MixItUp.Base/Util/ListExtensions.cs
+++ b/MixItUp.Base/Util/ListExtensions.cs
@@ -38,21 +38,21 @@ public static void MoveDown<T>(this IList<T> list, T item)
             }
         }
 
-        //public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> list)
-        //{
-        //    Random random = new Random();
-        //    var l = new SortedList<int, T>();
-        //    foreach (var i in list.ToArray())
-        //    {
-        //        var key = random.Next();
-        //        while (l.ContainsKey(key))
-        //        {
-        //            key = random.Next();
-        //        }
-        //        l.Add(key, i);
-        //    }
-        //    return l.Values;
-        //}
+        public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> list)
+        {
+            Random random = new Random();
+            var l = new SortedList<int, T>();
+            foreach (var i in list.ToArray())
+            {
+                var key = random.Next();
+                while (l.ContainsKey(key))
+                {
+                    key = random.Next();
+                }
+                l.Add(key, i);
+            }
+            return l.Values;
+        }
 
         public static T RemoveFirst<T>(this IList<T> list)
         {
diff --git a/MixItUp.Reporter/MixItUp.Reporter.csproj b/MixItUp.Reporter/MixItUp.Reporter.csproj
index d995501ec..842021a69 100644
--- a/MixItUp.Reporter/MixItUp.Reporter.csproj
+++ b/MixItUp.Reporter/MixItUp.Reporter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
 	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	<SelfContained>true</SelfContained>
     <OutputType>WinExe</OutputType>
diff --git a/MixItUp.SignalR.Client/MixItUp.SignalR.Client.csproj b/MixItUp.SignalR.Client/MixItUp.SignalR.Client.csproj
index 2d04d4622..54af03da0 100644
--- a/MixItUp.SignalR.Client/MixItUp.SignalR.Client.csproj
+++ b/MixItUp.SignalR.Client/MixItUp.SignalR.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	  <AssemblyTitle>MixItUp.SignalR.Client</AssemblyTitle>
 	  <AssemblyVersion>1.6.0.0</AssemblyVersion>
 	  <FileVersion>1.6.0.0</FileVersion>
diff --git a/MixItUp.WPF/MixItUp.WPF.csproj b/MixItUp.WPF/MixItUp.WPF.csproj
index 896afb53f..b8eddf652 100644
--- a/MixItUp.WPF/MixItUp.WPF.csproj
+++ b/MixItUp.WPF/MixItUp.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net10.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
 	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 	<SelfContained>true</SelfContained>
     <OutputType>WinExe</OutputType>