diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
index 568d9944..526b2873 100644
--- a/grammars/MagicPython.cson
+++ b/grammars/MagicPython.cson
@@ -386,7 +386,7 @@ repository:
       }
     ]
   "member-access":
-    begin: "\\.\\s*(?!\\.)"
+    begin: "(\\.)\\s*(?!\\.)"
     end: '''
       (?x)
         # stop when you've just read non-whitespace followed by non-word
@@ -398,6 +398,9 @@ repository:
         $
       
     '''
+    beginCaptures:
+      "1":
+        name: "punctuation.separator.period.python"
     patterns: [
       {
         include: "#function-call"
@@ -995,12 +998,14 @@ repository:
       {
         match: '''
           (?x)
-            \\s* \\b(from)\\b (\\s*\\.+\\s*) (import)?
+            \\s* \\b(from)\\b \\s*(\\.+)\\s* (import)?
           
         '''
         captures:
           "1":
             name: "keyword.control.import.python"
+          "2":
+            name: "punctuation.separator.period.python"
           "3":
             name: "keyword.control.import.python"
       }
@@ -1122,8 +1127,11 @@ repository:
       "1":
         name: "entity.other.inherited-class.python"
   "member-access-class":
-    begin: "\\.\\s*(?!\\.)"
+    begin: "(\\.)\\s*(?!\\.)"
     end: "(?<=\\S)(?=\\W)|$"
+    beginCaptures:
+      "1":
+        name: "punctuation.separator.period.python"
     patterns: [
       {
         include: "#call-wrapper-inheritance"
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
index 6545fbab..ae03ed0e 100644
--- a/grammars/MagicPython.tmLanguage
+++ b/grammars/MagicPython.tmLanguage
@@ -589,7 +589,7 @@
       <key>member-access</key>
       <dict>
         <key>begin</key>
-        <string>\.\s*(?!\.)</string>
+        <string>(\.)\s*(?!\.)</string>
         <key>end</key>
         <string>(?x)
   # stop when you've just read non-whitespace followed by non-word
@@ -600,6 +600,14 @@
   (^|(?&lt;=\s))(?=[^\\\w\s]) |
   $
 </string>
+        <key>beginCaptures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.separator.period.python</string>
+          </dict>
+        </dict>
         <key>patterns</key>
         <array>
           <dict>
@@ -1513,7 +1521,7 @@
           <dict>
             <key>match</key>
             <string>(?x)
-  \s* \b(from)\b (\s*\.+\s*) (import)?
+  \s* \b(from)\b \s*(\.+)\s* (import)?
 </string>
             <key>captures</key>
             <dict>
@@ -1522,6 +1530,11 @@
                 <key>name</key>
                 <string>keyword.control.import.python</string>
               </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>punctuation.separator.period.python</string>
+              </dict>
               <key>3</key>
               <dict>
                 <key>name</key>
@@ -1719,9 +1732,17 @@
       <key>member-access-class</key>
       <dict>
         <key>begin</key>
-        <string>\.\s*(?!\.)</string>
+        <string>(\.)\s*(?!\.)</string>
         <key>end</key>
         <string>(?&lt;=\S)(?=\W)|$</string>
+        <key>beginCaptures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>punctuation.separator.period.python</string>
+          </dict>
+        </dict>
         <key>patterns</key>
         <array>
           <dict>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
index 2c31e243..43009579 100644
--- a/grammars/src/MagicPython.syntax.yaml
+++ b/grammars/src/MagicPython.syntax.yaml
@@ -415,7 +415,7 @@ repository:
         match: (?x) \b ([[:alpha:]_]\w*) \b
 
   member-access:
-    begin: \.\s*(?!\.)
+    begin: (\.)\s*(?!\.)
     end: |
       (?x)
         # stop when you've just read non-whitespace followed by non-word
@@ -425,6 +425,8 @@ repository:
         # i.e. when seeing a non-identifier
         (^|(?<=\s))(?=[^\\\w\s]) |
         $
+    beginCaptures:
+      '1': {name: punctuation.separator.period.python}
     patterns:
       - include: '#function-call'
       - include: '#member-access-base'
@@ -829,9 +831,10 @@ repository:
     patterns:
       - match: |
           (?x)
-            \s* \b(from)\b (\s*\.+\s*) (import)?
+            \s* \b(from)\b \s*(\.+)\s* (import)?
         captures:
           '1': {name: keyword.control.import.python}
+          '2': {name: punctuation.separator.period.python}
           '3': {name: keyword.control.import.python}
       - name: keyword.control.import.python
         match: \b(?<!\.)import\b
@@ -907,8 +910,10 @@ repository:
       '1': {name: entity.other.inherited-class.python}
 
   member-access-class:
-    begin: \.\s*(?!\.)
+    begin: (\.)\s*(?!\.)
     end: (?<=\S)(?=\W)|$
+    beginCaptures:
+      '1': {name: punctuation.separator.period.python}
     patterns:
       - include: '#call-wrapper-inheritance'
       - include: '#member-access-base'
diff --git a/misc/scopes b/misc/scopes
index 72e0d629..128a673c 100644
--- a/misc/scopes
+++ b/misc/scopes
@@ -120,6 +120,7 @@ punctuation.separator.dict.python
 punctuation.separator.element.python
 punctuation.separator.inheritance.python
 punctuation.separator.parameters.python
+punctuation.separator.period.python
 punctuation.separator.slice.python
 storage.modifier.declaration.python
 storage.modifier.flag.regexp
diff --git a/test/atom-spec/python-spec.js b/test/atom-spec/python-spec.js
index 0359e613..c0d65218 100644
--- a/test/atom-spec/python-spec.js
+++ b/test/atom-spec/python-spec.js
@@ -162,13 +162,13 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("some");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("__bases__");
       expect(tokens[1][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[2][0].value).toBe("some");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe(".");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("__class__");
       expect(tokens[2][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[3][0].value).toBe("assert");
@@ -182,7 +182,7 @@ describe("Grammar Tests", function() {
       expect(tokens[5][0].value).toBe("__builtins__");
       expect(tokens[5][0].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[5][1].value).toBe(".");
-      expect(tokens[5][1].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[5][2].value).toBe("len");
       expect(tokens[5][2].scopes).toEqual(["source.python"]);
       expect(tokens[6][0].value).toBe("print");
@@ -196,217 +196,217 @@ describe("Grammar Tests", function() {
       expect(tokens[7][0].value).toBe("some");
       expect(tokens[7][0].scopes).toEqual(["source.python"]);
       expect(tokens[7][1].value).toBe(".");
-      expect(tokens[7][1].scopes).toEqual(["source.python"]);
+      expect(tokens[7][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[7][2].value).toBe("__dict__");
       expect(tokens[7][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[8][0].value).toBe("some");
       expect(tokens[8][0].scopes).toEqual(["source.python"]);
       expect(tokens[8][1].value).toBe(".");
-      expect(tokens[8][1].scopes).toEqual(["source.python"]);
+      expect(tokens[8][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[8][2].value).toBe("__doc__");
       expect(tokens[8][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[9][0].value).toBe("some");
       expect(tokens[9][0].scopes).toEqual(["source.python"]);
       expect(tokens[9][1].value).toBe(".");
-      expect(tokens[9][1].scopes).toEqual(["source.python"]);
+      expect(tokens[9][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[9][2].value).toBe("__file__");
       expect(tokens[9][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[10][0].value).toBe("some");
       expect(tokens[10][0].scopes).toEqual(["source.python"]);
       expect(tokens[10][1].value).toBe(".");
-      expect(tokens[10][1].scopes).toEqual(["source.python"]);
+      expect(tokens[10][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[10][2].value).toBe("__members__");
       expect(tokens[10][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[11][0].value).toBe("some");
       expect(tokens[11][0].scopes).toEqual(["source.python"]);
       expect(tokens[11][1].value).toBe(".");
-      expect(tokens[11][1].scopes).toEqual(["source.python"]);
+      expect(tokens[11][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[11][2].value).toBe("__metaclass__");
       expect(tokens[11][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[12][0].value).toBe("some");
       expect(tokens[12][0].scopes).toEqual(["source.python"]);
       expect(tokens[12][1].value).toBe(".");
-      expect(tokens[12][1].scopes).toEqual(["source.python"]);
+      expect(tokens[12][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[12][2].value).toBe("__methods__");
       expect(tokens[12][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[13][0].value).toBe("some");
       expect(tokens[13][0].scopes).toEqual(["source.python"]);
       expect(tokens[13][1].value).toBe(".");
-      expect(tokens[13][1].scopes).toEqual(["source.python"]);
+      expect(tokens[13][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[13][2].value).toBe("__module__");
       expect(tokens[13][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[14][0].value).toBe("some");
       expect(tokens[14][0].scopes).toEqual(["source.python"]);
       expect(tokens[14][1].value).toBe(".");
-      expect(tokens[14][1].scopes).toEqual(["source.python"]);
+      expect(tokens[14][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[14][2].value).toBe("__mro__");
       expect(tokens[14][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[15][0].value).toBe("some");
       expect(tokens[15][0].scopes).toEqual(["source.python"]);
       expect(tokens[15][1].value).toBe(".");
-      expect(tokens[15][1].scopes).toEqual(["source.python"]);
+      expect(tokens[15][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[15][2].value).toBe("__name__");
       expect(tokens[15][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[16][0].value).toBe("some");
       expect(tokens[16][0].scopes).toEqual(["source.python"]);
       expect(tokens[16][1].value).toBe(".");
-      expect(tokens[16][1].scopes).toEqual(["source.python"]);
+      expect(tokens[16][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[16][2].value).toBe("__slots__");
       expect(tokens[16][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[17][0].value).toBe("some");
       expect(tokens[17][0].scopes).toEqual(["source.python"]);
       expect(tokens[17][1].value).toBe(".");
-      expect(tokens[17][1].scopes).toEqual(["source.python"]);
+      expect(tokens[17][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[17][2].value).toBe("__subclasses__");
       expect(tokens[17][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[18][0].value).toBe("some");
       expect(tokens[18][0].scopes).toEqual(["source.python"]);
       expect(tokens[18][1].value).toBe(".");
-      expect(tokens[18][1].scopes).toEqual(["source.python"]);
+      expect(tokens[18][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[18][2].value).toBe("__version__");
       expect(tokens[18][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[19][0].value).toBe("some");
       expect(tokens[19][0].scopes).toEqual(["source.python"]);
       expect(tokens[19][1].value).toBe(".");
-      expect(tokens[19][1].scopes).toEqual(["source.python"]);
+      expect(tokens[19][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[19][2].value).toBe("__weakref__");
       expect(tokens[19][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[20][0].value).toBe("some");
       expect(tokens[20][0].scopes).toEqual(["source.python"]);
       expect(tokens[20][1].value).toBe(".");
-      expect(tokens[20][1].scopes).toEqual(["source.python"]);
+      expect(tokens[20][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[20][2].value).toBe("__qualname__");
       expect(tokens[20][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[21][0].value).toBe("some");
       expect(tokens[21][0].scopes).toEqual(["source.python"]);
       expect(tokens[21][1].value).toBe(".");
-      expect(tokens[21][1].scopes).toEqual(["source.python"]);
+      expect(tokens[21][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[21][2].value).toBe("__code__");
       expect(tokens[21][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[22][0].value).toBe("some");
       expect(tokens[22][0].scopes).toEqual(["source.python"]);
       expect(tokens[22][1].value).toBe(".");
-      expect(tokens[22][1].scopes).toEqual(["source.python"]);
+      expect(tokens[22][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[22][2].value).toBe("__wrapped__");
       expect(tokens[22][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[23][0].value).toBe("some");
       expect(tokens[23][0].scopes).toEqual(["source.python"]);
       expect(tokens[23][1].value).toBe(".");
-      expect(tokens[23][1].scopes).toEqual(["source.python"]);
+      expect(tokens[23][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[23][2].value).toBe("__signature__");
       expect(tokens[23][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[24][0].value).toBe("some");
       expect(tokens[24][0].scopes).toEqual(["source.python"]);
       expect(tokens[24][1].value).toBe(".");
-      expect(tokens[24][1].scopes).toEqual(["source.python"]);
+      expect(tokens[24][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[24][2].value).toBe("__defaults__");
       expect(tokens[24][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[25][0].value).toBe("some");
       expect(tokens[25][0].scopes).toEqual(["source.python"]);
       expect(tokens[25][1].value).toBe(".");
-      expect(tokens[25][1].scopes).toEqual(["source.python"]);
+      expect(tokens[25][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[25][2].value).toBe("__func__");
       expect(tokens[25][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[26][0].value).toBe("some");
       expect(tokens[26][0].scopes).toEqual(["source.python"]);
       expect(tokens[26][1].value).toBe(".");
-      expect(tokens[26][1].scopes).toEqual(["source.python"]);
+      expect(tokens[26][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[26][2].value).toBe("__self__");
       expect(tokens[26][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[27][0].value).toBe("some");
       expect(tokens[27][0].scopes).toEqual(["source.python"]);
       expect(tokens[27][1].value).toBe(".");
-      expect(tokens[27][1].scopes).toEqual(["source.python"]);
+      expect(tokens[27][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[27][2].value).toBe("__kwdefaults__");
       expect(tokens[27][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[28][0].value).toBe("some");
       expect(tokens[28][0].scopes).toEqual(["source.python"]);
       expect(tokens[28][1].value).toBe(".");
-      expect(tokens[28][1].scopes).toEqual(["source.python"]);
+      expect(tokens[28][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[28][2].value).toBe("__matmul__");
       expect(tokens[28][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[29][0].value).toBe("some");
       expect(tokens[29][0].scopes).toEqual(["source.python"]);
       expect(tokens[29][1].value).toBe(".");
-      expect(tokens[29][1].scopes).toEqual(["source.python"]);
+      expect(tokens[29][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[29][2].value).toBe("__imatmul__");
       expect(tokens[29][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[30][0].value).toBe("some");
       expect(tokens[30][0].scopes).toEqual(["source.python"]);
       expect(tokens[30][1].value).toBe(".");
-      expect(tokens[30][1].scopes).toEqual(["source.python"]);
+      expect(tokens[30][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[30][2].value).toBe("__rmatmul__");
       expect(tokens[30][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[31][0].value).toBe("some");
       expect(tokens[31][0].scopes).toEqual(["source.python"]);
       expect(tokens[31][1].value).toBe(".");
-      expect(tokens[31][1].scopes).toEqual(["source.python"]);
+      expect(tokens[31][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[31][2].value).toBe("__annotations__");
       expect(tokens[31][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[32][0].value).toBe("some");
       expect(tokens[32][0].scopes).toEqual(["source.python"]);
       expect(tokens[32][1].value).toBe(".");
-      expect(tokens[32][1].scopes).toEqual(["source.python"]);
+      expect(tokens[32][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[32][2].value).toBe("__init_subclass__");
       expect(tokens[32][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[33][0].value).toBe("some");
       expect(tokens[33][0].scopes).toEqual(["source.python"]);
       expect(tokens[33][1].value).toBe(".");
-      expect(tokens[33][1].scopes).toEqual(["source.python"]);
+      expect(tokens[33][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[33][2].value).toBe("__set_name__");
       expect(tokens[33][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[34][0].value).toBe("some");
       expect(tokens[34][0].scopes).toEqual(["source.python"]);
       expect(tokens[34][1].value).toBe(".");
-      expect(tokens[34][1].scopes).toEqual(["source.python"]);
+      expect(tokens[34][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[34][2].value).toBe("__fspath__");
       expect(tokens[34][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[35][0].value).toBe("some");
       expect(tokens[35][0].scopes).toEqual(["source.python"]);
       expect(tokens[35][1].value).toBe(".");
-      expect(tokens[35][1].scopes).toEqual(["source.python"]);
+      expect(tokens[35][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[35][2].value).toBe("__classcell__");
       expect(tokens[35][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[36][0].value).toBe("some");
       expect(tokens[36][0].scopes).toEqual(["source.python"]);
       expect(tokens[36][1].value).toBe(".");
-      expect(tokens[36][1].scopes).toEqual(["source.python"]);
+      expect(tokens[36][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[36][2].value).toBe("__bytes__");
       expect(tokens[36][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[37][0].value).toBe("some");
       expect(tokens[37][0].scopes).toEqual(["source.python"]);
       expect(tokens[37][1].value).toBe(".");
-      expect(tokens[37][1].scopes).toEqual(["source.python"]);
+      expect(tokens[37][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[37][2].value).toBe("__spec__");
       expect(tokens[37][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[38][0].value).toBe("some");
       expect(tokens[38][0].scopes).toEqual(["source.python"]);
       expect(tokens[38][1].value).toBe(".");
-      expect(tokens[38][1].scopes).toEqual(["source.python"]);
+      expect(tokens[38][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[38][2].value).toBe("__path__");
       expect(tokens[38][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[39][0].value).toBe("some");
       expect(tokens[39][0].scopes).toEqual(["source.python"]);
       expect(tokens[39][1].value).toBe(".");
-      expect(tokens[39][1].scopes).toEqual(["source.python"]);
+      expect(tokens[39][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[39][2].value).toBe("__prepare__");
       expect(tokens[39][2].scopes).toEqual(["source.python","support.function.magic.python"]);
       expect(tokens[40][0].value).toBe("some");
       expect(tokens[40][0].scopes).toEqual(["source.python"]);
       expect(tokens[40][1].value).toBe(".");
-      expect(tokens[40][1].scopes).toEqual(["source.python"]);
+      expect(tokens[40][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[40][2].value).toBe("__package__");
       expect(tokens[40][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[41][0].value).toBe("some");
       expect(tokens[41][0].scopes).toEqual(["source.python"]);
       expect(tokens[41][1].value).toBe(".");
-      expect(tokens[41][1].scopes).toEqual(["source.python"]);
+      expect(tokens[41][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[41][2].value).toBe("__traceback__");
       expect(tokens[41][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[42][0].value).toBe("some");
       expect(tokens[42][0].scopes).toEqual(["source.python"]);
       expect(tokens[42][1].value).toBe(".");
-      expect(tokens[42][1].scopes).toEqual(["source.python"]);
+      expect(tokens[42][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[42][2].value).toBe("__notspecial__");
       expect(tokens[42][2].scopes).toEqual(["source.python"]);
     });
@@ -417,37 +417,37 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("some");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("int");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
       expect(tokens[1][0].value).toBe("some");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("sum");
       expect(tokens[1][2].scopes).toEqual(["source.python"]);
       expect(tokens[2][0].value).toBe("some");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe(".");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("super");
       expect(tokens[2][2].scopes).toEqual(["source.python"]);
       expect(tokens[3][0].value).toBe("some");
       expect(tokens[3][0].scopes).toEqual(["source.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("unicode");
       expect(tokens[3][2].scopes).toEqual(["source.python"]);
       expect(tokens[4][0].value).toBe("some");
       expect(tokens[4][0].scopes).toEqual(["source.python"]);
       expect(tokens[4][1].value).toBe(".");
-      expect(tokens[4][1].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[4][2].value).toBe("foo");
       expect(tokens[4][2].scopes).toEqual(["source.python"]);
       expect(tokens[5][0].value).toBe("some");
       expect(tokens[5][0].scopes).toEqual(["source.python"]);
       expect(tokens[5][1].value).toBe(".");
-      expect(tokens[5][1].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[5][2].value).toBe("Exception");
       expect(tokens[5][2].scopes).toEqual(["source.python"]);
     });
@@ -457,18 +457,22 @@ describe("Grammar Tests", function() {
       tokens = grammar.tokenizeLines("some. True\nsome. \\\n    True\nTrue\nsome.\n    True")
       expect(tokens[0][0].value).toBe("some");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
-      expect(tokens[0][1].value).toBe(". ");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
-      expect(tokens[0][2].value).toBe("True");
-      expect(tokens[0][2].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
+      expect(tokens[0][1].value).toBe(".");
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[0][2].value).toBe(" ");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe("True");
+      expect(tokens[0][3].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
       expect(tokens[1][0].value).toBe("some");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
-      expect(tokens[1][1].value).toBe(". ");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
-      expect(tokens[1][2].value).toBe("\\");
-      expect(tokens[1][2].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
-      expect(tokens[1][3].value).toBe("");
-      expect(tokens[1][3].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].value).toBe(".");
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("\\");
+      expect(tokens[1][3].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
+      expect(tokens[1][4].value).toBe("");
+      expect(tokens[1][4].scopes).toEqual(["source.python"]);
       expect(tokens[2][0].value).toBe("    ");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe("True");
@@ -478,7 +482,9 @@ describe("Grammar Tests", function() {
       expect(tokens[4][0].value).toBe("some");
       expect(tokens[4][0].scopes).toEqual(["source.python"]);
       expect(tokens[4][1].value).toBe(".");
-      expect(tokens[4][1].scopes).toEqual(["source.python"]);
+      expect(tokens[4][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[4][2].value).toBe("");
+      expect(tokens[4][2].scopes).toEqual(["source.python"]);
       expect(tokens[5][0].value).toBe("    ");
       expect(tokens[5][0].scopes).toEqual(["source.python"]);
       expect(tokens[5][1].value).toBe("True");
@@ -583,7 +589,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("foo");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("class");
       expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","keyword.control.flow.python"]);
       expect(tokens[0][3].value).toBe("(");
@@ -595,7 +601,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("foo");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("and");
       expect(tokens[1][2].scopes).toEqual(["source.python","meta.function-call.python","keyword.control.flow.python"]);
       expect(tokens[1][3].value).toBe("(");
@@ -605,7 +611,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][0].value).toBe("foo");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe(".");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("if");
       expect(tokens[2][2].scopes).toEqual(["source.python","keyword.control.flow.python"]);
     });
@@ -616,7 +622,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("foo");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("1");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
       expect(tokens[1][0].value).toBe("foo");
@@ -644,7 +650,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][0].value).toBe("foo");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe(".");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("None");
       expect(tokens[2][2].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
       expect(tokens[2][3].value).toBe(" ");
@@ -656,11 +662,11 @@ describe("Grammar Tests", function() {
       expect(tokens[2][6].value).toBe("foo");
       expect(tokens[2][6].scopes).toEqual(["source.python"]);
       expect(tokens[2][7].value).toBe(".");
-      expect(tokens[2][7].scopes).toEqual(["source.python"]);
+      expect(tokens[2][7].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][8].value).toBe("None");
       expect(tokens[2][8].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
       expect(tokens[2][9].value).toBe(".");
-      expect(tokens[2][9].scopes).toEqual(["source.python"]);
+      expect(tokens[2][9].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][10].value).toBe("baz");
       expect(tokens[2][10].scopes).toEqual(["source.python"]);
     });
@@ -749,7 +755,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("foo");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("__class__");
       expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
       expect(tokens[0][3].value).toBe(" ");
@@ -767,7 +773,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("foo");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("__class__");
       expect(tokens[1][2].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
       expect(tokens[1][3].value).toBe("(");
@@ -783,7 +789,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][0].value).toBe("foo");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
       expect(tokens[2][1].value).toBe(".");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("__add__");
       expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
       expect(tokens[2][3].value).toBe(" ");
@@ -801,7 +807,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][0].value).toBe("foo");
       expect(tokens[3][0].scopes).toEqual(["source.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("__add__");
       expect(tokens[3][2].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
       expect(tokens[3][3].value).toBe("(");
@@ -819,7 +825,7 @@ describe("Grammar Tests", function() {
       expect(tokens[5][0].value).toBe("foo");
       expect(tokens[5][0].scopes).toEqual(["source.python"]);
       expect(tokens[5][1].value).toBe(".");
-      expect(tokens[5][1].scopes).toEqual(["source.python"]);
+      expect(tokens[5][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[5][2].value).toBe("__class__");
       expect(tokens[5][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[5][3].value).toBe(" ");
@@ -833,72 +839,80 @@ describe("Grammar Tests", function() {
       tokens = grammar.tokenizeLines("foo. __class__(foo=bar)\nfoo. __class__ (foo=bar)\nfoo. __add__ (foo=bar)\nfoo. __add__(foo=bar)")
       expect(tokens[0][0].value).toBe("foo");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
-      expect(tokens[0][1].value).toBe(". ");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
-      expect(tokens[0][2].value).toBe("__class__");
-      expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
-      expect(tokens[0][3].value).toBe("(");
-      expect(tokens[0][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
-      expect(tokens[0][4].value).toBe("foo");
-      expect(tokens[0][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
-      expect(tokens[0][5].value).toBe("=");
-      expect(tokens[0][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
-      expect(tokens[0][6].value).toBe("bar");
-      expect(tokens[0][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
-      expect(tokens[0][7].value).toBe(")");
-      expect(tokens[0][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[0][1].value).toBe(".");
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[0][2].value).toBe(" ");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe("__class__");
+      expect(tokens[0][3].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
+      expect(tokens[0][4].value).toBe("(");
+      expect(tokens[0][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[0][5].value).toBe("foo");
+      expect(tokens[0][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[0][6].value).toBe("=");
+      expect(tokens[0][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[0][7].value).toBe("bar");
+      expect(tokens[0][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[0][8].value).toBe(")");
+      expect(tokens[0][8].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
       expect(tokens[1][0].value).toBe("foo");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
-      expect(tokens[1][1].value).toBe(". ");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
-      expect(tokens[1][2].value).toBe("__class__");
-      expect(tokens[1][2].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
-      expect(tokens[1][3].value).toBe(" ");
-      expect(tokens[1][3].scopes).toEqual(["source.python","meta.function-call.python"]);
-      expect(tokens[1][4].value).toBe("(");
-      expect(tokens[1][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
-      expect(tokens[1][5].value).toBe("foo");
-      expect(tokens[1][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
-      expect(tokens[1][6].value).toBe("=");
-      expect(tokens[1][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
-      expect(tokens[1][7].value).toBe("bar");
-      expect(tokens[1][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
-      expect(tokens[1][8].value).toBe(")");
-      expect(tokens[1][8].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[1][1].value).toBe(".");
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[1][2].value).toBe(" ");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
+      expect(tokens[1][3].value).toBe("__class__");
+      expect(tokens[1][3].scopes).toEqual(["source.python","meta.function-call.python","support.variable.magic.python"]);
+      expect(tokens[1][4].value).toBe(" ");
+      expect(tokens[1][4].scopes).toEqual(["source.python","meta.function-call.python"]);
+      expect(tokens[1][5].value).toBe("(");
+      expect(tokens[1][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[1][6].value).toBe("foo");
+      expect(tokens[1][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[1][7].value).toBe("=");
+      expect(tokens[1][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[1][8].value).toBe("bar");
+      expect(tokens[1][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[1][9].value).toBe(")");
+      expect(tokens[1][9].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
       expect(tokens[2][0].value).toBe("foo");
       expect(tokens[2][0].scopes).toEqual(["source.python"]);
-      expect(tokens[2][1].value).toBe(". ");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
-      expect(tokens[2][2].value).toBe("__add__");
-      expect(tokens[2][2].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
-      expect(tokens[2][3].value).toBe(" ");
-      expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python"]);
-      expect(tokens[2][4].value).toBe("(");
-      expect(tokens[2][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
-      expect(tokens[2][5].value).toBe("foo");
-      expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
-      expect(tokens[2][6].value).toBe("=");
-      expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
-      expect(tokens[2][7].value).toBe("bar");
-      expect(tokens[2][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
-      expect(tokens[2][8].value).toBe(")");
-      expect(tokens[2][8].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[2][1].value).toBe(".");
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[2][2].value).toBe(" ");
+      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][3].value).toBe("__add__");
+      expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
+      expect(tokens[2][4].value).toBe(" ");
+      expect(tokens[2][4].scopes).toEqual(["source.python","meta.function-call.python"]);
+      expect(tokens[2][5].value).toBe("(");
+      expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[2][6].value).toBe("foo");
+      expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[2][7].value).toBe("=");
+      expect(tokens[2][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[2][8].value).toBe("bar");
+      expect(tokens[2][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[2][9].value).toBe(")");
+      expect(tokens[2][9].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
       expect(tokens[3][0].value).toBe("foo");
       expect(tokens[3][0].scopes).toEqual(["source.python"]);
-      expect(tokens[3][1].value).toBe(". ");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
-      expect(tokens[3][2].value).toBe("__add__");
-      expect(tokens[3][2].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
-      expect(tokens[3][3].value).toBe("(");
-      expect(tokens[3][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
-      expect(tokens[3][4].value).toBe("foo");
-      expect(tokens[3][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
-      expect(tokens[3][5].value).toBe("=");
-      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
-      expect(tokens[3][6].value).toBe("bar");
-      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
-      expect(tokens[3][7].value).toBe(")");
-      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][1].value).toBe(".");
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("__add__");
+      expect(tokens[3][3].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
+      expect(tokens[3][4].value).toBe("(");
+      expect(tokens[3][4].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[3][5].value).toBe("foo");
+      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[3][6].value).toBe("=");
+      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[3][7].value).toBe("bar");
+      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[3][8].value).toBe(")");
+      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
     });
 
   it("test/calls/call9.py", 
@@ -1010,7 +1024,7 @@ describe("Grammar Tests", function() {
       expect(tokens[6][3].value).toBe("sys");
       expect(tokens[6][3].scopes).toEqual(["source.python"]);
       expect(tokens[6][4].value).toBe(".");
-      expect(tokens[6][4].scopes).toEqual(["source.python"]);
+      expect(tokens[6][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[6][5].value).toBe("stderr");
       expect(tokens[6][5].scopes).toEqual(["source.python"]);
       expect(tokens[6][6].value).toBe(",");
@@ -1044,7 +1058,7 @@ describe("Grammar Tests", function() {
       expect(tokens[7][9].value).toBe("sys");
       expect(tokens[7][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
       expect(tokens[7][10].value).toBe(".");
-      expect(tokens[7][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[7][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.period.python"]);
       expect(tokens[7][11].value).toBe("stderr");
       expect(tokens[7][11].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
       expect(tokens[7][12].value).toBe(")");
@@ -1215,7 +1229,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][1].value).toBe("self");
       expect(tokens[2][1].scopes).toEqual(["source.python","variable.language.special.self.python"]);
       expect(tokens[2][2].value).toBe(".");
-      expect(tokens[2][2].scopes).toEqual(["source.python"]);
+      expect(tokens[2][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][3].value).toBe("a");
       expect(tokens[2][3].scopes).toEqual(["source.python"]);
       expect(tokens[2][4].value).toBe(" ");
@@ -1231,7 +1245,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][1].value).toBe("self");
       expect(tokens[3][1].scopes).toEqual(["source.python","variable.language.special.self.python"]);
       expect(tokens[3][2].value).toBe(".");
-      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][3].value).toBe("b");
       expect(tokens[3][3].scopes).toEqual(["source.python"]);
       expect(tokens[3][4].value).toBe(" ");
@@ -1265,7 +1279,7 @@ describe("Grammar Tests", function() {
       expect(tokens[6][1].value).toBe("a");
       expect(tokens[6][1].scopes).toEqual(["source.python"]);
       expect(tokens[6][2].value).toBe(".");
-      expect(tokens[6][2].scopes).toEqual(["source.python"]);
+      expect(tokens[6][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[6][3].value).toBe("self");
       expect(tokens[6][3].scopes).toEqual(["source.python"]);
       expect(tokens[6][4].value).toBe(" ");
@@ -1281,11 +1295,11 @@ describe("Grammar Tests", function() {
       expect(tokens[7][1].value).toBe("a");
       expect(tokens[7][1].scopes).toEqual(["source.python"]);
       expect(tokens[7][2].value).toBe(".");
-      expect(tokens[7][2].scopes).toEqual(["source.python"]);
+      expect(tokens[7][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[7][3].value).toBe("self");
       expect(tokens[7][3].scopes).toEqual(["source.python"]);
       expect(tokens[7][4].value).toBe(".");
-      expect(tokens[7][4].scopes).toEqual(["source.python"]);
+      expect(tokens[7][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[7][5].value).toBe("bar");
       expect(tokens[7][5].scopes).toEqual(["source.python"]);
       expect(tokens[7][6].value).toBe(" ");
@@ -1362,7 +1376,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][1].value).toBe("cls");
       expect(tokens[3][1].scopes).toEqual(["source.python","variable.language.special.cls.python"]);
       expect(tokens[3][2].value).toBe(".");
-      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][3].value).toBe("a");
       expect(tokens[3][3].scopes).toEqual(["source.python"]);
       expect(tokens[3][4].value).toBe(" ");
@@ -1378,7 +1392,7 @@ describe("Grammar Tests", function() {
       expect(tokens[4][1].value).toBe("cls");
       expect(tokens[4][1].scopes).toEqual(["source.python","variable.language.special.cls.python"]);
       expect(tokens[4][2].value).toBe(".");
-      expect(tokens[4][2].scopes).toEqual(["source.python"]);
+      expect(tokens[4][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[4][3].value).toBe("b");
       expect(tokens[4][3].scopes).toEqual(["source.python"]);
       expect(tokens[4][4].value).toBe(" ");
@@ -1424,7 +1438,7 @@ describe("Grammar Tests", function() {
       expect(tokens[8][1].value).toBe("a");
       expect(tokens[8][1].scopes).toEqual(["source.python"]);
       expect(tokens[8][2].value).toBe(".");
-      expect(tokens[8][2].scopes).toEqual(["source.python"]);
+      expect(tokens[8][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[8][3].value).toBe("cls");
       expect(tokens[8][3].scopes).toEqual(["source.python"]);
       expect(tokens[8][4].value).toBe(" ");
@@ -1440,11 +1454,11 @@ describe("Grammar Tests", function() {
       expect(tokens[9][1].value).toBe("a");
       expect(tokens[9][1].scopes).toEqual(["source.python"]);
       expect(tokens[9][2].value).toBe(".");
-      expect(tokens[9][2].scopes).toEqual(["source.python"]);
+      expect(tokens[9][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[9][3].value).toBe("cls");
       expect(tokens[9][3].scopes).toEqual(["source.python"]);
       expect(tokens[9][4].value).toBe(".");
-      expect(tokens[9][4].scopes).toEqual(["source.python"]);
+      expect(tokens[9][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[9][5].value).toBe("__name__");
       expect(tokens[9][5].scopes).toEqual(["source.python","support.variable.magic.python"]);
       expect(tokens[10][0].value).toBe("        ");
@@ -1506,7 +1520,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][4].value).toBe("f");
       expect(tokens[0][4].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[0][5].value).toBe(".");
-      expect(tokens[0][5].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python"]);
+      expect(tokens[0][5].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","punctuation.separator.period.python"]);
       expect(tokens[0][6].value).toBe("Exception");
       expect(tokens[0][6].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[0][7].value).toBe(",");
@@ -1516,7 +1530,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][9].value).toBe("f");
       expect(tokens[0][9].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[0][10].value).toBe(".");
-      expect(tokens[0][10].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python"]);
+      expect(tokens[0][10].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","punctuation.separator.period.python"]);
       expect(tokens[0][11].value).toBe("type");
       expect(tokens[0][11].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[0][12].value).toBe(",");
@@ -1532,7 +1546,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][17].value).toBe("Exception");
       expect(tokens[0][17].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","support.type.exception.python"]);
       expect(tokens[0][18].value).toBe(".");
-      expect(tokens[0][18].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python"]);
+      expect(tokens[0][18].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","punctuation.separator.period.python"]);
       expect(tokens[0][19].value).toBe("a");
       expect(tokens[0][19].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[0][20].value).toBe(",");
@@ -1659,7 +1673,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][4].value).toBe("Foo");
       expect(tokens[2][4].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[2][5].value).toBe(".");
-      expect(tokens[2][5].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python"]);
+      expect(tokens[2][5].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","punctuation.separator.period.python"]);
       expect(tokens[2][6].value).toBe("Bar");
       expect(tokens[2][6].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[2][7].value).toBe(",");
@@ -1669,7 +1683,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][9].value).toBe("Bar");
       expect(tokens[2][9].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[2][10].value).toBe(".");
-      expect(tokens[2][10].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python"]);
+      expect(tokens[2][10].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","punctuation.separator.period.python"]);
       expect(tokens[2][11].value).toBe("name");
       expect(tokens[2][11].scopes).toEqual(["source.python","meta.class.python","meta.class.inheritance.python","entity.other.inherited-class.python"]);
       expect(tokens[2][12].value).toBe("=");
@@ -1947,7 +1961,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][3].value).toBe(")");
       expect(tokens[2][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
       expect(tokens[2][4].value).toBe(".");
-      expect(tokens[2][4].scopes).toEqual(["source.python"]);
+      expect(tokens[2][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][5].value).toBe("__init__");
       expect(tokens[2][5].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
       expect(tokens[2][6].value).toBe("(");
@@ -1968,20 +1982,22 @@ describe("Grammar Tests", function() {
       expect(tokens[3][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
       expect(tokens[3][3].value).toBe(")");
       expect(tokens[3][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
-      expect(tokens[3][4].value).toBe(". ");
-      expect(tokens[3][4].scopes).toEqual(["source.python"]);
-      expect(tokens[3][5].value).toBe("__init__");
-      expect(tokens[3][5].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
-      expect(tokens[3][6].value).toBe("(");
-      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
-      expect(tokens[3][7].value).toBe("foo");
-      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
-      expect(tokens[3][8].value).toBe("=");
-      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
-      expect(tokens[3][9].value).toBe("1");
-      expect(tokens[3][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
-      expect(tokens[3][10].value).toBe(")");
-      expect(tokens[3][10].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
+      expect(tokens[3][4].value).toBe(".");
+      expect(tokens[3][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[3][5].value).toBe(" ");
+      expect(tokens[3][5].scopes).toEqual(["source.python"]);
+      expect(tokens[3][6].value).toBe("__init__");
+      expect(tokens[3][6].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
+      expect(tokens[3][7].value).toBe("(");
+      expect(tokens[3][7].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
+      expect(tokens[3][8].value).toBe("foo");
+      expect(tokens[3][8].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","variable.parameter.function-call.python"]);
+      expect(tokens[3][9].value).toBe("=");
+      expect(tokens[3][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","keyword.operator.assignment.python"]);
+      expect(tokens[3][10].value).toBe("1");
+      expect(tokens[3][10].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.numeric.dec.python"]);
+      expect(tokens[3][11].value).toBe(")");
+      expect(tokens[3][11].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
       expect(tokens[4][0].value).toBe("        ");
       expect(tokens[4][0].scopes).toEqual(["source.python"]);
       expect(tokens[4][1].value).toBe("super");
@@ -1990,12 +2006,14 @@ describe("Grammar Tests", function() {
       expect(tokens[4][2].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.begin.python"]);
       expect(tokens[4][3].value).toBe(")");
       expect(tokens[4][3].scopes).toEqual(["source.python","meta.function-call.python","punctuation.definition.arguments.end.python"]);
-      expect(tokens[4][4].value).toBe(". ");
-      expect(tokens[4][4].scopes).toEqual(["source.python"]);
-      expect(tokens[4][5].value).toBe("\\");
-      expect(tokens[4][5].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
-      expect(tokens[4][6].value).toBe("");
-      expect(tokens[4][6].scopes).toEqual(["source.python"]);
+      expect(tokens[4][4].value).toBe(".");
+      expect(tokens[4][4].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[4][5].value).toBe(" ");
+      expect(tokens[4][5].scopes).toEqual(["source.python"]);
+      expect(tokens[4][6].value).toBe("\\");
+      expect(tokens[4][6].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
+      expect(tokens[4][7].value).toBe("");
+      expect(tokens[4][7].scopes).toEqual(["source.python"]);
       expect(tokens[5][0].value).toBe("__init__");
       expect(tokens[5][0].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
       expect(tokens[5][1].value).toBe("(");
@@ -2029,7 +2047,7 @@ describe("Grammar Tests", function() {
       expect(tokens[8][1].value).toBe("foo");
       expect(tokens[8][1].scopes).toEqual(["source.python"]);
       expect(tokens[8][2].value).toBe(".");
-      expect(tokens[8][2].scopes).toEqual(["source.python"]);
+      expect(tokens[8][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[8][3].value).toBe("__init__");
       expect(tokens[8][3].scopes).toEqual(["source.python","meta.function-call.python","support.function.magic.python"]);
       expect(tokens[8][4].value).toBe("(");
@@ -4895,7 +4913,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][8].value).toBe("QQQ");
       expect(tokens[0][8].scopes).toEqual(["source.python","constant.other.caps.python"]);
       expect(tokens[0][9].value).toBe(".");
-      expect(tokens[0][9].scopes).toEqual(["source.python"]);
+      expect(tokens[0][9].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][10].value).toBe("bar");
       expect(tokens[0][10].scopes).toEqual(["source.python"]);
       expect(tokens[0][11].value).toBe(" ");
@@ -4903,7 +4921,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][12].value).toBe("baz");
       expect(tokens[0][12].scopes).toEqual(["source.python"]);
       expect(tokens[0][13].value).toBe(".");
-      expect(tokens[0][13].scopes).toEqual(["source.python"]);
+      expect(tokens[0][13].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][14].value).toBe("AA_a");
       expect(tokens[0][14].scopes).toEqual(["source.python","constant.other.caps.python"]);
       expect(tokens[0][15].value).toBe(" ");
@@ -4915,7 +4933,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][18].value).toBe("foo");
       expect(tokens[0][18].scopes).toEqual(["source.python"]);
       expect(tokens[0][19].value).toBe(".");
-      expect(tokens[0][19].scopes).toEqual(["source.python"]);
+      expect(tokens[0][19].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][20].value).toBe("_AAA");
       expect(tokens[0][20].scopes).toEqual(["source.python","constant.other.caps.python"]);
       expect(tokens[1][0].value).toBe("QQQq");
@@ -4929,7 +4947,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][4].value).toBe("self");
       expect(tokens[1][4].scopes).toEqual(["source.python","variable.language.special.self.python"]);
       expect(tokens[1][5].value).toBe(".");
-      expect(tokens[1][5].scopes).toEqual(["source.python"]);
+      expect(tokens[1][5].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][6].value).toBe("FOOO");
       expect(tokens[1][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
       expect(tokens[1][7].value).toBe("(");
@@ -5199,7 +5217,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][0].value).toBe("...");
       expect(tokens[3][0].scopes).toEqual(["source.python","constant.other.ellipsis.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("__class__");
       expect(tokens[3][2].scopes).toEqual(["source.python","support.variable.magic.python"]);
     });
@@ -5218,7 +5236,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][4].value).toBe("self");
       expect(tokens[0][4].scopes).toEqual(["source.python","variable.language.special.self.python"]);
       expect(tokens[0][5].value).toBe(".");
-      expect(tokens[0][5].scopes).toEqual(["source.python"]);
+      expect(tokens[0][5].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][6].value).toBe("some_list");
       expect(tokens[0][6].scopes).toEqual(["source.python","meta.item-access.python"]);
       expect(tokens[0][7].value).toBe("[");
@@ -5294,7 +5312,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("foofrom");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("something");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
     });
@@ -5365,13 +5383,13 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("a");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("Exception");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
       expect(tokens[1][0].value).toBe("Exception");
       expect(tokens[1][0].scopes).toEqual(["source.python","support.type.exception.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("a");
       expect(tokens[1][2].scopes).toEqual(["source.python"]);
     });
@@ -5381,46 +5399,56 @@ describe("Grammar Tests", function() {
       tokens = grammar.tokenizeLines("a. #foo\na.\n#foo\na. \\\n#foo\na. 'bar'\na.\n'bar'\na. \\\n'bar'")
       expect(tokens[0][0].value).toBe("a");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
-      expect(tokens[0][1].value).toBe(". ");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
-      expect(tokens[0][2].value).toBe("#");
-      expect(tokens[0][2].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
-      expect(tokens[0][3].value).toBe("foo");
-      expect(tokens[0][3].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
+      expect(tokens[0][1].value).toBe(".");
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[0][2].value).toBe(" ");
+      expect(tokens[0][2].scopes).toEqual(["source.python"]);
+      expect(tokens[0][3].value).toBe("#");
+      expect(tokens[0][3].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
+      expect(tokens[0][4].value).toBe("foo");
+      expect(tokens[0][4].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
       expect(tokens[1][0].value).toBe("a");
       expect(tokens[1][0].scopes).toEqual(["source.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[1][2].value).toBe("");
+      expect(tokens[1][2].scopes).toEqual(["source.python"]);
       expect(tokens[2][0].value).toBe("#");
       expect(tokens[2][0].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
       expect(tokens[2][1].value).toBe("foo");
       expect(tokens[2][1].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
       expect(tokens[3][0].value).toBe("a");
       expect(tokens[3][0].scopes).toEqual(["source.python"]);
-      expect(tokens[3][1].value).toBe(". ");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
-      expect(tokens[3][2].value).toBe("\\");
-      expect(tokens[3][2].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
-      expect(tokens[3][3].value).toBe("");
-      expect(tokens[3][3].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].value).toBe(".");
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[3][2].value).toBe(" ");
+      expect(tokens[3][2].scopes).toEqual(["source.python"]);
+      expect(tokens[3][3].value).toBe("\\");
+      expect(tokens[3][3].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
+      expect(tokens[3][4].value).toBe("");
+      expect(tokens[3][4].scopes).toEqual(["source.python"]);
       expect(tokens[4][0].value).toBe("#");
       expect(tokens[4][0].scopes).toEqual(["source.python","comment.line.number-sign.python","punctuation.definition.comment.python"]);
       expect(tokens[4][1].value).toBe("foo");
       expect(tokens[4][1].scopes).toEqual(["source.python","comment.line.number-sign.python"]);
       expect(tokens[5][0].value).toBe("a");
       expect(tokens[5][0].scopes).toEqual(["source.python"]);
-      expect(tokens[5][1].value).toBe(". ");
-      expect(tokens[5][1].scopes).toEqual(["source.python"]);
-      expect(tokens[5][2].value).toBe("'");
-      expect(tokens[5][2].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
-      expect(tokens[5][3].value).toBe("bar");
-      expect(tokens[5][3].scopes).toEqual(["source.python","string.quoted.single.python"]);
-      expect(tokens[5][4].value).toBe("'");
-      expect(tokens[5][4].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
+      expect(tokens[5][1].value).toBe(".");
+      expect(tokens[5][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[5][2].value).toBe(" ");
+      expect(tokens[5][2].scopes).toEqual(["source.python"]);
+      expect(tokens[5][3].value).toBe("'");
+      expect(tokens[5][3].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
+      expect(tokens[5][4].value).toBe("bar");
+      expect(tokens[5][4].scopes).toEqual(["source.python","string.quoted.single.python"]);
+      expect(tokens[5][5].value).toBe("'");
+      expect(tokens[5][5].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
       expect(tokens[6][0].value).toBe("a");
       expect(tokens[6][0].scopes).toEqual(["source.python"]);
       expect(tokens[6][1].value).toBe(".");
-      expect(tokens[6][1].scopes).toEqual(["source.python"]);
+      expect(tokens[6][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[6][2].value).toBe("");
+      expect(tokens[6][2].scopes).toEqual(["source.python"]);
       expect(tokens[7][0].value).toBe("'");
       expect(tokens[7][0].scopes).toEqual(["source.python","string.quoted.docstring.single.python","punctuation.definition.string.begin.python"]);
       expect(tokens[7][1].value).toBe("bar");
@@ -5429,12 +5457,14 @@ describe("Grammar Tests", function() {
       expect(tokens[7][2].scopes).toEqual(["source.python","string.quoted.docstring.single.python","punctuation.definition.string.end.python"]);
       expect(tokens[8][0].value).toBe("a");
       expect(tokens[8][0].scopes).toEqual(["source.python"]);
-      expect(tokens[8][1].value).toBe(". ");
-      expect(tokens[8][1].scopes).toEqual(["source.python"]);
-      expect(tokens[8][2].value).toBe("\\");
-      expect(tokens[8][2].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
-      expect(tokens[8][3].value).toBe("");
-      expect(tokens[8][3].scopes).toEqual(["source.python"]);
+      expect(tokens[8][1].value).toBe(".");
+      expect(tokens[8][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[8][2].value).toBe(" ");
+      expect(tokens[8][2].scopes).toEqual(["source.python"]);
+      expect(tokens[8][3].value).toBe("\\");
+      expect(tokens[8][3].scopes).toEqual(["source.python","punctuation.separator.continuation.line.python"]);
+      expect(tokens[8][4].value).toBe("");
+      expect(tokens[8][4].scopes).toEqual(["source.python"]);
       expect(tokens[9][0].value).toBe("'");
       expect(tokens[9][0].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.begin.python"]);
       expect(tokens[9][1].value).toBe("bar");
@@ -5813,7 +5843,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("a");
       expect(tokens[0][0].scopes).toEqual(["source.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("True");
       expect(tokens[0][2].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
       expect(tokens[0][3].value).toBe(" ");
@@ -5825,7 +5855,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][6].value).toBe("b");
       expect(tokens[0][6].scopes).toEqual(["source.python"]);
       expect(tokens[0][7].value).toBe(".");
-      expect(tokens[0][7].scopes).toEqual(["source.python"]);
+      expect(tokens[0][7].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][8].value).toBe("False");
       expect(tokens[0][8].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
       expect(tokens[0][9].value).toBe(" ");
@@ -5837,7 +5867,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][12].value).toBe("d");
       expect(tokens[0][12].scopes).toEqual(["source.python"]);
       expect(tokens[0][13].value).toBe(".");
-      expect(tokens[0][13].scopes).toEqual(["source.python"]);
+      expect(tokens[0][13].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][14].value).toBe("None");
       expect(tokens[0][14].scopes).toEqual(["source.python","keyword.illegal.name.python"]);
     });
@@ -6143,7 +6173,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("self");
       expect(tokens[0][0].scopes).toEqual(["source.python","variable.language.special.self.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("assertEqual");
       expect(tokens[0][2].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
       expect(tokens[0][3].value).toBe("(");
@@ -7248,7 +7278,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][19].value).toBe("fo");
       expect(tokens[0][19].scopes).toEqual(["source.python","meta.fstring.python"]);
       expect(tokens[0][20].value).toBe(".");
-      expect(tokens[0][20].scopes).toEqual(["source.python","meta.fstring.python"]);
+      expect(tokens[0][20].scopes).toEqual(["source.python","meta.fstring.python","punctuation.separator.period.python"]);
       expect(tokens[0][21].value).toBe("__add__");
       expect(tokens[0][21].scopes).toEqual(["source.python","meta.fstring.python","support.function.magic.python"]);
       expect(tokens[0][22].value).toBe("!s");
@@ -9825,7 +9855,7 @@ describe("Grammar Tests", function() {
       expect(tokens[4][7].value).toBe(")");
       expect(tokens[4][7].scopes).toEqual(["source.python","punctuation.parenthesis.end.python"]);
       expect(tokens[4][8].value).toBe(".");
-      expect(tokens[4][8].scopes).toEqual(["source.python"]);
+      expect(tokens[4][8].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[4][9].value).toBe("fuuuu");
       expect(tokens[4][9].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
       expect(tokens[4][10].value).toBe("(");
@@ -11409,7 +11439,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][4].value).toBe("re");
       expect(tokens[2][4].scopes).toEqual(["source.python"]);
       expect(tokens[2][5].value).toBe(".");
-      expect(tokens[2][5].scopes).toEqual(["source.python"]);
+      expect(tokens[2][5].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][6].value).toBe("compile");
       expect(tokens[2][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
       expect(tokens[2][7].value).toBe("(");
@@ -11723,7 +11753,7 @@ describe("Grammar Tests", function() {
       expect(tokens[20][4].value).toBe("re");
       expect(tokens[20][4].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
       expect(tokens[20][5].value).toBe(".");
-      expect(tokens[20][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python"]);
+      expect(tokens[20][5].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","punctuation.separator.period.python"]);
       expect(tokens[20][6].value).toBe("ASCII");
       expect(tokens[20][6].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.arguments.python","constant.other.caps.python"]);
       expect(tokens[20][7].value).toBe(")");
@@ -11997,32 +12027,34 @@ describe("Grammar Tests", function() {
       tokens = grammar.tokenizeLines("from ...foo import bar as spam, baz\nimport time as ham, datetime")
       expect(tokens[0][0].value).toBe("from");
       expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
-      expect(tokens[0][1].value).toBe(" ...");
+      expect(tokens[0][1].value).toBe(" ");
       expect(tokens[0][1].scopes).toEqual(["source.python"]);
-      expect(tokens[0][2].value).toBe("foo");
-      expect(tokens[0][2].scopes).toEqual(["source.python"]);
-      expect(tokens[0][3].value).toBe(" ");
+      expect(tokens[0][2].value).toBe("...");
+      expect(tokens[0][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
+      expect(tokens[0][3].value).toBe("foo");
       expect(tokens[0][3].scopes).toEqual(["source.python"]);
-      expect(tokens[0][4].value).toBe("import");
-      expect(tokens[0][4].scopes).toEqual(["source.python","keyword.control.import.python"]);
-      expect(tokens[0][5].value).toBe(" ");
-      expect(tokens[0][5].scopes).toEqual(["source.python"]);
-      expect(tokens[0][6].value).toBe("bar");
+      expect(tokens[0][4].value).toBe(" ");
+      expect(tokens[0][4].scopes).toEqual(["source.python"]);
+      expect(tokens[0][5].value).toBe("import");
+      expect(tokens[0][5].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[0][6].value).toBe(" ");
       expect(tokens[0][6].scopes).toEqual(["source.python"]);
-      expect(tokens[0][7].value).toBe(" ");
+      expect(tokens[0][7].value).toBe("bar");
       expect(tokens[0][7].scopes).toEqual(["source.python"]);
-      expect(tokens[0][8].value).toBe("as");
-      expect(tokens[0][8].scopes).toEqual(["source.python","keyword.control.flow.python"]);
-      expect(tokens[0][9].value).toBe(" ");
-      expect(tokens[0][9].scopes).toEqual(["source.python"]);
-      expect(tokens[0][10].value).toBe("spam");
+      expect(tokens[0][8].value).toBe(" ");
+      expect(tokens[0][8].scopes).toEqual(["source.python"]);
+      expect(tokens[0][9].value).toBe("as");
+      expect(tokens[0][9].scopes).toEqual(["source.python","keyword.control.flow.python"]);
+      expect(tokens[0][10].value).toBe(" ");
       expect(tokens[0][10].scopes).toEqual(["source.python"]);
-      expect(tokens[0][11].value).toBe(",");
-      expect(tokens[0][11].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
-      expect(tokens[0][12].value).toBe(" ");
-      expect(tokens[0][12].scopes).toEqual(["source.python"]);
-      expect(tokens[0][13].value).toBe("baz");
+      expect(tokens[0][11].value).toBe("spam");
+      expect(tokens[0][11].scopes).toEqual(["source.python"]);
+      expect(tokens[0][12].value).toBe(",");
+      expect(tokens[0][12].scopes).toEqual(["source.python","punctuation.separator.element.python"]);
+      expect(tokens[0][13].value).toBe(" ");
       expect(tokens[0][13].scopes).toEqual(["source.python"]);
+      expect(tokens[0][14].value).toBe("baz");
+      expect(tokens[0][14].scopes).toEqual(["source.python"]);
       expect(tokens[1][0].value).toBe("import");
       expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][1].value).toBe(" ");
@@ -12050,34 +12082,46 @@ describe("Grammar Tests", function() {
       tokens = grammar.tokenizeLines("from .... import a\nfrom ... import b\nfrom .. import c")
       expect(tokens[0][0].value).toBe("from");
       expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
-      expect(tokens[0][1].value).toBe(" .... ");
+      expect(tokens[0][1].value).toBe(" ");
       expect(tokens[0][1].scopes).toEqual(["source.python"]);
-      expect(tokens[0][2].value).toBe("import");
-      expect(tokens[0][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[0][2].value).toBe("....");
+      expect(tokens[0][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][3].value).toBe(" ");
       expect(tokens[0][3].scopes).toEqual(["source.python"]);
-      expect(tokens[0][4].value).toBe("a");
-      expect(tokens[0][4].scopes).toEqual(["source.python"]);
+      expect(tokens[0][4].value).toBe("import");
+      expect(tokens[0][4].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[0][5].value).toBe(" ");
+      expect(tokens[0][5].scopes).toEqual(["source.python"]);
+      expect(tokens[0][6].value).toBe("a");
+      expect(tokens[0][6].scopes).toEqual(["source.python"]);
       expect(tokens[1][0].value).toBe("from");
       expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
-      expect(tokens[1][1].value).toBe(" ... ");
+      expect(tokens[1][1].value).toBe(" ");
       expect(tokens[1][1].scopes).toEqual(["source.python"]);
-      expect(tokens[1][2].value).toBe("import");
-      expect(tokens[1][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[1][2].value).toBe("...");
+      expect(tokens[1][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][3].value).toBe(" ");
       expect(tokens[1][3].scopes).toEqual(["source.python"]);
-      expect(tokens[1][4].value).toBe("b");
-      expect(tokens[1][4].scopes).toEqual(["source.python"]);
+      expect(tokens[1][4].value).toBe("import");
+      expect(tokens[1][4].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[1][5].value).toBe(" ");
+      expect(tokens[1][5].scopes).toEqual(["source.python"]);
+      expect(tokens[1][6].value).toBe("b");
+      expect(tokens[1][6].scopes).toEqual(["source.python"]);
       expect(tokens[2][0].value).toBe("from");
       expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
-      expect(tokens[2][1].value).toBe(" .. ");
+      expect(tokens[2][1].value).toBe(" ");
       expect(tokens[2][1].scopes).toEqual(["source.python"]);
-      expect(tokens[2][2].value).toBe("import");
-      expect(tokens[2][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[2][2].value).toBe("..");
+      expect(tokens[2][2].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][3].value).toBe(" ");
       expect(tokens[2][3].scopes).toEqual(["source.python"]);
-      expect(tokens[2][4].value).toBe("c");
-      expect(tokens[2][4].scopes).toEqual(["source.python"]);
+      expect(tokens[2][4].value).toBe("import");
+      expect(tokens[2][4].scopes).toEqual(["source.python","keyword.control.import.python"]);
+      expect(tokens[2][5].value).toBe(" ");
+      expect(tokens[2][5].scopes).toEqual(["source.python"]);
+      expect(tokens[2][6].value).toBe("c");
+      expect(tokens[2][6].scopes).toEqual(["source.python"]);
     });
 
   it("test/statements/import3.py", 
@@ -12086,7 +12130,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("from");
       expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[0][1].value).toBe("....");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("import");
       expect(tokens[0][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[0][3].value).toBe(" ");
@@ -12096,7 +12140,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("from");
       expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][1].value).toBe("...");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("import");
       expect(tokens[1][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][3].value).toBe(" ");
@@ -12106,7 +12150,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][0].value).toBe("from");
       expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[2][1].value).toBe("..");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("import");
       expect(tokens[2][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[2][3].value).toBe(" ");
@@ -12116,7 +12160,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][0].value).toBe("from");
       expect(tokens[3][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("import");
       expect(tokens[3][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[3][3].value).toBe(" ");
@@ -12131,7 +12175,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("from");
       expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[0][1].value).toBe("....");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("foo");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
       expect(tokens[0][3].value).toBe(" ");
@@ -12145,7 +12189,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("from");
       expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][1].value).toBe("...");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("foo");
       expect(tokens[1][2].scopes).toEqual(["source.python"]);
       expect(tokens[1][3].value).toBe(" ");
@@ -12159,7 +12203,7 @@ describe("Grammar Tests", function() {
       expect(tokens[2][0].value).toBe("from");
       expect(tokens[2][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[2][1].value).toBe("..");
-      expect(tokens[2][1].scopes).toEqual(["source.python"]);
+      expect(tokens[2][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[2][2].value).toBe("foo");
       expect(tokens[2][2].scopes).toEqual(["source.python"]);
       expect(tokens[2][3].value).toBe(" ");
@@ -12173,7 +12217,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][0].value).toBe("from");
       expect(tokens[3][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("foo");
       expect(tokens[3][2].scopes).toEqual(["source.python"]);
       expect(tokens[3][3].value).toBe(" ");
@@ -12192,7 +12236,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][0].value).toBe("from");
       expect(tokens[0][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[0][1].value).toBe(".");
-      expect(tokens[0][1].scopes).toEqual(["source.python"]);
+      expect(tokens[0][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][2].value).toBe("foo");
       expect(tokens[0][2].scopes).toEqual(["source.python"]);
       expect(tokens[0][3].value).toBe(" ");
@@ -12206,7 +12250,7 @@ describe("Grammar Tests", function() {
       expect(tokens[1][0].value).toBe("from");
       expect(tokens[1][0].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][1].value).toBe(".");
-      expect(tokens[1][1].scopes).toEqual(["source.python"]);
+      expect(tokens[1][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[1][2].value).toBe("import");
       expect(tokens[1][2].scopes).toEqual(["source.python","keyword.control.import.python"]);
       expect(tokens[1][3].value).toBe(" ");
@@ -12218,7 +12262,7 @@ describe("Grammar Tests", function() {
       expect(tokens[3][0].value).toBe("foo");
       expect(tokens[3][0].scopes).toEqual(["source.python"]);
       expect(tokens[3][1].value).toBe(".");
-      expect(tokens[3][1].scopes).toEqual(["source.python"]);
+      expect(tokens[3][1].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[3][2].value).toBe("import");
       expect(tokens[3][2].scopes).toEqual(["source.python","keyword.control.flow.python"]);
       expect(tokens[4][0].value).toBe("");
@@ -13158,7 +13202,7 @@ describe("Grammar Tests", function() {
       expect(tokens[0][17].value).toBe("\"");
       expect(tokens[0][17].scopes).toEqual(["source.python","string.quoted.single.python","punctuation.definition.string.end.python"]);
       expect(tokens[0][18].value).toBe(".");
-      expect(tokens[0][18].scopes).toEqual(["source.python"]);
+      expect(tokens[0][18].scopes).toEqual(["source.python","punctuation.separator.period.python"]);
       expect(tokens[0][19].value).toBe("format");
       expect(tokens[0][19].scopes).toEqual(["source.python","meta.function-call.python","meta.function-call.generic.python"]);
       expect(tokens[0][20].value).toBe("(");
diff --git a/test/builtins/builtins3.py b/test/builtins/builtins3.py
index fd3db478..02ccb5af 100644
--- a/test/builtins/builtins3.py
+++ b/test/builtins/builtins3.py
@@ -60,127 +60,127 @@
 '             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 ]             : punctuation.definition.list.end.python, source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __bases__     : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __class__     : source.python, support.variable.magic.python
 assert        : keyword.control.flow.python, source.python
               : source.python
 __debug__     : source.python, support.variable.magic.python
 __builtins__  : source.python, support.variable.magic.python
 __builtins__  : source.python, support.variable.magic.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 len           : source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 __builtins__  : meta.function-call.arguments.python, meta.function-call.python, source.python, support.variable.magic.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __dict__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __doc__       : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __file__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __members__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __metaclass__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __methods__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __module__    : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __mro__       : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __name__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __slots__     : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __subclasses__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __version__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __weakref__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __qualname__  : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __code__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __wrapped__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __signature__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __defaults__  : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __func__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __self__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __kwdefaults__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __matmul__    : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __imatmul__   : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __rmatmul__   : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __annotations__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __init_subclass__ : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __set_name__  : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __fspath__    : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __classcell__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __bytes__     : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __spec__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __path__      : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __prepare__   : source.python, support.function.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __package__   : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __traceback__ : source.python, support.variable.magic.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __notspecial__ : source.python
diff --git a/test/builtins/builtins4.py b/test/builtins/builtins4.py
index b78b96fb..b8f3401b 100644
--- a/test/builtins/builtins4.py
+++ b/test/builtins/builtins4.py
@@ -8,20 +8,20 @@
 
 
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 int           : source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 sum           : source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 super         : source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 unicode       : source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 foo           : source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 Exception     : source.python
diff --git a/test/builtins/builtins5.py b/test/builtins/builtins5.py
index ecabf1c5..674df37f 100644
--- a/test/builtins/builtins5.py
+++ b/test/builtins/builtins5.py
@@ -8,16 +8,19 @@
 
 
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 True          : keyword.illegal.name.python, source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 \             : punctuation.separator.continuation.line.python, source.python
               : source.python
               : source.python
 True          : keyword.illegal.name.python, source.python
 True          : constant.language.python, source.python
 some          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
               : source.python
 True          : keyword.illegal.name.python, source.python
diff --git a/test/calls/call3.py b/test/calls/call3.py
index 3818b51c..3e5bca3d 100644
--- a/test/calls/call3.py
+++ b/test/calls/call3.py
@@ -5,16 +5,16 @@
 
 
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 class         : keyword.control.flow.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 a             : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 and           : keyword.control.flow.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 if            : keyword.control.flow.python, source.python
diff --git a/test/calls/call4.py b/test/calls/call4.py
index 50f561c0..a2976601 100644
--- a/test/calls/call4.py
+++ b/test/calls/call4.py
@@ -5,7 +5,7 @@
 
 
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 1             : source.python
 foo           : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
@@ -19,13 +19,13 @@
 sam           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 None          : keyword.illegal.name.python, source.python
               : source.python
 and           : keyword.operator.logical.python, source.python
               : source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 None          : keyword.illegal.name.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 baz           : source.python
diff --git a/test/calls/call7.py b/test/calls/call7.py
index 87242cc7..b0b00f05 100644
--- a/test/calls/call7.py
+++ b/test/calls/call7.py
@@ -8,7 +8,7 @@
 
 
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __class__     : meta.function-call.python, source.python, support.variable.magic.python
               : meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
@@ -17,7 +17,7 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __class__     : meta.function-call.python, source.python, support.variable.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
@@ -25,7 +25,7 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __add__       : meta.function-call.python, source.python, support.function.magic.python
               : meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
@@ -34,7 +34,7 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __add__       : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
@@ -43,7 +43,7 @@
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __class__     : source.python, support.variable.magic.python
               : source.python
 1             : constant.numeric.dec.python, source.python
diff --git a/test/calls/call8.py b/test/calls/call8.py
index 062a527f..471a64d3 100644
--- a/test/calls/call8.py
+++ b/test/calls/call8.py
@@ -6,7 +6,8 @@
 
 
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 __class__     : meta.function-call.python, source.python, support.variable.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
@@ -14,7 +15,8 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 __class__     : meta.function-call.python, source.python, support.variable.magic.python
               : meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
@@ -23,7 +25,8 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 __add__       : meta.function-call.python, source.python, support.function.magic.python
               : meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
@@ -32,7 +35,8 @@
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 __add__       : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
diff --git a/test/calls/print1.py b/test/calls/print1.py
index 6b1848c5..c5f3e7f7 100644
--- a/test/calls/print1.py
+++ b/test/calls/print1.py
@@ -55,7 +55,7 @@
               : source.python
 >>            : keyword.operator.bitwise.python, source.python
 sys           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 stderr        : source.python
 ,             : punctuation.separator.element.python, source.python
               : source.python
@@ -72,7 +72,7 @@
 file          : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
 =             : keyword.operator.assignment.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 sys           : meta.function-call.arguments.python, meta.function-call.python, source.python
-.             : meta.function-call.arguments.python, meta.function-call.python, source.python
+.             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.period.python, source.python
 stderr        : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
diff --git a/test/classes/class11.py b/test/classes/class11.py
index 6083dc95..bad00706 100644
--- a/test/classes/class11.py
+++ b/test/classes/class11.py
@@ -32,7 +32,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
 self          : source.python, variable.language.special.self.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 a             : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -40,7 +40,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 a             : source.python
               : source.python
 self          : source.python, variable.language.special.self.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 b             : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -57,7 +57,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 self          : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -65,9 +65,9 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 self          : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 bar           : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
diff --git a/test/classes/class12.py b/test/classes/class12.py
index 90e656bf..e8b69161 100644
--- a/test/classes/class12.py
+++ b/test/classes/class12.py
@@ -37,7 +37,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 :             : meta.function.python, punctuation.section.function.begin.python, source.python
               : source.python
 cls           : source.python, variable.language.special.cls.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 a             : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -45,7 +45,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 a             : source.python
               : source.python
 cls           : source.python, variable.language.special.cls.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 b             : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -68,7 +68,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 cls           : source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
@@ -76,9 +76,9 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 1             : constant.numeric.dec.python, source.python
               : source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 cls           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __name__      : source.python, support.variable.magic.python
               : source.python
 cls           : meta.item-access.python, source.python, variable.language.special.cls.python
diff --git a/test/classes/class14.py b/test/classes/class14.py
index 036543ed..706969f9 100644
--- a/test/classes/class14.py
+++ b/test/classes/class14.py
@@ -8,12 +8,12 @@ class         : meta.class.python, source.python, storage.type.class.python
 F             : entity.name.type.class.python, meta.class.python, source.python
 (             : meta.class.inheritance.python, meta.class.python, punctuation.definition.inheritance.begin.python, source.python
 f             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
-.             : meta.class.inheritance.python, meta.class.python, source.python
+.             : meta.class.inheritance.python, meta.class.python, punctuation.separator.period.python, source.python
 Exception     : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
 f             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
-.             : meta.class.inheritance.python, meta.class.python, source.python
+.             : meta.class.inheritance.python, meta.class.python, punctuation.separator.period.python, source.python
 type          : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
@@ -21,7 +21,7 @@ class         : meta.class.python, source.python, storage.type.class.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
 Exception     : meta.class.inheritance.python, meta.class.python, source.python, support.type.exception.python
-.             : meta.class.inheritance.python, meta.class.python, source.python
+.             : meta.class.inheritance.python, meta.class.python, punctuation.separator.period.python, source.python
 a             : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
diff --git a/test/classes/class2.py b/test/classes/class2.py
index bba5e52d..536f9258 100644
--- a/test/classes/class2.py
+++ b/test/classes/class2.py
@@ -14,12 +14,12 @@ class         : meta.class.python, source.python, storage.type.class.python
 Spam          : entity.name.type.class.python, meta.class.python, source.python
 (             : meta.class.inheritance.python, meta.class.python, punctuation.definition.inheritance.begin.python, source.python
 Foo           : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
-.             : meta.class.inheritance.python, meta.class.python, source.python
+.             : meta.class.inheritance.python, meta.class.python, punctuation.separator.period.python, source.python
 Bar           : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 ,             : meta.class.inheritance.python, meta.class.python, punctuation.separator.inheritance.python, source.python
               : meta.class.inheritance.python, meta.class.python, source.python
 Bar           : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
-.             : meta.class.inheritance.python, meta.class.python, source.python
+.             : meta.class.inheritance.python, meta.class.python, punctuation.separator.period.python, source.python
 name          : entity.other.inherited-class.python, meta.class.inheritance.python, meta.class.python, source.python
 =             : keyword.operator.assignment.python, meta.class.inheritance.python, meta.class.python, source.python
 {             : meta.class.inheritance.python, meta.class.python, punctuation.definition.dict.begin.python, source.python
diff --git a/test/classes/super1.py b/test/classes/super1.py
index 5172f365..1840ed9b 100644
--- a/test/classes/super1.py
+++ b/test/classes/super1.py
@@ -30,7 +30,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 super         : meta.function-call.python, source.python, support.type.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
@@ -41,7 +41,8 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 super         : meta.function-call.python, source.python, support.type.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 foo           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
@@ -52,7 +53,8 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 super         : meta.function-call.python, source.python, support.type.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 \             : punctuation.separator.continuation.line.python, source.python
               : source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
@@ -71,7 +73,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
               : source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 bar           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
diff --git a/test/expressions/const1.py b/test/expressions/const1.py
index 8e19a502..e59a19be 100644
--- a/test/expressions/const1.py
+++ b/test/expressions/const1.py
@@ -12,24 +12,24 @@
 PROTOCOL_v2   : constant.other.caps.python, source.python
               : source.python
 QQQ           : constant.other.caps.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 bar           : source.python
               : source.python
 baz           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 AA_a          : constant.other.caps.python, source.python
               : source.python
 _AAA          : constant.other.caps.python, source.python
               : source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 _AAA          : constant.other.caps.python, source.python
 QQQq          : source.python
               : source.python
 QQQq123       : source.python
               : source.python
 self          : source.python, variable.language.special.self.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 FOOO          : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
diff --git a/test/expressions/expr10.py b/test/expressions/expr10.py
index 0a14b7df..501fb475 100644
--- a/test/expressions/expr10.py
+++ b/test/expressions/expr10.py
@@ -32,5 +32,5 @@
 ...           : constant.other.ellipsis.python, source.python
 )             : punctuation.parenthesis.end.python, source.python
 ...           : constant.other.ellipsis.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 __class__     : source.python, support.variable.magic.python
diff --git a/test/expressions/expr11.py b/test/expressions/expr11.py
index 584174eb..142ff621 100644
--- a/test/expressions/expr11.py
+++ b/test/expressions/expr11.py
@@ -7,7 +7,7 @@
 =             : keyword.operator.assignment.python, source.python
               : source.python
 self          : source.python, variable.language.special.self.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 some_list     : meta.item-access.python, source.python
 [             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
 1             : constant.numeric.dec.python, meta.item-access.arguments.python, meta.item-access.python, source.python
diff --git a/test/expressions/expr15.py b/test/expressions/expr15.py
index 80558f9d..2815cdae 100644
--- a/test/expressions/expr15.py
+++ b/test/expressions/expr15.py
@@ -3,5 +3,5 @@
 
 
 foofrom       : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 something     : source.python
diff --git a/test/expressions/expr18.py b/test/expressions/expr18.py
index 41ed45db..8326520f 100644
--- a/test/expressions/expr18.py
+++ b/test/expressions/expr18.py
@@ -4,8 +4,8 @@
 
 
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 Exception     : source.python
 Exception     : source.python, support.type.exception.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 a             : source.python
diff --git a/test/expressions/expr19.py b/test/expressions/expr19.py
index 604b9b84..45dd0e8e 100644
--- a/test/expressions/expr19.py
+++ b/test/expressions/expr19.py
@@ -12,31 +12,37 @@
 
 
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
 foo           : comment.line.number-sign.python, source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
 foo           : comment.line.number-sign.python, source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 \             : punctuation.separator.continuation.line.python, source.python
               : source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
 foo           : comment.line.number-sign.python, source.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
 bar           : source.python, string.quoted.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.docstring.single.python
 bar           : source.python, string.quoted.docstring.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.docstring.single.python
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
+              : source.python
 \             : punctuation.separator.continuation.line.python, source.python
               : source.python
 '             : punctuation.definition.string.begin.python, source.python, string.quoted.single.python
diff --git a/test/expressions/expr7.py b/test/expressions/expr7.py
index eef5c56e..936af9e8 100644
--- a/test/expressions/expr7.py
+++ b/test/expressions/expr7.py
@@ -3,17 +3,17 @@
 
 
 a             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 True          : keyword.illegal.name.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 b             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 False         : keyword.illegal.name.python, source.python
               : source.python
 =             : keyword.operator.assignment.python, source.python
               : source.python
 d             : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 None          : keyword.illegal.name.python, source.python
diff --git a/test/fstrings/comment4.py b/test/fstrings/comment4.py
index 793efc35..f070cdd0 100644
--- a/test/fstrings/comment4.py
+++ b/test/fstrings/comment4.py
@@ -4,7 +4,7 @@
 
 
 self          : source.python, variable.language.special.self.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 assertEqual   : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 f             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.interpolated.python, string.quoted.single.python
diff --git a/test/fstrings/simple2.py b/test/fstrings/simple2.py
index 967bb1f3..48ce0dcd 100644
--- a/test/fstrings/simple2.py
+++ b/test/fstrings/simple2.py
@@ -22,7 +22,7 @@
  normal       : meta.fstring.python, source.python, string.interpolated.python, string.quoted.single.python
 {             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
 fo            : meta.fstring.python, source.python
-.             : meta.fstring.python, source.python
+.             : meta.fstring.python, punctuation.separator.period.python, source.python
 __add__       : meta.fstring.python, source.python, support.function.magic.python
 !s            : meta.fstring.python, source.python, storage.type.format.python
 }             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
diff --git a/test/illegals/illegal1.py b/test/illegals/illegal1.py
index 61c22dce..6010bc4f 100644
--- a/test/illegals/illegal1.py
+++ b/test/illegals/illegal1.py
@@ -28,7 +28,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 .class        : source.python, string.quoted.single.python
 '             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
 )             : punctuation.parenthesis.end.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 fuuuu         : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 baz           : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python
diff --git a/test/regexp/python8.py b/test/regexp/python8.py
index b0080e77..f0babc73 100644
--- a/test/regexp/python8.py
+++ b/test/regexp/python8.py
@@ -30,7 +30,7 @@
 =             : keyword.operator.assignment.python, source.python
               : source.python
 re            : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 compile       : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 r             : meta.function-call.arguments.python, meta.function-call.python, source.python, storage.type.string.python, string.regexp.quoted.multi.python
@@ -187,7 +187,7 @@
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python
 re            : meta.function-call.arguments.python, meta.function-call.python, source.python
-.             : meta.function-call.arguments.python, meta.function-call.python, source.python
+.             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.period.python, source.python
 ASCII         : constant.other.caps.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
                   : source.python
diff --git a/test/statements/import1.py b/test/statements/import1.py
index 1e322e8f..f41b72c5 100644
--- a/test/statements/import1.py
+++ b/test/statements/import1.py
@@ -4,7 +4,8 @@
 
 
 from          : keyword.control.import.python, source.python
- ...          : source.python
+              : source.python
+...           : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
diff --git a/test/statements/import2.py b/test/statements/import2.py
index 18a8049e..842f68d2 100644
--- a/test/statements/import2.py
+++ b/test/statements/import2.py
@@ -5,17 +5,23 @@
 
 
 from          : keyword.control.import.python, source.python
- ....         : source.python
+              : source.python
+....          : punctuation.separator.period.python, source.python
+              : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 a             : source.python
 from          : keyword.control.import.python, source.python
- ...          : source.python
+              : source.python
+...           : punctuation.separator.period.python, source.python
+              : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 b             : source.python
 from          : keyword.control.import.python, source.python
- ..           : source.python
+              : source.python
+..            : punctuation.separator.period.python, source.python
+              : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 c             : source.python
diff --git a/test/statements/import3.py b/test/statements/import3.py
index 79f06128..1952bf59 100644
--- a/test/statements/import3.py
+++ b/test/statements/import3.py
@@ -6,22 +6,22 @@
 
 
 from          : keyword.control.import.python, source.python
-....          : source.python
+....          : punctuation.separator.period.python, source.python
 import        : keyword.control.import.python, source.python
               : source.python
 a             : source.python
 from          : keyword.control.import.python, source.python
-...           : source.python
+...           : punctuation.separator.period.python, source.python
 import        : keyword.control.import.python, source.python
               : source.python
 b             : source.python
 from          : keyword.control.import.python, source.python
-..            : source.python
+..            : punctuation.separator.period.python, source.python
 import        : keyword.control.import.python, source.python
               : source.python
 c             : source.python
 from          : keyword.control.import.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 import        : keyword.control.import.python, source.python
               : source.python
 d             : source.python
diff --git a/test/statements/import4.py b/test/statements/import4.py
index c45b328d..b2cee743 100644
--- a/test/statements/import4.py
+++ b/test/statements/import4.py
@@ -6,28 +6,28 @@
 
 
 from          : keyword.control.import.python, source.python
-....          : source.python
+....          : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 a             : source.python
 from          : keyword.control.import.python, source.python
-...           : source.python
+...           : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 b             : source.python
 from          : keyword.control.import.python, source.python
-..            : source.python
+..            : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 c             : source.python
 from          : keyword.control.import.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
diff --git a/test/statements/import5.py b/test/statements/import5.py
index a805e4d3..2df920d6 100644
--- a/test/statements/import5.py
+++ b/test/statements/import5.py
@@ -11,20 +11,20 @@ def bar():
 
 
 from          : keyword.control.import.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 foo           : source.python
               : source.python
 import        : keyword.control.import.python, source.python
               : source.python
 d             : source.python
 from          : keyword.control.import.python, source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 import        : keyword.control.import.python, source.python
               : source.python
 a             : source.python
               : source.python
 foo           : source.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 import        : keyword.control.flow.python, source.python
               : source.python
 raise         : keyword.control.flow.python, source.python
diff --git a/test/strings/format2.py b/test/strings/format2.py
index e9b0c240..41c1baed 100644
--- a/test/strings/format2.py
+++ b/test/strings/format2.py
@@ -20,7 +20,7 @@
 !s            : constant.character.format.placeholder.other.python, source.python, storage.type.format.python, string.quoted.single.python
 }             : constant.character.format.placeholder.other.python, source.python, string.quoted.single.python
 "             : punctuation.definition.string.end.python, source.python, string.quoted.single.python
-.             : source.python
+.             : punctuation.separator.period.python, source.python
 format        : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 fo            : meta.function-call.arguments.python, meta.function-call.python, source.python, variable.parameter.function-call.python