diff --git a/extensions/ini/ini.language-configuration.json b/extensions/ini/ini.language-configuration.json
new file mode 100644
index 00000000000..93cfa1ce3b9
--- /dev/null
+++ b/extensions/ini/ini.language-configuration.json
@@ -0,0 +1,25 @@
+{
+	"comments": {
+		"lineComment": ";",
+		"blockComment": [ ";", " " ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"]
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"]
+	]
+}
\ No newline at end of file
diff --git a/extensions/ini/package.json b/extensions/ini/package.json
index 374e73d7162..7c20952302a 100644
--- a/extensions/ini/package.json
+++ b/extensions/ini/package.json
@@ -6,15 +6,26 @@
 	"contributes": {
 		"languages": [{
 			"id": "ini",
-			"extensions": [ ".ini", ".properties", ".gitconfig" ],
-			"filenames": ["config", ".gitattributes", ".gitconfig", "gitconfig", ".editorconfig"],
+			"extensions": [ ".ini"],
 			"aliases": [ "Ini", "ini" ],
-			"configuration": "./language-configuration.json"
-		}],
+			"configuration": "./ini.language-configuration.json"
+			},
+			{
+				"id": "properties",
+				"extensions": [ ".properties", ".gitconfig" ],
+				"filenames": ["config", ".gitattributes", ".gitconfig", "gitconfig", ".editorconfig"],
+				"aliases": [ "properties", "properties" ],
+				"configuration": "./properties.language-configuration.json"
+			}
+		],
 		"grammars": [{
 			"language": "ini",
 			"scopeName": "source.ini",
-			"path": "./syntaxes/Ini.plist"
+			"path": "./syntaxes/Ini.tmLanuage"
+		},{
+			"language": "properties",
+			"scopeName": "source.properties",
+			"path": "./syntaxes/properties.plist"
 		}]
 	}
 }
diff --git a/extensions/ini/language-configuration.json b/extensions/ini/properties.language-configuration.json
similarity index 100%
rename from extensions/ini/language-configuration.json
rename to extensions/ini/properties.language-configuration.json
diff --git a/extensions/ini/syntaxes/Ini.tmLanguage b/extensions/ini/syntaxes/Ini.tmLanguage
new file mode 100644
index 00000000000..b43ff239149
--- /dev/null
+++ b/extensions/ini/syntaxes/Ini.tmLanguage
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>fileTypes</key>
+	<array>
+		<string>ini</string>
+		<string>INI</string>
+		<string>inf</string>
+		<string>INF</string>
+		<string>reg</string>
+		<string>REG</string>
+		<string>lng</string>
+		<string>cfg</string>
+		<string>CFG</string>
+		<string>url</string>
+		<string>URL</string>
+		<string>.editorconfig</string>
+	</array>
+	<key>name</key>
+	<string>INI</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.comment.ini</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(;|#).*$\n?</string>
+			<key>name</key>
+			<string>comment.line.semicolon.ini</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.section.ini</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>entity.section.ini</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.section.ini</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^\s*(\[)(.*?)(\])</string>
+			<key>name</key>
+			<string>meta.tag.section.ini</string>
+		</dict>
+		<dict>
+			<key>captures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>meta.property.ini</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.quote.ini</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.name.ini</string>
+				</dict>
+				<key>4</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.quote.ini</string>
+				</dict>
+				<key>5</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.equals.ini</string>
+				</dict>
+				<key>6</key>
+				<dict>
+					<key>name</key>
+					<string>meta.value.ini</string>
+				</dict>
+				<key>7</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.quote.ini</string>
+				</dict>
+				<key>8</key>
+				<dict>
+					<key>name</key>
+					<string>string.name.value.ini</string>
+				</dict>
+				<key>9</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.quote.ini</string>
+				</dict>
+				<key>10</key>
+				<dict>
+					<key>name</key>
+					<string>comment.declarationline.semicolon.ini</string>
+				</dict>
+			</dict>
+			<key>match</key>
+			<string>^(\s*(["']?)(.+?)(\2)\s*(=))?\s*((["']?)(.*?)(\7))\s*(;.*)?$\n?</string>
+			<key>name</key>
+			<string>meta.declaration.ini</string>
+		</dict>
+	</array>
+	<key>scopeName</key>
+	<string>source.ini</string>
+	<key>uuid</key>
+	<string>957acd74-6d7c-4732-a25b-5f66a1e637cd</string>
+</dict>
+</plist>
diff --git a/extensions/ini/syntaxes/Ini.plist b/extensions/ini/syntaxes/properties.plist
similarity index 99%
rename from extensions/ini/syntaxes/Ini.plist
rename to extensions/ini/syntaxes/properties.plist
index 86606eea259..11436566bd5 100644
--- a/extensions/ini/syntaxes/Ini.plist
+++ b/extensions/ini/syntaxes/properties.plist
@@ -174,7 +174,7 @@
 		</dict>
 	</array>
 	<key>scopeName</key>
-	<string>source.ini</string>
+	<string>source.properties</string>
 	<key>uuid</key>
 	<string>77DC23B6-8A90-11D9-BAA4-000A9584EC8C</string>
 </dict>