diff --git a/syntaxes/fsharp.json b/syntaxes/fsharp.json
index bc91e1d..3619946 100644
--- a/syntaxes/fsharp.json
+++ b/syntaxes/fsharp.json
@@ -8,13 +8,13 @@
     "foldingStopMarker": "",
     "patterns": [
         {
-            "include": "#comments"
+            "include": "#compiler_directives"
         },
         {
-            "include": "#constants"
+            "include": "#comments"
         },
         {
-            "include": "#structure"
+            "include": "#constants"
         },
         {
             "include": "#strings"
@@ -29,10 +29,10 @@
             "include": "#definition"
         },
         {
-            "include": "#attributes"
+            "include": "#abstract_definition"
         },
         {
-            "include": "#method_calls"
+            "include": "#attributes"
         },
         {
             "include": "#modules"
@@ -44,11 +44,17 @@
             "include": "#du_declaration"
         },
         {
-            "include": "#keywords"
+            "include": "#record_declaration"
         },
         {
             "include": "#records"
         },
+        {
+            "include": "#strp_inlined"
+        },
+        {
+            "include": "#keywords"
+        },
         {
             "include": "#cexprs"
         },
@@ -57,6 +63,340 @@
         }
     ],
     "repository": {
+        "strp_inlined_body": {
+            "patterns": [
+                {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#anonymous_functions"
+                },
+                {
+                    "match": "(\\^[[:alpha:]0-9'._]+)",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "name": "keyword.fsharp",
+                    "match": "\\b(and|when|or)\\b"
+                },
+                {
+                    "begin": "(\\()",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "end": "(\\))",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#strp_inlined_body"
+                        }
+                    ]
+                },
+                {
+                    "match": "(static member|member)\\s*([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)\\s*(:)",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.fsharp"
+                        },
+                        "2": {
+                            "name": "variable.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    }
+                },
+                {
+                    "include": "#compiler_directives"
+                },
+                {
+                    "include": "#constants"
+                },
+                {
+                    "include": "#strings"
+                },
+                {
+                    "include": "#chars"
+                },
+                {
+                    "include": "#double_tick"
+                },
+                {
+                    "include": "#keywords"
+                },
+                {
+                    "include": "#text"
+                },
+                {
+                    "include": "#definition"
+                },
+                {
+                    "include": "#attributes"
+                },
+                {
+                    "include": "#keywords"
+                },
+                {
+                    "include": "#cexprs"
+                },
+                {
+                    "include": "#text"
+                }
+            ]
+        },
+        "strp_inlined": {
+            "patterns": [
+                {
+                    "begin": "(\\()",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "end": "(\\))",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#strp_inlined_body"
+                        }
+                    ]
+                }
+            ]
+        },
+        "generic_declaration": {
+            "patterns": [
+                {
+                    "comments": "SRTP syntax support",
+                    "begin": "(:)\\s*(\\()\\s*(static member|member)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.fsharp"
+                        }
+                    },
+                    "end": "(\\))",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "begin": "(\\()",
+                            "beginCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "end": "(\\))",
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "include": "#member_declaration"
+                                }
+                            ]
+                        },
+                        {
+                            "match": "(('|\\^)[[:alpha:]0-9'._]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#variables"
+                        },
+                        {
+                            "include": "#keywords"
+                        }
+                    ]
+                },
+                {
+                    "name": "keyword.fsharp",
+                    "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|use|use\\!|struct|while|mutable)(?!')\\b"
+                },
+                {
+                    "name": "keyword.fsharp",
+                    "match": ":"
+                },
+                {
+                    "include": "#constants"
+                },
+                {
+                    "match": "(('|\\^)[[:alpha:]0-9'._]+)",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "(<)",
+                    "end": "(>)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "(('|\\^)[[:alpha:]0-9'._]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#tuple_signature"
+                        },
+                        {
+                            "include": "#generic_declaration"
+                        }
+                    ]
+                },
+                {
+                    "match": "(?!when|and|or\\b)\\b([\\w0-9'`^._]+)",
+                    "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "match": "(\\|)",
+                    "comments": "Prevent captures of `|>` as a keyword when defining custom operator like `<|>`",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    }
+                },
+                {
+                    "include": "#keywords"
+                }
+            ]
+        },
+        "record_signature": {
+            "patterns": [
+                {
+                    "match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "variable.parameter.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "({)",
+                    "end": "(})",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                },
+                                "2": {
+                                    "name": "variable.parameter.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#record_signature"
+                        }
+                    ]
+                },
+                {
+                    "include": "#keywords"
+                }
+            ]
+        },
+        "tuple_signature": {
+            "patterns": [
+                {
+                    "match": "(([?[:alpha:]0-9'`^._ ]+))+",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "(\\()",
+                    "end": "(\\))",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "(([?[:alpha:]0-9'`^._ ]+))+",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#tuple_signature"
+                        }
+                    ]
+                },
+                {
+                    "include": "#keywords"
+                }
+            ]
+        },
         "anonymous_functions": {
             "patterns": [
                 {
@@ -65,15 +405,37 @@
                     "end": "(->)",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.function-definition.fsharp"
+                            "name": "keyword.fsharp"
                         }
                     },
                     "endCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         }
                     },
                     "patterns": [
+                        {
+                            "include": "#comments"
+                        },
+                        {
+                            "begin": "(\\()",
+                            "end": "\\s*(?=(->))",
+                            "beginCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "include": "#member_declaration"
+                                }
+                            ]
+                        },
                         {
                             "include": "#variables"
                         }
