diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 08f30070da..05cab907b5 100644
--- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.Servlet;
 
 import nz.net.ultraq.thymeleaf.LayoutDialect;
@@ -33,12 +32,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.bootstrap.context.condition.ConditionalOnClass;
 import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
-import org.springframework.bootstrap.context.condition.ConditionalOnMissingClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.TemplateProcessingParameters;
+import org.thymeleaf.dialect.IDialect;
 import org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect;
 import org.thymeleaf.resourceresolver.IResourceResolver;
 import org.thymeleaf.spring3.SpringTemplateEngine;
@@ -107,19 +106,24 @@ public class ThymeleafAutoConfiguration {
 	}
 
 	@Configuration
-	@ConditionalOnMissingClass("nz.net.ultraq.thymeleaf.LayoutDialect")
 	@ConditionalOnMissingBean(SpringTemplateEngine.class)
 	protected static class ThymeleafDefaultConfiguration {
 
 		@Autowired
 		private Collection<ITemplateResolver> templateResolvers = Collections.emptySet();
 
+		@Autowired(required = false)
+		private Collection<IDialect> dialects = Collections.emptySet();
+
 		@Bean
 		public SpringTemplateEngine templateEngine() {
 			SpringTemplateEngine engine = new SpringTemplateEngine();
 			for (ITemplateResolver templateResolver : this.templateResolvers) {
 				engine.addTemplateResolver(templateResolver);
 			}
+			for (IDialect dialect : this.dialects) {
+				engine.addDialect(dialect);
+			}
 			return engine;
 		}
 
@@ -127,20 +131,11 @@ public class ThymeleafAutoConfiguration {
 
 	@Configuration
 	@ConditionalOnClass(name = "nz.net.ultraq.thymeleaf.LayoutDialect")
-	@ConditionalOnMissingBean(SpringTemplateEngine.class)
 	protected static class ThymeleafWebLayoutConfiguration {
 
-		@Autowired
-		private Collection<ITemplateResolver> templateResolvers = Collections.emptySet();
-
 		@Bean
-		public SpringTemplateEngine templateEngine() {
-			SpringTemplateEngine engine = new SpringTemplateEngine();
-			for (ITemplateResolver templateResolver : this.templateResolvers) {
-				engine.addTemplateResolver(templateResolver);
-			}
-			engine.addDialect(new LayoutDialect());
-			return engine;
+		public LayoutDialect layoutDialect() {
+			return new LayoutDialect();
 		}
 
 	}
@@ -167,12 +162,9 @@ public class ThymeleafAutoConfiguration {
 	@ConditionalOnClass({ SpringSecurityDialect.class })
 	protected static class ThymeleafSecurityDialectConfiguration {
 
-		@Autowired
-		private SpringTemplateEngine templateEngine;
-
-		@PostConstruct
-		public void configureThymeleafSecurity() {
-			this.templateEngine.addDialect(new SpringSecurityDialect());
+		@Bean
+		public SpringSecurityDialect securityDialect() {
+			return new SpringSecurityDialect();
 		}
 	}
 
diff --git a/spring-package-maven-plugin/pom.xml b/spring-package-maven-plugin/pom.xml
index 300e926e54..716d7be6ad 100644
--- a/spring-package-maven-plugin/pom.xml
+++ b/spring-package-maven-plugin/pom.xml
@@ -99,7 +99,7 @@
 			<plugin>
 				<artifactId>maven-plugin-plugin</artifactId>
 				<configuration>
-					<goalPrefix>spring</goalPrefix>
+					<goalPrefix>spring-package</goalPrefix>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/spring-starters/pom.xml b/spring-starters/pom.xml
index 20fdbeb0c4..05c15652d9 100644
--- a/spring-starters/pom.xml
+++ b/spring-starters/pom.xml
@@ -18,9 +18,11 @@
 		<module>spring-starter-batch</module>
 		<module>spring-starter-data-jpa</module>
 		<module>spring-starter-integration</module>
+		<module>spring-starter-jetty</module>
 		<module>spring-starter-logging</module>
 		<module>spring-starter-parent</module>
 		<module>spring-starter-security</module>
+		<module>spring-starter-tomcat</module>
 		<module>spring-starter-web</module>
 	</modules>
 </project>
diff --git a/spring-starters/spring-starter-jetty/pom.xml b/spring-starters/spring-starter-jetty/pom.xml
new file mode 100644
index 0000000000..4d5f067a95
--- /dev/null
+++ b/spring-starters/spring-starter-jetty/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-starters</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-starter-jetty</artifactId>
+	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-jsp</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-starters/spring-starter-parent/pom.xml b/spring-starters/spring-starter-parent/pom.xml
index 1b3eb35d2f..3f9f96f189 100644
--- a/spring-starters/spring-starter-parent/pom.xml
+++ b/spring-starters/spring-starter-parent/pom.xml
@@ -56,6 +56,11 @@
 				<artifactId>spring-starter-tomcat</artifactId>
 				<version>${spring.zero.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.zero</groupId>
+				<artifactId>spring-starter-jetty</artifactId>
+				<version>${spring.zero.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.zero</groupId>
 				<artifactId>spring-starter-data-jpa</artifactId>
diff --git a/spring-starters/spring-starter-tomcat/pom.xml b/spring-starters/spring-starter-tomcat/pom.xml
new file mode 100644
index 0000000000..fd8b0a1f1f
--- /dev/null
+++ b/spring-starters/spring-starter-tomcat/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+	<parent>
+		<groupId>org.springframework.zero</groupId>
+		<artifactId>spring-starters</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-starter-tomcat</artifactId>
+	<packaging>jar</packaging>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-starters/spring-starter-web/pom.xml b/spring-starters/spring-starter-web/pom.xml
index aa0ab8e874..22ee2688eb 100644
--- a/spring-starters/spring-starter-web/pom.xml
+++ b/spring-starters/spring-starter-web/pom.xml
@@ -19,20 +19,13 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-starter-tomcat</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>