diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7114c1e3..a3ebe44c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Updated the activity bar icon for better visibility
 - Storing the panel collapse section states
+- [#248](https://github.com/estruyf/vscode-front-matter/issues/248): Added support for front matter highlighting to all file types specified in `frontMatter.content.supportedFileTypes`
 
 ### ⚡️ Optimizations
 
diff --git a/src/extension.ts b/src/extension.ts
index 50b26c42..76aac326 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -28,8 +28,6 @@ let statusDebouncer: { (fnc: any, time: number): void; };
 let editDebounce: { (fnc: any, time: number): void; };
 let collection: vscode.DiagnosticCollection;
 
-const mdSelector: vscode.DocumentSelector = { language: 'markdown', scheme: 'file' };
-
 export async function activate(context: vscode.ExtensionContext) {
 	const { subscriptions, extensionUri, extensionPath } = context;
 
@@ -93,7 +91,7 @@ export async function activate(context: vscode.ExtensionContext) {
 	});
 
 	// Folding the front matter of markdown files
-	vscode.languages.registerFoldingRangeProvider(mdSelector, new MarkdownFoldingProvider());
+	MarkdownFoldingProvider.register();
 
 	const insertTags = vscode.commands.registerCommand(COMMAND_NAME.insertTags, async () => {
 		await vscode.commands.executeCommand('workbench.view.extension.frontmatter-explorer');
diff --git a/src/providers/MarkdownFoldingProvider.ts b/src/providers/MarkdownFoldingProvider.ts
index 85224889..fbf4235a 100644
--- a/src/providers/MarkdownFoldingProvider.ts
+++ b/src/providers/MarkdownFoldingProvider.ts
@@ -1,6 +1,7 @@
-import { TextEditorDecorationType } from 'vscode';
+import { ArticleHelper } from '../helpers';
+import { languages, TextEditorDecorationType } from 'vscode';
 import { CancellationToken, FoldingContext, FoldingRange, FoldingRangeKind, FoldingRangeProvider, Range, TextDocument, window, Position } from 'vscode';
-import { SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, SETTING_FRONTMATTER_TYPE } from '../constants';
+import { SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT, SETTINGS_CONTENT_SUPPORTED_FILETYPES, SETTING_FRONTMATTER_TYPE } from '../constants';
 import { Settings } from '../helpers';
 import { FrontMatterDecorationProvider } from './FrontMatterDecorationProvider';
 
@@ -10,6 +11,18 @@ export class MarkdownFoldingProvider implements FoldingRangeProvider {
   private static endLine: number | null = null;
   private static decType: TextEditorDecorationType | null = null;
 
+  public static register() {
+    const supportedFiles = Settings.get<string[]>(SETTINGS_CONTENT_SUPPORTED_FILETYPES);
+
+    languages.registerFoldingRangeProvider({ language: 'markdown', scheme: 'file' }, new MarkdownFoldingProvider());
+
+    for (const fileExt of (supportedFiles || [])) {
+      if (fileExt !== "md" && fileExt !== "markdown") {
+        languages.registerFoldingRangeProvider({ pattern: `**/*.${fileExt}`, scheme: 'file' }, new MarkdownFoldingProvider());
+      }
+    }
+  }
+
   public async provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): Promise<FoldingRange[]> {
     const ranges: FoldingRange[] = [];
 
@@ -24,18 +37,23 @@ export class MarkdownFoldingProvider implements FoldingRangeProvider {
   }
 
   public static triggerHighlighting() {
-    const fmHighlight = Settings.get<boolean>(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT);
+    const activeDoc = window.activeTextEditor?.document;
 
-    const range = this.getFrontMatterRange();
+    const isSupported = ArticleHelper.isMarkdownFile(activeDoc);
+    if (isSupported) {
+      const fmHighlight = Settings.get<boolean>(SETTINGS_CONTENT_FRONTMATTER_HIGHLIGHT);
 
-    if (range) {
-      if (MarkdownFoldingProvider.decType !== null) {
-        MarkdownFoldingProvider.decType.dispose();
-      }
+      const range = this.getFrontMatterRange();
 
-      if (fmHighlight) {
-        MarkdownFoldingProvider.decType = new FrontMatterDecorationProvider().get();
-        window.activeTextEditor?.setDecorations(MarkdownFoldingProvider.decType, [range]);
+      if (range) {
+        if (MarkdownFoldingProvider.decType !== null) {
+          MarkdownFoldingProvider.decType.dispose();
+        }
+
+        if (fmHighlight) {
+          MarkdownFoldingProvider.decType = new FrontMatterDecorationProvider().get();
+          window.activeTextEditor?.setDecorations(MarkdownFoldingProvider.decType, [range]);
+        }
       }
     }
   }
@@ -61,7 +79,7 @@ export class MarkdownFoldingProvider implements FoldingRangeProvider {
       let start = null;
       let end = null;
       let endLine = null;
-      
+
       MarkdownFoldingProvider.start = null;
       MarkdownFoldingProvider.end = null;
       MarkdownFoldingProvider.endLine = null;