@@ -86,7 +448,7 @@
                 {
                     "name": "support.function.attribute.fsharp",
                     "begin": "\\[\\<",
-                    "end": "\\>\\]",
+                    "end": "\\>\\]|\\]",
                     "patterns": [
                         {
                             "include": "$self"
@@ -177,57 +539,346 @@
                 }
             ]
         },
-        "definition": {
+        "abstract_definition": {
+            "name": "abstract.definition.fsharp",
+            "begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)",
+            "end": "\\s*(with)\\b|=|$",
+            "beginCaptures": {
+                "1": {
+                    "name": "keyword.fsharp"
+                },
+                "2": {
+                    "name": "keyword.fsharp"
+                },
+                "3": {
+                    "name": "support.function.attribute.fsharp"
+                },
+                "5": {
+                    "name": "keyword.fsharp"
+                }
+            },
+            "endCaptures": {
+                "1": {
+                    "name": "keyword.fsharp"
+                }
+            },
             "patterns": [
                 {
-                    "name": "binding.fsharp",
-                    "begin": "\\b(val mutable|val|let mutable|let inline|let|member|static member|override|let!|use)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]|(?<=,)\\s)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]|(?<=,)\\s)*)?",
-                    "end": "((``.*``)|(with)\\b|=|$)",
-                    "beginCaptures": {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#common_declaration"
+                },
+                {
+                    "match": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([[:alpha:]0-9'`^._ ]+)){0,1}",
+                    "captures": {
                         "1": {
-                            "name": "keyword.other.binding.fsharp"
+                            "name": "keyword.symbol.fsharp"
                         },
                         "2": {
-                            "name": "keyword.other.function-recursive.fsharp"
+                            "name": "variable.parameter.fsharp"
                         },
-                        "3":{
-                            "name": "support.function.attribute.fsharp"
+                        "3": {
+                            "name": "keyword.symbol.fsharp"
                         },
                         "4": {
-                            "name": "keyword.other.access.fsharp"
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+                    "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "include": "#keywords"
+                }
+            ]
+        },
+        "common_binding_definition": {
+            "patterns": [
+                {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#attributes"
+                },
+                {
+                    "comments": "SRTP syntax support",
+                    "begin": "(:)\\s*(\\()\\s*(static member|member)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
                         },
-                        "5": {
-                            "name": "variable.other.binding.fsharp"
+                        "2": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.fsharp"
                         }
                     },
+                    "end": "(\\))\\s*((?=,)|(?=\\=))",
                     "endCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "(\\^[[:alpha:]0-9'._]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#variables"
+                        },
+                        {
+                            "include": "#keywords"
+                        }
+                    ]
+                },
+                {
+                    "begin": "(:)\\s*(\\()",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
                         },
                         "2": {
-                            "name": "variable.other.binding.fsharp"
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]*)))",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#tuple_signature"
+                        }
+                    ]
+                },
+                {
+                    "begin": "(:)\\s*(\\^[[:alpha:]0-9'._]+)\\s*(when)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
                         },
                         "3": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
+                        }
+                    },
+                    "end": "(?=:)",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
                         }
                     },
                     "patterns": [
                         {
-                            "include": "#variables"
+                            "name": "keyword.fsharp",
+                            "match": "\\b(and|when|or)\\b"
+                        },
+                        {
+                            "comment": "Because we first capture the keywords, we can capture what looks like a word and assume it's an entity definition",
+                            "match": "([[:alpha:]0-9'^._]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "name": "keyword.symbol.fsharp",
+                            "match": "(\\(|\\))"
+                        }
+                    ]
+                },
+                {
+                    "match": "(:)\\s*([?[:alpha:]0-9'`^._ ]+)",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "3": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "(\\*)\\s*(\\()",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))+)",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#tuple_signature"
+                        }
+                    ]
+                },
+                {
+                    "match": "(\\*)(\\s*([?[:alpha:]0-9'`^._ ]+))*",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "(<(?![[:space:]]*\\)))",
+                    "beginComment": "The group (?![[:space:]]*\\) is for protection against overload operator. static member (<)",
+                    "end": "((?<!:)>)",
+                    "endComment": "The group (?<!:) prevent us from stopping on :> when using SRTP synthax",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#generic_declaration"
+                        }
+                    ]
+                },
+                {
+                    "begin": "({)",
+                    "end": "(})",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "include": "#record_signature"
+                        }
+                    ]
+                },
+                {
+                    "include": "#definition"
+                },
+                {
+                    "include": "#variables"
+                },
+                {
+                    "include": "#keywords"
+                }
+            ]
+        },
+        "definition": {
+            "patterns": [
+                {
+                    "name": "binding.fsharp",
+                    "begin": "\\b(let mutable|let inline|let|member val|static member inline|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+                    "end": "\\s*(with\\b|=|\\n+=|(?<=\\=))",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.fsharp"
                         },
+                        "3": {
+                            "name": "support.function.attribute.fsharp"
+                        },
+                        "4": {
+                            "name": "keyword.fsharp"
+                        },
+                        "5": {
+                            "name": "variable.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.fsharp"
+                        }
+                    },
+                    "patterns": [
                         {
-                            "include": "#member_declaration"
+                            "include": "#common_binding_definition"
+                        }
+                    ]
+                },
+                {
+                    "name": "binding.fsharp",
+                    "begin": "\\b(static val mutable|val mutable|val)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+                    "end": "\\n$",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.fsharp"
                         },
