diff --git a/packages/template-blank-ng/package.json b/packages/template-blank-ng/package.json
index d17f7e761..18f5431d9 100644
--- a/packages/template-blank-ng/package.json
+++ b/packages/template-blank-ng/package.json
@@ -12,7 +12,7 @@
   "name": "tns-template-blank-ng",
   "displayName": "Blank",
   "templateType": "App template",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Blank template for NativeScript apps using Angular",
   "author": "Telerik <support@telerik.com>",
   "license": "Apache-2.0",
diff --git a/packages/template-blank-ng/src/app/app-routing.module.ts b/packages/template-blank-ng/src/app/app-routing.module.ts
index 4c8c2d500..9cbe609b4 100644
--- a/packages/template-blank-ng/src/app/app-routing.module.ts
+++ b/packages/template-blank-ng/src/app/app-routing.module.ts
@@ -4,7 +4,7 @@ import { NativeScriptRouterModule } from "nativescript-angular/router";
 
 const routes: Routes = [
     { path: "", redirectTo: "/home", pathMatch: "full" },
-    { path: "home", loadChildren: () => import(`~/app/home/home.module`).then((m) => m.HomeModule) }
+    { path: "home", loadChildren: () => import("~/app/home/home.module").then((m) => m.HomeModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-drawer-navigation-ng/package.json b/packages/template-drawer-navigation-ng/package.json
index d05b7ef8e..a02a6e7bf 100644
--- a/packages/template-drawer-navigation-ng/package.json
+++ b/packages/template-drawer-navigation-ng/package.json
@@ -12,7 +12,7 @@
   "name": "tns-template-drawer-navigation-ng",
   "displayName": "Navigation Drawer",
   "templateType": "App template",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Side navigation template",
   "author": "Telerik <support@telerik.com>",
   "license": "Apache-2.0",
diff --git a/packages/template-drawer-navigation-ng/src/app/app-routing.module.ts b/packages/template-drawer-navigation-ng/src/app/app-routing.module.ts
index 3284c8d61..3c95b4185 100644
--- a/packages/template-drawer-navigation-ng/src/app/app-routing.module.ts
+++ b/packages/template-drawer-navigation-ng/src/app/app-routing.module.ts
@@ -4,11 +4,11 @@ import { NativeScriptRouterModule } from "nativescript-angular/router";
 
 const routes: Routes = [
     { path: "", redirectTo: "/home", pathMatch: "full" },
-    { path: "home", loadChildren: () => import(`~/app/home/home.module`).then(m => m.HomeModule) },
-    { path: "browse", loadChildren: () => import(`~/app/browse/browse.module`).then(m => m.BrowseModule) },
-    { path: "search", loadChildren: () => import(`~/app/search/search.module`).then(m => m.SearchModule) },
-    { path: "featured", loadChildren: () => import(`~/app/featured/featured.module`).then(m => m.FeaturedModule) },
-    { path: "settings", loadChildren: () => import(`~/app/settings/settings.module`).then(m => m.SettingsModule) }
+    { path: "home", loadChildren: () => import("~/app/home/home.module").then(m => m.HomeModule) },
+    { path: "browse", loadChildren: () => import("~/app/browse/browse.module").then(m => m.BrowseModule) },
+    { path: "search", loadChildren: () => import("~/app/search/search.module").then(m => m.SearchModule) },
+    { path: "featured", loadChildren: () => import("~/app/featured/featured.module").then(m => m.FeaturedModule) },
+    { path: "settings", loadChildren: () => import("~/app/settings/settings.module").then(m => m.SettingsModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-health-survey-ng/package.json b/packages/template-health-survey-ng/package.json
index d6c182e6d..13407ae58 100644
--- a/packages/template-health-survey-ng/package.json
+++ b/packages/template-health-survey-ng/package.json
@@ -11,7 +11,7 @@
   },
   "name": "tns-template-health-survey-ng",
   "displayName": "Health Survey with Kinvey",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Health survey template that saves data to Kinvey database.",
   "license": "SEE LICENSE IN <your-license-filename>",
   "keywords": [
diff --git a/packages/template-health-survey-ng/src/app/app-routing.module.ts b/packages/template-health-survey-ng/src/app/app-routing.module.ts
index 4516a5667..e52297762 100644
--- a/packages/template-health-survey-ng/src/app/app-routing.module.ts
+++ b/packages/template-health-survey-ng/src/app/app-routing.module.ts
@@ -6,9 +6,9 @@ import { LoggedInLazyLoadGuard } from "./logged-in-lazy-load.guard";
 
 const routes: Routes = [
     { path: "", redirectTo: "/consent", pathMatch: "full" },
-    { path: "login", loadChildren: () => import(`~/app/login/login.module`).then((m) => m.LoginModule) },
-    { path: "consent", loadChildren: () => import(`~/app/consent/consent.module`).then((m) => m.ConsentModule), canLoad: [LoggedInLazyLoadGuard] },
-    { path: "survey", loadChildren: () => import(`~/app/survey/survey.module`).then((m) => m.SurveyModule) }
+    { path: "login", loadChildren: () => import("~/app/login/login.module").then((m) => m.LoginModule) },
+    { path: "consent", loadChildren: () => import("~/app/consent/consent.module").then((m) => m.ConsentModule), canLoad: [LoggedInLazyLoadGuard] },
+    { path: "survey", loadChildren: () => import("~/app/survey/survey.module").then((m) => m.SurveyModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-master-detail-kinvey-ng/package.json b/packages/template-master-detail-kinvey-ng/package.json
index a61586568..dc4ff6392 100644
--- a/packages/template-master-detail-kinvey-ng/package.json
+++ b/packages/template-master-detail-kinvey-ng/package.json
@@ -12,7 +12,7 @@
   "name": "tns-template-master-detail-kinvey-ng",
   "displayName": "Master-Detail with Kinvey",
   "templateType": "App template",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Master-detail interface to display collection of items from Kinvey and inspect and edit selected item properties. ",
   "license": "SEE LICENSE IN <your-license-filename>",
   "keywords": [
diff --git a/packages/template-master-detail-kinvey-ng/src/app/app-routing.module.ts b/packages/template-master-detail-kinvey-ng/src/app/app-routing.module.ts
index 25b0b3cc0..c5d69bc5a 100644
--- a/packages/template-master-detail-kinvey-ng/src/app/app-routing.module.ts
+++ b/packages/template-master-detail-kinvey-ng/src/app/app-routing.module.ts
@@ -4,7 +4,7 @@ import { NativeScriptRouterModule } from "nativescript-angular/router";
 
 const routes: Routes = [
     { path: "", redirectTo: "/cars", pathMatch: "full" },
-    { path: "cars", loadChildren: () => import(`~/app/cars/cars.module`).then((m) => m.CarsModule) }
+    { path: "cars", loadChildren: () => import("~/app/cars/cars.module").then((m) => m.CarsModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-master-detail-ng/package.json b/packages/template-master-detail-ng/package.json
index b3450b886..11dda81ab 100644
--- a/packages/template-master-detail-ng/package.json
+++ b/packages/template-master-detail-ng/package.json
@@ -12,7 +12,7 @@
   "name": "tns-template-master-detail-ng",
   "displayName": "Master-Detail with Firebase",
   "templateType": "App template",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Master-detail interface to display collection of items from Firebase and inspect and edit selected item properties. ",
   "author": "Telerik <support@telerik.com>",
   "license": "Apache-2.0",
diff --git a/packages/template-master-detail-ng/src/app/app-routing.module.ts b/packages/template-master-detail-ng/src/app/app-routing.module.ts
index 25b0b3cc0..c5d69bc5a 100644
--- a/packages/template-master-detail-ng/src/app/app-routing.module.ts
+++ b/packages/template-master-detail-ng/src/app/app-routing.module.ts
@@ -4,7 +4,7 @@ import { NativeScriptRouterModule } from "nativescript-angular/router";
 
 const routes: Routes = [
     { path: "", redirectTo: "/cars", pathMatch: "full" },
-    { path: "cars", loadChildren: () => import(`~/app/cars/cars.module`).then((m) => m.CarsModule) }
+    { path: "cars", loadChildren: () => import("~/app/cars/cars.module").then((m) => m.CarsModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-patient-care-ng/package.json b/packages/template-patient-care-ng/package.json
index c46c123f4..ab584c093 100644
--- a/packages/template-patient-care-ng/package.json
+++ b/packages/template-patient-care-ng/package.json
@@ -11,7 +11,7 @@
   },
   "name": "tns-template-patient-care-ng",
   "displayName": "Patient Care with Kinvey",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Patient care template that saves data to Kinvey database.",
   "license": "SEE LICENSE IN <your-license-filename>",
   "keywords": [
diff --git a/packages/template-patient-care-ng/src/app-routing.module.ts b/packages/template-patient-care-ng/src/app-routing.module.ts
index 26ec91917..8248a1b05 100644
--- a/packages/template-patient-care-ng/src/app-routing.module.ts
+++ b/packages/template-patient-care-ng/src/app-routing.module.ts
@@ -6,8 +6,8 @@ import { LoggedInLazyLoadGuard } from "./logged-in-lazy-load.guard";
 
 const routes: Routes = [
     { path: "", redirectTo: "/care", pathMatch: "full" },
-    { path: "care", loadChildren: () => import(`./care/care.module`).then((m) => m.CareModule), canLoad: [LoggedInLazyLoadGuard] },
-    { path: "login", loadChildren: () => import(`./login/login.module`).then((m) => m.LoginModule) }
+    { path: "care", loadChildren: () => import("./care/care.module").then((m) => m.CareModule), canLoad: [LoggedInLazyLoadGuard] },
+    { path: "login", loadChildren: () => import("./login/login.module").then((m) => m.LoginModule) }
 ];
 
 @NgModule({
diff --git a/packages/template-tab-navigation-ng/package.json b/packages/template-tab-navigation-ng/package.json
index cdd5b387b..aa13c993c 100644
--- a/packages/template-tab-navigation-ng/package.json
+++ b/packages/template-tab-navigation-ng/package.json
@@ -12,7 +12,7 @@
   "name": "tns-template-tab-navigation-ng",
   "displayName": "Tabs",
   "templateType": "App template",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Tabbed interface template",
   "author": "Telerik <support@telerik.com>",
   "license": "Apache-2.0",
diff --git a/packages/template-tab-navigation-ng/src/app/app-routing.module.ts b/packages/template-tab-navigation-ng/src/app/app-routing.module.ts
index 58dda210c..dbc6e5754 100644
--- a/packages/template-tab-navigation-ng/src/app/app-routing.module.ts
+++ b/packages/template-tab-navigation-ng/src/app/app-routing.module.ts
@@ -13,19 +13,19 @@ const routes: Routes = [
     {
         path: "home",
         component: NSEmptyOutletComponent,
-        loadChildren: () => import(`~/app/home/home.module`).then((m) => m.HomeModule),
+        loadChildren: () => import("~/app/home/home.module").then((m) => m.HomeModule),
         outlet: "homeTab"
     },
     {
         path: "browse",
         component: NSEmptyOutletComponent,
-        loadChildren: () => import(`~/app/browse/browse.module`).then((m) => m.BrowseModule),
+        loadChildren: () => import("~/app/browse/browse.module").then((m) => m.BrowseModule),
         outlet: "browseTab"
     },
     {
         path: "search",
         component: NSEmptyOutletComponent,
-        loadChildren: () => import(`~/app/search/search.module`).then((m) => m.SearchModule),
+        loadChildren: () => import("~/app/search/search.module").then((m) => m.SearchModule),
         outlet: "searchTab"
     }
 ];