diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c82d20da..9994a636 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,15 +9,15 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           submodules: 'true'
       - name: Use Node.js 21.x
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 21.x
       - name: Use Install NSIS
-        uses: repolevedavaj/install-nsis@v1.0.2
+        uses: repolevedavaj/install-nsis@v1.1.0
         with:
           nsis-version: 3.08
       - name: Run build.bat
@@ -25,7 +25,8 @@ jobs:
           .\build.bat
       - name: Build the installer
         run: |
-          cmd /C "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi"
+          "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi"
+        shell: cmd
       - uses: actions/upload-artifact@v4
         with:
           name: Installer
diff --git a/.gitignore b/.gitignore
index f1b3b624..af149097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ build
 build64
 build_arm64/
 node/input_methods/McBopomofo
+node/input_methods/McFoxim
 installer/*.exe
diff --git a/.gitmodules b/.gitmodules
index eb3e42f7..839a9dc1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "McBopomofoWeb"]
 	path = McBopomofoWeb
 	url = https://github.com/openvanilla/McBopomofoWeb.git
+[submodule "McFoximWeb"]
+	path = McFoximWeb
+	url = https://github.com/openvanilla/McFoximWeb.git
diff --git a/McBopomofoWeb b/McBopomofoWeb
index 9fa4191f..962af366 160000
--- a/McBopomofoWeb
+++ b/McBopomofoWeb
@@ -1 +1 @@
-Subproject commit 9fa4191fc876ac8b74205d97aaa707bc6d9cd1e1
+Subproject commit 962af36607caea5d2b999c81cd23c8fb1881293c
diff --git a/McFoximWeb b/McFoximWeb
new file mode 160000
index 00000000..cd43770b
--- /dev/null
+++ b/McFoximWeb
@@ -0,0 +1 @@
+Subproject commit cd43770b95cabce87b97bd26af4a3470b8b82d4d
diff --git a/build.bat b/build.bat
index 5cbe5255..cfe1d166 100644
--- a/build.bat
+++ b/build.bat
@@ -18,3 +18,15 @@ echo "Copy McBopomofo to node\input_methods\McBopomofo"
 cmd /C rd /s /q node\input_methods\McBopomofo
 cmd /C mkdir node\input_methods\McBopomofo
 cmd /C xcopy /s /q /y /f McBopomofoWeb\output\pime node\input_methods\McBopomofo\.
+
+
+echo "Start building McFoximWeb"
+cd McFoximWeb
+cmd /C npm install
+cmd /C npm run build:pime
+cd ..
+
+echo "Copy McFoximWeb to node\input_methods\McFoxim"
+cmd /C rd /s /q node\input_methods\McFoxim
+cmd /C mkdir node\input_methods\McFoxim
+cmd /C xcopy /s /q /y /f McFoximWeb\output\pime node\input_methods\McFoxim\.
diff --git a/installer/installer.nsi b/installer/installer.nsi
index d7624701..401f5a7d 100644
--- a/installer/installer.nsi
+++ b/installer/installer.nsi
@@ -580,6 +580,13 @@ SectionGroup /e $(NODE_SECTION_GROUP) node_section_group
 				StrCpy $INST_NODE "True"
 		SectionEnd
 
+		Section $(MCFOXIM) McFoxim
+				SectionIn 2
+				SetOutPath "$INSTDIR\node\input_methods\McFoxim"
+				File /r "..\node\input_methods\McFoxim\*.*"
+				StrCpy $INST_NODE "True"
+		SectionEnd
+
 		Section $(EMOJIME) emojime
 				SectionIn 2
 				SetOutPath "$INSTDIR\node\input_methods\emojime"
@@ -733,6 +740,7 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${cheez} $(cheez_DESC)
     !insertmacro MUI_DESCRIPTION_TEXT ${rime} $(rime_DESC)
 	!insertmacro MUI_DESCRIPTION_TEXT ${mcbopomofo} $(mcbopomofo_DESC)
+	!insertmacro MUI_DESCRIPTION_TEXT ${mcfoxim} $(mcfoxim_DESC)
 	!insertmacro MUI_DESCRIPTION_TEXT ${emojime} $(emojime_DESC)
 	!insertmacro MUI_DESCRIPTION_TEXT ${cheeng} $(cheeng_DESC)
 	!insertmacro MUI_DESCRIPTION_TEXT ${braille_chewing} $(braille_chewing_DESC)
diff --git a/installer/locale/English.nsh b/installer/locale/English.nsh
index 2e40837d..a1b65559 100644
--- a/installer/locale/English.nsh
+++ b/installer/locale/English.nsh
@@ -38,6 +38,7 @@
 !insertmacro LANG_STRING CHEEZ "EZ Input"
 !insertmacro LANG_STRING RIME "Rime"
 !insertmacro LANG_STRING MCBOPOMOFO "McBopomofo"
+!insertmacro LANG_STRING MCFOXIM "McFoxim"
 !insertmacro LANG_STRING EMOJIME "emojime"
 !insertmacro LANG_STRING CHEENG "Eng-Num"
 !insertmacro LANG_STRING BRAILLE_CHEWING "Braille Chewing"
@@ -63,6 +64,7 @@
 !insertmacro LANG_STRING cheez_DESC "Install EZ Input method module."
 !insertmacro LANG_STRING rime_DESC "Install Rime input method engine, 内含拼音、注音、仓颉、五笔、粤拼、吴语等数种输入方案。"
 !insertmacro LANG_STRING mcbopomofo_DESC "Install McBopomofo input method module."
+!insertmacro LANG_STRING mcfoxim_DESC "Install McFoxIM input method module."
 !insertmacro LANG_STRING emojime_DESC "Install emojime input method module."
 !insertmacro LANG_STRING cheeng_DESC "Install Eng-Num input method module."
 !insertmacro LANG_STRING braille_chewing_DESC "Install Braille Chewing input method module."
diff --git a/installer/locale/SimpChinese.nsh b/installer/locale/SimpChinese.nsh
index f8b52653..506f9f58 100644
--- a/installer/locale/SimpChinese.nsh
+++ b/installer/locale/SimpChinese.nsh
@@ -38,6 +38,7 @@
 !insertmacro LANG_STRING CHEEZ 轻松
 !insertmacro LANG_STRING RIME 中州韵
 !insertmacro LANG_STRING MCBOPOMOFO 小麦注音
+!insertmacro LANG_STRING MCFOXIM 小麦族语
 !insertmacro LANG_STRING EMOJIME emojime
 !insertmacro LANG_STRING CHEENG 英数
 !insertmacro LANG_STRING BRAILLE_CHEWING "盲文酷音"
@@ -63,6 +64,7 @@
 !insertmacro LANG_STRING cheez_DESC "安装轻松输入法模块。"
 !insertmacro LANG_STRING rime_DESC "安装中州韵输入法引擎，内含拼音、注音、仓颉、五笔、粤拼、吴语等数种输入方案。"
 !insertmacro LANG_STRING mcbopomofo_DESC "安装小麦注音输入法模块。"
+!insertmacro LANG_STRING mcfoxim_DESC "安装小麦族语输入法模块。"
 !insertmacro LANG_STRING emojime_DESC "安装 emojime 输入法模块。"
 !insertmacro LANG_STRING cheeng_DESC "安装英数输入法模块。"
 !insertmacro LANG_STRING braille_chewing_DESC "安装盲文酷音输入法模块。"
diff --git a/installer/locale/TradChinese.nsh b/installer/locale/TradChinese.nsh
index e53e7c43..00792527 100644
--- a/installer/locale/TradChinese.nsh
+++ b/installer/locale/TradChinese.nsh
@@ -38,6 +38,7 @@
 !insertmacro LANG_STRING CHEEZ 輕鬆
 !insertmacro LANG_STRING RIME 中州韻
 !insertmacro LANG_STRING MCBOPOMOFO 小麥注音
+!insertmacro LANG_STRING MCFOXIM 小麥族語
 !insertmacro LANG_STRING EMOJIME emojime
 !insertmacro LANG_STRING CHEENG 英數
 !insertmacro LANG_STRING BRAILLE_CHEWING "點字酷音"
@@ -63,6 +64,7 @@
 !insertmacro LANG_STRING cheez_DESC "安裝輕鬆輸入法模組。"
 !insertmacro LANG_STRING rime_DESC "安裝中州韻輸入法引擎，內含拼音、注音、倉頡、五筆、粵拼、吳語等數種輸入方案。"
 !insertmacro LANG_STRING mcbopomofo_DESC "安裝小麥注音輸入法模組。"
+!insertmacro LANG_STRING mcfoxim_DESC "安裝小麥族語輸入法模組。"
 !insertmacro LANG_STRING emojime_DESC "安裝 emojime 輸入法模組。"
 !insertmacro LANG_STRING cheeng_DESC "安裝英數輸入法模組。"
 !insertmacro LANG_STRING braille_chewing_DESC "安裝點字酷音輸入法模組。"