diff --git a/Site/2013-05/css/main.css b/Site/2013-05/css/main.css
index bea72aea..8d8f9507 100644
--- a/Site/2013-05/css/main.css
+++ b/Site/2013-05/css/main.css
@@ -35,6 +35,9 @@ a .popup {
     margin-right: -100px;
     padding: 8px;
 }
+a .popup.border {
+    margin-bottom: 1em;
+}
 a:hover .popup {
     display: block;
 }
@@ -108,6 +111,11 @@ img.block {
     margin:                     auto 1em;
     width:                      640px;
 }
+img.border {
+    background:                 #AAA;
+    border:                     1px solid #333;
+    padding:                    1px;
+}
 
 .thumb {
     clear: both;
diff --git a/Site/2013-05/img/about.png b/Site/2013-05/img/about.png
index bd5ccfc5..79693dc4 100644
Binary files a/Site/2013-05/img/about.png and b/Site/2013-05/img/about.png differ
diff --git a/Site/2013-05/img/android.png b/Site/2013-05/img/android.png
index 74c97c45..839005d9 100644
Binary files a/Site/2013-05/img/android.png and b/Site/2013-05/img/android.png differ
diff --git a/Site/2013-05/img/c-cli.png b/Site/2013-05/img/c-cli.png
index 29c719bf..7f60eab2 100644
Binary files a/Site/2013-05/img/c-cli.png and b/Site/2013-05/img/c-cli.png differ
diff --git a/Site/2013-05/img/favicon.png b/Site/2013-05/img/favicon.png
index f8fe4085..eebdd282 100644
Binary files a/Site/2013-05/img/favicon.png and b/Site/2013-05/img/favicon.png differ
diff --git a/Site/2013-05/img/glyphicons-halflings-white.png b/Site/2013-05/img/glyphicons-halflings-white.png
old mode 100755
new mode 100644
index 3bf6484a..7bf4fa5a
Binary files a/Site/2013-05/img/glyphicons-halflings-white.png and b/Site/2013-05/img/glyphicons-halflings-white.png differ
diff --git a/Site/2013-05/img/glyphicons-halflings.png b/Site/2013-05/img/glyphicons-halflings.png
index 8bc9e642..a724f1dc 100644
Binary files a/Site/2013-05/img/glyphicons-halflings.png and b/Site/2013-05/img/glyphicons-halflings.png differ
diff --git a/Site/2013-05/img/howto-mp-copy.png b/Site/2013-05/img/howto-mp-copy.png
index 17e0febc..4e15c2df 100644
Binary files a/Site/2013-05/img/howto-mp-copy.png and b/Site/2013-05/img/howto-mp-copy.png differ
diff --git a/Site/2013-05/img/howto-mp-copy@2x.png b/Site/2013-05/img/howto-mp-copy@2x.png
index 5f26e749..8ecda0c5 100644
Binary files a/Site/2013-05/img/howto-mp-copy@2x.png and b/Site/2013-05/img/howto-mp-copy@2x.png differ
diff --git a/Site/2013-05/img/howto-mp-create-confirm.png b/Site/2013-05/img/howto-mp-create-confirm.png
index a2872266..d978ae67 100644
Binary files a/Site/2013-05/img/howto-mp-create-confirm.png and b/Site/2013-05/img/howto-mp-create-confirm.png differ
diff --git a/Site/2013-05/img/howto-mp-create-confirm@2x.png b/Site/2013-05/img/howto-mp-create-confirm@2x.png
index 8ddd4281..fe573167 100644
Binary files a/Site/2013-05/img/howto-mp-create-confirm@2x.png and b/Site/2013-05/img/howto-mp-create-confirm@2x.png differ
diff --git a/Site/2013-05/img/howto-mp-create.png b/Site/2013-05/img/howto-mp-create.png
index cb5a1bb7..119758f3 100644
Binary files a/Site/2013-05/img/howto-mp-create.png and b/Site/2013-05/img/howto-mp-create.png differ
diff --git a/Site/2013-05/img/howto-mp-create@2x.png b/Site/2013-05/img/howto-mp-create@2x.png
index 2d6d6d01..7c042b50 100644
Binary files a/Site/2013-05/img/howto-mp-create@2x.png and b/Site/2013-05/img/howto-mp-create@2x.png differ
diff --git a/Site/2013-05/img/howto-mp-login.png b/Site/2013-05/img/howto-mp-login.png
index 4a63363d..cdbd14b5 100644
Binary files a/Site/2013-05/img/howto-mp-login.png and b/Site/2013-05/img/howto-mp-login.png differ
diff --git a/Site/2013-05/img/howto-mp-login@2x.png b/Site/2013-05/img/howto-mp-login@2x.png
index 2739fdaa..090db915 100644
Binary files a/Site/2013-05/img/howto-mp-login@2x.png and b/Site/2013-05/img/howto-mp-login@2x.png differ
diff --git a/Site/2013-05/img/howto-mp-type-basic.png b/Site/2013-05/img/howto-mp-type-basic.png
index 8eb27173..fe99a438 100644
Binary files a/Site/2013-05/img/howto-mp-type-basic.png and b/Site/2013-05/img/howto-mp-type-basic.png differ
diff --git a/Site/2013-05/img/howto-mp-type-basic@2x.png b/Site/2013-05/img/howto-mp-type-basic@2x.png
index 906f47dc..88090e4d 100644
Binary files a/Site/2013-05/img/howto-mp-type-basic@2x.png and b/Site/2013-05/img/howto-mp-type-basic@2x.png differ
diff --git a/Site/2013-05/img/howto-mp-type-change.png b/Site/2013-05/img/howto-mp-type-change.png
index dc7be3c6..6aa6ec1b 100644
Binary files a/Site/2013-05/img/howto-mp-type-change.png and b/Site/2013-05/img/howto-mp-type-change.png differ
diff --git a/Site/2013-05/img/howto-mp-type-change@2x.png b/Site/2013-05/img/howto-mp-type-change@2x.png
index 125c8ced..3a9f5e8e 100644
Binary files a/Site/2013-05/img/howto-mp-type-change@2x.png and b/Site/2013-05/img/howto-mp-type-change@2x.png differ
diff --git a/Site/2013-05/img/howto-twitter-done.png b/Site/2013-05/img/howto-twitter-done.png
index baca4bb7..8fad27f0 100644
Binary files a/Site/2013-05/img/howto-twitter-done.png and b/Site/2013-05/img/howto-twitter-done.png differ
diff --git a/Site/2013-05/img/howto-twitter-done@2x.png b/Site/2013-05/img/howto-twitter-done@2x.png
index 6f4a4dad..55a08753 100644
Binary files a/Site/2013-05/img/howto-twitter-done@2x.png and b/Site/2013-05/img/howto-twitter-done@2x.png differ
diff --git a/Site/2013-05/img/howto-twitter-paste.png b/Site/2013-05/img/howto-twitter-paste.png
index 5bb32411..5d134ed7 100644
Binary files a/Site/2013-05/img/howto-twitter-paste.png and b/Site/2013-05/img/howto-twitter-paste.png differ
diff --git a/Site/2013-05/img/howto-twitter-paste@2x.png b/Site/2013-05/img/howto-twitter-paste@2x.png
index a22e4ea9..7cf39d87 100644
Binary files a/Site/2013-05/img/howto-twitter-paste@2x.png and b/Site/2013-05/img/howto-twitter-paste@2x.png differ
diff --git a/Site/2013-05/img/howto-twitter-signup.png b/Site/2013-05/img/howto-twitter-signup.png
index e080d9af..8ff21b58 100644
Binary files a/Site/2013-05/img/howto-twitter-signup.png and b/Site/2013-05/img/howto-twitter-signup.png differ
diff --git a/Site/2013-05/img/howto-twitter-signup@2x.png b/Site/2013-05/img/howto-twitter-signup@2x.png
index e866a586..a3456c96 100644
Binary files a/Site/2013-05/img/howto-twitter-signup@2x.png and b/Site/2013-05/img/howto-twitter-signup@2x.png differ
diff --git a/Site/2013-05/img/ios.png b/Site/2013-05/img/ios.png
index b92a7c32..27a18f03 100644
Binary files a/Site/2013-05/img/ios.png and b/Site/2013-05/img/ios.png differ
diff --git a/Site/2013-05/img/java-cli.png b/Site/2013-05/img/java-cli.png
index c64d6e86..3cdea426 100644
Binary files a/Site/2013-05/img/java-cli.png and b/Site/2013-05/img/java-cli.png differ
diff --git a/Site/2013-05/img/java-gui.png b/Site/2013-05/img/java-gui.png
index 5de9bd58..71a99739 100644
Binary files a/Site/2013-05/img/java-gui.png and b/Site/2013-05/img/java-gui.png differ
diff --git a/Site/2013-05/img/mac-gui.png b/Site/2013-05/img/mac-gui.png
index 0ca8c465..06d33b60 100644
Binary files a/Site/2013-05/img/mac-gui.png and b/Site/2013-05/img/mac-gui.png differ
diff --git a/Site/2013-05/img/mac-icon-256.png b/Site/2013-05/img/mac-icon-256.png
index d98bf5e9..91ef069c 100644
Binary files a/Site/2013-05/img/mac-icon-256.png and b/Site/2013-05/img/mac-icon-256.png differ
diff --git a/Site/2013-05/img/mp-authenticate.png b/Site/2013-05/img/mp-authenticate.png
index 9cd27a8e..d435f673 100644
Binary files a/Site/2013-05/img/mp-authenticate.png and b/Site/2013-05/img/mp-authenticate.png differ
diff --git a/Site/2013-05/img/mp-authenticate@2x.png b/Site/2013-05/img/mp-authenticate@2x.png
index 93272af6..02263109 100644
Binary files a/Site/2013-05/img/mp-authenticate@2x.png and b/Site/2013-05/img/mp-authenticate@2x.png differ
diff --git a/Site/2013-05/img/mp-process-black.png b/Site/2013-05/img/mp-process-black.png
index 78498410..df54c7a6 100644
Binary files a/Site/2013-05/img/mp-process-black.png and b/Site/2013-05/img/mp-process-black.png differ
diff --git a/Site/2013-05/img/play.png b/Site/2013-05/img/play.png
index 97cad261..86fb383f 100644
Binary files a/Site/2013-05/img/play.png and b/Site/2013-05/img/play.png differ
diff --git a/Site/2013-05/img/re-enable-1.png b/Site/2013-05/img/re-enable-1.png
index 933a0460..09d97048 100644
Binary files a/Site/2013-05/img/re-enable-1.png and b/Site/2013-05/img/re-enable-1.png differ
diff --git a/Site/2013-05/img/re-enable-2.png b/Site/2013-05/img/re-enable-2.png
index a7f20326..93a53c22 100644
Binary files a/Site/2013-05/img/re-enable-2.png and b/Site/2013-05/img/re-enable-2.png differ
diff --git a/Site/2013-05/img/re-enable-3.png b/Site/2013-05/img/re-enable-3.png
index 4015a660..53c5af14 100644
Binary files a/Site/2013-05/img/re-enable-3.png and b/Site/2013-05/img/re-enable-3.png differ
diff --git a/Site/2013-05/img/re-enable-4.png b/Site/2013-05/img/re-enable-4.png
index 75e9783a..eb8d62eb 100644
Binary files a/Site/2013-05/img/re-enable-4.png and b/Site/2013-05/img/re-enable-4.png differ
diff --git a/Site/2013-05/img/re-enable-5.png b/Site/2013-05/img/re-enable-5.png
index 95650c08..eea8f950 100644
Binary files a/Site/2013-05/img/re-enable-5.png and b/Site/2013-05/img/re-enable-5.png differ
diff --git a/Site/2013-05/img/recovery-1.png b/Site/2013-05/img/recovery-1.png
index f43bb4dc..b9210e81 100644
Binary files a/Site/2013-05/img/recovery-1.png and b/Site/2013-05/img/recovery-1.png differ
diff --git a/Site/2013-05/img/recovery-2.png b/Site/2013-05/img/recovery-2.png
index d5a79ad9..951160f9 100644
Binary files a/Site/2013-05/img/recovery-2.png and b/Site/2013-05/img/recovery-2.png differ
diff --git a/Site/2013-05/img/recovery-3.png b/Site/2013-05/img/recovery-3.png
index 29ed72e3..6dd3211a 100644
Binary files a/Site/2013-05/img/recovery-3.png and b/Site/2013-05/img/recovery-3.png differ
diff --git a/Site/2013-05/img/recovery-4.png b/Site/2013-05/img/recovery-4.png
index 972c0c00..519a3396 100644
Binary files a/Site/2013-05/img/recovery-4.png and b/Site/2013-05/img/recovery-4.png differ
diff --git a/Site/2013-05/img/recovery-5.png b/Site/2013-05/img/recovery-5.png
index 474d9c3d..c11c77f6 100644
Binary files a/Site/2013-05/img/recovery-5.png and b/Site/2013-05/img/recovery-5.png differ
diff --git a/Site/2013-05/img/recovery-6.png b/Site/2013-05/img/recovery-6.png
index 7cc45ad6..21b055b2 100644
Binary files a/Site/2013-05/img/recovery-6.png and b/Site/2013-05/img/recovery-6.png differ
diff --git a/Site/2013-05/img/recovery-7.png b/Site/2013-05/img/recovery-7.png
index 1fc0609a..ec477502 100644
Binary files a/Site/2013-05/img/recovery-7.png and b/Site/2013-05/img/recovery-7.png differ
diff --git a/Site/2013-05/img/recovery-8.png b/Site/2013-05/img/recovery-8.png
index 206ecf5e..1a7cd0ba 100644
Binary files a/Site/2013-05/img/recovery-8.png and b/Site/2013-05/img/recovery-8.png differ
diff --git a/Site/2013-05/img/shot-laptop-leaning-iphone.png b/Site/2013-05/img/shot-laptop-leaning-iphone.png
index 7af68910..576bbc68 100644
Binary files a/Site/2013-05/img/shot-laptop-leaning-iphone.png and b/Site/2013-05/img/shot-laptop-leaning-iphone.png differ
diff --git a/Site/2013-05/img/thumb-authenticate.png b/Site/2013-05/img/thumb-authenticate.png
index ef4eefde..ac51966b 100644
Binary files a/Site/2013-05/img/thumb-authenticate.png and b/Site/2013-05/img/thumb-authenticate.png differ
diff --git a/Site/2013-05/img/thumb-iphone-broken.png b/Site/2013-05/img/thumb-iphone-broken.png
index dc1bdf8c..f1f5c20b 100644
Binary files a/Site/2013-05/img/thumb-iphone-broken.png and b/Site/2013-05/img/thumb-iphone-broken.png differ
diff --git a/Site/2013-05/img/thumb-iphone-mac-sync.png b/Site/2013-05/img/thumb-iphone-mac-sync.png
index 2b7e8ea5..940ccfb2 100644
Binary files a/Site/2013-05/img/thumb-iphone-mac-sync.png and b/Site/2013-05/img/thumb-iphone-mac-sync.png differ
diff --git a/Site/2013-05/img/thumb-iphone-pw.png b/Site/2013-05/img/thumb-iphone-pw.png
index 63c7f13e..1282170a 100644
Binary files a/Site/2013-05/img/thumb-iphone-pw.png and b/Site/2013-05/img/thumb-iphone-pw.png differ
diff --git a/Site/2013-05/img/thumb-iphone-types.png b/Site/2013-05/img/thumb-iphone-types.png
index 9d488777..b332f299 100644
Binary files a/Site/2013-05/img/thumb-iphone-types.png and b/Site/2013-05/img/thumb-iphone-types.png differ
diff --git a/Site/2013-05/img/thumb-process-black.png b/Site/2013-05/img/thumb-process-black.png
index e0d23c9d..82c19990 100644
Binary files a/Site/2013-05/img/thumb-process-black.png and b/Site/2013-05/img/thumb-process-black.png differ
diff --git a/Site/2013-05/img/video-bg.png b/Site/2013-05/img/video-bg.png
index d1a2df60..db9dca50 100644
Binary files a/Site/2013-05/img/video-bg.png and b/Site/2013-05/img/video-bg.png differ
diff --git a/Site/2013-05/img/video-pattern.png b/Site/2013-05/img/video-pattern.png
index 8a8cfbd7..57b5511c 100644
Binary files a/Site/2013-05/img/video-pattern.png and b/Site/2013-05/img/video-pattern.png differ
diff --git a/Site/2013-05/img/web.png b/Site/2013-05/img/web.png
new file mode 100644
index 00000000..5524432c
Binary files /dev/null and b/Site/2013-05/img/web.png differ
diff --git a/Site/2013-05/index.html b/Site/2013-05/index.html
index 2c72b6d6..8e8c3ad8 100644
--- a/Site/2013-05/index.html
+++ b/Site/2013-05/index.html
@@ -79,11 +79,12 @@
             <h4>
                 Get it for:
                 <a title="iPhone, iPad, iPod touch" href="http://itunes.apple.com/app/id510296984" onclick="_gaq.push(['_trackPageview', '/outbound/ios']);">iPhone / iPad<img class="popup" src="img/ios.png" /></a> |
-                <a title="Mac (graphical interface)" href="https://itunes.apple.com/app/id662763204" onclick="_gaq.push(['_trackPageview', '/outbound/gui/mac']);">Mac<img class="popup" src="img/mac-gui.png" /></a> |
+                <a title="Mac (graphical interface)" href="https://itunes.apple.com/app/id662763204" onclick="_gaq.push(['_trackPageview', '/outbound/gui/mac']);">Mac<img class="popup border" src="img/mac-gui.png" /></a> |
                 <a title="Mac, Linux, UNIX, Windows (graphical interface)" href="masterpassword-gui.jar" onclick="_gaq.push(['_trackPageview', '/outbound/gui/java']);">Desktop (Java)<img class="popup" src="img/java-gui.png" /></a> |
                 Terminal (<a title="Mac, Linux, UNIX, Windows (command line interface)" href="masterpassword-cli.zip" onclick="_gaq.push(['_trackPageview', '/outbound/cli/java']);">Java<img class="popup" src="img/java-cli.png" /></a> /
                 <a title="Mac, Linux, UNIX, Windows (command line interface)" href="https://github.com/Lyndir/MasterPassword/tree/master/MasterPassword/C" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Native C<img class="popup" src="img/c-cli.png" /></a>) |
-                <a title="Android" href="masterpassword-android.apk" onclick="_gaq.push(['_trackPageview', '/outbound/android']);">Android (Beta)<img class="popup" src="img/android.png" /></a>
+                <a title="Android" href="masterpassword-android.apk" onclick="_gaq.push(['_trackPageview', '/outbound/android']);">Android (Beta)<img class="popup" src="img/android.png" /></a> |
+                <a title="JavaScript" href="mpw-js" onclick="_gaq.push(['_trackPageview', '/outbound/js']);">Web (Beta)<img class="popup border" src="img/web.png" /></a>
             </h4>
         </section>
 
diff --git a/Site/2013-05/mpw-js/js/mpw-js b/Site/2013-05/mpw-js/js/mpw-js
index 768cfad3..08ada42c 160000
--- a/Site/2013-05/mpw-js/js/mpw-js
+++ b/Site/2013-05/mpw-js/js/mpw-js
@@ -1 +1 @@
-Subproject commit 768cfad320668f480e2e44f7bf85c1f0de1b4059
+Subproject commit 08ada42cbb033b2c094cef0c015a20d8c7467bc1