diff --git a/bin/assets/plugins/formatters.json b/bin/assets/plugins/formatters.json
index c83e2baa0..1f8516f92 100644
--- a/bin/assets/plugins/formatters.json
+++ b/bin/assets/plugins/formatters.json
@@ -8,7 +8,7 @@
   "formatters": [
     {
       "language": ["javascript", "typescript", "jsx", "tsx", "html"],
-      "file_patterns": ["%.js$", "%.ts$", "%.jsx$", "%.tsx$", "%.html?$"],
+      "file_patterns": ["%.js$", "%.ts$", "%.jsx$", "%.tsx$", "%.[mp]?html?$"],
       "command": "prettier $FILENAME",
       "url": "https://prettier.io"
     },
diff --git a/bin/assets/plugins/lspclient.json b/bin/assets/plugins/lspclient.json
index dca6da034..a7326de4b 100644
--- a/bin/assets/plugins/lspclient.json
+++ b/bin/assets/plugins/lspclient.json
@@ -181,7 +181,7 @@
       "name": "emmet-language-server",
       "url": "https://github.com/olrtg/emmet-language-server",
       "command": "emmet-language-server --stdio",
-      "file_patterns": ["%.htm", "%.html"],
+      "file_patterns": ["%.[mp]?html?"],
       "rootIndicationFileNames": [".git"],
       "initializationOptions": {
         "showSuggestionsAsSnippets": true
diff --git a/src/eepp/ui/doc/languages/html.cpp b/src/eepp/ui/doc/languages/html.cpp
index a89ea404b..1de3afb28 100644
--- a/src/eepp/ui/doc/languages/html.cpp
+++ b/src/eepp/ui/doc/languages/html.cpp
@@ -9,7 +9,7 @@ void addHTML() {
 		->add(
 
 			{ "HTML",
-			  { "%.html?$", "%.phtml", "%.handlebars" },
+			  { "%.[mp]?html?$", "%.handlebars" },
 			  {
 				  { { "<%s*[sS][cC][rR][iI][pP][tT]%s+[tT][yY][pP][eE]%s*=%s*['\"]%a+/"
 					  "[jJ][aA][vV][aA][sS][cC][rR][iI][pP][tT]['\"]%s*>",
diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw
index c57b51e28..2f90a4410 160000
--- a/src/thirdparty/efsw
+++ b/src/thirdparty/efsw
@@ -1 +1 @@
-Subproject commit c57b51e281516c125a2571c737b01b9337b4af99
+Subproject commit 2f90a44104d33b873e9e374b1dbb6c6b73073528