diff --git a/spring-web-modules/spring-thymeleaf-2/README.md b/spring-web-modules/spring-thymeleaf-2/README.md
index e21b7b6be7..c5db9a8e0f 100644
--- a/spring-web-modules/spring-thymeleaf-2/README.md
+++ b/spring-web-modules/spring-thymeleaf-2/README.md
@@ -11,4 +11,4 @@ This module contains articles about Spring with Thymeleaf
 - [Working With Arrays in Thymeleaf](https://www.baeldung.com/thymeleaf-arrays)
 - [Working with Boolean in Thymeleaf](https://www.baeldung.com/thymeleaf-boolean)
 - [Working With Custom HTML Attributes in Thymeleaf](https://www.baeldung.com/thymeleaf-custom-html-attributes)
-- [[<-- prev]](/spring-thymeleaf)
+- More articles: [[<-- prev]](../spring-thymeleaf) [[next -->]](../spring-thymeleaf-3)
diff --git a/spring-web-modules/spring-thymeleaf-3/README.md b/spring-web-modules/spring-thymeleaf-3/README.md
index 46ddd6c03f..12f300a6a3 100644
--- a/spring-web-modules/spring-thymeleaf-3/README.md
+++ b/spring-web-modules/spring-thymeleaf-3/README.md
@@ -11,4 +11,4 @@ This module contains articles about Spring with Thymeleaf
 - [Using Hidden Inputs with Spring and Thymeleaf](https://www.baeldung.com/spring-thymeleaf-hidden-inputs)
 - [Thymeleaf Variables](https://www.baeldung.com/thymeleaf-variables)
 - [Displaying Error Messages with Thymeleaf in Spring](https://www.baeldung.com/spring-thymeleaf-error-messages)
-- [[next -->]](/spring-thymeleaf-4)
+- More articles: [[<-- prev]](../spring-thymeleaf-2) [[next -->]](../spring-thymeleaf-4)
diff --git a/spring-web-modules/spring-thymeleaf-4/README.md b/spring-web-modules/spring-thymeleaf-4/README.md
index f8dc4c8b4e..b8c18965bc 100644
--- a/spring-web-modules/spring-thymeleaf-4/README.md
+++ b/spring-web-modules/spring-thymeleaf-4/README.md
@@ -2,26 +2,14 @@
 
 This module contains articles about Spring with Thymeleaf
 
-### Relevant Articles: 
-- [CSRF Protection with Spring MVC and Thymeleaf](https://www.baeldung.com/csrf-thymeleaf-with-spring-security)
-- [Conditionals in Thymeleaf](https://www.baeldung.com/spring-thymeleaf-conditionals)
-- [Iteration in Thymeleaf](https://www.baeldung.com/thymeleaf-iteration)
-- [Spring with Thymeleaf Pagination for a List](https://www.baeldung.com/spring-thymeleaf-pagination)
+## Relevant Articles:
 
-### Build the Project
-
-mvn clean install
-
-### Run the Project
-
-mvn cargo:run
-- **note**: starts on port '8082'
-
-Access the pages using the URLs:
-
- - http://localhost:8082/spring-thymeleaf-4/
- - http://localhost:8082/spring-thymeleaf-4/addStudent/
- - http://localhost:8082/spring-thymeleaf-4/listStudents/
-
-The first URL is the home page of the application. The home page has links to the second and third pages.
+- [Changing the Thymeleaf Template Directory in Spring Boot](https://www.baeldung.com/spring-thymeleaf-template-directory)
+- [Add a Checked Attribute to Input Conditionally in Thymeleaf](https://www.baeldung.com/thymeleaf-conditional-checked-attribute)
+- [Spring MVC Data and Thymeleaf](https://www.baeldung.com/spring-mvc-thymeleaf-data)
+- [Upload Image With Spring Boot and Thymeleaf](https://www.baeldung.com/spring-boot-thymeleaf-image-upload)
+- [Getting a URL Attribute Value in Thymeleaf](https://www.baeldung.com/thymeleaf-url-attribute-value)
+- [Expression Types in Thymeleaf](https://www.baeldung.com/java-thymeleaf-expression-types)
+- [Difference Between th:text and th:value in Thymeleaf](https://www.baeldung.com/java-thymeleaf-text-vs-value)
+- More articles: [[<-- prev]](../spring-thymeleaf-3) [[next -->]](../spring-thymeleaf-5)
 
diff --git a/spring-web-modules/spring-thymeleaf-4/pom.xml b/spring-web-modules/spring-thymeleaf-4/pom.xml
index 163d590c9f..2582044c0f 100644
--- a/spring-web-modules/spring-thymeleaf-4/pom.xml
+++ b/spring-web-modules/spring-thymeleaf-4/pom.xml
@@ -9,139 +9,33 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
-        <!-- Spring -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <!-- Exclude Commons Logging in favor of SLF4j -->
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>${spring-data.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>${javax.validation-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
-        </dependency>
-        <!-- Spring Security -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-        <!-- Thymeleaf -->
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf</artifactId>
-            <version>${org.thymeleaf-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf-spring5</artifactId>
-            <version>${org.thymeleaf-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>nz.net.ultraq.thymeleaf</groupId>
-            <artifactId>thymeleaf-layout-dialect</artifactId>
-            <version>${thymeleaf-layout-dialect.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-java8time</artifactId>
-            <version>${org.thymeleaf.extras-version}</version>
-        </dependency>
-        <!-- Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <version>${spring-security.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>${cargo-maven2-plugin.version}</version>
-                <configuration>
-                    <wait>true</wait>
-                    <container>
-                        <containerId>jetty9x</containerId>
-                        <type>embedded</type>
-                        <systemProperties>
-                        </systemProperties>
-                    </container>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>8082</cargo.servlet.port>
-                        </properties>
-                    </configuration>
-                </configuration>
-            </plugin>
-        </plugins>
+        <finalName>spring-thymeleaf-4</finalName>
     </build>
 
     <properties>
-        <spring-data.version>2.3.2.RELEASE</spring-data.version>
-        <org.thymeleaf-version>3.0.11.RELEASE</org.thymeleaf-version>
-        <org.thymeleaf.extras-version>3.0.4.RELEASE</org.thymeleaf.extras-version>
-        <thymeleaf-layout-dialect.version>2.4.1</thymeleaf-layout-dialect.version>
-        <javax.validation-version>2.0.1.Final</javax.validation-version>
-        <hibernate-validator.version>6.0.11.Final</hibernate-validator.version>
-        <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/Application.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/Application.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/Application.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/Application.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attribute/CheckedAttributeController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/attribute/CheckedAttributeController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attribute/CheckedAttributeController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/attribute/CheckedAttributeController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/expression/Dino.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/expression/Dino.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/expression/Dino.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/expression/Dino.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/expression/DinoController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/expression/DinoController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/expression/DinoController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/expression/DinoController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/imageupload/UploadController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/imageupload/UploadController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/imageupload/UploadController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/imageupload/UploadController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/url/UrlController.java b/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/url/UrlController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/url/UrlController.java
rename to spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/url/UrlController.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/application.properties b/spring-web-modules/spring-thymeleaf-4/src/main/resources/application.properties
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/application.properties
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/application.properties
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/messages.properties b/spring-web-modules/spring-thymeleaf-4/src/main/resources/messages.properties
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/messages.properties
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/messages.properties
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-2/hello.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-2/hello.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-2/hello.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-2/hello.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/form.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/form.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/form.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/form.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/index.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/index.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/index.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/index.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/result.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/result.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates-3/result.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates-3/result.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attribute/index.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/attribute/index.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attribute/index.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/attribute/index.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attributes/index.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/attributes/index.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attributes/index.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/attributes/index.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/imageupload/index.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/imageupload/index.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/imageupload/index.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/imageupload/index.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-bean-data.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-bean-data.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-bean-data.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-bean-data.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-model-attributes.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-model-attributes.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-model-attributes.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-model-attributes.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-request-parameters.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-request-parameters.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-request-parameters.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-request-parameters.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-servlet-context.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-servlet-context.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-servlet-context.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-servlet-context.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-session-attributes.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-session-attributes.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/mvcdata/email-session-attributes.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/mvcdata/email-session-attributes.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/url/index.html b/spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/url/index.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/url/index.html
rename to spring-web-modules/spring-thymeleaf-4/src/main/resources/templates/url/index.html
diff --git a/spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java b/spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java
rename to spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java
diff --git a/spring-web-modules/spring-thymeleaf-5/src/test/resources/logback-test.xml b/spring-web-modules/spring-thymeleaf-4/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-5/src/test/resources/logback-test.xml
rename to spring-web-modules/spring-thymeleaf-4/src/test/resources/logback-test.xml
diff --git a/spring-web-modules/spring-thymeleaf-5/README.md b/spring-web-modules/spring-thymeleaf-5/README.md
index 34dd122cbf..51efdfea0f 100644
--- a/spring-web-modules/spring-thymeleaf-5/README.md
+++ b/spring-web-modules/spring-thymeleaf-5/README.md
@@ -2,13 +2,26 @@
 
 This module contains articles about Spring with Thymeleaf
 
-## Relevant Articles:
+### Relevant Articles: 
+- [CSRF Protection with Spring MVC and Thymeleaf](https://www.baeldung.com/csrf-thymeleaf-with-spring-security)
+- [Conditionals in Thymeleaf](https://www.baeldung.com/spring-thymeleaf-conditionals)
+- [Iteration in Thymeleaf](https://www.baeldung.com/thymeleaf-iteration)
+- [Spring with Thymeleaf Pagination for a List](https://www.baeldung.com/spring-thymeleaf-pagination)
+- More articles: [[<-- prev]](../spring-thymeleaf-4)
+### Build the Project
+
+mvn clean install
+
+### Run the Project
+
+mvn cargo:run
+- **note**: starts on port '8082'
+
+Access the pages using the URLs:
+
+ - http://localhost:8082/spring-thymeleaf-5/
+ - http://localhost:8082/spring-thymeleaf-5/addStudent/
+ - http://localhost:8082/spring-thymeleaf-5/listStudents/
+
+The first URL is the home page of the application. The home page has links to the second and third pages.
 
-- [Changing the Thymeleaf Template Directory in Spring Boot](https://www.baeldung.com/spring-thymeleaf-template-directory)
-- [Add a Checked Attribute to Input Conditionally in Thymeleaf](https://www.baeldung.com/thymeleaf-conditional-checked-attribute)
-- [Spring MVC Data and Thymeleaf](https://www.baeldung.com/spring-mvc-thymeleaf-data)
-- [Upload Image With Spring Boot and Thymeleaf](https://www.baeldung.com/spring-boot-thymeleaf-image-upload)
-- [Getting a URL Attribute Value in Thymeleaf](https://www.baeldung.com/thymeleaf-url-attribute-value)
-- [Expression Types in Thymeleaf](https://www.baeldung.com/java-thymeleaf-expression-types)
-- [Difference Between th:text and th:value in Thymeleaf](https://www.baeldung.com/java-thymeleaf-text-vs-value)
-- [[<-- prev]](/spring-thymeleaf)
diff --git a/spring-web-modules/spring-thymeleaf-5/pom.xml b/spring-web-modules/spring-thymeleaf-5/pom.xml
index e7c54d83c9..0717e41bac 100644
--- a/spring-web-modules/spring-thymeleaf-5/pom.xml
+++ b/spring-web-modules/spring-thymeleaf-5/pom.xml
@@ -9,33 +9,139 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
+        <!-- Spring -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${spring-data.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${javax.validation-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <!-- Spring Security -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${spring-security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>${spring-security.version}</version>
+        </dependency>
+        <!-- Thymeleaf -->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring5</artifactId>
+            <version>${org.thymeleaf-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>nz.net.ultraq.thymeleaf</groupId>
+            <artifactId>thymeleaf-layout-dialect</artifactId>
+            <version>${thymeleaf-layout-dialect.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-java8time</artifactId>
+            <version>${org.thymeleaf.extras-version}</version>
+        </dependency>
+        <!-- Servlet -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>spring-thymeleaf-5</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>jetty9x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <properties>
-        <tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
+        <spring-data.version>2.3.2.RELEASE</spring-data.version>
+        <org.thymeleaf-version>3.0.11.RELEASE</org.thymeleaf-version>
+        <org.thymeleaf.extras-version>3.0.4.RELEASE</org.thymeleaf.extras-version>
+        <thymeleaf-layout-dialect.version>2.4.1</thymeleaf-layout-dialect.version>
+        <javax.validation-version>2.0.1.Final</javax.validation-version>
+        <hibernate-validator.version>6.0.11.Final</hibernate-validator.version>
+        <!-- Maven plugins -->
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebApp.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebApp.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebApp.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebApp.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/BookController.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/BookController.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Book.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Book.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Book.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Book.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Student.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Student.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Student.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Student.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Teacher.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Teacher.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/model/Teacher.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/model/Teacher.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/service/BookService.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/service/BookService.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/service/BookService.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/service/BookService.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java
rename to spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/resources/logback.xml b/spring-web-modules/spring-thymeleaf-5/src/main/resources/logback.xml
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/resources/logback.xml
rename to spring-web-modules/spring-thymeleaf-5/src/main/resources/logback.xml
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/resources/messages_en.properties b/spring-web-modules/spring-thymeleaf-5/src/main/resources/messages_en.properties
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/resources/messages_en.properties
rename to spring-web-modules/spring-thymeleaf-5/src/main/resources/messages_en.properties
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/addStudent.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/addStudent.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/addStudent.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/addStudent.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/csrfAttack.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/csrfAttack.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/csrfAttack.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/csrfAttack.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/home.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/home.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/home.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/home.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listBooks.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listBooks.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listBooks.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listBooks.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listStudents.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listStudents.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listStudents.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listStudents.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listTeachers.html b/spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listTeachers.html
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/main/webapp/WEB-INF/views/listTeachers.html
rename to spring-web-modules/spring-thymeleaf-5/src/main/webapp/WEB-INF/views/listTeachers.html
diff --git a/spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java b/spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java
rename to spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/controller/ControllerIntegrationTest.java b/spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/controller/ControllerIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/controller/ControllerIntegrationTest.java
rename to spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/controller/ControllerIntegrationTest.java
diff --git a/spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java b/spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-thymeleaf-4/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java
rename to spring-web-modules/spring-thymeleaf-5/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java
diff --git a/spring-web-modules/spring-thymeleaf/README.md b/spring-web-modules/spring-thymeleaf/README.md
index 653e6df5b9..b49095f5b1 100644
--- a/spring-web-modules/spring-thymeleaf/README.md
+++ b/spring-web-modules/spring-thymeleaf/README.md
@@ -10,7 +10,7 @@ This module contains articles about Spring with Thymeleaf
 - [How to Work with Dates in Thymeleaf](https://www.baeldung.com/dates-in-thymeleaf)
 - [Working with Fragments in Thymeleaf](https://www.baeldung.com/spring-thymeleaf-fragments)
 - [JavaScript Function Call with Thymeleaf](https://www.baeldung.com/thymeleaf-js-function-call)
-- [[next -->]](/spring-thymeleaf-2)
+- [[next -->]](../spring-thymeleaf-2)
 
 ### Build the Project