diff --git a/wiki/home/page/Android/Setup.html b/wiki/home/page/Android/Setup.html
index 16e8a8bc4..1076e40e3 100644
--- a/wiki/home/page/Android/Setup.html
+++ b/wiki/home/page/Android/Setup.html
@@ -17,6 +17,41 @@
     <div id="contentSub"></div>
     <div id="mw-content-text" lang="en" dir="ltr" class="mw-content-ltr">
     
+    <div id="toc" class="toc">
+      <div id="toctitle">
+        <h2>
+          Contents
+        </h2>
+      </div>
+      <ul>
+        <li class="toclevel-1 tocsection-1">
+          <a href="#Application"><span class="tocnumber">1</span> <span class="toctext">Application</span></a>
+        </li>
+        <li class="toclevel-1 tocsection-2">
+          <a href="#Wikis"><span class="tocnumber">2</span> <span class="toctext">Wikis</span></a> 
+          <ul>
+            <li class="toclevel-2 tocsection-3">
+              <a href="#Download_the_wiki"><span class="tocnumber">2.1</span> <span class="toctext">Download the wiki</span></a>
+            </li>
+            <li class="toclevel-2 tocsection-4">
+              <a href="#Unzip_the_download"><span class="tocnumber">2.2</span> <span class="toctext">Unzip the download</span></a>
+            </li>
+            <li class="toclevel-2 tocsection-5">
+              <a href="#Move_the_files_to_your_SD_card"><span class="tocnumber">2.3</span> <span class="toctext">Move the files to your SD card</span></a>
+            </li>
+            <li class="toclevel-2 tocsection-6">
+              <a href="#Import_the_wiki_in_XOWA"><span class="tocnumber">2.4</span> <span class="toctext">Import the wiki in XOWA</span></a>
+            </li>
+          </ul>
+        </li>
+        <li class="toclevel-1 tocsection-7">
+          <a href="#Open_the_wiki"><span class="tocnumber">3</span> <span class="toctext">Open the wiki</span></a>
+        </li>
+        <li class="toclevel-1 tocsection-8">
+          <a href="#Android_wikis"><span class="tocnumber">4</span> <span class="toctext">Android wikis</span></a>
+        </li>
+      </ul>
+    </div>
     <h2>
       <span class="mw-headline" id="Application">Application</span>
     </h2>
@@ -34,21 +69,179 @@
     <h2>
       <span class="mw-headline" id="Wikis">Wikis</span>
     </h2>
-    <p>
-      Wikis will be generated over the coming months. If you want a specific wiki, please make a request at <a href="https://github.com/gnosygnu/xowa/issues" rel="nofollow" class="external free">https://github.com/gnosygnu/xowa/issues</a>
-    </p>
-    <table class="wikitable">
+    <h3>
+      <span class="mw-headline" id="Download_the_wiki">Download the wiki</span>
+    </h3>
+    <ul>
+      <li>
+        Pick a wiki from the list below <sup id="cite_ref-more_wikis_0-0" class="reference"><a href="#cite_note-more_wikis-0">[1]</a></sup> 
+        <ul>
+          <li>
+            To view text only, download the <code>html</code> links
+          </li>
+          <li>
+            To view images, also download the <code>images</code> links
+          </li>
+        </ul>
+      </li>
+      <li>
+        Not all files are required for the wiki 
+        <ul>
+          <li>
+            Only the files marked <code>core</code> are required
+          </li>
+          <li>
+            Other files may be skipped, but you won't see data in those files
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <dl>
+      <dd>
+        <dl>
+          <dd>
+            For example, if you don't download <code>html.category articles</code>, you won't be able to read categories (articles in the [[Category]] namespace)
+          </dd>
+          <dd>
+            For example, if you don't download <code>images.main articles.part-02</code>, you won't have 500,000 random images.
+          </dd>
+        </dl>
+      </dd>
+    </dl>
+    <h3>
+      <span class="mw-headline" id="Unzip_the_download">Unzip the download</span>
+    </h3>
+    <ul>
+      <li>
+        Use <a href="http://www.7-zip.org/" rel="nofollow" class="external text">7-zip</a> to unzip the downloads
+      </li>
+    </ul>
+    <h3>
+      <span class="mw-headline" id="Move_the_files_to_your_SD_card">Move the files to your SD card</span>
+    </h3>
+    <ul>
+      <li>
+        The unzip will create a folder like <code>C:\xowa\wiki\en.wikipedia.org</code>
+      </li>
+      <li>
+        Move this folder to your SD card.
+      </li>
+    </ul>
+    <dl>
+      <dd>
+        For example, if your SD card is on the X drive, you will be moving them to <code>X:\xowa\wiki\en.wikipedia.org</code>
+      </dd>
+      <dd>
+        When done, you will have a file like <code>X:\xowa\wiki\en.wikipedia.org\en.wikipedia.org-core.xowa</code> as well as many others
+      </dd>
+    </dl>
+    <h3>
+      <span class="mw-headline" id="Import_the_wiki_in_XOWA">Import the wiki in XOWA</span>
+    </h3>
+    <ul>
+      <li>
+        Press <code>the menu button</code> in the top left-hand corner
+      </li>
+      <li>
+        Press the <code>XOWA</code> item
+      </li>
+      <li>
+        Press the <code>blue plus</code> image in the top right-hand corner of the grid
+      </li>
+    </ul>
+    <dl>
+      <dd>
+        If you're on Marshmallow, you will get a prompt to allow XOWA to read your SD card. Please allow it. For more information on XOWA's privacy policy, see <a href="http://xowa.org/wiki/home/page/Help/Privacy/Android.html" id="xolnki_2" title="Help/Privacy/Android" class="xowa-visited">Help/Privacy/Android</a>
+      </dd>
+    </dl>
+    <ul>
+      <li>
+        Go to the wiki folder on your SD card
+      </li>
+    </ul>
+    <dl>
+      <dd>
+        For example, on an LG G4 device, you would navigate to <code>storage</code> -&gt; <code>CARD-CODE</code> -&gt; <code>xowa</code> -&gt; <code>wiki</code> -&gt; <code>en.wikipedia.org</code>
+      </dd>
+    </dl>
+    <ul>
+      <li>
+        Press the file with the XOWA icon. In this case it would be <code>en.wikipedia.org-core.xowa</code>
+      </li>
+    </ul>
+    <h2>
+      <span class="mw-headline" id="Open_the_wiki">Open the wiki</span>
+    </h2>
+    <ul>
+      <li>
+        Press the link for the wiki on the <code>XOWA</code> page
+      </li>
+      <li>
+        You will be navigated to the Main Page. Enjoy!
+      </li>
+    </ul>
+    <h2>
+      <span class="mw-headline" id="Android_wikis">Android wikis</span>
+    </h2>
+    <table class='wikitable sortable'>
       <tr>
