diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 2e73f348..83abb6a0 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2036,12 +2036,23 @@ JSON:
   searchable: false
   extensions:
   - ".json"
+  - ".avsc"
   - ".geojson"
+  - ".gltf"
   - ".JSON-tmLanguage"
+  - ".jsonl"
+  - ".tfstate"
+  - ".tfstate.backup"
   - ".topojson"
+  - ".webapp"
+  - ".webmanifest"
   filenames:
   - ".arcconfig"
+  - ".htmlhintrc"
+  - ".jscsrc"
   - ".jshintrc"
+  - ".tern-config"
+  - ".tern-project"
   - composer.lock
   - mcmod.info
   language_id: 174
@@ -2051,6 +2062,7 @@ JSON5:
   - ".json5"
   filenames:
   - ".babelrc"
+  - ".jslintrc"
   tm_scope: source.js
   ace_mode: javascript
   codemirror_mode: javascript
diff --git a/samples/JSON/Material_Alpha_01.gltf b/samples/JSON/Material_Alpha_01.gltf
new file mode 100644
index 00000000..677f8fa0
--- /dev/null
+++ b/samples/JSON/Material_Alpha_01.gltf
@@ -0,0 +1,136 @@
+{
+	"accessors": [
+		{
+			"bufferView": 0,
+			"componentType": 5126,
+			"count": 4,
+			"type": "VEC3",
+			"max": [
+				0.5,
+				0.5,
+				0.0
+			],
+			"min": [
+				-0.5,
+				-0.5,
+				0.0
+			],
+			"name": "Positions Accessor"
+		},
+		{
+			"bufferView": 1,
+			"componentType": 5126,
+			"count": 4,
+			"type": "VEC4",
+			"name": "Colors Accessor"
+		},
+		{
+			"bufferView": 2,
+			"componentType": 5126,
+			"count": 4,
+			"type": "VEC2",
+			"name": "UV Accessor 0"
+		},
+		{
+			"bufferView": 3,
+			"componentType": 5125,
+			"count": 6,
+			"type": "SCALAR",
+			"name": "Indices Accessor"
+		}
+	],
+	"asset": {
+		"generator": "glTF Asset Generator",
+		"version": "2.0",
+		"extras": {
+			"Attributes": "VertexColor_Vector4_Float - AlphaMode_Mask - AlphaCutoff - DoubleSided - BaseColorFactor - BaseColorTexture"
+		}
+	},
+	"buffers": [
+		{
+			"uri": "Material_Alpha_01.bin",
+			"byteLength": 168
+		}
+	],
+	"bufferViews": [
+		{
+			"buffer": 0,
+			"byteLength": 48,
+			"name": "Positions"
+		},
+		{
+			"buffer": 0,
+			"byteOffset": 48,
+			"byteLength": 64,
+			"name": "Colors"
+		},
+		{
+			"buffer": 0,
+			"byteOffset": 112,
+			"byteLength": 32,
+			"name": "Texture Coords 0"
+		},
+		{
+			"buffer": 0,
+			"byteOffset": 144,
+			"byteLength": 24,
+			"name": "Indices"
+		}
+	],
+	"images": [
+		{
+			"uri": "Texture_baseColor.png"
+		}
+	],
+	"materials": [
+		{
+			"pbrMetallicRoughness": {
+				"baseColorFactor": [
+					1.0,
+					1.0,
+					1.0,
+					0.6
+				],
+				"baseColorTexture": {
+					"index": 0
+				}
+			},
+			"alphaMode": "MASK",
+			"alphaCutoff": 0.7,
+			"doubleSided": true
+		}
+	],
+	"meshes": [
+		{
+			"primitives": [
+				{
+					"attributes": {
+						"POSITION": 0,
+						"COLOR_0": 1,
+						"TEXCOORD_0": 2
+					},
+					"indices": 3,
+					"material": 0
+				}
+			]
+		}
+	],
+	"nodes": [
+		{
+			"mesh": 0
+		}
+	],
+	"scene": 0,
+	"scenes": [
+		{
+			"nodes": [
+				0
+			]
+		}
+	],
+	"textures": [
+		{
+			"source": 0
+		}
+	]
+}
\ No newline at end of file
diff --git a/samples/JSON/filenames/.htmlhintrc b/samples/JSON/filenames/.htmlhintrc
new file mode 100644
index 00000000..2a9cc05b
--- /dev/null
+++ b/samples/JSON/filenames/.htmlhintrc
@@ -0,0 +1,25 @@
+{
+	"alt-require": true,
+	"attr-lowercase": true,
+	"attr-no-duplication": true,
+	"attr-unsafe-chars": true,
+	"attr-value-double-quotes": true,
+	"attr-value-not-empty": false,
+	"doctype-first": true,
+	"doctype-html5": true,
+	"head-script-disabled": false,
+	"href-abs-or-rel": false,
+	"id-class-ad-disabled": true,
+	"id-class-value": false,
+	"id-unique": true,
+	"inline-script-disabled": true,
+	"inline-style-disabled": true,
+	"space-tab-mixed-disabled": "space",
+	"spec-char-escape": true,
+	"src-not-empty": true,
+	"style-disabled": false,
+	"tag-pair": true,
+	"tag-self-close": false,
+	"tagname-lowercase": true,
+	"title-require": true
+}
diff --git a/samples/JSON/filenames/.jscsrc b/samples/JSON/filenames/.jscsrc
new file mode 100644
index 00000000..3620ac27
--- /dev/null
+++ b/samples/JSON/filenames/.jscsrc
@@ -0,0 +1,88 @@
+{
+	"requireCurlyBraces": [
+		"if",
+		"else",
+		"for",
+		"while",
+		"do",
+		"try",
+		"catch"
+	],
+	"requireSpaceAfterKeywords": [
+		"if",
+		"else",
+		"for",
+		"while",
+		"do",
+		"switch",
+		"case",
+		"return",
+		"try",
+		"catch",
+		"typeof"
+	],
+	"requireSpaceBeforeBlockStatements": true,
+	"requireParenthesesAroundIIFE": true,
+	"requireSpacesInConditionalExpression": true,
+	"disallowSpacesInNamedFunctionExpression": {
+		"beforeOpeningRoundBrace": true
+	},
+	"disallowSpacesInFunctionDeclaration": {
+		"beforeOpeningRoundBrace": true
+	},
+	"requireSpaceBetweenArguments": true,
+	"requireBlocksOnNewline": true,
+	"disallowEmptyBlocks": true,
+	"disallowSpacesInsideArrayBrackets": true,
+	"disallowSpacesInsideParentheses": true,
+	"disallowDanglingUnderscores": true,
+	"requireCommaBeforeLineBreak": true,
+	"disallowSpacesInCallExpression": true,
+	"disallowSpaceAfterPrefixUnaryOperators": true,
+	"disallowSpaceBeforePostfixUnaryOperators": true,
+	"disallowSpaceBeforeBinaryOperators": [
+		","
+	],
+	"requireSpacesInForStatement": true,
+	"requireSpaceBeforeBinaryOperators": true,
+	"requireSpaceAfterBinaryOperators": true,
+	"disallowKeywords": [
+		"with"
+	],
+	"disallowMixedSpacesAndTabs": true,
+	"disallowTrailingWhitespace": true,
+	"disallowKeywordsOnNewLine": [
+		"else"
+	],
+	"requireLineFeedAtFileEnd": true,
+	"requireCapitalizedConstructors": true,
+	"requireDotNotation": true,
+	"disallowNewlineBeforeBlockStatements": true,
+	"disallowMultipleLineStrings": true,
+	"requireSpaceBeforeObjectValues": true,
+	"validateQuoteMarks": "'",
+	"requireSpaceAfterLineComment": true,
+	"validateIndentation": 2,
+	"validateLineBreaks": "LF",
+	"disallowSpacesInFunction": {
+		"beforeOpeningRoundBrace": true
+	},
+	"requireSpacesInFunction": {
+		"beforeOpeningCurlyBrace": true
+	},
+	"disallowMultipleLineBreaks": true,
+	"disallowYodaConditions": true,
+	"disallowFunctionDeclarations": true,
+	"disallowMultipleVarDecl": "exceptUndefined",
+	"requirePaddingNewlinesBeforeKeywords": [
+		"do",
+		"for",
+		"if",
+		"switch",
+		"try",
+		"void",
+		"while",
+		"return"
+	],
+	"excludeFiles": ["**/node_modules/**", "**/min/**", "**/*.min.js"]
+}
diff --git a/samples/JSON/filenames/.tern-config b/samples/JSON/filenames/.tern-config
new file mode 100644
index 00000000..4ab18942
--- /dev/null
+++ b/samples/JSON/filenames/.tern-config
@@ -0,0 +1,19 @@
+{
+	"ecmaVersion": 6,
+	"libs": [
+		"browser",
+		"jquery"
+	],
+	"dontLoad": [
+		"node_modules/**"
+	],
+	"plugins": {
+		"es_modules": {},
+		"node": {},
+		"angular": {},
+		"doc_comment": {
+			"fullDocs": true,
+			"strong": true
+		}
+	}
+}
diff --git a/samples/JSON/filenames/.tern-project b/samples/JSON/filenames/.tern-project
new file mode 100644
index 00000000..e5b0338c
--- /dev/null
+++ b/samples/JSON/filenames/.tern-project
@@ -0,0 +1,15 @@
+{
+	"ecmaVersion": 6,
+	"libs": [],
+	"loadEagerly": [
+		"src/app/**/*.js"
+	],
+	"dontLoad": [
+		"node_modules"
+	],
+	"plugins": {
+		"requirejs": {
+			"baseURL": "src"
+		}
+	}
+}
diff --git a/samples/JSON/http_response.avsc b/samples/JSON/http_response.avsc
new file mode 100644
index 00000000..10389351
--- /dev/null
+++ b/samples/JSON/http_response.avsc
@@ -0,0 +1,18 @@
+{
+    "type": "record",
+    "name": "Response",
+    "namespace": "org.rflow.message.data.http",
+    "aliases": [],
+    "fields": [
+        {"name": "client_ip",    "type": ["string", "null"]},
+        {"name": "client_port",  "type": ["int", "null"]},
+        {"name": "server_ip",    "type": ["string", "null"]},
+        {"name": "server_port",  "type": ["int", "null"]},
+
+        {"name": "protocol",             "type": "string"},
+        {"name": "status_code",          "type": "int"},
+        {"name": "status_reason_phrase", "type": "string"},
+        {"name": "headers",              "type": {"type": "map", "values": "string"}},
+        {"name": "content",              "type": "bytes"}
+    ]
+}
diff --git a/samples/JSON/manifest.webapp b/samples/JSON/manifest.webapp
new file mode 100644
index 00000000..a347133c
--- /dev/null
+++ b/samples/JSON/manifest.webapp
@@ -0,0 +1,19 @@
+{
+	"version": "1.0",
+	"name": "demo",
+	"description": "demo",
+	"launch_path": "/index.html",
+	"icons": {
+		"128": "/res/icon.png"
+	},
+	"developer": {
+		"name": "Cocos2d-html5",
+		"url": "http://cocos2d-x.org/"
+	},
+	"default_locale": "en",
+	"installs_allowed_from": [
+		"*"
+	],
+	"orientation": "portrait-primary",
+	"fullscreen": "true"
+}
diff --git a/samples/JSON/manifest.webmanifest b/samples/JSON/manifest.webmanifest
new file mode 100644
index 00000000..cfe96256
--- /dev/null
+++ b/samples/JSON/manifest.webmanifest
@@ -0,0 +1,56 @@
+{
+	"short_name": "CC Splitter",
+	"name": "Credit Card Splitter",
+	"start_url": "./index.html",
+	"display": "standalone",
+	"theme_color": "#000000",
+	"background_color": "#ffffff",
+	"lang": "en-GB",
+	"icons": [
+		{
+			"src": "logo-16.png",
+			"sizes": "16x16",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-36.png",
+			"sizes": "36x36",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-48.png",
+			"sizes": "48x48",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-72.png",
+			"sizes": "72x72",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-96.png",
+			"sizes": "96x96",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-144.png",
+			"sizes": "144x144",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-192.png",
+			"sizes": "192x192",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-250.png",
+			"sizes": "250x250",
+			"type": "image/png"
+		},
+		{
+			"src": "logo-512.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		}
+	]
+}
diff --git a/samples/JSON/small.tfstate b/samples/JSON/small.tfstate
new file mode 100644
index 00000000..86d80f76
--- /dev/null
+++ b/samples/JSON/small.tfstate
@@ -0,0 +1,122 @@
+{
+		"version": 1,
+		"serial": 12,
+		"modules": [
+				{
+						"path": [
+								"root"
+						],
+						"outputs": {
+								"public_az1_subnet_id": "subnet-d658bba0",
+								"region": "us-west-2",
+								"vpc_cidr": "10.201.0.0/16",
+								"vpc_id": "vpc-65814701"
+						},
+						"resources": {
+								"aws_key_pair.onprem": {
+										"type": "aws_key_pair",
+										"primary": {
+												"id": "onprem",
+												"attributes": {
+														"id": "onprem",
+														"key_name": "onprem",
+														"public_key": "foo"
+												},
+												"meta": {
+														"schema_version": "1"
+												}
+										}
+								}
+						}
+				},
+				{
+						"path": [
+								"root",
+								"bootstrap"
+						],
+						"outputs": {
+								"consul_bootstrap_dns": "consul.bootstrap"
+						},
+						"resources": {
+								"aws_route53_record.oasis-consul-bootstrap-a": {
+										"type": "aws_route53_record",
+										"depends_on": [
+												"aws_route53_zone.oasis-consul-bootstrap"
+										],
+										"primary": {
+												"id": "Z68734P5178QN_consul.bootstrap_A",
+												"attributes": {
+														"failover": "",
+														"fqdn": "consul.bootstrap",
+														"health_check_id": "",
+														"id": "Z68734P5178QN_consul.bootstrap_A",
+														"name": "consul.bootstrap",
+														"records.#": "6",
+														"records.1148461392": "10.201.3.8",
+														"records.1169574759": "10.201.2.8",
+														"records.1206973758": "10.201.1.8",
+														"records.1275070284": "10.201.2.4",
+														"records.1304587643": "10.201.3.4",
+														"records.1313257749": "10.201.1.4",
+														"set_identifier": "",
+														"ttl": "300",
+														"type": "A",
+														"weight": "-1",
+														"zone_id": "Z68734P5178QN"
+												}
+										}
+								},
+								"aws_route53_record.oasis-consul-bootstrap-ns": {
+										"type": "aws_route53_record",
+										"depends_on": [
+												"aws_route53_zone.oasis-consul-bootstrap",
+												"aws_route53_zone.oasis-consul-bootstrap",
+												"aws_route53_zone.oasis-consul-bootstrap",
+												"aws_route53_zone.oasis-consul-bootstrap",
+												"aws_route53_zone.oasis-consul-bootstrap"
+										],
+										"primary": {
+												"id": "Z68734P5178QN_consul.bootstrap_NS",
+												"attributes": {
+														"failover": "",
+														"fqdn": "consul.bootstrap",
+														"health_check_id": "",
+														"id": "Z68734P5178QN_consul.bootstrap_NS",
+														"name": "consul.bootstrap",
+														"records.#": "4",
+														"records.1796532126": "ns-512.awsdns-00.net.",
+														"records.2728059479": "ns-1536.awsdns-00.co.uk.",
+														"records.4092160370": "ns-1024.awsdns-00.org.",
+														"records.456007465": "ns-0.awsdns-00.com.",
+														"set_identifier": "",
+														"ttl": "30",
+														"type": "NS",
+														"weight": "-1",
+														"zone_id": "Z68734P5178QN"
+												}
+										}
+								},
+								"aws_route53_zone.oasis-consul-bootstrap": {
+										"type": "aws_route53_zone",
+										"primary": {
+												"id": "Z68734P5178QN",
+												"attributes": {
+														"comment": "Used to bootstrap consul dns",
+														"id": "Z68734P5178QN",
+														"name": "consul.bootstrap",
+														"name_servers.#": "4",
+														"name_servers.0": "ns-0.awsdns-00.com.",
+														"name_servers.1": "ns-1024.awsdns-00.org.",
+														"name_servers.2": "ns-1536.awsdns-00.co.uk.",
+														"name_servers.3": "ns-512.awsdns-00.net.",
+														"tags.#": "0",
+														"vpc_id": "vpc-65814701",
+														"vpc_region": "us-west-2",
+														"zone_id": "Z68734P5178QN"
+												}
+										}
+								}
+						}
+				}
+		]
+}
diff --git a/samples/JSON/terraform.tfstate.backup b/samples/JSON/terraform.tfstate.backup
new file mode 100644
index 00000000..227fac59
--- /dev/null
+++ b/samples/JSON/terraform.tfstate.backup
@@ -0,0 +1,77 @@
+{
+		"version": 3,
+		"terraform_version": "0.11.2",
+		"serial": 5,
+		"lineage": "5ffde9fb-4814-4609-a8a6-f1054f1779c1",
+		"modules": [
+				{
+						"path": [
+								"root"
+						],
+						"outputs": {},
+						"resources": {
+								"aws_iam_role.iam_for_lambda": {
+										"type": "aws_iam_role",
+										"depends_on": [],
+										"primary": {
+												"id": "iam_for_lambda",
+												"attributes": {
+														"arn": "arn:aws:iam::387412527620:role/iam_for_lambda",
+														"assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"lambda.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"}]}",
+														"create_date": "2018-01-27T04:05:27Z",
+														"force_detach_policies": "false",
+														"id": "iam_for_lambda",
+														"name": "iam_for_lambda",
+														"path": "/",
+														"unique_id": "AROAINXWJF2AIJOZMQXOE"
+												},
+												"meta": {},
+												"tainted": false
+										},
+										"deposed": [],
+										"provider": "provider.aws"
+								},
+								"aws_lambda_function.query-fitbit": {
+										"type": "aws_lambda_function",
+										"depends_on": [
+												"aws_iam_role.iam_for_lambda"
+										],
+										"primary": {
+												"id": "query-fitbit",
+												"attributes": {
+														"arn": "arn:aws:lambda:us-east-1:387412527620:function:query-fitbit",
+														"dead_letter_config.#": "0",
+														"description": "",
+														"environment.#": "0",
+														"filename": "../lambda/query-fitbit.zip",
+														"function_name": "query-fitbit",
+														"handler": "exports.handler",
+														"id": "query-fitbit",
+														"invoke_arn": "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:387412527620:function:query-fitbit/invocations",
+														"kms_key_arn": "",
+														"last_modified": "2018-01-27T04:11:31.185+0000",
+														"memory_size": "128",
+														"publish": "false",
+														"qualified_arn": "arn:aws:lambda:us-east-1:387412527620:function:query-fitbit:$LATEST",
+														"reserved_concurrent_executions": "0",
+														"role": "arn:aws:iam::387412527620:role/iam_for_lambda",
+														"runtime": "nodejs6.10",
+														"source_code_hash": "mNFY3lZD4jFsVq/f353zMD9MLSBvoaEbObIB1KBnxq4=",
+														"tags.%": "0",
+														"timeout": "3",
+														"tracing_config.#": "1",
+														"tracing_config.0.mode": "PassThrough",
+														"version": "$LATEST",
+														"vpc_config.#": "0"
+												},
+												"meta": {},
+												"tainted": false
+										},
+										"deposed": [],
+										"provider": "provider.aws"
+								}
+						},
+						"depends_on": []
+				}
+		]
+}
diff --git a/samples/JSON5/filenames/.jslintrc b/samples/JSON5/filenames/.jslintrc
new file mode 100644
index 00000000..9d4c466c
--- /dev/null
+++ b/samples/JSON5/filenames/.jslintrc
@@ -0,0 +1,23 @@
+{
+	"indent": 4,
+	"maxlen": 120,
+	"browser": false,
+	"couch": false,
+	"devel": false,
+	"node": false,
+	"rhino": false,
+	"white": true,
+	"plusplus":true,
+	"stupid":true,
+
+	"predef": [
+		"setTimeout",
+		"module",
+		"exports",
+		"define",
+		"require",
+		"window",
+		"buster",
+		"sinon"
+	]
+}