diff --git a/.settings/settings.json b/.settings/settings.json
index 3c0bb208e9..783b6df3da 100644
--- a/.settings/settings.json
+++ b/.settings/settings.json
@@ -1,12 +1,12 @@
-// Place your settings in this file to overwrite default and user settings.
 {
-	"search.excludeFolders": [
-		".git",
-		"node_modules",
-		"bower_components",
-		"packages",
-		"build",
-		"dist",
-		"tmp"
-	]
+	"search.exclude": {
+		".git" : true,
+		".idea": true,
+		"node_modules" : true,
+		"bower_components" : true,
+		"packages" : true,
+		"build" : true,
+		"dist" : true,
+		"tmp" : true
+	}
 }
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 28f520ca1f..936f8f085e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,8 @@
 {
     "version": "1.5.0",
     "compilerOptions": {
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
         "target": "es5",
         "module": "commonjs",
         "declaration": false,
@@ -9,8 +11,8 @@
         "noLib": false,
         "outDir": "dist/js/cjs"
     },
-    "filesGlob": [
-        "./src/**/*.ts",
+    "fileGlobs": [
+        "./modules/**/*.ts",
         "./tools/**/*.ts",
         "!./node_modules/**",
         "!./modules_dart/**",