diff --git a/LICENSE.html b/LICENSE.html
index f010bb37..9a160096 100644
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -2,8 +2,8 @@
 <html id="home" lang="en">
 <head>
 <title>MIT License</title>
-<meta charset=utf-8>
-<meta name=viewport content="width=device-width, initial-scale=0.70;">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=0.7">
 <!--
 Welcome fellow open source developer. This project is here for you to
 link to if you're like me and keep forgetting to include the 
diff --git a/README.md b/README.md
index d4c3a3ca..7981bee6 100644
--- a/README.md
+++ b/README.md
@@ -266,7 +266,7 @@ Domain contributions:
 * [mostly-magic](http://github.com/mostly-magic) - 2030-2032
 
 *Please note that the whois says 2021 as you can only have 10 active
-registered years with ICCAN - but the domain is set to auto-renew, so
+registered years with ICANN - but the domain is set to auto-renew, so
 it's all good :)*
 
 ### 2. Hosting
diff --git a/themes/open-sans.css b/themes/open-sans.css
index 74f2b853..3de1190e 100644
--- a/themes/open-sans.css
+++ b/themes/open-sans.css
@@ -1 +1 @@
-@font-face{font-family:'Open Sans Bold';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format('woff')}// begin styles html{background:#f2f2f8}body{margin:0;padding:100px;font-family:'Open Sans',sans-serif;font-size:1.2em;line-height:1.6}::selection{background:#ccc}::-moz-selection{background:#ccc}h1{text-align:center;font:36px 'Open Sans Bold'}p{margin:25px 0 0}p:first-of-type{text-align:center;margin:0 0 50px}a{color:#0a0a0b;text-decoration:none;border-bottom:3px solid rgba(10,10,11,1);-webkit-transition:.15s ease;-moz-transition:.15s ease;-ms-transition:.15s ease;-o-transition:.15s ease;transition:.15s ease}a:focus,a:hover{opacity:.5}article,footer{display:block;margin:0 auto!important;padding:25px;max-width:900px;width:100%}footer{text-align:center;font:75% 'Open Sans Bold'}#gravatar{display:block!important;border-radius:100%;margin:0 auto}
\ No newline at end of file
+@font-face{font-family:'Open Sans Bold';font-style:normal;font-weight:700;src:local('Open Sans Bold'),local('OpenSans-Bold'),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format('woff')}html{background:#f2f2f8}body{margin:0;padding:100px;font-family:'Open Sans',sans-serif;font-size:1.2em;line-height:1.6}::selection{background:#ccc}::-moz-selection{background:#ccc}h1{text-align:center;font:36px 'Open Sans Bold'}p{margin:25px 0 0}p:first-of-type{text-align:center;margin:0 0 50px}a{color:#0a0a0b;text-decoration:none;border-bottom:3px solid rgba(10,10,11,1);-webkit-transition:.15s ease;-moz-transition:.15s ease;-ms-transition:.15s ease;-o-transition:.15s ease;transition:.15s ease}a:focus,a:hover{opacity:.5}article,footer{display:block;margin:0 auto!important;padding:25px;max-width:900px;width:100%}footer{text-align:center;font:75% 'Open Sans Bold'}#gravatar{display:block!important;border-radius:100%;margin:0 auto}
diff --git a/themes/solarized.css b/themes/solarized.css
index 7c5aeca0..a5533c16 100644
--- a/themes/solarized.css
+++ b/themes/solarized.css
@@ -1,3 +1,3 @@
 /*Solarized theme by Ethan Schoonover*/
 /*Part of source code reused from the Open Sans Theme */
-@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300);@import url(http://fonts.googleapis.com/css?family=Source+Code+Pro:700);html{padding:0;font-size:1em;background-color:#eee8d5}body{font-family:'Source Sans Pro',sans-serif;font-size:1.5em;font-weight:300;text-align:center;margin:0;background:none repeat scroll 0 0 #eee8d5}article,footer{text-align:center;margin:auto;max-width:100%}article{margin-top:0;padding:1.75em;color:#dc322f;text-align:center;position:relative;background:none repeat scroll 0 0 #002b36}article p{text-align:left;color:#93a1a1}article p:first-of-type{text-align:center;color:#b58900}article p:last-of-type{color:#268bd2}#gravatar{width:50px;border:5px solid #FFF;border-radius:15px;display:block;margin:0 auto}h1{font-size:2em;font-weight:700;text-transform:uppercase;display:inline-block;padding-bottom:12px;border-bottom:2px dashed #dc322f;margin:0}a{font-family:'Source Sans Pro',sans-serif;font-size:1em;font-weight:700;color:#859900;text-decoration:none;word-wrap:break-word}a:active,a:focus,a:hover{color:#d33682}@media screen and (min-width:960px){#gravatar{display: none;position:absolute;top:2em;left:2em}h1{font-size:2.5em}}
+@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300|Source+Code+Pro:700);html{padding:0;font-size:1em;background-color:#eee8d5}body{font-family:'Source Sans Pro',sans-serif;font-size:1.5em;font-weight:300;text-align:center;margin:0;background:none repeat scroll 0 0 #eee8d5}article,footer{text-align:center;margin:auto;max-width:100%}article{margin-top:0;padding:1.75em;color:#dc322f;text-align:center;position:relative;background:none repeat scroll 0 0 #002b36}article p{text-align:left;color:#93a1a1}article p:first-of-type{text-align:center;color:#b58900}article p:last-of-type{color:#268bd2}#gravatar{width:50px;border:5px solid #FFF;border-radius:15px;display:block;margin:0 auto}h1{font-size:2em;font-weight:700;text-transform:uppercase;display:inline-block;padding-bottom:12px;border-bottom:2px dashed #dc322f;margin:0}a{font-family:'Source Sans Pro',sans-serif;font-size:1em;font-weight:700;color:#859900;text-decoration:none;word-wrap:break-word}a:active,a:focus,a:hover{color:#d33682}@media screen and (min-width:960px){#gravatar{display: none;position:absolute;top:2em;left:2em}h1{font-size:2.5em}}sour
diff --git a/users/adam.json b/users/adam.json
index cc89a2d4..1fa017d4 100644
--- a/users/adam.json
+++ b/users/adam.json
@@ -1,5 +1,7 @@
 {
-	"copyright": "Ad@m",
-	"url": "http://adam.hbang.ws",
-	"theme": "orange"
-}
\ No newline at end of file
+	"copyright": "Adam Demasi",
+	"url": "http://kirb.me/",
+	"email": "adam@hbang.ws",
+	"gravatar": true,
+	"theme": "solarized"
+}
diff --git a/users/ailjazi.json b/users/ailjazi.json
deleted file mode 100644
index 264cf25c..00000000
--- a/users/ailjazi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "copyright":	"Aldo Iljazi",
-  "email":		"mail@ailjazi.me",
-  "theme":		"flesch"
-}
diff --git a/users/ajenjo.json b/users/ajenjo.json
index 6693673c..94a07040 100644
--- a/users/ajenjo.json
+++ b/users/ajenjo.json
@@ -1 +1,7 @@
-{"copyright":"Jon Dotsoy.","url":"https:\/\/github.com\/ajenjo\/ajenjo-server","email":"ajenjo@jonad.in","theme":"xtansia","gravatar":true}
\ No newline at end of file
+{
+  "copyright": "Jon Dotsoy.",
+  "url": "https://github.com/ajenjo/ajenjo-server",
+  "email": "ajenjo@jon.soy",
+  "theme": "xtansia",
+  "gravatar": true
+}
diff --git a/users/allthingssmitty.json b/users/allthingssmitty.json
new file mode 100644
index 00000000..1f10cb1d
--- /dev/null
+++ b/users/allthingssmitty.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Matt Smith, https://github.com/AllThingsSmitty",
+  "url": "https://github.com/AllThingsSmitty",
+  "theme": "default",
+  "gravatar": true
+}
diff --git a/users/anwarjaved.json b/users/anwarjaved.json
index 88bd0118..22daa74f 100644
--- a/users/anwarjaved.json
+++ b/users/anwarjaved.json
@@ -1 +1 @@
-{"copyright":"Anwar Javed","email":"anwarjaved@gmail.com","format":"html","gravatar":true,"theme":"default-dark"}
\ No newline at end of file
+{ "copyright": "Anwar Javed", "email": "anwarjaved@gmail.com", "format": "html", "gravatar": true, "theme": "default-dark" }
diff --git a/users/ari.json b/users/ari.json
deleted file mode 100644
index 818c77e8..00000000
--- a/users/ari.json
+++ /dev/null
@@ -1 +0,0 @@
-{"copyright":"Ari Porad","email":"ariporad@gmail.com"}
\ No newline at end of file
diff --git a/users/ariporad.json b/users/ariporad.json
index 8f5b5da1..581b2e01 100644
--- a/users/ariporad.json
+++ b/users/ariporad.json
@@ -1 +1,6 @@
-{"copyright":"Ari Porad","url":"http:\/\/ariporad.com","email":"ari@porad.com"}
\ No newline at end of file
+{
+    "copyright": "Ari Porad",
+    "url": "http: //ariporad.com",
+    "email": "ari@ariporad.com",
+    "gravatar": true
+}
diff --git a/users/axisthemes.json b/users/axisthemes.json
index df9f9dbd..13552d2d 100644
--- a/users/axisthemes.json
+++ b/users/axisthemes.json
@@ -1 +1 @@
-{"copyright":"AxisThemes"}
\ No newline at end of file
+{"copyright":"AxisThemes","url":"http:\/\/axisthemes.com","theme":"double-windsor"}
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/byjml.json b/users/byjml.json
index 29f4c265..b1c20c8f 100644
--- a/users/byjml.json
+++ b/users/byjml.json
@@ -1 +1 @@
-{"copyright":"byjml","url":"http:\/\/jml.so","email":"me@jml.so","format":"html"}
+{"copyright":"byjml","url":"http:\/\/jml.so","email":"by@jml.so","format":"html"}
diff --git a/users/chrismayer b/users/chrismayer.json
similarity index 100%
rename from users/chrismayer
rename to users/chrismayer.json
diff --git a/users/cocoanaut.json b/users/cocoanaut.json
index 14726b19..8344dc7d 100644
--- a/users/cocoanaut.json
+++ b/users/cocoanaut.json
@@ -1 +1,8 @@
-{ "copyright": "Frank Gregor", "url": "http://cocoanaut.com", "email": "phranck@cocoanaut.com", "format": "html", "theme": "default" }
\ No newline at end of file
+{ 
+	"copyright": "Frank Gregor", 
+	"url": "http://cocoanaut.com", 
+	"email": "phranck@cocoanaut.com",
+	"gravatar": true,
+	"format": "html", 
+	"theme": "default"
+}
\ No newline at end of file
diff --git a/users/danidemi.json b/users/danidemi.json
new file mode 100644
index 00000000..b84a2640
--- /dev/null
+++ b/users/danidemi.json
@@ -0,0 +1 @@
+{"copyright":"Daniele Demichelis, http:\/\/danidemi.com","url":"http:\/\/danidemi.com","email":"demichelis@danidemi.com","format":"html","gravatar": true}
diff --git a/users/daniguardiola.json b/users/daniguardiola.json
new file mode 100644
index 00000000..2ecf40f8
--- /dev/null
+++ b/users/daniguardiola.json
@@ -0,0 +1 @@
+{"copyright":"Dani Guardiola","url":"http:\/\/daniguardiola.me","email":"contact@daniguardiola.me","format":"html","theme":"black-beauty"}
diff --git a/users/danilovaz.json b/users/danilovaz.json
index 800b4253..9ce4b5dd 100644
--- a/users/danilovaz.json
+++ b/users/danilovaz.json
@@ -1 +1 @@
-{"copyright":"Danilo Vaz","url":"http:\/\/danilovaz.github.io","email":"dani@canarinho.co","format":"md"}
\ No newline at end of file
+{"copyright":"Danilo Vaz, http:\/\/danilovaz.github.io","url":"http:\/\/danilovaz.github.io","email":"danilo@canarinho.co","format":"html"}
diff --git a/users/dartokloning.json b/users/dartokloning.json
new file mode 100644
index 00000000..9586822d
--- /dev/null
+++ b/users/dartokloning.json
@@ -0,0 +1,5 @@
+{
+"copyright": "Darto KLoning",
+"url": "http://www.kloningspoon.com",
+"theme": "orange"
+}
diff --git a/users/denji.json b/users/denji.json
new file mode 100644
index 00000000..0557411a
--- /dev/null
+++ b/users/denji.json
@@ -0,0 +1 @@
+{"copyright":"Denis Denisov","email":"denji0k@gmail.com","format":"html","gravatar":true,"theme":"opensans","url":"https://github.com/denji"}
diff --git a/users/diessica.json b/users/diessica.json
index 9f9514f3..3678526f 100644
--- a/users/diessica.json
+++ b/users/diessica.json
@@ -1 +1 @@
-{"copyright":"Di\u00e9ssica Gurskas","url":"http:\/\/diessica.com","email":"diessicode@gmail.com","theme":"afterdark","gravatar":true}
+{"copyright":"Di\u00e9ssica Gurskas","url":"http:\/\/diessi.ca","email":"diessicode@gmail.com","theme":"double-windsor","gravatar":true}
diff --git a/users/dn.json b/users/dn.json
index c70877d2..077641b4 100644
--- a/users/dn.json
+++ b/users/dn.json
@@ -1 +1,6 @@
-{"copyright":"David Newman"}
\ No newline at end of file
+{
+  "copyright": "David Newman",
+  "format": "txt",
+  "email": "davidjndev@gmail.com",
+  "theme"     : "default"
+}
diff --git a/users/dochang.json b/users/dochang.json
new file mode 100644
index 00000000..b93f8c6d
--- /dev/null
+++ b/users/dochang.json
@@ -0,0 +1,5 @@
+{
+  "copyright": "ZHANG Weiyi",
+  "url": "https://github.com/dochang",
+  "email": "dochang@gmail.com"
+}
diff --git a/users/edferras.json b/users/edferras.json
new file mode 100644
index 00000000..b5bc3a59
--- /dev/null
+++ b/users/edferras.json
@@ -0,0 +1,5 @@
+{
+    "copyright": "Eduardo Ferras",
+    "url": "https:\/\/github.com\/edferras",
+    "email": "edferras@gmail.com"
+}
diff --git a/users/eduardorabelo.json b/users/eduardorabelo.json
index 35fc2f81..231c704e 100644
--- a/users/eduardorabelo.json
+++ b/users/eduardorabelo.json
@@ -1 +1,7 @@
-{"copyright":"Eduardo Rabelo","url":"http:\/\/eduardorabelo.com.br","email":"oieduardorabelo@gmail.com","gravatar":true,"theme":"default"}
\ No newline at end of file
+{
+  "copyright": "Eduardo Rabelo",
+  "url": "http://eduardorabelo.com.br",
+  "email": "oieduardorabelo@gmail.com",
+  "gravatar": true,
+  "theme": "default"
+}
diff --git a/users/efrainc.json b/users/efrainc.json
index f8d3e0da..28c6408f 100644
--- a/users/efrainc.json
+++ b/users/efrainc.json
@@ -1 +1,7 @@
-{"copyright":"Remy Sharp"}
\ No newline at end of file
+{
+  "copyright": "Efrain Camacho",
+  "url": "http://github.com/efrainc",
+  "email": "efrainc88@gmail.com",
+  "gravatar": false,
+  "theme": "solarized"
+}
diff --git a/users/ehsan.json b/users/ehsan.json
new file mode 100644
index 00000000..8b128dce
--- /dev/null
+++ b/users/ehsan.json
@@ -0,0 +1,7 @@
+{
+  "copyright": "Ehsan Aghaei, http://ehsanaghaei.ir",
+  "url": "http://ehsanaghaei.ir",
+  "email": "ehsan.aghaeii@gmail.com",
+  "format": "txt",
+  "theme": "opensans"
+}
diff --git a/users/getify.json b/users/getify.json
index 6f335313..b17233f8 100644
--- a/users/getify.json
+++ b/users/getify.json
@@ -1,4 +1,7 @@
 {
   "copyright": "Kyle Simpson",
-  "url": "http://getify.me"
+  "url": "http://getify.me",
+  "email": "getify@gmail.com",
+  "gravatar": true,
+  "theme": "eula-modern"
 }