-        <td>
-          Simple Wikipedia
+        <th>
+          wiki
+        </th>
+        <th>
+          wiki date
+        </th>
+        <th>
+          posted date
+        </th>
+        <th>
+          size<br>
+          (GB)
+        </th>
+        <th>
+          type
+        </th>
+        <th>
+          download
+        </th>
+      </tr>
+      <tr style='color:black; border-collapse:collapse;'>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            <a href="https://simple.wikipedia.org" rel="nofollow" class="external free">https://simple.wikipedia.org</a><br>
+          </p>
         </td>
-        <td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2016-03-05<br>
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2016-03-28
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top; text-align:right;'>
+          <p>
+            1.9
+          </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_simplewiki_latest/Xowa_simplewiki_2016-03-05.7z" rel="nofollow" class="external text">html</a><br>
+            <a href="https://archive.org/download/Xowa_simplewiki_latest/Xowa_simplebundle_2015-04-17.7z" rel="nofollow" class="external text">file</a>
+          </p>
         </td>
       </tr>
       <tr style='color:black; border-collapse:collapse;'>
         <td style='color:black; vertical-align:top;'>
           <p>
-            <a href="https://en.wikipedia.org" rel="nofollow" class="external free">https://en.wikipedia.org</a> (Android)
+            <a href="https://en.wikipedia.org" rel="nofollow" class="external free">https://en.wikipedia.org</a>
           </p>
         </td>
         <td style='color:black; vertical-align:top;'>
@@ -81,12 +274,57 @@
              <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_html_ns-014.7z" rel="nofollow" class="external text">html.category articles</a><br>
              <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_html_ns-100.7z" rel="nofollow" class="external text">html.portal articles</a><br>
           </p>
+        </td>
+      </tr>
+      <tr style='color:black; border-collapse:collapse;'>
+        <td style='color:black; vertical-align:top;'>
           <p>
-            <br>
+            <a href="https://en.wikipedia.org" rel="nofollow" class="external free">https://en.wikipedia.org</a>
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2016-03-05
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top;'>
+          <p>
+            2016-04-09
+          </p>
+        </td>
+        <td style='color:black; vertical-align:top; text-align:right;'>
+          <p>
+            80
+          </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_enwiki_latest/Xowa_enwiki_2016-03-05_file_core.7z" rel="nofollow" class="external text">images.core</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-01.7z" rel="nofollow" class="external text">images.main articles.part-01</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-02.7z" rel="nofollow" class="external text">images.main articles.part-02</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-03.7z" rel="nofollow" class="external text">images.main articles.part-03</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-04.7z" rel="nofollow" class="external text">images.main articles.part-04</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-05.7z" rel="nofollow" class="external text">images.main articles.part-05</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-06.7z" rel="nofollow" class="external text">images.main articles.part-06</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-07.7z" rel="nofollow" class="external text">images.main articles.part-07</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-08.7z" rel="nofollow" class="external text">images.main articles.part-08</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-09.7z" rel="nofollow" class="external text">images.main articles.part-09</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_ns-000_part-10.7z" rel="nofollow" class="external text">images.main articles.part-10</a><br>
+             <a href="https://archive.org/download/Xowa_enwiki_latest/Xowa_enwiki_2016-03-05_file_wiki_file_ns-100.7z" rel="nofollow" class="external text">images.other articles</a><br>
           </p>
         </td>
       </tr>
     </table>
+    <ol class="references">
+      <li id="cite_note-more_wikis-0">
+        <span class="mw-cite-backlink"><a href="#cite_ref-more_wikis_0-0">^</a></span> <span class="reference-text">More wikis will be generated over the coming months. If you want a specific wiki, please make a request at <a href="https://github.com/gnosygnu/xowa/issues" rel="nofollow" class="external free">https://github.com/gnosygnu/xowa/issues</a></span>
+      </li>
+    </ol>
   
     </div>
   </div>