diff --git a/other/Fix-policy-templates.patch b/other/fix-policy-templates.patch
similarity index 100%
rename from other/Fix-policy-templates.patch
rename to other/fix-policy-templates.patch
diff --git a/other/ftp-support-thorium.patch b/other/ftp-support-thorium.patch
index fdeb5031..280cf389 100644
--- a/other/ftp-support-thorium.patch
+++ b/other/ftp-support-thorium.patch
@@ -8340,7 +8340,7 @@ index 0000000000000..8c8b965924cca
 +
 +  resolve_request_ =
 +      resolver_->CreateRequest(url::SchemeHostPort(request_->url),
-+                               NetworkAnonymizationKey(), net_log_, absl::nullopt);
++                               NetworkAnonymizationKey(), net_log_, std::nullopt);
 +  return resolve_request_->Start(base::BindOnce(
 +      &FtpNetworkTransaction::OnIOComplete, base::Unretained(this)));
 +}
diff --git a/setup.sh b/setup.sh
index b13554f6..ae7058dd 100755
--- a/setup.sh
+++ b/setup.sh
@@ -86,7 +86,7 @@ cp -r -v pak_src/binaries/pak-win/. ${CR_SRC_DIR}/out/thorium/ &&
 
 patchFFMPEG () {
 	cp -v other/add-hevc-ffmpeg-decoder-parser.patch ${CR_SRC_DIR}/third_party/ffmpeg/ &&
-	cp -v other/Fix-policy-templates.patch ${CR_SRC_DIR}/ &&
+	cp -v other/fix-policy-templates.patch ${CR_SRC_DIR}/ &&
 	cp -v other/ftp-support-thorium.patch ${CR_SRC_DIR}/ &&
 
 	printf "\n" &&
@@ -97,7 +97,7 @@ patchFFMPEG () {
 	printf "\n" &&
 	printf "${YEL}Patching policy templates...${c0}\n" &&
 	cd ${CR_SRC_DIR} &&
-	git apply --reject ./Fix-policy-templates.patch &&
+	git apply --reject ./fix-policy-templates.patch &&
 
 	printf "\n" &&
 	printf "${YEL}Patching FTP support...${c0}\n" &&
diff --git a/src/chrome/app/chrome_exe.vsprops b/src/chrome/app/chrome_exe.vsprops
index bfe8cc66..23675b3c 100644
--- a/src/chrome/app/chrome_exe.vsprops
+++ b/src/chrome/app/chrome_exe.vsprops
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
-	Version="11.00"
+	Version="8.00"
 	Name="chrome_exe"
 	InheritedPropertySheets="$(SolutionDir)..\third_party\breakpad\using_breakpad.vsprops"
 	>
diff --git a/src/media/base/media_switches.cc b/src/media/base/media_switches.cc
index fa9907b2..a0f77451 100644
--- a/src/media/base/media_switches.cc
+++ b/src/media/base/media_switches.cc
@@ -335,7 +335,7 @@ BASE_FEATURE(kPlatformHEVCDecoderSupport,
 // Enables HEVC hardware accelerated encoding for Windows, Mac, and Android.
 BASE_FEATURE(kPlatformHEVCEncoderSupport,
              "PlatformHEVCEncoderSupport",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             base::FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID)
 #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
 
diff --git a/src/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py b/src/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
index 0c8abe7e..185130eb 100755
--- a/src/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+++ b/src/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
@@ -985,9 +985,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch,
 
     # Google Chrome & ChromeOS specific configuration.
     configure_flags['Chrome'].extend([
-      '--enable-decoder=aac,h264,mp3,eac3,ac3,hevc,mpeg4,mpegvideo,mp2,mp1,flac',
-      '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,eac3,ac3,h264,vc1,flac',
-      '--enable-parser=aac,h264,hevc,mpegaudio,mpeg4video,mpegvideo,eac3,ac3,h261,vc1,h263,flac',
+        '--enable-decoder=aac,h264,mp3,eac3,ac3,hevc,mpeg4,mpegvideo,mp2,mp1,flac',
+        '--enable-demuxer=aac,mp3,mov,dtshd,dts,avi,mpegvideo,m4v,eac3,ac3,h264,vc1,flac',
+        '--enable-parser=aac,h264,hevc,mpegaudio,mpeg4video,mpegvideo,eac3,ac3,h261,vc1,h263,flac',
     ])
 
     # Google ChromeOS specific configuration.
diff --git a/thorium-libjxl b/thorium-libjxl
index 6bd91631..5e55b927 160000
--- a/thorium-libjxl
+++ b/thorium-libjxl
@@ -1 +1 @@
-Subproject commit 6bd91631ad36a39d24e6660d9e77a0631e8af4ae
+Subproject commit 5e55b927dce30737c02125b6c9687a41ed6726bb