diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8384213..7ffcb20 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,7 +7,9 @@
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}" ]
+            "args": [
+                "--extensionDevelopmentPath=${workspaceRoot}"
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index c7f4deb..16ac7c7 100644
--- a/package.json
+++ b/package.json
@@ -34,36 +34,40 @@
                     "env"
                 ],
                 "extensions": [
-                    ".flaskenv",
-                    ".env",
                     ".env-sample",
-                    ".env.example",
-                    ".env.local",
-                    ".env.dev",
-                    ".env.dev.local",
-                    ".env.build",
                     ".env.build.local",
-                    ".env.development",
+                    ".env.build",
+                    ".env.dev.local",
+                    ".env.dev",
                     ".env.development.local",
-                    ".env.test",
-                    ".env.test.local",
-                    ".env.testing",
-                    ".env.qa",
+                    ".env.development",
+                    ".env.dist",
+                    ".env.dusk.local",
+                    ".env.example",
+                    ".env.live.local",
+                    ".env.live",
+                    ".env.local",
+                    ".env.prod.local",
+                    ".env.prod",
+                    ".env.production.local",
+                    ".env.production",
                     ".env.qa.local",
-                    ".env.uat",
-                    ".env.uat.local",
-                    ".env.stag",
+                    ".env.qa",
+                    ".env.sample",
                     ".env.stag.local",
-                    ".env.stage",
+                    ".env.stag",
                     ".env.stage.local",
-                    ".env.staging",
+                    ".env.stage",
                     ".env.staging.local",
-                    ".env.live",
-                    ".env.live.local",
-                    ".env.production",
-                    ".env.production.local",
-                    ".env.prod",
-                    ".env.prod.local"
+                    ".env.staging",
+                    ".env.test.local",
+                    ".env.test",
+                    ".env.testing",
+                    ".env.uat.local",
+                    ".env.uat",
+                    ".env",
+                    ".envrc",
+                    ".flaskenv"
                 ],
                 "configuration": "./language-configuration.json"
             }
diff --git a/syntaxes/env.YAML-tmLanguage b/syntaxes/env.YAML-tmLanguage
index de83306..7c7d88e 100644
--- a/syntaxes/env.YAML-tmLanguage
+++ b/syntaxes/env.YAML-tmLanguage
@@ -1,8 +1,28 @@
-# [PackageDev] target_format: plist, ext: tmLanguage
+# [PackageDev] target_format: plist,
+ext: tmLanguage
 ---
 name: DotENV
 scopeName: source.env
-fileTypes: [".env", ".env-sample", ".env.example", ".env.local", ".env.dev", ".env.test", ".env.testing", ".env.production", ".env.prod"]
+fileTypes: [
+  ".env-sample",
+  ".env.dev",
+  ".env.development.local",
+  ".env.development",
+  ".env.dist",
+  ".env.dusk.local",
+  ".env.example",
+  ".env.local",
+  ".env.prod",
+  ".env.production.local",
+  ".env.production",
+  ".env.sample",
+  ".env.test.local",
+  ".env.test",
+  ".env.testing",
+  ".env",
+  ".envrc",
+  ".flaskenv"
+]
 uuid: 09d4e117-0975-453d-a74b-c2e525473f97
 
 patterns:
diff --git a/syntaxes/env.tmLanguage b/syntaxes/env.tmLanguage
index 59c57ff..0571ad3 100644
--- a/syntaxes/env.tmLanguage
+++ b/syntaxes/env.tmLanguage
@@ -1,233 +1,242 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>name</key>
-    <string>DotENV</string>
-    <key>scopeName</key>
-    <string>source.env</string>
-    <key>fileTypes</key>
-    <array>
-      <string>.env</string>
-      <string>.env-sample</string>
-      <string>.env.example</string>
-      <string>.env.local</string>
-      <string>.env.dev</string>
-      <string>.env.test</string>
-      <string>.env.testing</string>
-      <string>.env.production</string>
-      <string>.env.prod</string>
-    </array>
-    <key>uuid</key>
-    <string>09d4e117-0975-453d-a74b-c2e525473f97</string>
-    <key>patterns</key>
-    <array>
+<dict>
+  <key>fileTypes</key>
+  <array>
+    <string>.env-sample</string>
+    <string>.env.dev</string>
+    <string>.env.development.local</string>
+    <string>.env.development</string>
+    <string>.env.dist</string>
+    <string>.env.dusk.local</string>
+    <string>.env.example</string>
+    <string>.env.local</string>
+    <string>.env.prod</string>
+    <string>.env.production.local</string>
+    <string>.env.production</string>
+    <string>.env.sample</string>
+    <string>.env.test.local</string>
+    <string>.env.test</string>
+    <string>.env.testing</string>
+    <string>.env</string>
+    <string>.envrc</string>
+    <string>.flaskenv</string>
+  </array>
+  <key>name</key>
+  <string>DotENV</string>
+  <key>patterns</key>
+  <array>
+    <dict>
+      <key>captures</key>
       <dict>
