diff --git a/README.md b/README.md
index 1d3f7a1e..d4c3a3ca 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,18 @@ You can fork this project, send me a pull request and wait for me to
 pull (which I'll do as quickly as possible) or if the user is still
 available you can do it yourself from the command line:
 
-    curl -d'{ "copyright": "Remy Sharp" }' http://rem.mit-license.org
+```bash
+curl -d'{ "copyright": "Remy Sharp" }' http://rem.mit-license.org
+```
 
 If the `rem` user isn't taken already, then this will create the new
 user file on the fly and the url will be immediately available.
 
 You can send a full JSON file to the API, not *just* the copyright, so this works too:
 
-    curl -d'{ "copyright": "Remy Sharp", "url": "http://remysharp.com", "email": "me@mysite.com", "format": "txt" }' http://rem.mit-license.org
+```bash
+curl -d'{ "copyright": "Remy Sharp", "url": "http://remysharp.com", "email": "me@mysite.com", "format": "txt" }' http://rem.mit-license.org
+```
 
 If there's any problems in the automated creation, send me a pull
 request and it'll go live soon after.
@@ -59,9 +63,11 @@ Create a new file and give it the name of the CNAME you want (in my case
 it's `rem.json`). This file contains a JSON object containing at least a
 `copyright` property:
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com"
+}
+```
 
 Means I can now link to: http://rem.mit-license.org and it will show my
 license name (note that the date will always show the current year).
@@ -71,10 +77,12 @@ license name (note that the date will always show the current year).
 In addition to the `copyright` property, if you want to make a link from
 the copyright text, you can include a `url` property:
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com"
+}
+```
 
 ### email
 
@@ -82,34 +90,40 @@ You can also include a link to your email which is displayed after the
 copyright notice using the `email` property (note the `mailto:` is
 automatically added):
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com",
-      "email": "me@mysite.com"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com",
+  "email": "me@mysite.com"
+}
+```
 
 ### format
 
 And if you want your license to appear as plain text, just add the
 `format` property (currently only `txt` and `html` are supported):
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com",
-      "format": "txt"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com",
+  "format": "txt"
+}
+```
 
 ### gravatar
 
 And if you want to show your gravatar, just add the `gravatar`
 boolean property:
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com",
-      "email": "me@mysite.com",
-      "gravatar": true
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com",
+  "email": "me@mysite.com",
+  "gravatar": true
+}
+```
 
 Note that the gravatar requires the email property. You also need to check the
 compatibility of the chosen theme. Currently, only the default theme supports
@@ -133,11 +147,13 @@ shows an older version of the LICENSE.html file (compared to the [latest version
 
 This can also be targeted in my JSON file:
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com",
-      "version": "a526rbf7"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com",
+  "version": "a526rbf7"
+}
+```
 
 Note that if no version is supplied, the latest copy of the LICENSE.html
 will be displayed with your information included.
@@ -151,11 +167,13 @@ is simple and clean, but you can add your own as you like.
 To use a theme, add the `theme` property to your `user.json` file, for
 example:
 
-    {
-      "copyright": "Remy Sharp, http://remysharp.com",
-      "url": "http://remysharp.com",
-      "theme": "flesch"
-    }
+```json
+{
+  "copyright": "Remy Sharp, http://remysharp.com",
+  "url": "http://remysharp.com",
+  "theme": "flesch"
+}
+```
 
 Current available themes:
 
@@ -180,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/brasil-js.json b/users/brasil-js.json
new file mode 100644
index 00000000..5ef40804
--- /dev/null
+++ b/users/brasil-js.json
@@ -0,0 +1 @@
+{"copyright":"Brasil.js","url":"http:\/\/brasil-js.org","email":"contato@brasil-js.org","format":"html", "gravatar": true}
diff --git a/users/chrismayer b/users/chrismayer
new file mode 100644
index 00000000..9f84d2f0
--- /dev/null
+++ b/users/chrismayer
@@ -0,0 +1,4 @@
+{
+  "copyright": "Christian Mayer, www.meggsimum.de",
+  "url": "http://www.meggsimum.de"
+}
diff --git a/users/daniellmb.json b/users/daniellmb.json
index 1f3e1a21..721fd87d 100644
--- a/users/daniellmb.json
+++ b/users/daniellmb.json
@@ -1,7 +1,7 @@
 {
     "copyright": "Daniel Lamb",
     "url": "http://daniellmb.com",
-    "email": "dlamb.open.source@mgmail.com",
+    "email": "dlamb.open.source@gmail.com",
     "gravatar": true,
     "theme": "friendly"
 }
diff --git a/users/eduan.json b/users/eduan.json
index ec95448c..72b87405 100644
--- a/users/eduan.json
+++ b/users/eduan.json
@@ -1 +1 @@
-{"copyright":"Eduán Lávaque","url":"http:\/\/eduantech.com","email":"eduanlavaque@gmail.com","format":"html","theme":"default"}
+{"copyright":"Greduan","url":"http:\/\/greduan.com","email":"eduan@websharks-inc.com","format":"html","theme":"default"}
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"
 }
diff --git a/users/hacdias.json b/users/hacdias.json
new file mode 100644
index 00000000..5394151b
--- /dev/null
+++ b/users/hacdias.json
@@ -0,0 +1,6 @@
+{
+    "copyright": "Henrique Dias",
+    "url": "http://henriquedias.com",
+    "email": "me@henriquedias.com",
+    "gravatar": true
+}
diff --git a/users/hadb.json b/users/hadb.json
index 03638c09..03549da8 100644
--- a/users/hadb.json
+++ b/users/hadb.json
@@ -1,6 +1,8 @@
 {
-    "copyright": "HADB, Bean Deng 邓斌",
-    "email": "haiandengbin@126.com",
-    "gravatar": true,
-    "theme": "eula-modern"
+  "copyright": "HADB, Bean Deng 邓斌",
+  "url": "http://blog.haoest.com",
+  "format": "html",
+  "email": "haiandengbin@126.com",
+  "gravatar": false,
+  "theme": "eula-modern"
 }
