diff --git a/README.md b/README.md
index fa808e17..95d4b28f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You can send a full JSON file to the API, not *just* the copyright, so this work
     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. 
+request and it'll go live soon after.
 
 Equally if you need to update the user file to include more details that
 you didn't initially include (extra fields in the next section) you will
@@ -40,7 +40,7 @@ need to send a pull request on that `user.json` file via GitHub.
 
 The `users` directory contains a list of files, each representing a host
 on mit-license.org. The minimum requirement for the JSON is that is
-contains a `copyright` field - everything else is optional. Remember to ensure 
+contains a `copyright` field - everything else is optional. Remember to ensure
 the `user.json` file is [valid JSON](http://jsonlint.com/).
 
 Available fields:
@@ -110,9 +110,9 @@ boolean property:
       "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 
+
+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
 Gravatar.
 
 ### License version targeting
@@ -127,7 +127,7 @@ extra assurance for you.
 Targeting requires the [sha from the license commit](https://github.com/remy/mit-license/commits/master/LICENSE.html). This can be
 specified on the URL (in your permalink) or in the JSON file.
 
-For example: http://rem.mit-license.org/a526bf7ad1 (make sure to view-source) 
+For example: http://rem.mit-license.org/a526bf7ad1 (make sure to view-source)
 shows an older version of the LICENSE.html file (compared to the [latest version](http://rem.mit-license.org)
 - the older version didn't have the new themes).
 
@@ -196,7 +196,7 @@ The url also supports including a start year:
 
 * [http://rem.mit-license.org/2009/](http://rem.mit-license.org/2009/) will
   show a license year range of 2009-2011 (2011 being the current year)
-* [http://rem.mit-license.org/2009-2010](http://rem.mit-license.org/2009-2010/) 
+* [http://rem.mit-license.org/2009-2010](http://rem.mit-license.org/2009-2010/)
   allows me to force the year range
 * [http://rem.mit-license.org/a526bf7ad1/2009-2010/license.txt](http://rem.mit-license.org/a526bf7ad1/2009-2010/license.txt) a526bf7ad1 version, with year range of 2009-2010 in plain text
 
diff --git a/themes/afterdark.css b/themes/afterdark.css
index 9756617b..a20079f4 100644
--- a/themes/afterdark.css
+++ b/themes/afterdark.css
@@ -8,4 +8,5 @@ a:active, a:hover { color:#5dd912; }
 a img { position: absolute; top: 0; right: 0; border: 0; }
 :-moz-any-link:focus {background:#bc4a46;}
 ::selection {background:#bc4a46;}
-::-moz-selection {background:#bc4a46;}
\ No newline at end of file
+::-moz-selection {background:#bc4a46;}
+#gravatar { position: relative; float: right; margin-bottom: 1em; margin-left: 1em; border: 1px solid #ddd; }
\ No newline at end of file
diff --git a/themes/blackwood.css b/themes/blackwood.css
index 2ed72e0c..a42f844f 100644
--- a/themes/blackwood.css
+++ b/themes/blackwood.css
@@ -38,3 +38,4 @@ a:active, a:hover { border-bottom: 1px dotted #F00;   }
   footer p { position: static; background: none;  }
   footer { position: static; background-color: #fff;  }
 }	
+#gravatar { position: relative; float: left; margin-top: 1em; margin-right: 1em; border: 1px solid #ddd; }
\ No newline at end of file
diff --git a/themes/cherry-white.css b/themes/cherry-white.css
index a2426fa6..0453a0ad 100644
--- a/themes/cherry-white.css
+++ b/themes/cherry-white.css
@@ -15,4 +15,5 @@ a img { position: absolute; top: 0; right: 0; border: 0; }
 ::-moz-selection {color:#bc4a46; }
 footer {  background-color: #FFFFFF; border-bottom: 3px solid #FF3366; margin-top: 10px; padding: 4px 28px; text-align: center; border-top: 1px solid #F5F5F5; }
 footer a { padding: 10px;  }
-footer p { font-size: 16px; margin: 0; padding: 0;}
\ No newline at end of file
+footer p { font-size: 16px; margin: 0; padding: 0;}
+#gravatar { position: relative; float: right; border: 3px solid #CCCCCC; top: -2.3em; z-index: 1; border-radius: 10px; }
\ No newline at end of file
diff --git a/themes/cherry.css b/themes/cherry.css
index 03c992de..d3b35adb 100644
--- a/themes/cherry.css
+++ b/themes/cherry.css
@@ -15,4 +15,5 @@ a img { position: absolute; top: 0; right: 0; border: 0; }
 ::-moz-selection {color:#bc4a46; }
 footer {  background-color: #FFFFFF; border-bottom: 3px solid #FF3366; margin-top: 10px; padding: 4px 28px; text-align: center; }
 footer a { padding: 10px;  }
-footer p { font-size: 16px; margin: 0; padding: 0;}
\ No newline at end of file
+footer p { font-size: 16px; margin: 0; padding: 0;}
+#gravatar { position: relative; float: right; border: 3px solid #CCCCCC; top: -4.3em; z-index: 1; border-radius: 10px; }
\ No newline at end of file
diff --git a/themes/default.css b/themes/default.css
index 1f649096..cf677f00 100644
--- a/themes/default.css
+++ b/themes/default.css
@@ -17,4 +17,4 @@ a:active { color:#000; }
 :-moz-any-link:focus {color:#000; border:0;}
 ::selection {background:#ccc;}
 ::-moz-selection {background:#ccc;}
-#gravatar{position:relative;float:right; margin-bottom: 1em; margin-left: 1em; border: 1px solid #ddd;}
+#gravatar { position: relative; float: right; margin-bottom: 1em; margin-left: 1em; border: 1px solid #ddd; }
\ No newline at end of file
diff --git a/themes/double-windsor.css b/themes/double-windsor.css
index 7312809a..1358764f 100644
--- a/themes/double-windsor.css
+++ b/themes/double-windsor.css
@@ -71,3 +71,10 @@ footer {
   margin-top: 5px;
   font-style: italic;
 }
+
+#gravatar {
+    border: 1px solid #ddd;
+    position: relative;
+    float: right;
+    top: -1.7em;
+}
\ No newline at end of file
diff --git a/themes/flesch.css b/themes/flesch.css
index 6ef87c1d..ecec83a7 100644
--- a/themes/flesch.css
+++ b/themes/flesch.css
@@ -10,3 +10,4 @@ h1 { margin:0; font-size: 24px; line-height: 32px;}
 a, a:visited { color:#105cb6; padding:4px; text-decoration:none; } 
 a:active, a:hover { color:#003; }
 a img { position: absolute; top: 0; right: 0; border: 0; }
+#gravatar { position: relative; float: right; margin-bottom: 1em; margin-left: 1em; border: 1px solid #ddd; }
\ No newline at end of file
diff --git a/themes/hipster-gray.css b/themes/hipster-gray.css
index 8a6d24b4..a274fd83 100644
--- a/themes/hipster-gray.css
+++ b/themes/hipster-gray.css
@@ -196,3 +196,11 @@ footer a:hover, footer a:focus, footer a:active {
     padding-left: 12pt;
   }
 }
+#gravatar {
+    position: relative;
+    float: left;
+    border: 20px solid #c4c4c4;
+    margin-left: -12em;
+    margin-top: -1em;
+    width: 5em;
+}
\ No newline at end of file
diff --git a/themes/orange.css b/themes/orange.css
index e0304e51..f6d60623 100644
--- a/themes/orange.css
+++ b/themes/orange.css
@@ -3,11 +3,12 @@ html,body{background:#663B14;font:13pt "PT Sans",sans-serif;text-align:center}
 a:link,a:visited{color:#234234;text-decoration:none}
 a:hover,a:active{color:#432321;text-decoration:underline}
 article{background:#CC9900;text-align:left;width:85%;margin:80px auto;border-radius:10px;-moz-border-radius:10px;box-shadow:-1px 1px 20px rgba(30,30,30,0.5),2px 1px 15px rgba(80,80,80,0.4),inset 0 0 10px rgba(50,50,50,0.7);-webkit-box-shadow:-1px 1px 20px rgba(30,30,30,0.5),2px 1px 15px rgba(80,80,80,0.4),inset 0 0 10px rgba(50,50,50,0.7)}
-article h1{background:#CC6600;text-align:center;font:bold 35pt "PT Sans Caption","PT Sans",sans-serif;margin:0;padding:5px;border-radius:10px;-moz-border-radius:10px;box-shadow:inset 0 0 10px rgba(70,70,70,0.2),inset 1px 0 10px rgba(50,50,50,0.3),inset -1px 0 10px rgba(50,50,50,0.3);-webkit-box-shadow:inset 0 0 10px rgba(70,70,70,0.2),inset 1px 0 10px rgba(50,50,50,0.3),inset -1px 0 10px rgba(50,50,50,0.3)}
+article h1{background:#CC6600;text-align:center;font:bold 35pt "PT Sans Caption","PT Sans",sans-serif;margin:0;padding:19px;border-radius:10px;-moz-border-radius:10px;box-shadow:inset 0 0 10px rgba(70,70,70,0.2),inset 1px 0 10px rgba(50,50,50,0.3),inset -1px 0 10px rgba(50,50,50,0.3);-webkit-box-shadow:inset 0 0 10px rgba(70,70,70,0.2),inset 1px 0 10px rgba(50,50,50,0.3),inset -1px 0 10px rgba(50,50,50,0.3)}
 article p{margin:0;padding:10px 15px}
 footer{position:fixed;bottom:0;left:0;width:100%;border-top:1px solid #7A7A00;background:#333300;user-select:none;-moz-user-select:none;-webkit-user-select:none}
 footer p,footer a{display:block;margin:0;text-shadow:0 0 10px #ccc;font-size:11.5pt}
 footer a:link,footer a:visited{color:#aaa}
 footer a:hover,footer a:active{color:#eee}
 ::selection{background:#663300;color:white}
-::-moz-selection{background:#663300;color:white}
\ No newline at end of file
+::-moz-selection{background:#663300;color:white}
+#gravatar { position: relative; float: right; top: 0.5em; z-index: 1; right: 0.7em; border-radius: 10px; }
\ No newline at end of file
diff --git a/themes/xtansia.css b/themes/xtansia.css
index 687246b7..30fd54d2 100644
--- a/themes/xtansia.css
+++ b/themes/xtansia.css
@@ -64,4 +64,11 @@ a:hover {
 
 a:active {
   color: #007399;
+}
+
+#gravatar {
+    position: relative;
+    float: right;
+    border: 2px solid gray;
+    top: -1em;
 }
\ No newline at end of file
diff --git a/users/rem.json b/users/rem.json
index 5f6c6a18..15441f6a 100644
--- a/users/rem.json
+++ b/users/rem.json
@@ -1,5 +1,6 @@
 {
   "copyright": "Remy Sharp, http://remysharp.com",
   "url": "http://remysharp.com",
-  "theme": "flesch"
+  "theme": "flesch",
+  "gravatar": true
 }