diff --git a/website/features/GetterSetter.html b/website/features/GetterSetter.html
new file mode 100644
index 00000000..246a8eab
--- /dev/null
+++ b/website/features/GetterSetter.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html><head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<script src="../logi/jQuery-all.js" type="text/javascript"></script>
+	<script src="features.js" type="text/javascript"></script>
+	<link rel="stylesheet" type="text/css" href="../logi/reset.css" />
+	<link rel="stylesheet" type="text/css" href="features.css" />
+	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+	<meta name="description" content="Spice up your java" />
+	<title>@Getter and @Setter</title>
+	<!--[if lt IE 7]><script type="text/javascript" src="logi/iepngfix_tilebg.js"></script><![endif]--> 
+</head><body><div id="pepper">
+	<div class="meat">
+		<div class="minimumHeight"></div>
+		<div class="header"><a href="../index.html">Project Lombok</a></div>
+		<h1>@Getter and @Setter</h1>
+		<div class="overview">
+		</div>
+		<footer>
+			<a href="features.html">Back to features</a> | <span class="disabled">Previous feature</span> | <a href="Data.html">Next feature (@Data)</a><br />
+			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+		</footer>
+		<div style="clear: both;"></div>
+	</div>
+</div></body></html>
diff --git a/website/features/features.css b/website/features/features.css
new file mode 100644
index 00000000..e7bbdeca
--- /dev/null
+++ b/website/features/features.css
@@ -0,0 +1,51 @@
+body {
+	font-family: Verdana;
+	background-image: url(gradient.png);
+	background-repeat: repeat-x;
+	background-attachment: fixed;
+}
+
+#pepper {
+	background-image: url(lombok-background.png);
+	background-repeat: no-repeat;
+	background-attachment: fixed;
+	background-position: 50px 20px;
+}
+
+.meat {
+	padding: 0px 48px;
+}
+
+.meat .header {
+	position: absolute;
+	top: 10px;
+	left: 30px;
+}
+
+.meat .minimumHeight {
+	height: 700px;
+	width: 5px;
+	float: left;
+}
+
+h1 {
+	width: 100%;
+	text-align: center;
+}
+
+footer {
+	margin: 64px auto 0 auto;
+	padding-bottom: 16px;
+	display: block;
+	text-align: center;
+}
+
+footer .disabled {
+	color: #aaa;
+}
+
+footer .copyright {
+	color: #555;
+	font-size: 11px;
+	font-style: italic;
+}
diff --git a/website/features/gradient.png b/website/features/gradient.png
new file mode 100644
index 00000000..3ffcde2c
Binary files /dev/null and b/website/features/gradient.png differ
diff --git a/website/features/lombok-background.png b/website/features/lombok-background.png
new file mode 100644
index 00000000..0fbdf64c
Binary files /dev/null and b/website/features/lombok-background.png differ
diff --git a/website/index.css b/website/index.css
index aa9a9e51..884a13dc 100644
--- a/website/index.css
+++ b/website/index.css
@@ -123,7 +123,7 @@ code {
 footer {
 	margin-top: 8px;
 	display: block;
-	color: #333;
+	color: #555;
 	font-style: italic;
 	font-size: 11px;
 	width: 100%;