diff --git a/blog.html b/blog.html
index 7d1710f25..94a26b057 100644
--- a/blog.html
+++ b/blog.html
@@ -17,11 +17,50 @@
     <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr">
 
 <!-- page_bgn -->
+    <h2>
+      <span class='mw-headline' id='Release:_v2.8.5.1_.282015-08-30_20:15_Sun.29'>Release: v2.8.5.1 (2015-08-30 20:15 Sun)</span>
+    </h2>
+    <p>
+      v2.8.5 is a light release. It includes a DMG for Mac OS X and moves the images from /user/anonymous/app to /bin/any/xowa/file
+    </p>
+    <h3>
+      <span class='mw-headline' id='New_Mac_OS_X_DMG'>New Mac OS X DMG</span>
+    </h3>
+    <p>
+      I spent some time putting together a DMG file for Mac OS X. For now, it's only for 64-bit versions (Snow Leopard and up).
+    </p>
+    <h3>
+      <span class='mw-headline' id='Image_update_for_Ukrainian_and_Finnish_wikis'>Image update for Ukrainian and Finnish wikis</span>
+    </h3>
+    <p>
+      These updates were uploaded earlier this week to <a href="https://archive.org/details/Xowa_ukwiki_latest" class="external text" rel="nofollow">https://archive.org/details/Xowa_ukwiki_latest</a> and <a href="https://archive.org/details/Xowa_fiwiki_latest" class="external text" rel="nofollow">https://archive.org/details/Xowa_fiwiki_latest</a> .
+    </p>
+    <p>
+      I was planning to upload German, but Wikimedia kicked off a new cycle over the weekend. I'll review German this week and upload accordingly
+    </p>
+    <h3>
+      <span class='mw-headline' id='Images_moved_from_.2Fuser.2Fanonymous.2Fapp_to_.2Fbin.2Fany.2Fxowa.2Ffile'>Images moved from /user/anonymous/app to /bin/any/xowa/file</span>
+    </h3>
+    <p>
+      I moved all files and images out of the "/user/" file hierarchy. Basically, I'm planning to reduce "/user/" to only a few files or directories. CSS files will probably be moved out within the next few months as well.
+    </p>
+    <h3>
+      <span class='mw-headline' id='Next_release:_v2.9.1'>Next release: v2.9.1</span>
+    </h3>
+    <p>
+      For images, I'm going to continue image updates with German, Turkish and Indonesian.
+    </p>
+    <p>
+      For development, I plan to keep v2.9.1 light, so will work on either Android or other long-running items
+    </p>
+    <p>
+      <br>
+    </p>
     <h2>
       <span class='mw-headline' id='Release:_v2.8.4.1_.282015-08-23_21:40_Sun.29'>Release: v2.8.4.1 (2015-08-23 21:40 Sun)</span>
     </h2>
     <p>
-      v2.8.4 is a light release. It supports 7 new Wikimedia wikis and has some Firefox addons.
+      v2.8.4 is a light release. It supports 7 new Wikimedia wikis and has some Firefox addon fixes.
     </p>
     <h3>
       <span class='mw-headline' id='Image_update_for_Persian_and_Bengali_wikis'>Image update for Persian and Bengali wikis</span>
@@ -42,7 +81,7 @@
       There were a few issues with images not loading and sidebar links not working. See <a href="https://github.com/piotrex/XOWA-Addon/issues/2" class="external text" rel="nofollow">https://github.com/piotrex/XOWA-Addon/issues/2</a> and <a href="https://github.com/piotrex/XOWA-Addon/issues/3" class="external text" rel="nofollow">https://github.com/piotrex/XOWA-Addon/issues/3</a>
     </p>
     <h3>
-      <span class='mw-headline' id='Next_release:_v2.8.4'>Next release: v2.8.4</span>
+      <span class='mw-headline' id='Next_release:_v2.8.5'>Next release: v2.8.5</span>
     </h3>
     <p>
       For this week, I'm going to continue image updates with Ukrainian, German and Finnish.
