diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c9ac390
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/main/resources/fsh/fsh.tmbundle"]
+	path = src/main/resources/fsh/fsh.tmbundle
+	url = git@github.com:qligier/fsh.tmbundle.git
diff --git a/gradle.properties b/gradle.properties
index b46466a..8180127 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ platformVersion=2023.3.7
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
 platformPlugins=
 # Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins=
+platformBundledPlugins=org.jetbrains.plugins.textmate
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion=8.9
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
diff --git a/src/main/java/ch/qligier/jetbrains/plugin/fhir/fsh/FshTextMateBundleProvider.java b/src/main/java/ch/qligier/jetbrains/plugin/fhir/fsh/FshTextMateBundleProvider.java
new file mode 100644
index 0000000..5d78fdf
--- /dev/null
+++ b/src/main/java/ch/qligier/jetbrains/plugin/fhir/fsh/FshTextMateBundleProvider.java
@@ -0,0 +1,13 @@
+// Copyright 2024 Quentin Ligier. Use of this source code is governed by the MIT license.
+
+package ch.qligier.jetbrains.plugin.fhir.fsh;
+
+import org.jetbrains.plugins.textmate.api.TextMateBundleProvider;
+
+/**
+ * jetbrains-plugin-fhir
+ *
+ * @author Quentin Ligier
+ **/
+public class FshTextMateBundleProvider extends TextMateBundleProvider {
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 2e0200f..058bc41 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -29,11 +29,24 @@
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html -->
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.lang</depends>
-    
+
     <actions>
     </actions>
 
     <extensions defaultExtensionNs="com.intellij">
+
+        <!-- The following two ("editorHighlighterProvider" and "lang.syntaxHighlighterFactory") are required
+            because defining a custom file type breaks the association of a TextMate grammar with a file extension.
+            https://intellij-support.jetbrains.com/hc/en-us/community/posts/360008202719/comments/8966725380242 -->
+        <editorHighlighterProvider
+                filetype="Snakeskin"
+                implementationClass="org.jetbrains.plugins.textmate.language.syntax.highlighting.TextMateEditorHighlighterProvider" />
+
+        <lang.syntaxHighlighterFactory
+                language="Snakeskin"
+                implementationClass="org.jetbrains.plugins.textmate.language.syntax.highlighting.TextMateSyntaxHighlighterFactory" />
+
+        <textmate.bundleProvider implementation="snakeskin.lang.SnakeskinTextMateBundleProvider" />
     </extensions>
 
     <applicationListeners>
diff --git a/src/main/resources/fsh/fsh.tmbundle b/src/main/resources/fsh/fsh.tmbundle
new file mode 160000
index 0000000..4a1840a
--- /dev/null
+++ b/src/main/resources/fsh/fsh.tmbundle
@@ -0,0 +1 @@
+Subproject commit 4a1840afe2026709750b0e504dd96babad5dfd83