diff --git a/download.html b/download.html
index dfbf88cd97..3b8f7b11b1 100644
--- a/download.html
+++ b/download.html
@@ -86,7 +86,7 @@
 		
 	<div id="footer">
 		<p class="right">Design: Luka Cvrk, <a title="Awsome Web Templates" href="http://www.solucija.com/">Solucija</a></p>
-		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez[at]gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
+		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez@gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
 	</div>
 	
   <script type="text/javascript">
diff --git a/index.html b/index.html
index 438a003406..f05cd2a222 100644
--- a/index.html
+++ b/index.html
@@ -77,7 +77,7 @@
 			<h3><span class="red">Who</span> made this?</h3>
 				<h4>Author</h4>
 				<p>Roberto Rosario<br/>
-				<a href="mailto:roberto.rosario.gonzalez[at]gmail.com">e-mail: roberto.rosario.gonzalez[at]gmail.com</a><br/>
+				<a href="mailto:roberto.rosario.gonzalez@gmail.com">e-mail: roberto.rosario.gonzalez@gmail.com</a><br/>
 				<a href="http://twitter.com/#siloraptor">http://twitter.com/#siloraptor</a></p>
 
 				<h4>License</h4>
@@ -87,7 +87,7 @@
 		
 	<div id="footer">
 		<p class="right">Design: Luka Cvrk, <a title="Awsome Web Templates" href="http://www.solucija.com/">Solucija</a></p>
-		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez[at]gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
+		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez@gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
 	</div>
   <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
diff --git a/screenshots.html b/screenshots.html
index 47307b4492..8c9ed2217b 100644
--- a/screenshots.html
+++ b/screenshots.html
@@ -32,9 +32,9 @@
 
 	<div id="bar">
 		<div class="wrap">
-			<span class="step"><a>1</a> capture</span>
-			<span class="step"><a>2</a> organize</span>
-			<span class="step"><a>3</a> store</span>
+			<span class="step"><a>1</a> Capture</span>
+			<span class="step"><a>2</a> Organize</span>
+			<span class="step"><a>3</a> Store</span>
 		</div>
 	</div>
 
@@ -79,7 +79,7 @@
 		
 	<div id="footer">
 		<p class="right">Design: Luka Cvrk, <a title="Awsome Web Templates" href="http://www.solucija.com/">Solucija</a></p>
-		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez[at]gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
+		<p>&copy; Copyright 2011 <a href="mailto:roberto.rosario.gonzalez@gmail.com">Roberto Rosario</a> &middot; All Rights Reserved</p>
 	</div>
   <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");