diff --git a/download.html b/download.html
index ddb3364f1..2480601b4 100644
--- a/download.html
+++ b/download.html
@@ -21,31 +21,31 @@
 
 <h2><span class='mw-headline' id='Windows'> Windows </span></h2>
 <ul>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_windows_64_v2.8.4.1.zip" class="external text" rel="nofollow">Windows (64-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_windows_64_v2.8.5.1.zip" class="external text" rel="nofollow">Windows (64-bit)</a>
   </li>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_windows_v2.8.4.1.zip" class="external text" rel="nofollow">Windows (32-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_windows_v2.8.5.1.zip" class="external text" rel="nofollow">Windows (32-bit)</a>
   </li>
 </ul>
 
 <h2><span class='mw-headline' id='Linux'> Linux </span></h2>
 <ul>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_linux_64_v2.8.4.1.zip" class="external text" rel="nofollow">Linux (64-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_linux_64_v2.8.5.1.zip" class="external text" rel="nofollow">Linux (64-bit)</a>
   </li>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_linux_v2.8.4.1.zip" class="external text" rel="nofollow">Linux (32-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_linux_v2.8.5.1.zip" class="external text" rel="nofollow">Linux (32-bit)</a>
   </li>
 </ul>
 
 <h2><span class='mw-headline' id='Mac_OS_X'> Mac OS X </span></h2>
 <ul>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_macosx_64_v2.8.4.1.zip" class="external text" rel="nofollow">Mac OS X (64-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_macosx_64_v2.8.5.1.zip" class="external text" rel="nofollow">Mac OS X (64-bit)</a>
   </li>
-  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.4.1/xowa_app_macosx_v2.8.4.1.zip" class="external text" rel="nofollow">Mac OS X (32-bit)</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/releases/download/v2.8.5.1/xowa_app_macosx_v2.8.5.1.zip" class="external text" rel="nofollow">Mac OS X (32-bit)</a>
   </li>
 </ul>
 
 <h2><span class='mw-headline' id='Source'> Source code </span></h2>
 <ul>
-  <li> <a href="https://github.com/gnosygnu/xowa/archive/v2.8.4.1.zip" class="external text" rel="nofollow">Source code</a>
+  <li> <a href="https://github.com/gnosygnu/xowa/archive/v2.8.5.1.zip" class="external text" rel="nofollow">Source code</a>
   </li>
 </ul>
 
@@ -55,35 +55,28 @@
     </h2>
 
     <h2>
-      <span class='mw-headline' id='v2.8.4.1_.282015-08-24.29'>v2.8.4.1 (2015-08-24)</span>
+      <span class='mw-headline' id='v2.8.5.1_.282015-08-31.29'>v2.8.5.1 (2015-08-31)</span>
     </h2>
     <p>
-      <b>fix</b>
+      <b>package</b>
     </p>
     <ul>
       <li>
-        Import: Fix broken urls for wikimedia wikis (affects 7 wikimedia dumps not importing) {detected by cd19s}. See: [[Help:Import/List]] <a href="https://ar.wikimedia.org/wiki/">https://ar.wikimedia.org</a> <a href="https://ca.wikimedia.org/wiki/">https://ca.wikimedia.org</a> <a href="https://be.wikimedia.org/wiki/">https://be.wikimedia.org</a> <a href="https://uk.wikimedia.org" class="external text" rel="nofollow">https://uk.wikimedia.org</a> <a href="https://br.wikimedia.org/wiki/">https://br.wikimedia.org</a> <a href="https://co.wikimedia.org/wiki/">https://co.wikimedia.org</a> <a href="https://se.wikimedia.org/wiki/">https://se.wikimedia.org</a>
+        Package: Release image update for Ukrainian wikis (2015-08). See: <a href="https://archive.org/download/Xowa_ukwiki_latest" class="external text" rel="nofollow">https://archive.org/download/Xowa_ukwiki_latest</a>
       </li>
       <li>
