diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index ab30257..7c6f83e 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<version>2.1.5.RELEASE</version>
+			<version>3.1.0.M1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
index 5a11404..3e5da3c 100644
--- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
+++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java
@@ -21,7 +21,7 @@ public class HotelsController {
 	}
 
 	@GetMapping("/hotels/search")
-	public void search(SearchCriteria searchCriteria, Principal currentUser, Model model) {
+	public void search(@SuppressWarnings("unused") SearchCriteria searchCriteria, Principal currentUser, Model model) {
 		if (currentUser != null) {
 			List<Booking> booking = bookingService.findBookings(currentUser.getName());
 			model.addAttribute(booking);
diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
index c31f82b..6d496b0 100644
--- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
+++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java
@@ -5,6 +5,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 @Configuration
 @EnableWebSecurity
@@ -20,7 +21,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 				.failureUrl("/login?login_error=1")
 				.and()
 			.logout()
-				.logoutUrl("/logout")
+				.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET"))
 				.logoutSuccessUrl("/logoutSuccess");
 	}
 
diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java
index 2fe49a3..31a979f 100644
--- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java
+++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java
@@ -45,7 +45,7 @@ public class WebFlowConfig extends AbstractFlowConfiguration {
 	@Bean
 	public MvcViewFactoryCreator mvcViewFactoryCreator() {
 		MvcViewFactoryCreator factoryCreator = new MvcViewFactoryCreator();
-		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.tilesViewResolver()));
+		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.thymeleafViewResolver()));
 		factoryCreator.setUseSpringBeanBinding(true);
 		return factoryCreator;
 	}
diff --git a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java
index 9c4980b..4851e13 100644
--- a/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java
+++ b/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java
@@ -3,34 +3,43 @@ package org.springframework.webflow.samples.booking.config;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import jakarta.servlet.ServletContext;
+import org.thymeleaf.dialect.IDialect;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring6.view.AjaxThymeleafViewResolver;
+import org.thymeleaf.spring6.view.FlowAjaxThymeleafView;
+import org.thymeleaf.templateresolver.WebApplicationTemplateResolver;
+import org.thymeleaf.web.IWebApplication;
+import org.thymeleaf.web.servlet.JakartaServletWebApplication;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter;
 import org.springframework.webflow.mvc.servlet.FlowHandlerMapping;
 import org.springframework.webflow.samples.booking.BookingFlowHandler;
-import org.thymeleaf.dialect.IDialect;
-import org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect;
-import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
-import org.thymeleaf.extras.tiles2.dialect.TilesDialect;
-import org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer;
-import org.thymeleaf.extras.tiles2.spring4.web.view.FlowAjaxThymeleafTilesView;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.spring4.view.AjaxThymeleafViewResolver;
-import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
 @EnableWebMvc
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer, ServletContextAware {
 
 	@Autowired
 	private WebFlowConfig webFlowConfig;
 
+	private ServletContext servletContext;
+
+	@Override
+	public void setServletContext(ServletContext servletContext) {
+		this.servletContext = servletContext;
+	}
+
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("/resources/**").addResourceLocations("/", "classpath:/META-INF/web-resources/");
@@ -70,9 +79,9 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	}
 
 	@Bean