diff --git a/users/gggkiller.json b/users/gggkiller.json
index c263f98b..48bf78d1 100644
--- a/users/gggkiller.json
+++ b/users/gggkiller.json
@@ -1 +1 @@
-{"copyright":"Gustavo Andr\u00e9","email":"gggkiller2@gmail.com","format":"txt"}
\ No newline at end of file
+{"copyright":"GGG KILLER","email":"gggkiller2@gmail.com","format":"html", "url":"http://gggkiller.com","gravatar":true,"theme":"double-windsor"}
diff --git a/users/grawity.json b/users/grawity.json
index 1b534531..a31a7ea8 100644
--- a/users/grawity.json
+++ b/users/grawity.json
@@ -1 +1,6 @@
-{"copyright":"Mantas Mikul\u0117nas","email":"grawity@gmail.com","url":"http:\/\/nullroute.eu.org\/~grawity\/"}
\ No newline at end of file
+{
+ "copyright": "Mantas Mikulėnas",
+ "email": "grawity@gmail.com",
+ "url": "http://nullroute.eu.org/~grawity/",
+ "format": "txt"
+}
diff --git a/users/hadb.json b/users/hadb.json
index 37775753..03549da8 100644
--- a/users/hadb.json
+++ b/users/hadb.json
@@ -1,7 +1,8 @@
 {
-    "copyright": "HADB, Bean Deng 邓斌",
-    "url": "http://blog.haoest.com",
-    "email": "haiandengbin@126.com",
-    "format": "html",
-    "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/halid.json b/users/halid.json
index 768e4a52..c113bc69 100644
--- a/users/halid.json
+++ b/users/halid.json
@@ -1 +1,8 @@
-{"copyright":"Halid Altuner","url":"http:\/\/halid.org","email":"halid@halid.org","format":"html","gravater":true,"theme":"opensans"}
\ No newline at end of file
+{
+    "copyright": "Halid Altuner",
+    "url": "http://halid.org",
+    "email": "halid@halid.org",
+    "format": "html",
+    "gravater": true,
+    "theme": "opensans"
+}
diff --git a/users/hanksudo.json b/users/hanksudo.json
new file mode 100644
index 00000000..fd50005f
--- /dev/null
+++ b/users/hanksudo.json
@@ -0,0 +1,6 @@
+{
+    "copyright": "Hank Wang",
+    "email": "drapho@gmail.com",
+    "theme": "hilula",
+    "gravatar": true
+}
diff --git a/users/hashanp.json b/users/hashanp.json
index 54996602..5a59eb43 100644
--- a/users/hashanp.json
+++ b/users/hashanp.json
@@ -1,6 +1,6 @@
 {
   "copyright": "Hashan Punchihewa, https://hashanp.github.io",
-  "url": "https://hashanp.github.io",
+  "url": "https://hashanp.divshot.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/hoop33.json b/users/hoop33.json
index 968978e6..5f3b9302 100644
--- a/users/hoop33.json
+++ b/users/hoop33.json
@@ -1 +1 @@
-{"copyright":"Rob Warner","url":"http:\/\/grailbox.com","email":"rwarner@grailbox.com","format":"txt"}
\ No newline at end of file
+{"copyright":"Rob Warner","url":"http:\/\/grailbox.com","email":"rwarner@grailbox.com","format":"html","gravatar":true,"theme":"opensans"}
diff --git a/users/hugorper.json b/users/hugorper.json
index bf6e924b..72bba65f 100644
--- a/users/hugorper.json
+++ b/users/hugorper.json
@@ -1 +1,5 @@
-{"copyright":"Hugo Pereira, http:\/\/hugorper.com","url":"http:\/\/hugorper.com","email":"hugorper@gmail.com"}
\ No newline at end of file
+{
+    "copyright": "Hugo Pereira, http://hugorper.com",
+    "url": "http://hugorper.com",
+    "email": "hugorper@gmail.com"
+}
diff --git a/users/iamale.json b/users/iamale.json
index 0ead20ae..53785226 100644
--- a/users/iamale.json
+++ b/users/iamale.json
@@ -1 +1 @@
-{"copyright":"Alexander Pushkov","url":"http:\/\/ale.incrowd.ws","email":"ale@incrowd.ws"}
\ No newline at end of file
+{"copyright":"Alexander Pushkov","url":"http:\/\/ale.rocks","email":"ale@songbee.net"}
diff --git a/users/if.json b/users/if.json
index 2396ef3a..f906db12 100644
--- a/users/if.json
+++ b/users/if.json
@@ -1 +1 @@
-{"copyright":"Invisible Friend","url":"http:\/\/invisiblefriend.com","email":"if.admin@invisiblefriend.com","format":"txt"}
\ No newline at end of file
+{"copyright":"invisible friend","url":"http:\/\/invisiblefriend.com","format":"txt"}
diff --git a/users/iknew.json b/users/iknew.json
index be1b78b3..8bfb883c 100644
--- a/users/iknew.json
+++ b/users/iknew.json
@@ -1 +1 @@
-{"copyright":"iknew today"}
\ No newline at end of file
+{"copyright": "iknew today", "url": "http:\/\/iknew.today", "email": "iknew.today@gmail.com"}
diff --git a/users/imjching.json b/users/imjching.json
index 43efa396..a0d155b6 100644
--- a/users/imjching.json
+++ b/users/imjching.json
@@ -1 +1 @@
-{"copyright":"J.Ching","email":"imjching@hotmail.com","format":"txt"}
\ No newline at end of file
+{"copyright":"Jay C.","url":"http://www.imjching.com","email":"jay@imjching.com","format":"txt"}
\ No newline at end of file
diff --git a/users/jaswinder.json b/users/jaswinder.json
index 88f7b3ee..664ad9a1 100644
--- a/users/jaswinder.json
+++ b/users/jaswinder.json
@@ -1,7 +1,7 @@
 {
-  "copyright": "Jaswinder Singh, http://jaswindersingh.me",
-  "url": "http://jaswindersingh.me",
+  "copyright": "Jaswinder Singh, http://about.me/itsjaswinder",
+  "url": "http://about.me/itsjaswinder",
   "email": "s.jaswinder03@gmail.com",
   "gravatar": true,
-  "theme": "cherry"
+  "theme": "eula-modern"
 }
diff --git a/users/jay.json b/users/jay.json
index d6ba9ac7..82fb0773 100644
--- a/users/jay.json
+++ b/users/jay.json
@@ -1 +1 @@
-{"copyright":"Jay Bosamiya"}
\ No newline at end of file
+{"copyright":"Jay Bosamiya"}
diff --git a/users/jbradach.json b/users/jbradach.json
index 48cac7a5..a53198de 100644
--- a/users/jbradach.json
+++ b/users/jbradach.json
@@ -1 +1,8 @@
-{"copyright":"James Bradach, https:\/\/jamesbradach.com","url":"https:\/\/jamesbradach.com","email":"heythere@jamesbradach.com","format":"html","gravatar":true,"theme":"eula-modern"}
\ No newline at end of file
+{
+  "copyright": "James Bradach, https://jamesbradach.com",
+  "url": "https://jamesbradach.com",
+  "email": "heythere@jamesbradach.com",
+  "format": "html",
+  "gravatar": true,
+  "theme": "eula-modern"
+}
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/jenish b/users/jenish
new file mode 100644
index 00000000..99dfc079
--- /dev/null
+++ b/users/jenish
@@ -0,0 +1,5 @@
+
+{
+  "copyright": "Rakholiya Jenish",
+  "theme": "double-windsor"
+}
diff --git a/users/jmblog.json b/users/jmblog.json
index c4b2941a..1ddd7a2a 100644
--- a/users/jmblog.json
+++ b/users/jmblog.json
@@ -1 +1,4 @@
-{"copyright":"Yoshihide Jimbo","email":"yjimbo@gmail.com"}
\ No newline at end of file
+{
+  "copyright": "Yoshihide Jimbo",
+  "url": "https://github.com/jmblog/"
+}
diff --git a/users/johnschult.json b/users/johnschult.json
new file mode 100644
index 00000000..25031262
--- /dev/null
+++ b/users/johnschult.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "John Schult, https://github.com/johnschult",
+  "email": "johnschult@icloud.com",
+  "gravatar": true,
+  "theme"     : "default"
+}
diff --git a/users/joseandro.json b/users/joseandro.json
index 8e7760c6..af263228 100644
--- a/users/joseandro.json
+++ b/users/joseandro.json
@@ -1 +1 @@
-{"copyright":"Joseandro Luiz"}
\ No newline at end of file
+{"copyright":"Joseandro Luiz","url":"https:\/\/github.com\/joseandro","email":"joseandro.luiz@gmail.com","gravatar":true}
diff --git a/users/jprice.json b/users/jprice.json
index 4a9fec35..a5cc64fb 100644
--- a/users/jprice.json
+++ b/users/jprice.json
@@ -1 +1 @@
-{"copyright": "Josh Price, http://jprice.github.io","url": "http://jprice.github.io","email": "josh@joshprice.net","gravatar": true,"theme": "black-beauty"}
+{"copyright": "Josh Price, http://jprice.io","url": "http://jprice.io","email": "josh@jprice.io","gravatar": true,"theme": "black-beauty"}
diff --git a/users/k33nice.json b/users/k33nice.json
new file mode 100644
index 00000000..e56ed7b7
--- /dev/null
+++ b/users/k33nice.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Alexandr Krykovliuk",
+  "url": "http://k33nice.com",
+  "email": "k33nice@gmail.com",
+  "theme": "flesch"
+}
\ No newline at end of file
diff --git a/users/knakayama.json b/users/knakayama.json
index 7974ad8c..45a8516c 100644
--- a/users/knakayama.json
+++ b/users/knakayama.json
@@ -1 +1,7 @@
-{"copyright":"knakayama","email":"knakayama@gmail.com","format":"txt"}
\ No newline at end of file
+{
+  "copyright": "knakayama, https://github.com/knakayama",
+  "format": "txt",
+  "email": "knakayama@gmail.com",
+  "gravatar": true,
+  "theme"     : "default"
+}
diff --git a/users/leonardorifeli.json b/users/leonardorifeli.json
index d680e274..9e611531 100644
--- a/users/leonardorifeli.json
+++ b/users/leonardorifeli.json
@@ -1 +1 @@
-{"copyright":"Leonardo Rifeli","url":"http:\/\/leonardorifeli.com","email":"leonardorifeli@gmail.com","theme":"default"}
\ No newline at end of file
+{"copyright":"Leonardo Rifeli","url":"http:\/\/leonardorifeli.com","email":"leonardorifeli@gmail.com"}
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/managenet.json b/users/managenet.json
new file mode 100644
index 00000000..aa604fbc
--- /dev/null
+++ b/users/managenet.json
@@ -0,0 +1,5 @@
+{
+  "copyright": "Jacob Marshall, https://manage.net.nz",
+  "url": "https://manage.net.nz",
+  "email": "support@manage.net.nz"
+}
diff --git a/users/minhee.json b/users/minhee.json
index ddadb5b8..f36e691d 100644
--- a/users/minhee.json
+++ b/users/minhee.json
@@ -1 +1 @@
-{"copyright":"Hong Minhee, http:\/\/dahlia.kr\/","url":"http:\/\/dahlia.kr\/","email":"minhee@dahlia.kr"}
\ No newline at end of file
+{"copyright":"Hong Minhee, http:\/\/hongminhee.org\/","url":"http:\/\/hongminhee.org\/","email":"hongminhee@member.fsf.org"}
diff --git a/users/minidfx.json b/users/minidfx.json
new file mode 100644
index 00000000..670bb381
--- /dev/null
+++ b/users/minidfx.json
@@ -0,0 +1,8 @@
+{
+  "copyright": "MiniDfx, https://github.com/minidfx",
+  "url": "http://blog.couloir42.ch",
+  "format": "txt",
+  "email": "minidfx@gmail.com",
+  "gravatar": true,
+  "theme"     : "default"
+}
diff --git a/users/nhanderu.json b/users/nhanderu.json
new file mode 100644
index 00000000..66323552
--- /dev/null
+++ b/users/nhanderu.json
@@ -0,0 +1,5 @@
+{
+	"copyright": "Rafael Escobar",
+	"url": "http://nhanderu.com",
+	"email": "rafael.bze@gmail.com"
+}
diff --git a/users/obihann.json b/users/obihann.json
new file mode 100644
index 00000000..5704bb52
--- /dev/null
+++ b/users/obihann.json
@@ -0,0 +1 @@
+{"copyright":"Jeffrey Hann","url":"http:\/\/jeffreyhann.ca","email":"jeffhann@gmail.com"}
diff --git a/users/palleas.json b/users/palleas.json
new file mode 100644
index 00000000..2dc1f107
--- /dev/null
+++ b/users/palleas.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Romain 'Palleas' Pouclet, http://romain-pouclet.com",
+  "url": "http://romain-pouclet.com",
+  "email": "romain.pouclet@gmail.com",
+  "gravatar": true
+}
diff --git a/users/pemrouz.json b/users/pemrouz.json
index b01903e8..b93190b4 100644
--- a/users/pemrouz.json
+++ b/users/pemrouz.json
@@ -1 +1 @@
-{"copyright":"Pedram Emrouznejad"}
\ No newline at end of file
+{"copyright":"Pedram Emrouznejad"}
diff --git a/users/pushandplay.json b/users/pushandplay.json
index ad771a82..b00733ce 100644
--- a/users/pushandplay.json
+++ b/users/pushandplay.json
@@ -1 +1,8 @@
-{"copyright":"pushandplay"}
\ No newline at end of file
+{
+  "copyright": "pushandplay",
+  "url": "http://pushandplay.ru",
+  "format": "txt",
+  "email": "hello@pushandplay.ru",
+  "gravatar": true,
+  "theme": "default"
+}
diff --git a/users/queryli.json b/users/queryli.json
new file mode 100644
index 00000000..6e1bf367
--- /dev/null
+++ b/users/queryli.json
@@ -0,0 +1 @@
+{"copyright":"QueryLI","url":"http:\/\/query.li","email":"hello@query.li","format":"html","gravatar": true}
\ No newline at end of file
diff --git a/users/rafamello.json b/users/rafamello.json
new file mode 100644
index 00000000..dfb0a8c2
--- /dev/null
+++ b/users/rafamello.json
@@ -0,0 +1,2 @@
+{"copyright":"Rafael Mello Campanari","url":"http:\/\/rafamello.com","email":"lab.rafamello@gmail.com","format":"txt",
+  "theme": "flesch"}
\ No newline at end of file
diff --git a/users/rares.json b/users/rares.json
index 68da5eed..3971718c 100644
--- a/users/rares.json
+++ b/users/rares.json
@@ -1 +1 @@
-{"copyright":"Robert Ares"}
\ No newline at end of file
+{"copyright":"Robert Ares","url":"http:\/\/www.robares.com","email":"rob.ares+mit@gmail.com","format":"txt"}
diff --git a/users/revi.json b/users/revi.json
new file mode 100644
index 00000000..2ed70b94
--- /dev/null
+++ b/users/revi.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Yongmin Hong (Revi), https://www.revi.pe.kr",
+  "url": "https://www.revi.pe.kr",
+  "email": "revi@member.fsf.org",
+  "theme": "cherry"
+}
diff --git a/users/rflpazini.json b/users/rflpazini.json
index 64a3e3e4..b10e3c75 100644
--- a/users/rflpazini.json
+++ b/users/rflpazini.json
@@ -1 +1,5 @@
-{"copyright":"Rafael Pazini","url":"http:\/\/rflpazini.github.io","email":"rflpazini@gmail.com","format":"text"}
\ No newline at end of file
+{
+    "copyright": "Rafael Pazini",
+    "url": "http:\/\/rflpazini.github.io",
+    "email": "rflpazini@gmail.com"
+}
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/s-a.json b/users/s-a.json
new file mode 100644
index 00000000..281f605f
--- /dev/null
+++ b/users/s-a.json
@@ -0,0 +1,6 @@
+{
+	"copyright": "Stephan Ahlf",
+	"url": "https://github.com/s-a",
+	"email": "stephan.ahlf@gmail.com",
+	"format": "txt"
+}
\ No newline at end of file
diff --git a/users/sagru.json b/users/sagru.json
index 606ef8b9..6483cd4c 100644
--- a/users/sagru.json
+++ b/users/sagru.json
@@ -1,7 +1,8 @@
 {
-    "copyright": "Simple App Group LLC", 
-    "email": "info@simpleappgroup.com", 
-    "format": "html", 
-	"theme": "blackwood",
-    "url": "http://simpleappgroup.com"
+    "copyright": "Simple App Group LLC",
+    "email": "info@simpleappgroup.com",
+    "format": "html",
+    "theme": "opensans",
+    "url": "https://simpleappgroup.com",
+    "gravatar": true
 }
