diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Layout/_Line.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Layout/_Line.cshtml
index 6aec34511..06a1cd966 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Layout/_Line.cshtml
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Layout/_Line.cshtml
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles"})
 
 @{
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_Large emphasized link.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_Large emphasized link.cshtml
index e8834e593..f222168f0 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_Large emphasized link.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_Large emphasized link.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles"})
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of document-links.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of document-links.cshtml
index 61e370532..7a4e33a66 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of document-links.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of document-links.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles"})
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of icon-links.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of icon-links.cshtml
index f1cbcb9c1..a31141006 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of icon-links.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of icon-links.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles,scripts,height"})
@@ -9,7 +9,7 @@
 }
 
 <div class="co-container-outer">
-	<div class="co-container-inner co-navigation co-navigation-@(Dnn.Module.ModuleID) co-navigation-icon co-navigation-text">
+	<div class="co-container-inner co-navigation co-navigation-@(CmsContext.Module.Id) co-navigation-icon co-navigation-text">
     <div class="row">
       @foreach (var link in AsList(Data))
       {
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links with overlay.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links with overlay.cshtml
index 8a7fa4b5c..935322c71 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links with overlay.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links with overlay.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles,scripts,height"})
@@ -9,7 +9,7 @@
 }
 
 <div class="co-container-outer">
-	<div class="co-container-inner co-navigation co-navigation-@(Dnn.Module.ModuleID) co-navigation-image">
+	<div class="co-container-inner co-navigation co-navigation-@(CmsContext.Module.Id) co-navigation-image">
 		<div class="row">
 			@foreach (var link in AsList(Data))
 			{
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links.cshtml
index 272a221f8..596bc4652 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of image-links.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles,scripts,height"})
@@ -9,7 +9,7 @@
 }
 
 <div class="co-container-outer">
-	<div class="co-container-inner co-navigation co-navigation-@(Dnn.Module.ModuleID) co-navigation-image">
+	<div class="co-container-inner co-navigation co-navigation-@(CmsContext.Module.Id) co-navigation-image">
 		<div class="row">
 			@foreach (var link in AsList(Data))
 			{
diff --git a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of links.cshtml b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of links.cshtml
index c15722f73..6693bea62 100644
--- a/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of links.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/Content/bs3/Link/_List of links.cshtml	
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @* This adds all link/script tags *@
 @RenderPage("../shared/_Assets.cshtml", new { parts = "styles,scripts,height"})
@@ -9,7 +9,7 @@
 }
 
 <div class="co-container-outer">
-	<div class="co-container-inner co-navigation co-navigation-@(Dnn.Module.ModuleID) co-navigation-text">
+	<div class="co-container-inner co-navigation co-navigation-@(CmsContext.Module.Id) co-navigation-text">
     <div class="row">
       @foreach (var link in AsList(Data))
       {
diff --git a/DNNPlatform/Portals/1/2sxc/News5/bs3/_Details.cshtml b/DNNPlatform/Portals/1/2sxc/News5/bs3/_Details.cshtml
index 24de2f15f..899f20774 100644
--- a/DNNPlatform/Portals/1/2sxc/News5/bs3/_Details.cshtml
+++ b/DNNPlatform/Portals/1/2sxc/News5/bs3/_Details.cshtml
@@ -1,4 +1,4 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 
 @Html.Partial("./shared/_Assets.cshtml", new { scripts = true} )
@@ -7,7 +7,7 @@
   var parts = CreateInstance("./shared/_Parts.cshtml");
   var page = GetService<ToSic.Sxc.Web.IPageService>(); // Service to set titles etc. on the page
   var article = AsList(Data).FirstOrDefault();
-  var filteredCategory = Request.QueryString["category"];
+  var filteredCategory = CmsContext.Page.Parameters["category"];
   var categoryParams = Text.Has(filteredCategory)
       ? "category=" + filteredCategory
       : "";
diff --git a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns without images.cshtml b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns without images.cshtml
index 9f20c5731..d0a58c194 100644
--- a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns without images.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns without images.cshtml	
@@ -1,7 +1,7 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @using ToSic.Sxc.Search;
-@using ToSic.Eav.Run;
+@using ToSic.Sxc.Context;
 
 @Html.Partial("shared/_Assets.cshtml")
 
@@ -11,7 +11,7 @@
   var viewConfiguration = Content;
   var articles = AsList(Data["News"]);
   var categories = AsList(App.Data["Category"]);
-  var categoryQueryString = Request.QueryString["category"];
+  var categoryQueryString = CmsContext.Page.Parameters["category"];
   var filteredCategory = AsList(Data["Category"]).FirstOrDefault();
   var pages = AsList(Data["Paging"]).FirstOrDefault();
 }