+                        "3": {
+                            "name": "support.function.attribute.fsharp"
+                        },
+                        "4": {
+                            "name": "keyword.fsharp"
+                        },
+                        "5": {
+                            "name": "variable.fsharp"
+                        }
+                    },
+                    "patterns": [
                         {
-                            "match": "(:)(\\s*([?[:alpha:]0-9'<>^._ ]+))*",
-                            "captures" : {
-                                "1":  {
-                                    "name": "keyword.other.fsharp"
-                                },
-                                "2": {
-                                    "name": "entity.name.type.fsharp"
-                                }
-                            }
+                            "include": "#common_binding_definition"
                         }
                     ]
                 }
@@ -241,23 +892,26 @@
                     "end": "$|(\\|)",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         }
                     },
                     "endCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.symbol.fsharp"
                         }
                     },
                     "patterns": [
                         {
-                            "match": "([[:alpha:]0-9'`<>^._]+)\\s*(:)\\s*([[:alpha:]0-9'`<>^._]+)",
+                            "include": "#comments"
+                        },
+                        {
+                            "match": "([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)\\s*(:)\\s*([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)",
                             "captures": {
                                 "1": {
                                     "name": "variable.parameter.fsharp"
                                 },
                                 "2": {
-                                    "name": "keyword.other.fsharp"
+                                    "name": "keyword.symbol.fsharp"
                                 },
                                 "3": {
                                     "name": "entity.name.type.fsharp"
@@ -265,17 +919,7 @@
                             }
                         },
                         {
-                            "match": "([[:alpha:]0-9'`<>^._]+)",
-                            "captures": {
-                                "1": {
-                                    "name": "entity.name.type.fsharp"
-                                }
-                            }
-                        },
-                        {
-                            "begin": "\\(",
-                            "end": "\\)",
-                            "match": "([[:alpha:]0-9'`<>^._]+)",
+                            "match": "([[:alpha:]0-9'`^._]+)|``([[:alpha:]0-9'^._ ]+)``",
                             "captures": {
                                 "1": {
                                     "name": "entity.name.type.fsharp"
@@ -292,17 +936,12 @@
         "keywords": {
             "patterns": [
                 {
-                    "name": "keyword.other.fsharp",
-                    "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|use|use\\!|struct|while|mutable)(?!')\\b"
-                },
-                {
-                    "name": "meta.preprocessor.fsharp",
-                    "begin": "^\\s*#\\s*(light)\\b",
-                    "end": "(\\s|$)"
+                    "name": "keyword.fsharp",
+                    "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|property|union|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable)(?!')\\b"
                 },
                 {
-                    "name": "keyword.other.fsharp",
-                    "match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\<\\<)"
+                    "name": "keyword.symbol.fsharp",
+                    "match": "(&&&|\\|\\|\\||\\^\\^\\^|~~~|<<<|>>>|\\|>|\\->|\\<\\-|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)"
                 }
             ]
         },
@@ -311,18 +950,23 @@
                 {
                     "name": "entity.name.section.fsharp",
                     "begin": "\\b(namespace|module)\\s*(public|internal|private)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
-                    "end": "(\\s|$)",
+                    "end": "(\\s?=|\\s|$)",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "2": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "3": {
                             "name": "entity.name.section.fsharp"
                         }
                     },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
                     "patterns": [
                         {
                             "name": "entity.name.section.fsharp",
@@ -344,7 +988,7 @@
                     "end": "(\\s|$)",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "2": {
                             "name": "entity.name.section.fsharp"
@@ -371,7 +1015,7 @@
                     "end": "(\\s|$)",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.namespace-definition.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "2": {
                             "name": "entity.name.type.namespace.fsharp"
@@ -481,10 +1125,10 @@
             "patterns": [
                 {
                     "name": "entity.name.type.format.specifier.fsharp",
-                    "match": "(%0?-?(\\d+)?((a|t)|(\\.\\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o)|(s|b|O)|(\\+?A)))",
+                    "match": "(%0?-?(\\d+)?((a|t)|(\\.\\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o|u)|(s|b|O)|(\\+?A)))",
                     "captures": {
                         "1": {
-                            "name": "keyword.other.format.specifier.fsharp"
+                            "name": "keyword.format.specifier.fsharp"
                         }
                     }
                 }
@@ -497,32 +1141,204 @@
                     "match": "\\(\\)"
                 },
                 {
-                    "name": "variable.parameter.fsharp",
-                    "match": "[[:alpha:]'_]\\w*"
+                    "match": "(\\?{0,1})(``[[:alpha:]0-9'`^:,._ ]+``|[[:alpha:]0-9'`<>^._ ]\\w*)",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "variable.parameter.fsharp"
+                        }
+                    }
+                }
+            ]
+        },
+        "common_declaration": {
+            "patterns": [
+                {
+                    "begin": "\\s*(->)\\s*([[:alpha:]0-9'`^._ ]+)(<)",
+                    "end": "(>)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "([[:alpha:]0-9'`^._ ]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#keywords"
+                        }
+                    ]
+                },
+                {
+                    "match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "begin": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
+                    "end": "(>)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "variable.parameter.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "4": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "5": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    },
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "([[:alpha:]0-9'`^._ ]+)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "include": "#keywords"
+                        }
+                    ]
                 }
             ]
         },
         "member_declaration": {
             "patterns": [
                 {
-                    "begin": "\\(",
-                    "end": "\\)",
+                    "include": "#comments"
+                },
+                {
+                    "include": "#common_declaration"
+                },
+                {
+                    "comments": "SRTP syntax support",
+                    "begin": "(:)\\s*(\\()\\s*(static member|member)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.fsharp"
+                        }
+                    },
+                    "end": "(\\))\\s*((?=,)|(?=\\=))",
+                    "endCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
                     "patterns": [
                         {
-                            "match": "\\?{0,1}([[:alpha:]0-9'`<>^._]+)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'<>^._ ]+)){0,1}",
+                            "begin": "(\\()",
+                            "beginCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "end": "(\\))",
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "include": "#member_declaration"
+                                }
+                            ]
+                        },
+                        {
+                            "match": "(\\^[[:alpha:]0-9'._]+)",
                             "captures": {
                                 "1": {
-                                    "name": "variable.parameter.fsharp"
-                                },
-                                "2": {
-                                    "name": "keyword.other.fsharp"
-                                },
-                                "3": {
                                     "name": "entity.name.type.fsharp"
                                 }
                             }
+                        },
+                        {
+                            "include": "#variables"
+                        },
+                        {
+                            "include": "#keywords"
                         }
                     ]
