diff --git a/samples/htmx_website_with_webstencils/ControllerU.pas b/samples/htmx_website_with_webstencils/ControllerU.pas
index bf67c603..fb5912f0 100644
--- a/samples/htmx_website_with_webstencils/ControllerU.pas
+++ b/samples/htmx_website_with_webstencils/ControllerU.pas
@@ -9,9 +9,6 @@ uses
 type
   [MVCPath]
   TMyController = class(TMVCController)
-  protected
-    procedure OnBeforeAction(AContext: TWebContext; const AActionName: string;
-      var AHandled: Boolean); override;
   public
     [MVCPath]
     [MVCHTTPMethod([httpGET])]
@@ -40,7 +37,7 @@ begin
   var lCustomers := GetPeople();
   try
     ViewData['customers'] := lCustomers;
-    Result := Page(['pages/customers']);
+    Result := Page('customers' + IfThen(Context.Request.IsHTMX, '_body'))
   finally
     lCustomers.Free;
   end;
@@ -48,14 +45,7 @@ end;
 
 function TMyController.Home: String;
 begin
-  Result := Page(['pages/home']);
-end;
-
-procedure TMyController.OnBeforeAction(AContext: TWebContext;
-  const AActionName: string; var AHandled: Boolean);
-begin
-  inherited;
-  ViewData['ispage'] := not AContext.Request.IsHTMX;
+  Result := Page('home' + IfThen(Context.Request.IsHTMX, '_body'))
 end;
 
 function TMyController.Posts: String;
@@ -63,7 +53,7 @@ begin
   var lPosts := GetPosts(20);
   try
     ViewData['posts'] := lPosts;
-    Result := Page(['pages/posts']);
+    Result := Page('posts' + IfThen(Context.Request.IsHTMX, '_body'))
   finally
     lPosts.Free;
   end;
@@ -74,7 +64,7 @@ begin
   var lUsers := GetUsers();
   try
     ViewData['users'] := lUsers;
-    Result := Page(['pages/users']);
+    Result := Page('users' + IfThen(Context.Request.IsHTMX, '_body'));
   finally
     lUsers.Free;
   end;
diff --git a/samples/htmx_website_with_webstencils/bin/templates/baselayout.html b/samples/htmx_website_with_webstencils/bin/templates/baselayout.html
index 83feff79..227c9577 100644
--- a/samples/htmx_website_with_webstencils/bin/templates/baselayout.html
+++ b/samples/htmx_website_with_webstencils/bin/templates/baselayout.html
@@ -73,7 +73,7 @@
     <main class="container-fluid">
         <div class="parent">
             <!-- Side Navigation -->
-            @import partials/sidenav
+            @import sidenav
             <!-- Main Content Area -->
             <div class="main" id="main">
 @RenderBody