diff --git a/users/scottrobertson.json b/users/scottrobertson.json
index 6d82a58c..a25c99b5 100644
--- a/users/scottrobertson.json
+++ b/users/scottrobertson.json
@@ -1,6 +1,6 @@
 {
-  "copyright": "Scott Robertson, http://scottrobertson.me",
-  "url": "http://scottrobertson.me",
-  "email": "scott@scottrobertson.me",
+  "copyright": "Scott Robertson, https://scottrobertson.me",
+  "url": "https://scottrobertson.me",
+  "email": "scottymeuk@gmail.com",
   "gravatar": true
 }
diff --git a/users/sguidetti.json b/users/sguidetti.json
index 3fc9ead4..713fcf22 100644
--- a/users/sguidetti.json
+++ b/users/sguidetti.json
@@ -1 +1,6 @@
-{"copyright":"Steve Guidetti","url":"http:\/\/www.ultramegatech.com"}
\ No newline at end of file
+{
+  "copyright": "Steve Guidetti",
+  "url": "http://www.ultramegasoft.com",
+  "email" : "sguidetti@ultramegasoft.com",
+  "gravatar": true
+}
diff --git a/users/shivapoudel.json b/users/shivapoudel.json
index cc0ef775..a6e4cd69 100644
--- a/users/shivapoudel.json
+++ b/users/shivapoudel.json
@@ -1 +1 @@
-{"copyright":"Shiva Poudel"}
\ No newline at end of file
+{"copyright":"Shiva Poudel","url":"https:\/\/github.com/shivapoudel","theme":"double-windsor"}
diff --git a/users/sidak.json b/users/sidak.json
new file mode 100644
index 00000000..ebdf3814
--- /dev/null
+++ b/users/sidak.json
@@ -0,0 +1 @@
+{"copyright":"Sidak Pal Singh"}
diff --git a/users/sotayamashita.json b/users/sotayamashita.json
index 4c7cc915..c0e326c1 100644
--- a/users/sotayamashita.json
+++ b/users/sotayamashita.json
@@ -1 +1,6 @@
-{"copyright":"Sota Yamashita","url":"https:\/\/github.com\/sota0805"}
\ No newline at end of file
+{
+  "copyright": "Sota Yamashita, https://github.com/sotayamashita",
+  "url": "https://github.com/sotayamshita",
+  "email": "sota.yamashita@gmail.com",
+  "gravatar": false
+}
diff --git a/users/teppeis.json b/users/teppeis.json
index fb7c8eb9..616c02f5 100644
--- a/users/teppeis.json
+++ b/users/teppeis.json
@@ -1 +1 @@
-{"copyright": "Teppei Sato", "url": "https:\/\/github.com\/teppeis", "email": "teppeis@gmail.com", "format": "double-windsor"}
+{"copyright": "Teppei Sato", "url": "https:\/\/github.com\/teppeis", "email": "teppeis@gmail.com", "theme": "double-windsor"}
diff --git a/users/toolbear.json b/users/toolbear.json
index 831f6eb0..4033ab12 100644
--- a/users/toolbear.json
+++ b/users/toolbear.json
@@ -1 +1,6 @@
-{"copyright":"Tim Taylor, http:\/\/tool-man.org","url":"http:\/\/tool-man.org\/","email":"tim@tool-man.org","gravatar":true}
\ No newline at end of file
+{
+  "copyright": "Tim Taylor, http://tool-man.org",
+  "url": "http://tool-man.org/",
+  "email": "tim@tool-man.org",
+  "gravatar": true
+}
diff --git a/users/toomore.json b/users/toomore.json
index 7540560f..0b09151d 100644
--- a/users/toomore.json
+++ b/users/toomore.json
@@ -1 +1,7 @@
-{"copyright":"Toomore Chiang, http:\/\/toomore.net\/","url":"http:\/\/toomore.net","theme":"silver-style","email":"toomore0929@gmail.com","gravatar":true}
\ No newline at end of file
+{
+  "copyright": "Toomore Chiang, http://toomore.net/",
+  "url": "http://toomore.net",
+  "theme": "silver-style",
+  "email": "toomore0929@gmail.com",
+  "gravatar": true
+}
diff --git a/users/touma.json b/users/touma.json
new file mode 100644
index 00000000..8bda08d8
--- /dev/null
+++ b/users/touma.json
@@ -0,0 +1,6 @@
+{
+  "copyright": "Kamijou Touma, http://ilp.moe",
+  "url": "http://ilp.moe",
+  "email": "kamijoutouma@l.ilp.moe",
+  "format": "html"
+}
diff --git a/users/voltdb.json b/users/voltdb.json
new file mode 100644
index 00000000..b3f6a1d5
--- /dev/null
+++ b/users/voltdb.json
@@ -0,0 +1,6 @@
+{
+  "copyright":"VoltDB, Inc.",
+  "url":"http:\/\/www.voltdb.com",
+  "email":"info@voltdb.com",
+  "format":"txt"
+}
diff --git a/users/xight.json b/users/xight.json
index e9620079..f8daa9d2 100644
--- a/users/xight.json
+++ b/users/xight.json
@@ -1 +1,5 @@
-{"copyright":"Yoshiki Sato"}
\ No newline at end of file
+{
+	"copyright":"Yoshiki Sato",
+	"url":"http://xight.org",
+	"gravatar":true
+}
diff --git a/users/xlab.json b/users/xlab.json
index 335d63cb..ecefce5d 100644
--- a/users/xlab.json
+++ b/users/xlab.json
@@ -1 +1 @@
-{"copyright":"Maxim Kouprianov","url":"https:\/\/kouprianov.com","email":"maxim@kouprianov.com","format":"txt"}
\ No newline at end of file
+{"copyright":"Maxim Kupriianov","url":"https:\/\/xlab.is","email":"max@kc.vc","format":"txt"}
\ No newline at end of file
diff --git a/users/xuhong.json b/users/xuhong.json
index 86d315ac..8abc7789 100644
--- a/users/xuhong.json
+++ b/users/xuhong.json
@@ -1 +1 @@
-{"copyright":"xuhong chen"}
\ No newline at end of file
+{"copyright": "xuhong chen", "url": "http:\/\/xuhong.github.com", "email": "cxh710200711@gmail.com"}
diff --git a/users/ylrxeidx.json b/users/ylrxeidx.json
new file mode 100644
index 00000000..d54902f6
--- /dev/null
+++ b/users/ylrxeidx.json
@@ -0,0 +1,5 @@
+{
+	"copyright":	"Aldo Iljazi",
+	"email":	"ylrxeidx@openmailbox.org",
+	"theme":	"flesch"
+}
diff --git a/users/zzzzbov.json b/users/zzzzbov.json
new file mode 100644
index 00000000..4b01125e
--- /dev/null
+++ b/users/zzzzbov.json
@@ -0,0 +1,5 @@
+{
+    "copyright": "zzzzBov",
+    "email": "zzzzbov@gmail.com",
+    "url": "http://zzzzbov.com"
+}
\ No newline at end of file