-        <key>comment</key>
-        <string>Comments - starts with #</string>
-        <key>match</key>
-        <string>(#).*$\n?</string>
-        <key>name</key>
-        <string>comment.line.number-sign.env</string>
-        <key>captures</key>
+        <key>1</key>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.comment.env</string>
-          </dict>
+          <key>name</key>
+          <string>punctuation.definition.comment.env</string>
         </dict>
       </dict>
+      <key>comment</key>
+      <string>Comments - starts with #</string>
+      <key>match</key>
+      <string>(#).*$\n?</string>
+      <key>name</key>
+      <string>comment.line.number-sign.env</string>
+    </dict>
+    <dict>
+      <key>begin</key>
+      <string>(\")</string>
+      <key>beginCaptures</key>
       <dict>
-        <key>comment</key>
-        <string>Strings (double)</string>
-        <key>name</key>
-        <string>string.quoted.double.env</string>
-        <key>begin</key>
-        <string>(\")</string>
-        <key>beginCaptures</key>
+        <key>1</key>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.string.begin.env</string>
-          </dict>
+          <key>name</key>
+          <string>punctuation.definition.string.begin.env</string>
         </dict>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>include</key>
-            <string>#interpolation</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#variable</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#escape-characters</string>
-          </dict>
-        </array>
-        <key>end</key>
-        <string>(\")</string>
-        <key>endCaptures</key>
+      </dict>
+      <key>comment</key>
+      <string>Strings (double)</string>
+      <key>end</key>
+      <string>(\")</string>
+      <key>endCaptures</key>
+      <dict>
+        <key>1</key>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.string.end</string>
-          </dict>
+          <key>name</key>
+          <string>punctuation.definition.string.end</string>
         </dict>
       </dict>
-      <dict>
-        <key>comment</key>
-        <string>Strings (single)</string>
-        <key>name</key>
-        <string>string.quoted.single.env</string>
-        <key>begin</key>
-        <string>(\')</string>
-        <key>beginCaptures</key>
+      <key>name</key>
+      <string>string.quoted.double.env</string>
+      <key>patterns</key>
+      <array>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.string.begin.env</string>
-          </dict>
+          <key>include</key>
+          <string>#interpolation</string>
         </dict>
-        <key>end</key>
-        <string>(\')</string>
-        <key>endCaptures</key>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>punctuation.definition.string.end</string>
-          </dict>
+          <key>include</key>
+          <string>#variable</string>
         </dict>
-      </dict>
-      <dict>
-        <key>comment</key>
-        <string>Assignment Operator</string>
-        <key>match</key>
-        <string>(?&lt;=[\w])\s?=</string>
-        <key>name</key>
-        <string>keyword.operator.assignment.env</string>
-      </dict>
-      <dict>
-        <key>comment</key>
-        <string>Variable</string>
-        <key>match</key>
-        <string>([\w]+)(?=\s?\=)</string>
-        <key>name</key>
-        <string>variable.other.env</string>
-      </dict>
+        <dict>
+          <key>include</key>
+          <string>#escape-characters</string>
+        </dict>
+      </array>
+    </dict>
+    <dict>
+      <key>begin</key>
+      <string>(\')</string>
+      <key>beginCaptures</key>
       <dict>
-        <key>comment</key>
-        <string>Keywords</string>
-        <key>match</key>
-        <string>(?i)\s?(export)</string>
-        <key>name</key>
-        <string>keyword.other.env</string>
+        <key>1</key>
+        <dict>
+          <key>name</key>
+          <string>punctuation.definition.string.begin.env</string>
+        </dict>
       </dict>
+      <key>comment</key>
+      <string>Strings (single)</string>
+      <key>end</key>
+      <string>(\')</string>
+      <key>endCaptures</key>
       <dict>
-        <key>comment</key>
-        <string>Constants</string>
-        <key>match</key>
-        <string>(?i)(?&lt;=\=)\s?(true|false|null)</string>
-        <key>name</key>
-        <string>constant.language.env</string>
+        <key>1</key>
+        <dict>
+          <key>name</key>
+          <string>punctuation.definition.string.end</string>
+        </dict>
       </dict>
+      <key>name</key>
+      <string>string.quoted.single.env</string>
+    </dict>
+    <dict>
+      <key>comment</key>
+      <string>Assignment Operator</string>
+      <key>match</key>
+      <string>(?&lt;=[\w])\s?=</string>
+      <key>name</key>
+      <string>keyword.operator.assignment.env</string>
+    </dict>
+    <dict>
+      <key>comment</key>
+      <string>Variable</string>
+      <key>match</key>
+      <string>([\w]+)(?=\s?\=)</string>
+      <key>name</key>
+      <string>variable.other.env</string>
+    </dict>
+    <dict>
+      <key>comment</key>
+      <string>Keywords</string>
+      <key>match</key>
+      <string>(?i)\s?(export)</string>
+      <key>name</key>
+      <string>keyword.other.env</string>
+    </dict>
+    <dict>
+      <key>comment</key>
+      <string>Constants</string>
+      <key>match</key>
+      <string>(?i)(?&lt;=\=)\s?(true|false|null)</string>
+      <key>name</key>
+      <string>constant.language.env</string>
+    </dict>
+    <dict>
+      <key>comment</key>
+      <string>Numeric</string>
+      <key>match</key>
+      <string>\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b</string>
+      <key>name</key>
+      <string>constant.numeric.env</string>
+    </dict>
+  </array>
+  <key>repository</key>
+  <dict>
+    <key>escape-characters</key>
+    <dict>
+      <key>patterns</key>
+      <array>
+        <dict>
+          <key>match</key>
+          <string>\\[nrt\\\$\"\']</string>
+          <key>name</key>
+          <string>constant.character.escape.env</string>
+        </dict>
+      </array>
+    </dict>
+    <key>interpolation</key>
+    <dict>
+      <key>begin</key>
+      <string>(\$\{|\{)</string>
+      <key>beginCaptures</key>
       <dict>
-        <key>comment</key>
-        <string>Numeric</string>
-        <key>match</key>
-        <string>\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b</string>
-        <key>name</key>
-        <string>constant.numeric.env</string>
+        <key>1</key>
+        <dict>
+          <key>name</key>
+          <string>string.interpolated.env keyword.other.template.begin.env</string>
+        </dict>
       </dict>
-    </array>
-    <key>repository</key>
-    <dict>
-      <key>interpolation</key>
+      <key>comment</key>
+      <string>Template Syntax: "foo ${bar} {$baz}"</string>
+      <key>end</key>
+      <string>(\})</string>
+      <key>endCaptures</key>
       <dict>
-        <key>comment</key>
-        <string>Template Syntax: "foo ${bar} {$baz}"</string>
-        <key>begin</key>
-        <string>(\$\{|\{)</string>
-        <key>beginCaptures</key>
+        <key>1</key>
         <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>string.interpolated.env keyword.other.template.begin.env</string>
-          </dict>
+          <key>name</key>
+          <string>string.interpolated.env keyword.other.template.end.env</string>
         </dict>
-        <key>patterns</key>
-        <array>
+      </dict>
+      <key>patterns</key>
+      <array>
+        <dict>
+          <key>captures</key>
           <dict>
-            <key>match</key>
-            <string>(?x)(\$+)?([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)</string>
-            <key>captures</key>
+            <key>1</key>
             <dict>
-              <key>1</key>
-              <dict>
-                <key>name</key>
-                <string>punctuation.definition.variable.env variable.other.env</string>
-              </dict>
-              <key>2</key>
-              <dict>
-                <key>name</key>
-                <string>variable.other.env</string>
-              </dict>
+              <key>name</key>
+              <string>punctuation.definition.variable.env variable.other.env</string>
+            </dict>
+            <key>2</key>
+            <dict>
+              <key>name</key>
+              <string>variable.other.env</string>
             </dict>
           </dict>
-        </array>
-        <key>end</key>
-        <string>(\})</string>
-        <key>endCaptures</key>
-        <dict>
-          <key>1</key>
-          <dict>
-            <key>name</key>
-            <string>string.interpolated.env keyword.other.template.end.env</string>
-          </dict>
+          <key>match</key>
+          <string>(?x)(\$+)?([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)</string>
         </dict>
-      </dict>
-      <key>variable</key>
-      <dict>
-        <key>patterns</key>
-        <array>
+      </array>
+    </dict>
+    <key>variable</key>
+    <dict>
+      <key>patterns</key>
+      <array>
+        <dict>
+          <key>captures</key>
           <dict>
-            <key>match</key>
-            <string>(?x)(\$+)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)</string>
-            <key>captures</key>
+            <key>1</key>
             <dict>
-              <key>1</key>
-              <dict>
-                <key>name</key>
-                <string>punctuation.definition.variable.env variable.other.env</string>
-              </dict>
-              <key>2</key>
-              <dict>
-                <key>name</key>
-                <string>variable.other.env</string>
-              </dict>
+              <key>name</key>
+              <string>punctuation.definition.variable.env variable.other.env</string>
+            </dict>
+            <key>2</key>
+            <dict>
+              <key>name</key>
+              <string>variable.other.env</string>
             </dict>
           </dict>
-        </array>
-      </dict>
-      <key>escape-characters</key>
-      <dict>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>match</key>
-            <string>\\[nrt\\\$\"\']</string>
-            <key>name</key>
-            <string>constant.character.escape.env</string>
-          </dict>
-        </array>
-      </dict>
+          <key>match</key>
+          <string>(?x)(\$+)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)</string>
+        </dict>
+      </array>
     </dict>
   </dict>
+  <key>scopeName</key>
+  <string>source.env</string>
+  <key>uuid</key>
+  <string>09d4e117-0975-453d-a74b-c2e525473f97</string>
+</dict>
 </plist>