+                },
+                {
+                    "match": "(\\^[[:alpha:]0-9'._]+)",
+                    "captures": {
+                        "1": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "name": "keyword.fsharp",
+                    "match": "\\b(and|when|or)\\b"
+                },
+                {
+                    "name": "keyword.symbol.fsharp",
+                    "match": "(\\(|\\))"
+                },
+                {
+                    "match": "(\\?{0,1})([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>._ ]+)){0,1}",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "2": {
+                            "name": "variable.parameter.fsharp"
+                        },
+                        "3": {
+                            "name": "keyword.symbol.fsharp"
+                        },
+                        "4": {
+                            "name": "entity.name.type.fsharp"
+                        }
+                    }
+                },
+                {
+                    "include": "#keywords"
                 }
             ]
         },
@@ -549,37 +1365,31 @@
             "patterns": [
                 {
                     "name": "record.fsharp",
-                    "begin": "(type)[\\s]+(private|internal|public)?[\\s]*([[:alpha:]0-9'<>^:,._]+)[\\s]?(private|internal|public)?[\\s]*",
-                    "end": "[\\s]*((with)|((as) ([[:alpha:]0-9']+))|(=)|[\\n=]|(\\(\\)))",
+                    "begin": "\\b(type)[\\s]+(private|internal|public)?\\s*",
+                    "end": "\\s*((with)|((as)\\s+([[:alpha:]0-9']+))|(=)|[\\n=]|(\\(\\)))",
                     "beginCaptures": {
                         "1": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "2": {
-                            "name": "keyword.other.fsharp"
-                        },
-                        "3": {
-                            "name": "entity.name.type.fsharp"
-                        },
-                        "4": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         }
                     },
                     "endCaptures": {
                         "2": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "3": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "4": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         },
                         "5": {
                             "name": "variable.parameter.fsharp"
                         },
                         "6": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.symbol.fsharp"
                         },
                         "7": {
                             "name": "constant.language.unit.fsharp"
@@ -587,7 +1397,202 @@
                     },
                     "patterns": [
                         {
-                            "include": "#member_declaration"
+                            "include": "#comments"
+                        },
+                        {
+                            "include": "#attributes"
+                        },
+                        {
+                            "match": "([[:alpha:]0-9'^._]+|``[[:alpha:]0-9'`^:,._ ]+``)",
+                            "captures": {
+                                "1": {
+                                    "name": "entity.name.type.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "begin": "(<)",
+                            "end": "((?<!:)>)",
+                            "beginCaptures": {
+                                "1": {
+                                    "name": "keyword.fsharp"
+                                }
+                            },
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "match": "(('|\\^)``[[:alpha:]0-9`^:,._ ]+``|('|\\^)[[:alpha:]0-9`^:._]+)",
+                                    "captures": {
+                                        "1": {
+                                            "name": "entity.name.type.fsharp"
+                                        }
+                                    }
+                                },
+                                {
+                                    "name": "keyword.fsharp",
+                                    "match": "\\b(interface|with|abstract|and|when|or|not|struct|equality|comparison|unmanaged|delegate|enum)\\b"
+                                },
+                                {
+                                    "begin": "(\\()",
+                                    "end": "(\\))",
+                                    "beginCaptures": {
+                                        "1": {
+                                            "name": "keyword.symbol.fsharp"
+                                        }
+                                    },
+                                    "endCaptures": {
+                                        "1": {
+                                            "name": "keyword.symbol.fsharp"
+                                        }
+                                    },
+                                    "patterns": [
+                                        {
+                                            "match": "(static member|member|new)",
+                                            "captures": {
+                                                "1": {
+                                                    "name": "keyword.fsharp"
+                                                }
+                                            }
+                                        },
+                                        {
+                                            "include": "#common_binding_definition"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "match": "([\\w0-9'`^._]+)",
+                                    "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
+                                    "captures": {
+                                        "1": {
+                                            "name": "entity.name.type.fsharp"
+                                        }
+                                    }
+                                },
+                                {
+                                    "include": "#keywords"
+                                }
+                            ]
+                        },
+                        {
+                            "match": "\\s*(private|internal|public)",
+                            "captures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                },
+                                "2": {
+                                    "name": "keyword.fsharp"
+                                }
+                            }
+                        },
+                        {
+                            "begin": "(\\()",
+                            "end": "\\s*(?=(=)|[\\n=]|(\\(\\))|(as))",
+                            "beginCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "include": "#member_declaration"
+                                }
+                            ]
+                        },
+                        {
+                            "include": "#keywords"
+                        }
+                    ]
+                }
+            ]
+        },
+        "record_declaration": {
+            "patterns": [
+                {
+                    "begin": "(\\{)",
+                    "beginCaptures": {
+                        "1": {
+                            "name": "keyword.symbol.fsharp"
+                        }
+                    },
+                    "end": "(?<=\\})",
+                    "patterns": [
+                        {
+                            "include": "#comments"
+                        },
+                        {
+                            "begin": "(((mutable)\\s[[:alpha:]]+)|[[:alpha:]0-9'`<>^._]*)\\s*((?<!:):(?!:))\\s*",
+                            "beginCaptures": {
+                                "3": {
+                                    "name": "keyword.fsharp"
+                                },
+                                "4": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "end": "$|(;|\\})",
+                            "endCaptures": {
+                                "1": {
+                                    "name": "keyword.symbol.fsharp"
+                                }
+                            },
+                            "patterns": [
+                                {
+                                    "include": "#comments"
+                                },
+                                {
+                                    "match": "([[:alpha:]0-9'`^_ ]+)",
+                                    "captures": {
+                                        "1": {
+                                            "name": "entity.name.type.fsharp"
+                                        }
+                                    }
+                                },
+                                {
+                                    "include": "#keywords"
+                                }
+                            ]
+                        },
+                        {
+                            "include": "#compiler_directives"
+                        },
+                        {
+                            "include": "#constants"
+                        },
+                        {
+                            "include": "#strings"
+                        },
+                        {
+                            "include": "#chars"
+                        },
+                        {
+                            "include": "#double_tick"
+                        },
+                        {
+                            "include": "#definition"
+                        },
+                        {
+                            "include": "#attributes"
+                        },
+                        {
+                            "include": "#anonymous_functions"
+                        },
+                        {
+                            "include": "#keywords"
+                        },
+                        {
+                            "include": "#cexprs"
+                        },
+                        {
+                            "include": "#text"
                         }
                     ]
                 }
@@ -600,7 +1605,7 @@
                     "match": "\\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\\s*\\{",
                     "captures": {
                         "0": {
-                            "name": "keyword.other.fsharp"
+                            "name": "keyword.fsharp"
                         }
                     }
                 }
@@ -626,6 +1631,15 @@
                     "match": "\\\\"
                 }
             ]
+        },
+        "compiler_directives": {
+            "patterns": [
+                {
+                    "name": "compiler_directive.fsharp",
+                    "match": "\\s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)",
+                    "captures": {}
+                }
+            ]
         }
     }
 }