diff --git a/docs/dev/LOOT Metadata Syntax.html b/docs/dev/LOOT Metadata Syntax.html
index 678a048..44b9aa9 100644
--- a/docs/dev/LOOT Metadata Syntax.html	
+++ b/docs/dev/LOOT Metadata Syntax.html	
@@ -2,54 +2,177 @@
 <meta charset="utf-8">
 <title>LOOT Metadata Syntax</title>
 <style>
-    body {
-        font:10pt/1.5 Helvetica,sans-serif;
-        text-rendering:optimizeLegibility;}
-    p, ul, li {margin:1.5em 0;}
-    h1,h3,h2 {font-weight:normal;}
-h1{
-    font-size:36pt;
-    line-height:0.5;
-    margin-top:1.125em;
-    margin-bottom:0.375em;}
-h2{
-    font-size:24pt;
-    line-height:0.75;
-    margin-top:3em;
-    margin-bottom:1.5em;}
-h3{
-    font-size:18pt;
-    line-height:1;
-    margin-top:3.5em;
-    margin-bottom:1em;}
-    ul, ol {margin-top:0.5em; margin-bottom:1em;}
-    li {margin:0.75em 0;}
-    a:link {text-decoration:none;}
-    a:hover {text-decoration:underline;}
-    ol ol {list-style:lower-alpha;}
+/* This styling is from the report's typography.css file. The font paths
+   have been edited. */
+/* Font definitions */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 300;
+    src: url('../resources/report/fonts/Roboto-Light.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 300;
+    src: url('../resources/report/fonts/Roboto-LightItalic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../resources/report/fonts/Roboto-Regular.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../resources/report/fonts/Roboto-Italic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 500;
+    src: url('../resources/report/fonts/Roboto-Medium.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 500;
+    src: url('../resources/report/fonts/Roboto-MediumItalic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../resources/report/fonts/Roboto-Bold.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 700;
+    src: url('../resources/report/fonts/Roboto-BoldItalic.ttf');
+}
 
-    code {display:inline-block; padding:0 3px; background:#eee;}
-    td, th {border:1px solid #ddd; padding: 5px; vertical-align:top;}
-    table {border-collapse:collapse; margin:1.5em; margin-bottom: 3em; background:#fafafa;}
-    thead {background:#99CCFF;}
-    code.box {border-radius:5px; border:1px solid #ccc; padding:0.75em; white-space:pre; overflow-x:auto; display:table; margin:1.5em;}
+/* Typography */
+html {
+    font:11pt/1.429 Roboto, sans-serif;
+    color: rgba(0, 0, 0, 0.87);
+    font-weight: 400;
+    text-rendering: optimizeLegibility;
+}
+.display2, h1 {
+    font-weight: 400;
+    font-size: 3.214rem;
+    color: rgba(0, 0, 0, 0.54);
+    line-height: 1.067;
+}
+.headline, h2 {
+    font-weight: 400;
+    font-size: 1.714rem;
+    line-height: 1.333;
+}
+.title, h3 {
+    font-weight: 500;
+    font-size: 1.429rem;
+    /*letter-spacing: 0.005em;*/
+}
+.subhead, h4,
+#summary > h1,
+html /deep/ paper-item {
+    font-weight: 400;
+    font-size: 1.143rem;
+    line-height: 1.75;
+    /* Alternate line height: */
+    /* line-height: 1.5; */
+    /*letter-spacing: 0.01em;*/
+}
+.button,
+html /deep/ paper-tab,
+html /deep/ paper-button {
+    font-weight: 500;
+    font-size: 1rem;
+    text-transform: uppercase;
+    /*letter-spacing: 0.01em;*/
+}
 
-    blockquote {border-radius:3px; border:1px solid #0c0; padding:5px; background:#7e7; display:table;margin:1.5em;}
+/* This styling is from the report's style.css file. */
+a {
+    color: #2196F3;
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+/* Tables */
+html /deep/ table {
+    border-collapse: collapse;
+    width: 100%;
+    background-color: #E8EAF6;
+}
+html /deep/ table td, table th {
+    vertical-align: top;
+    text-align: left;
+    padding: 8px 16px;
+}
+html /deep/ table th {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+}
 
-    a[href^="http"]:after {padding-left:2px; content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=);}
 
-    span[title] {border-bottom: 1px dotted; font-family: sans-serif; cursor:help;}
-    abbr {cursor:help; border-bottom: 1px dotted black;}
+/* The styling below is specific to the readmes. */
+h1, ol ol, ul ul, table {
+    margin: 0.5em 0;
+}
+h2, h3 {
+    margin-top: 2em;
+    margin-bottom: 0;
+}
+h4, ol, ul, p {
+    margin-top: 1em;
+    margin-bottom: 0;
+}
+ol ol {
+    list-style:lower-alpha;
+}
+pre > code, blockquote {
+    border: 1px solid rgba(0, 0, 0, 0.12);
+    border-radius: 2px;
+    padding: 16px;
+    margin: 16px;
+    display: table;
+}
+pre > code {
+    overflow-x: auto;
+}
+blockquote {
+    background: #eee;
+}
+code {
+    display: inline-block;
+    padding: 0 4px;
+    background: #eee;
+}
+a[href^=http]::after {
+    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" height="10px" width="10px" preserveAspectRatio="xMidYMid meet" fit="" style="pointer-events: none; display: block; color: #2196F3; fill: currentcolor; position: relative; top: -2px;"><g><path d="M9 5v2h6.59l-11.59 11.59 1.41 1.41 11.59-11.59v6.59h2v-10z"></path></g></svg>');
+}
+abbr {
+    cursor: help;
+    border-bottom: 1px dotted rgba(0, 0, 0, 0.12);
+}
+var {
+    color: #303F9F;
+}
 
-    #warning {background:#fbb; padding:10px 5px;margin:-8px;}
-    .warning {background:#fbb; border-color:#d00;}
-    var {color:#8B4513;}
+.clipper {
+    overflow: hidden;
+}
 </style>
 <!--  LOOT
 
     A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and Fallout: New Vegas.
 
-    Copyright (C) 2012–2014    WrinklyNinja
+    Copyright (C) 2012–2015    WrinklyNinja
 
     This file is part of LOOT.
 
@@ -83,7 +206,6 @@ h3{
         <li><a href="#structs-dirty">Dirty Info Data Structure</a>
         <li><a href="#structs-plugin">Plugin Data Structure</a>
     </ol>
-    <li><a href="#links">URL Hyperlinking</a>
     <li><a href="#cond">Condition Strings</a>
     <ol>
         <li><a href="#cond-function">Functions</a>
@@ -92,6 +214,7 @@ h3{
     </ol>
     <li><a href="#lang">Language Codes</a>
     <li><a href="#license">License</a>
+    <li><a href="#support">Feature Support</a>
 </ol>
 
 <h2 id="intro">Introduction</h2>
@@ -105,7 +228,7 @@ h3{
 </ul>
 <p>Some important points that are more specific to how LOOT uses YAML:
 <ul>
-    <li>LOOT's support for YAML syntax is incomplete. A list of known limitations can be found <a href="https://github.com/WrinklyNinja/yaml-cpp/issues?labels=bug&amp;state=open">here</a>. The only major missing piece is support for merge keys (<code>&lt;&lt;:</code>).
+    <li>LOOT's support for YAML syntax is incomplete. A list of known limitations can be found <a href="https://github.com/WrinklyNinja/yaml-cpp/issues?labels=bug&amp;state=open">here</a>.
     <li>Strings are case-sensitive, apart from file paths, regular expressions and checksums.
 </ul>
 <p>Some properties of file paths as used by LOOT:
@@ -127,7 +250,7 @@ h3{
 </table>
 <p>Other keys may also be present, but are not processed by LOOT. The message and plugin data structures are detailed in the next section.
 <p>An example metadata file:
-<code class="box">globals:
+<pre><code>globals:
   - type: say
     content: 'You are using the latest version of LOOT.'
     condition: 'version("LOOT", "0.5.0.0", ==)'
@@ -144,7 +267,7 @@ plugins:
       - Graphics
       - Hair
       - R.Relations
-</code>
+</code></pre>
 
 
 <h2 id="structs">Data Structures</h2>
@@ -153,7 +276,7 @@ plugins:
 <h3 id="structs-tag">Tag Data Structure</h3>
 <p>LOOT metadata files can contain suggestions for the addition or removal of Bash Tags, and this is the structure used for them. It has two forms: the first is a simple string, and the second is a key-value map. All values in the map are strings.
 <p>The simple form:
-<code class="box"><var>tag</var></code>
+<pre><code><var>tag</var></code></pre>
 <p>where <code><var>tag</var></code> is the Bash Tag, preceded by a minus sign if it is suggested for removal.
 <p>The map form:
 <table>
@@ -163,33 +286,33 @@ plugins:
         <tr><td><code>condition</code><td>&#x2717;<td>A condition string that is evaluated to determine whether this Bash Tag should be suggested: if it evaluates to true, the Tag is suggested, otherwise it is ignored. See <a href="#cond">Condition Strings</a> for details.
 </table>
 <p>Examples:
-<code class="box">Relations</code>
+<pre><code>Relations</code></pre>
 or
-<code class="box">name: -Relations
+<pre><code>name: -Relations
 condition: 'file("Mart''s Monster Mod for OOO.esm") or file("FCOM_Convergence.esm")'
-</code>
+</code></pre>
 
 <h3 id="structs-file">File Data Structure</h3>
 <p>Not to be confused with the structure of the metadata file itself, this structure can be used to hold file paths. It has two forms: the first is a simple string, and the second is a key-value map. All values in the map are strings.
 <p>The simple form:
-<code class="box"><var>filepath</var></code>
+<pre><code><var>filepath</var></code></pre>
 <p>where <code><var>filepath</var></code> is an exact (ie. not regex) file path relative to the game's Data folder.
 <p>The map form:
 <table>
     <thead><tr><th>Key Name<th>Required<th>Notes
     <tbody>
         <tr><td><code>name</code><td>&#x2713;<td>An exact (ie. not regex) file path or name.
-        <tr><td><code>display</code><td>&#x2717;<td>A substitute string to be displayed instead of the file path in any generated messages, eg. the name of the mod the file belongs to. Double-quoted URLs will be hyperlinked in the LOOT report. See <a href="#links">URL Hyperlinking</a> for details.
+        <tr><td><code>display</code><td>&#x2717;<td>A substitute string to be displayed instead of the file path in any generated messages, eg. the name of the mod the file belongs to.
         <tr><td><code>condition</code><td>&#x2717;<td>A condition string that is evaluated to determine whether this file data should be used: if it evaluates to true, the data is used, otherwise it is ignored. See <a href="#cond">Condition Strings</a> for details.
 </table>
 
 <p>Examples:
-<code class="box">'../obse_loader.exe'</code>
+<pre><code>'../obse_loader.exe'</code></pre>
 or
-<code class="box">name: '../obse_loader.exe'
+<pre><code>name: '../obse_loader.exe'
 condition: 'version("../obse_loader.exe", "0.0.18.0", &gt;=)'
 display: 'OBSE v18+'
-</code>
+</code></pre>
 
 <h3 id="structs-message">Message Data Structure</h3>
 <p>Messages are given as key-value maps.
@@ -199,6 +322,7 @@ display: 'OBSE v18+'
         <tr><td><code>type</code><td>string<td>&#x2713;<td>The type string can be one of three keywords, see the table below for their semantics.
         <tr><td><code>content</code><td>string <i>or</i> localised content list<td>&#x2713;<td>Either simply a string, or a list of localised content data structures. If the latter, one of the structures must be for English.
         <tr><td><code>condition</code><td>string<td>&#x2717;<td>A condition string that is evaluated to determine whether the message should be displayed: if it evaluates to true, the message is displayed, otherwise it is not. See <a href="#cond">Condition Strings</a> for details.
+        <tr><td><code>subs</code><td>list of strings<td>&#x2717;<td>A list of strings to be substituted into the message content string. The content string must use numbered specifiers (<code>%1%</code>, <code>%2%</code>, etc.), where the numbers correspond to the position of the substitution string in this list to use, to denote where these strings are to be substituted.
 </table>
 
 <p>There are three message types:
@@ -213,9 +337,10 @@ display: 'OBSE v18+'
 <table>
     <thead><tr><th>Key Name<th>Required<th>Notes
     <tbody>
-        <tr><td><code>str</code><td>&#x2713;<td>The actual message content string. Double-quoted URLs will be hyperlinked in the LOOT report. See <a href="#links">URL Hyperlinking</a> for details.
+        <tr><td><code>str</code><td>&#x2713;<td>The actual message content string.
         <tr><td><code>lang</code><td>&#x2713;<td>The language that <code>str</code> is written in, given as a POSIX language code. The languages LOOT supports are given in <a href="#lang">Language Codes</a>.
 </table>
+<p>LOOT supports formatting of messages using <a href="https://help.github.com/articles/github-flavored-markdown">GitHub Flavored Markdown</a>. Support is provided by the <a href="https://github.com/chjj/marked">Marked</a> library (v0.3.2). Strings that get substituted into messages, such as file display names and dirty info utility strings, also support the same formatting options.
 
 <p>LOOT handles messages and languages as follows:
 <ol>
@@ -223,35 +348,45 @@ display: 'OBSE v18+'
     <li>If a message's <code>content</code> value is a list of localised content structures, then the first structure with a language that matches LOOT's current language will be used as the message's content if displayed. If there are no matches, then the first structure in English will be used.
 </ol>
 
-
 <p>Examples (translations by Google):
-<code class="box">type: say
+<pre><code>type: say
 condition: 'file("foo.esp")'
 content:
   - lang: en
     str: 'An example link: &lt;http://www.example.com&gt;'
   - lang: ru
     str: 'Это пример ссылки: &lt;http://www.example.com&gt;'
-</code>
+</code></pre>
 would be displayed as
 <blockquote>
 отмечать: Это пример ссылки: <a href="http://www.example.com">http://www.example.com</a>
 </blockquote>
 if the current language was Russian and <code>foo.esp</code> was installed, while
-<code class="box">type: say
+<pre><code>type: say
 content: 'An alternative [example link](http://www.example.com), with no translations.'
-</code>
+</code></pre>
 would be displayed as
 <blockquote>
 отмечать: An alternative <a href="http://www.example.com">example link</a>, with no translations.
 </blockquote>
+In English,
+<pre><code>type: say
+content: 'A newer version of %1% [is available](%2%).
+subs:
+  - 'this plugin'
+  - 'http://www.example.com'
+</code></pre>
+would be displayed as
+<blockquote>
+Note: A newer version of this plugin <a href="http://www.example.com">is available</a>.
+</blockquote>
 
 
 <h3 id="structs-location">Location Data Structure</h3>
 <p>This data structure is used to hold information on where a plugin is hosted online. It is not currently used by LOOT, but it was suggested that since the LOOT team receives a considerable number of plugin URLs, they should be recorded in a standard format, as there is no existing store of such information and it could prove useful in the future.
 <p>The data structure has two forms: the first is a simple string, and the second is a key-value map. The first form should be used for a URL without any associated version data, such as when it is not clear which version is found there, or when it is the only known hosting location for the plugin and as such hosts all available versions. The second form should be used when version data can be associated with the URL, such as when the URL only hosts a subset of the available versions of the plugin.
 <p>The simple form:
-<code class="box"><var>URL</var></code>
+<pre><code><var>URL</var></code></pre>
 <p>where <code><var>URL</var></code> is a URL at which the plugin may be found.
 <p>The map form:
 <table>
@@ -261,12 +396,12 @@ would be displayed as
         <tr><td><code>ver</code><td>string list<td>&#x2713;<td>A list of versions that can be found at the URL.
 </table>
 <p>Examples:
-<code class="box">'http://skyrim.nexusmods.com/mods/19/'</code>
+<pre><code>'http://skyrim.nexusmods.com/mods/19/'</code></pre>
 or
-<code class="box">link: 'http://steamcommunity.com/sharedfiles/filedetails/?id=87144366'
+<pre><code>link: 'http://steamcommunity.com/sharedfiles/filedetails/?id=87144366'
 ver:
   - '1.3.2c'
-</code>
+</code></pre>
 
 <h3 id="structs-dirty">Dirty Info Data Structure</h3>
 <p>This structure holds information on which versions of a plugin are dirty, and how many identical-to-master records, deleted records and deleted navmeshes (if applicable) it contains. Dirty info is given as a key-value map.
@@ -274,18 +409,18 @@ ver:
     <thead><tr><th>Key Name<th>Data Type<th>Required<th>Notes
     <tbody>
         <tr><td><code>crc</code><td>hexadecimal integer<td>&#x2713;<td>The CRC checksum of the dirty plugin, before cleaning. LOOT displays the CRCs of installed plugins in its report. The 8-character CRC should be preceded by <code>0x</code> so that it is correctly interpreted.
-        <tr><td><code>util</code><td>string<td>&#x2713;<td>The utility that should be used to clean the plugin. This field supports <a href="#links">URL Hyperlinking</a>, and it is recommended that a URL to the game's cleaning guide is supplied.
+        <tr><td><code>util</code><td>string<td>&#x2713;<td>The utility that should be used to clean the plugin.
         <tr><td><code>itm</code><td>integer<td>&#x2717;<td>The number of identical-to-master records reported for the dirty plugin. If the number is unknown, this field should not be supplied. If the number is known and zero, this field should be supplied.
         <tr><td><code>udr</code><td>integer<td>&#x2717;<td>The number of undeleted records reported for the dirty plugin. If the number is unknown, this field should not be supplied. If the number is known and zero, this field should be supplied.
         <tr><td><code>nav</code><td>integer<td>&#x2717;<td>The number of deleted navmeshes reported for the dirty plugin. If the number is unknown, this field should not be supplied. If the number is known and zero, this field should be supplied.
 </table>
 <p>Examples:
-<code class="box">crc: 0x3DF62ABC
+<pre><code>crc: 0x3DF62ABC
 util: '[TES5Edit](http://www.creationkit.com/TES5Edit_Cleaning_Guide_-_TES5Edit)'
 itm: 4
 udr: 160
 nav: 0
-</code>
+</code></pre>
 
 
 <h3 id="structs-plugin">Plugin Data Structure</h3>
@@ -297,10 +432,10 @@ nav: 0
         <tr><td><code>enabled</code><td>boolean<td>&#x2717;<td>Enables or disables use of the plugin object. Used for user rules, but no reason to use it in the masterlist. If unspecified, defaults to <code>true</code>.
         <tr><td><code>priority</code><td>integer<td>&#x2717;<td>Modifies plugin position relative to others that change one or more of the same records, but which are otherwise unrelated (ie. neither plugin lists the other as a master, requirement, or in its <code>after</code> list). Plugins that don't change any of the same records are not compared, unless:
             <ul>
-                <li>One of the plugins is a "dummy" plugin, containing only a header record.
+                <li>One of the plugins is an empty plugin, containing only a header record.
                 <li>One of the plugins has a priority greater than or equal to 1,000,000. In this case, only the modulo (ie. remainder when divided) with 1,000,000 is used when comparing plugin priority values &ndash; the rest is only used to signify that the plugin should be compared against all others.
             </ul>
-            <p>For example, <code>priority: 153000352</code> and <code>priority: 352</code> have equal values when compared, but a plugin with the first priority will be compared against all others, while a (non-dummy) plugin with the second priority will be compared against only those it conflicts with.
+            <p>For example, <code>priority: 153000352</code> and <code>priority: 352</code> have equal values when compared, but a plugin with the first priority will be compared against all others, while a (non-empty) plugin with the second priority will be compared against only those it conflicts with.
             <p>A plugin with a higher priority value will load after a plugin with a lower priority value. Value can be anything in the range <code>-2000000000</code> to <code>2000000000</code>, and if unspecified defaults to <code>0</code>.
         <tr><td><code>after</code><td>file list<td>&#x2717;<td>An unordered list of plugins that this plugin must load after, but which are not dependencies. Used for resolving specific compatibility issues and by user rules for specifying custom plugin positions.
         <tr><td><code>req</code><td>file list<td>&#x2717;<td>An unordered list of files that this plugin requires to be present. This plugin will load after any plugins listed. If any of these files are missing, an error message will be displayed. Intended for use specifying implicit dependencies, as LOOT will detect a plugin's explicit masters itself.
@@ -310,8 +445,26 @@ nav: 0
         <tr><td><code>url</code><td>location list<td>&#x2717;<td>An unordered list of locations for this plugin. If the same version can be found at multiple locations, only one location should be recorded. This metadata is not currently used by LOOT.
         <tr><td><code>dirty</code><td>dirty info list<td>&#x2717;<td>An unordered list of dirty info structures for this plugin.
 </table>
+<p><strong>Each plugin must have only one matching non-regex entry.</strong> If multiple non-regex entries exist with the same <code>name</code> value, all but the first will be ignored. A plugin may match any number of regex entries though, and their metadata will be merged, with later entries being merged into earlier entries as detailed in the table below. Merging only takes place if both entries have their <code>enabled</code> value set to <code>true</code> (which is the default if unspecified).
+
+<table>
+    <thead>
+        <tr><th>Key Name<th>Merge Behaviour (merging B into A)
+    <tbody>
+        <tr><td><code>name</code><td>Not merged.
+        <tr><td><code>enabled</code><td>Replaced but must be `true` anyway.
+        <tr><td><code>priority</code><td>Replaced by B's value.
+        <tr><td><code>after</code><td>Merged. If A and B both contain an entry with the same <code>name</code> value, B's copy is skipped.
+        <tr><td><code>req</code><td>Merged. If A and B both contain an entry with the same <code>name</code> value, B's copy is skipped.
+        <tr><td><code>inc</code><td>Merged. If A and B both contain an entry with the same <code>name</code> value, B's copy is skipped.
+        <tr><td><code>msg</code><td>Merged. If A and B both contain an entry with the same content string (if there are multiple content strings, the first is checked), then B's copy is skipped.
+        <tr><td><code>tag</code><td>Merged. If A and B both contain an entry with the same <code>name</code> value, B's copy is skipped, unless one is suggesting the tag for addition and the other is suggesting it for removal, in which case both entries are kept.
+        <tr><td><code>url</code><td>Currently skipped by the parser, so neither A nor B will contain any entries anyway.
+        <tr><td><code>dirty</code><td>Merged. If A and B both contain an entry with the same <code>crc</code> value, B's copy is skipped.
+</table>
+
 <p>Example:
-<code class="box">name: 'Oscuro''s_Oblivion_Overhaul.esm'
+<pre><code>name: 'Oscuro''s_Oblivion_Overhaul.esm'
 req:
   - 'Oblivion.esm'  # Don't do this, Oblivion.esm is a master of Oscuro's_Oblivion_Overhaul.esm, so LOOT already knows it's required.
   - name: 'example.esp'
@@ -329,27 +482,11 @@ tag:
 msg:
   - type: say
     content: 'Do not clean. "Dirty" edits are intentional and required for the mod to function.'
-</code>
-
-
-<h2 id="links">URL Hyperlinking</h2>
-<p>File <code>display</code> strings and message <code>content</code> strings (including the strings in localised content structures) that contain recognised URLs have them displayed as hyperlinks in the LOOT report.
-<p>URLs must begin with <code>file:</code>, <code>http:</code> or <code>https:</code>, and be written according to the following subset of <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a> syntax. Note that LOOT does not recognise additional Markdown syntaxes to those given below.
-<p>For labelled URLs, the syntax is <code>[<var>label</var>](<var>url</var>)</code>. A single optional space may be included between the closing square bracket and the opening parenthesis, ie. <code>[<var>label</var>] (<var>url</var>)</code>.
-<p>For unlabelled URLs, the syntax is <code>&lt;<var>url</var>&gt;</code>. The URL shall be used as its own label.
-<p>Note that the URLs given as part of a location data structure should not be labelled or enclosed in less-than or greater-than signs, as they consist of raw URL data, rather than text to be displayed in a message.
-<p>Examples:
-<code class="box">'This [string](https://en.wikipedia.org/wiki/String_(computer_science)) contains a labelled hyperlink.'</code>
-would be displayed as
-<blockquote>This <a href="https://en.wikipedia.org/wiki/String_(computer_science)">string</a> contains a labelled hyperlink.</blockquote>
-<p>While
-<code class="box">'This string (see: &lt;https://en.wikipedia.org/wiki/String_(computer_science)&gt;) contains an unlabelled hyperlink.'</code>
-both get displayed as
-<blockquote>This string (see: <a href="https://en.wikipedia.org/wiki/String_(computer_science)">https://en.wikipedia.org/wiki/String_(computer_science)</a>) contains an unlabelled hyperlink.</blockquote>
+</code></pre>
 
 <h2 id="cond">Condition Strings</h2>
 <p>Condition strings can be used to ensure that data is only acted on by LOOT under certain circumstances. They are very similar to boolean conditional expressions in programming languages such as Python, though more limited. Their <a href="https://en.wikipedia.org/wiki/Extended_Backus%E2%80%93Naur_Form">EBNF</a> grammar is:
-<code class="box">[ negator ], function, { junctor, [ negator ], function } ;</code>
+<pre><code>[ negator ], function, { junctor, [ negator ], function } ;</code></pre>
 <p>The <code>[ negator ], function</code> grammar is referred to as a condition, and two conditions joined by an operator, ie. <code>condition, operator, condition</code> is referred to as a compound condition.
 <p>LOOT caches the results of condition evaluations, so performance is not really an issue. A regular expression check will still take longer than a file check though, so use the former only when appropriate to do so.
 
@@ -378,7 +515,7 @@ both get displayed as
 
 <h3 id="cond-operator">The Negator &amp; Junctors</h3>
 <p>The negator, or logical negation operator, inverts the value of the function that follows it. Its inclusion is optional, and its syntax is simply:
-<code class="box">not</code>
+<pre><code>not</code></pre>
 <p>Below is a truth table for the negator.
 <table>
     <thead><tr><th>Value of <code><var>function</var></code><th>Value of <code>not <var>function</var></code>
@@ -447,9 +584,23 @@ both get displayed as
         <tr><td>Brazilian Portuguese<td>pt_BR
         <tr><td>Russian<td>ru
         <tr><td>Spanish<td>es
+        <tr><td>German<td>de
+        <tr><td>Danish<td>da
 </table>
 
 <h2 id="license">License</h2>
 <p>This document is part of the LOOT documentation.<br>
-Copyright (C) 2012&mdash;2014 WrinklyNinja<br>
+Copyright (C) 2012&mdash;2015 WrinklyNinja<br>
 See the file <q>LOOT ReadMe.html</q> for copying conditions.
+
+<h2 id="support">Feature Support</h2>
+<p>Different versions of LOOT may have varying levels of support for the syntax detailed in this document. Such variation in support is detailed in the table below. Unless otherwise noted, all syntax changes are backwards-compatible (ie. you can use the features without breaking the masterlist for users on older versions).
+
+<table>
+    <thead>
+        <tr><th>Feature<th> LOOT v0.6 and earlier<th>LOOT v0.7
+    <tbody>
+        <tr><td>GitHub Flavored Markdown message formatting<td>Only URL hyperlinking is supported, for <code>file:</code>, <code>http:</code> and <code>https:</code> URLs, using the <code>[label](url)</code> and <code>&lt;url&gt;</code> syntaxes.<td>LOOT uses the <a href="https://github.com/chjj/marked">Marked</a> library (v0.3.2) to provide support for most of GitHub Flavored Markdown, minus the GitHub-specific features (like @mentions, issue/repo linking and emoji).
+        <tr><td>Message string substitution (ie. <code>sub:</code>)<td>Not supported.<td>Supported.
+        <tr><td>YAML merge keys (ie. <code>&lt;&lt;:</code>)<td>Not supported.<td>Supported.
+</table>
diff --git a/docs/dev/LOOT Readme.html b/docs/dev/LOOT Readme.html
index 67c1d97..0523b72 100644
--- a/docs/dev/LOOT Readme.html	
+++ b/docs/dev/LOOT Readme.html	
@@ -2,67 +2,177 @@
 <meta charset="utf-8">
 <title>LOOT Readme</title>
 <style>
-    body {
-        font:10pt/1.5 Helvetica,sans-serif;
-        text-rendering:optimizeLegibility;}
-    p, ul, li {margin:1.5em 0;}
-    h1,h3,h2 {font-weight:normal;}
-h1{
-    font-size:36pt;
-    line-height:0.5;
-    margin-top:1.125em;
-    margin-bottom:0.375em;}
-h2{
-    font-size:24pt;
-    line-height:0.75;
-    margin-top:3em;
-    margin-bottom:1.5em;}
-h3{
-    font-size:18pt;
-    line-height:1;
-    margin-top:3.5em;
-    margin-bottom:1em;}
-    ul, ol {margin-top:0.5em; margin-bottom:1em;}
-    li {margin:0.75em 0;}
-    a:link {text-decoration:none;}
-    a:hover {text-decoration:underline;}
-    ol ol {list-style:lower-alpha;}
+/* This styling is from the report's typography.css file. The font paths
+   have been edited. */
+/* Font definitions */
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 300;
+    src: url('../resources/report/fonts/Roboto-Light.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 300;
+    src: url('../resources/report/fonts/Roboto-LightItalic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../resources/report/fonts/Roboto-Regular.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../resources/report/fonts/Roboto-Italic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 500;
+    src: url('../resources/report/fonts/Roboto-Medium.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 500;
+    src: url('../resources/report/fonts/Roboto-MediumItalic.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../resources/report/fonts/Roboto-Bold.ttf');
+}
+@font-face {
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 700;
+    src: url('../resources/report/fonts/Roboto-BoldItalic.ttf');
+}
 
-    code {display:inline-block; padding:0 3px; background:#eee;}
-    td, th {border:1px solid #ddd; padding: 5px 10px; vertical-align:top;}
-    table {border-collapse:collapse; margin:1.5em; margin-bottom: 3em; background:#fafafa;}
-    thead {background:#6badf6;}
-    th {font-weight:normal;}
-    code.box {border-radius:5px; border:1px solid #ccc; padding:0.75em; white-space:pre; overflow-x:auto; display:table; margin:1.5em;}
+/* Typography */
+html {
+    font:11pt/1.429 Roboto, sans-serif;
+    color: rgba(0, 0, 0, 0.87);
+    font-weight: 400;
+    text-rendering: optimizeLegibility;
+}
+.display2, h1 {
+    font-weight: 400;
+    font-size: 3.214rem;
+    color: rgba(0, 0, 0, 0.54);
+    line-height: 1.067;
+}
+.headline, h2 {
+    font-weight: 400;
+    font-size: 1.714rem;
+    line-height: 1.333;
+}
+.title, h3 {
+    font-weight: 500;
+    font-size: 1.429rem;
+    /*letter-spacing: 0.005em;*/
+}
+.subhead, h4,
+#summary > h1,
+html /deep/ paper-item {
+    font-weight: 400;
+    font-size: 1.143rem;
+    line-height: 1.75;
+    /* Alternate line height: */
+    /* line-height: 1.5; */
+    /*letter-spacing: 0.01em;*/
+}
+.button,
+html /deep/ paper-tab,
+html /deep/ paper-button {
+    font-weight: 500;
+    font-size: 1rem;
+    text-transform: uppercase;
+    /*letter-spacing: 0.01em;*/
+}
 
-    blockquote {border:1px solid #ccc; border-radius:3px; padding:10px; background:#eee; display:table;margin:1.5em;}
+/* This styling is from the report's style.css file. */
+a {
+    color: #2196F3;
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+/* Tables */
+html /deep/ table {
+    border-collapse: collapse;
+    width: 100%;
+    background-color: #E8EAF6;
+}
+html /deep/ table td, table th {
+    vertical-align: top;
+    text-align: left;
+    padding: 8px 16px;
+}
+html /deep/ table th {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+}
 
-    a[href^="http"]:after {padding-left:2px; content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=);}
 
-    .slideshow img {opacity:0;
-        position:absolute;
-        transition: opacity 1.5s;
-        -moz-transition: opacity 1.5s;
-        -webkit-transition: opacity 1.5s;
-        -o-transition: opacity 1.5s;}
-    .slideshow img:first-child {opacity:1;}
+/* The styling below is specific to the readmes. */
+h1, ol ol, ul ul, table {
+    margin: 0.5em 0;
+}
+h2, h3 {
+    margin-top: 2em;
+    margin-bottom: 0;
+}
+h4, ol, ul, p {
+    margin-top: 1em;
+    margin-bottom: 0;
+}
+ol ol {
+    list-style:lower-alpha;
+}
+pre > code, blockquote {
+    border: 1px solid rgba(0, 0, 0, 0.12);
+    border-radius: 2px;
+    padding: 16px;
+    margin: 16px;
+    display: table;
+}
+pre > code {
+    overflow-x: auto;
+}
+blockquote {
+    background: #eee;
+}
+code {
+    display: inline-block;
+    padding: 0 4px;
+    background: #eee;
+}
+a[href^=http]::after {
+    content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" height="10px" width="10px" preserveAspectRatio="xMidYMid meet" fit="" style="pointer-events: none; display: block; color: #2196F3; fill: currentcolor; position: relative; top: -2px;"><g><path d="M9 5v2h6.59l-11.59 11.59 1.41 1.41 11.59-11.59v6.59h2v-10z"></path></g></svg>');
+}
+abbr {
+    cursor: help;
+    border-bottom: 1px dotted rgba(0, 0, 0, 0.12);
+}
+var {
+    color: #303F9F;
+}
 
-    span[title] {border-bottom: 1px dotted; font-family: sans-serif; cursor:help;}
-    abbr {cursor:help; border-bottom: 1px dotted black;}
-
-    #warning {background:#fbb; padding:10px 5px;margin:-8px;}
-    .warning {background:#fbb; border-color:#d00;}
-    var {color:#8B4513;}
-
-    .teamTableBody td:not(:first-child) {text-align:center;}
-    dt {margin-bottom:0.5em; margin-top:1em; font-style:italic;}
-    dd {margin-bottom:0.75em;}
+.clipper {
+    overflow: hidden;
+}
 </style>
 <!--  LOOT
 
     A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and Fallout: New Vegas.
 
-    Copyright (C) 2012–2014    WrinklyNinja
+    Copyright (C) 2012–2015    WrinklyNinja
 
     This file is part of LOOT.
 
@@ -90,22 +200,16 @@ h3{
     <li><a href="#install">Installation &amp; Uninstallation</a>
     <li><a href="#usage">Using LOOT</a>
     <ol>
-        <li><a href="#usage-sort">Sorting Plugins</a>
-        <li><a href="#usage-log">The Results Report</a>
-        <li><a href="#usage-custom">Customising LOOT's Results</a>
+        <li><a href="#usage-init">Initialisation</a>
+        <li><a href="#usage-header">The Header Bar</a>
+        <li><a href="#usage-cards">Plugin Cards &amp; Sidebar Items</a>
+        <li><a href="#usage-filters">Filters</a>
+        <li><a href="#usage-editing">Editing Plugin Metadata</a>
         <li><a href="#usage-settings">Editing Settings</a>
     </ol>
-    <li><a href="#trouble">Troubleshooting</a>
-    <li><a href="#contrib">Contributing To LOOT</a>
-    <li><a href="#translate">Translating LOOT</a>
+    <li><a href="#contrib">Contributing &amp; Support</a>
     <li><a href="#credits">Credits</a>
     <li><a href="#license">License</a>
-    <li><a href="#appendix">Appendices</a>
-    <ol>
-        <li><a href="#appendix-intro">Introduction To Load Orders</a>
-        <li><a href="#appendix-dirty">Dirty Edits, Mod Cleaning &amp; CRCs</a>
-        <li><a href="#appendix-permissions">File Permissions</a>
-    </ol>
     <li><a href="#history">Version History</a>
 </ol>
 
@@ -115,9 +219,9 @@ h3{
 
 <p>LOOT also provides some load order error checking, including checks for requirements, incompatibilities and cyclic dependencies. In addition, it provides a large number of plugin-specific usage notes, bug warnings and Bash Tag suggestions for Wrye Bash.
 
-<p>While LOOT is able to calculate correct load order positions for the vast majority of plugins using only their content, it cannot do so for all plugins. As such, LOOT provides a mechanism for supplying additional plugin metadata so that it may sort them correctly.
+<p>While LOOT is able to calculate correct load order positions for the vast majority of plugins using only their content, it cannot do so for all plugins. As such, LOOT provides a mechanism for supplying additional plugin metadata so that it may sort them correctly. An online <em>masterlist</em> is provided to supply metadata for many plugins that need it, while users can make their own metadata additions, which are saved in their <em>userlist</em>.
 
-<p>LOOT is intended to make using mods easier, and mod users should still possess a working knowledge of mod load ordering. See <a href="#appendix-intro">Introduction To Load Orders</a> for an overview.
+<p>LOOT is intended to make using mods easier, and mod users should still possess a working knowledge of mod load ordering. See <a href="https://github.com/loot/loot.github.io/wiki/Introduction-To-Load-Orders">Introduction To Load Orders</a> for an overview.
 
 
 <h2 id="install">Installation &amp; Uninstallation</h2>
@@ -134,148 +238,214 @@ h3{
 
 
 <h2 id="usage">Using LOOT</h2>
-<p>When LOOT is run, it will attempt to detect which of the supported games are installed. If a <a href="#settingsDefaultGame">default game</a> has been set, LOOT will run for it, otherwise it will run for the same game as it last ran for. If the relevant game cannot be detected, if there is no record of the last game LOOT ran for, it will run for the first detected game.
+
+<h3 id="usage-init">Initialisation</h3>
+
+<p>When LOOT is run, it will attempt to detect which of the supported games are installed. If a <a href="#settingsDefaultGame">default game</a> has been set, LOOT will run for it, otherwise it will run for the same game as it last ran for. If the relevant game cannot be detected, or if there is no record of the last game LOOT ran for, it will run for the first detected game.
+
 <p>LOOT can also be launched with the <code>LOOT.exe [--game=&lt;game folder name&gt;]</code> command line parameter to set the game to run for. If the supplied game folder name is valid, the default and last game values are ignored. The default folder names are <code>Oblivion</code>, <code>Skyrim</code>, <code>Fallout3</code> and <code>FalloutNV</code>.
-<p>Once a game has been set, the main window will be displayed.
-<figure>
-    <img alt="LOOT's main window" src="images/main.png">
-    <figcaption>LOOT's main window. The title bar displays which game LOOT is running for.</figcaption>
-</figure>
-<p>Clicking the <q>Edit Metadata</q> button will open LOOT's <a href="#usage-custom">metadata editor</a>, where you can make changes to the metadata LOOT uses to sort plugins, the messages that get displayed for plugins, and any Bash Tag suggestions LOOT makes.
-<p>Clicking the <q>Sort Plugins</q> button will begin the <a href="#usage-sort">plugin sorting process</a>. This will sort your plugins, allow you to make any changes to the load order it produces, then display a report that details the results of LOOT's activity.
-<p>Clicking the <q>View Last Report</q> button will display the <a href="#usage-log">report</a> generated the last time LOOT sorted your plugins for the current game.
-<p>The <q>File</q> menu provides menu items for sorting plugins, viewing the debug log and the last report LOOT generated, and quitting LOOT. The menu's <q>Redate Plugins</q> option is provided so that Skyrim modders may set the load order for the Creation Kit. It is only enabled for Skyrim, and changes the timestamps of the plugins in its Data folder to match their current load order. A side effect of changing the timestamps is that any Steam Workshop mods installed will be re-downloaded.
-<p>The <q>Edit</q> menu provides menu items for accessing LOOT's metadata editor and the <a href="#usage-settings">settings window</a>.
-<p>The <q>Game</q> menu allows you to change which game LOOT is running for. Games that LOOT cannot find are greyed out, and the the one LOOT is running for is marked with a bullet point. To change the active game, simply select another game in the list.
-<p>The <q>Help</q> menu provides a link to this readme and an about page that contains the version of LOOT being run, some legal information and a link to the <a href="http://loot.github.io">project homepage</a>.
 
-<h3 id="usage-sort">Sorting Plugins</h3>
+<p>If LOOT cannot detect any supported game installs, it will immediately open the <a href="#usage-settings">Settings dialog</a>. There you can edit LOOT's settings to provide a path to a supported game, after which you can select it from the Game menu.
+
+<p>Once a game has been set, LOOT will scan its plugins and load the game's masterlist, if one is present. The plugins and any metadata they have are then listed in their current load order.
+
+<p>If LOOT detects that it is the first time you have run that version of LOOT, it will display a <q>First-Time Tips</q> dialog, which provides some information about the user interface that may not be immediately obvious.
+
+<h3 id="usage-header">The Header Bar</h3>
+
 <figure>
-    <img alt="LOOT confirmation dialog" src="images/confirm.png">
-    <figcaption>Viewing &amp; editing LOOT's calculated load order.</figcaption>
+    <div style="width: 100%; overflow-x: auto;">
+        <div class="clipper" style="height: 54px; width: 1060px;">
+            <img src="images/main.png">
+        </div>
+    </div>
+<figcaption>LOOT's header bar, divided into sidebar and panel areas. The sidebar area contains the plugins and filters tabs. From left to right in the panel area are the <q>Jump To General Information</q> button, the game menu, and the sorting, masterlist update and main menu buttons. The game menu, masterlist update button and sorting button have been disabled, as a plugin metadata editor is open.</figcaption>
 </figure>
-<p>Clicking the <q>Sort Plugins</q> button in the main window will begin the sorting process.
-<p>First, LOOT downloads and applies any masterlist updates available, if the <a href="#settingsUpdateMasterlist">relevant setting</a> is enabled. If the latest update cannot be parsed (eg. due to typos), then LOOT will roll back until it finds a version that works.
-<p>LOOT then sorts your plugins according to a combination of data from the plugins themselves, and any masterlist and userlist entries they may have. If a cyclic interaction is detected (eg. A depends on B depends on A), then sorting will fail.
-<p>If sorting is successful, the calculated load order is then displayed in the dialog shown above. In this window, you can view the load order calculated by LOOT, and make any edits to the metadata used that you feel are necessary. The window is a simplified version of the metadata editor window, in which all metadata that does not affect sorting is hidden. Please see <a href="usage-custom">the section below</a> for more information on how to edit metadata using it.
-<p>If the <q>Apply</q> button is clicked, LOOT does one of two things: if no edits were made, then it immediately applies the load order; but if edits were made, then it repeats the sorting process with the new edits applied. If the <q>Cancel</q> button is clicked, then the load order and any edits made are discarded.
-<p>LOOT then generates a report and displays it either in a new window or in your default browser, according to the value of the <a href="#settingsViewReports">relevant setting</a>. Any errors encountered during the sorting process will be displayed in this report. See the next section for more information on the report.
+
+<p>The header bar provides access to LOOT's main features. Most of these features get disabled while there is at least one plugin editor open, so if you're trying to use an option that has been greyed out, first close any editors you have open.
+
+<h4>Game Menu</h4>
+
+<p>LOOT's active game can be changed by clicking on it in the header bar, and selecting another game from the menu that is displayed. Games that have no install detected are disabled have their menu items disabled.
+
+<h4 id="usage-update">Masterlist Update &amp; Sorting</h4>
+
+<p>The masterlist update process updates the active game's masterlist to the latest revision at the location given by the game's masterlist repository settings. If the latest revision contains errors, LOOT will roll back to the latest revision that works.
+
+<p>By <a href="#settingsUpdateMasterlist">default</a>, sorting first updates the masterlist. LOOT then calculates a load order for your plugins, using their internal data and any metadata they may have. If a cyclic interaction is detected (eg. A depends on B depends on A), then sorting will fail.
+
+<p>Once LOOT has calculated a load order, the plugin cards are sorted into that order. The masterlist update and sorting buttons are replaced with <span class="button">Apply</span> and <span class="button">Cancel</span> buttons, which apply and discard the calculated load order respectively. Changing games is disabled until the calculated load order is applied or discarded.
+
 <p>LOOT is able to sort plugins ghosted by Wrye Bash, and can extract Bash Tags and version numbers from plugin descriptions. Provided that they have the <code>Filter</code> Bash Tag present in their description, LOOT can recognise filter patches and so avoid displaying unnecessary error messages for any of their masters that may be missing.
-<p>While reading very large plugins, such as the game's main master file, LOOT may appear to stop responding: this is not an issue. The time it takes for LOOT to sort your load order depends primarily on the size of the masterlist being used, the total size of the files in your load order, and the number of plugins in your load order. The first run is likely to be longer than subsequent runs as LOOT needs to download the full masterlist, rather than just the changes made by updates. In testing, it was found that sorting ~90 plugins with a total size of ~350 MB and a 5 MB masterlist takes around 15 seconds, though performance will vary with computer hardware.
 
+<p>Any errors encountered during sorting or masterlist update will be displayed on the <q>General Information</q> card.
 
-<h3 id="usage-log">The Results Report</h3>
-<figure class="slideshow">
-    <img alt="LOOT report summary tab" src="images/viewer-1.png">
-    <img alt="LOOT report details tab" src="images/viewer-2.png">
-    <figcaption style="padding-top:610px;">LOOT's report viewer.</figcaption>
-</figure>
+<h4>Main Menu</h4>
 
-<p>LOOT's results report is comprised of two sections:
+<p>A few items in the main menu are not self-explanatory:
 <ul>
-    <li>The <q>Summary</q> tab gives information on the versions of LOOT and the masterlist used, whether masterlist updating is enabled, and breaks down some message and plugin numbers. It also notifies you if there have been no changes in the <q>Details</q> tab since you last ran LOOT for the same game. Finally, the <q>Summary</q> tab is also where any global messages supplied in the masterlist and any errors encountered during sorting are displayed.
-    <li>The <q>Details</q> tab lists the plugins LOOT sorted in their new load order, along with any messages LOOT has provided for them. LOOT will also display the plugin's <abbr title="Cyclic Redundancy Check">CRC</abbr> value and extract its version if found in the plugin's description field. If LOOT suggests any Bash Tags to be added, they will be displayed in <span style="color:green;">green text</span>, while any Bash Tags to be removed will be displayed in <span style="color:red;">red text</span>.
+    <li><q>Redate Plugins</q> is provided so that Skyrim modders may set the load order for the Creation Kit. It is only enabled for Skyrim, and changes the timestamps of the plugins in its Data folder to match their current load order. A side effect of changing the timestamps is that any Steam Workshop mods installed will be re-downloaded.
+    <li><q>Copy Content</q> copies the data displayed in LOOT's cards as YAML-formatted text.
+    <li><q>Refresh Content</q> re-scans the installed plugins' headers and regenerates the content LOOT displays. This can be useful if you have made changes to your installed plugins while LOOT was open. Refreshing content will also discard any CRCs that were previously calculated, as they may have changed.
 </ul>
-<p>In addition, there are a few filters that can be used to selectively hide items in the <q>Details</q> tab. These filters are:
-<ul>
-    <li><i>Hide Version Numbers</i>: Hides the version numbers printed in blue next to those plugins that provide them.
-    <li><i>Hide CRCs</i>: Hides the CRCs printed in orange next to those plugins that provide them.
-    <li><i>Hide Notes</i>: Hides all plugin messages that have the <i>Note:</i> prefix.
-    <li><i>Hide Bash Tag Suggestions</i>: Hides all Bash Tag suggestions.
-    <li><i>Hide 'Do Not Clean' Messages</i>: Hides any messages that contain the string <q>Do not clean.</q>.
-    <li><i>Hide Inactive Plugin Messages</i>: Hides all messages attached to plugins that are inactive.
-    <li><i>Hide All Plugin Messages</i>: Hides all plugin messages.
-    <li><i>Hide Messageless Plugins</i>: Hides any plugins that have no visible messages.
-</ul>
-<p>LOOT will display the version numbers of any plugins that provide them in their description fields. If a plugin supplies no version number, it cannot be displayed. The version numbers may not reflect the actual version of the mod installed - this could either be due to the mod author forgetting to update the description, or due to a mistake in LOOT's detection. As version numbers are supplied by mod authors in a wide range of formats and LOOT has to detect as many as possible, it occasionally identifies parts of some descriptions as version numbers incorrectly. When in doubt, check the version number given in a mod's readme.
-<p>LOOT's plugin messages are a valuable resource, acting as a means of providing users with information that they might otherwise not obtain. It is important for a stable, healthy game that you act on any messages that require action.
-<p>If you think a message suggests an unnecessary action, report it to an official LOOT thread. If you encounter a message that is non-conditional, ie. it suggests an action but is still displayed on subsequent runs of LOOT after the action has been carried out, also report it to an official LOOT thread, so that it can be made conditional.
 
+<h3 id="usage-cards">Plugin Cards &amp; Sidebar Items</h3>
 
-<h3 id="usage-custom">Customising LOOT's Results</h3>
 <figure>
-    <img src="images/editor.png">
-    <figcaption>LOOT's metadata editor.</figcaption>
+    <div style="width: 100%; overflow-x: auto;">
+        <div class="clipper" style="height: 315px; width: 690px;">
+            <img src="images/main.png" style="position: relative; top: -90px; left: -355px;">
+        </div>
+    </div>
+<figcaption>Examples of plugin cards.</figcaption>
 </figure>
-<p>LOOT's sorting algorithm uses the contents of plugins to work out where they should load relative to one another. However, this is sometimes not enough for it to produce a correct load order. In such cases, additional metadata can be supplied so that the plugins get sorted correctly. This metadata is supplied to LOOT by two sources: one is the masterlist, which is maintained by the LOOT team, and the other is the userlist, which you can edit as you desire.
-<p>The metadata editor allows you to manage the metadata stored in your userlist. It is a more fully-featured version of the dialog displayed during sorting. When opened, it lists all the plugins you have installed, and any that are missing but have existing user-added metadata, in alphabetical order. Plugins that load BSAs are displayed in <span style="color: #008EDB;">blue text</span>, and plugins with user-added metadata are displayed with a tick in the first column of the list. Selecting a plugin then opens its metadata for editing, and displays any existing metadata in the fields to the right of the plugin list. Right-clicking a plugin displays a context menu containing a few commands. The editor fields and context menu commands are explained in the tables below.
-<p>The <q>Add &#x2026;</q>, <q>Edit &#x2026;</q> and <q>Remove &#x2026;</q> buttons are used to edit the contents of the list currently visible. The <q>Edit &#x2026;</q> and <q>Remove &#x2026;</q> buttons are greyed out if no row is selected or if the selected row is not user-added metadata, but comes from the masterlist or the plugin itself. Metadata that comes from the masterlist or the plugin itself cannot be edited or removed, only added to. This is to prevent users from accidentally overriding important metadata.
 
-<p>The <q>Show only conflicting plugins</q> checkbox filters the plugin list so that only plugins which either contain conflicting records or (if the selected plugin loads a BSA) load BSAs that <i>may</i> contain conflicting resources are displayed. While the filter is active, it is also possible to add plugins to the <q>Requirements</q>, <q>Incompatibilities</q> and <q>Load After</q> lists by drag 'n' dropping them from the plugin list. The filter must be deactivated to select another plugin for editing.
+<p>Each plugin is displayed on its own <q>card</q>, which displays all the information LOOT has for that plugin, and provides access to plugin-specific functionality, including its metadata editor. Each plugin also has an item in the sidebar's <span class="button">Plugins</span> tab. The sidebar item contains the plugin's name and icons for plugins that load BSAs or have user metadata. Clicking on a plugin's sidebar item will jump to its card, while double-clicking will jump to its card and open its metadata editor.
+
+<p>The plugin card's header holds the following information, some of which is only displayed if applicable:
+<ol>
+    <li>The <q>Active Plugin</q> icon.
+    <li>The plugin name.
+    <li>The plugin's version number, extracted from its description field.
+    <li>The plugin's <abbr title="Cyclic Redundancy Checksum">CRC</abbr>, which can be used to uniquely identify it. CRCs are only displayed after they have been calculated during conflict filtering or sorting.
+    <li>The <q>Master File</q> icon.
+    <li>The <q>Empty Plugin</q> icon.
+    <li>The <q>Loads BSA</q> icon.
+    <li>The <q>Has User Metadata</q> icon.
+    <li>The plugin menu button, which provides access to a few plugin-specific features, including a conflict filter and access to its metadata editor. These are explained in later sections.
+</ol>
+
+<p>Bash Tag suggestions and messages are displayed below the plugin card's header.
+
+<p>If LOOT suggests any Bash Tags to be added, they will be displayed in <span style="color:green;">green text</span>, while any Bash Tags to be removed will be displayed in <span style="color:red;">red text</span>. For completeness, the list of Bash Tags to add will include any Bash Tags that are already specified in the plugin's description field. Users generally don't need to do anything with this information, as if they're using Wrye Bash it will automatically apply LOOT's suggestions, and if they're not using Wrye Bash then this information doesn't apply.
+
+<p>LOOT's plugin messages are a valuable resource, acting as a means of providing users with information that they might otherwise not obtain. It is important for a stable, healthy game that you act on any messages that require action. If you think a message suggests an unnecessary action, report it to an official LOOT thread. If you encounter a message that is non-conditional, ie. it suggests an action but is still displayed on subsequent runs of LOOT after the action has been carried out, also report it to an official LOOT thread, so that it can be made conditional.
+
+<h3 id="usage-filters">Filters</h3>
+<p>Clicking the <span class="button">Filters</span> tab in the sidebar will replace the sidebar's plugin list with a list of filter toggles that can be applied to hide various combinations of plugins and other content. The available filter toggles are:
+<ul>
+    <li><i>Hide version numbers</i>: Hides the version numbers displayed in blue next to those plugins that provide them.
+    <li><i>Hide CRCs</i>: Hides the CRCs displayed in orange next to those plugins that provide them.
+    <li><i>Hide Bash Tags</i>: Hides all Bash Tag suggestions.
+    <li><i>Hide notes</i>: Hides all plugin messages that have the <i>Note:</i> prefix, or the equivalent text for the language selected in LOOT's settings.
+    <li><i>Hide 'Do not clean' messages</i>: Hides all messages that contain the text <q>Do not clean</q>, or the equivalent text for the language selected in LOOT's settings.
+    <li><i>Hide all plugin messages</i>: Hides all plugin messages.
+    <li><i>Hide inactive plugins</i>: Hides all plugins that are inactive.
+    <li><i>Hide messageless plugins</i>: Hides all plugins that have no visible messages.
+</ul>
+<p>There are also two other filters:
+<ul>
+    <li>A conflict filter that can be accessed through each plugin's menu. This filters the plugin cards displayed so that only plugins which conflict with this plugin will be visible. If this plugin loads a BSA, other plugins that load BSAs which <em>may</em> contain conflicting resources are also displayed.</p>
+
+    Only one plugin's conflict filter can be active at any one time, so activating a second conflict filter will deactivate the first. The plugin for which the filter is currently active has its card highlighted.
+    <li>A content filter, located at the bottom of the sidebar. This hides any plugins that don't have the filter input value present in any of the following:
+    <ul>
+        <li>Filename
+        <li>Version
+        <li>CRC value
+        <li>Bash Tag suggestions
+        <li>Messages
+    </ul>
+</ul>
+
+<h3 id="usage-editing">Editing Plugin Metadata</h3>
+
+<figure>
+    <div style="width: 100%; overflow-x: auto;">
+        <div class="clipper" style="height: 290px; width: 690px;">
+            <img src="images/main.png" style="position: relative; top: -405px; left: -355px;">
+        </div>
+    </div>
+<figcaption>A metadata editor panel.</figcaption>
+</figure>
+
+<p>LOOT uses metadata to supply plugins with messages and Bash Tag suggestions, and to help it sort plugins that it can't otherwise sort correctly. Users can add to their plugins' metadata through each plugin's metadata editor panel, and plugins with user metadata are indicated with a <q>Has User Metadata</q> icon.
+
+<p>A plugin's editor panel is accessed by clicking the <q>Edit Metadata</q> item in the plugin's menu. Multiple plugins can have their editor panels open at once. While at least one editor panel is open, the plugin sidebar also displays any non-zero plugin priorities, to aid setting new priority values.
+
+<p>The editor's header bar is similar to the header on the front of the plugin card, minus the <q>Has User Metadata</q> icon, and with the addition of <q>Apply</q> and <q>Cancel</q> icon buttons and a row of tabs. The <span class="button">Main</span> tab contains the following inputs:
+
+<ul>
+    <li>The <q>Enable Edits</q> checkbox must be checked for LOOT to use any user-added metadata, otherwise it will be ignored.
+    <li>The <q>Global Priority</q> checkbox controls how LOOT compares plugin priorities. If unchecked, the plugin's priority will only be compared against plugins that conflict, and empty plugins. If checked, the plugin's priority will be compared against all plugins.
+    <li>The <q>Priority Value</q> input sets the plugin's priority value, which is used to modify plugin position relative to others. Plugins with higher priority values load after plugins with lower priority values. Plugins have a default priority of 0.
+</ul>
+
+<p>The other tabs contain metadata tables, which are detailed below. New rows can be added, and existing user-added rows can be removed, though rows containing metadata from the masterlist cannot. The <span class="button">Load After</span>, <span class="button">Requirements</span> and <span class="button">Incompatibilities</span> tables can have rows added by dragging and dropping plugins from the sidebar into the table area.
 
-<p>The <q>Save Changes</q> button will save any user-added metadata to your userlist, including any changes made, then exit the metadata editor. The <q>Cancel</q> button will exit the editor without saving any changes.
 <table>
     <thead>
-        <tr><th>Field<th>Description
+        <tr><th>Table<th>Description
     <tbody>
-        <tr><td>Enable User Changes<td>If this is checked, LOOT will use the metadata you supplied when sorting the current plugin. Otherwise, your metadata will be ignored.
-        <tr><td id="editingPriority">Priority<td>Modifies plugin position relative to others that change one or more of the same records, but which are otherwise unrelated (ie. neither plugin lists the other as a master, requirement, or in its "load after" list). Plugins that don't change any of the same records are not compared, unless:
+        <tr><td>Load After<td>This is a list of plugins which, if present, the current plugin must load after, but which are not required. This metadata can be used for resolving specific compatibility issues. Each entry has three fields:
         <ul>
-            <li>One or both of the plugins is a "dummy" plugin, containing only a header record.
-            <li>One or both of the plugins has the <q>Compare priority against all other plugins</q> checkbox ticked.
-        </ul>
-        <p>A plugin with a higher priority value will load after a plugin with a lower priority value. Plugins have a default priority of 0.
-        <tr><td>Requirements<td>This is a list of files that are required by the current plugin for it to function correctly. LOOT will display an error message if any of the listed files are missing.
-        <p>Any file, not just plugins, can be listed here, and each file has three sub-fields:
-        <ul>
-            <li>The <var>filename</var> is the path, relative to the game's Data folder, of the file to be checked for. This sub-field is required.
+            <li>The <var>filename</var> is the path, relative to the game's Data folder, of the file to be checked for. This field is required.
             <li>The <var>display name</var> is optional, and if specified will be used instead of the <var>filename</var> in any error messages that are displayed if a problem is encountered relating to the file.
             <li>The <var>condition</var> is the optional condition string that is used to determine if the file should be checked for. If left blank, the file will always be checked for. Condition strings are a relatively advanced part of LOOT's functionality, and their syntax is covered in the <a href="LOOT%20Metadata%20Syntax.html">Metadata Syntax</a> documentation.
         </ul>
-        <p>Note that listing a plugin's masters as requirements is pointless, as LOOT already checks them.
-        <tr><td>Incompatibilities<td>This is a list of files that are incompatible with the plugin. LOOT will display an error message if any of the listed files are found.
-        <p>Any file, not just plugins, can be listed here, and each file has the same three sub-fields as for the requirements field.
-        <tr><td>Load After<td>This is a list of plugins which, if present, the current plugin must load after, but which are not required. This field can be used for resolving specific compatibility issues.
-        <tr><td>Messages<td>A list of messages that are to be displayed for the plugin in LOOT's report. These have no bearing on a plugin's position in the load order.
-        <p>Each message has four sub-fields:
+        <tr><td>Requirements<td>This is a list of files that are required by the current plugin for it to function correctly. The current plugin will be loaded after any plugins listed. LOOT will also display an error message if any of the listed files are missing. Any file, not just plugins, can be listed here, and each entry has the same three fields as for the load after table.
+        <p>Note that listing a plugin's masters as requirements is unnecessary, as LOOT already checks them.
+        <tr><td>Incompatibilities<td>This is a list of files that are incompatible with the plugin. LOOT will display an error message if any of the listed files are found. Any file, not just plugins, can be listed here, and each entry has the same three fields as for the load after table.
+        <tr><td>Messages<td>A list of messages that are to be displayed for the plugin in LOOT's report. These have no bearing on a plugin's position in the load order. Each message has four fields:
         <ul>
             <li>The <var>type</var> is fairly self-explanatory, and is used to provide messages of varying severity with appropriate emphasis in LOOT's report.
             <li>The <var>content</var> is the actual message text.
-            <li>The <var>condition</var> is, like for the corresponding file sub-field, used to determine if the message should be displayed. If left blank, the message is displayed.
-            <li>The <var>language</var> is the language LOOT runs in that the message will be displayed for. For example, if the message language is set to <q>English</q> and LOOT is running in German, then the message will not be displayed. If left unspecified, the message will be shown no matter what language LOOT is running in.
+            <li>The <var>condition</var> is, like for the corresponding file field, used to determine if the message should be displayed. If left blank, the message is displayed.
+            <li>The <var>language</var> is the language LOOT runs in that the message will be displayed for. This field has no effect for user-added messages, as they cannot contain multiple localisations, and LOOT will always display messages that have only one localisation, even if it doesn't match the current language.
         </ul>
         <p>If a message's condition determines that it should not be displayed, then it will not be displayed, no matter the language. However, if a message's condition determines that it should be displayed, but the language is specified and doesn't match the language LOOT is running in, the message will not be displayed.
         <tr><td>Bash Tags<td>A list of Bash Tags. These are used by Wrye Bash when generating a Bashed Patch. LOOT's metadata includes Bash Tag addition and removal suggestions, and any Bash Tags that came with the plugin are also displayed.
         <p>As LOOT can suggest Bash Tags be added or removed, it is possible for the same Tag to appear twice, being suggested for addition and removal. In such cases, removal overrides addition.
-        <p>Each Bash Tag has three sub-fields:
+        <p>Each Bash Tag has three fields:
         <ul>
             <li>The <var>state</var> determines whether the Tag is to be suggested for addition or removal.
             <li>The <var>name</var> is the actual Bash Tag name.
             <li>The <var>condition</var> decides if the Tag is to be suggested or not. It functions as for files and messages.
         </ul>
         <p>If a plugin's masters are missing, an error message will be displayed for it. Filter patches are special mods designed for use with a Bashed Patch that do not require all their masters to be present, and so any plugin with the <code>Filter</code> tag applied and missing masters will not cause any errors to be displayed.
-</table>
-<table>
-    <thead>
-        <tr><th>Context Menu Command<th>Description
-    <tbody>
-        <tr><td>Copy Name<td>Copies the selected plugin's filename to the clipboard.
-        <tr><td id="editorCopyMetadataAsText">Copy Metadata As Text<td>Copies the selected plugin's current metadata, as it appears in the userlist, to the clipboard. This makes it easier to share your metadata changes with the LOOT team, as they can then paste this text directly into the masterlist, and also avoids any typos being introduced. If posting the text in an online forum that supports BBCode (as most forums do), be sure to wrap it in <code>[code]</code> tags, eg. <code>[code]copied text[/code]</code>, so that the spaces are not removed by the forum software.
-        <tr><td>Remove Plugin User-Added Metadata<td>This removes all saved user-added metadata from the selected plugin, <b>and</b> any unsaved data added to the plugin since the Metadata Editor window was opened.
-        <tr><td>Remove All User-Added Metadata<td>This removes all user-added metadata from all plugins.
+        <tr><td>Dirty Info<td>A list of dirty plugin CRCs and related information. Each row has five fields:
+        <ul>
+            <li>The <var>CRC</var> of the dirty plugin.
+            <li>The <var>ITM Count</var> for the dirty plugin.
+            <li>The number of <var>Deleted References</var> that the dirty plugin contains.
+            <li>The number of <var>Deleted Navmeshes</var> that the dirty plugin contains.
+            <li>The name of the <var>Cleaning Utility</var> to use to clean the dirty plugin.
+        </ul>
+        <p>LOOT uses the information supplied to construct a warning message for the plugin if it matches any of the given CRCs.
+        <tr><td>Locations<td>A list of URLs that the mod to which the plugin belongs can be found at. This metadata is not currently used by LOOT, but it may be useful to record it. Each location has two fields:
+        <ul>
+            <li>The <var>URL</var> at which the plugin's parent mod can be found.
+            <li>The <var>Version</var> which can be found at the given URL.
+        </ul>
 </table>
 
 <h3 id="usage-settings">Editing Settings</h3>
 <figure>
-    <img src="images/settings.png">
-    <figcaption>LOOT's settings window.</figcaption>
+    <div style="width: 100%; overflow-x: auto;">
+        <div class="clipper" style="height: 768px; width: 1024px;">
+            <img src="images/settings.png" style="position: relative;">
+        </div>
+    </div>
+    <figcaption>LOOT's settings dialog.</figcaption>
 </figure>
-<p>LOOT's settings window may be accessed by clicking <q>Edit&#x2192;Settings</q> in the main window's menu bar. LOOT's settings are detailed in the table below.
+<p>LOOT's settings may be accessed by clicking <q>Settings</q> button in LOOT's menu bar. The settings are detailed in the table below.
 <table>
     <thead>
         <tr><th>Setting<th>Description
     <tbody>
         <tr><td id="settingsDefaultGame">Default Game<td>If set to something other than <q>Autodetect</q>, this overrides game autodetection. If the game specified is not detected, LOOT falls back to autodetection.
-        <tr><td>Language<td>Controls the language LOOT uses in its interfaces. Debug messages are always displayed in English, and any plugin messages that do not have translations in the selected language will be displayed in English instead.
-        <tr><td>Debug Verbosity<td>Controls the verbosity of the debug output, which is written to <code>%LOCALAPPDATA%\LOOT\LOOTDebugLog.txt</code>.
+        <tr><td>Language<td>Controls the language LOOT uses in its interfaces. Any plugin messages that do not have translations in the selected language will be displayed in English, if available, or in their available language otherwise.
+        <tr><td>Enable Debug Logging<td>If enabled, writes debug output to <code>%LOCALAPPDATA%\LOOT\LOOTDebugLog.txt</code>. Debug logging can have a noticeable impact on performance, so it is off by default.
         <tr><td id="settingsUpdateMasterlist">Update masterlist before sorting<td>If checked, LOOT will update its masterlist, should an update be available, before sorting plugins.
 </table>
-<p>The games list allows the customisation of which games LOOT offers support for, trivialising support for multiple copies of a game and Total Conversions. The games listed here will be displayed in the main window's <q>Game</q> menu when LOOT is next run. The <q>Add Game</q>, <q>Edit Game</q> and <q>Remove Game</q> buttons are used to edit the list. Each game has several columns, which are explained below.
+<p>LOOT's game-specific settings can be customised in the games table. New game profiles can be added, making it easy to use LOOT across multiple copies of a game, including total conversion mods. LOOT ships with settings for the <q>Nehrim - At Fate's Edge</q> total conversion mod as an example. Game profiles can also be deleted, though the active game cannot have its profile deleted, and LOOT will recreate the profiles for the four base games it supports (Oblivion, Skyrim, Fallout 3, Fallout: New Vegas) when it is next run.
+
+<p>The game settings are explained in the table below.
 <table>
     <thead>
-        <tr><th>Column<th>Description
+        <tr><th>Game Setting<th>Description
     <tbody>
-        <tr><td>Name<td>The name of the game, or another identifying string, that is displayed in menus and the main window's title bar.
+        <tr><td>Name<td>The name of the game, or another identifying text, that is displayed in menus and the LOOT's title bar.
         <tr><td>Base Game Type<td>Every game LOOT runs for must use the plugin file format and load order system of one of the following games:
         <ul>
             <li>TES IV: Oblivion
@@ -285,94 +455,58 @@ h3{
         </ul>
         <tr><td>LOOT Folder Name<td>The sub-folder which LOOT uses to store the game's files in. Each game must be given a unique sub-folder.
         <tr><td>Master File<td>The game's main master file. This is specified as it must load before all other plugins. Note that Skyrim-based games will always load Skyrim.esm first, so this column must always be set to <q>Skyrim.esm</q> for such games.
-        <tr><td id="settingsMasterlistURL">Masterlist Repository URL<td>The URL of the repository that LOOT uses to update its local copy of the masterlist. If set to an empty string, masterlist updating will be skipped.
+        <tr><td id="settingsMasterlistURL">Masterlist Repository URL<td>The URL of the repository that LOOT uses to update its local copy of the masterlist. If left empty, masterlist updating will be skipped.
         <br><br>
         Masterlist repositories are <a href="http://git-scm.com/">Git</a> repositories that are configured to allow unauthenticated read access and contain a masterlist file named <code>masterlist.yaml</code> in their root directory. The LOOT team maintains a set of official repositories for the games that LOOT supports by default.
         <tr><td>Masterlist Repository Branch<td>The branch of the masterlist repository that LOOT should get masterlist updates from.
         <tr><td>Install Path<td>The path to the game's folder, in which the Data folder lies. Either this or a registry key must be supplied.
         <tr><td>Install Path Registry Key<td>The registry key, in <code>HKEY_LOCAL_MACHINE</code>, that contains the install path of the game. This is used to obtain the install path if LOOT has no previous record of the game's install path, or LOOT's stored install path is invalid. Either this or an install path must be supplied.
 </table>
-<p>Note that for Skyrim, multiple copies or Total Conversions will all edit the same <code>plugins.txt</code> file, and so they lack the level of independence that is achievable for other games.
 
 
-<h2 id="trouble">Troubleshooting</h2>
-<p>If LOOT encounters a problem at any point, it should provide an error message, either in a dialog (as is generally the case) or in its report (as for errors encountered during the sorting process). If LOOT unexpectedly crashes, or you experience a problem for which no error message is given, please report the crash or problem to an official LOOT thread (see <a href="#contrib">Contributing To LOOT</a>), so that it can be fixed.
-<p>If the information below does not help you to solve any problems you are experiencing, please seek further support in one of the official LOOT threads.
-<p>There are a few general reasons why LOOT may fail to function correctly. Check if any of the symptoms listed below fit your issue.
-<dl>
-    <dt>LOOT ran without any errors, but the load order hasn't changed to match what LOOT has in its report.
-        <dd>Make sure that you aren't using another utility to <q>lock</q> your load order.
-        <dd>If you're sorting for Skyrim, make sure that you haven't replaced or renamed your <code>TESV.exe</code>, as this interferes with LOOT's ability to decide how to set the load order.
-    <dt>Some plugins have the wrong or no version number given in LOOT's report.
-        <dd>No solution.
-    <dt>A game is installed, but LOOT cannot detect it.
-        <dd>The game's Registry entry is missing. This happens to a lot of people, because Steam likes to remove it whenever the game is updated or its game cache is verified. Run the game's launcher to add the Registry entry back again.
-    <dt>There are no line breaks in <code>plugins.txt</code> or <code>loadorder.txt</code> when they are opened in Notepad.
-        <dd>There probably are LF line breaks, but Notepad only recognises CRLF line breaks. It doesn't make any difference to the game.
-</dl>
+<h2 id="contrib">Contributing &amp; Support</h2>
+<p>LOOT is very much a community project, and contributions from its users are vital to its upkeep, whether they be metadata, translations, code or anything else. The best way to contribute is to <a href="https://github.com/loot/loot.github.io/wiki/How-To-Contribute">make changes yourself</a> at GitHub! It's the fastest way to get changes you want applied, and you'll get your name automatically immortalised in our <a href="http://loot.github.io/credits/">credits</a>.
 
+<p>If you encounter an issue with LOOT, check the <a href="https://github.com/loot/loot.github.io/wiki/LOOT-FAQs">Frequently Asked Questions</a> wiki page in case a solution is available there.
 
-<h2 id="contrib">Contributing To LOOT</h2>
-<p>LOOT is very much a community project, and contributions from its users are vital to its upkeep. The best way to contribute is to <a href="https://github.com/loot/loot.github.io/wiki/How-To-Contribute">make changes yourself</a> at GitHub! It's the fastest way to get changes you want applied, and you'll get your name automatically immortalised in our <a href="http://loot.github.io/credits/">credits</a>.
+<p>Otherwise, general discussion and support takes place in LOOT's official forum threads. These are linked to at the bottom of <a href="http://loot.github.io">LOOT's homepage</a>.
 
-<p>Otherwise, general discussion takes place in LOOT's official forum threads. These are linked to at the bottom of <a href="http://loot.github.io">LOOT's homepage</a>.
-
-<p>If you want to submit metadata, the easiest way to do so is to add the metadata to your own LOOT install (either during sorting or in the Metadata Editor), and use the <a href="#editorCopyMetadataAsText">Copy Metadata As Text</a> feature to easily get it in a form that you can then edit into a masterlist on GitHub or post in the official forum threads.
+<p>If you want to submit metadata, the easiest way to do so is to add the metadata to your own LOOT install, then use the <a href="#copyMetadata">Copy Metadata</a> feature to easily get it in a form that you can then edit into a masterlist on GitHub or post in the official forum threads.
 
 <p>Information on dirty plugins is very welcome, but for such information to be useful we require at least the filename and the CRC of the dirty plugin. The CRC may be calculated using Wrye Bash or 7-Zip, with other sources being unverified as correct. In the case of 7-Zip, the <q><em>CRC checksum for data</em></q> is the one required. In addition to the CRC, the number of records removed (the ITM count) and/or undeleted (the UDR count) are also welcome.
 
-<p>
-
-
-<h2 id="translate">Translating LOOT</h2>
-<p>LOOT supports translation into other languages, with the following limitations:
-<ul>
-    <li>Debug log messages and error messages generated by the libraries LOOT uses cannot be translated.
-    <li>Masterlist messages can be translated, but translations must be submitted to the masterlist maintainers for addition.
-    <li>The languages LOOT supports is hardcoded, so LOOT must be updated to include new translations.
-</ul>
-<p>Translations are best submitted through GitHub's <a href="https://github.com/loot/loot.github.io/wiki/How-To-Contribute">forking system</a>. You will need to fork the LOOT <a href="https://github.com/loot/loot">source code repository</a>. All file paths given below are relative to the base folder of that repository.
-<p>To translate LOOT's installer:
-<ol>
-    <li>Open the installer script at <code>src/installer.nsi</code> in a text editor of your choice.
-    <li>The English strings are located in the section with the heading <q>English Strings</q>. Copy and paste this section into a new text file, and translate the quoted strings, replacing the English text. For the lines beginning <code>VIAddVersionKey</code>, only translate the second quoted string.
-    <li>Save the text file containing your translated strings.
-</ol>
-To translate the LOOT application:
-<ol>
- <li>Download and install the latest version of <a href="http://www.poedit.net/">Poedit</a>.
- <li>If you are starting a new translation, select <q>File->New catalogue from POT file...</q> and choose the template file at <code>resources/l10n/template.pot</code>. In the <q>Catalog properties</q> dialog, just click <q>OK</q> without changing anything.
- <li>If you are updating a previous translation, open in Poedit the <code>loot.po</code> translation file in the relevant subdirectory of <code>resources/l10n</code>, then select <q>Catalogue->Update from POT file...</q> and choose the template file you downloaded. Click <q>OK</q> in the <q>Update summary</q> dialog.
- <li>Edit the translation file to add or update translations of the programs' text. Strings that were added since the last translation are displayed in bold and dark blue, and strings you have edited the translations of are marked with a star to the left of their source text in the main list.
-<p>Some languages may use different words or phrases for different contexts where only one word or phrase may be used for all contexts in English. <strong>While no contextual information is supplied to translators by default, it can be added on request</strong>. To request the addition of contextual information to a text string, contact WrinklyNinja, quoting the structure that contains the string for which you are requesting contextual information.
-<p>Some strings to be translated may contain special characters. Different types of special character that may be encountered are:
-<ul>
- <li>Backslashes <code>\</code>. Backslashes must be escaped using another backslash, so if you wanted to display a single backslash <code>\</code>, you would put <code>\\</code> in your translated string.
- <li>Double-quotation marks <code>"</code>. Double-quotation marks must be preceded by a backslash, ie. <code>\"</code>, or LOOT will crash when it tries to display the string.
- <li>New line characters <code>\n</code>. Do not change the position of these characters relative to the surrounding text, they are responsible for creating new lines.
- <li>Words containing an ampersand <code>&amp;</code>. If a string contains a word that begins with or includes an ampersand, the string is for a menu item and the ampersand is a symbol placed before a specific letter and used to show which keyboard key can be used to select that menu item. The ampersand can be moved to be placed before a more appropriate letter in the translated text.
- <li>Formatting placeholders. Placeholders are used so that LOOT can substitute text or numbers that are generated at runtime into pre-made strings. They appear as a number surrounded by percentage signs, eg. <code>%1%</code>. If formatting placeholders are used in the untranslated string, they <strong>must all</strong> be present in the translated string, or LOOT will crash when it tries to display the translated string. Placeholders can be moved around so that the sentence makes grammatical sense in the target language.
-</ul>
- <li>Save the translation file with the filename <code>loot.po</code> in a location of your choosing.
-</ol>
-
 
 <h2 id="credits">Credits</h2>
-<p>LOOT is developed by a team on <a href="https://github.com/loot/">GitHub</a>, with contributions from users. A full list of GitHub contributors may be found <a href="http://loot.github.io/credits/">here</a>. An up-to-date list of team members may be viewed on the <a href="https://github.com/loot/loot.github.io/wiki/Team-Members">project wiki</a>. Unless otherwise noted, team members can be contacted on the <a href="http://forums.bethsoft.com/index.php">Bethesda Softworks Forums</a> or on <a href="http://forums.nexusmods.com/">The Nexus Forums</a> via the private messaging system.
+<p>LOOT is developed by a team on <a href="https://github.com/loot/">GitHub</a>, with contributions from users. A full list of GitHub contributors may be found <a href="http://loot.github.io/credits/">here</a>. A list of team members may be viewed on the <a href="https://github.com/loot/loot.github.io/wiki/Team-Members">project wiki</a>. Unless otherwise noted, team members can be contacted on the <a href="http://forums.bethsoft.com/index.php">Bethesda Softworks Forums</a> or on <a href="http://forums.nexusmods.com/">The Nexus Forums</a> via the private messaging system.
 <p>LOOT's masterlists were largely converted from <a href="http://boss-developers.github.io">BOSS</a>'s masterlists, and so credit is due to the very large number of sources and people who have contributed to them.
 <p>In addition, the following are credited with application-related support:
 <ul>
     <li>Icon: jonwd7
-    <li>Polish translation: Łukasz Niemczyk
-    <li>Chinese translation: bluesky404
-    <li>French translation: Kaos
-    <li>Spanish translation: Sharlikran
-    <li>Russian translation: Tokc.D.K.
-    <li>Brazilian Portuguese translation: Kassane
-    <li>Finnish translation: 3ventic
+    <li>Translations:
+    <ul>
+        <li>Brazilian Portuguese: Kassane
+        <li>Chinese: bluesky404
+        <li>Finnish: 3ventic
+        <li>French: Kaos
+        <li>German: lpradel
+        <li>Polish: Łukasz Niemczyk
+        <li>Russian: Tokc.D.K.
+        <li>Spanish: Sharlikran
+    </ul>
     <li>Beta testing: Too many to list, thank you all!
 </ul>
-<p>LOOT is written in C++ and makes use of the <a href="http://www.davekoelle.com/alphanum.html">Alphanum</a>, <a href="http://www.boost.org/">Boost</a>, <a href="http://github.com/WrinklyNinja/libespm">libespm</a>, <a href="http://github.com/libgit2/libgit2">libgit2</a>, <a href="http://github.com/WrinklyNinja/libloadorder">libloadorder</a>, <a href="http://www.wxwidgets.org/">wxWidgets</a> and <a href="http://code.google.com/p/yaml-cpp/">yaml-cpp</a> libraries. LOOT's reports are written in HTML5/CSS3/Javascript and make use of <a href="http://github.com/inexorabletash/polyfill">Polyfill.js</a> and <a href="http://requirejs.org">RequireJS</a>. Copyright license information for all these may be found <a href="licenses/Licenses.txt">here</a>.
+<p>LOOT is written in C/C++, HTML5, CSS3 and JavaScript, and uses the
+<a href="http://www.davekoelle.com/alphanum.html">Alphanum</a>,
+<a href="http://www.boost.org/">Boost</a>,
+<a href="https://github.com/SlexAxton/Jed">Jed</a>,
+<a href="https://github.com/WrinklyNinja/jed-gettext-parser">Jed Gettext Parser</a>,
+<a href="https://github.com/WrinklyNinja/libespm">libespm</a>,
+<a href="https://github.com/libgit2/libgit2">libgit2</a>,
+<a href="https://github.com/WrinklyNinja/libloadorder">libloadorder</a>,
+<a href="https://github.com/chjj/marked">Marked</a>,
+<a href="https://www.polymer-project.org/">Polymer</a>
+<a href="http://requirejs.org">RequireJS</a> and
+<a href="http://code.google.com/p/yaml-cpp/">yaml-cpp</a> libraries, and the <a href="https://code.google.com/p/chromiumembedded/">Chromium Embedded Framework</a>. Copyright license information for all these may be found <a href="licenses/Licenses.txt">here</a>.
 
 <h2 id="license">License</h2>
 <p>LOOT is distributed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License v3.0</a>, aside from the documentation, which is distributed under the <a href="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License v1.3</a>. The full texts of the licenses are included with LOOT in the accompanying <a href="licenses/GNU%20GPL%20v3.txt">GNU GPL v3.txt</a> and <a href="licenses/GNU%20FDL%20v1.3.txt">GNU FDL v1.3.txt</a> files.
@@ -382,88 +516,139 @@ To translate the LOOT application:
 <p>LOOT has been specifically designed to prevent it being locked into the LOOT Team's official masterlist repositories. Nevertheless, the LOOT Team appeals to the community to avoid the distribution of unofficial masterlists, as this would only hamper the effort to create one set of stores for load order information. Any issues with a masterlist are best brought to the attention of the LOOT Team so that they may be remedied.
 
 <p>GNU Free Documentation License Version 1.3 Notice:
-<blockquote>Copyright (C)  2012&mdash;2014  WrinklyNinja<br />
+<blockquote>Copyright (C)  2012&mdash;2015  WrinklyNinja<br />
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3
 or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.<br />
 A copy of the license is included in the file named "GNU FDL v1.3.txt".</blockquote>
 
-<h2 id="appendix">Appendices</h2>
-<h3 id="appendix-intro">Introduction To Load Orders</h3>
-<p>This appendix provides a general overview of load ordering in the games LOOT supports for those who are unfamiliar with the concept. For simplicity, <q>the game</q> will be used when the text refers to any of the games that LOOT supports.
-<p>Mod plugins for the game are files that end in <code>.esp</code> or <code>.esm</code>. These files are created by the game's official editing tools, or by third-party modders' tools. They contain various data <em>records</em>, which  cover almost all aspects of what is in the game &ndash; NPCs, items, races, interiors, worlds, quests, etc. &ndash; and can either be new or changes to the records added by another plugin.
-<p>When the game is run, it loads each installed plugin one by one in a certain <em>load order</em>. The load order is important for two reasons:
-<ul>
-<li>If one plugin changes a record added by another plugin, the former must load after the latter. If it doesn't, the game will crash on launch.
-<li>The game can only apply one version of a record, so if multiple plugins contain the same record, the last-loaded plugin's version overrides all others. This is known as the <em>rule of one</em>, and it holds true for almost all record types. Some overrides can cause problems in-game, and a good load order is one that arranges plugins to avoid such problems.
-</ul>
-<p>There are a few hardcoded rules related to load order:
-<ul>
- <li>Master plugins always load before non-master plugins. The difference between the two plugin types isn't really relevant, except that a plugin's type is decided by a setting inside it, and not by its file extension (even though <code>.esm</code> stands for Elder Scrolls Master).
- <li>There is a limit of 255 active plugins that can be loaded by the game. This isn't strictly a load <em>order</em> thing, but is worth mentioning.
- <li>In Skyrim, <code>Skyrim.esm</code> always loads before all other plugins.
- <li>In Skyrim, if <code>Update.esm</code> is present, it is always loaded. It loads after all other master plugins, unless it has another position explicitly set.
-</ul>
-<p>A plugin's position in the load order is often displayed by mod managers as a hexadecimal number, from 00 to FE (0 to 255 in decimal). The plugin with position 00 loads first, and the plugin with position FE is loaded last. Hexadecimal numbers are used to display the load order positions of plugins because these numbers form the first two digits of the code that the game uses to reference the records that the plugin adds, so knowing the numbers allows modders and mod users to determine from which plugin a record is from.
-<p>In Oblivion, Fallout 3 and Fallout: New Vegas, load order is determined by plugin timestamps, and the plugins you have accessed are listed in <code>%LOCALAPPDATA%\&lt;game&gt;\plugins.txt</code>. As such, it's best to use a mod manager to create a backup of your load order. In Skyrim, the load order of active plugins is stored in <code>%LOCALAPPDATA%\&lt;game&gt;\plugins.txt</code>, and modding utilities generally use <code>%LOCALAPPDATA%\&lt;game&gt;\loadorder.txt</code> to store the load order of all plugins. This makes backing up your load order as easy as making copies of those two files.
-
-<h3 id="appendix-dirty">Dirty Edits, Mod Cleaning &amp; CRCs</h3>
-<p>Dirty edits are often a side-effect of mod creation, and are often due to bugs in the utilities Bethesda has provided to create mods, rather than bad practice by mod authors. Dirty edits can cause a wide range of issues, including incorrect game settings, missing content, broken quests and crashing to desktop. The more dirty edits there are in a mod, and the more mods with dirty edits you use, the more likely you are to experience issues.
-<p>Thankfully there is a way to remove dirty edits from mods relatively easily, a process known as <i>mod cleaning</i>, using TES4Edit, FO3Edit,  FNVEdit or TES5Edit (for Oblivion, Fallout 3, Fallout: New Vegas and Skyrim respectively). Detailed instructions and information on mod cleaning are available for <a href="http://cs.elderscrolls.com/constwiki/index.php/TES4Edit_Cleaning_Guide">Oblivion</a> and <a href="http://www.creationkit.com/TES5Edit_Cleaning_Guide_-_TES5Edit">Skyrim</a>, with the process being largely the same for the others.
-<p>The problem of dirty edits is largely a problem of ignorance on the part of mod authors and users alike of the problems dirty mods can cause. As such, there are community efforts to raise awareness of dirty edits and cleaning. LOOT plays a key role in these efforts, as it holds the complete list of all known dirty mods (as does BOSS), and it uses this information to provide notification messages to users for any dirty mods they have installed.
-<p>LOOT identifies and describes unclean plugins using four key pieces of information. They are:
-<ul>
-    <li><i><abbr title="Cyclic Redundancy Check">CRC</abbr> value</i>: CRC values are a highly accurate way of identifying files based on their contents, as if the contents change, so does the CRC value. LOOT identifies an unclean plugin by comparing the installed plugin's CRC value against the CRC values for known unclean versions of that plugin. This identification method has the limitation that it can't detect unclean plugins that aren't already known as such, and won't detect unclean but edited plugins, but it's a lot faster than actually checking for dirty edits in the plugin.
-    <li><i><abbr title="Identical To Master">ITM</abbr> Count</i>: ITM records are a type of dirty edit where a mod has overwritten something in the game without actually changing anything. If another mod higher up in the load order makes an intentional change to that thing, it will have its effect cancelled out by the ITM record, which can cause problems. The ITM count is the number of ITM records found and corrected in the mod plugin.
-    <li><i><abbr title="Undeleted and Disabled Reference">UDR</abbr> Count</i>: Deleting records is a significant cause of crashes and game bugs. UDRs are records that the mod deleted from the game or from another mod that have been corrected safely by undeleting them and disabling them instead, which has the same intended effect without causing issues. The UDR count is the number of deleted reference records found and corrected in the mod plugin.
-    <li><i>Deleted Navmesh Count</i>: Like deleting records, deleting navmeshes can cause crashes. However, these cannot be automatically corrected, and require manual cleaning. Navmeshes don't exist in Oblivion, so this information doesn't apply.
-</ul>
-<p>In addition to the above, there is another type of dirty edit known as a <em>wild edit</em>. These are any edit that is unrelated to the purpose of the mod, and so provide unnecessary opportunity for conflicts with other mods that do need to change the same thing. It can be difficult to tell if an edit is a wild edit, and so they cannot be automatically cleaned. LOOT can still notify users of wild edits and link to information on fixing them if the CRCs of plugins with wild edits are reported, along with details on what needs cleaning.
-<p>LOOT and the modding communities rely on user contribution of this information to progress. For information on how to contribute, see <a href="#contrib">Contributing To LOOT</a>. If you find that a mod contains dirty edits, you should also report this to the mod's author so that they can fix it.
-<p><b>Note:</b> TES4Edit et al. will include a variety of <em>junk records</em> in the ITM count for a plugin, such as new empty cells that are automatically generated and are almost impossible to remove. These junk records are non-harmful, and LOOT may inform users when a mod contains these and no true ITMs to avoid confusion.
-
-<h3 id="appendix-permissions">File Permissions</h3>
-<p>If you are running Windows Vista or a later version of Windows, LOOT (and other modding programs) may be prevented from working correctly by the UAC security feature. There are four common workarounds to this problem:
-<ol>
-    <li>Install the game outside the <q>Program Files</q> (or <q>Program Files (x86)</q> if on 64-bit Windows). UAC prevents unauthorised edits to these folders, so by installing the game outside of them, you remove it from UAC's reach, allowing you to use mods more easily.
-    <li>Deactivate UAC. This can be done from the Control Panel, and will turn UAC off across the whole of your computer. It is up to you whether you feel that you have adequate security measures in place to do this without risk.
-    <li>Give yourself <q>Full Control</q> permissions over your game install folder. This will allow you to make any edits you desire while keeping UAC active and on guard for any edits made by programs you do not run, and also means that you do not need to reinstall your game to a new location.
-    <li>Run LOOT as an Administrator. Right-click the LOOT executable, or the shortcut if launching from a shortcut, and select <q>Run as administrator</q>.
-</ol>
-<p>For those that wish to take the third option and give themselves <q>Full Control</q> permissions, here is a guide:
-<ol>
-    <li>Right-click the folder you wish to change the permissions for, and select <q>Properties</q>.
-    <li>In <q>Properties</q>, select the <q>Security</q> tab, and click the <q>Edit...</q> button. A UAC prompt may appear, simply allow yourself to continue.
-    <li>In the <q>Group or user names</q> box, select the <q>Users</q> option.
-    <li>In the lower box, check the box opposite <q>Full Control</q> in the <q>Allow</q> column. Press OK to exit. If a UAC prompt appears, allow the change.
-    <li>In the <q>Properties</q> window, select OK to exit. You should now have Full Control permissions over your chosen folder.
-</ol>
 
 <h2 id="history">Version History</h2>
 <p>Only program history is recorded here. The masterlists are updated far too frequently for their changes to be concisely recorded here, but a full history of changes to them may be viewed by browsing the GitHub repositories.
 
-<h3>0.6.0 - <i>05 July 2014</i></h3>
+<h3>0.7.0 - <i>X Y 2015</i></h3>
+<h4>Fixes</h4>
 <ul>
-    <li>Fixed: The uninstaller not removing the Git repositories used to update the masterlists.
-    <li>Fixed: Miscellaneous crashes due to uncaught exceptions.
-    <li>Fixed: Plugin priorities are now temporarily "inherited" during sorting so that a plugin with a low priority that is made via metadata to load after a plugin with a high priority doesn't cause other plugins with lower priorities to be positioned incorrectly.
-    <li>Fixed: The default language is now correctly set to English.
-    <li>Fixed: Defaults for the online masterlist repository used for Nehrim.
-    <li>Fixed: Endless sorting loop that occurred if some user metadata was disabled.
-    <li>Added: Display of masterlist revision date in reports.
-    <li>Added: Report filter for inactive plugin messages.
-    <li>Added: The number of dirty plugins, active plugins and plugins in total to the report summary.
-    <li>Added: A find dialog to the report viewer, initiated using the <code>Ctrl-F</code> keyboard shortcut.
-    <li>Added: LOOT's windows now remember their last position and size.
-    <li>Added: Command line parameter for selecting the game LOOT should run for.
-    <li>Added: Finnish translation.
-    <li>Removed: Support for Windows XP.
-	<li>Removed: Support for loading BOSS masterlists using the API. This was a leftover from when LOOT was BOSSv3 and backwards compatibility was an issue.
-    <li>Removed: The ability to open reports in an external browser. This was necessitated by the changes to report generation.
-    <li>Removed: The MSVC 2013 redistributable requirement.
-    <li>Removed: The "None Specified" language option is no longer available: English is the new default.
-    <li>Changed: Unified and improved the metadata editors launched during and outside of sorting.
+    <li>The <code>settings.yaml</code> included with the installer was very old.
+    <li>Inactive incompatibilities were displayed as error messages. They are now displayed as warnings.
+    <li>Masterlist entries that matched the same plugin were not being merged. Now one exact match and any number of regex matches will be merged.
+    <li>Masterlist updating failed when a fast-forward merge was not possible (eg. when remote has been rebased, or a different repository is used). Such cases are now handled by deleting the local repository and re-cloning the remote.
+    <li>Masterlists would not 'update' to older revisions. This can be useful for testing, so now they can do so.
+    <li>Crashes when trying to read corrupt plugins and after masterlist update completion.
+    <li>Plugins with non-ASCII description text would cause <code>codecvt to wstring</code> errors.
+    <li>LOOT would accept any file with a <code>.esp</code> or <code>.esm</code> extension as a plugin. It now checks more thoroughly, by attempting to parse such files' headers.
+    <li>LOOT would only detect Skyrim plugins as loading BSAs. Plugins for the other games that also load BSAs are now correctly detected as such.
+</ul>
+<h4>Additions</h4>
+<ul>
+    <li>Danish translation.
+    <li>If LOOT can't detect any installed games, it now launches to the settings dialog, where the game settings can be edited to allow a game to be detected.
+    <li><q>Copy Content</q> menu item to copy the plugin list and all information it contains to the clipboard as YAML-formatted text.
+    <li>A <q>Refresh Content</q> item has been added to the main menu, which re-scans plugin headers and updates LOOT's content.
+    <li>LOOT is now built with High DPI display support.
+    <li>Masterlist updates can now be performed independently of sorting.
+    <li>A <q>First-Time Tips</q> dialog will be displayed on the first run of any particular version of LOOT.
+    <li>Attempting to close LOOT with an unapplied sorted load order or an open plugin editor will trigger a confirmation dialog.
+    <li>Support for GitHub Flavored Markdown in messages, minus features specific to the GitHub site, such as @mentions and emoji.
+    <li>Support for message content substitution metadata syntax in the masterlist.
+    <li>Display of LOOT's build revision has been added to the <q>About</q> dialog.
+    <li>Plugin location metadata can now be added through the user interface.
+    <li>A content filter, which hides plugins that don't have the filter text present in their filenames, versions, CRCs, Bash Tags or messages.
+</ul>
+<h4>Changes</h4>
+<ul>
+    <li>New single-window HTML5-based interface, based on Google's Material Design.
+    <li>LOOT's calculated load orders are now more intuitive: an additional constraint was added so that plugins will be placed in alphabetical order so long as doing so does not violate any of the other constraints.
+    <li>LOOT now parses the masterlist and plugin headers on startup, and the resulting content is displayed with the plugins in their current load order.
+    <li>Each plugin now has its own editor, and multiple editors can be opened at once.
+    <li>Drag 'n' drop of plugins from the sidebar into metadata editor tables no longer requires the conflicts filter to be enabled.
+    <li>CRCs are calculated during conflict filtering or sorting, so are not displayed until either process has been performed.
+    <li>The <q>View Debug Log</q> menu item has been replaced with a <q>Open Debug Log Location</q> menu item to make it easier to upload the file itself.
+    <li>Debug logging control has been simplified to enable/disable, replacing the <q>Debug Verbosity</q> setting with an <q>Enable Debug Logging</q> checkbox.
+    <li>Changes to game settings now take immediate effect.
+    <li>Masterlist updating now exits earlier if the masterlist is already up-to-date.
+    <li>Masterlist revisions are now displayed using the shortest unique substring that is at least 7 characters long.
+    <li>Making edits to plugin metadata before applying a calculated load order no longer causes LOOT to recalculate the load order. Instead, the displayed load order is applied, and the metadata edits will be applied the next time sorting is performed.
+    <li>All references to <q>UDRs</q> have been replaced by the more technically-correct <q>Deleted References</q> term.
+    <li>The <q>Hide inactive plugin messages</q> filter has been replaced by a <q>Hide inactive plugins</q> filter.
+    <li>New icon!
+    <li>Copied metadata is now wrapped in BBCode <code>[spoiler][code]...[/code][/spoiler]</code> tags for easier pasting into forum posts.
+    <li>The Summary and General Messages cards have been combined into a General Information card.
+</ul>
+<h4>Removals</h4>
+<ul>
+    <li>Messages with multiple language strings can no longer be created through the user interface. User-added multiple-language messages will be converted to single-language strings if their plugin's editor is opened then closed using the <q>OK</q> button.
+    <li>The <q>Copy Name</q> menu item has been removed, as plugin names can now be selected and copied using <code>Ctrl-C</code>.
+    <li>As LOOT no longer generates reports, it doesn't save them either.
+</ul>
+<h4>API</h4>
+<ul>
+    <li>Fixed some documentation errors.
+    <li>Fixed the API creating a LOOT folder when being initialised.
+    <li>Fixed false successes for <code>loot_create_db()</code> when invalid paths were supplied.
+    <li>Fixed <code>loot_load_lists()</code> ignoring userlist paths, and accepting invalid paths.
+    <li>Fixed <code>loot_eval_lists()</code> accepting invalid language codes.
+    <li>Fixed <code>loot_get_dirty_info()</code> never outputting the <code>loot_needs_cleaning_no</code> code.
+    <li>Fixed <code>loot_write_minimal_list()</code> causing a crash when passed an invalid output path.
+    <li>Added load order sorting and application functions.
+    <li>Added masterlist update and revision checking functions.
+    <li>Added support for native Linux builds.
+    <li>Added unit testing of API functions to help ensure correctness and consistency of functionality.
+    <li>Added <code>loot_get_build_id()</code>, which outputs the shortened revision ID that the API was built from.
+</ul>
+
+<h3>0.6.1 - <i>22 December 2014</i></h3>
+<ul>
+    <li>Fixed: Default Nehrim registry entry path.
+    <li>Fixed: Messages in the wrong language being selected.
+    <li>Fixed: LOOT windows opening off-screen if the screen area had been changed since last run.
+    <li>Fixed: Read-only <code>.git</code> folders preventing repository deletion.
+    <li>Fixed: Unnecessary plugins in cyclic dependency error messages.
+    <li>Fixed: Bash Tag suggestions displaying incorrectly.
+    <li>Fixed: The current game can no longer be deleted from the settings window.
+    <li>Fixed: Plugin metadata being lost when the settings window was exited with the "OK" button, leading to possible condition evaluation issues.
+    <li>Fixed: A blank report bug when running on systems which don't have Internet Explorer 11 installed.
+    <li>Fixed: Reports appearing empty of all content when no global messages are to be displayed.
+    <li>Changed: Updated Boost (1.57.0), libgit2 (0.21.3), wxWidgets (3.0.2) and libloadorder (6.0.3) dependencies. <b>This includes a critical security vulnerability fix in libgit2</b>.
+    <li>Changed: The game menu is now updated when the settings window is exited with the "OK" button.
+    <li>Changed: Updated Russian translation.
+    <li>Changed: Updated Brazilian Portuguese translation.
+    <li>Added: German translation.
+    <li>Added: The Large Address Aware flag to the LOOT executable.
+</ul>
+
+<h3>0.6.0 - <i>05 July 2014</i></h3>
+<h4>Fixes</h4>
+<ul>
+    <li>The uninstaller not removing the Git repositories used to update the masterlists.
+    <li>Miscellaneous crashes due to uncaught exceptions.
+    <li>Plugin priorities are now temporarily "inherited" during sorting so that a plugin with a low priority that is made via metadata to load after a plugin with a high priority doesn't cause other plugins with lower priorities to be positioned incorrectly.
+    <li>The default language is now correctly set to English.
+    <li>Defaults for the online masterlist repository used for Nehrim.
+    <li>Endless sorting loop that occurred if some user metadata was disabled.
+</ul>
+<h4>Additions</h4>
+<ul>
+    <li>Display of masterlist revision date in reports.
+    <li>Report filter for inactive plugin messages.
+    <li>The number of dirty plugins, active plugins and plugins in total to the report summary.
+    <li>A find dialog to the report viewer, initiated using the <code>Ctrl-F</code> keyboard shortcut.
+    <li>LOOT's windows now remember their last position and size.
+    <li>Command line parameter for selecting the game LOOT should run for.
+    <li>Finnish translation.
+</ul>
+<h4>Removals</h4>
+<ul>
+    <li>Support for Windows XP.
+    <li>Support for loading BOSS masterlists using the API. This was a leftover from when LOOT was BOSSv3 and backwards compatibility was an issue.
+    <li>The ability to open reports in an external browser. This was necessitated by the changes to report generation.
+    <li>The MSVC 2013 redistributable requirement.
+    <li>The "None Specified" language option is no longer available: English is the new default.
+</ul>
+<h4>Changes</h4>
+<ul>
+    <li>Unified and improved the metadata editors launched during and outside of sorting.
     <ul>
         <li>The metadata editor now resizes more appropriately.
         <li>The mid-sorting instance hides the requirement, incompatibility, Bash Tags, dirty info and message lists.
@@ -474,44 +659,17 @@ A copy of the license is included in the file named "GNU FDL v1.3.txt".</blockqu
         <li>Checkboxes have been added to set whether or not a priority value is "global". The UI also now displays the priority value used in comparisons (ie. with the millions and higher digits omitted).
         <li>A right-click menu command for clearing all user-added metadata for all plugins has been added to the metadata editor.
     </ul>
-    <li>Changed: Missing master/requirement and incompatibility errors are downgraded to warnings if the plugin in question is inactive.
-    <li>Changed: Masterlist update errors have been made more user-friendly.
-    <li>Changed: If an error is encountered during masterlist update, LOOT will now silently delete the repository folder and attempt the update again. If it fails again, it will then report an error.
-    <li>Changed: Masterlist update now handles repository interaction a lot more like Git itself does, so should be less error-prone.
-    <li>Changed: Cyclic dependency error messages now detail the full cycle.
-    <li>Changed: LOOT's report now uses a static HTML file and generates a javascript file that is dynamically loaded to contain the report data. This removes the PugiXML build dependency.
-    <li>Changed: Debug log message priorities adjusted so that medium verbosity includes more useful data.
-    <li>Changed: Updated dependencies: libgit2 (v0.21.0), wxWidgets (v3.0.1), libloadorder (latest), libespm (latest).
+    <li>Missing master/requirement and incompatibility errors are downgraded to warnings if the plugin in question is inactive.
+    <li>Masterlist update errors have been made more user-friendly.
+    <li>If an error is encountered during masterlist update, LOOT will now silently delete the repository folder and attempt the update again. If it fails again, it will then report an error.
+    <li>Masterlist update now handles repository interaction a lot more like Git itself does, so should be less error-prone.
+    <li>Cyclic dependency error messages now detail the full cycle.
+    <li>LOOT's report now uses a static HTML file and generates a javascript file that is dynamically loaded to contain the report data. This removes the PugiXML build dependency.
+    <li>Debug log message priorities adjusted so that medium verbosity includes more useful data.
+    <li>Updated dependencies: libgit2 (v0.21.0), wxWidgets (v3.0.1), libloadorder (latest), libespm (latest).
 </ul>
 
 <h3>0.5.0 - <i>31 March 2014</i></h3>
 <ul>
-	<li>Initial release.
+    <li>Initial release.
 </ul>
-
-<script>
-"use strict";
-function nextImage(imgs, i){
-    for(var i=0;i<imgs.length;i++){
-        if(imgs[i].style.opacity=='1' || imgs[i].style.opacity==''){
-            imgs[i].style.opacity='0';
-            if(i+1<imgs.length){
-                imgs[i+1].style.opacity='1';
-            }else{
-                imgs[0].style.opacity='1';
-            }
-            break;
-        }
-    }
-    var t=setTimeout(nextImage, 5000, imgs);
-}
-
-var figures = document.getElementsByTagName('figure');
-if(figures!=null){
-    for (var i=0; i < figures.length; i++) {
-        if (figures[i].className == 'slideshow'){
-            var t=setTimeout(nextImage,5000, figures[i].getElementsByTagName('img'));
-        }
-    }
-}
-</script>
diff --git a/docs/dev/images/confirm-1.png b/docs/dev/images/confirm-1.png
deleted file mode 100644
index 753c5ea..0000000
Binary files a/docs/dev/images/confirm-1.png and /dev/null differ
diff --git a/docs/dev/images/confirm-2.png b/docs/dev/images/confirm-2.png
deleted file mode 100644
index 0f7af96..0000000
Binary files a/docs/dev/images/confirm-2.png and /dev/null differ
diff --git a/docs/dev/images/confirm.png b/docs/dev/images/confirm.png
deleted file mode 100644
index 39513ea..0000000
Binary files a/docs/dev/images/confirm.png and /dev/null differ
diff --git a/docs/dev/images/editor.png b/docs/dev/images/editor.png
deleted file mode 100644
index b4dfcb5..0000000
Binary files a/docs/dev/images/editor.png and /dev/null differ
diff --git a/docs/dev/images/main.png b/docs/dev/images/main.png
index 8419ccd..0b24918 100644
Binary files a/docs/dev/images/main.png and b/docs/dev/images/main.png differ
diff --git a/docs/dev/images/settings.png b/docs/dev/images/settings.png
index 3d30c08..ba0c1b5 100644
Binary files a/docs/dev/images/settings.png and b/docs/dev/images/settings.png differ
diff --git a/docs/dev/images/viewer-1.png b/docs/dev/images/viewer-1.png
deleted file mode 100644
index 04089c4..0000000
Binary files a/docs/dev/images/viewer-1.png and /dev/null differ
diff --git a/docs/dev/images/viewer-2.png b/docs/dev/images/viewer-2.png
deleted file mode 100644
index ed381a8..0000000
Binary files a/docs/dev/images/viewer-2.png and /dev/null differ
diff --git a/docs/dev/licenses/Apache License v2.0.txt b/docs/dev/licenses/Apache License v2.0.txt
deleted file mode 100644
index a16c46a..0000000
--- a/docs/dev/licenses/Apache License v2.0.txt	
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/docs/dev/licenses/BSD License (Chromium Embedded Framework).txt b/docs/dev/licenses/BSD License (Chromium Embedded Framework).txt
new file mode 100644
index 0000000..a5d84ad
--- /dev/null
+++ b/docs/dev/licenses/BSD License (Chromium Embedded Framework).txt	
@@ -0,0 +1,29 @@
+// Copyright (c) 2008-2013 Marshall A. Greenblatt. Portions Copyright (c)
+// 2006-2009 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dev/licenses/BSD License (Polymer).txt b/docs/dev/licenses/BSD License (Polymer).txt
new file mode 100644
index 0000000..95987ba
--- /dev/null
+++ b/docs/dev/licenses/BSD License (Polymer).txt	
@@ -0,0 +1,27 @@
+// Copyright (c) 2014 The Polymer Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/dev/licenses/GNU GPL v2 (libgit2).txt b/docs/dev/licenses/GNU GPL v2 (libgit2).txt
index d1ca4d4..e0fed07 100644
--- a/docs/dev/licenses/GNU GPL v2 (libgit2).txt	
+++ b/docs/dev/licenses/GNU GPL v2 (libgit2).txt	
@@ -7,7 +7,7 @@
 
 ----------------------------------------------------------------------
 
-			LINKING EXCEPTION
+                        LINKING EXCEPTION
 
  In addition to the permissions in the GNU General Public License,
  the authors give you unlimited permission to link the compiled
@@ -20,15 +20,15 @@
 
 ----------------------------------------------------------------------
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -78,7 +78,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -277,7 +277,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -299,9 +299,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -391,12 +391,12 @@ Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
 The priority queue implementation is based on code licensed under the
 Apache 2.0 license:
 
-	Copyright 2010 Volkan Yazıcı <volkan.yazici@gmail.com>
-	Copyright 2006-2010 The Apache Software Foundation
+        Copyright 2010 Volkan Yazıcı <volkan.yazici@gmail.com>
+        Copyright 2006-2010 The Apache Software Foundation
 
 The full text of the Apache 2.0 license is available at:
 
-	http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
 ----------------------------------------------------------------------
 
diff --git a/docs/dev/licenses/Licenses.txt b/docs/dev/licenses/Licenses.txt
index 07dd003..4459c89 100644
--- a/docs/dev/licenses/Licenses.txt
+++ b/docs/dev/licenses/Licenses.txt
@@ -4,13 +4,15 @@ LOOT uses a number of libraries, and their licenses are listed in this file.
 
 * Alphanum - zlib license; the text is not included as allowed by the license.
 * Boost - Boost Software License v1.0; see "Boost Software License v1.0.txt" for the text.
+* Chromium Embedded Framework - BSD license; see "BSD License (Chromium Embedded Framework).txt" for the text.
+* Jed - WTFPL; the text is not included as allowed by the license.
+* Jed Gettext Parser - MIT License; see "MIT License (Jed Gettext Parser).txt" for the text.
 * Libespm - GNU GPL v3; see "GNU GPL v3.txt" for the text.
 * Libgit2 - GNU GPL v2; see "GNU GPL v2 (libgit2).txt" for the text.
 * Libloadorder - GNU GPL v3; see "GNU GPL v3.txt" for the text.
-* Polyfill.js - This code has been placed in the public domain.
+* Marked - MIT License; see "MIT License (Marked).txt" for the text.
+* Polymer - BSD license; see "BSD License (Polymer).txt" for the text.
 * RequireJS - MIT License; see "MIT License (RequireJS).txt" for the text.
-* wxWidgets - wxWindows License; the text is not included as allowed by the license.
 * yaml-cpp - MIT License; see "MIT License (yaml-cpp).txt" for the text.
-* zlib - zlib license; the text is not included as allowed by the license.
 
 Source code for all libraries and binaries can be found on the websites linked to in the main LOOT readme.
diff --git a/docs/dev/licenses/MIT License (Jed Gettext Parser).txt b/docs/dev/licenses/MIT License (Jed Gettext Parser).txt
new file mode 100644
index 0000000..4262699
--- /dev/null
+++ b/docs/dev/licenses/MIT License (Jed Gettext Parser).txt	
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Oliver Hamlet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/docs/dev/licenses/MIT License (Marked).txt b/docs/dev/licenses/MIT License (Marked).txt
new file mode 100644
index 0000000..a7b812e
--- /dev/null
+++ b/docs/dev/licenses/MIT License (Marked).txt	
@@ -0,0 +1,19 @@
+Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/docs/dev/licenses/MIT License (PugiXML).txt b/docs/dev/licenses/MIT License (PugiXML).txt
deleted file mode 100644
index 03459ba..0000000
--- a/docs/dev/licenses/MIT License (PugiXML).txt	
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2006-2012 Arseny Kapoulkine
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.