@@ -46,7 +46,7 @@
   /**
   * Prevent duplicated search results
   */
-  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IContainer moduleInfo, DateTime beginDate) {
+  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IModule moduleInfo, DateTime beginDate) {
     searchInfos.Clear();
   }
 }
\ No newline at end of file
diff --git a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns.cshtml b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns.cshtml
index 9e2a17e53..48c728d00 100644
--- a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List Columns.cshtml	
@@ -1,7 +1,7 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @using ToSic.Sxc.Search;
-@using ToSic.Eav.Run;
+@using ToSic.Sxc.Context;
 
 @Html.Partial("shared/_Assets.cshtml")
 
@@ -11,7 +11,7 @@
   var viewConfiguration = Content;
   var articles = AsList(Data["News"]);
   var categories = AsList(App.Data["Category"]);
-  var categoryQueryString = Request.QueryString["category"];
+  var categoryQueryString = CmsContext.Page.Parameters["category"];
   var filteredCategory = AsList(Data["Category"]).FirstOrDefault();
   var pages = AsList(Data["Paging"]).FirstOrDefault();
 }
@@ -46,7 +46,7 @@
   /**
   * Prevent duplicated search results
   */
-  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IContainer moduleInfo, DateTime beginDate) {
+  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IModule moduleInfo, DateTime beginDate) {
     searchInfos.Clear();
   }
 }
\ No newline at end of file
diff --git a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List archive.cshtml b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List archive.cshtml
index 45cbbca43..eeb4103d6 100644
--- a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List archive.cshtml	
+++ b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List archive.cshtml	
@@ -1,7 +1,7 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @using ToSic.Sxc.Search;
-@using ToSic.Eav.Run;
+@using ToSic.Sxc.Context;
 
 @Html.Partial("shared/_Assets.cshtml")
 
@@ -11,7 +11,7 @@
   var viewConfiguration = Content;
   var articles = AsList(Data["News"]);
   var categories = AsList(App.Data["Category"]);
-  var categoryQueryString = Request.QueryString["category"];
+  var categoryQueryString = CmsContext.Page.Parameters["category"];
   var filteredCategory = AsList(Data["Category"]).FirstOrDefault();
   var pages = AsList(Data["Paging"]).FirstOrDefault();
 }
@@ -46,7 +46,7 @@
   /**
   * Prevent duplicated search results
   */
-  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IContainer moduleInfo, DateTime beginDate) {
+  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IModule moduleInfo, DateTime beginDate) {
     searchInfos.Clear();
   }
 }
\ No newline at end of file
diff --git a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List.cshtml b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List.cshtml
index bdd58b747..40e546c92 100644
--- a/DNNPlatform/Portals/1/2sxc/News5/bs3/_List.cshtml
+++ b/DNNPlatform/Portals/1/2sxc/News5/bs3/_List.cshtml
@@ -1,7 +1,7 @@
-@inherits ToSic.Sxc.Dnn.RazorComponent
+@inherits Custom.Hybrid.Razor14
 @using ToSic.Razor.Blade;
 @using ToSic.Sxc.Search;
-@using ToSic.Eav.Run;
+@using ToSic.Sxc.Context;
 
 @Html.Partial("shared/_Assets.cshtml")
 
@@ -11,7 +11,7 @@
   var viewConfiguration = Content;
   var articles = AsList(Data["News"]);
   var categories = AsList(App.Data["Category"]);
-  var categoryQueryString = Request.QueryString["category"];
+  var categoryQueryString = CmsContext.Page.Parameters["category"];
   var filteredCategory = AsList(Data["Category"]).FirstOrDefault();
   var pages = AsList(Data["Paging"]).FirstOrDefault();
 }
@@ -50,7 +50,7 @@
   /// <param name="moduleInfo"></param>
   /// <param name="beginDate"></param>
 
-  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IContainer moduleInfo, DateTime beginDate) {
+  public override void CustomizeSearch(Dictionary<string, List<ISearchItem>> searchInfos, IModule moduleInfo, DateTime beginDate) {
     var parts = CreateInstance("shared/_Parts.cshtml");
     foreach (var si in searchInfos["SearchIndex"]) {
       var article = AsDynamic(si.Entity);