diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c1042f0..2f388d36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,24 +7,14 @@
 # Get Build Revision
 ##############################
 
-# Uses the CMake module in this repo: https://github.com/rpavlik/cmake-modules
-# On Windows, this requires Git for Windows to be installed.
+find_package(Git)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
-include(GetGitRevisionDescription OPTIONAL RESULT_VARIABLE GIT_MODULE_PATH)
-IF (NOT GIT_MODULE_PATH MATCHES "NOTFOUND")
-    get_git_head_revision(GIT_REFSPEC GIT_COMMIT_STRING --tags --long)
-
-    IF (GIT_COMMIT_STRING MATCHES "GITDIR-NOTFOUND")
-        set(GIT_COMMIT_STRING "unknown")
-    ELSE ()
-        # Get a shortened ID. Although knowing the shortest unique string requires Git,
-        # 8 characters should be a good compromise between chance of ambiguity and length,
-        # especially since the version numbers would narrow down the range of possibly
-        # ambiguous commits.
-        string(SUBSTRING ${GIT_COMMIT_STRING} 0 8 GIT_COMMIT_STRING)
-    ENDIF ()
-ELSE ()
+IF (GIT_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+                  OUTPUT_VARIABLE GIT_COMMIT_STRING
+                  ERROR_QUIET
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+ELSE()
     SET (GIT_COMMIT_STRING "unknown")
 ENDIF ()
 
@@ -92,7 +82,6 @@ find_package(GTest)
 
 set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/file.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/metadata/formid.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/location.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/message.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/message_content.cpp"
@@ -106,7 +95,6 @@ set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.c
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/git_helper.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.cpp"
@@ -117,7 +105,6 @@ set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.c
 set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/metadata/condition_grammar.h"
 				"${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/file.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/metadata/formid.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/location.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/message.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata/message_content.h"
@@ -131,7 +118,6 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/metadata/condition_grammar.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/metadata_list.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/git_helper.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.h"
@@ -190,7 +176,6 @@ set (LOOT_TESTS_HEADERS "${CMAKE_SOURCE_DIR}/src/tests/fixtures.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_condition_grammar.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_conditional_metadata.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_file.h"
-                        "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_formid.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_location.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_message.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_message_content.h"
@@ -198,7 +183,6 @@ set (LOOT_TESTS_HEADERS "${CMAKE_SOURCE_DIR}/src/tests/fixtures.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_plugin_metadata.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_tag.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/plugin/test_plugin.h"
-                        "${CMAKE_SOURCE_DIR}/src/tests/backend/plugin/test_plugin_loader.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/test_metadata_list.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/test_masterlist.h"
                         "${CMAKE_SOURCE_DIR}/src/tests/backend/test_plugin_sorter.h")
@@ -373,12 +357,19 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Windows")
     )
 
     # Copy CEF binaries.
-    FOREACH(cef_dll libcef.dll natives_blob.bin snapshot_blob.bin d3dcompiler_47.dll libEGL.dll libGLESv2.dll wow_helper.exe)
+    FOREACH(cef_dll libcef.dll natives_blob.bin snapshot_blob.bin d3dcompiler_47.dll libEGL.dll libGLESv2.dll)
         add_custom_command(TARGET LOOT POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                 "${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$<CONFIGURATION>/${cef_dll}"
                 $<TARGET_FILE_DIR:LOOT>/${cef_dll})
     ENDFOREACH()
+
+    IF (PROJECT_ARCH MATCHES "32")
+        add_custom_command(TARGET LOOT POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${CMAKE_SOURCE_DIR}/${CEF_ROOT}/$<CONFIGURATION>/wow_helper.exe"
+                $<TARGET_FILE_DIR:LOOT>/wow_helper.exe)
+    ENDIF ()
 ELSE ()
     # Copy CEF binaries.
     FOREACH(cef_dll libcef.so natives_blob.bin snapshot_blob.bin chrome-sandbox)
diff --git a/README.md b/README.md
index 748a9bab..1cdf4a43 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ LOOT requires the following C/C++ libraries (version numbers used in latest deve
 * [Boost](http://www.boost.org) v1.59.0
 * [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) branch 2454: Required to build the GUI, but not the API or tests.
 * [Google Test](https://github.com/google/googletest) v1.7: Required to build the tests, but not the API or the GUI.
-* [Libespm](http://github.com/WrinklyNinja/libespm) v1.0.0
-* [Libgit2](http://libgit2.github.com/) v0.23.3
-* [Libloadorder](http://github.com/WrinklyNinja/libloadorder) revision 50342d7
+* [Libespm](http://github.com/WrinklyNinja/libespm) v2.5.0
+* [Libgit2](http://libgit2.github.com/) v0.23.4
+* [Libloadorder](http://github.com/WrinklyNinja/libloadorder) revision 3a7d694
 * [Pseudosem](http://github.com/WrinklyNinja/pseudosem): v1.0.1
 * [yaml-cpp](http://github.com/WrinklyNinja/yaml-cpp): Use the `patched-for-loot` branch.
 
diff --git a/docs/BUILD.MSVC.md b/docs/BUILD.MSVC.md
index 899a0669..14ac4647 100644
--- a/docs/BUILD.MSVC.md
+++ b/docs/BUILD.MSVC.md
@@ -67,8 +67,6 @@ Example CMake keys: `-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=build -DCMAKE_ARCHIVE_OUTP
 
 #### LOOT
 
-LOOT uses a third-party CMake module to generate its build revision data, so first download the `GetGitRevisionDescription.cmake` and `GetGitRevisionDescription.cmake.in` files found in [this repository](https://github.com/rpavlik/cmake-modules) to the `build` subdirectory of the LOOT folder.
-
 1. Set CMake up so that it builds the binaries in the `build` subdirectory of the LOOT folder.
 2. Define any necessary parameters.
 3. Configure CMake, then generate a build system for Visual Studio 12.
diff --git a/docs/LOOT Metadata Syntax.html b/docs/LOOT Metadata Syntax.html
index 8e5645d7..c6a1ee99 100644
--- a/docs/LOOT Metadata Syntax.html	
+++ b/docs/LOOT Metadata Syntax.html	
@@ -165,7 +165,8 @@ var {
 </style>
 <!--  LOOT
 
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and Fallout: New Vegas.
+    A load order optimisation tool for Oblivion, Skyrim, Fallout 3,
+    Fallout: New Vegas and Fallout 4.
 
     Copyright (C) 2012–2015    WrinklyNinja
 
diff --git a/docs/LOOT Readme.html b/docs/LOOT Readme.html
index 489209f1..c1350c50 100644
--- a/docs/LOOT Readme.html	
+++ b/docs/LOOT Readme.html	
@@ -165,7 +165,8 @@ var {
 </style>
 <!--  LOOT
 
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and Fallout: New Vegas.
+    A load order optimisation tool for Oblivion, Skyrim, Fallout 3,
+    Fallout: New Vegas and Fallout 4.
 
     Copyright (C) 2012–2015    WrinklyNinja
 
@@ -211,7 +212,7 @@ var {
 
 <h2 id="intro">Introduction</h2>
 
-<p>LOOT is a plugin load order optimiser for TES IV: Oblivion, TES V: Skyrim, Fallout 3 and Fallout: New Vegas. It is designed to assist mod users in avoiding detrimental conflicts, by automatically calculating a load order that satisfies all plugin dependencies and maximises each plugin's impact on the user's game.
+<p>LOOT is a plugin load order optimiser for TES IV: Oblivion, TES V: Skyrim, Fallout 3, Fallout: New Vegas and Fallout 4. It is designed to assist mod users in avoiding detrimental conflicts, by automatically calculating a load order that satisfies all plugin dependencies and maximises each plugin's impact on the user's game.
 
 <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.
 
@@ -239,7 +240,7 @@ var {
 
 <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>--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>LOOT can also be launched with the <code>--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>, <code>FalloutNV</code> and <code>Fallout4</code>.
 
 <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.
 
@@ -315,7 +316,7 @@ var {
     <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>Loads Archive</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>
@@ -444,7 +445,7 @@ var {
         <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>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>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, Fallout 4) when it is next run.
 
 <p>The game settings are explained in the table below.
 <table>
@@ -458,9 +459,10 @@ var {
             <li>TES V: Skyrim
             <li>Fallout 3
             <li>Fallout: New Vegas
+            <li>Fallout 4
         </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>Master File<td>The game's main master file. This is checked for when detecting if the game is installed.
         <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.
diff --git a/include/loot/api.h b/include/loot/api.h
index 10b0f6d7..7af09d88 100644
--- a/include/loot/api.h
+++ b/include/loot/api.h
@@ -246,6 +246,7 @@ extern "C"
     LOOT_API extern const unsigned int loot_game_tes5;  /**< Game code for The Elder Scrolls V: Skyrim. */
     LOOT_API extern const unsigned int loot_game_fo3;  /**< Game code for Fallout 3. */
     LOOT_API extern const unsigned int loot_game_fonv;  /**< Game code for Fallout: New Vegas. */
+    LOOT_API extern const unsigned int loot_game_fo4;  /**< Game code for Fallout: New Vegas. */
 
     /**@}*/
     /**********************************************************************//**
diff --git a/resources/l10n/template.pot b/resources/l10n/template.pot
index fb833b51..3f331d64 100644
--- a/resources/l10n/template.pot
+++ b/resources/l10n/template.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: LOOT v0.7\n"
+"Project-Id-Version: LOOT v0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 18:45+0100\n"
+"POT-Creation-Date: 2015-11-30 18:01+0000\n"
 "PO-Revision-Date: 2015-02-09 21:40-0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -11,271 +11,265 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.2\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Poedit-KeywordsList: translate:1,1t;translate:1c,2,t\n"
-"X-Poedit-Basepath: ../..\n"
+"X-Poedit-Basepath: ../../src\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SearchPath-0: src/backend\n"
-"X-Poedit-SearchPath-1: src/gui\n"
-"X-Poedit-SearchPath-2: resources/report/js\n"
+"X-Poedit-SearchPath-0: backend\n"
+"X-Poedit-SearchPath-1: gui\n"
+"X-Poedit-SearchPath-2: gui/html/js\n"
 
-#: src/backend/game/game.cpp:58
+#: backend/game/game.cpp:58
 msgid "Invalid game ID supplied."
 msgstr ""
 
-#: src/backend/game/game.cpp:65
+#: backend/game/game.cpp:65
 msgid "Game path could not be detected."
 msgstr ""
 
-#: src/backend/game/game.cpp:76
+#: backend/game/game.cpp:76
 msgid "Could not create LOOT folder for game. Details:"
 msgstr ""
 
-#: src/backend/game/game.cpp:179
+#: backend/game/game.cpp:177
 msgid "An exception occurred while loading this plugin. Details:"
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:49
+#: backend/game/load_order_handler.cpp:50
 msgid "Unsupported game ID supplied."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:54
+#: backend/game/load_order_handler.cpp:55
 msgid "Game path is not initialised."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:86
+#: backend/game/load_order_handler.cpp:89
 msgid ""
 "libloadorder failed to create a game handle. Details could not be fetched."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:90
+#: backend/game/load_order_handler.cpp:93
 msgid "libloadorder failed to create a game handle. Details:"
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:107
-msgid ""
-"libloadorder failed to initialise game master file support. Details could "
-"not be fetched."
-msgstr ""
-
-#: src/backend/game/load_order_handler.cpp:111
-msgid "libloadorder failed to initialise game master file support. Details:"
-msgstr ""
-
-#: src/backend/game/load_order_handler.cpp:131
+#: backend/game/load_order_handler.cpp:112
 msgid ""
 "libloadorder failed to get the active plugins list. Details could not be "
 "fetched."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:135
+#: backend/game/load_order_handler.cpp:116
 msgid "libloadorder failed to get the active plugins list. Details:"
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:161
+#: backend/game/load_order_handler.cpp:142
 msgid ""
 "libloadorder failed to get the load order. Details could not be fetched."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:165
+#: backend/game/load_order_handler.cpp:146
 msgid "libloadorder failed to get the load order. Details:"
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:188
+#: backend/game/load_order_handler.cpp:169
 msgid ""
 "libloadorder failed to set the load order. Details could not be fetched."
 msgstr ""
 
-#: src/backend/game/load_order_handler.cpp:192
+#: backend/game/load_order_handler.cpp:173
 msgid "libloadorder failed to set the load order. Details:"
 msgstr ""
 
-#: src/backend/helpers/git_helper.cpp:85
+#: backend/helpers/git_helper.cpp:88
 msgid "Git operation failed. Error: %1%"
 msgstr ""
 
-#: src/backend/helpers/git_helper.cpp:154 src/backend/masterlist.cpp:50
-msgid "Unknown: Git repository missing"
-msgstr ""
-
-#: src/backend/helpers/helpers.cpp:88
-msgid "Unable to open \"%1%\" for CRC calculation."
-msgstr ""
-
-#: src/backend/masterlist.cpp:42
-msgid ""
-"An error occurred while trying to read the local masterlist's version. If "
-"this error happens again, try deleting the \".git\" folder in %1%."
-msgstr ""
-
-#: src/backend/masterlist.cpp:46
-msgid "N/A: No masterlist present"
-msgstr ""
-
-#: src/backend/masterlist.cpp:81 src/backend/masterlist.cpp:82
-msgid "(edited)"
-msgstr ""
-
-#: src/backend/masterlist.cpp:112
+#: backend/helpers/git_helper.cpp:163
 msgid ""
 "An error occurred while trying to clone the remote masterlist repository."
 msgstr ""
 
-#: src/backend/masterlist.cpp:163 src/backend/masterlist.cpp:198
-msgid ""
-"An error occurred while trying to access the local masterlist repository. If "
-"this error happens again, try deleting the \".git\" folder in %1%."
-msgstr ""
-
-#: src/backend/masterlist.cpp:188
+#: backend/helpers/git_helper.cpp:212
 msgid ""
 "An error occurred while trying to update the masterlist. This could be due "
 "to a server-side error. Try again in a few minutes."
 msgstr ""
 
-#: src/backend/masterlist.cpp:332
+#: backend/helpers/git_helper.cpp:324 backend/masterlist.cpp:50
+msgid "Unknown: Git repository missing"
+msgstr ""
+
+#: backend/helpers/helpers.cpp:88
+msgid "Unable to open \"%1%\" for CRC calculation."
+msgstr ""
+
+#: backend/helpers/helpers.cpp:126 backend/helpers/helpers.cpp:129
+msgid "Failed to open file in its default application."
+msgstr ""
+
+#: backend/helpers/helpers.cpp:139
+msgid "Failed to get %LOCALAPPDATA% path."
+msgstr ""
+
+#: backend/masterlist.cpp:42
+msgid ""
+"An error occurred while trying to read the local masterlist's version. If "
+"this error happens again, try deleting the \".git\" folder in %1%."
+msgstr ""
+
+#: backend/masterlist.cpp:46
+msgid "N/A: No masterlist present"
+msgstr ""
+
+#: backend/masterlist.cpp:81 backend/masterlist.cpp:82
+msgid "(edited)"
+msgstr ""
+
+#: backend/masterlist.cpp:119 backend/masterlist.cpp:133
+msgid ""
+"An error occurred while trying to access the local masterlist repository. If "
+"this error happens again, try deleting the \".git\" folder in %1%."
+msgstr ""
+
+#: backend/masterlist.cpp:241
 msgid ""
 "An error occurred while trying to read information on the updated "
 "masterlist. If this error happens again, try deleting the \".git\" folder in "
 "%1%."
 msgstr ""
 
-#: src/backend/masterlist.cpp:403
+#: backend/masterlist.cpp:256
 msgid "Masterlist revision"
 msgstr ""
 
-#: src/backend/masterlist.cpp:407
+#: backend/masterlist.cpp:260
 msgid ""
 "The latest masterlist revision contains a syntax error, LOOT is using the "
 "most recent valid revision instead. Syntax errors are usually minor and "
 "fixed within hours."
 msgstr ""
 
-#: src/backend/metadata/conditional_metadata.cpp:72
-#: src/backend/metadata/conditional_metadata.cpp:104
+#: backend/metadata/conditional_metadata.cpp:72
+#: backend/metadata/conditional_metadata.cpp:104
 msgid "Failed to parse condition \"%1%\": %2%"
 msgstr ""
 
-#: src/backend/metadata/conditional_metadata.cpp:77
-#: src/backend/metadata/conditional_metadata.cpp:109
+#: backend/metadata/conditional_metadata.cpp:77
+#: backend/metadata/conditional_metadata.cpp:109
 msgid "Failed to parse condition \"%1%\"."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:68
+#: backend/metadata/plugin_dirty_info.cpp:68
 msgid ""
 "Contains %1% ITM records, %2% deleted references and %3% deleted navmeshes. "
 "Clean with %4%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:70
+#: backend/metadata/plugin_dirty_info.cpp:70
 msgid "Clean with %1%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:73
+#: backend/metadata/plugin_dirty_info.cpp:73
 msgid ""
 "Contains %1% deleted references and %2% deleted navmeshes. Clean with %3%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:75
+#: backend/metadata/plugin_dirty_info.cpp:75
 msgid "Contains %1% deleted navmeshes. Clean with %2%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:77
+#: backend/metadata/plugin_dirty_info.cpp:77
 msgid "Contains %1% deleted references. Clean with %2%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:80
+#: backend/metadata/plugin_dirty_info.cpp:80
 msgid "Contains %1% ITM records and %2% deleted navmeshes. Clean with %3%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:82
+#: backend/metadata/plugin_dirty_info.cpp:82
 msgid "Contains %1% ITM records. Clean with %2%."
 msgstr ""
 
-#: src/backend/metadata/plugin_dirty_info.cpp:85
+#: backend/metadata/plugin_dirty_info.cpp:85
 msgid "Contains %1% ITM records and %2% deleted references. Clean with %3%."
 msgstr ""
 
-#: src/backend/plugin/plugin.cpp:154
+#: backend/plugin/plugin.cpp:163
 msgid "Cannot read \"%1%\". Details: %2%"
 msgstr ""
 
-#: src/backend/plugin/plugin.cpp:260 src/backend/plugin/plugin.cpp:272
+#: backend/plugin/plugin.cpp:271 backend/plugin/plugin.cpp:283
 msgid "This plugin requires \"%1%\" to be installed, but it is missing."
 msgstr ""
 
-#: src/backend/plugin/plugin.cpp:264
+#: backend/plugin/plugin.cpp:275
 msgid "This plugin requires \"%1%\" to be active, but it is inactive."
 msgstr ""
 
-#: src/backend/plugin/plugin.cpp:278
+#: backend/plugin/plugin.cpp:289
 msgid "This plugin is incompatible with \"%1%\", but both are present."
 msgstr ""
 
-#: src/backend/plugin_sorter.cpp:84
+#: backend/plugin_sorter.cpp:84
 msgid ""
 "Cyclic interaction detected between plugins \"%1%\" and \"%2%\". Back cycle: "
 "%3%"
 msgstr ""
 
-#: src/backend/plugin_sorter.cpp:105
+#: backend/plugin_sorter.cpp:105
 msgid "Building plugin graph..."
 msgstr ""
 
-#: src/backend/plugin_sorter.cpp:115
+#: backend/plugin_sorter.cpp:115
 msgid "Adding edges to plugin graph and performing topological sort..."
 msgstr ""
 
-#: src/backend/plugin_sorter.cpp:210 src/gui/handler.cpp:1062
+#: backend/plugin_sorter.cpp:210 gui/handler.cpp:1056
 msgid "\"%1%\" contains a condition that could not be evaluated. Details: %2%"
 msgstr ""
 
-#: src/gui/handler.cpp:213 src/gui/handler.cpp:217
+#: gui/handler.cpp:216 gui/handler.cpp:220
 msgid "Failed to change game. Details: %1%"
 msgstr ""
 
-#: src/gui/handler.cpp:234 src/gui/handler.cpp:238 src/gui/handler.cpp:332
-#: src/gui/handler.cpp:336 src/gui/handler.cpp:368 src/gui/handler.cpp:372
+#: gui/handler.cpp:237 gui/handler.cpp:241 gui/handler.cpp:335
+#: gui/handler.cpp:339 gui/handler.cpp:371 gui/handler.cpp:375
 msgid "Failed to copy plugin metadata. Details: %1%"
 msgstr ""
 
-#: src/gui/handler.cpp:256 src/gui/handler.cpp:267
+#: gui/handler.cpp:259 gui/handler.cpp:270
 msgid "Failed to apply plugin metadata. Details: %1%"
 msgstr ""
 
-#: src/gui/handler.cpp:404 src/gui/handler.cpp:1000
+#: gui/handler.cpp:407 gui/handler.cpp:994
 msgid "Loading plugin contents..."
 msgstr ""
 
-#: src/gui/handler.cpp:408
+#: gui/handler.cpp:411
 msgid "Checking for conflicting plugins..."
 msgstr ""
 
-#: src/gui/handler.cpp:578 src/gui/handler.cpp:586
-msgid "Shell execute failed."
-msgstr ""
-
-#: src/gui/handler.cpp:644
+#: gui/handler.cpp:639
 msgid "Loading plugin headers..."
 msgstr ""
 
-#: src/gui/handler.cpp:670
+#: gui/handler.cpp:664
 msgid "Parsing masterlist..."
 msgstr ""
 
-#: src/gui/handler.cpp:677
+#: gui/handler.cpp:671
 msgid ""
 "An error occurred while parsing the masterlist: %1%. This probably happened "
 "because an update to LOOT changed its metadata syntax support. Try updating "
 "your masterlist to resolve the error."
 msgstr ""
 
-#: src/gui/handler.cpp:687
+#: gui/handler.cpp:681
 msgid "Parsing userlist..."
 msgstr ""
 
-#: src/gui/handler.cpp:694
+#: gui/handler.cpp:688
 msgid ""
 "An error occurred while parsing the userlist: %1%. This probably happened "
 "because an update to LOOT changed its metadata syntax support. Your user "
@@ -291,649 +285,643 @@ msgid ""
 "[LOOT's website](http://loot.github.io/)."
 msgstr ""
 
-#: src/gui/handler.cpp:731
+#: gui/handler.cpp:725
 msgid "Merging and evaluating plugin metadata..."
 msgstr ""
 
-#: src/gui/handler.cpp:796
+#: gui/handler.cpp:790
 msgid "Loading general messages..."
 msgstr ""
 
-#: src/gui/handler.cpp:825 src/gui/handler.cpp:938
+#: gui/handler.cpp:819 gui/handler.cpp:932
 msgid ""
 "A global message contains a condition that could not be evaluated. Details: "
 "%1%"
 msgstr ""
 
-#: src/gui/handler.cpp:835 src/gui/handler.cpp:839
+#: gui/handler.cpp:829 gui/handler.cpp:833
 msgid "Failed to get game data. Details: %1%"
 msgstr ""
 
-#: src/gui/handler.cpp:858
+#: gui/handler.cpp:852
 msgid "Updating and parsing masterlist..."
 msgstr ""
 
-#: src/gui/handler.cpp:880
+#: gui/handler.cpp:874
 msgid "Regenerating displayed content..."
 msgstr ""
 
-#: src/gui/handler.cpp:951 src/gui/handler.cpp:955
+#: gui/handler.cpp:945 gui/handler.cpp:949
 msgid "Failed to update the masterlist. Details: %1%"
 msgstr ""
 
-#: src/gui/handler.cpp:1035
+#: gui/handler.cpp:1029
 msgid "Failed to sort plugins. Details: %1%"
 msgstr ""
 
-#: src/gui/loot_state.cpp:69
+#: gui/loot_state.cpp:69
 msgid "Error: Could not create LOOT settings file. %1%"
 msgstr ""
 
-#: src/gui/loot_state.cpp:79
+#: gui/loot_state.cpp:79
 msgid "Error: Settings parsing failed. %1%"
 msgstr ""
 
-#: src/gui/loot_state.cpp:144
+#: gui/loot_state.cpp:144
 msgid "Error: Games' settings parsing failed. %1%"
 msgstr ""
 
-#: src/gui/loot_state.cpp:164
+#: gui/loot_state.cpp:165
 msgid "Error: Game-specific settings could not be initialised. %1%"
 msgstr ""
 
-#: src/gui/loot_state.cpp:310
+#: gui/loot_state.cpp:311
 msgid "None of the supported games were detected."
 msgstr ""
 
-#: src/backend/metadata/condition_grammar.h:161
-#: src/backend/metadata/condition_grammar.h:288
-#: src/backend/metadata/condition_grammar.h:358
+#: backend/metadata/condition_grammar.h:155
+#: backend/metadata/condition_grammar.h:284
+#: backend/metadata/condition_grammar.h:352
 msgid "Invalid file path:"
 msgstr ""
 
-#: src/backend/metadata/condition_grammar.h:209
+#: backend/metadata/condition_grammar.h:188
+#: backend/metadata/condition_grammar.h:215
+msgid "Invalid regex string \"%1%\": %2%"
+msgstr ""
+
+#: backend/metadata/condition_grammar.h:206
 msgid "Invalid folder path:"
 msgstr ""
 
-#: src/backend/metadata/condition_grammar.h:218
-msgid "Invalid regex string:"
-msgstr ""
-
-#: src/backend/metadata/condition_grammar.h:375
+#: backend/metadata/condition_grammar.h:372
 msgid "Expected \"%1%\" at \"%2%\"."
 msgstr ""
 
-#: resources/report/js/events.js:42
+#: gui/html/js/events.js:42
 msgid "Loading game data..."
 msgstr ""
 
-#: resources/report/js/events.js:112
+#: gui/html/js/events.js:112
 #, javascript-format
 msgid "Masterlist updated to revision %s."
 msgstr ""
 
-#: resources/report/js/events.js:114
+#: gui/html/js/events.js:114
 msgid "No masterlist update was necessary."
 msgstr ""
 
-#: resources/report/js/events.js:119
+#: gui/html/js/events.js:119
 msgid "Updating masterlist..."
 msgstr ""
 
-#: resources/report/js/events.js:143
+#: gui/html/js/events.js:143
 msgid "Sorting plugins..."
 msgstr ""
 
-#: resources/report/js/events.js:245
+#: gui/html/js/events.js:245
 msgid "Redate Plugins?"
 msgstr ""
 
-#: resources/report/js/events.js:245
+#: gui/html/js/events.js:245
 msgid ""
 "This feature is provided so that modders using the Creation Kit may set the "
 "load order it uses. A side-effect is that any subscribed Steam Workshop mods "
 "will be re-downloaded by Steam. Do you wish to continue?"
 msgstr ""
 
-#: resources/report/js/events.js:245
+#: gui/html/js/events.js:245
 msgid "Redate"
 msgstr ""
 
-#: resources/report/js/events.js:254
+#: gui/html/js/events.js:254
 msgid ""
 "Are you sure you want to clear all existing user-added metadata from all "
 "plugins?"
 msgstr ""
 
-#: resources/report/js/events.js:254 resources/report/js/events.js:570
+#: gui/html/js/events.js:254 gui/html/js/events.js:570
 msgid "Clear"
 msgstr ""
 
-#: resources/report/js/events.js:276
+#: gui/html/js/events.js:276
 msgid "All user-added metadata has been cleared."
 msgstr ""
 
-#: resources/report/js/events.js:333
+#: gui/html/js/events.js:333
 msgid "LOOT's content has been copied to the clipboard."
 msgstr ""
 
-#: resources/report/js/events.js:355
+#: gui/html/js/events.js:355
 msgid "The load order has been copied to the clipboard."
 msgstr ""
 
-#: resources/report/js/events.js:566
+#: gui/html/js/events.js:566
 #, javascript-format
 msgid "The metadata for \"%s\" has been copied to the clipboard."
 msgstr ""
 
-#: resources/report/js/events.js:570
+#: gui/html/js/events.js:570
 #, javascript-format
 msgid ""
 "Are you sure you want to clear all existing user-added metadata from \"%s\"?"
 msgstr ""
 
-#: resources/report/js/events.js:596
+#: gui/html/js/events.js:596
 #, javascript-format
 msgid "The user-added metadata for \"%s\" has been cleared."
 msgstr ""
 
-#: resources/report/js/events.js:619
+#: gui/html/js/events.js:619
 msgid "sorted load order"
 msgstr ""
 
-#: resources/report/js/events.js:621
+#: gui/html/js/events.js:621
 msgid "metadata edits"
 msgstr ""
 
-#: resources/report/js/events.js:632
+#: gui/html/js/events.js:632
 msgid "Refreshing data..."
 msgstr ""
 
-#: resources/report/js/filters.js:121
+#: gui/html/js/filters.js:121
 msgid "Do not clean"
 msgstr ""
 
-#: resources/report/js/filters.js:160
+#: gui/html/js/filters.js:160
 msgid "Checking if plugins have been loaded..."
 msgstr ""
 
-#: resources/report/js/helpers.js:7 resources/report/js/l10n.js:162
+#: gui/html/js/helpers.js:7 gui/html/js/l10n.js:162
 msgid "Error"
 msgstr ""
 
-#: resources/report/js/helpers.js:27 resources/report/js/l10n.js:130
-#: resources/report/js/l10n.js:227 resources/report/js/l10n.js:306
+#: gui/html/js/helpers.js:27 gui/html/js/l10n.js:130 gui/html/js/l10n.js:227
+#: gui/html/js/l10n.js:306
 msgid "Cancel"
 msgstr ""
 
-#: resources/report/js/helpers.js:33 resources/report/js/l10n.js:318
+#: gui/html/js/helpers.js:33 gui/html/js/l10n.js:318
 msgid "OK"
 msgstr ""
 
-#: resources/report/js/helpers.js:54
+#: gui/html/js/helpers.js:54
 #, javascript-format
 msgid ""
 "You have not yet applied or cancelled your %s. Are you sure you want to quit?"
 msgstr ""
 
-#: resources/report/js/helpers.js:54 resources/report/js/l10n.js:240
+#: gui/html/js/helpers.js:54 gui/html/js/l10n.js:240
 msgid "Quit"
 msgstr ""
 
-#: resources/report/js/init.js:38
+#: gui/html/js/init.js:38
 msgid "unknown"
 msgstr ""
 
-#: resources/report/js/l10n.js:61 resources/report/js/l10n.js:80
+#: gui/html/js/l10n.js:61 gui/html/js/l10n.js:80
 msgid "Active Plugin"
 msgstr ""
 
-#: resources/report/js/l10n.js:62 resources/report/js/l10n.js:81
-#: resources/report/js/l10n.js:295
+#: gui/html/js/l10n.js:62 gui/html/js/l10n.js:81 gui/html/js/l10n.js:295
 msgid "Master File"
 msgstr ""
 
-#: resources/report/js/l10n.js:63 resources/report/js/l10n.js:82
+#: gui/html/js/l10n.js:63 gui/html/js/l10n.js:82
 msgid "Empty Plugin"
 msgstr ""
 
-#: resources/report/js/l10n.js:64 resources/report/js/l10n.js:83
-msgid "Loads BSA"
+#: gui/html/js/l10n.js:64 gui/html/js/l10n.js:83
+msgid "Loads Archive"
 msgstr ""
 
-#: resources/report/js/l10n.js:65 resources/report/js/l10n.js:140
+#: gui/html/js/l10n.js:65 gui/html/js/l10n.js:140
 msgid "Has User Metadata"
 msgstr ""
 
-#: resources/report/js/l10n.js:67
+#: gui/html/js/l10n.js:67
 msgid "Show Only Conflicts"
 msgstr ""
 
-#: resources/report/js/l10n.js:68
+#: gui/html/js/l10n.js:68
 msgid "Edit Metadata"
 msgstr ""
 
-#: resources/report/js/l10n.js:69
+#: gui/html/js/l10n.js:69
 msgid "Copy Metadata"
 msgstr ""
 
-#: resources/report/js/l10n.js:70
+#: gui/html/js/l10n.js:70
 msgid "Clear User Metadata"
 msgstr ""
 
-#: resources/report/js/l10n.js:85
+#: gui/html/js/l10n.js:85
 msgid "Enable Edits"
 msgstr ""
 
-#: resources/report/js/l10n.js:86
+#: gui/html/js/l10n.js:86
 msgid ""
 "Global priorities are compared against all other plugins. Normal priorities "
 "are compared against only conflicting plugins."
 msgstr ""
 
-#: resources/report/js/l10n.js:87 resources/report/js/l10n.js:139
+#: gui/html/js/l10n.js:87 gui/html/js/l10n.js:139
 msgid "Global Priority"
 msgstr ""
 
-#: resources/report/js/l10n.js:88
+#: gui/html/js/l10n.js:88
 msgid "Priority Value"
 msgstr ""
 
-#: resources/report/js/l10n.js:90
+#: gui/html/js/l10n.js:90
 msgid "Main"
 msgstr ""
 
-#: resources/report/js/l10n.js:91
+#: gui/html/js/l10n.js:91
 msgid "Load After"
 msgstr ""
 
-#: resources/report/js/l10n.js:92
+#: gui/html/js/l10n.js:92
 msgid "Requirements"
 msgstr ""
 
-#: resources/report/js/l10n.js:93
+#: gui/html/js/l10n.js:93
 msgid "Incompatibilities"
 msgstr ""
 
-#: resources/report/js/l10n.js:94
+#: gui/html/js/l10n.js:94
 msgid "Messages"
 msgstr ""
 
-#: resources/report/js/l10n.js:95
+#: gui/html/js/l10n.js:95
 msgid "Bash Tags"
 msgstr ""
 
-#: resources/report/js/l10n.js:96
+#: gui/html/js/l10n.js:96
 msgid "Dirty Info"
 msgstr ""
 
-#: resources/report/js/l10n.js:97
+#: gui/html/js/l10n.js:97
 msgid "Locations"
 msgstr ""
 
-#: resources/report/js/l10n.js:99 resources/report/js/l10n.js:103
-#: resources/report/js/l10n.js:107
+#: gui/html/js/l10n.js:99 gui/html/js/l10n.js:103 gui/html/js/l10n.js:107
 msgid "Filename"
 msgstr ""
 
-#: resources/report/js/l10n.js:100 resources/report/js/l10n.js:104
-#: resources/report/js/l10n.js:108
+#: gui/html/js/l10n.js:100 gui/html/js/l10n.js:104 gui/html/js/l10n.js:108
 msgid "Display Name"
 msgstr ""
 
-#: resources/report/js/l10n.js:101 resources/report/js/l10n.js:105
-#: resources/report/js/l10n.js:109 resources/report/js/l10n.js:113
-#: resources/report/js/l10n.js:118
+#: gui/html/js/l10n.js:101 gui/html/js/l10n.js:105 gui/html/js/l10n.js:109
+#: gui/html/js/l10n.js:113 gui/html/js/l10n.js:118
 msgid "Condition"
 msgstr ""
 
-#: resources/report/js/l10n.js:111
+#: gui/html/js/l10n.js:111
 msgid "Type"
 msgstr ""
 
-#: resources/report/js/l10n.js:112
+#: gui/html/js/l10n.js:112
 msgid "Content"
 msgstr ""
 
-#: resources/report/js/l10n.js:114 resources/report/js/l10n.js:283
+#: gui/html/js/l10n.js:114 gui/html/js/l10n.js:283
 msgid "Language"
 msgstr ""
 
-#: resources/report/js/l10n.js:116
+#: gui/html/js/l10n.js:116
 msgid "Add/Remove"
 msgstr ""
 
-#: resources/report/js/l10n.js:117
+#: gui/html/js/l10n.js:117
 msgid "Bash Tag"
 msgstr ""
 
-#: resources/report/js/l10n.js:120
+#: gui/html/js/l10n.js:120
 msgid "CRC"
 msgstr ""
 
-#: resources/report/js/l10n.js:121
+#: gui/html/js/l10n.js:121
 msgid "ITM Count"
 msgstr ""
 
-#: resources/report/js/l10n.js:122
+#: gui/html/js/l10n.js:122
 msgid "Deleted References"
 msgstr ""
 
-#: resources/report/js/l10n.js:123
+#: gui/html/js/l10n.js:123
 msgid "Deleted Navmeshes"
 msgstr ""
 
-#: resources/report/js/l10n.js:124
+#: gui/html/js/l10n.js:124
 msgid "Cleaning Utility"
 msgstr ""
 
-#: resources/report/js/l10n.js:126
+#: gui/html/js/l10n.js:126
 msgid "URL"
 msgstr ""
 
-#: resources/report/js/l10n.js:127 resources/report/js/l10n.js:292
+#: gui/html/js/l10n.js:127 gui/html/js/l10n.js:292
 msgid "Name"
 msgstr ""
 
-#: resources/report/js/l10n.js:129 resources/report/js/l10n.js:226
-#: resources/report/js/l10n.js:305
+#: gui/html/js/l10n.js:129 gui/html/js/l10n.js:226 gui/html/js/l10n.js:305
 msgid "Apply"
 msgstr ""
 
-#: resources/report/js/l10n.js:141
+#: gui/html/js/l10n.js:141
 msgid "Editor Is Open"
 msgstr ""
 
-#: resources/report/js/l10n.js:150
+#: gui/html/js/l10n.js:150
 msgid "A filename is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:151 resources/report/js/l10n.js:164
-#: resources/report/js/l10n.js:176 resources/report/js/l10n.js:190
-#: resources/report/js/l10n.js:200 resources/report/js/l10n.js:211
+#: gui/html/js/l10n.js:151 gui/html/js/l10n.js:164 gui/html/js/l10n.js:176
+#: gui/html/js/l10n.js:190 gui/html/js/l10n.js:200 gui/html/js/l10n.js:211
 msgid "Delete Row"
 msgstr ""
 
-#: resources/report/js/l10n.js:160
+#: gui/html/js/l10n.js:160
 msgid "Note"
 msgstr ""
 
-#: resources/report/js/l10n.js:161
+#: gui/html/js/l10n.js:161
 msgid "Warning"
 msgstr ""
 
-#: resources/report/js/l10n.js:163
+#: gui/html/js/l10n.js:163
 msgid "A content string is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:173
+#: gui/html/js/l10n.js:173
 msgid "Add"
 msgstr ""
 
-#: resources/report/js/l10n.js:174
+#: gui/html/js/l10n.js:174
 msgid "Remove"
 msgstr ""
 
-#: resources/report/js/l10n.js:175 resources/report/js/l10n.js:209
+#: gui/html/js/l10n.js:175 gui/html/js/l10n.js:209
 msgid "A name is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:185
+#: gui/html/js/l10n.js:185
 msgid "A CRC is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:186 resources/report/js/l10n.js:187
-#: resources/report/js/l10n.js:188
+#: gui/html/js/l10n.js:186 gui/html/js/l10n.js:187 gui/html/js/l10n.js:188
 msgid "Values must be integers."
 msgstr ""
 
-#: resources/report/js/l10n.js:189
+#: gui/html/js/l10n.js:189
 msgid "A utility name is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:199
+#: gui/html/js/l10n.js:199
 msgid "A link is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:210
+#: gui/html/js/l10n.js:210
 msgid "A folder is required."
 msgstr ""
 
-#: resources/report/js/l10n.js:220 resources/report/js/l10n.js:303
+#: gui/html/js/l10n.js:220 gui/html/js/l10n.js:303
 msgid "Add New Row"
 msgstr ""
 
-#: resources/report/js/l10n.js:223
+#: gui/html/js/l10n.js:223
 msgid "Jump To General Information"
 msgstr ""
 
-#: resources/report/js/l10n.js:224
+#: gui/html/js/l10n.js:224
 msgid "Sort Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:225
+#: gui/html/js/l10n.js:225
 msgid "Update Masterlist"
 msgstr ""
 
-#: resources/report/js/l10n.js:228
+#: gui/html/js/l10n.js:228
 msgid "Search Cards"
 msgstr ""
 
-#: resources/report/js/l10n.js:231
+#: gui/html/js/l10n.js:231
 msgid "Redate Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:232
+#: gui/html/js/l10n.js:232
 msgid "Open Debug Log Location"
 msgstr ""
 
-#: resources/report/js/l10n.js:233
+#: gui/html/js/l10n.js:233
 msgid "Clear All User Metadata"
 msgstr ""
 
-#: resources/report/js/l10n.js:234
+#: gui/html/js/l10n.js:234
 msgid "Copy Load Order"
 msgstr ""
 
-#: resources/report/js/l10n.js:235
+#: gui/html/js/l10n.js:235
 msgid "Copy Content"
 msgstr ""
 
-#: resources/report/js/l10n.js:236
+#: gui/html/js/l10n.js:236
 msgid "Refresh Content"
 msgstr ""
 
-#: resources/report/js/l10n.js:237
+#: gui/html/js/l10n.js:237
 msgid "View Documentation"
 msgstr ""
 
-#: resources/report/js/l10n.js:238
+#: gui/html/js/l10n.js:238
 msgid "About"
 msgstr ""
 
-#: resources/report/js/l10n.js:239 resources/report/js/l10n.js:275
+#: gui/html/js/l10n.js:239 gui/html/js/l10n.js:275
 msgid "Settings"
 msgstr ""
 
-#: resources/report/js/l10n.js:243
+#: gui/html/js/l10n.js:243
 msgid "Search cards"
 msgstr ""
 
-#: resources/report/js/l10n.js:246
+#: gui/html/js/l10n.js:246
 msgid "Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:247
+#: gui/html/js/l10n.js:247
 msgid "Filters"
 msgstr ""
 
-#: resources/report/js/l10n.js:248
+#: gui/html/js/l10n.js:248
 msgid "Press Enter or click outside the input to set the filter."
 msgstr ""
 
-#: resources/report/js/l10n.js:249
+#: gui/html/js/l10n.js:249
 msgid "Filter content"
 msgstr ""
 
-#: resources/report/js/l10n.js:252
+#: gui/html/js/l10n.js:252
 msgid "Hide version numbers"
 msgstr ""
 
-#: resources/report/js/l10n.js:253
+#: gui/html/js/l10n.js:253
 msgid "Hide CRCs"
 msgstr ""
 
-#: resources/report/js/l10n.js:254
+#: gui/html/js/l10n.js:254
 msgid "Hide Bash Tags"
 msgstr ""
 
-#: resources/report/js/l10n.js:255
+#: gui/html/js/l10n.js:255
 msgid "Hide notes"
 msgstr ""
 
-#: resources/report/js/l10n.js:256
+#: gui/html/js/l10n.js:256
 msgid "Hide 'Do not clean' messages"
 msgstr ""
 
-#: resources/report/js/l10n.js:257
+#: gui/html/js/l10n.js:257
 msgid "Hide all plugin messages"
 msgstr ""
 
-#: resources/report/js/l10n.js:258
+#: gui/html/js/l10n.js:258
 msgid "Hide inactive plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:259
+#: gui/html/js/l10n.js:259
 msgid "Hide messageless plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:260
+#: gui/html/js/l10n.js:260
 msgid "Hidden plugins:"
 msgstr ""
 
-#: resources/report/js/l10n.js:261
+#: gui/html/js/l10n.js:261
 msgid "Hidden messages:"
 msgstr ""
 
-#: resources/report/js/l10n.js:264
+#: gui/html/js/l10n.js:264
 msgid "General Information"
 msgstr ""
 
-#: resources/report/js/l10n.js:265
+#: gui/html/js/l10n.js:265
 msgid "Masterlist Revision"
 msgstr ""
 
-#: resources/report/js/l10n.js:266
+#: gui/html/js/l10n.js:266
 msgid "Masterlist Date"
 msgstr ""
 
-#: resources/report/js/l10n.js:267
+#: gui/html/js/l10n.js:267
 msgid "Warnings"
 msgstr ""
 
-#: resources/report/js/l10n.js:268
+#: gui/html/js/l10n.js:268
 msgid "Errors"
 msgstr ""
 
-#: resources/report/js/l10n.js:269
+#: gui/html/js/l10n.js:269
 msgid "Total Messages"
 msgstr ""
 
-#: resources/report/js/l10n.js:270
+#: gui/html/js/l10n.js:270
 msgid "Active Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:271
+#: gui/html/js/l10n.js:271
 msgid "Dirty Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:272
+#: gui/html/js/l10n.js:272
 msgid "Total Plugins"
 msgstr ""
 
-#: resources/report/js/l10n.js:278
+#: gui/html/js/l10n.js:278
 msgid "Default Game"
 msgstr ""
 
-#: resources/report/js/l10n.js:279
+#: gui/html/js/l10n.js:279
 msgid "Autodetect"
 msgstr ""
 
-#: resources/report/js/l10n.js:284
+#: gui/html/js/l10n.js:284
 msgid "Language changes will be applied after LOOT is restarted."
 msgstr ""
 
-#: resources/report/js/l10n.js:286
+#: gui/html/js/l10n.js:286
 msgid "Enable debug logging"
 msgstr ""
 
-#: resources/report/js/l10n.js:287
+#: gui/html/js/l10n.js:287
 msgid "The output is logged to the LOOTDebugLog.txt file."
 msgstr ""
 
-#: resources/report/js/l10n.js:289
+#: gui/html/js/l10n.js:289
 msgid "Update masterlist before sorting"
 msgstr ""
 
-#: resources/report/js/l10n.js:293
+#: gui/html/js/l10n.js:293
 msgid "Base Game"
 msgstr ""
 
-#: resources/report/js/l10n.js:294
+#: gui/html/js/l10n.js:294
 msgid "LOOT Folder"
 msgstr ""
 
-#: resources/report/js/l10n.js:296
+#: gui/html/js/l10n.js:296
 msgid "Masterlist Repository URL"
 msgstr ""
 
-#: resources/report/js/l10n.js:297
+#: gui/html/js/l10n.js:297
 msgid "Masterlist Repository Branch"
 msgstr ""
 
-#: resources/report/js/l10n.js:298
+#: gui/html/js/l10n.js:298
 msgid "Install Path"
 msgstr ""
 
-#: resources/report/js/l10n.js:299
+#: gui/html/js/l10n.js:299
 msgid "Install Path Registry Key"
 msgstr ""
 
-#: resources/report/js/l10n.js:310
+#: gui/html/js/l10n.js:310
 msgid "First-Time Tips"
 msgstr ""
 
-#: resources/report/js/l10n.js:312
+#: gui/html/js/l10n.js:312
 msgid ""
 "CRCs are only displayed after plugins have been loaded, either by conflict "
 "filtering, or by sorting."
 msgstr ""
 
-#: resources/report/js/l10n.js:313
+#: gui/html/js/l10n.js:313
 msgid ""
 "Double-click a plugin in the sidebar to quickly open its metadata editor. "
 "Multiple metadata editors can be opened at once."
 msgstr ""
 
-#: resources/report/js/l10n.js:314
+#: gui/html/js/l10n.js:314
 msgid ""
 "Plugins can be drag and dropped from the sidebar into editors' \"load after\", "
 "\"requirements\" and \"incompatibility\" tables."
 msgstr ""
 
-#: resources/report/js/l10n.js:315
+#: gui/html/js/l10n.js:315
 msgid ""
 "Some features are disabled while there is an editor open, or while there is "
 "a sorted load order that has not been applied or discarded."
 msgstr ""
 
-#: resources/report/js/l10n.js:316
+#: gui/html/js/l10n.js:316
 msgid ""
 "Many interface elements have tooltips. If you don't know what something is, "
 "try hovering your mouse over it to find out. Otherwise, LOOT's documentation "
 "can be accessed through the main menu."
 msgstr ""
 
-#: resources/report/js/loot.js:183 resources/report/js/loot.js:188
+#: gui/html/js/loot.js:183 gui/html/js/loot.js:188
 msgid "N/A"
 msgstr ""
diff --git a/resources/settings.yaml b/resources/settings.yaml
index 20b7e26b..db64f4d3 100644
--- a/resources/settings.yaml
+++ b/resources/settings.yaml
@@ -46,6 +46,15 @@ games:
     path: ~
     registry: Software\Bethesda Softworks\FalloutNV\Installed Path
 
+  - folder: Fallout4
+    name: "Fallout 4"
+    type: Fallout4
+    master: Fallout4.esm
+    repo: https://github.com/loot/fallout4.git
+    branch: master
+    path: ~
+    registry: Software\Bethesda Softworks\Fallout4\Installed Path
+
   - folder: Nehrim
     name: Nehrim - At Fate's Edge
     type: Oblivion
diff --git a/scripts/archive.js b/scripts/archive.js
index 5c49d209..21b15bd8 100644
--- a/scripts/archive.js
+++ b/scripts/archive.js
@@ -58,7 +58,6 @@ function createAppArchive(release_path, dest_path) {
             'libEGL.dll',
             'libGLESv2.dll',
             'libcef.dll',
-            'wow_helper.exe',
             'natives_blob.bin',
             'snapshot_blob.bin',
             'cef.pak',
@@ -67,6 +66,10 @@ function createAppArchive(release_path, dest_path) {
             'devtools_resources.pak',
             'icudtl.dat'
         ];
+
+        if (helpers.fileExists(path.join(release_path, 'wow_helper.exe'))) {
+            binaries.push('wow_helper.exe');
+        }
     } else {
         binaries = [
             'LOOT',
diff --git a/scripts/install-step.travis.sh b/scripts/install-step.travis.sh
index cd7fbd66..3ea16c12 100644
--- a/scripts/install-step.travis.sh
+++ b/scripts/install-step.travis.sh
@@ -8,8 +8,8 @@ wget -P build https://raw.githubusercontent.com/rpavlik/cmake-modules/master/Get
 cd ../..
 
 # Install libespm.
-wget https://github.com/WrinklyNinja/libespm/archive/1.0.0.tar.gz -O - | tar -xz
-mv libespm-1.0.0 libespm
+wget https://github.com/WrinklyNinja/libespm/archive/2.5.0.tar.gz -O - | tar -xz
+mv libespm-2.5.0 libespm
 
 # Build yaml-cpp
 wget https://github.com/WrinklyNinja/yaml-cpp/archive/patched-for-loot.tar.gz -O - | tar -xz
@@ -20,16 +20,16 @@ make yaml-cpp
 cd ../..
 
 # Build libgit2
-wget https://github.com/libgit2/libgit2/archive/v0.23.1.tar.gz -O - | tar -xz
-mv libgit2-0.23.1 libgit2
+wget https://github.com/libgit2/libgit2/archive/v0.23.4.tar.gz -O - | tar -xz
+mv libgit2-0.23.4 libgit2
 mkdir libgit2/build && cd libgit2/build
 cmake .. -DBUILD_SHARED_LIBS=OFF
 make git2
 cd ../..
 
 # Build libloadorder
-wget https://github.com/WrinklyNinja/libloadorder/archive/50342d7298f27a6a4366175119bd17aaf09000c7.tar.gz -O - | tar -xz
-mv libloadorder-50342d7298f27a6a4366175119bd17aaf09000c7 libloadorder
+wget https://github.com/WrinklyNinja/libloadorder/archive/3a7d694e2eab9957b745fe828da1ed00f537c989.tar.gz -O - | tar -xz
+mv libloadorder-3a7d694e2eab9957b745fe828da1ed00f537c989 libloadorder
 mkdir libloadorder/build && cd libloadorder/build
 cmake .. -DPROJECT_ARCH=64 -DPROJECT_STATIC_RUNTIME=OFF -DBUILD_SHARED_LIBS=OFF -DGTEST_ROOT=../gtest-1.7.0
 make loadorder64
diff --git a/scripts/installer.iss b/scripts/installer.iss
index 7ea57df4..2247d656 100644
--- a/scripts/installer.iss
+++ b/scripts/installer.iss
@@ -159,16 +159,19 @@ Type: files; Name: "{localappdata}\{#MyAppName}\Oblivion\masterlist.yaml";
 Type: files; Name: "{localappdata}\{#MyAppName}\Skyrim\masterlist.yaml";
 Type: files; Name: "{localappdata}\{#MyAppName}\Fallout3\masterlist.yaml";
 Type: files; Name: "{localappdata}\{#MyAppName}\FalloutNV\masterlist.yaml";
+Type: files; Name: "{localappdata}\{#MyAppName}\Fallout4\masterlist.yaml";
 
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Oblivion\.git";
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Skyrim\.git";
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Fallout3\.git";
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\FalloutNV\.git";
+Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Fallout4\.git";
 
 Type: dirifempty; Name: "{localappdata}\{#MyAppName}\Oblivion";
 Type: dirifempty; Name: "{localappdata}\{#MyAppName}\Skyrim";
 Type: dirifempty; Name: "{localappdata}\{#MyAppName}\Fallout3";
 Type: dirifempty; Name: "{localappdata}\{#MyAppName}\FalloutNV";
+Type: dirifempty; Name: "{localappdata}\{#MyAppName}\Fallout4";
 
 Type: dirifempty; Name: "{localappdata}\{#MyAppName}";
 
@@ -230,6 +233,7 @@ begin
       DeleteFile(ExpandConstant('{localappdata}\{#MyAppName}\Skyrim\userlist.yaml'));
       DeleteFile(ExpandConstant('{localappdata}\{#MyAppName}\Fallout3\userlist.yaml'));
       DeleteFile(ExpandConstant('{localappdata}\{#MyAppName}\FalloutNV\userlist.yaml'));
+      DeleteFile(ExpandConstant('{localappdata}\{#MyAppName}\Fallout4\userlist.yaml'));
     end;
   end;
 end;
diff --git a/src/api/api.cpp b/src/api/api.cpp
index 002eb6d3..47563d9c 100644
--- a/src/api/api.cpp
+++ b/src/api/api.cpp
@@ -63,6 +63,7 @@ const unsigned int loot_game_tes4 = loot::Game::tes4;
 const unsigned int loot_game_tes5 = loot::Game::tes5;
 const unsigned int loot_game_fo3 = loot::Game::fo3;
 const unsigned int loot_game_fonv = loot::Game::fonv;
+const unsigned int loot_game_fo4 = loot::Game::fo4;
 
 // LOOT message types.
 const unsigned int loot_message_say = loot::Message::say;
@@ -243,7 +244,12 @@ LOOT_API unsigned int loot_create_db(loot_db * const db,
                                      const unsigned int clientGame,
                                      const char * const gamePath,
                                      const char * const gameLocalPath) {
-    if (db == nullptr || (clientGame != loot_game_tes4 && clientGame != loot_game_tes5 && clientGame != loot_game_fo3 && clientGame != loot_game_fonv))
+    if (db == nullptr
+        || (clientGame != loot_game_tes4
+        && clientGame != loot_game_tes5
+        && clientGame != loot_game_fo3
+        && clientGame != loot_game_fonv
+        && clientGame != loot_game_fo4))
         return c_error(loot_error_invalid_args, "Null pointer passed.");
 
     //Set the locale to get encoding conversions working correctly.
diff --git a/src/backend/game/game.cpp b/src/backend/game/game.cpp
index 13bfe6a6..230369e9 100644
--- a/src/backend/game/game.cpp
+++ b/src/backend/game/game.cpp
@@ -54,7 +54,7 @@ namespace loot {
     Game::Game(const unsigned int gameCode, const std::string& folder) : GameSettings(gameCode, folder), _pluginsFullyLoaded(false) {}
 
     void Game::Init(bool createFolder, const boost::filesystem::path& gameLocalAppData) {
-        if (Id() != Game::tes4 && Id() != Game::tes5 && Id() != Game::fo3 && Id() != Game::fonv) {
+        if (Id() != Game::tes4 && Id() != Game::tes5 && Id() != Game::fo3 && Id() != Game::fonv && Id() != Game::fo4) {
             throw error(error::invalid_args, lc::translate("Invalid game ID supplied.").str());
         }
 
diff --git a/src/backend/game/game_settings.cpp b/src/backend/game/game_settings.cpp
index 0c95ddcf..3682e9c8 100644
--- a/src/backend/game/game_settings.cpp
+++ b/src/backend/game/game_settings.cpp
@@ -42,6 +42,7 @@ namespace loot {
     const unsigned int GameSettings::tes5 = 2;
     const unsigned int GameSettings::fo3 = 3;
     const unsigned int GameSettings::fonv = 4;
+    const unsigned int GameSettings::fo4 = 5;
 
     GameSettings::GameSettings() : _id(GameSettings::autodetect) {}
 
@@ -78,6 +79,14 @@ namespace loot {
             _repositoryURL = "https://github.com/loot/falloutnv.git";
             _repositoryBranch = "v0.8";
         }
+        else if (Id() == GameSettings::fo4) {
+            _name = "Fallout 4";
+            _registryKey = "Software\\Bethesda Softworks\\Fallout4\\Installed Path";
+            _lootFolderName = "Fallout4";
+            _masterFile = "Fallout4.esm";
+            _repositoryURL = "https://github.com/loot/fallout4.git";
+            _repositoryBranch = "v0.8";
+        }
 
         if (!folder.empty())
             _lootFolderName = folder;
@@ -120,6 +129,19 @@ namespace loot {
         return _id;
     }
 
+    libespm::GameId GameSettings::LibespmId() const {
+        if (_id == GameSettings::tes4)
+            return libespm::GameId::OBLIVION;
+        else if (_id == GameSettings::tes5)
+            return libespm::GameId::SKYRIM;
+        else if (_id == GameSettings::fo3)
+            return libespm::GameId::FALLOUT3;
+        else if (_id == GameSettings::fonv)
+            return libespm::GameId::FALLOUTNV;
+        else
+            return libespm::GameId::FALLOUT4;
+    }
+
     string GameSettings::Name() const {
         return _name;
     }
@@ -223,6 +245,9 @@ namespace loot {
         if (find(games.begin(), games.end(), GameSettings(GameSettings::fonv)) == games.end())
             games.push_back(GameSettings(GameSettings::fonv));
 
+        if (find(games.begin(), games.end(), GameSettings(GameSettings::fo4)) == games.end())
+            games.push_back(GameSettings(GameSettings::fo4));
+
         // If there were any missing defaults, make sure they're in settings now.
         settings["games"] = games;
 
diff --git a/src/backend/game/game_settings.h b/src/backend/game/game_settings.h
index a5189ede..a85e8d80 100644
--- a/src/backend/game/game_settings.h
+++ b/src/backend/game/game_settings.h
@@ -32,6 +32,8 @@
 
 #include <yaml-cpp/yaml.h>
 
+#include <libespm/GameId.h>
+
 namespace loot {
     class GameSettings {
     public:
@@ -44,6 +46,7 @@ namespace loot {
         bool operator == (const GameSettings& rhs) const;  //Compares names and folder names.
 
         unsigned int Id() const;
+        libespm::GameId LibespmId() const;
         std::string Name() const;  //Returns the game's name, eg. "TES IV: Oblivion".
         std::string FolderName() const;
         std::string Master() const;
@@ -68,6 +71,7 @@ namespace loot {
         static const unsigned int tes5;
         static const unsigned int fo3;
         static const unsigned int fonv;
+        static const unsigned int fo4;
     private:
         unsigned int _id;
         std::string _name;
@@ -119,6 +123,8 @@ namespace YAML {
                 rhs = loot::GameSettings(loot::GameSettings::fo3, node["folder"].as<std::string>());
             else if (node["type"].as<std::string>() == loot::GameSettings(loot::GameSettings::fonv).FolderName())
                 rhs = loot::GameSettings(loot::GameSettings::fonv, node["folder"].as<std::string>());
+            else if (node["type"].as<std::string>() == loot::GameSettings(loot::GameSettings::fo4).FolderName())
+                rhs = loot::GameSettings(loot::GameSettings::fo4, node["folder"].as<std::string>());
             else
                 throw RepresentationException(node.Mark(), "bad conversion: invalid value for 'type' key in 'game settings' object");
 
diff --git a/src/backend/game/load_order_handler.cpp b/src/backend/game/load_order_handler.cpp
index 26950603..02fb8d4d 100644
--- a/src/backend/game/load_order_handler.cpp
+++ b/src/backend/game/load_order_handler.cpp
@@ -45,7 +45,8 @@ namespace loot {
         if (game.Id() != GameSettings::tes4
             && game.Id() != GameSettings::tes5
             && game.Id() != GameSettings::fo3
-            && game.Id() != GameSettings::fonv) {
+            && game.Id() != GameSettings::fonv
+            && game.Id() != GameSettings::fo4) {
             throw error(error::invalid_args, lc::translate("Unsupported game ID supplied.").str());
         }
 
@@ -74,6 +75,8 @@ namespace loot {
             ret = lo_create_handle(&_gh, LIBLO_GAME_FO3, game.GamePath().string().c_str(), gameLocalDataPath);
         else if (game.Id() == GameSettings::fonv)
             ret = lo_create_handle(&_gh, LIBLO_GAME_FNV, game.GamePath().string().c_str(), gameLocalDataPath);
+        else if (game.Id() == GameSettings::fo4)
+            ret = lo_create_handle(&_gh, LIBLO_GAME_FO4, game.GamePath().string().c_str(), gameLocalDataPath);
         else
             ret = LIBLO_ERROR_INVALID_ARGS;
 
@@ -92,28 +95,6 @@ namespace loot {
             lo_cleanup();
             throw error(error::liblo_error, err);
         }
-
-        if (game.Id() != GameSettings::tes5) {
-            ret = lo_set_game_master(_gh, game.Master().c_str());
-            if (ret != LIBLO_OK && ret != LIBLO_WARN_BAD_FILENAME && ret != LIBLO_WARN_INVALID_LIST && ret != LIBLO_WARN_LO_MISMATCH) {
-                const char * e = nullptr;
-                string err;
-                lo_get_error_message(&e);
-                lo_destroy_handle(_gh);
-                _gh = nullptr;
-
-                if (e == nullptr) {
-                    BOOST_LOG_TRIVIAL(error) << "libloadorder failed to initialise game master file support. Details could not be fetched.";
-                    err = lc::translate("libloadorder failed to initialise game master file support. Details could not be fetched.").str();
-                }
-                else {
-                    BOOST_LOG_TRIVIAL(error) << "libloadorder failed to initialise game master file support. Details: " << e;
-                    err = lc::translate("libloadorder failed to initialise game master file support. Details:").str() + " " + e;
-                }
-                lo_cleanup();
-                throw error(error::liblo_error, err);
-            }
-        }
     }
 
     std::unordered_set<std::string> LoadOrderHandler::GetActivePlugins() const {
diff --git a/src/backend/helpers/git_helper.cpp b/src/backend/helpers/git_helper.cpp
index 81fdb7fc..e4f5c76a 100644
--- a/src/backend/helpers/git_helper.cpp
+++ b/src/backend/helpers/git_helper.cpp
@@ -165,6 +165,10 @@ namespace loot {
         BOOST_LOG_TRIVIAL(info) << "Repository doesn't exist, cloning the remote repository.";
 
         fs::path tempPath = fs::temp_directory_path() / fs::unique_path();
+
+        //Delete temporary folder in case it already exists.
+        fs::remove_all(tempPath);
+
         if (!fs::is_empty(path)) {
             // Directory is non-empty. Delete the masterlist file and
             // .git folder, then move any remaining files to a temporary
diff --git a/src/backend/metadata/formid.cpp b/src/backend/metadata/formid.cpp
deleted file mode 100644
index 50f623fc..00000000
--- a/src/backend/metadata/formid.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  LOOT
-
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-    Fallout: New Vegas.
-
-    Copyright (C) 2012-2015    WrinklyNinja
-
-    This file is part of LOOT.
-
-    LOOT is free software: you can redistribute
-    it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, either version 3 of
-    the License, or (at your option) any later version.
-
-    LOOT is distributed in the hope that it will
-    be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with LOOT.  If not, see
-    <http://www.gnu.org/licenses/>.
-    */
-
-#include "formid.h"
-
-#include <boost/algorithm/string.hpp>
-#include <boost/log/trivial.hpp>
-
-using namespace std;
-
-namespace loot {
-    FormID::FormID() : id(0) {}
-
-    FormID::FormID(const std::string& sourcePlugin, const uint32_t objectID) : plugin(sourcePlugin), id(objectID) {}
-
-    FormID::FormID(const std::vector<std::string>& sourcePlugins, const uint32_t formID) {
-        unsigned int index = formID >> 24;
-        id = formID & ~((uint32_t)index << 24);
-
-        if (index >= sourcePlugins.size()) {
-            BOOST_LOG_TRIVIAL(trace) << hex << formID << dec << " in " << sourcePlugins.back() << " has a higher modIndex than expected.";
-            index = sourcePlugins.size() - 1;
-        }
-
-        plugin = sourcePlugins[index];
-    }
-
-    bool FormID::operator == (const FormID& rhs) const {
-        return (id == rhs.Id() && boost::iequals(plugin, rhs.Plugin()));
-    }
-
-    bool FormID::operator < (const FormID& rhs) const {
-        if (id != rhs.Id())
-            return id < rhs.Id();
-        else
-            return boost::ilexicographical_compare(plugin, rhs.Plugin());
-    }
-
-    std::string FormID::Plugin() const {
-        return plugin;
-    }
-
-    uint32_t FormID::Id() const {
-        return id;
-    }
-}
diff --git a/src/backend/metadata/formid.h b/src/backend/metadata/formid.h
deleted file mode 100644
index c4621735..00000000
--- a/src/backend/metadata/formid.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  LOOT
-
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-    Fallout: New Vegas.
-
-    Copyright (C) 2012-2015    WrinklyNinja
-
-    This file is part of LOOT.
-
-    LOOT is free software: you can redistribute
-    it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, either version 3 of
-    the License, or (at your option) any later version.
-
-    LOOT is distributed in the hope that it will
-    be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with LOOT.  If not, see
-    <http://www.gnu.org/licenses/>.
-    */
-#ifndef __LOOT_METADATA_FORMID__
-#define __LOOT_METADATA_FORMID__
-
-#include <cstdint>
-#include <string>
-#include <vector>
-
-namespace loot {
-    // A FormID is a 32 bit unsigned integer of the form xxYYYYYY in hex.
-    // The xx is the position in the masters list of the plugin that the FormID
-    // is from, and the YYYYYY is the rest of the FormID. Here the xx bit is
-    // stored as the corresponding filename to allow comparison between FormIDs
-    // from different plugins.
-    class FormID {
-    public:
-        FormID();
-        FormID(const std::string& pluginName, const uint32_t objectID);
-        FormID(const std::vector<std::string>& masters, const uint32_t formID);  //The masters here also includes the plugin that they are masters of as the last element.
-
-        bool operator < (const FormID& rhs) const;
-        bool operator == (const FormID& rhs) const;
-
-        std::string Plugin() const;
-        uint32_t Id() const;
-    private:
-        std::string plugin;
-        uint32_t id;
-    };
-}
-
-#endif
diff --git a/src/backend/metadata/plugin_metadata.cpp b/src/backend/metadata/plugin_metadata.cpp
index 718d56d5..36d5702e 100644
--- a/src/backend/metadata/plugin_metadata.cpp
+++ b/src/backend/metadata/plugin_metadata.cpp
@@ -296,8 +296,12 @@ namespace loot {
                 ++it;
         }
 
-        //First need to get plugin's CRC, if it is an exact plugin and it does not have its CRC set.
-        if (!IsRegexPlugin()) {
+        // Regex plugins shouldn't have dirty info, but just clear in case.
+        if (IsRegexPlugin())
+            _dirtyInfo.clear();
+
+        if (!_dirtyInfo.empty()) {
+            //First need to get plugin's CRC, if it is an exact plugin and it does not have its CRC set.
             uint32_t crc = game.GetCachedCrc(name);
             if (crc == 0) {
                 if (boost::filesystem::exists(game.DataPath() / name)) {
@@ -324,10 +328,6 @@ namespace loot {
                     ++it;
             }
         }
-        else {
-            // Regex plugins shouldn't have dirty info, but just clear in case.
-            _dirtyInfo.clear();
-        }
 
         return *this;
     }
diff --git a/src/backend/metadata/plugin_metadata.h b/src/backend/metadata/plugin_metadata.h
index b9f69e94..ff74571b 100644
--- a/src/backend/metadata/plugin_metadata.h
+++ b/src/backend/metadata/plugin_metadata.h
@@ -25,7 +25,6 @@
 #define __LOOT_METADATA_PLUGIN_METADATA__
 
 #include "file.h"
-#include "formid.h"
 #include "location.h"
 #include "message.h"
 #include "plugin_dirty_info.h"
diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp
index 3b559f15..b8c10764 100644
--- a/src/backend/plugin/plugin.cpp
+++ b/src/backend/plugin/plugin.cpp
@@ -23,7 +23,6 @@
     */
 
 #include "plugin.h"
-#include "plugin_loader.h"
 #include "../game/game.h"
 #include "../helpers/helpers.h"
 
@@ -34,7 +33,10 @@
 #include <boost/locale.hpp>
 #include <regex>
 
+#include <libespm/Plugin.h>
+
 using namespace std;
+using libespm::FormId;
 
 namespace loot {
     /// REGEX expression definition
@@ -97,27 +99,34 @@ namespace loot {
     Plugin::Plugin(loot::Game& game, const std::string& n, const bool headerOnly)
         : PluginMetadata(n), _isEmpty(true), isMaster(false), crc(0), numOverrideRecords(0) {
         try {
-            PluginLoader loader;
-            loader.Load(game, name, headerOnly, false);
-            isMaster = loader.IsMaster();
-            masters = loader.Masters();
-            _isEmpty = loader.IsEmpty();
-            formIDs = loader.FormIDs();
+            boost::filesystem::path filepath = game.DataPath() / name;
+
+            // In case the plugin is ghosted.
+            if (!boost::filesystem::exists(filepath) && boost::filesystem::exists(filepath.string() + ".ghost"))
+                filepath += ".ghost";
+
+            libespm::Plugin plugin(game.LibespmId());
+            plugin.load(filepath, headerOnly);
+
+            isMaster = plugin.isMasterFile();
+            masters = plugin.getMasters();
+            formIDs = plugin.getFormIds();
+            _isEmpty = plugin.getRecordAndGroupCount() == 0;
 
             if (!headerOnly) {
                 BOOST_LOG_TRIVIAL(trace) << name << ": Caching CRC value.";
-                crc = loader.Crc();
+                crc = GetCrc32(filepath);
                 game.CacheCrc(name, crc);
             }
 
             BOOST_LOG_TRIVIAL(trace) << name << ": Counting override FormIDs.";
             for (const auto& formID : formIDs) {
-                if (!boost::iequals(formID.Plugin(), name))
+                if (!boost::iequals(formID.getPluginName(), name))
                     ++numOverrideRecords;
             }
 
             //Also read Bash Tags applied and version string in description.
-            string text = loader.Description();
+            string text = plugin.getDescription();
             BOOST_LOG_TRIVIAL(trace) << name << ": " << "Attempting to read the version from the description.";
             for (size_t i = 0; i < version_checks.size(); ++i) {
                 smatch what;
@@ -165,7 +174,7 @@ namespace loot {
         return !(*this == rhs);
     }
 
-    const std::set<FormID>& Plugin::FormIDs() const {
+    const std::set<libespm::FormId>& Plugin::FormIDs() const {
         return formIDs;
     }
 
@@ -173,7 +182,7 @@ namespace loot {
         //Basically std::set_intersection except with an early exit instead of an append to results.
         //BOOST_LOG_TRIVIAL(trace) << "Checking for FormID overlap between \"" << name << "\" and \"" << plugin.Name() << "\".";
 
-        set<FormID>::const_iterator i = formIDs.begin(),
+        set<FormId>::const_iterator i = formIDs.begin(),
             j = plugin.FormIDs().begin(),
             iend = formIDs.end(),
             jend = plugin.FormIDs().end();
@@ -194,9 +203,9 @@ namespace loot {
         return numOverrideRecords;
     }
 
-    std::set<FormID> Plugin::OverlapFormIDs(const Plugin& plugin) const {
-        set<FormID> otherFormIDs = plugin.FormIDs();
-        set<FormID> overlap;
+    std::set<FormId> Plugin::OverlapFormIDs(const Plugin& plugin) const {
+        set<FormId> otherFormIDs = plugin.FormIDs();
+        set<FormId> overlap;
 
         set_intersection(formIDs.begin(), formIDs.end(), otherFormIDs.begin(), otherFormIDs.end(), inserter(overlap, overlap.end()));
 
@@ -217,21 +226,23 @@ namespace loot {
 
     bool Plugin::IsValid(const Game& game) const {
         BOOST_LOG_TRIVIAL(trace) << "Checking to see if \"" << name << "\" is a valid plugin.";
-        // Rather than just checking the extension, try also parsing the file header, and see if it fails.
-        if (!boost::iends_with(name, ".esm") && !boost::iends_with(name, ".esp")) {
+        // Check the extension, because only plugins with the .esm or .esp
+        // extension (or .ghost, which is trimmed) should be handled by LOOT,
+        // even if the file content is valid.
+        if (!boost::iends_with(name, ".esm") && !boost::iends_with(name, ".esp"))
             return false;
-        }
 
-        try {
-            PluginLoader loader;
-            loader.Load(game, name, true, true);
+        boost::filesystem::path filepath = game.DataPath() / name;
+
+        // In case the plugin is ghosted.
+        if (!boost::filesystem::exists(filepath) && boost::filesystem::exists(filepath.string() + ".ghost"))
+            filepath += ".ghost";
+
+        if (libespm::Plugin::isValid(filepath, game.LibespmId(), true))
             return true;
-        }
-        catch (std::exception& /*e*/) {
-            BOOST_LOG_TRIVIAL(warning) << "The .es(p|m) file \"" << name << "\" is not a valid plugin.";
-            return false;
-        }
-        return true;
+
+        BOOST_LOG_TRIVIAL(warning) << "The .es(p|m) file \"" << name << "\" is not a valid plugin.";
+        return false;
     }
 
     bool Plugin::IsActive(const Game& game) const {
@@ -291,7 +302,7 @@ namespace loot {
     bool Plugin::LoadsBSA(const Game& game) const {
         if (IsRegexPlugin())
             return false;
-        if (game.Id() == Game::tes5) {
+        if (game.Id() == Game::tes5 || game.Id() == Game::fo4) {
             // Skyrim plugins only load BSAs that exactly match their basename.
             return boost::filesystem::exists(game.DataPath() / (name.substr(0, name.length() - 3) + "bsa"));
         }
diff --git a/src/backend/plugin/plugin.h b/src/backend/plugin/plugin.h
index 0118c65e..10e46792 100644
--- a/src/backend/plugin/plugin.h
+++ b/src/backend/plugin/plugin.h
@@ -24,7 +24,6 @@
 #ifndef __LOOT_PLUGIN__
 #define __LOOT_PLUGIN__
 
-#include "../metadata/formid.h"
 #include "../metadata/plugin_metadata.h"
 
 #include <cstdint>
@@ -35,6 +34,8 @@
 
 #include <boost/locale.hpp>
 
+#include <libespm/FormId.h>
+
 namespace loot {
     class Game;
 
@@ -44,7 +45,7 @@ namespace loot {
         Plugin(const std::string& name);
         Plugin(Game& game, const std::string& name, const bool headerOnly);
 
-        const std::set<FormID>& FormIDs() const;
+        const std::set<libespm::FormId>& FormIDs() const;
         std::vector<std::string> Masters() const;
         bool IsMaster() const;  //Checks master bit flag.
         bool IsEmpty() const;
@@ -62,14 +63,14 @@ namespace loot {
 
         //Load ordering functions.
         bool DoFormIDsOverlap(const Plugin& plugin) const;
-        std::set<FormID> OverlapFormIDs(const Plugin& plugin) const;
+        std::set<libespm::FormId> OverlapFormIDs(const Plugin& plugin) const;
 
         //Validity checks.
         bool CheckInstallValidity(const Game& game);  //Checks that reqs and masters are all present, and that no incs are present. Returns true if the plugin is dirty.
     private:
         bool _isEmpty;  // Does the plugin contain any records other than the TES4 header?
         std::vector<std::string> masters;
-        std::set<FormID> formIDs;
+        std::set<libespm::FormId> formIDs;
         std::string version;  //Obtained from description field.
         bool isMaster;
         uint32_t crc;
diff --git a/src/backend/plugin/plugin_loader.cpp b/src/backend/plugin/plugin_loader.cpp
deleted file mode 100644
index f6ac5b01..00000000
--- a/src/backend/plugin/plugin_loader.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*  LOOT
-
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-    Fallout: New Vegas.
-
-    Copyright (C) 2012-2015    WrinklyNinja
-
-    This file is part of LOOT.
-
-    LOOT is free software: you can redistribute
-    it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, either version 3 of
-    the License, or (at your option) any later version.
-
-    LOOT is distributed in the hope that it will
-    be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with LOOT.  If not, see
-    <http://www.gnu.org/licenses/>.
-    */
-
-#include "plugin_loader.h"
-#include "../game/game.h"
-#include "../helpers/helpers.h"
-
-#include <libespm/libespm.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/log/trivial.hpp>
-#include <boost/locale.hpp>
-
-using namespace std;
-
-namespace loot {
-    PluginLoader::PluginLoader() : _isEmpty(true), _isMaster(false), _crc(0) {}
-
-    void PluginLoader::Load(const Game& game,
-                            const std::string& name,
-                            const bool headerOnly,
-                            const bool checkValidityOnly) {
-        espm::File * file = nullptr;
-        espm::Settings espmSettings;
-
-        // Clear existing data.
-        _isEmpty = true;
-        _isMaster = false;
-        _formIDs.clear();
-        _masters.clear();
-        _description.clear();
-        _crc = 0;
-
-        // Get data from file contents using libespm.
-        BOOST_LOG_TRIVIAL(trace) << name << ": " << "Opening with libespm...";
-        boost::filesystem::path filepath = game.DataPath() / name;
-
-        //In case the plugin is ghosted.
-        if (!boost::filesystem::exists(filepath) && boost::filesystem::exists(filepath.string() + ".ghost"))
-            filepath += ".ghost";
-
-        try {
-            if (game.Id() == Game::tes4) {
-                espmSettings = espm::Settings("tes4");
-                file = new espm::tes4::File(filepath, espmSettings, false, headerOnly);
-            }
-            else if (game.Id() == Game::tes5) {
-                espmSettings = espm::Settings("tes5");
-                file = new espm::tes5::File(filepath, espmSettings, false, headerOnly);
-            }
-            else if (game.Id() == Game::fo3) {
-                espmSettings = espm::Settings("fo3");
-                file = new espm::fo3::File(filepath, espmSettings, false, headerOnly);
-            }
-            else {
-                espmSettings = espm::Settings("fonv");
-                file = new espm::fonv::File(filepath, espmSettings, false, headerOnly);
-            }
-
-            // If only wanting to test for valid parsing, quit now.
-            if (checkValidityOnly) {
-                delete file;
-                return;
-            }
-
-            BOOST_LOG_TRIVIAL(trace) << filepath.filename().string() << ": " << "Checking master flag.";
-            _isMaster = file->isMaster(espmSettings);
-
-            BOOST_LOG_TRIVIAL(trace) << filepath.filename().string() << ": " << "Getting masters.";
-            for (const auto& master : file->getMasters()) {
-                _masters.push_back(boost::locale::conv::to_utf<char>(master, "Windows-1252", boost::locale::conv::stop));
-            }
-
-            BOOST_LOG_TRIVIAL(trace) << filepath.filename().string() << ": " << "Number of masters: " << _masters.size();
-
-            if (!headerOnly) {
-                BOOST_LOG_TRIVIAL(trace) << filepath.filename().string() << ": " << "Getting CRC.";
-                _crc = file->crc;
-            }
-
-            BOOST_LOG_TRIVIAL(trace) << name << ": " << "Getting the FormIDs.";
-            vector<uint32_t> records = file->getFormIDs();
-            vector<string> plugins = _masters;
-            plugins.push_back(name);
-            for (const auto &record : records) {
-                _formIDs.insert(FormID(plugins, record));
-            }
-
-            BOOST_LOG_TRIVIAL(trace) << name << ": " << "Checking if plugin is empty.";
-            if (headerOnly) {
-                // Check the header records count.
-                _isEmpty = file->getNumRecords() == 0;
-            }
-            else {
-                _isEmpty = _formIDs.empty();
-            }
-
-            //Also read Bash Tags applied and version string in description.
-            BOOST_LOG_TRIVIAL(trace) << name << ": " << "Reading the description.";
-            _description = boost::locale::conv::to_utf<char>(file->getDescription(), "Windows-1252", boost::locale::conv::stop);
-        }
-        catch (std::exception&) {
-            delete file;
-            throw;
-        }
-
-        BOOST_LOG_TRIVIAL(trace) << name << ": " << "Plugin loading complete.";
-    }
-
-    bool PluginLoader::IsEmpty() const {
-        return _isEmpty;
-    }
-
-    bool PluginLoader::IsMaster() const {
-        return _isMaster;
-    }
-
-    const std::set<FormID>& PluginLoader::FormIDs() const {
-        return _formIDs;
-    }
-
-    std::vector<std::string> PluginLoader::Masters() const {
-        return _masters;
-    }
-
-    std::string PluginLoader::Description() const {
-        return _description;
-    }
-
-    uint32_t PluginLoader::Crc() const {
-        return _crc;
-    }
-}
diff --git a/src/backend/plugin/plugin_loader.h b/src/backend/plugin/plugin_loader.h
deleted file mode 100644
index 99082d05..00000000
--- a/src/backend/plugin/plugin_loader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  LOOT
-
-    A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-    Fallout: New Vegas.
-
-    Copyright (C) 2012-2015    WrinklyNinja
-
-    This file is part of LOOT.
-
-    LOOT is free software: you can redistribute
-    it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, either version 3 of
-    the License, or (at your option) any later version.
-
-    LOOT is distributed in the hope that it will
-    be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with LOOT.  If not, see
-    <http://www.gnu.org/licenses/>.
-    */
-#ifndef __LOOT_PLUGIN_LOADER__
-#define __LOOT_PLUGIN_LOADER__
-
-#include "../metadata/formid.h"
-
-#include <cstdint>
-#include <string>
-#include <vector>
-#include <set>
-
-namespace loot {
-    class Game;
-
-    class PluginLoader {
-    public:
-        PluginLoader();
-
-        void Load(const Game& game,
-                  const std::string& name,
-                  const bool headerOnly,
-                  const bool checkValidityOnly);
-
-        bool IsEmpty() const;
-        bool IsMaster() const;  //Checks master bit flag.
-        const std::set<FormID>& FormIDs() const;
-        std::vector<std::string> Masters() const;
-        std::string Description() const;
-        uint32_t Crc() const;
-    private:
-        bool _isEmpty;
-        bool _isMaster;
-        std::set<FormID> _formIDs;
-        std::vector<std::string> _masters;
-        std::string _description;
-        uint32_t _crc;
-    };
-}
-
-#endif
diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp
index 3d3510f9..6e136107 100644
--- a/src/gui/handler.cpp
+++ b/src/gui/handler.cpp
@@ -612,6 +612,7 @@ namespace loot {
         temp.push_back(Game(Game::tes5).FolderName());
         temp.push_back(Game(Game::fo3).FolderName());
         temp.push_back(Game(Game::fonv).FolderName());
+        temp.push_back(Game(Game::fo4).FolderName());
         return JSON::stringify(temp);
     }
 
diff --git a/src/gui/html/elements/loot-plugin-card.html b/src/gui/html/elements/loot-plugin-card.html
index a403785f..b17b8e7a 100644
--- a/src/gui/html/elements/loot-plugin-card.html
+++ b/src/gui/html/elements/loot-plugin-card.html
@@ -174,7 +174,7 @@ loot-clear-metadata
                     <core-tooltip id="emptyPlugin" label="Empty Plugin" noarrow>
                         <core-icon icon="visibility-off"></core-icon>
                     </core-tooltip>
-                    <core-tooltip id="loadsBSA" label="Loads BSA" noarrow>
+                    <core-tooltip id="loadsBSA" label="Loads Archive" noarrow>
                         <core-icon icon="attachment"></core-icon>
                     </core-tooltip>
                     <core-tooltip id="hasUserEdits" label="Has User Metadata" noarrow>
diff --git a/src/gui/html/elements/loot-plugin-editor.html b/src/gui/html/elements/loot-plugin-editor.html
index 306f43bc..d3f1e85b 100644
--- a/src/gui/html/elements/loot-plugin-editor.html
+++ b/src/gui/html/elements/loot-plugin-editor.html
@@ -134,7 +134,7 @@ loot-editor-close
             <core-tooltip id="emptyPlugin" label="Empty Plugin" noarrow>
                 <core-icon icon="visibility-off"></core-icon>
             </core-tooltip>
-            <core-tooltip id="loadsBSA" label="Loads BSA" noarrow>
+            <core-tooltip id="loadsBSA" label="Loads Archive" noarrow>
                 <core-icon icon="attachment"></core-icon>
             </core-tooltip>
             <core-tooltip label="Apply" noarrow>
diff --git a/src/gui/html/index.html b/src/gui/html/index.html
index 989a17cf..1bec269e 100644
--- a/src/gui/html/index.html
+++ b/src/gui/html/index.html
@@ -233,7 +233,7 @@
 
     <loot-dialog id="about" heading="About LOOT">
         <p>Version <span id="LOOTVersion"></span> (build <span id="LOOTBuild"></span>)</p>
-        <p>Load order optimisation for Oblivion, Skyrim, Fallout 3 and Fallout: New Vegas.</p>
+        <p>Load order optimisation for Oblivion, Skyrim, Fallout 3, Fallout: New Vegas and Fallout 4.</p>
         <p><a href="http://loot.github.io">http://loot.github.io</a></p>
         <p>LOOT is free, but if you want to show your appreciation with some money, donations may be made to WrinklyNinja (LOOT's creator and main developer) using <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HDR3YBGGYCLBG">PayPal</a>, <a href="https://wrinklyninja.github.io/bitcoin/">Bitcoin</a> or <a href="https://flattr.com/submit/auto?user_id=OliverHamlet&url=https://wrinklyninja.github.io&title=LOOT">Flattr</a>.</p>
         <p>Copyright &copy; 2012&ndash;2015 WrinklyNinja</p>
diff --git a/src/gui/html/js/l10n.js b/src/gui/html/js/l10n.js
index 8ee43c4e..f3162730 100644
--- a/src/gui/html/js/l10n.js
+++ b/src/gui/html/js/l10n.js
@@ -61,7 +61,7 @@
             pluginCard.getElementById('activeTick').setAttribute('label', l10n.translate("Active Plugin").fetch());
             pluginCard.getElementById('isMaster').setAttribute('label', l10n.translate("Master File").fetch());
             pluginCard.getElementById('emptyPlugin').setAttribute('label', l10n.translate("Empty Plugin").fetch());
-            pluginCard.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch());
+            pluginCard.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads Archive").fetch());
             pluginCard.getElementById('hasUserEdits').setAttribute('label', l10n.translate("Has User Metadata").fetch());
 
             pluginCard.getElementById('showOnlyConflicts').previousElementSibling.textContent = l10n.translate("Show Only Conflicts").fetch();
@@ -80,7 +80,7 @@
             pluginEditor.getElementById('activeTick').setAttribute('label', l10n.translate("Active Plugin").fetch());
             pluginEditor.getElementById('isMaster').setAttribute('label', l10n.translate("Master File").fetch());
             pluginEditor.getElementById('emptyPlugin').setAttribute('label', l10n.translate("Empty Plugin").fetch());
-            pluginEditor.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch());
+            pluginEditor.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads Archive").fetch());
 
             pluginEditor.getElementById('enableEdits').previousElementSibling.textContent = l10n.translate("Enable Edits").fetch();
             pluginEditor.getElementById('globalPriority').parentElement.parentElement.setAttribute('label', l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch());
diff --git a/src/tests/backend/game/test_game.h b/src/tests/backend/game/test_game.h
index a3b52760..6b653de9 100644
--- a/src/tests/backend/game/test_game.h
+++ b/src/tests/backend/game/test_game.h
@@ -275,17 +275,17 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Skyrim.esm", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_TRUE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Skyrim.esm", 0xCF0),
-        loot::FormID("Skyrim.esm", 0xCF1),
-        loot::FormID("Skyrim.esm", 0xCF2),
-        loot::FormID("Skyrim.esm", 0xCF3),
-        loot::FormID("Skyrim.esm", 0xCF4),
-        loot::FormID("Skyrim.esm", 0xCF5),
-        loot::FormID("Skyrim.esm", 0xCF6),
-        loot::FormID("Skyrim.esm", 0xCF7),
-        loot::FormID("Skyrim.esm", 0xCF8),
-        loot::FormID("Skyrim.esm", 0xCF9),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF3),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF4),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF5),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF6),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF7),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF8),
+        libespm::FormId("Skyrim.esm", std::vector<std::string>(), 0xCF9),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_EQ("5.0", plugin.Version());
@@ -297,17 +297,17 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank.esm", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_TRUE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
-        loot::FormID("Blank.esm", 0xCF4),
-        loot::FormID("Blank.esm", 0xCF5),
-        loot::FormID("Blank.esm", 0xCF6),
-        loot::FormID("Blank.esm", 0xCF7),
-        loot::FormID("Blank.esm", 0xCF8),
-        loot::FormID("Blank.esm", 0xCF9),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF3),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF4),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF5),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF6),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF7),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF8),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF9),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_EQ("5.0", plugin.Version());
@@ -319,16 +319,16 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Different.esm", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_TRUE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank - Different.esm", 0xCEF),
-        loot::FormID("Blank - Different.esm", 0xCF0),
-        loot::FormID("Blank - Different.esm", 0xCF1),
-        loot::FormID("Blank - Different.esm", 0xCF2),
-        loot::FormID("Blank - Different.esm", 0xCF3),
-        loot::FormID("Blank - Different.esm", 0xCF4),
-        loot::FormID("Blank - Different.esm", 0xCF5),
-        loot::FormID("Blank - Different.esm", 0xCF6),
-        loot::FormID("Blank - Different.esm", 0xCF7),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCEF),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF3),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF4),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF5),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF6),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF7),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_EQ("", plugin.Version());
@@ -340,15 +340,15 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Master Dependent.esm", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_TRUE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
-        loot::FormID("Blank - Master Dependent.esm", 0xCEA),
-        loot::FormID("Blank - Master Dependent.esm", 0xCEB),
-        loot::FormID("Blank - Master Dependent.esm", 0xCEC),
-        loot::FormID("Blank - Master Dependent.esm", 0xCED),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF3),
+        libespm::FormId("Blank - Master Dependent.esm", std::vector<std::string>(), 0xCEA),
+        libespm::FormId("Blank - Master Dependent.esm", std::vector<std::string>(), 0xCEB),
+        libespm::FormId("Blank - Master Dependent.esm", std::vector<std::string>(), 0xCEC),
+        libespm::FormId("Blank - Master Dependent.esm", std::vector<std::string>(), 0xCED),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank.esm"
@@ -362,14 +362,14 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Different Master Dependent.esm", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_TRUE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank - Different.esm", 0xCEF),
-        loot::FormID("Blank - Different.esm", 0xCF0),
-        loot::FormID("Blank - Different.esm", 0xCF1),
-        loot::FormID("Blank - Different.esm", 0xCF2),
-        loot::FormID("Blank - Different Master Dependent.esm", 0xCE9),
-        loot::FormID("Blank - Different Master Dependent.esm", 0xCEA),
-        loot::FormID("Blank - Different Master Dependent.esm", 0xCEB),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCEF),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank - Different Master Dependent.esm", std::vector<std::string>(), 0xCE9),
+        libespm::FormId("Blank - Different Master Dependent.esm", std::vector<std::string>(), 0xCEA),
+        libespm::FormId("Blank - Different Master Dependent.esm", std::vector<std::string>(), 0xCEB),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank - Different.esm"
@@ -383,13 +383,13 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esp", 0xCEC),
-        loot::FormID("Blank.esp", 0xCED),
-        loot::FormID("Blank.esp", 0xCEE),
-        loot::FormID("Blank.esp", 0xCEF),
-        loot::FormID("Blank.esp", 0xCF0),
-        loot::FormID("Blank.esp", 0xCF1),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCEC),
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCED),
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCEE),
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCEF),
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCF1),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_EQ("", plugin.Version());
@@ -401,12 +401,12 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Different.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank - Different.esp", 0xCEB),
-        loot::FormID("Blank - Different.esp", 0xCEC),
-        loot::FormID("Blank - Different.esp", 0xCED),
-        loot::FormID("Blank - Different.esp", 0xCEE),
-        loot::FormID("Blank - Different.esp", 0xCEF),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCEB),
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCEC),
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCED),
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCEE),
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCEF),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_EQ("", plugin.Version());
@@ -418,11 +418,11 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Master Dependent.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank - Master Dependent.esp", 0xCE9),
-        loot::FormID("Blank - Master Dependent.esp", 0xCEA),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank - Master Dependent.esp", std::vector<std::string>(), 0xCE9),
+        libespm::FormId("Blank - Master Dependent.esp", std::vector<std::string>(), 0xCEA),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank.esm"
@@ -436,10 +436,10 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Different Master Dependent.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank - Different.esm", 0xCEF),
-        loot::FormID("Blank - Different.esm", 0xCF0),
-        loot::FormID("Blank - Different Master Dependent.esp", 0xCE7),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCEF),
+        libespm::FormId("Blank - Different.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank - Different Master Dependent.esp", std::vector<std::string>(), 0xCE7),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank - Different.esm"
@@ -453,9 +453,9 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Plugin Dependent.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esp", 0xCEC),
-        loot::FormID("Blank - Plugin Dependent.esp", 0xCE7),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esp", std::vector<std::string>(), 0xCEC),
+        libespm::FormId("Blank - Plugin Dependent.esp", std::vector<std::string>(), 0xCE7),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank.esp"
@@ -469,8 +469,8 @@ TEST_F(Game, LoadPlugins) {
     EXPECT_EQ("Blank - Different Plugin Dependent.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank - Different.esp", 0xCEB),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank - Different.esp", std::vector<std::string>(), 0xCEB),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank - Different.esp"
diff --git a/src/tests/backend/game/test_game_settings.h b/src/tests/backend/game/test_game_settings.h
index 79b80623..651cb785 100644
--- a/src/tests/backend/game/test_game_settings.h
+++ b/src/tests/backend/game/test_game_settings.h
@@ -259,7 +259,8 @@ TEST(GetGameSettings, AllMissing) {
         loot::GameSettings(loot::GameSettings::tes4),
         loot::GameSettings(loot::GameSettings::tes5),
         loot::GameSettings(loot::GameSettings::fo3),
-        loot::GameSettings(loot::GameSettings::fonv)
+        loot::GameSettings(loot::GameSettings::fonv),
+        loot::GameSettings(loot::GameSettings::fo4)
     };
 
     EXPECT_FALSE(settings["games"]);
@@ -271,7 +272,8 @@ TEST(GetGameSettings, MissingFallout3) {
     std::list<loot::GameSettings> initial({
         loot::GameSettings(loot::GameSettings::tes4, "folder1"),
         loot::GameSettings(loot::GameSettings::tes5, "folder2"),
-        loot::GameSettings(loot::GameSettings::fonv, "folder3")
+        loot::GameSettings(loot::GameSettings::fonv, "folder3"),
+        loot::GameSettings(loot::GameSettings::fo4, "folder4")
     });
 
     YAML::Node settings;
@@ -281,6 +283,7 @@ TEST(GetGameSettings, MissingFallout3) {
         loot::GameSettings(loot::GameSettings::tes4, "folder1"),
         loot::GameSettings(loot::GameSettings::tes5, "folder2"),
         loot::GameSettings(loot::GameSettings::fonv, "folder3"),
+        loot::GameSettings(loot::GameSettings::fo4, "folder4"),
         loot::GameSettings(loot::GameSettings::fo3)
     };
 
diff --git a/src/tests/backend/metadata/test_formid.h b/src/tests/backend/metadata/test_formid.h
deleted file mode 100644
index 9a4b05ab..00000000
--- a/src/tests/backend/metadata/test_formid.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  LOOT
-
-A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-Fallout: New Vegas.
-
-Copyright (C) 2014-2015    WrinklyNinja
-
-This file is part of LOOT.
-
-LOOT is free software: you can redistribute
-it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation, either version 3 of
-the License, or (at your option) any later version.
-
-LOOT is distributed in the hope that it will
-be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with LOOT.  If not, see
-<http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LOOT_TEST_BACKEND_METADATA_FORMID
-#define LOOT_TEST_BACKEND_METADATA_FORMID
-
-#include "backend/metadata/formid.h"
-#include "tests/fixtures.h"
-
-using loot::FormID;
-
-TEST(FormID, ConstructorsAndDataAccess) {
-    FormID fid;
-
-    EXPECT_EQ("", fid.Plugin());
-    EXPECT_EQ(0, fid.Id());
-
-    fid = FormID("plugin.esp", 1);
-    EXPECT_EQ("plugin.esp", fid.Plugin());
-    EXPECT_EQ(1, fid.Id());
-
-    std::vector<std::string> masters = {
-        "master1.esp",
-        "master2.esp",
-        "plugin.esp"
-    };
-    fid = FormID(masters, 0x01000001);
-    EXPECT_EQ("master2.esp", fid.Plugin());
-    EXPECT_EQ(1, fid.Id());
-
-    fid = FormID(masters, 0x0F000001);
-    EXPECT_EQ("plugin.esp", fid.Plugin());
-    EXPECT_EQ(1, fid.Id());
-}
-
-TEST(FormID, EqualityOperator) {
-    FormID fid1, fid2;
-    EXPECT_TRUE(fid1 == fid2);
-
-    // Not valid conditions, but not evaluating them in this test.
-    fid1 = FormID("plugin.esp", 1);
-    fid2 = FormID("plugin.esp", 1);
-    EXPECT_TRUE(fid1 == fid2);
-
-    fid1 = FormID("plugin.esp", 1);
-    fid2 = FormID("plugin.esp", 2);
-    EXPECT_FALSE(fid1 == fid2);
-
-    fid1 = FormID("plugin1.esp", 1);
-    fid2 = FormID("plugin2.esp", 1);
-    EXPECT_FALSE(fid1 == fid2);
-}
-
-TEST(FormID, LessThanOperator) {
-    FormID fid1, fid2;
-    EXPECT_FALSE(fid1 < fid2);
-    EXPECT_FALSE(fid2 < fid1);
-
-    fid1 = FormID("plugin.esp", 1);
-    fid2 = FormID("Plugin.esp", 1);
-    EXPECT_FALSE(fid1 < fid2);
-    EXPECT_FALSE(fid2 < fid1);
-
-    fid1 = FormID("plugin.esp", 1);
-    fid2 = FormID("plugin.esp", 2);
-    EXPECT_TRUE(fid1 < fid2);
-    EXPECT_FALSE(fid2 < fid1);
-
-    fid1 = FormID("plugin1.esp", 1);
-    fid2 = FormID("Plugin2.esp", 1);
-    EXPECT_TRUE(fid1 < fid2);
-    EXPECT_FALSE(fid2 < fid1);
-}
-
-#endif
diff --git a/src/tests/backend/plugin/test_plugin.h b/src/tests/backend/plugin/test_plugin.h
index 88311d20..4f060b69 100644
--- a/src/tests/backend/plugin/test_plugin.h
+++ b/src/tests/backend/plugin/test_plugin.h
@@ -64,17 +64,17 @@ TEST_F(Plugin, ConstructorsAndDataAccess) {
 
     plugin = loot::Plugin(game, "Blank.esm", false);
     EXPECT_EQ("Blank.esm", plugin.Name());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
-        loot::FormID("Blank.esm", 0xCF4),
-        loot::FormID("Blank.esm", 0xCF5),
-        loot::FormID("Blank.esm", 0xCF6),
-        loot::FormID("Blank.esm", 0xCF7),
-        loot::FormID("Blank.esm", 0xCF8),
-        loot::FormID("Blank.esm", 0xCF9),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF3),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF4),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF5),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF6),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF7),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF8),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF9),
     }), plugin.FormIDs());
     EXPECT_TRUE(plugin.Masters().empty());
     EXPECT_TRUE(plugin.IsMaster());
@@ -86,11 +86,11 @@ TEST_F(Plugin, ConstructorsAndDataAccess) {
     EXPECT_EQ("Blank - Master Dependent.esp", plugin.Name());
     EXPECT_FALSE(plugin.IsEmpty());
     EXPECT_FALSE(plugin.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank - Master Dependent.esp", 0xCE9),
-        loot::FormID("Blank - Master Dependent.esp", 0xCEA),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank - Master Dependent.esp", std::vector<std::string>(), 0xCE9),
+        libespm::FormId("Blank - Master Dependent.esp", std::vector<std::string>(), 0xCEA),
     }), plugin.FormIDs());
     EXPECT_EQ(std::vector<std::string>({
         "Blank.esm"
@@ -259,17 +259,17 @@ TEST_F(Plugin, OverlapFormIDs) {
 
     plugin1 = loot::Plugin(game, "Blank.esm", false);
     plugin2 = loot::Plugin(game, "Blank - Master Dependent.esm", false);
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF3),
     }), plugin1.OverlapFormIDs(plugin2));
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
+    EXPECT_EQ(std::set<libespm::FormId>({
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF0),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF1),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF2),
+        libespm::FormId("Blank.esm", std::vector<std::string>(), 0xCF3),
     }), plugin2.OverlapFormIDs(plugin1));
 }
 
diff --git a/src/tests/backend/plugin/test_plugin_loader.h b/src/tests/backend/plugin/test_plugin_loader.h
deleted file mode 100644
index 60064f75..00000000
--- a/src/tests/backend/plugin/test_plugin_loader.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  LOOT
-
-A load order optimisation tool for Oblivion, Skyrim, Fallout 3 and
-Fallout: New Vegas.
-
-Copyright (C) 2014-2015    WrinklyNinja
-
-This file is part of LOOT.
-
-LOOT is free software: you can redistribute
-it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation, either version 3 of
-the License, or (at your option) any later version.
-
-LOOT is distributed in the hope that it will
-be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with LOOT.  If not, see
-<http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LOOT_TEST_BACKEND_PLUGIN_LOADER
-#define LOOT_TEST_BACKEND_PLUGIN_LOADER
-
-#include "backend/plugin/plugin_loader.h"
-#include "tests/fixtures.h"
-
-class PluginLoader : public SkyrimTest {};
-
-TEST_F(PluginLoader, Constructor) {
-    loot::PluginLoader pl;
-    EXPECT_TRUE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-}
-
-TEST_F(PluginLoader, Load_CheckValidityOnly) {
-    loot::Game game(loot::Game::tes5);
-    game.SetGamePath(dataPath.parent_path());
-    ASSERT_NO_THROW(game.Init(false, localPath));
-
-    loot::PluginLoader pl;
-    EXPECT_NO_THROW(pl.Load(game, "Blank.esm", true, true));
-    EXPECT_TRUE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-
-    EXPECT_ANY_THROW(pl.Load(game, "NotAPlugin.esm", true, true));
-    EXPECT_TRUE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-
-    EXPECT_NO_THROW(pl.Load(game, "Blank.esm", false, true));
-    EXPECT_TRUE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-
-    EXPECT_ANY_THROW(pl.Load(game, "NotAPlugin.esm", false, true));
-    EXPECT_TRUE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-}
-
-TEST_F(PluginLoader, Load_HeaderOnly) {
-    loot::Game game(loot::Game::tes5);
-    game.SetGamePath(dataPath.parent_path());
-    ASSERT_NO_THROW(game.Init(false, localPath));
-
-    loot::PluginLoader pl;
-    EXPECT_NO_THROW(pl.Load(game, "Blank.esm", true, false));
-    EXPECT_FALSE(pl.IsEmpty());
-    EXPECT_TRUE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("v5.0", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-
-    EXPECT_NO_THROW(pl.Load(game, "Blank - Master Dependent.esp", true, false));
-    EXPECT_FALSE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_TRUE(pl.FormIDs().empty());
-    EXPECT_EQ(std::vector<std::string>({
-        "Blank.esm"
-    }), pl.Masters());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0, pl.Crc());
-}
-
-TEST_F(PluginLoader, Load) {
-    loot::Game game(loot::Game::tes5);
-    game.SetGamePath(dataPath.parent_path());
-    ASSERT_NO_THROW(game.Init(false, localPath));
-
-    loot::PluginLoader pl;
-    EXPECT_NO_THROW(pl.Load(game, "Blank.esm", false, false));
-    EXPECT_FALSE(pl.IsEmpty());
-    EXPECT_TRUE(pl.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank.esm", 0xCF2),
-        loot::FormID("Blank.esm", 0xCF3),
-        loot::FormID("Blank.esm", 0xCF4),
-        loot::FormID("Blank.esm", 0xCF5),
-        loot::FormID("Blank.esm", 0xCF6),
-        loot::FormID("Blank.esm", 0xCF7),
-        loot::FormID("Blank.esm", 0xCF8),
-        loot::FormID("Blank.esm", 0xCF9),
-    }), pl.FormIDs());
-    EXPECT_TRUE(pl.Masters().empty());
-    EXPECT_EQ("v5.0", pl.Description());
-    EXPECT_EQ(0x187BE342, pl.Crc());
-
-    EXPECT_NO_THROW(pl.Load(game, "Blank - Master Dependent.esp", false, false));
-    EXPECT_FALSE(pl.IsEmpty());
-    EXPECT_FALSE(pl.IsMaster());
-    EXPECT_EQ(std::set<loot::FormID>({
-        loot::FormID("Blank.esm", 0xCF0),
-        loot::FormID("Blank.esm", 0xCF1),
-        loot::FormID("Blank - Master Dependent.esp", 0xCE9),
-        loot::FormID("Blank - Master Dependent.esp", 0xCEA),
-    }), pl.FormIDs());
-    EXPECT_EQ(std::vector<std::string>({
-        "Blank.esm"
-    }), pl.Masters());
-    EXPECT_EQ("", pl.Description());
-    EXPECT_EQ(0x832152DC, pl.Crc());
-}
-
-#endif
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index 594b52f5..50d3a3ce 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -39,7 +39,6 @@
 #include "backend/metadata/test_condition_grammar.h"
 #include "backend/metadata/test_conditional_metadata.h"
 #include "backend/metadata/test_file.h"
-#include "backend/metadata/test_formid.h"
 #include "backend/metadata/test_location.h"
 #include "backend/metadata/test_message.h"
 #include "backend/metadata/test_message_content.h"
@@ -47,7 +46,6 @@
 #include "backend/metadata/test_plugin_metadata.h"
 #include "backend/metadata/test_tag.h"
 #include "backend/plugin/test_plugin.h"
-#include "backend/plugin/test_plugin_loader.h"
 #include "backend/test_metadata_list.h"
 #include "backend/test_masterlist.h"
 #include "backend/test_plugin_sorter.h"
diff --git a/src/tests/printers.h b/src/tests/printers.h
index 3431ace3..89fe9f5a 100644
--- a/src/tests/printers.h
+++ b/src/tests/printers.h
@@ -30,7 +30,6 @@ along with LOOT.  If not, see
 #include <gtest/gtest.h>
 
 #include "backend/metadata/file.h"
-#include "backend/metadata/formid.h"
 #include "backend/metadata/location.h"
 #include "backend/metadata/message.h"
 #include "backend/metadata/message_content.h"
@@ -47,14 +46,6 @@ namespace loot {
             << ")";
     }
 
-    void PrintTo(const FormID& value, ::std::ostream* os) {
-        *os << "loot::FormID(\"" << value.Plugin() << "\", 0x"
-            << std::hex << std::uppercase
-            << value.Id()
-            << std::nouppercase << std::dec
-            << ")";
-    }
-
     void PrintTo(const Location& value, ::std::ostream* os) {
         *os << "loot::Location(\"" << value.URL() << "\", "
             << "\"" << value.Name() << "\", "