diff --git a/syntaxes/env.YAML-tmLanguage b/syntaxes/env.YAML-tmLanguage
index aa11ec6..546403a 100644
--- a/syntaxes/env.YAML-tmLanguage
+++ b/syntaxes/env.YAML-tmLanguage
@@ -6,78 +6,112 @@ fileTypes: [".env", ".env-sample", ".env.example", ".env.local", ".env.dev", ".e
 uuid: 09d4e117-0975-453d-a74b-c2e525473f97
 
 patterns:
-  - comment: 'Comments - starts with #'
-    match: '(#).*$\n?'
+  - comment: Comments
+    match: '^\s?(#.*$)\n'
+    captures:
+      '1':
+        patterns:
+          - include: '#reminder'
+  - comment: Entries
+    match: '^\s?(export\s?)*([\w]+)\s?(\=)(.*)$'
+    captures:
+      '1':
+        name: keyword.other.env
+      '2':
+        name: variable.other.env
+      '3':
+        name: keyword.operator.assignment.env
+      '4':
+        patterns:
+          - include: '#boolean'
+          - include: '#numeric'
+          - include: '#string'
+          - include: '#interpolated'
+          - include: '#unquoted'
+repository:
+  reminder:
+    comment: 'Reminder - starts with #'
+    match: '(#).*'
     name: comment.line.number-sign.env
     captures:
       '1': { name: punctuation.definition.comment.env }
-
-  - comment: Strings (double)
-    name: string.quoted.double.env
-    begin: (\")
-    beginCaptures:
-      '1': { name: punctuation.definition.string.begin.env }
-    patterns:
-      - include: '#interpolation'
-      - include: '#variable'
-      - include: '#escape-characters'
-    end: (\")
-    endCaptures:
-      '1': { name: punctuation.definition.string.end }
-
-  - comment: Strings (single)
+  boolean:
+    comment: 'Boolean Constants'
+    match: '(?i)\b(true|false|null)\b(.*)'
+    captures:
+      '1': { name: constant.language.env }
+      '2':
+        patterns:
+          - include: '#reminder'
+  numeric:
+    comment: Numeric
+    match: '(?:\+|-)?\b((?:0(?:x|X)[0-9a-fA-F]*)|(?:(?:[0-9]+\.?[0-9]*)|(?:\.[0-9]+))(?:(?:e|E)(?:\+|-)?[0-9]+)?)\b(.*)'
+    captures:
+      '1': { name: constant.numeric.env }
+      '2':
+        patterns:
+          - include: '#reminder'
+  string:
+    comment: 'Strings (single)'
     name: string.quoted.single.env
-    begin: (\')
+    begin: '(?<!\\)(\'')'
     beginCaptures:
       '1': { name: punctuation.definition.string.begin.env }
-    end: (\')
+    end: '(\'')(.*)'
     endCaptures:
-      '1': { name: punctuation.definition.string.end }
-
-  - comment: Assignment Operator
-    match: (?<=[\w])\s?=
-    name: keyword.operator.assignment.env
-
-  - comment: Variable
-    match: '([\w]+)(?=\s?\=)'
-    name: variable.other.env
-
-  - comment: Keywords
-    match: '(?i)\s?(export)'
-    name: keyword.other.env
-
-  - comment: Constants
-    match: '(?i)(?<=\=)\s?(true|false|null)'
-    name: constant.language.env
-
-  - comment: Numeric
-    match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b'
-    name: constant.numeric.env
-
-
-repository:
+      '1': { name: punctuation.definition.string.end.env }
+      '2':
+        patterns:
+          - include: '#reminder'
   interpolation:
     comment: 'Template Syntax: "foo ${bar} {$baz}"'
     begin: '(\$\{|\{)'
     beginCaptures:
-      '1': { name: string.interpolated.env keyword.other.template.begin.env }
+      '1': { name: 'string.interpolated.env keyword.other.template.begin.env' }
     patterns:
       - match: '(?x)(\$+)?([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)'
         captures:
-          '1': { name: punctuation.definition.variable.env variable.other.env }
+          '1': { name: 'punctuation.definition.variable.env variable.other.env' }
           '2': { name: variable.other.env }
     end: '(\})'
     endCaptures:
-      '1': { name: string.interpolated.env keyword.other.template.end.env }
-
+      '1': { name: 'string.interpolated.env keyword.other.template.end.env' }
   variable:
     patterns:
-    - match: '(?x)(\$+)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)'
-      captures:
-        '1': { name: punctuation.definition.variable.env variable.other.env }
-        '2': { name: variable.other.env }
-
+      - match: '(?x)(\$+)([a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*?\b)'
+        captures:
+          '1': { name: 'punctuation.definition.variable.env variable.other.env' }
+          '2': { name: variable.other.env }
   escape-characters:
     patterns:
-    - match: \\[nrt\\\$\"\']
-      name: constant.character.escape.env
+      - match: '\\[nrt\\\$\"\'']'
+        name: constant.character.escape.env
+  unquoted:
+    comment: 'Strings (none)'
+    name: string.unquoted.env
+    match: '([^#]*)(#.*)?'
+    captures:
+      '1':
+        patterns:
+          - include: '#interpolation'
+          - include: '#variable'
+          - include: '#escape-characters'
+      '2':
+        patterns:
+          - include: '#reminder'
+  interpolated:
+    comment: 'Strings (double)'
+    name: string.quoted.double.env
+    begin: '(\")'
+    beginCaptures:
+      '1': { name: punctuation.definition.string.begin.env }
+    patterns:
+      - include: '#interpolation'
+      - include: '#variable'
+      - include: '#escape-characters'
+    end: '(\")(.*)'
+    endCaptures:
+      '1': { name: punctuation.definition.string.end.env }
+      '2':
+        patterns:
+          - include: '#reminder'
diff --git a/syntaxes/env.tmLanguage b/syntaxes/env.tmLanguage
index a5d2a80..78671d6 100644
--- a/syntaxes/env.tmLanguage
+++ b/syntaxes/env.tmLanguage
@@ -23,68 +23,151 @@
     <array>
       <dict>
         <key>comment</key>
-        <string>Comments - starts with #</string>
+        <string>Comments</string>
         <key>match</key>
-        <string>(#).*$\n?</string>
-        <key>name</key>
-        <string>comment.line.number-sign.env</string>
+        <string>^\s?(#.*$)\n</string>
         <key>captures</key>
         <dict>
           <key>1</key>
           <dict>
-            <key>name</key>
-            <string>punctuation.definition.comment.env</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
           </dict>
         </dict>
       </dict>
       <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>
+        <string>Entries</string>
+        <key>match</key>
+        <string>^\s?(export\s?)*([\w]+)\s?(\=)(.*)$</string>
+        <key>captures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.definition.string.begin.env</string>
+            <string>keyword.other.env</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.env</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.operator.assignment.env</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#boolean</string>
+              </dict>
+              <dict>
+                <key>include</key>
+                <string>#numeric</string>
+              </dict>
+              <dict>
+                <key>include</key>
+                <string>#string</string>
+              </dict>
+              <dict>
+                <key>include</key>
+                <string>#interpolated</string>
+              </dict>
+              <dict>
+                <key>include</key>
+                <string>#unquoted</string>
+              </dict>
+            </array>
           </dict>
         </dict>
-        <key>patterns</key>
-        <array>
+      </dict>
+    </array>
+    <key>repository</key>
+    <dict>
+      <key>reminder</key>
+      <dict>
+        <key>comment</key>
+        <string>Reminder - starts with #</string>
+        <key>match</key>
+        <string>(#).*</string>
+        <key>name</key>
+        <string>comment.line.number-sign.env</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
           <dict>
-            <key>include</key>
-            <string>#interpolation</string>
+            <key>name</key>
+            <string>punctuation.definition.comment.env</string>
           </dict>
+        </dict>
+      </dict>
+      <key>boolean</key>
+      <dict>
+        <key>comment</key>
+        <string>Boolean Constants</string>
+        <key>match</key>
+        <string>(?i)\b(true|false|null)\b(.*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
           <dict>
-            <key>include</key>
-            <string>#variable</string>
+            <key>name</key>
+            <string>constant.language.env</string>
           </dict>
+          <key>2</key>
           <dict>
-            <key>include</key>
-            <string>#escape-characters</string>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
           </dict>
-        </array>
-        <key>end</key>
-        <string>(\")</string>
-        <key>endCaptures</key>
+        </dict>
+      </dict>
+      <key>numeric</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>captures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.definition.string.end</string>
+            <string>constant.numeric.env</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
           </dict>
         </dict>
       </dict>
+      <key>string</key>
       <dict>
         <key>comment</key>
         <string>Strings (single)</string>
         <key>name</key>
         <string>string.quoted.single.env</string>
         <key>begin</key>
-        <string>(\')</string>
+        <string>(?&lt;!\\)(\')</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -94,59 +177,26 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(\')</string>
+        <string>(\')(.*)</string>
         <key>endCaptures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>punctuation.definition.string.end</string>
+            <string>punctuation.definition.string.end.env</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
           </dict>
         </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>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>interpolation</key>
       <dict>
         <key>comment</key>
@@ -227,6 +277,98 @@
           </dict>
         </array>
       </dict>
+      <key>unquoted</key>
+      <dict>
+        <key>comment</key>
+        <string>Strings (none)</string>
+        <key>name</key>
+        <string>string.unquoted.env</string>
+        <key>match</key>
+        <string>([^#]*)(#.*)?</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <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>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
+          </dict>
+        </dict>
+      </dict>
+      <key>interpolated</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>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.definition.string.begin.env</string>
+          </dict>
+        </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>1</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.definition.string.end.env</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>patterns</key>
+            <array>
+              <dict>
+                <key>include</key>
+                <string>#reminder</string>
+              </dict>
+            </array>
+          </dict>
+        </dict>
+      </dict>
     </dict>
   </dict>
-</plist>
+</plist>
\ No newline at end of file