-        File: Use thumb size when specified for videos, not original size (affects several video thumbnails showing with large size); EX:[[File:A.ogv|thumb]] -&gt; 220px x&gt; original_px. See: <a href="https://en.wikipedia.org/wiki/Edward_Snowden">https://en.wikipedia.org/wiki/Edward_Snowden</a> <a href="https://en.wikipedia.org/wiki/Xinjiang">https://en.wikipedia.org/wiki/Xinjiang</a> <a href="https://en.wikipedia.org/wiki/Alice_Brady">https://en.wikipedia.org/wiki/Alice_Brady</a> [broken since:v2.8.2]
+        Package: Release image update for Finnish wikis (2015-08). See: <a href="https://archive.org/download/Xowa_fiwiki_latest" class="external text" rel="nofollow">https://archive.org/download/Xowa_fiwiki_latest</a>
+      </li>
+    </ul>
+    <p>
+      <b>add</b>
+    </p>
+    <ul>
+      <li>
+        Setup: Add Mac OS X dmg setup file.
       </li>
       <li>
-        Setup: Fix XOWA root directory for setup_lua.sh (affects error message on console when application first starts; also official lua won't work (LuaJ does)). See: /xowa/bin/os_name/xowa/script/setup_lua.sh
-      </li>
-      <li>
-        Lang: Fix non-working link trail for non-WikiMedia wikis {detected by pirate}. See: <a href="https://nethackwiki.com/wiki/">http://nethackwiki.com</a> [broken since:v2.7.2]
-      </li>
-      <li>
-        FirefoxAddon: Fix XOWA toolbar button and sidebar links; EX:xowa:home //en.wikipedia.org/ {detected by pirate}.
-      </li>
-      <li>
-        FirefoxAddon: Fix images not loading on first view {detected by pirate}.
-      </li>
-      <li>
-        Setup: Enable bundled JRE for Windows .exe. See: /xowa/xowa.exe
-      </li>
-      <li>
-        Make.Images: Fix images not downloading for small wikis.
+        Scribunto.Text: Add basic support for JsonEncode / JsonDecode.
       </li>
     </ul>
     <p>
@@ -91,29 +84,10 @@
     </p>
     <ul>
       <li>
-        Javascript.Find: Allow search by backslash; EX:"C:\XOWA". See: [[Help:Upgrading]]
+        Setup: Change macosx shell scripts from .sh to ""; See: /xowa/xowa_macosx_64.
       </li>
       <li>
-        API.Wikimedia: Add bldr command for downloading wiki meta data. See: [[Help:Import/Command-line/Site meta]]
-      </li>
-    </ul>
-    <p>
-      <b>package</b>
-    </p>
-    <ul>
-      <li>
-        Package: Release image update for Persian wikis (2015-08). See: <a href="https://archive.org/download/Xowa_fawiki_latest" class="external text" rel="nofollow">https://archive.org/download/Xowa_fawiki_latest</a>
-      </li>
-      <li>
-        Package: Release image update for Bengali Wikis (2015-08). See: <a href="https://archive.org/download/Xowa_bnwiki_latest" class="external text" rel="nofollow">https://archive.org/download/Xowa_bnwiki_latest</a>
-      </li>
-    </ul>
-    <p>
-      <b>minor</b>
-    </p>
-    <ul>
-      <li>
-        FirefoxAddon: Include latest version of XOWA Addon (v0.2.1) {detected by pirate}. See: /xowa/bin/any/firefox/xowa_viewer/default/
+        Parser.Title: Ignore BIDI (bi-directional) marks in title {detected by gnosygnu.gui}. See: <a href="/site/fa.wikisource.org/wiki/تصمیم_قانونی_دایر_به‌ابراز‌_رای‌اعتماد_به_دولت_جناب_آقای_امیرعباس_هویدا_نخست‌وزیر_۱۳۵۰">https://fa.wikisource.org/wiki/تصمیم_قانونی_دایر_به‌ابراز‌_رای‌اعتماد_به_دولت_جناب_آقای_امیرعباس_هویدا_نخست‌وزیر_۱۳۵۰</a>
       </li>
     </ul>
     <p>
@@ -121,7 +95,19 @@
     </p>
     <ul>
       <li>
-        Diagnostics: Fix test to expect "home" instead of "Home". See: [[Help:Diagnostics/Scribunto/SiteLibrary]]
+        Url: Ignore invalid urls when entered from url bar {detected by gnosygnu.gui}. See: <a href="https://a" class="external text" rel="nofollow">https://a</a> <a href="https://a/b/c" class="external text" rel="nofollow">https://a/b/c</a> <a href="https://enxyz.wikipedia.org" class="external text" rel="nofollow">https://enxyz.wikipedia.org</a>
+      </li>
+      <li>
+        Setup: Always update version number in xowa.exe and xowa_64.exe. See: /xowa/xowa.exe /xowa/xowa_64.exe
+      </li>
+      <li>
+        Setup: Move edit-toolbar images from /xowa/user/anonymous/app/img/edit to /xowa/bin/any/xowa/html/res/src/xowa/edit-toolbar/img. See: /xowa/bin/any/xowa/html/res/src/xowa/edit-toolbar/img
+      </li>
+      <li>
+        Setup: Move images from /xowa/user/anonymous/app/img/ to /xowa/bin/any/xowa/file/. See: /xowa/bin/any/xowa/file/
+      </li>
+      <li>
+        Html_dump: Handle external links with reparented font elements; EX:&lt;font color="red"&gt;[http://a.org]&lt;/font&gt; {detected by gnosygnu.build.warning}.
       </li>
     </ul>
     <p>
@@ -129,9 +115,15 @@
     </p>
     <ul>
       <li>
-        Source: Clean up Xow_domain_itm and Xow_abrv_wm.
+        Source: Reorganize primitive classes.
+      </li>
+      <li>
+        Source: Refactor json classes.
       </li>
     </ul>
+    <p>
+      <br>
+    </p>
 <!-- page_end -->
     </div>
   </div>
diff --git a/image_dbs.html b/image_dbs.html
index 202b7181a..2a7c4049a 100644
--- a/image_dbs.html
+++ b/image_dbs.html
@@ -287,7 +287,7 @@
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            .xowa .sqlite3
+            .xowa<br/>.sqlite3
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
@@ -1492,41 +1492,84 @@
       <tr style='color:black; border-collapse:collapse;'>
         <td style='color:black; vertical-align:top;'>
           <p>
-            <a href="https://uk.wikipedia.org/wiki/">http://uk.wikipedia.org</a><br>
-            <a href="https://uk.wiktionary.org/wiki/">http://uk.wiktionary.org</a><br>
-            <a href="https://uk.wikisource.org/wiki/">http://uk.wikisource.org</a><br>
-            <a href="https://uk.wikivoyage.org/wiki/">http://uk.wikivoyage.org</a><br>
-            <a href="https://uk.wikiquote.org/wiki/">http://uk.wikiquote.org</a><br>
-            <a href="https://uk.wikibooks.org/wiki/">http://uk.wikibooks.org</a><br>
-            <a href="https://uk.wikinews.org/wiki/">http://uk.wikinews.org</a>
+            <a href="https://uk.wikipedia.org/wiki/">https://uk.wikipedia.org</a>
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            2014-07-22<br>
-            2014-07-25<br>
-            2014-07-24<br>
-            2014-07-05<br>
-            2014-07-26<br>
-            2014-07-26<br>
-            2014-07-26
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
+          <p>
+            2015-08-27
+          </p>
         </td>
         <td style='color:black; vertical-align:top; text-align:right;'>
           <p>
-            9.2
+            10.3
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            .sqlite3
+            .xowa
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            <a href="https://archive.org/details/Xowa_ukbundle_latest" class="external text" rel="nofollow">download</a><br>
+            <a href="https://archive.org/download/Xowa_ukwiki_latest/Xowa_ukwiki_2015-08-07_text.7z" class="external text" rel="nofollow">wiki</a><br>
+             <a href="https://archive.org/download/Xowa_ukwiki_latest/Xowa_ukwiki_2015-08-07_file_core.7z" class="external text" rel="nofollow">images.core</a><br>
+             <a href="https://archive.org/download/Xowa_ukwiki_latest/Xowa_ukwiki_2015-08-07_file_ns-000_part-1.7z" class="external text" rel="nofollow">images.main</a><br>
+             <a href="https://archive.org/download/Xowa_ukwiki_latest/Xowa_ukwiki_2015-08-07_file_ns-100.7z" class="external text" rel="nofollow">images.other</a><br>
+          </p>
+        </td>
+      </tr>
+      <tr style='color:black; border-collapse:collapse;'>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            <a href="https://uk.wiktionary.org/wiki/">https://uk.wiktionary.org</a><br>
+            <a href="https://uk.wikisource.org/wiki/">https://uk.wikisource.org</a><br>
+            <a href="https://uk.wikivoyage.org/wiki/">https://uk.wikivoyage.org</a><br>
+            <a href="https://uk.wikiquote.org/wiki/">https://uk.wikiquote.org</a><br>
+            <a href="https://uk.wikibooks.org/wiki/">https://uk.wikibooks.org</a><br>
+            <a href="https://uk.wikinews.org/wiki/">https://uk.wikinews.org</a>
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07<br>
+            2015-08-07
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2015-08-27
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top; text-align:right;'>
+          <p>
+            0.3
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            .xowa
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            <a href="https://archive.org/download/Xowa_ukwiki_latest/Xowa_ukbundle_2015-08-07.7z" class="external text" rel="nofollow">wikis and images</a><br>
           </p>
         </td>
       </tr>
@@ -1839,35 +1882,38 @@
             <a href="https://fi.wikiquote.org/wiki/">https://fi.wikiquote.org</a><br>
             <a href="https://fi.wikibooks.org/wiki/">https://fi.wikibooks.org</a><br>
             <a href="https://fi.wikiversity.org/wiki/">https://fi.wikiversity.org</a><br>
-            <a href="https://fi.wikinews.org/wiki/">https://fi.wikinews.org</a><br>
+            <a href="https://fi.wikinews.org/wiki/">https://fi.wikinews.org</a>
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            2015-03-07<br>
-            2015-03-05<br>
-            2015-02-24<br>
-            2015-03-13<br>
-            2015-03-13<br>
-            2015-03-07<br>
-            2015-03-05<br>
+            2015-08-05<br>
+            2015-08-05<br>
+            2015-08-05<br>
+            2015-08-05<br>
+            2015-08-05<br>
+            2015-08-05<br>
+            2015-08-05
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
+          <p>
+            2015-08-27
+          </p>
         </td>
         <td style='color:black; vertical-align:top; text-align:right;'>
           <p>
-            6.6
+            6.9
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            .sqlite3
+            .xowa
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
           <p>
-            <a href="https://archive.org/download/Xowa_fiwiki_latest/Xowa_fibundle_2015-03-15.7z" class="external text" rel="nofollow">bundle: 2015-03-15</a>
+            <a href="https://archive.org/download/Xowa_fiwiki_latest/Xowa_fibundle_2015-08-05.7z" class="external text" rel="nofollow">bundle: 2015-08-05</a>
           </p>
         </td>
       </tr>
diff --git a/index.html b/index.html
index 60df7597b..b1760df29 100644
--- a/index.html
+++ b/index.html
@@ -93,6 +93,14 @@
 </td>
 <td width='20%' valign='top' style='padding-left:5px;'> 
   <h2><span class='mw-headline' id='Recent_News'> Recent News </span></h2>
+  <b>2015-08-31</b> Ukrainian and Finnish wikis released<br/>
+  <ul>
+    <li> <a href="https://archive.org/details/Xowa_ukwiki_latest" class="external text" rel="nofollow">Ukrainian wikis</a>
+    </li>
+    <li> <a href="https://archive.org/details/Xowa_fiwiki_latest" class="external text" rel="nofollow">Finnish wikis</a>
+    </li>
+  </ul>
+
   <b>2015-08-24</b> Persian and Bengali wikis released<br/>
   <ul>
     <li> <a href="https://archive.org/details/Xowa_fawiki_latest" class="external text" rel="nofollow">Persian wikis</a>