diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 12b3f84e050..1dbf52b56a9 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -68,16 +68,20 @@ namespace ts.server {
             "types": ["jquery"]
         },
         "WinJS": {
-            "match": /^(.*\/winjs)\/base\.js$/i,        // If the winjs/base.js file is found..
+            // e.g. c:/temp/UWApp1/lib/winjs-4.0.1/js/base.js
+            "match": /^(.*\/winjs-[.\d]+)\/js\/base\.js$/i,        // If the winjs/base.js file is found..
             "exclude": [["^", 1, "/.*"]],                // ..then exclude all files under the winjs folder
             "types": ["winjs"]                           // And fetch the @types package for WinJS
         },
         "Kendo": {
-            "match": /^(.*\/kendo\/.+\.js$/i,
-            "exclude": [["^", 1, "/.*"]]
+            // e.g. /Kendo3/wwwroot/lib/kendo/kendo.all.min.js
+            "match": /^(.*\/kendo)\/kendo\.all\.min\.js$/i,
+            "exclude": [["^", 1, "/.*"]],
+            "types": ["kendo-ui"]
         },
         "Office Nuget": {
-            "match": /^(.*\/1\/office)\/excel\.debug\.js$/i, // Office NuGet package is installed under a "1/office" folder
+            // e.g. /scripts/Office/1/excel-15.debug.js
+            "match": /^(.*\/office\/1)\/excel-\d+\.debug\.js$/i, // Office NuGet package is installed under a "1/office" folder
             "exclude": [["^", 1, "/.*"]],                     // Exclude that whole folder if the file indicated above is found in it
             "types": ["office"]                               // @types package to fetch instead
         }