diff --git a/K-LiteCodecPackMega.bat b/K-LiteCodecPackMega.bat
index eed2a33..b942a0c 100644
--- a/K-LiteCodecPackMega.bat
+++ b/K-LiteCodecPackMega.bat
@@ -4,6 +4,7 @@
 ::		Github:				https://github.com/hieuck/curl-uri-wget-download-setup				::
 ::		Facebook:			https://www.facebook.com/ZzhieuhuhongzZ/							::
 ::		Donate to me:		Vietcombank - 9966595263 - LE TRUNG HIEU							::
+::							MoMo - 0966595263 - LE TRUNG HIEU									::
 ::																								::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @ECHO OFF
@@ -44,7 +45,7 @@ set "Process=mpc-hc.exe"
 if exist "%SystemRoot%\SysWOW64" set "Process=mpc-hc64.exe"
 
 set "FileName="
-set "SoftNameVersion=1835"
+set "SoftNameVersion=1840"
 set "FileDLwB=K-Lite_Codec_Pack*.exe"
 
 set "OpenAfterInstall="
@@ -72,7 +73,7 @@ set "Link=https://files3.codecguide.com/K-Lite_Codec_Pack_!SoftNameVersion!_Mega
 set "LinkForAllWindows32bit="
 set "LinkForAllWindows64bit="
 
-set "LinkFromGithub=K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_!SoftNameVersion!_Mega.exe"
+set "LinkFromGithub=K-Lite_Codec_Pack_!SoftNameVersion!_Mega.exe"
 set "LinkFromDropbox="
 set "LinkFromOneDrive="
 
@@ -91,6 +92,12 @@ set "NoticeOption="
 REM MenuChoice Configuration
 setlocal EnableDelayedExpansion
 
+:: Extracting the necessary parts from LinkFromGithub
+for /f "tokens=1,2 delims=-." %%a in ("%LinkFromGithub%") do (
+	set "prefixLFG=%%a"
+	set "versionLFG=%%b"
+)
+
 :menu
 set "Menu1=Official Website"
 set "Menu2=My Github"
@@ -158,7 +165,7 @@ if "%choice%"=="1" (
 		set "LinkForOldWindows32bit="
 		set "LinkForOldWindows64bit="
 
-		set "Link=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/Setup/%LinkFromGithub%"
+		set "Link=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/Setup/%prefixLFG%/%LinkFromGithub%"
 		set "LinkForAllWindows32bit="
 		set "LinkForAllWindows64bit="
 		goto NextStepAfterChosen
@@ -360,7 +367,12 @@ if /i "%Extract7z%"=="Yes" (
 REM Set up information related to software cr4cking
 if /i "%License%"=="Yes" (
 	set "Admin=Yes"
-	set "Cr4ckLink=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/Cr4ck/!Cr4ckFile!.rar"
+	:: Extracting the necessary parts from Cr4ckFile
+	for /f "tokens=1,3 delims=-" %%a in ("%Cr4ckFile%") do (
+		set "prefix=%%a"
+		set "suffix=%%b"
+	)
+	set "Cr4ckLink=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/Cr4ck/!prefix!!suffix!/!Cr4ckFile!.rar"
 	set "Link7zdll=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/7z/7z.dll"
 	set "Link7zexe=https://github.com/hieuck/curl-uri-wget-download-setup/raw/main/7z/7z.exe"
 	if /i "%ARCH%"=="x86" (
diff --git a/Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1785_Mega.exe b/Setup/K/K-Lite_Codec_Pack_1785_Mega.exe
similarity index 100%
rename from Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1785_Mega.exe
rename to Setup/K/K-Lite_Codec_Pack_1785_Mega.exe
diff --git a/Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1805_Mega.exe b/Setup/K/K-Lite_Codec_Pack_1805_Mega.exe
similarity index 100%
rename from Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1805_Mega.exe
rename to Setup/K/K-Lite_Codec_Pack_1805_Mega.exe
diff --git a/Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1830_Mega.exe b/Setup/K/K-Lite_Codec_Pack_1830_Mega.exe
similarity index 100%
rename from Setup/K-Lite_Codec_Pack_Mega/K-Lite_Codec_Pack_1830_Mega.exe
rename to Setup/K/K-Lite_Codec_Pack_1830_Mega.exe
diff --git a/Setup/K/K-Lite_Codec_Pack_1840_Mega.exe b/Setup/K/K-Lite_Codec_Pack_1840_Mega.exe
new file mode 100644
index 0000000..29f3a06
Binary files /dev/null and b/Setup/K/K-Lite_Codec_Pack_1840_Mega.exe differ