diff --git a/README.md b/README.md
index cc6c4ec4..d4c3a3ca 100644
--- a/README.md
+++ b/README.md
@@ -198,9 +198,9 @@ Current available themes:
   [@remy](http://github.com/remy),
   [@raphaelbastide](http://github.com/raphaelbastide) &
   [@evertton](http://github.com/evertton))
-* black-beauty - [preview](http://jsbin.com/efujux/38) (by [@evertton](http://github.com/evertton))
+* black-beauty - [preview](http://jsbin.com/dovivu) (by [@evertton](http://github.com/evertton))
 * silver-style - [preview](http://jsbin.com/erezijI/2) (by [@dev-dipesh](https://github.com/Dev-Dipesh))
-* friendly - [preview](http://jsbin.com/ecijol/6) (by [@evertton](http://github.com/evertton))
+* friendly - [preview](http://jsbin.com/hilula) (by [@evertton](http://github.com/evertton))
 * opensans - [preview](http://jsbin.com/UfepUvah) (by [@pburtchaell](http://github.com/pburtchaell))
 * solarized - [preview](http://jsbin.com/yimax/1) (by [@anmoljagetia](http://github.com/anmoljagetia))
 
diff --git a/themes/black-beauty.css b/themes/black-beauty.css
index e2ceb35a..b05d1592 100644
--- a/themes/black-beauty.css
+++ b/themes/black-beauty.css
@@ -19,9 +19,9 @@ article, footer {
 }
 
 article {
-  margin-top: 2em;
+  margin-top: 1em;
   background-color: #2a2a2a;
-  padding: 2em;
+  padding: 1em;
   text-align: center;
   position: relative;
 }
@@ -32,18 +32,26 @@ article p {
 
 article p:first-of-type {
   text-align: center;
+  font-size: .8em;
+}
+
+article p:last-of-type {
+  border-left: 3px solid #CCC;
+  padding-left: 15px;
 }
 
 #gravatar {
   width: 70px;
-  border: 5px solid #ccc;
-  border-radius: 5px;
-  display:block;
+  border-radius: 35px;
+  display: block;
   margin: 0 auto;
+  position: absolute;
+  right: -6px;
+  bottom: -20px;
 }
 
 h1 {
-  font-size: 2em;
+  font-size: 1.5em;
   font-weight: 300;
   text-transform: uppercase;
   display: inline-block;
@@ -62,13 +70,17 @@ a:hover, a:focus, a:active {
   color: white;
 }
 
-@media screen and (min-width: 960px) {
-  #gravatar {
-    position: absolute;
-    top: 2em;
-    left: 2em;
-  }
+@media (min-width: 640px) {
   h1 {
-    font-size: 2.5em;
+    font-size: 2.4em;
   }
-}
\ No newline at end of file
+
+  body {
+    font-size: 1.4em;
+  }
+
+  article p:first-of-type {
+    font-size: 1em;
+  }
+}
+
diff --git a/themes/friendly.css b/themes/friendly.css
index c6abc8ed..ed24d3d0 100644
--- a/themes/friendly.css
+++ b/themes/friendly.css
@@ -13,15 +13,14 @@ body {
 }
 
 article, footer {
-  max-width: 900px;
-  margin-left: auto;
-  margin-right: auto;
+  max-width: 877px;
+  margin: 0 auto;
   text-align: center;
 }
 
 article {
-  margin-top: 2em;
-  padding: 2em;
+  margin-top: 1em;
+  padding: 1em;
   text-align: center;
   position: relative;
 }
@@ -32,18 +31,27 @@ article p {
 
 article p:first-of-type {
   text-align: center;
+  font-size: .8em;
+  
+}
+
+article p:last-of-type {
+  border-left: 3px solid #333;
+  padding-left: 15px;
 }
 
 #gravatar {
   width: 70px;
-  border: 5px solid #d9d9d9;
-  border-radius: 5px;
-  display:block;
+  border-radius: 35px;
+  display: block;
   margin: 0 auto;
+  position: absolute;
+  bottom: -3em;
+  left: 0;
 }
 
 h1 {
-  font-size: 2em;
+  font-size: 1.5em;
   font-weight: 300;
   text-transform: uppercase;
   display: inline-block;
@@ -52,6 +60,20 @@ h1 {
   margin: 0;
 }
 
+footer {
+  background: #dadada;
+  border-radius: 5px;
+}
+
+footer p {
+  text-align: left;
+  padding-left: 80px;
+}
+
+footer p a {
+  color: #333;
+}
+
 a {
     color: gray;
     text-decoration: none;
@@ -62,13 +84,16 @@ a:hover, a:focus, a:active {
   color: black;
 }
 
-@media screen and (min-width: 960px) {
-  #gravatar {
-    position: absolute;
-    top: 2em;
-    left: 2em;
-  }
+@media (min-width: 640px) {
   h1 {
-    font-size: 2.5em;
+    font-size: 2.4em;
   }
-}
\ No newline at end of file
+
+  body {
+    font-size: 1.4em;
+  }
+
+  article p:first-of-type {
+    font-size: 1em;
+  }
+}
diff --git a/users/evertton.json b/users/evertton.json
index 573f8cd7..52cb19ea 100644
--- a/users/evertton.json
+++ b/users/evertton.json
@@ -3,5 +3,5 @@
 	"email": "e.everttonlima@gmail.com",
 	"format": "html",
 	"gravatar": true,
-	"theme": "black-beauty"
+	"theme": "friendly"
 }