diff --git a/src/grammar/brightscript.tmLanguage.spec.ts b/src/grammar/brightscript.tmLanguage.spec.ts
index 387f2189b..15688607a 100644
--- a/src/grammar/brightscript.tmLanguage.spec.ts
+++ b/src/grammar/brightscript.tmLanguage.spec.ts
@@ -337,38 +337,142 @@ describe('brightscript.tmlanguage.json', () => {
         `);
     });
 
-    /**
-     * @param test comment 123
-     */
+    describe('interfaces', () => {
+        it('handles comments following interface fields', async () => {
+            await testGrammar(`
+                interface Person
+                    name as string 'this is a comment
+                '                  ^^^^^^^^^^^^^^^^^^ punctuation.definition.comment.brs
+                '           ^^^^^^ storage.type.brs
+                '        ^^ keyword.control.as.brs
+                '   ^^^^ variable.object.property.brs
+
+                    name2 as string
+                '            ^^^^^^ storage.type.brs
+                '         ^^ keyword.control.as.brs
+                '   ^^^^^ variable.object.property.brs
+            `);
+        });
 
-    it('handles comments following interface fields', async () => {
-        await testGrammar(`
-            interface Person
-                name as string 'this is a comment
-               '               ^^^^^^^^^^^^^^^^^^ punctuation.definition.comment.brs
-               '        ^^^^^^ storage.type.brs
-               '     ^^ keyword.control.as.brs
-               '^^ variable.object.property.brs
+        it('handles optional properly in interfaces', async () => {
+            await testGrammar(`
+                interface Person
+                 optional
+                '^^^^^^^^ variable.object.property.brs
+            `);
 
-               name as string
-              '        ^^^^^^ storage.type.brs
-              '     ^^ keyword.control.as.brs
-              '^^ variable.object.property.brs
-        `);
-    });
+            await testGrammar(`
+                interface Person
+                    optional as optional
+                '               ^^^^^^^^ entity.name.type.brs
+                '            ^^ keyword.control.as.brs
+                '   ^^^^^^^^ variable.object.property.brs
+            `);
 
-    it('handles interface function with return type', async () => {
-        await testGrammar(`
-            interface Person
-                sub test() as string 'this is a comment
-               '                      ^^^^^^^^^^^^^^^^^ punctuation.definition.comment.brs
-               '              ^^^^^^ storage.type.brs
-               '           ^^ keyword.control.as.brs
-               '         ^ punctuation.definition.parameters.end.brs
-               '        ^ punctuation.definition.parameters.begin.brs
-               '    ^^^^ entity.name.function.member.brs
-               '^^^ storage.type.function.brs
-        `);
+            await testGrammar(`
+                interface Person
+                    optional optional
+                '            ^^^^^^^^ variable.object.property.brs
+                '   ^^^^^^^^ keyword.other.optional.brs
+            `);
+
+            await testGrammar(`
+                interface Person
+                    optional as string
+                '               ^^^^^^ storage.type.brs
+                '            ^^ keyword.control.as.brs
+                '   ^^^^^^^^ variable.object.property.brs
+            `);
+
+            await testGrammar(`
+                interface Person
+                    optional optional as optional
+                '                        ^^^^^^^^ entity.name.type.brs
+                '                     ^^ keyword.control.as.brs
+                '            ^^^^^^^^ variable.object.property.brs
+                '   ^^^^^^^^ keyword.other.optional.brs
+            `);
+
+            await testGrammar(`
+                interface Person
+                    optional name as string
+                '                    ^^^^^^ storage.type.brs
+                '                 ^^ keyword.control.as.brs
+                '            ^^^^ variable.object.property.brs
+                '   ^^^^^^^^ keyword.other.optional.brs
+            `);
+        });
+
+        it('colors class declaration property', async () => {
+            await testGrammar(`
+                 class Person
+                '      ^^^^^^ entity.name.type.class.brs
+                '^^^^^ storage.type.class.brs
+                 end class
+                '^^^^^^^^^ storage.type.class.brs
+            `);
+
+            await testGrammar(`
+                 class Person extends
+                '             ^^^^^^^ storage.modifier.brs
+                '      ^^^^^^ entity.name.type.class.brs
+                '^^^^^ storage.type.class.brs
+                 end class
+                '^^^^^^^^^ storage.type.class.brs
+            `);
+
+            await testGrammar(`
+                  class Person extends Alpha
+                 '                     ^^^^^ entity.other.inherited-class.brs
+                 '             ^^^^^^^ storage.modifier.brs
+                 '      ^^^^^^ entity.name.type.class.brs
+                 '^^^^^ storage.type.class.brs
+                 end class
+                '^^^^^^^^^ storage.type.class.brs
+            `);
+
+            await testGrammar(`
+                  class Person extends Alpha.Beta
+                 '                     ^^^^^^^^^^ entity.other.inherited-class.brs
+                 '             ^^^^^^^ storage.modifier.brs
+                 '      ^^^^^^ entity.name.type.class.brs
+                 '^^^^^ storage.type.class.brs
+                 end class
+                '^^^^^^^^^ storage.type.class.brs
+            `);
+        });
+
+        it('supports optional in class field', async () => {
+            await testGrammar(`
+                 class Person extends Alpha.Beta
+                    optional name
+                '            ^^^^ variable.object.property.brs
+                '   ^^^^^^^^ keyword.other.optional.brs
+                 end class
+            `);
+            await testGrammar(`
+                 class Person extends Alpha.Beta
+                    public optional name
+                '                   ^^^^ variable.object.property.brs
+                '          ^^^^^^^^ keyword.other.optional.brs
+                '   ^^^^^^ storage.modifier.brs
+                 end class
+            `);
+        });
+
+        it('handles interface function with return type', async () => {
+            await testGrammar(`
+                interface Person
+                    sub test() as string 'this is a comment
+                '                         ^^^^^^^^^^^^^^^^^ punctuation.definition.comment.brs
+                '                 ^^^^^^ storage.type.brs
+                '              ^^ keyword.control.as.brs
+                '            ^ punctuation.definition.parameters.end.brs
+                '           ^ punctuation.definition.parameters.begin.brs
+                '       ^^^^ entity.name.function.member.brs
+                '   ^^^ storage.type.function.brs
+            `);
+        });
     });
 
     describe('bsdoc', () => {
@@ -875,6 +979,619 @@ describe('brightscript.tmlanguage.json', () => {
         `);
     });
 
+    it(`handles interface field declarations`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 value
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations1`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 value as
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations2`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations3`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations4`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional value
+                '         ^^^^^ variable.object.property.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations5`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional value as
+                '               ^^ keyword.control.as.brs
+                '         ^^^^^ variable.object.property.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations6`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional value as Dynamic
+                '                  ^^^^^^^ storage.type.brs
+                '               ^^ keyword.control.as.brs
+                '         ^^^^^ variable.object.property.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations7`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations8`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional value
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations9`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional value as
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations10`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional value as Dynamic
+                '                           ^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations11`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations12`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public value
+                '       ^^^^^ variable.object.property.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations13`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public value as
+                '             ^^ keyword.control.as.brs
+                '       ^^^^^ variable.object.property.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations14`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public value as Dynamic
+                '                ^^^^^^^ storage.type.brs
+                '             ^^ keyword.control.as.brs
+                '       ^^^^^ variable.object.property.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations15`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations16`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional value
+                '                ^^^^^ variable.object.property.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations17`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional value as
+                '                      ^^ keyword.control.as.brs
+                '                ^^^^^ variable.object.property.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations18`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional value as Dynamic
+                '                         ^^^^^^^ storage.type.brs
+                '                      ^^ keyword.control.as.brs
+                '                ^^^^^ variable.object.property.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations19`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional optional
+                '                ^^^^^^^^ keyword.other.optional.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations20`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional optional as
+                '                         ^^ keyword.control.as.brs
+                '                ^^^^^^^^ keyword.other.optional.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations21`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional optional as Dynamic
+                '                            ^^^^^^^ storage.type.brs
+                '                         ^^ keyword.control.as.brs
+                '                ^^^^^^^^ keyword.other.optional.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations22`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 private optional
+                '        ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations23`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 private optional optional
+                '                 ^^^^^^^^ keyword.other.optional.brs
+                '        ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations24`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 private optional optional as
+                '                          ^^ keyword.control.as.brs
+                '                 ^^^^^^^^ keyword.other.optional.brs
+                '        ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations25`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 private optional optional as Dynamic
+                '                             ^^^^^^^ storage.type.brs
+                '                          ^^ keyword.control.as.brs
+                '                 ^^^^^^^^ keyword.other.optional.brs
+                '        ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations26`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations27`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations28`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '        ^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations29`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '        ^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '        ^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations30`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations31`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+                 optional optional value as Dynamic
+                '                           ^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations32`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public optional as Dynamic
+                '                   ^^^^^^^ storage.type.brs
+                '                ^^ keyword.control.as.brs
+                '       ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^ storage.modifier.brs
+                 optional optional value as Dynamic
+                '                           ^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations33`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations34`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+                 value as Dynamic
+                '         ^^^^^^^ storage.type.brs
+                '      ^^ keyword.control.as.brs
+                '^^^^^ variable.object.property.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations35`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional value as Dynamic
+                '                           ^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+                 optional optional value as Optional
+                '                           ^^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations36`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 optional optional value as Dynamic
+                '                           ^^^^^^^ storage.type.brs
+                '                        ^^ keyword.control.as.brs
+                '                  ^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+                 optional optional optional as Optional
+                '                              ^^^^^^^^ storage.type.brs
+                '                           ^^ keyword.control.as.brs
+                '                  ^^^^^^^^ variable.object.property.brs
+                '         ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
+    it(`handles interface field declarations37`, async () => {
+        await testGrammar(`
+             interface UI
+            '          ^^ entity.name.type.interface.brs
+            '^^^^^^^^^ storage.type.interface.brs
+                 public public public as Public
+                '                        ^^^^^^ storage.type.brs
+                '                     ^^ keyword.control.as.brs
+                '              ^^^^^^ variable.object.property.brs
+                '       ^^^^^^ keyword.other.optional.brs
+                '^^^^^^ keyword.other.optional.brs
+                optional optional optional as Public
+                '                             ^^^^^^^^ storage.type.brs
+                '                          ^^ keyword.control.as.brs
+                '                 ^^^^^^^^ variable.object.property.brs
+                '        ^^^^^^^^ keyword.other.optional.brs
+                '^^^^^^^ keyword.other.optional.brs
+             end interface
+            '^^^^^^^^^^^^^ storage.type.interface.brs
+        `);
+    });
+
     it('handles named public/protected/private function declarations', async () => {
         await testGrammar(`
              public sub write()
@@ -1419,4 +2136,5 @@ async function testGrammar(testCaseText: string) {
         const text = getErrorResultText('test.brs', testCase, result);
         throw new Error(`\nFound ${result.length} issues with grammar:\n${text}`);
     }
+    const thing = {};
 }
diff --git a/syntaxes/brightscript.tmLanguage.json b/syntaxes/brightscript.tmLanguage.json
index 905f5d640..054f828a5 100644
--- a/syntaxes/brightscript.tmLanguage.json
+++ b/syntaxes/brightscript.tmLanguage.json
@@ -52,18 +52,12 @@
                 {
                     "include": "#end_namespace"
                 },
-                {
-                    "include": "#method"
-                },
                 {
                     "include": "#field"
                 },
                 {
                     "include": "#class_declaration"
                 },
-                {
-                    "include": "#end_class"
-                },
                 {
                     "include": "#preprocessor_keywords"
                 },
@@ -103,6 +97,9 @@
                 {
                     "include": "#primitive_literal_expression"
                 },
+                {
+                    "include": "#function_container"
+                },
                 {
                     "include": "#function_declaration"
                 },
@@ -476,10 +473,11 @@
             ]
         },
         "class_declaration": {
-            "match": "(?i:(class)\\s+([a-z0-9_]+)(?:\\s+(extends)(?:\\s+([a-z0-9_]+))?)?)",
-            "captures": {
+            "name": "meta.class.brs",
+            "begin": "(?i)^[ \\t]*(class)[ \\t]+([a-z0-9_]+)(?:[ \\t]+(extends)(?:[ \\t]+([a-z0-9_.]+))?)?\\s*",
+            "beginCaptures": {
                 "1": {
-                    "name": "keyword.other.class.brs"
+                    "name": "storage.type.class.brs"
                 },
                 "2": {
                     "name": "entity.name.type.class.brs"
@@ -488,11 +486,29 @@
                     "name": "storage.modifier.brs"
                 },
                 "4": {
-                    "name": "entity.name.type.class.brs"
+                    "name": "entity.other.inherited-class.brs"
                 }
-            }
+            },
+            "end": "(?i)(?<![_[:alnum:]])(?<!\\.)\\s*(end\\s*class)",
+            "endCaptures": {
+                "1": {
+                    "name": "storage.type.class.brs"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#class_or_interface_field"
+                },
+                {
+                    "include": "#method"
+                },
+                {
+                    "include": "#entire_language"
+                }
+            ]
         },
         "method": {
+            "match": "(?i:)(?:(public|protected|private)\\s+)?(?:(override)\\s+)?((?:sub|function)[^\\w])(?:\\s+([a-z_][a-z0-9_]*))?",
             "captures": {
                 "1": {
                     "name": "storage.modifier.brs"
@@ -501,16 +517,15 @@
                     "name": "storage.modifier.brs"
                 },
                 "3": {
-                    "name": "keyword.declaration.function.brs"
+                    "name": "keyword.declaration.function.brs method"
                 },
                 "4": {
                     "name": "entity.name.function.brs"
                 }
-            },
-            "match": "(?i:(?:(public|protected|private)\\s+)?(?:(override)\\s+)?((?:sub|function))(?:\\s+(?:\\(|([a-z_][a-z0-9_]*))))"
+            }
         },
         "field": {
-            "match": "(?i:(public|protected|private)\\s+([a-z0-9_]+))",
+            "match": "(?i)(public|protected|private)\\s+([a-z0-9_]+)",
             "captures": {
                 "1": {
                     "name": "storage.modifier.brs"
@@ -520,10 +535,6 @@
                 }
             }
         },
-        "end_class": {
-            "match": "(?i:\\s*(end\\s*class))",
-            "name": "storage.type.class.brs"
-        },
         "preprocessor_keywords": {
             "patterns": [
                 {
@@ -708,7 +719,7 @@
         "function_call": {
             "captures": {
                 "1": {
-                    "name": "entity.name.function.brs"
+                    "name": "entity.name.function.brs call"
                 }
             },
             "match": "(?i:\\b([a-z_][a-z0-9_]*)[ \\t]*(?=\\())"
@@ -722,7 +733,7 @@
                     "name": "storage.modifier.brs"
                 },
                 "3": {
-                    "name": "keyword.declaration.function.brs"
+                    "name": "keyword.declaration.function.brs function_declaration"
                 },
                 "4": {
                     "name": "entity.name.function.brs"
@@ -730,20 +741,42 @@
             },
             "match": "(?i:(?:(public|protected|private)\\s+)?(?:(override)\\s+)?((?:sub|function))(?:\\s+(?:\\(|([a-z_][a-z0-9_]*))))"
         },
+        "function_container": {
+            "name": "meta.function.brs function_container",
+            "begin": "(?i)[ \\t]*\\b(?=function|sub)[ \\t]*\\b",
+            "beginCaptures": {},
+            "patterns": [
+                {
+                    "include": "#function_declaration"
+                },
+                {
+                    "include": "#inline_function_declaration"
+                },
+                {
+                    "include": "#entire_language"
+                }
+            ],
+            "end": "(?i)[ \\t]*(end[ \\t]*(sub|function))\\b",
+            "endCaptures": {
+                "1": {
+                    "name": "keyword.declaration.function.brs"
+                }
+            }
+        },
         "end_function": {
             "name": "keyword.declaration.function.brs",
-            "match": "(?i)[ \\t]*end\\s*(sub|function)"
+            "match": "(?i)[ \\t]*(end[ \\t]*(sub|function))"
         },
         "inline_function_declaration": {
             "captures": {
                 "1": {
-                    "name": "keyword.declaration.function.brs"
+                    "name": "keyword.declaration.function.brs inline_function_declaration"
                 },
                 "2": {
-                    "name": "keyword.declaration.function.brs"
+                    "name": "keyword.declaration.function.brs inline_function_declaration"
                 }
             },
-            "match": "(?i)[^a-z0-9_\"](function|sub)\\s*\\("
+            "match": "(?i)[^a-z0-9_\"](function|sub)[ \\t]*\\("
         },
         "interface_declaration": {
             "name": "meta.interface.brs",
@@ -767,7 +800,7 @@
                     "include": "#interface_function"
                 },
                 {
-                    "include": "#interface_field"
+                    "include": "#class_or_interface_field"
                 }
             ],
             "end": "(?i)[\\s\\t]*(end[\\s\\t]*interface)",
@@ -777,19 +810,26 @@
                 }
             }
         },
-        "interface_field": {
-            "begin": "(?i)\\s*\\b([a-z0-9_]+)(?:[\\s\\t]*(as))?",
+        "class_or_interface_field": {
+            "__regex101": "https://regex101.com/r/vQxNAE/2",
+            "begin": "(?i)\\s*\\b(?:(public|protected|private)[ \\t]+(?!as))?(?:(optional)[ \\t]+(?!as))?([a-z0-9_]+)",
             "beginCaptures": {
                 "1": {
-                    "name": "variable.object.property.brs"
+                    "name": "storage.modifier.brs"
                 },
                 "2": {
-                    "name": "keyword.control.as.brs"
+                    "name": "keyword.other.optional.brs"
+                },
+                "3": {
+                    "name": "variable.object.property.brs"
                 }
             },
             "patterns": [
                 {
-                    "include": "#type_expression"
+                    "include": "#field_type_declaration"
+                },
+                {
+                    "include": "#field_initializer"
                 },
                 {
                     "include": "#comment"
@@ -797,6 +837,54 @@
             ],
             "end": "\r?\n"
         },
+        "field_type_declaration": {
+            "begin": "(?i)(?:[ \\t]*(as))",
+            "beginCaptures": {
+                "1": {
+                    "name": "keyword.control.as.brs"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#field_initializer"
+                },
+                {
+                    "include": "#type_expression"
+                }
+            ],
+            "end": "(?=\r?\n)"
+        },
+        "field_initializer": {
+            "begin": "[ \\t]*(=)[ \\t]*",
+            "beginCaptures": {
+                "1": {
+                    "name": "keyword.control.as.brs"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#function_container"
+                },
+                {
+                    "include": "#entire_language"
+                }
+            ],
+            "end": "(?i)(?:(\\))|(\\])|(})(end[ \\t]function))",
+            "endCaptures": {
+                "1": {
+                    "name": "meta.brace.round.brs"
+                },
+                "2": {
+                    "name": "meta.brace.square.brs"
+                },
+                "3": {
+                    "name": "meta.objectliteral.brs"
+                },
+                "4": {
+                    "name": "keyword.declaration.function.source.brs"
+                }
+            }
+        },
         "interface_function": {
             "patterns": [
                 {
@@ -811,7 +899,7 @@
             "match": "(?i:\\s*\\b(function|sub)[\\s\\t]+([a-z0-9_]+)(\\())(\\))[\\s\\t]",
             "captures": {
                 "1": {
-                    "name": "storage.type.function.brs"
+                    "name": "storage.type.function.brs interface_function_plain"
                 },
                 "2": {
                     "name": "entity.name.function.member.brs"
@@ -831,7 +919,7 @@
             "begin": "(?i:\\s*\\b(function|sub)[\\s\\t]+([a-z0-9_]+)(\\()).*?(\\))[\\s\\t]+(as)",
             "beginCaptures": {
                 "1": {
-                    "name": "storage.type.function.brs"
+                    "name": "storage.type.function.brs interface_function_with_return_type"
                 },
                 "2": {
                     "name": "entity.name.function.member.brs"
@@ -902,7 +990,7 @@
         "type_expression": {
             "patterns": [
                 {
-                    "match": "(?i)(boolean|integer|longinteger|float|double|string)",
+                    "match": "(?i)\\b(boolean|integer|longinteger|float|double|string|dynamic)\\b",
                     "captures": {
                         "1": {
                             "name": "storage.type.brs"
@@ -910,10 +998,10 @@
                     }
                 },
                 {
-                    "match": "(?i)\\b([a-z0-9_]+)",
+                    "match": "(?i)\\b([a-z0-9_]+)\\b",
                     "captures": {
                         "1": {
-                            "name": "support.type.brs entity.name.type.brs"
+                            "name": "support.type.brs entity.name.type.brs bob"
                         }
                     }
                 }