diff --git a/users/hashanp.json b/users/hashanp.json
new file mode 100644
index 00000000..54996602
--- /dev/null
+++ b/users/hashanp.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Hashan Punchihewa, https://hashanp.github.io",
+  "url": "https://hashanp.github.io",
+  "email": "hashan.punchihewa@gmail.com",
+  "theme":"magic-mint"
+}
diff --git a/users/heppler.json b/users/heppler.json
index 26712728..2e203a43 100644
--- a/users/heppler.json
+++ b/users/heppler.json
@@ -1 +1,6 @@
-{"copyright":"Jason A. Heppler","url":"http:\/\/jasonheppler.org","email":"jason@jasonheppler.org","format":"txt"}
\ No newline at end of file
+{
+  "copyright":"Jason A. Heppler",
+  "url":"http:\/\/jasonheppler.org",
+  "email":"jason@jasonheppler.org",
+  "theme": "eula-modern"
+}
diff --git a/users/isoden.json b/users/isoden.json
new file mode 100644
index 00000000..abfb8728
--- /dev/null
+++ b/users/isoden.json
@@ -0,0 +1,5 @@
+{
+    "copyright": "Yu Isoda, http://isoden.me",
+    "url": "http://isoden.me",
+    "theme": "opensans"
+}
\ No newline at end of file
diff --git a/users/jbrooksuk.json b/users/jbrooksuk.json
index 9d5410b7..e4ec8cca 100644
--- a/users/jbrooksuk.json
+++ b/users/jbrooksuk.json
@@ -1 +1 @@
-{"copyright":"James Brooks","url":"http:\/\/james.brooks.so","email":"jbrooksuk@me.com","theme":"white cherry","gravatar":true}
\ No newline at end of file
+{"copyright":"James Brooks","url":"http:\/\/james-brooks.uk","email":"jbrooksuk@me.com","theme":"white cherry","gravatar":true}
diff --git a/users/joseandro.json b/users/joseandro.json
new file mode 100644
index 00000000..af195000
--- /dev/null
+++ b/users/joseandro.json
@@ -0,0 +1 @@
+{"copyright":"Joseandro Luiz","url":"https:\/\/github.com\/joseandro","email":"joseandro.luiz@gmail.com","gravatar":true}
\ No newline at end of file
diff --git a/users/karami.json b/users/karami.json
index cec07637..134a416c 100644
--- a/users/karami.json
+++ b/users/karami.json
@@ -1 +1 @@
-{"copyright":"Hossein Karami","url":"http:\/\/karami.me","email":"athreepik@gmail.com","format":"html","gravatar": true}
+{"copyright":"Hossein Karami","url":"http:\/\/hosseinkarami.com","email":"hi@hosseinkarami.com","format":"html","gravatar": true}
diff --git a/users/kawaz.json b/users/kawaz.json
new file mode 100644
index 00000000..4f5d6ae2
--- /dev/null
+++ b/users/kawaz.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Yoshiaki Kawazu, https://twitter.com/kawaz",
+  "url": "https://twitter.com/kawaz",
+  "email": "kawazzz@gmail.com",
+  "gravatar": true
+}
diff --git a/users/magno.json b/users/magno.json
index 981f66a7..7853c7c4 100644
--- a/users/magno.json
+++ b/users/magno.json
@@ -1,5 +1,5 @@
 {
 	"copyright": "Magno Biét",
 	"url": "http:\/\/magnobiet.com",
-	"email": "magno.biet@gmail.com"
-}
\ No newline at end of file
+	"email": "me@magnobiet.com"
+}
diff --git a/users/ryanjacobs.json b/users/ryanjacobs.json
new file mode 100644
index 00000000..e6a6c860
--- /dev/null
+++ b/users/ryanjacobs.json
@@ -0,0 +1,6 @@
+{
+    "copyright": "Ryan Jacobs",
+          "url": "http:\/\/ryanjacobs.io",
+       "format": "html",
+        "theme": "default"
+}
diff --git a/users/ryanwu.json b/users/ryanwu.json
index 82478bfa..e89d0d7d 100644
--- a/users/ryanwu.json
+++ b/users/ryanwu.json
@@ -1 +1 @@
-{"copyright":"Ryan Wu","url":"http:\/\/ryanwu.me","email":"hello@ryanwu.me"}
\ No newline at end of file
+{"copyright":"Ryan Wu","url":"http:\/\/ryanwu.me","email":"hello@ryanwu.me","gravatar": true,"theme":"hilula"}
diff --git a/users/saravanan.json b/users/saravanan.json
new file mode 100644
index 00000000..8c630246
--- /dev/null
+++ b/users/saravanan.json
@@ -0,0 +1,3 @@
+{
+  "copyright": "Saravanan Rajaraman"
+}
diff --git a/users/teppeis.json b/users/teppeis.json
new file mode 100644
index 00000000..fb7c8eb9
--- /dev/null
+++ b/users/teppeis.json
@@ -0,0 +1 @@
+{"copyright": "Teppei Sato", "url": "https:\/\/github.com\/teppeis", "email": "teppeis@gmail.com", "format": "double-windsor"}
diff --git a/users/toolbear.json b/users/toolbear.json
new file mode 100644
index 00000000..4033ab12
--- /dev/null
+++ b/users/toolbear.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Tim Taylor, http://tool-man.org",
+  "url": "http://tool-man.org/",
+  "email": "tim@tool-man.org",
+  "gravatar": true
+}