diff --git a/include/eepp/ui/uirichtext.hpp b/include/eepp/ui/uirichtext.hpp
index d70efd86e..8c178c372 100644
--- a/include/eepp/ui/uirichtext.hpp
+++ b/include/eepp/ui/uirichtext.hpp
@@ -215,7 +215,7 @@ class EE_API UIRichText : public UIHTMLWidget {
 	virtual void onFontChanged();
 	virtual void onFontStyleChanged();
 	virtual void onSelectionChange();
-	virtual void onLayoutUpdate() override;
+	virtual void onLayoutUpdate();
 
 	void selCurInit( const Int64& init );
 	void selCurEnd( const Int64& end );
@@ -229,9 +229,9 @@ class EE_API UIRichText : public UIHTMLWidget {
 class EE_API UIHTMLHtml : public UIRichText {
   public:
 	static UIHTMLHtml* New( const std::string& tag );
-	virtual Uint32 getType() const override;
-	bool isType( const Uint32& type ) const override;
-	bool applyProperty( const StyleSheetProperty& attribute ) override;
+	virtual Uint32 getType() const;
+	bool isType( const Uint32& type ) const;
+	bool applyProperty( const StyleSheetProperty& attribute );
 
   protected:
 	UIHTMLHtml( const std::string& tag = "html" );
@@ -240,10 +240,10 @@ class EE_API UIHTMLHtml : public UIRichText {
 class EE_API UIHTMLBody : public UIRichText {
   public:
 	static UIHTMLBody* New( const std::string& tag );
-	virtual Uint32 getType() const override;
-	bool isType( const Uint32& type ) const override;
-	bool applyProperty( const StyleSheetProperty& attribute ) override;
-	virtual void updateLayout() override;
+	virtual Uint32 getType() const;
+	bool isType( const Uint32& type ) const;
+	bool applyProperty( const StyleSheetProperty& attribute );
+	virtual void updateLayout();
 	void setDocumentViewportMinHeight( const Float& height );
 
   protected:
@@ -259,14 +259,14 @@ class EE_API UIHTMLBody : public UIRichText {
 	void setDocumentContentMinHeight( const Float& height );
 	void updateDocumentMinHeight();
 	void updateDocumentContentMinHeightFromChildren();
-	virtual Uint32 onMessage( const NodeMessage* Msg ) override;
+	virtual Uint32 onMessage( const NodeMessage* Msg );
 };
 
 class EE_API UIHTMLHead : public UIWidget {
   public:
 	static UIHTMLHead* New();
-	virtual Uint32 getType() const override;
-	bool isType( const Uint32& type ) const override;
+	virtual Uint32 getType() const;
+	bool isType( const Uint32& type ) const;
 
   protected:
 	UIHTMLHead();
diff --git a/projects/windows/ecode/build.app.ps1 b/projects/windows/ecode/build.app.ps1
index 8ad4e990b..2a4f0d6d0 100644
--- a/projects/windows/ecode/build.app.ps1
+++ b/projects/windows/ecode/build.app.ps1
@@ -10,8 +10,8 @@ if ($premakeInPath) {
   $premakeCmd = "premake5.exe"
 } else {
   if (-not (Test-Path ".\premake5.exe")) {
-    Invoke-WebRequest -Uri "https://github.com/premake/premake-core/releases/download/v5.0.0-beta7/premake-5.0.0-beta7-windows.zip" -OutFile "premake-5.0.0-beta7-windows.zip"
-    Expand-Archive -LiteralPath "premake-5.0.0-beta7-windows.zip" -DestinationPath .
+    Invoke-WebRequest -Uri "https://github.com/premake/premake-core/releases/download/v5.0.0-beta8/premake-5.0.0-beta8-windows.zip" -OutFile "premake-5.0.0-beta8-windows.zip"
+    Expand-Archive -LiteralPath "premake-5.0.0-beta8-windows.zip" -DestinationPath .
   }
   $premakeCmd = ".\premake5.exe"
 }
@@ -24,7 +24,17 @@ $msbuildPlat = if ($isArm64) { "ARM64" } else { "x64" }
 $backendArg = if ($isSdl3) { "SDL3" } else { "SDL2" }
 $sdlDll = if ($isSdl3) { "SDL3.dll" } else { "SDL2.dll" }
 
-& $premakeCmd --windows-vc-build --with-backend=$backendArg $(if ($premakeExtra) { $premakeExtra }) --disable-static-build vs2022
+$vsAction = "vs2026"
+$vsWhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+if (Test-Path $vsWhere) {
+    $vsVersion = & $vsWhere -latest -property catalog_productLineVersion
+    if ($vsVersion -lt 18.0) {
+        $vsAction = "vs2022"
+    }
+}
+Write-Output "Using premake action: $vsAction"
+
+& $premakeCmd --windows-vc-build --with-backend=$backendArg $(if ($premakeExtra) { $premakeExtra }) --disable-static-build $vsAction
 
 $msbuildInPath = Get-Command msbuild -ErrorAction SilentlyContinue
 
@@ -45,4 +55,4 @@ if ($msbuildInPath) {
 .\projects\scripts\copy_ecode_assets.ps1 .\bin .\projects\windows\ecode\ecode
 Copy-Item -Path ".\bin\$sdlDll", ".\libs\windows\$archSuffix\eepp.dll", ".\bin\ecode.exe" -Destination ".\projects\windows\ecode\ecode"
 Compress-Archive -LiteralPath ".\projects\windows\ecode\ecode" -DestinationPath .\projects\windows\ecode\ecode-windows-nightly-msvc-$archSuffix.zip -Force
-Compress-Archive -LiteralPath ".\bin\ecode.pdb" -DestinationPath .\projects\windows\ecode\ecode-windows-nightly-msvc-$archSuffix-pdb.zip -Force
\ No newline at end of file
+Compress-Archive -LiteralPath ".\bin\ecode.pdb" -DestinationPath .\projects\windows\ecode\ecode-windows-nightly-msvc-$archSuffix-pdb.zip -Force