-	public AjaxThymeleafViewResolver tilesViewResolver() {
+	public AjaxThymeleafViewResolver thymeleafViewResolver() {
 		AjaxThymeleafViewResolver viewResolver = new AjaxThymeleafViewResolver();
-		viewResolver.setViewClass(FlowAjaxThymeleafTilesView.class);
+		viewResolver.setViewClass(FlowAjaxThymeleafView.class);
 		viewResolver.setTemplateEngine(templateEngine());
 		return viewResolver;
 	}
@@ -80,10 +89,8 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	@Bean
 	public SpringTemplateEngine templateEngine(){
 
-		Set<IDialect> dialects = new LinkedHashSet<IDialect>();
-		dialects.add(new TilesDialect());
+		Set<IDialect> dialects = new LinkedHashSet<>();
 		dialects.add(new SpringSecurityDialect());
-		dialects.add(new ConditionalCommentsDialect());
 
 		SpringTemplateEngine templateEngine = new SpringTemplateEngine();
 		templateEngine.setTemplateResolver(templateResolver());
@@ -92,18 +99,13 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
 	}
 
 	@Bean
-	public ServletContextTemplateResolver templateResolver() {
-		ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
-		templateResolver.setPrefix("/WEB-INF");
-		templateResolver.setTemplateMode("HTML5");
-		return templateResolver;
-	}
-
-	@Bean
-	public ThymeleafTilesConfigurer tilesConfigurer() {
-		ThymeleafTilesConfigurer configurer = new ThymeleafTilesConfigurer();
-		configurer.setDefinitions("/WEB-INF/**/views.xml");
-		return configurer;
+	public WebApplicationTemplateResolver templateResolver() {
+		IWebApplication application = JakartaServletWebApplication.buildApplication(this.servletContext);
+		WebApplicationTemplateResolver resolver = new WebApplicationTemplateResolver(application);
+		resolver.setPrefix("/WEB-INF/");
+		resolver.setSuffix(".html");
+		resolver.setTemplateMode("HTML5");
+		return resolver;
 	}
 
 }
diff --git a/booking-mvc/src/main/resources/log4j2.xml b/booking-mvc/src/main/resources/log4j2.xml
index bb09f49..22aa0ba 100644
--- a/booking-mvc/src/main/resources/log4j2.xml
+++ b/booking-mvc/src/main/resources/log4j2.xml
@@ -8,6 +8,7 @@
 	<Loggers>
 		<Logger name="org.springframework.samples" level="debug" />
 		<Logger name="org.springframework.web" level="debug" />
+		<Logger name="org.thymeleaf.spring6" level="debug" />
 		<Root level="info">
 			<AppenderRef ref="Console" />
 		</Root>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
index d166884..be94c71 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
@@ -13,7 +13,7 @@
 		<evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" />
 	</on-start>
 	
-	<view-state id="enterBookingDetails" model="booking">
+	<view-state id="enterBookingDetails" model="booking" view="/hotels/booking/enterBookingDetails.html">
 		<binder>
 			<binding property="checkinDate" />
 			<binding property="checkoutDate" />
@@ -32,7 +32,7 @@
 		<transition on="cancel" to="cancel" bind="false" />
 	</view-state>
 	
-	<view-state id="reviewBooking">
+	<view-state id="reviewBooking" view="/hotels/booking/reviewBooking.html">
 		<on-render>
 			<render fragments="body" />
 		</on-render>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
index 83c00ef..db4f37d 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.html
@@ -1,55 +1,36 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../../../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../../../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../../../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../../../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
 
-
-<div id="bookingForm">
+<div th:fragment="bodyContent">
 
     <div class="span-5">
     
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
index 7d9638c..c1064d8 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.html
@@ -1,53 +1,33 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../../../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../../../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../../../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../../../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
-
-
+<body th:replace="layouts/standard.html :: body(~{::#messages})">
 
 
 <div id="messages">
@@ -58,8 +38,5 @@
 
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
index a54a00a..ef39373 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.html
@@ -1,55 +1,35 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../../../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../../../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../../../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../../../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
-
-
-<div id="bookingForm">
+<div th:fragment="bodyContent">
 
     <div class="span-5">
     
@@ -126,10 +106,6 @@
 
 </div>
 
-
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
deleted file mode 100644
index a085f66..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-		"https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-	
-<tiles-definitions>
-	
-	<definition name="enterBookingDetails" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/booking/enterBookingDetails.html :: content" type="thymeleaf"/>
-	</definition>
-
-	<definition name="reviewBooking" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/booking/reviewBooking.html :: content" type="thymeleaf"/>
-	</definition>
-	
-</tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
index d6bbc21..abfd1ce 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.html
@@ -1,16 +1,13 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
       xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
@@ -26,29 +23,15 @@
         <link rel="stylesheet" type="text/css" media="screen, projection"
               href="../../styles/blueprint/ie.css" />
     <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen" href="../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
 
-<div id="bookings" sec:authorize="hasRole('ROLE_USER')">
+<div th:fragment="bodyContent" sec:authorize="hasRole('ROLE_USER')">
 
     <h2>Current Hotel Bookings</h2>
 
@@ -87,10 +70,6 @@
     
 </div>
 
-
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
index 45e8150..d60087e 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/list.html
@@ -1,16 +1,12 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
@@ -26,28 +22,14 @@
         <link rel="stylesheet" type="text/css" media="screen, projection"
               href="../../styles/blueprint/ie.css" />
     <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
+    <link rel="stylesheet" type="text/css" media="screen" href="../styles/booking.css" />
     
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
-
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
+<div th:fragment="bodyContent">
 
 <h1>Hotel Results</h1>
 
@@ -55,14 +37,12 @@
     <a id="changeSearchLink" href="#" 
        th:href="@{hotels/search(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize})}">Change Search</a>
     <script type="text/javascript">
-        // <![CDATA[
         Spring.addDecoration(new Spring.AjaxEventDecoration({
             elementId: "changeSearchLink",
             event: "onclick",
             popup: true,
-            params: {fragments: "searchForm"}       
+            params: {fragments: "#searchForm"}
         }));
-        // ]]>
     </script>
 </p>
 
@@ -100,13 +80,11 @@
                 <a id="prevResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page - 1})}">Previous Results</a>
                 <script type="text/javascript">
-                    // <![CDATA[
                     Spring.addDecoration(new Spring.AjaxEventDecoration({
                         elementId: "prevResultsLink",
                         event: "onclick",
-                        params: {fragments: "body"}
+                        params: {fragments: "#hotelResults"}
                     }));
-                    // ]]>
                 </script>
             </div>
         </div>
@@ -115,13 +93,11 @@
                 <a id="moreResultsLink" href="#" 
                    th:href="@{hotels(searchString=${searchCriteria.searchString},pageSize=${searchCriteria.pageSize},page=${searchCriteria.page + 1})}">More Results</a>
                 <script type="text/javascript">
-                    // <![CDATA[
                     Spring.addDecoration(new Spring.AjaxEventDecoration({
                         elementId: "moreResultsLink",
                         event: "onclick",
-                        params: {fragments: "body"}     
+                        params: {fragments: "#hotelResults"}
                     }));
-                    // ]]>
                 </script>
             </div>      
         </div>
@@ -130,10 +106,8 @@
 
 </div>  
 
+</div>
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
index 35f5f0a..a1cc521 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/search.html
@@ -1,16 +1,12 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
@@ -27,42 +23,25 @@
               href="../../styles/blueprint/ie.css" />
     <![endif]-->
     
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../styles/booking.css" />
+    <link rel="stylesheet" type="text/css" media="screen" href="../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
+<div th:fragment="bodyContent">
 
-
-<div tiles:include="searchForm">
+<div id="searchForm" th:replace="hotels/searchForm.html :: bodyContent">
    A search form will go here. See it at <a href="searchForm.html">searchForm.html</a>. 
 </div>
 
-<div tiles:include="bookingsTable">
+<div th:replace="hotels/bookingsTable.html :: bodyContent">
    A table with the current hotel bookings will go here. 
    See it at <a href="bookingsTable.html">bookingsTable.html</a>. 
 </div>
 
-
+</div>
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
index f337b8c..249c313 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.html
@@ -5,12 +5,10 @@
       xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
@@ -26,27 +24,14 @@
         <link rel="stylesheet" type="text/css" media="screen, projection"
               href="../../styles/blueprint/ie.css" />
     <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen" href="../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
+<div th:fragment="bodyContent">
 
 <h1>Search Hotels</h1>
 
@@ -86,10 +71,8 @@
     
 </form>
 
+</div>
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
index e4f6489..421e05e 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/hotels/show.html
@@ -5,49 +5,33 @@
       xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
-
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
+<div th:fragment="bodyContent">
 
 <h1 th:text="${hotel.name}">The Herb Plaza</h1>
 
@@ -71,11 +55,8 @@
     </div>
 </form>
 
-
+</div>
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
deleted file mode 100644
index a697ace..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-		"https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-	
-<tiles-definitions>
-	
-	<definition name="hotels/search" extends="standardLayout">
-		<put-attribute name="body">
-			<definition template="/hotels/search.html :: content" templateType="thymeleaf">
-				<put-attribute name="searchForm" value="/hotels/searchForm.html :: content" type="thymeleaf"/>
-				<put-attribute name="bookingsTable" value="/hotels/bookingsTable.html :: content" type="thymeleaf"/>
-			</definition>
-		</put-attribute>
-	</definition>
-
-	<definition name="hotels/*" extends="standardLayout" templateType="thymeleaf">
-		<put-attribute name="body" value="/hotels/{1}.html :: content" type="thymeleaf"/>
-	</definition>
-
-</tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/intro.html b/booking-mvc/src/main/webapp/WEB-INF/intro.html
index f697b58..233e1a4 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/intro.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/intro.html
@@ -1,16 +1,12 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
@@ -23,31 +19,17 @@
           href="../styles/blueprint/print.css" />
     
     <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
+    <link rel="stylesheet" type="text/css" media="screen, projection"
               href="../styles/blueprint/ie.css" />
     <![endif]-->
     
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../styles/booking.css" />
+    <link rel="stylesheet" type="text/css" media="screen" href="../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
-<div>
+<div th:fragment="bodyContent">
     <h1>Welcome to Spring Travel</h1>
     <p>
         This sample demonstrates how to use Spring MVC and Spring Web Flow together with Thymeleaf and Tiles.
@@ -77,10 +59,6 @@
     </p>
 </div>
 
-
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
index fb1c2de..8706d91 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
       xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
@@ -41,7 +40,7 @@
 </head>
 
 
-<body class="tundra">
+<body class="tundra" th:fragment="body(bodyContent)">
 
 <div id="page" class="container">
 
@@ -77,16 +76,10 @@
                 </a>
             </p>
         </div>
-        <div id="main" class="span-18 last" tiles:include="body">
+        <div id="main" class="span-18 last" th:insert="${bodyContent}">
 
-          <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->      
-          <!-- At runtime, the body of this <div> will be substituted by -->
-          <!-- Tiles in order to create the final HTML page that will be -->
-          <!-- sent to the browser.                                      -->
-          <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->      
-          
           BODY PAGE GOES HERE!
-          
+
         </div>
     </div>
     
diff --git a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
deleted file mode 100644
index dac7eb1..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC
-		"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-		"https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<tiles-definitions>
-	
-    <definition name="standardLayout" template="/layouts/standard.html" templateType="thymeleaf"/>
-<!--     <definition name="standardLayoutJSP" template="/WEB-INF/layouts/standard.jsp" templateType="jsp"/> -->
-    	
-</tiles-definitions>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/login.html b/booking-mvc/src/main/webapp/WEB-INF/login.html
index d67df11..9f8b5c7 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/login.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/login.html
@@ -1,52 +1,35 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
-      xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
+<div th:fragment="bodyContent">
 
 <div class="span-5">
     <p>Valid username/passwords are:</p>
@@ -127,6 +110,7 @@
     
 </div>
 
+</div>
 
 </body>
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
index b8552d5..00f4f08 100644
--- a/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
+++ b/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.html
@@ -2,53 +2,35 @@
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:th="http://www.thymeleaf.org"
       xmlns:tiles="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org"
       lang="en">
 
-<head>
+<head th:replace="layouts/standard.html :: //head">
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- This <head> section is only used for static prototyping purposes. At runtime, -->
-    <!-- Tiles will only use the body fragment defined with tiles:fragment="content",  --> 
-    <!-- as specified at the corresponding views.xml file.                             -->
+    <!-- This <head> section is only used for static prototyping purposes.             -->
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <title>Spring Travel: Spring MVC and Web Flow Reference Application</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    
-    <link rel="stylesheet" type="text/css" media="screen, projection" 
-          href="../styles/blueprint/screen.css" />
-    
-    <link rel="stylesheet" type="text/css" media="print" 
-          href="../styles/blueprint/print.css" />
-    
-    <!--[if lt IE 8]>
-        <link rel="stylesheet" type="text/css" media="screen, projection"
-              href="../styles/blueprint/ie.css" />
-    <![endif]-->
-    
-    <link rel="stylesheet" type="text/css" media="screen" 
-          href="../styles/booking.css" />
 
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Some styles and scripts are served from spring-js-resources-{ver}.jar at -->
-    <!-- runtime. Therefore not available for static prototyping. See the         -->
-    <!-- layouts/standard.html template file for detail.                          -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../styles/blueprint/screen.css" />
+
+    <link rel="stylesheet" type="text/css" media="print"
+          href="../styles/blueprint/print.css" />
+
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" media="screen, projection"
+          href="../styles/blueprint/ie.css" />
+    <![endif]-->
+
+    <link rel="stylesheet" type="text/css" media="screen" href="../styles/booking.css" />
+
 </head>
 
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- START of the content to be included in the execution result.  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Only the markup inside this <body> would be required in this  -->
-<!-- template if no static prototyping was intended.               -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<body tiles:fragment="content">
+<body th:replace="layouts/standard.html :: body(~{::bodyContent})">
 
-
-<div>
+<div th:fragment="bodyContent">
     <h1>Logout</h1>
     <p>You have successfully logged out.</p>
     <hr />
@@ -57,8 +39,5 @@
 
 
 </body>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- END of the content to be included in the execution result -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 </html>
diff --git a/booking-mvc/src/main/webapp/WEB-INF/views.xml b/booking-mvc/src/main/webapp/WEB-INF/views.xml
deleted file mode 100644
index e1ffede..0000000
--- a/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC
-	"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-	"https://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-	
-<tiles-definitions>
-	
-	<definition name="intro" extends="standardLayout">
-		<put-attribute name="body" value="/intro.html :: content" type="thymeleaf"/>
-	</definition>
-	
-	<definition name="login" extends="standardLayout">
-		<put-attribute name="body" value="/login.html :: content" type="thymeleaf"/>
-	</definition>
-	
-	<definition name="logoutSuccess" extends="standardLayout">
-		<put-attribute name="body" value="/logoutSuccess.html :: content" type="thymeleaf"/>
-	</definition>
-	
-</tiles-definitions>