diff --git a/samples/htmx_website_with_webstencils/bin/templates/customers.html b/samples/htmx_website_with_webstencils/bin/templates/customers.html
new file mode 100644
index 00000000..6d8bc223
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/customers.html
@@ -0,0 +1,2 @@
+@layoutpage baselayout
+@import customers_body
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/customers_body.html b/samples/htmx_website_with_webstencils/bin/templates/customers_body.html
new file mode 100644
index 00000000..0abc0657
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/customers_body.html
@@ -0,0 +1,23 @@
+<h1 class="text-2xl font-bold mb-4">Customers</h1>
+<table class="striped">
+    <thead>
+        <tr>
+            <th>Code</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Country</th>
+            <th>DOB</th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach(var cust in customers){
+        <tr>
+            <td>@cust.code</td>
+            <td>@cust.first_name</td>
+            <td>@cust.last_name</td>
+            <td>@cust.country</td>
+            <td>@cust.dob @if (FormatDateTime("yyyy/mm/dd", cust.dob) >= "2000/01/01") {&#128197;}</td>
+        </tr>
+        }
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/home.html b/samples/htmx_website_with_webstencils/bin/templates/home.html
new file mode 100644
index 00000000..096e8530
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/home.html
@@ -0,0 +1,2 @@
+@LayoutPage baselayout
+@import home_body
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/home_body.html b/samples/htmx_website_with_webstencils/bin/templates/home_body.html
new file mode 100644
index 00000000..6d56f37c
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/home_body.html
@@ -0,0 +1,3 @@
+<h1 class="text-2xl font-bold mb-4">HTMX WebSite</h1>
+<p>Powered by DMVCFramework, WebStencils and HTMX</p>
+<p><small>More info about WebStencils <a target="_blank" href="https://docwiki.embarcadero.com/RADStudio/en/WebStencils">here</a></small></p>
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/pages/customers.html b/samples/htmx_website_with_webstencils/bin/templates/pages/customers.html
deleted file mode 100644
index 74915a80..00000000
--- a/samples/htmx_website_with_webstencils/bin/templates/pages/customers.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{{extends "../baselayout.html"}}
-{{block "body"}}
-<h1 class="text-2xl font-bold mb-4">Customers</h1>
-<table class="striped">
-    <thead>
-        <tr>
-            <th>Code</th>
-            <th>First Name</th>
-            <th>Last Name</th>
-            <th>Country</th>
-            <th>DOB</th>
-        </tr>
-    </thead>
-    <tbody>
-        {{if customers}}
-        {{for cust in customers}}
-        <tr>
-            <td>{{:cust.code|lpad,3,"0"}}</td>
-            <td>{{:cust.first_name}}</td>
-            <td>{{:cust.last_name}}</td>
-            <td>{{:cust.country|capitalize}}</td>
-            <td>{{:cust.dob}}{{if cust.dob|ge,"2000/01/01"}}📅{{endif}}</td>
-        </tr>
-        {{endfor}}
-        {{endif}}
-    </tbody>
-</table>
-{{endblock}}
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/pages/home.html b/samples/htmx_website_with_webstencils/bin/templates/pages/home.html
deleted file mode 100644
index 59078084..00000000
--- a/samples/htmx_website_with_webstencils/bin/templates/pages/home.html
+++ /dev/null
@@ -1,3 +0,0 @@
-@LayoutPage baselayout
-<h1 class="text-2xl font-bold mb-4">HTMX WebSite</h1>
-<p>Powered by DMVCFramework, TemplatePro and HTMX</p>
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/posts.html b/samples/htmx_website_with_webstencils/bin/templates/posts.html
new file mode 100644
index 00000000..1ebcf882
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/posts.html
@@ -0,0 +1,2 @@
+@layoutpage baselayout
+@import posts_body
diff --git a/samples/htmx_website_with_webstencils/bin/templates/pages/posts.html b/samples/htmx_website_with_webstencils/bin/templates/posts_body.html
similarity index 91%
rename from samples/htmx_website_with_webstencils/bin/templates/pages/posts.html
rename to samples/htmx_website_with_webstencils/bin/templates/posts_body.html
index ba22a1cd..a78aacc1 100644
--- a/samples/htmx_website_with_webstencils/bin/templates/pages/posts.html
+++ b/samples/htmx_website_with_webstencils/bin/templates/posts_body.html
@@ -1,10 +1,9 @@
-@layoutpage baselayout
 <h1 class="text-2xl font-bold mb-4">Posts</h1>
 @foreach (var p in posts){
 <p>
 <article style="padding: 0.6rem">
     <header style="font-size: 140%">
-        @p.title
+        @(uppercase(p.title))
     </header>
         @p.abstract
     <footer>
diff --git a/samples/htmx_website_with_webstencils/bin/templates/partials/sidenav.html b/samples/htmx_website_with_webstencils/bin/templates/sidenav.html
similarity index 100%
rename from samples/htmx_website_with_webstencils/bin/templates/partials/sidenav.html
rename to samples/htmx_website_with_webstencils/bin/templates/sidenav.html
diff --git a/samples/htmx_website_with_webstencils/bin/templates/users.html b/samples/htmx_website_with_webstencils/bin/templates/users.html
new file mode 100644
index 00000000..714df3c7
--- /dev/null
+++ b/samples/htmx_website_with_webstencils/bin/templates/users.html
@@ -0,0 +1,2 @@
+@layoutpage baselayout
+@import users_body
\ No newline at end of file
diff --git a/samples/htmx_website_with_webstencils/bin/templates/pages/users.html b/samples/htmx_website_with_webstencils/bin/templates/users_body.html
similarity index 88%
rename from samples/htmx_website_with_webstencils/bin/templates/pages/users.html
rename to samples/htmx_website_with_webstencils/bin/templates/users_body.html
index c5dc7b5f..8c61ca09 100644
--- a/samples/htmx_website_with_webstencils/bin/templates/pages/users.html
+++ b/samples/htmx_website_with_webstencils/bin/templates/users_body.html
@@ -1,4 +1,3 @@
-@layoutpage baselayout
 <h1 class="text-2xl font-bold mb-4">Users</h1>
 <table class="striped">
     <thead>
@@ -13,7 +12,7 @@
         <tr>
             <td>@user.first_name</td>
             <td>@user.last_name</td>
-            <td>@user.email</td>
+            <td>@(lowercase(user.email))</td>
         </tr>
         }
         
diff --git a/sources/MVCFramework.View.Renderers.WebStencils.pas b/sources/MVCFramework.View.Renderers.WebStencils.pas
index f11b9fd7..c86174ec 100644
--- a/sources/MVCFramework.View.Renderers.WebStencils.pas
+++ b/sources/MVCFramework.View.Renderers.WebStencils.pas
@@ -179,8 +179,9 @@ begin
   try
     RegisterWSFunctions(lWebStencilsProcessor);
     try
-      lWebStencilsProcessor.OnFile := Self.OnFile;
+      //lWebStencilsProcessor.OnFile := Self.OnFile;
       lWebStencilsProcessor.InputFileName := lViewFileName;
+      lWebStencilsProcessor.PathTemplate := TPath.GetDirectoryName(lViewFileName);
       if Assigned(ViewModel) then
       begin
         for lPair in ViewModel do