diff --git a/extensions/kusto/package.json b/extensions/kusto/package.json
index 6fbefe7641..2335df5229 100644
--- a/extensions/kusto/package.json
+++ b/extensions/kusto/package.json
@@ -18,7 +18,7 @@
   "typings": "./src/kusto",
   "scripts": {
     "compile": "gulp compile-extension:kusto-client",
-    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-kusto syntaxes/SQL.plist ./syntaxes/sql.tmLanguage.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-kusto ./syntaxes/kusto.tmLanguage"
   },
   "contributes": {
     "commands": [
@@ -66,6 +66,11 @@
         "label": "[Kuskus] Kusto (Dark)",
         "uiTheme": "vs-dark",
         "path": "./themes/kuskus-kusto-dark.json"
+      },
+      {
+        "label": "[Kuskus] Kusto Explorer (Dark)",
+        "uiTheme": "vs-dark",
+        "path": "./themes/kuskus-kusto-explorer-dark.json"
       }
     ],
     "outputChannels": [
diff --git a/extensions/kusto/package.nls.json b/extensions/kusto/package.nls.json
index 36937c247b..f139a8b3bd 100644
--- a/extensions/kusto/package.nls.json
+++ b/extensions/kusto/package.nls.json
@@ -23,7 +23,7 @@
 	"kusto.logDebugInfo": "[Optional] Log debug output to the console (View -> Output) and then select appropriate output channel from the dropdown",
 	"kusto.tracingLevel": "[Optional] Log level for backend services. Azure Data Studio generates a file name every time it starts and if the file already exists the logs entries are appended to that file. For cleanup of old log files see logRetentionMinutes and logFilesRemovalLimit settings. The default tracingLevel does not log much. Changing verbosity could lead to extensive logging and disk space requirements for the logs. Error includes Critical, Warning includes Error, Information includes Warning and Verbose includes Information",
 
-	"kusto.provider.displayName": "Kusto",
+	"kusto.provider.displayName": "Azure Data Explorer (Kusto)",
 	"kusto.connectionOptions.connectionName.displayName": "Name (optional)",
 	"kusto.connectionOptions.connectionName.description": "Custom name of the connection",
 	"kusto.connectionOptions.serverName.displayName": "Cluster",
diff --git a/extensions/kusto/src/constants.ts b/extensions/kusto/src/constants.ts
index 11bc89a901..1f1421b733 100644
--- a/extensions/kusto/src/constants.ts
+++ b/extensions/kusto/src/constants.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-export const serviceName = 'Kusto service';
+export const serviceName = 'Kusto Tools Service';
 export const providerId = 'KUSTO';
 export const serviceCrashLink = 'https://github.com/Microsoft/vscode-kusto/wiki/SqlToolsService-Known-Issues';
 export const extensionConfigSectionName = 'kusto';
diff --git a/extensions/kusto/syntaxes/kusto.tmLanguage b/extensions/kusto/syntaxes/kusto.tmLanguage
index 4bc8063091..15c627641e 100644
--- a/extensions/kusto/syntaxes/kusto.tmLanguage
+++ b/extensions/kusto/syntaxes/kusto.tmLanguage
@@ -7,8 +7,9 @@
 
         <key>fileTypes</key>
         <array>
-            <string>csl</string>
+            <string>kql</string>
             <string>kusto</string>
+			<string>csl</string>
         </array>
 
         <key>name</key>
@@ -70,7 +71,7 @@
                 <dict>
                     <!-- timespan literals
                     -  https://docs.microsoft.com/en-us/azure/kusto/query/scalar-data-types/timespan#timespan-literals
-                    -->
+					-->
                     <key>match</key>
                     <string>(?<=\.\d|\d|\d\W)(d|h|m|s|ms|microsecond|tick|seconds)\b</string>
                     <key>name</key>
@@ -230,9 +231,9 @@
                 <string>keyword.control.kusto</string>
             </dict>
             <dict>
-                <!-- User-defined functions
+                 <!-- User-defined functions
                     -  https://docs.microsoft.com/en-us/azure/kusto/query/functions/user-defined-functions
-                -->
+				-->
                 <key>match</key>
                 <string>(?<=let ).+(?=\W*=)</string>
                 <key>name</key>