diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 772bbbb219..a9bbf71ba3 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -1,16 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-mvc-java</artifactId>
     <version>0.1-SNAPSHOT</version>
-
     <name>spring-mvc-java</name>
     <packaging>war</packaging>
-
     <dependencies>
-
         <!-- Spring -->
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -21,64 +18,53 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${org.springframework.version}</version>
         </dependency>
-
         <!-- web -->
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>1.2</version>
             <scope>runtime</scope>
         </dependency>
-
         <!-- AOP -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
             <version>${org.springframework.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
             <version>${aspectj.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
             <version>${aspectj.version}</version>
         </dependency>
-
         <!-- logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${org.slf4j.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${org.slf4j.version}</version>
         </dependency>
-
         <!-- test scoped -->
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit-dep</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -91,23 +77,30 @@
             <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
-
+        <!-- Thymeleaf -->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring4</artifactId>
+            <version>${thymeleaf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>${thymeleaf.version}</version>
+        </dependency>
     </dependencies>
-
     <build>
         <finalName>spring-mvc-java</finalName>
         <resources>
@@ -116,9 +109,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -128,7 +119,10 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -137,7 +131,6 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -151,7 +144,6 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
@@ -172,50 +164,46 @@
                     </configuration>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <path>/</path>
+                </configuration>
+            </plugin>
         </plugins>
-
     </build>
-
     <properties>
         <!-- Spring -->
         <org.springframework.version>4.2.2.RELEASE</org.springframework.version>
         <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
-
+        <thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
         <!-- persistence -->
         <hibernate.version>4.3.11.Final</hibernate.version>
         <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
-
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
-
         <!-- various -->
         <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
-
         <!-- util -->
         <guava.version>18.0</guava.version>
         <commons-lang3.version>3.4</commons-lang3.version>
-
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.11</junit.version>
         <mockito.version>1.10.19</mockito.version>
-
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
-
         <rest-assured.version>2.4.1</rest-assured.version>
-
         <!-- maven plugins -->
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
-
         <!-- AspectJ -->
         <aspectj.version>1.8.7</aspectj.version>
     </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/org/baeldung/controller/UserController.java b/spring-mvc-java/src/main/java/org/baeldung/controller/UserController.java
new file mode 100644
index 0000000000..3203296a17
--- /dev/null
+++ b/spring-mvc-java/src/main/java/org/baeldung/controller/UserController.java
@@ -0,0 +1,31 @@
+package org.baeldung.controller;
+
+import org.baeldung.model.UserDetails;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+@RequestMapping("/")
+public class UserController {
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public String showForm(final Model model) {
+        final UserDetails user = new UserDetails();
+        user.setFirstname("John");
+        user.setLastname("Roy");
+        user.setEmailId("John.Roy@gmail.com");
+        model.addAttribute("user", user);
+        return "index";
+    }
+
+    @RequestMapping(value = "/processForm", method = RequestMethod.POST)
+    public String processForm(@ModelAttribute(value = "user") final UserDetails user, final Model model) {
+        // Insert userDetails into DB
+        model.addAttribute("name", user.getFirstname() + " " + user.getLastname());
+        return "hello";
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/org/baeldung/dialect/CustomDialect.java b/spring-mvc-java/src/main/java/org/baeldung/dialect/CustomDialect.java
new file mode 100644
index 0000000000..e6d1ad6b74
--- /dev/null
+++ b/spring-mvc-java/src/main/java/org/baeldung/dialect/CustomDialect.java
@@ -0,0 +1,24 @@
+package org.baeldung.dialect;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.baeldung.processor.NameProcessor;
+import org.thymeleaf.dialect.AbstractDialect;
+import org.thymeleaf.processor.IProcessor;
+
+public class CustomDialect extends AbstractDialect {
+
+    @Override
+    public String getPrefix() {
+        return "custom";
+    }
+
+    @Override
+    public Set<IProcessor> getProcessors() {
+        final Set<IProcessor> processors = new HashSet<IProcessor>();
+        processors.add(new NameProcessor());
+        return processors;
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/org/baeldung/model/UserDetails.java b/spring-mvc-java/src/main/java/org/baeldung/model/UserDetails.java
new file mode 100644
index 0000000000..d0b37fae8a
--- /dev/null
+++ b/spring-mvc-java/src/main/java/org/baeldung/model/UserDetails.java
@@ -0,0 +1,32 @@
+package org.baeldung.model;
+
+public class UserDetails {
+    private String firstname;
+    private String lastname;
+    private String emailId;
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(final String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(final String lastname) {
+        this.lastname = lastname;
+    }
+
+    public String getEmailId() {
+        return emailId;
+    }
+
+    public void setEmailId(final String emailId) {
+        this.emailId = emailId;
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/org/baeldung/processor/NameProcessor.java b/spring-mvc-java/src/main/java/org/baeldung/processor/NameProcessor.java
new file mode 100644
index 0000000000..df9a4da7f0
--- /dev/null
+++ b/spring-mvc-java/src/main/java/org/baeldung/processor/NameProcessor.java
@@ -0,0 +1,23 @@
+package org.baeldung.processor;
+
+import org.thymeleaf.Arguments;
+import org.thymeleaf.dom.Element;
+import org.thymeleaf.processor.attr.AbstractTextChildModifierAttrProcessor;
+
+public class NameProcessor extends AbstractTextChildModifierAttrProcessor {
+
+    public NameProcessor() {
+        super("name");
+    }
+
+    @Override
+    protected String getText(final Arguments arguements, final Element elements, final String attributeName) {
+        return "Hello, " + elements.getAttributeValue(attributeName) + "!";
+    }
+
+    @Override
+    public int getPrecedence() {
+        return 1000;
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java b/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
index 945c1794fb..50681e88f6 100644
--- a/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
+++ b/spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ClientWebConfig.java
@@ -1,16 +1,28 @@
 package org.baeldung.spring.web.config;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import org.baeldung.dialect.CustomDialect;
+import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Description;
+import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.web.servlet.ViewResolver;
 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.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.JstlView;
+import org.thymeleaf.dialect.IDialect;
+import org.thymeleaf.spring4.SpringTemplateEngine;
+import org.thymeleaf.spring4.view.ThymeleafViewResolver;
+import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
 @EnableWebMvc
 @Configuration
+@ComponentScan("org.baeldung.controller")
 public class ClientWebConfig extends WebMvcConfigurerAdapter {
 
     public ClientWebConfig() {
@@ -28,12 +40,49 @@ public class ClientWebConfig extends WebMvcConfigurerAdapter {
 
     @Bean
     public ViewResolver viewResolver() {
-        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
-
+        /*final InternalResourceViewResolver bean = new InternalResourceViewResolver();
         bean.setViewClass(JstlView.class);
         bean.setPrefix("/WEB-INF/view/");
-        bean.setSuffix(".jsp");
+        bean.setSuffix(".jsp");*/
 
-        return bean;
+        final ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+        viewResolver.setTemplateEngine(templateEngine());
+
+        return viewResolver;
     }
+
+    @Bean
+    @Description("Thymeleaf template resolver serving HTML 5")
+    public ServletContextTemplateResolver templateResolver() {
+        final ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
+        templateResolver.setPrefix("/WEB-INF/templates/");
+        templateResolver.setSuffix(".html");
+        templateResolver.setTemplateMode("HTML5");
+        return templateResolver;
+    }
+
+    @Bean
+    @Description("Thymeleaf template engine with Spring integration")
+    public SpringTemplateEngine templateEngine() {
+        final SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.setTemplateResolver(templateResolver());
+        final Set<IDialect> dialects = new HashSet<>();
+        dialects.add(new CustomDialect());
+        templateEngine.setAdditionalDialects(dialects);
+        return templateEngine;
+    }
+
+    @Bean
+    @Description("Spring message resolver")
+    public MessageSource messageSource() {
+        final ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
+        messageSource.setBasename("messages");
+        return messageSource;
+    }
+
+    @Override
+    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
+    }
+
 }
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/templates/footer.html b/spring-mvc-java/src/main/webapp/WEB-INF/templates/footer.html
new file mode 100644
index 0000000000..f72d553303
--- /dev/null
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/templates/footer.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+    <div th:fragment="footer1">&copy; 2013 Footer</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/templates/hello.html b/spring-mvc-java/src/main/webapp/WEB-INF/templates/hello.html
new file mode 100644
index 0000000000..1eddd85166
--- /dev/null
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/templates/hello.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8" />
+</head>
+<body>
+    <span th:text="#{welcome.text}">Hi</span>
+    <span th:text="${name}"> John </span>!
+    <span custom:name="James">Test</span>
+    <div th:replace="footer :: footer1">&copy; 2013 The Static
+        Templates</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/templates/index.html b/spring-mvc-java/src/main/webapp/WEB-INF/templates/index.html
new file mode 100644
index 0000000000..9b4159c193
--- /dev/null
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/templates/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<title>Thymeleaf Spring Example</title>
+</head>
+<body>
+    Hello John!
+    <br></br>
+    <div>Please confirm your details</div>
+    <br></br>
+    <form action="#" th:action="@{/processForm}" th:object="${user}"
+        method="post">
+        <table>
+            <tr>
+                <td>Firstname :</td>
+                <td><input type="text" value="Firstname"
+                    th:field="*{firstname}" /></td>
+            </tr>
+            <tr>
+                <td>Lastname :</td>
+                <td><input type="text" value="Lastname"
+                    th:field="*{lastname}" /></td>
+            </tr>
+            <tr>
+                <td>EmailId :</td>
+                <td><input type="text" value="emailId"
+                    th:field="*{emailId}" /></td>
+            </tr>
+            <tr>
+                <td align="center"><input type="submit" /></td>
+            </tr>
+        </table>
+    </form>
+</body>
+</html>
\ No newline at end of file