diff --git a/.gitignore b/.gitignore
index 2e9741bc1..1c93af7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,4 @@ npm-debug.log
 /**/yarn-error.log
 /**/*-bundle.js
 /Extensions/Manage/Dnn.PersonaBar.Users/admin/personaBar/scripts/exportables/Users/UsersCommon.js
+Extensions/**/*.js.map
diff --git a/Dnn.AdminExperience.sln b/Dnn.AdminExperience.sln
index e3920dcc6..3c2b18a09 100644
--- a/Dnn.AdminExperience.sln
+++ b/Dnn.AdminExperience.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2046
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.PersonaBar.UI", "Library\Dnn.PersonaBar.UI\Dnn.PersonaBar.UI.csproj", "{7D92D57E-EB66-4816-A0FA-B39213452539}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -96,6 +96,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.PersonaBar.TaskSchedule
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dnn.PersonaBar.Vocabularies", "Extensions\Settings\Dnn.PersonaBar.Vocabularies\Dnn.PersonaBar.Vocabularies.csproj", "{B4CBAC32-E561-4426-AD67-8A12284AAED0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2D2487D-79FD-492F-BC7D-327E4D94F4C7}"
+	ProjectSection(SolutionItems) = preProject
+		..\cake.config = ..\cake.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Cloud_Debug|Any CPU = Cloud_Debug|Any CPU
@@ -432,4 +437,7 @@ Global
 		{EE37275B-1E65-4475-BB1E-0F8F31B3D281} = {EF78794D-AAEA-4759-9B82-FB2D38AFD3D4}
 		{B4CBAC32-E561-4426-AD67-8A12284AAED0} = {EF78794D-AAEA-4759-9B82-FB2D38AFD3D4}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B7ADC7A0-7B9C-41BA-A5C4-77E9DD8499A0}
+	EndGlobalSection
 EndGlobal
diff --git a/Extensions/Content/Dnn.PersonaBar.Pages/Pages.Web/webpack.config.js b/Extensions/Content/Dnn.PersonaBar.Pages/Pages.Web/webpack.config.js
index 4f449c2c8..c18b7a324 100644
--- a/Extensions/Content/Dnn.PersonaBar.Pages/Pages.Web/webpack.config.js
+++ b/Extensions/Content/Dnn.PersonaBar.Pages/Pages.Web/webpack.config.js
@@ -77,5 +77,6 @@ module.exports = {
         new webpack.DefinePlugin({
             VERSION: JSON.stringify(packageJson.version)
         })
-    ]
+    ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Manage/Dnn.PersonaBar.AdminLogs/AdminLogs.Web/webpack.config.js b/Extensions/Manage/Dnn.PersonaBar.AdminLogs/AdminLogs.Web/webpack.config.js
index 0857e8727..1addfe194 100644
--- a/Extensions/Manage/Dnn.PersonaBar.AdminLogs/AdminLogs.Web/webpack.config.js
+++ b/Extensions/Manage/Dnn.PersonaBar.AdminLogs/AdminLogs.Web/webpack.config.js
@@ -60,5 +60,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/webpack.config.js b/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/webpack.config.js
index 075043796..1df7dd5f9 100644
--- a/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/webpack.config.js
+++ b/Extensions/Manage/Dnn.PersonaBar.Roles/Roles.Web/webpack.config.js
@@ -48,5 +48,6 @@ module.exports = {
         new webpack.DefinePlugin({
             VERSION: JSON.stringify(packageJson.version)
         })
-    ]
+    ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Manage/Dnn.PersonaBar.Sites/Sites.Web/webpack.config.js b/Extensions/Manage/Dnn.PersonaBar.Sites/Sites.Web/webpack.config.js
index 7b9b49944..74c79d174 100644
--- a/Extensions/Manage/Dnn.PersonaBar.Sites/Sites.Web/webpack.config.js
+++ b/Extensions/Manage/Dnn.PersonaBar.Sites/Sites.Web/webpack.config.js
@@ -67,5 +67,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Manage/Dnn.PersonaBar.Themes/Themes.Web/webpack.config.js b/Extensions/Manage/Dnn.PersonaBar.Themes/Themes.Web/webpack.config.js
index d7dad0de1..6302d019e 100644
--- a/Extensions/Manage/Dnn.PersonaBar.Themes/Themes.Web/webpack.config.js
+++ b/Extensions/Manage/Dnn.PersonaBar.Themes/Themes.Web/webpack.config.js
@@ -85,5 +85,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Extensions/Extensions.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Extensions/Extensions.Web/webpack.config.js
index 41a0a48a3..6f45bf4cf 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Extensions/Extensions.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Extensions/Extensions.Web/webpack.config.js
@@ -100,5 +100,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Licensing/Licensing.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Licensing/Licensing.Web/webpack.config.js
index 3e339b6b5..51d063d5e 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Licensing/Licensing.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Licensing/Licensing.Web/webpack.config.js
@@ -85,5 +85,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Prompt/Prompt.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Prompt/Prompt.Web/webpack.config.js
index eeb906883..0d4e24f11 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Prompt/Prompt.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Prompt/Prompt.Web/webpack.config.js
@@ -84,7 +84,8 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
 
 if(isAnalyze) {
diff --git a/Extensions/Settings/Dnn.PersonaBar.Security/Security.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Security/Security.Web/webpack.config.js
index a38e8e3f4..ed0321fd7 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Security/Security.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Security/Security.Web/webpack.config.js
@@ -86,5 +86,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Seo/Seo.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Seo/Seo.Web/webpack.config.js
index cf99e7df3..adabeafb7 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Seo/Seo.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Seo/Seo.Web/webpack.config.js
@@ -75,5 +75,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Servers/Servers.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Servers/Servers.Web/webpack.config.js
index e25f4b0e9..8b20539fb 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Servers/Servers.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Servers/Servers.Web/webpack.config.js
@@ -73,5 +73,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.SiteImportExport/SiteImportExport.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.SiteImportExport/SiteImportExport.Web/webpack.config.js
index 3a51edf02..b8336bdbd 100644
--- a/Extensions/Settings/Dnn.PersonaBar.SiteImportExport/SiteImportExport.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.SiteImportExport/SiteImportExport.Web/webpack.config.js
@@ -93,5 +93,6 @@ module.exports = {
         new webpack.DefinePlugin({
             VERSION: JSON.stringify(packageJson.version)
         })
-    ]
+    ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/webpack.config.js
index 295acfe4b..f5b8a60b2 100644
--- a/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.SiteSettings/SiteSettings.Web/webpack.config.js
@@ -93,5 +93,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.TaskScheduler/TaskScheduler.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.TaskScheduler/TaskScheduler.Web/webpack.config.js
index 6db09c4fd..6c9e9398d 100644
--- a/Extensions/Settings/Dnn.PersonaBar.TaskScheduler/TaskScheduler.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.TaskScheduler/TaskScheduler.Web/webpack.config.js
@@ -76,5 +76,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
\ No newline at end of file
diff --git a/Extensions/Settings/Dnn.PersonaBar.Vocabularies/Vocabularies.Web/webpack.config.js b/Extensions/Settings/Dnn.PersonaBar.Vocabularies/Vocabularies.Web/webpack.config.js
index 888423519..ab31d2419 100644
--- a/Extensions/Settings/Dnn.PersonaBar.Vocabularies/Vocabularies.Web/webpack.config.js
+++ b/Extensions/Settings/Dnn.PersonaBar.Vocabularies/Vocabularies.Web/webpack.config.js
@@ -77,5 +77,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+        devtool: "source-map"
 };
\ No newline at end of file