4 files changed, 29 insertions, 2 deletions
diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html
index e5c2c007..d5a88fb7 100644
--- a/website/templates/setup/_setup.html
+++ b/website/templates/setup/_setup.html
@@ -8,7 +8,7 @@
 
 <#macro section title>
 	<div class="row">
-		<h3>${title}</h3>
+		<@main.h3 title="${title}" />
 
 		<#nested>
 	</div>
@@ -19,7 +19,7 @@
 		<div class="page-header top5" id="featureContent">
 			<div class="row text-center">
 				<div class="header-group">
-					<h1>${title}</h1>
+					<@main.h1 title="${title}" />
 				</div>
 			</div>
 			<#nested>
diff --git a/website/templates/setup/android.html b/website/templates/setup/android.html
index 8762d355..19e92a58 100644
--- a/website/templates/setup/android.html
+++ b/website/templates/setup/android.html
@@ -42,6 +42,13 @@ dependencies {
 				Restart Android Studio
 			</li></ul>
 		</p>
+		<p>
+			Modify your application's <code>dependencies</code> block:
+<pre>
+dependencies {
+	compileOnly 'org.projectlombok:lombok:${version}'
+	annotationProcessor 'org.projectlombok:lombok:${version}'
+}</pre>
 	</@s.section>
 
 	<@s.section title="Eclipse">
diff --git a/website/templates/setup/gradle.html b/website/templates/setup/gradle.html
index 579aa6a2..7cb4af0d 100644
--- a/website/templates/setup/gradle.html
+++ b/website/templates/setup/gradle.html
@@ -28,8 +28,14 @@ repositories {
 	mavenCentral()
 }
 
+plugins {
+    id 'net.ltgt.apt' version '0.10'
+}
+
 dependencies {
 	compileOnly 'org.projectlombok:lombok:${version}'
+	
+	apt "org.projectlombok:lombok:${version}"
 }</pre>
 		</p><p>
 			Remember that you still have to download <code>lombok.jar</code> (or find it in gradle's caches) and run it as a jarfile, if you wish to program in eclipse. The plugin makes that part easier.
diff --git a/website/templates/setup/main.html b/website/templates/setup/main.html
new file mode 100644
index 00000000..8c874a55
--- /dev/null
+++ b/website/templates/setup/main.html
@@ -0,0 +1,14 @@
+<#import "_setup.html" as s>
+
+<@s.scaffold title="Using lombok">
+	<@s.introduction>
+		<#list s.main.setupTargets as cat, tgtList>
+			<h3 class="listHeader">${cat}</h3>
+			<ul>
+				<#list tgtList as name, url>
+					<li class="target"><a href="/setup/${url}">${name}</a></li>
+				</#list>
+			</ul>
+		</#list>
+	</@s.introduction>
+</@s.scaffold>