diff --git a/Android/build.bat b/Android/build.bat
index d1c3d97..1f4861d 100644
--- a/Android/build.bat
+++ b/Android/build.bat
@@ -1 +1,3 @@
-dotnet build -f net8.0-android -c Release
\ No newline at end of file
+dotnet build -f net8.0-android -c Release
+
+REM Note: Android SDL2 (armhf) is copied via Core.csproj conditional includes
\ No newline at end of file
diff --git a/AvaloniaUI/publish.linux.arm.bat b/AvaloniaUI/publish.linux.arm.bat
index 9324820..d6be8be 100644
--- a/AvaloniaUI/publish.linux.arm.bat
+++ b/AvaloniaUI/publish.linux.arm.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r linux-arm -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+copy /Y ..\LIBS\SDL2\armhf\libSDL2.so bin\Release\net8.0\linux-arm\publish\
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.linux.arm64.bat b/AvaloniaUI/publish.linux.arm64.bat
index 8023ec0..5e9e720 100644
--- a/AvaloniaUI/publish.linux.arm64.bat
+++ b/AvaloniaUI/publish.linux.arm64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r linux-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+REM Note: No arm64 libSDL2.so available - requires separate download from SDL website
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.linux.loongarch64.bat b/AvaloniaUI/publish.linux.loongarch64.bat
index ab8e81c..fb42a12 100644
--- a/AvaloniaUI/publish.linux.loongarch64.bat
+++ b/AvaloniaUI/publish.linux.loongarch64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r linux-loongarch64 -p:PublishSingleFile=true -p:PublishTrimmed=false -p:DebugType=None -p:DebugSymbols=false --self-contained true -p:RuntimeFrameworkVersion=8.0.22
 
+copy /Y ..\LIBS\SDL2\loongarch64\libSDL2.so bin\Release\net8.0\linux-loongarch64\publish\
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.linux.x64.bat b/AvaloniaUI/publish.linux.x64.bat
index 8c68c9b..a3858cc 100644
--- a/AvaloniaUI/publish.linux.x64.bat
+++ b/AvaloniaUI/publish.linux.x64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+copy /Y ..\LIBS\SDL2\amd64\libSDL2.so bin\Release\net8.0\linux-x64\publish\
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.osx.osx-arm64.bat b/AvaloniaUI/publish.osx.osx-arm64.bat
index 6e5ce89..5a5f142 100644
--- a/AvaloniaUI/publish.osx.osx-arm64.bat
+++ b/AvaloniaUI/publish.osx.osx-arm64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r osx-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+copy /Y ..\LIBS\SDL2\osx\libSDL2.dylib bin\Release\net8.0\osx-arm64\publish\
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.osx.osx-x64.bat b/AvaloniaUI/publish.osx.osx-x64.bat
index 9791153..d1cc226 100644
--- a/AvaloniaUI/publish.osx.osx-x64.bat
+++ b/AvaloniaUI/publish.osx.osx-x64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r osx-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+copy /Y ..\LIBS\SDL2\osx\libSDL2.dylib bin\Release\net8.0\osx-x64\publish\
+
 pause
\ No newline at end of file
diff --git a/AvaloniaUI/publish.win.x64.bat b/AvaloniaUI/publish.win.x64.bat
index a46ec96..90b058b 100644
--- a/AvaloniaUI/publish.win.x64.bat
+++ b/AvaloniaUI/publish.win.x64.bat
@@ -1,3 +1,5 @@
 dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true
 
+copy /Y ..\LIBS\SDL2\win64\SDL2.dll bin\Release\net8.0\win-x64\publish\
+
 pause
\ No newline at end of file
diff --git a/ScePSX/Core.csproj b/ScePSX/Core.csproj
index ee9d3e0..7744b73 100644
--- a/ScePSX/Core.csproj
+++ b/ScePSX/Core.csproj
@@ -35,21 +35,7 @@
 </ItemGroup>
 
 <ItemGroup>
-  <None Include="..\LIBS\SDL2\win64\SDL2.dll" Link="SDL2.dll" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </None>
-  <None Include="..\LIBS\SDL2\win64\SDL2.dll" Link="SDL2.dll" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </None>
-  <None Include="..\LIBS\SDL2\armhf\libSDL2.so" Link="libSDL2.so" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </None>
-  <None Include="..\LIBS\SDL2\amd64\libSDL2.so" Link="libSDL2.so" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </None>
-  <None Include="..\LIBS\SDL2\osx\libSDL2.dylib" Link="libSDL2.dylib" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'osx'">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </None>
+
 </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/WindowUI/ScePSX.Win.csproj b/WindowUI/ScePSX.Win.csproj
index d14663a..b87dede 100644
--- a/WindowUI/ScePSX.Win.csproj
+++ b/WindowUI/ScePSX.Win.csproj
@@ -60,9 +60,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\LIBS\SDL2\win64\SDL2.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="lang\lang-pt.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/WindowUI/UI/Form_Main.cs b/WindowUI/UI/Form_Main.cs
index 52c20c8..71bf6e7 100644
--- a/WindowUI/UI/Form_Main.cs
+++ b/WindowUI/UI/Form_Main.cs
@@ -1087,7 +1087,7 @@ private void ButtonsUp(object sender, KeyEventArgs e)
                 Core.Button(button1, false, 1);
         }
 
-        private void applypgxp()
+        public void applypgxp()
         {
             PGXPVector.use_pgxp = ini.ReadInt("PGXP", "base") == 1;
             PGXPVector.use_pgxp_aff = ini.ReadInt("PGXP", "aff") == 1;
diff --git a/WindowUI/UI/Form_Set.cs b/WindowUI/UI/Form_Set.cs
index 9074c67..3b79d5a 100644
--- a/WindowUI/UI/Form_Set.cs
+++ b/WindowUI/UI/Form_Set.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Windows.Forms;
 
@@ -90,6 +90,8 @@ private void btnsave_Click(object sender, EventArgs e)
             }
 
             applypgxp();
+            FrmMain.applypgxp();
+            this.Close();
         }
 
         private void btndel_Click(object sender, EventArgs e)