From 83f9af3d3e0022b5b1efcc44d0f044c3b24fa034 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Mon, 6 Dec 2021 03:51:08 -0600
Subject: [PATCH 01/43] First pass for Qt6 compatibility

---
 src/directoryrefresher.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/directoryrefresher.h b/src/directoryrefresher.h
index 2e6de1a06..49eb15be1 100644
--- a/src/directoryrefresher.h
+++ b/src/directoryrefresher.h
@@ -54,6 +54,7 @@ class DirectoryRefresher : public QObject
     int priority;
   };
 
+
   DirectoryRefresher(std::size_t threadCount);
 
   /**

From 0b6afd6a9a39c60b5420e40189bc0ac60a4766ba Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Mon, 23 Dec 2019 13:53:56 -0600
Subject: [PATCH 02/43] Add new API connection to retrieve game info

---
 src/nexusinterface.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++
 src/nexusinterface.h   | 38 +++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 2c536b144..00ecdae34 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -91,6 +91,11 @@ void NexusBridge::requestToggleTracking(QString gameName, int modID, bool track,
                                                          userData, m_SubModule));
 }
 
+void NexusBridge::requestGameInfo(QString gameName, QVariant userData)
+{
+  m_RequestIDs.insert(m_Interface->requestGameInfo(gameName, this, userData, m_SubModule));
+}
+
 void NexusBridge::nxmDescriptionAvailable(QString gameName, int modID,
                                           QVariant userData, QVariant resultData,
                                           int requestID)
@@ -194,6 +199,15 @@ void NexusBridge::nxmTrackingToggled(QString gameName, int modID, QVariant userD
   }
 }
 
+void NexusBridge::nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID)
+{
+  std::set<int>::iterator iter = m_RequestIDs.find(requestID);
+  if (iter != m_RequestIDs.end()) {
+    m_RequestIDs.erase(iter);
+    emit gameInfoAvailable(gameName, userData, resultData);
+  }
+}
+
 void NexusBridge::nxmRequestFailed(QString gameName, int modID, int fileID,
                                    QVariant userData, int requestID, int errorCode,
                                    const QString& errorMessage)
@@ -735,6 +749,26 @@ int NexusInterface::requestToggleTracking(QString gameName, int modID, bool trac
   return requestInfo.m_ID;
 }
 
+int NexusInterface::requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule, MOBase::IPluginGame const* game)
+{
+  if (m_User.shouldThrottle()) {
+    throttledWarning(m_User);
+    return -1;
+  }
+
+  NXMRequestInfo requestInfo(NXMRequestInfo::TYPE_GAMEINFO, userData, subModule, game);
+  m_RequestQueue.enqueue(requestInfo);
+
+  connect(this, SIGNAL(nxmGameInfoAvailable(QString, QVariant, QVariant, int)),
+    receiver, SLOT(nxmGameInfoAvailable(QString, QVariant, QVariant, int)), Qt::UniqueConnection);
+
+  connect(this, SIGNAL(nxmRequestFailed(QString, int, int, QVariant, int, QNetworkReply::NetworkError, QString)),
+    receiver, SLOT(nxmRequestFailed(QString, int, int, QVariant, int, QNetworkReply::NetworkError, QString)), Qt::UniqueConnection);
+
+  nextRequest();
+  return requestInfo.m_ID;
+}
+
 int NexusInterface::requestInfoFromMd5(QString gameName, QByteArray& hash,
                                        QObject* receiver, QVariant userData,
                                        const QString& subModule,
@@ -1201,6 +1235,30 @@ NexusInterface::NXMRequestInfo::NXMRequestInfo(
       m_Endorse(false), m_Track(false), m_Hash(QByteArray())
 {}
 
+NexusInterface::NXMRequestInfo::NXMRequestInfo(Type type
+  , QVariant userData
+  , const QString & subModule
+  , MOBase::IPluginGame const *game
+)
+  : m_ModID(0)
+  , m_ModVersion("0")
+  , m_FileID(0)
+  , m_Reply(nullptr)
+  , m_Type(type)
+  , m_UpdatePeriod(UpdatePeriod::NONE)
+  , m_UserData(userData)
+  , m_Timeout(nullptr)
+  , m_Reroute(false)
+  , m_ID(s_NextID.fetchAndAddAcquire(1))
+  , m_URL(get_management_url())
+  , m_SubModule(subModule)
+  , m_NexusGameID(game->nexusGameID())
+  , m_GameName(game->gameNexusName())
+  , m_Endorse(false)
+  , m_Track(false)
+  , m_Hash(QByteArray())
+{}
+
 NexusInterface::NXMRequestInfo::NXMRequestInfo(
     int modID, int fileID, NexusInterface::NXMRequestInfo::Type type, QVariant userData,
     const QString& subModule, MOBase::IPluginGame const* game)
diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index 331ce55d4..95e461688 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -113,6 +113,12 @@ class NexusBridge : public MOBase::IModRepositoryBridge
   virtual void requestToggleTracking(QString gameName, int modID, bool track,
                                      QVariant userData);
 
+  /**
+   * @brief requestGameInfo
+   * @param userData user data to be returned with the result
+   */
+  virtual void requestGameInfo(QString gameName, QVariant userData);
+
 public slots:
 
   void nxmDescriptionAvailable(QString gameName, int modID, QVariant userData,
@@ -129,6 +135,7 @@ public slots:
   void nxmTrackedModsAvailable(QVariant userData, QVariant resultData, int requestID);
   void nxmTrackingToggled(QString gameName, int modID, QVariant userData, bool tracked,
                           int requestID);
+  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID);
   void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
                         int requestID, int errorCode, const QString& errorMessage);
 
@@ -444,6 +451,34 @@ class NexusInterface : public QObject
                             QVariant userData, const QString& subModule,
                             MOBase::IPluginGame const* game);
 
+  /**
+  * @param gameName the game short name to support multiple game sources
+  * @brief toggle tracking state of the mod
+  * @param modID id of the mod
+  * @param track true if the mod should be tracked, false for not tracked
+  * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)
+  * @param userData user data to be returned with the result
+  * @param game the game with which the mods are associated
+  * @return int an id to identify the request
+  */
+  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule)
+  {
+    return requestGameInfo(gameName, receiver, userData, subModule, getGame(gameName));
+  }
+
+  /**
+  * @param gameName the game short name to support multiple game sources
+  * @brief toggle tracking state of the mod
+  * @param modID id of the mod
+  * @param track true if the mod should be tracked, false for not tracked
+  * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)
+  * @param userData user data to be returned with the result
+  * @param game the game with which the mods are associated
+  * @return int an id to identify the request
+  */
+  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule,
+    MOBase::IPluginGame const* game);
+
   /**
    *
    */
@@ -552,6 +587,7 @@ class NexusInterface : public QObject
   void nxmTrackedModsAvailable(QVariant userData, QVariant resultData, int requestID);
   void nxmTrackingToggled(QString gameName, int modID, QVariant userData, bool tracked,
                           int requestID);
+  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID);
   void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
                         int requestID, int errorCode, const QString& errorString);
   void requestsChanged(const APIStats& stats, const APIUserAccount& user);
@@ -592,6 +628,7 @@ private slots:
       TYPE_TOGGLETRACKING,
       TYPE_TRACKEDMODS,
       TYPE_FILEINFO_MD5,
+      TYPE_GAMEINFO,
     } m_Type;
     UpdatePeriod m_UpdatePeriod;
     QVariant m_UserData;
@@ -614,6 +651,7 @@ private slots:
                    const QString& subModule, MOBase::IPluginGame const* game);
     NXMRequestInfo(int modID, int fileID, Type type, QVariant userData,
                    const QString& subModule, MOBase::IPluginGame const* game);
+    NXMRequestInfo(Type type, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);
     NXMRequestInfo(Type type, QVariant userData, const QString& subModule);
     NXMRequestInfo(UpdatePeriod period, Type type, QVariant userData,
                    const QString& subModule, MOBase::IPluginGame const* game);

From 4fd45b937c0577a0c5c1699726e8132b97be8f5d Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Mon, 23 Dec 2019 15:58:21 -0600
Subject: [PATCH 03/43] WIP: Initial changes to fetch nexus categories

---
 src/categories.cpp       |  208 ++++---
 src/categories.h         |   45 +-
 src/categoriesdialog.cpp |   15 +-
 src/filterlist.cpp       |   25 +-
 src/filterlist.h         |    6 +-
 src/mainwindow.cpp       | 1175 +++++++++++++++++++++++++++++++++++++-
 src/mainwindow.h         |    4 +-
 7 files changed, 1340 insertions(+), 138 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 70efd7060..e64d35c3d 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -29,6 +29,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QList>
 #include <QObject>
 
+#include "nexusinterface.h"
+
 using namespace MOBase;
 
 CategoryFactory* CategoryFactory::s_Instance = nullptr;
@@ -38,6 +40,13 @@ QString CategoryFactory::categoriesFilePath()
   return qApp->property("dataPath").toString() + "/categories.dat";
 }
 
+
+QString CategoryFactory::nexusMappingFilePath()
+{
+  return qApp->property("dataPath").toString() + "/nexuscatmap.dat";
+}
+
+
 CategoryFactory::CategoryFactory()
 {
   atexit(&cleanup);
@@ -48,20 +57,18 @@ void CategoryFactory::loadCategories()
   reset();
 
   QFile categoryFile(categoriesFilePath());
+  bool needLoad = false;
 
   if (!categoryFile.open(QIODevice::ReadOnly)) {
-    loadDefaultCategories();
+    needLoad = true;
   } else {
     int lineNum = 0;
     while (!categoryFile.atEnd()) {
       QByteArray line = categoryFile.readLine();
       ++lineNum;
       QList<QByteArray> cells = line.split('|');
-      if (cells.count() != 4) {
-        log::error("invalid category line {}: {} ({} cells)", lineNum, line.constData(),
-                   cells.count());
-      } else {
-        std::vector<int> nexusIDs;
+      if (cells.count() == 4) {
+        std::vector<NexusCategory> nexusCats;
         if (cells[2].length() > 0) {
           QList<QByteArray> nexusIDStrings = cells[2].split(',');
           for (QList<QByteArray>::iterator iter = nexusIDStrings.begin();
@@ -69,9 +76,9 @@ void CategoryFactory::loadCategories()
             bool ok  = false;
             int temp = iter->toInt(&ok);
             if (!ok) {
-              log::error("invalid category id {}", iter->constData());
+              log::error(tr("invalid category id {}"), iter->constData());
             }
-            nexusIDs.push_back(temp);
+            nexusCats.push_back(NexusCategory("Unknown", temp));
           }
         }
         bool cell0Ok = true;
@@ -79,23 +86,63 @@ void CategoryFactory::loadCategories()
         int id       = cells[0].toInt(&cell0Ok);
         int parentID = cells[3].trimmed().toInt(&cell3Ok);
         if (!cell0Ok || !cell3Ok) {
-          log::error("invalid category line {}: {}", lineNum, line.constData());
+          log::error(tr("invalid category line {}: {}"), lineNum, line.constData());
         }
-        addCategory(id, QString::fromUtf8(cells[1].constData()), nexusIDs, parentID);
+        addCategory(id, QString::fromUtf8(cells[1].constData()), nexusCats, parentID);
+      } else if (cells.count() == 3) {
+          bool cell0Ok = true;
+          bool cell3Ok = true;
+          int id = cells[0].toInt(&cell0Ok);
+          int parentID = cells[2].trimmed().toInt(&cell3Ok);
+          if (!cell0Ok || !cell3Ok) {
+            log::error(tr("invalid category line {}: {}"), lineNum, line.constData());
+          }
+
+          addCategory(id, QString::fromUtf8(cells[1].constData()), std::vector<NexusCategory>(), parentID);
+      } else {
+        log::error(
+          tr("invalid category line {}: {} ({} cells)"),
+          lineNum, line.constData(), cells.count());
       }
     }
     categoryFile.close();
+
+    QFile nexusMapFile(nexusMappingFilePath());
+    if (!nexusMapFile.open(QIODevice::ReadOnly)) {
+      needLoad = true;
+    } else {
+      int nexLineNum = 0;
+      while (!nexusMapFile.atEnd()) {
+        QByteArray nexLine = nexusMapFile.readLine();
+        ++nexLineNum;
+        QList<QByteArray> nexCells = nexLine.split('|');
+        std::vector<NexusCategory> nexusCats;
+        QString nexName = nexCells[1];
+        bool ok = false;
+        int nexID = nexCells[2].toInt(&ok);
+        if (!ok) {
+          log::error(tr("invalid nexus ID {}"), nexCells[2].constData());
+        }
+        int catID = nexCells[0].toInt(&ok);
+        if (!ok) {
+          log::error(tr("invalid category id {}"), nexCells[0].constData());
+        }
+        m_NexusMap[NexusCategory(nexName, nexID)] = catID;
+      }
+    }
+    nexusMapFile.close();
   }
   std::sort(m_Categories.begin(), m_Categories.end());
   setParents();
+  if (needLoad) loadDefaultCategories();
 }
 
-CategoryFactory& CategoryFactory::instance()
+CategoryFactory* CategoryFactory::instance()
 {
   if (s_Instance == nullptr) {
     s_Instance = new CategoryFactory;
   }
-  return *s_Instance;
+  return s_Instance;
 }
 
 void CategoryFactory::reset()
@@ -106,7 +153,7 @@ void CategoryFactory::reset()
   // 43 = Savegames (makes no sense to install them through MO)
   // 45 = Videos and trailers
   // 87 = Miscelanous
-  addCategory(0, "None", {4, 28, 43, 45, 87}, 0);
+  addCategory(0, "None", std::vector<NexusCategory>(), 0);
 }
 
 void CategoryFactory::setParents()
@@ -139,7 +186,7 @@ void CategoryFactory::saveCategories()
   QFile categoryFile(categoriesFilePath());
 
   if (!categoryFile.open(QIODevice::WriteOnly)) {
-    reportError(QObject::tr("Failed to save custom categories"));
+    reportError(tr("Failed to save custom categories"));
     return;
   }
 
@@ -154,13 +201,28 @@ void CategoryFactory::saveCategories()
         .append("|")
         .append(iter->m_Name.toUtf8())
         .append("|")
-        .append(VectorJoin(iter->m_NexusIDs, ",").toUtf8())
-        .append("|")
         .append(QByteArray::number(iter->m_ParentID))
         .append("\n");
     categoryFile.write(line);
   }
   categoryFile.close();
+
+  QFile nexusMapFile(nexusMappingFilePath());
+
+  if (!nexusMapFile.open(QIODevice::WriteOnly)) {
+    reportError(tr("Failed to save nexus category mappings"));
+    return;
+  }
+
+  nexusMapFile.resize(0);
+  QByteArray line;
+  for (auto iter = m_NexusMap.begin(); iter != m_NexusMap.end(); ++iter) {
+    line.append(iter->first.m_Name).append("|");
+    line.append(iter->first.m_ID).append("|");
+    line.append(iter->second).append("\n");
+    categoryFile.write(line);
+  }
+  categoryFile.close();
 }
 
 unsigned int
@@ -175,97 +237,55 @@ CategoryFactory::countCategories(std::function<bool(const Category& category)> f
   return result;
 }
 
-int CategoryFactory::addCategory(const QString& name, const std::vector<int>& nexusIDs,
-                                 int parentID)
+int CategoryFactory::addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID)
 {
   int id = 1;
   while (m_IDMap.find(id) != m_IDMap.end()) {
     ++id;
   }
-  addCategory(id, name, nexusIDs, parentID);
+  addCategory(id, name, nexusCats, parentID);
 
   saveCategories();
   return id;
 }
 
-void CategoryFactory::addCategory(int id, const QString& name,
-                                  const std::vector<int>& nexusIDs, int parentID)
+void CategoryFactory::addCategory(int id, const QString& name, int parentID)
 {
   int index = static_cast<int>(m_Categories.size());
-  m_Categories.push_back(Category(index, id, name, nexusIDs, parentID));
-  for (int nexusID : nexusIDs) {
-    m_NexusMap[nexusID] = index;
-  }
+  m_Categories.push_back(Category(index, id, name, parentID));
   m_IDMap[id] = index;
 }
 
+void CategoryFactory::addCategory(int id, const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID)
+{
+  for (auto nexusCat : nexusCats) {
+    m_NexusMap[nexusCat] = id;
+  }
+  addCategory(id, name, parentID);
+}
+
+
 void CategoryFactory::loadDefaultCategories()
 {
   // the order here is relevant as it defines the order in which the
   // mods appear in the combo box
-  addCategory(1, "Animations", {2, 4, 51}, 0);
-  addCategory(52, "Poses", {1, 29}, 1);
-  addCategory(2, "Armour", {2, 5, 54}, 0);
-  addCategory(53, "Power Armor", {1, 53}, 2);
-  addCategory(3, "Audio", {3, 33, 35, 106}, 0);
-  addCategory(38, "Music", {2, 34, 61}, 0);
-  addCategory(39, "Voice", {2, 36, 107}, 0);
-  addCategory(5, "Clothing", {2, 9, 60}, 0);
-  addCategory(41, "Jewelry", {1, 102}, 5);
-  addCategory(42, "Backpacks", {1, 49}, 5);
-  addCategory(6, "Collectables", {2, 10, 92}, 0);
-  addCategory(28, "Companions", {3, 11, 66, 96}, 0);
-  addCategory(7, "Creatures, Mounts, & Vehicles", {4, 12, 65, 83, 101}, 0);
-  addCategory(8, "Factions", {2, 16, 25}, 0);
-  addCategory(9, "Gameplay", {2, 15, 24}, 0);
-  addCategory(27, "Combat", {1, 77}, 9);
-  addCategory(43, "Crafting", {2, 50, 100}, 9);
-  addCategory(48, "Overhauls", {2, 24, 79}, 9);
-  addCategory(49, "Perks", {1, 27}, 9);
-  addCategory(54, "Radio", {1, 31}, 9);
-  addCategory(55, "Shouts", {1, 104}, 9);
-  addCategory(22, "Skills & Levelling", {2, 46, 73}, 9);
-  addCategory(58, "Weather & Lighting", {1, 56}, 9);
-  addCategory(44, "Equipment", {1, 44}, 43);
-  addCategory(45, "Home/Settlement", {1, 45}, 43);
-  addCategory(10, "Body, Face, & Hair", {2, 17, 26}, 0);
-  addCategory(56, "Tattoos", {1, 57}, 10);
-  addCategory(40, "Character Presets", {1, 58}, 0);
-  addCategory(11, "Items", {2, 27, 85}, 0);
-  addCategory(32, "Mercantile", {2, 23, 69}, 0);
-  addCategory(37, "Ammo", {1, 3}, 11);
-  addCategory(19, "Weapons", {2, 41, 55}, 11);
-  addCategory(36, "Weapon & Armour Sets", {1, 42}, 11);
-  addCategory(23, "Player Homes", {2, 28, 67}, 0);
-  addCategory(25, "Castles & Mansions", {1, 68}, 23);
-  addCategory(51, "Settlements", {1, 48}, 23);
-  addCategory(12, "Locations", {10, 20, 21, 22, 30, 47, 70, 88, 89, 90, 91}, 0);
-  addCategory(4, "Cities", {1, 53}, 12);
-  addCategory(31, "Landscape Changes", {1, 58}, 0);
-  addCategory(29, "Environment", {2, 14, 74}, 0);
-  addCategory(30, "Immersion", {2, 51, 78}, 0);
-  addCategory(20, "Magic", {3, 75, 93, 94}, 0);
-  addCategory(21, "Models & Textures", {2, 19, 29}, 0);
-  addCategory(33, "Modders resources", {2, 18, 82}, 0);
-  addCategory(13, "NPCs", {3, 22, 33, 99}, 0);
-  addCategory(24, "Bugfixes", {2, 6, 95}, 0);
-  addCategory(14, "Patches", {2, 25, 84}, 24);
-  addCategory(35, "Utilities", {2, 38, 39}, 0);
-  addCategory(26, "Cheats", {1, 8}, 0);
-  addCategory(15, "Quests", {2, 30, 35}, 0);
-  addCategory(16, "Races & Classes", {1, 34}, 0);
-  addCategory(34, "Stealth", {1, 76}, 0);
-  addCategory(17, "UI", {2, 37, 42}, 0);
-  addCategory(18, "Visuals", {2, 40, 62}, 0);
-  addCategory(50, "Pip-Boy", {1, 52}, 18);
-  addCategory(46, "Shader Presets", {3, 13, 97, 105}, 0);
-  addCategory(47, "Miscellaneous", {2, 2, 28}, 0);
+  if (QMessageBox::question(nullptr, tr("Load Nexus Categories?"),
+    tr("This is either a new or old instance which lacks modern Nexus category mappings. Would you like to import and map categories from Nexus now?"),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit requestNexusCategories();
+  }
+}
+
+
+void CategoryFactory::mapNexusCategories(QString, QVariant, QVariant result)
+{
+
 }
 
 int CategoryFactory::getParentID(unsigned int index) const
 {
   if (index >= m_Categories.size()) {
-    throw MyException(QObject::tr("invalid category index: %1").arg(index));
+    throw MyException(tr("invalid category index: %1").arg(index));
   }
 
   return m_Categories[index].m_ParentID;
@@ -303,7 +323,7 @@ bool CategoryFactory::isDescendantOfImpl(int id, int parentID,
       return isDescendantOfImpl(m_Categories[index].m_ParentID, parentID, seen);
     }
   } else {
-    log::warn("{} is no valid category id", id);
+    log::warn(tr("{} is no valid category id"), id);
     return false;
   }
 }
@@ -311,7 +331,7 @@ bool CategoryFactory::isDescendantOfImpl(int id, int parentID,
 bool CategoryFactory::hasChildren(unsigned int index) const
 {
   if (index >= m_Categories.size()) {
-    throw MyException(QObject::tr("invalid category index: %1").arg(index));
+    throw MyException(tr("invalid category index: %1").arg(index));
   }
 
   return m_Categories[index].m_HasChildren;
@@ -320,7 +340,7 @@ bool CategoryFactory::hasChildren(unsigned int index) const
 QString CategoryFactory::getCategoryName(unsigned int index) const
 {
   if (index >= m_Categories.size()) {
-    throw MyException(QObject::tr("invalid category index: %1").arg(index));
+    throw MyException(tr("invalid category index: %1").arg(index));
   }
 
   return m_Categories[index].m_Name;
@@ -388,7 +408,7 @@ QString CategoryFactory::getCategoryNameByID(int id) const
 int CategoryFactory::getCategoryID(unsigned int index) const
 {
   if (index >= m_Categories.size()) {
-    throw MyException(QObject::tr("invalid category index: %1").arg(index));
+    throw MyException(tr("invalid category index: %1").arg(index));
   }
 
   return m_Categories[index].m_ID;
@@ -398,7 +418,7 @@ int CategoryFactory::getCategoryIndex(int ID) const
 {
   std::map<int, unsigned int>::const_iterator iter = m_IDMap.find(ID);
   if (iter == m_IDMap.end()) {
-    throw MyException(QObject::tr("invalid category id: %1").arg(ID));
+    throw MyException(tr("invalid category id: %1").arg(ID));
   }
   return iter->second;
 }
@@ -419,12 +439,14 @@ int CategoryFactory::getCategoryID(const QString& name) const
 
 unsigned int CategoryFactory::resolveNexusID(int nexusID) const
 {
-  std::map<int, unsigned int>::const_iterator iter = m_NexusMap.find(nexusID);
-  if (iter != m_NexusMap.end()) {
-    log::debug("nexus category id {} maps to internal {}", nexusID, iter->second);
-    return iter->second;
+  auto result = std::find_if(m_NexusMap.begin(), m_NexusMap.end(), [nexusID](const std::pair<NexusCategory, unsigned int> el) {
+    return el.first.m_ID == nexusID;
+    });
+  if (result != m_NexusMap.end()) {
+    log::debug(tr("nexus category id {} maps to internal {}"), nexusID, result->second);
+    return result->second;
   } else {
-    log::debug("nexus category id {} not mapped", nexusID);
+    log::debug(tr("nexus category id {} not mapped"), nexusID);
     return 0U;
   }
 }
diff --git a/src/categories.h b/src/categories.h
index b938bd195..232288a73 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -31,8 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
  *to look up categories, optimized to where the request comes from. Therefore be very
  *careful which of the two you have available
  **/
-class CategoryFactory
-{
+class CategoryFactory : QObject {
+  Q_OBJECT;
 
   friend class CategoriesDialog;
 
@@ -53,19 +53,14 @@ class CategoryFactory
   };
 
 public:
-  struct Category
-  {
-    Category(int sortValue, int id, const QString& name,
-             const std::vector<int>& nexusIDs, int parentID)
-        : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
-          m_NexusIDs(nexusIDs), m_ParentID(parentID)
-    {}
+  struct Category {
+    Category(int sortValue, int id, const QString& name, int parentID)
+      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false), m_ParentID(parentID) {}
     int m_SortValue;
     int m_ID;
     int m_ParentID;
     bool m_HasChildren;
     QString m_Name;
-    std::vector<int> m_NexusIDs;
 
     friend bool operator<(const Category& LHS, const Category& RHS)
     {
@@ -73,6 +68,13 @@ class CategoryFactory
     }
   };
 
+  struct NexusCategory {
+    NexusCategory(const QString &name, const int nexusID)
+      : m_Name(name), m_ID(nexusID) {}
+    QString m_Name;
+    int m_ID;
+  };
+
 public:
   /**
    * @brief reset the list of categories
@@ -89,7 +91,7 @@ class CategoryFactory
    **/
   void saveCategories();
 
-  int addCategory(const QString& name, const std::vector<int>& nexusIDs, int parentID);
+  int addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID);
 
   /**
    * @brief retrieve the number of available categories
@@ -183,20 +185,33 @@ class CategoryFactory
    *
    * @return the reference to the singleton
    **/
-  static CategoryFactory& instance();
+  static CategoryFactory* instance();
 
   /**
    * @return path to the file that contains the categories list
    */
   static QString categoriesFilePath();
 
+  /**
+   * @return path to the file that contains the nexus category mappings
+   */
+  static QString nexusMappingFilePath();
+
+public slots:
+
+  void mapNexusCategories(QString, QVariant, QVariant data);
+
+signals:
+
+  void requestNexusCategories();
+
 private:
   CategoryFactory();
 
   void loadDefaultCategories();
 
-  void addCategory(int id, const QString& name, const std::vector<int>& nexusID,
-                   int parentID);
+  void addCategory(int id, const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID);
+  void addCategory(int id, const QString& name, int parentID);
 
   void setParents();
 
@@ -207,7 +222,7 @@ class CategoryFactory
 
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
-  std::map<int, unsigned int> m_NexusMap;
+  std::map<NexusCategory, unsigned int> m_NexusMap;
 
 private:
   // called by isDescendantOf()
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 99a931efa..70759419a 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -132,8 +132,8 @@ void CategoriesDialog::cellChanged(int row, int)
 
 void CategoriesDialog::commitChanges()
 {
-  CategoryFactory& categories = CategoryFactory::instance();
-  categories.reset();
+  CategoryFactory* categories = CategoryFactory::instance();
+  categories->reset();
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
     int index             = ui->categoriesTable->verticalHeader()->logicalIndex(i);
@@ -145,13 +145,14 @@ void CategoriesDialog::commitChanges()
       nexusIDs.push_back(iter->toInt());
     }
 
-    categories.addCategory(ui->categoriesTable->item(index, 0)->text().toInt(),
-                           ui->categoriesTable->item(index, 1)->text(), nexusIDs,
-                           ui->categoriesTable->item(index, 3)->text().toInt());
+    categories->addCategory(
+          ui->categoriesTable->item(index, 0)->text().toInt(),
+          ui->categoriesTable->item(index, 1)->text(), nexusIDs,
+          ui->categoriesTable->item(index, 3)->text().toInt());
   }
-  categories.setParents();
+  categories->setParents();
 
-  categories.saveCategories();
+  categories->saveCategories();
 }
 
 void CategoriesDialog::refreshIDs()
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index d0c7199ec..548532274 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -187,9 +187,9 @@ class CriteriaItemFilter : public QObject
   }
 };
 
-FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore& core,
-                       CategoryFactory& factory)
-    : ui(ui), m_core(core), m_factory(factory)
+
+FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, CategoryFactory* factory)
+  : ui(ui), m_Organizer(organizer), m_factory(factory)
 {
   auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
     return cycleItem(item, dir);
@@ -274,15 +274,15 @@ void FilterList::addContentCriteria()
 void FilterList::addCategoryCriteria(QTreeWidgetItem* root,
                                      const std::set<int>& categoriesUsed, int targetID)
 {
-  const auto count = static_cast<unsigned int>(m_factory.numCategories());
+  const auto count = static_cast<unsigned int>(m_factory->numCategories());
   for (unsigned int i = 1; i < count; ++i) {
-    if (m_factory.getParentID(i) == targetID) {
-      int categoryID = m_factory.getCategoryID(i);
+    if (m_factory->getParentID(i) == targetID) {
+      int categoryID = m_factory->getCategoryID(i);
       if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
         QTreeWidgetItem* item =
-            addCriteriaItem(root, m_factory.getCategoryName(i), categoryID,
-                            ModListSortProxy::TypeCategory);
-        if (m_factory.hasChildren(i)) {
+          addCriteriaItem(root, m_factory->getCategoryName(i),
+            categoryID, ModListSortProxy::TypeCategory);
+        if (m_factory->hasChildren(i)) {
           addCategoryCriteria(item, categoriesUsed, categoryID);
         }
       }
@@ -294,8 +294,9 @@ void FilterList::addSpecialCriteria(int type)
 {
   const auto sc = static_cast<CategoryFactory::SpecialCategories>(type);
 
-  addCriteriaItem(nullptr, m_factory.getSpecialCategoryName(sc), type,
-                  ModListSortProxy::TypeSpecial);
+  addCriteriaItem(
+    nullptr, m_factory->getSpecialCategoryName(sc),
+    type, ModListSortProxy::TypeSpecial);
 }
 
 void FilterList::refresh()
@@ -332,7 +333,7 @@ void FilterList::refresh()
           log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
           break;
         }
-        currentID = m_factory.getParentID(m_factory.getCategoryIndex(currentID));
+        currentID = m_factory->getParentID(m_factory->getCategoryIndex(currentID));
       }
     }
   }
diff --git a/src/filterlist.h b/src/filterlist.h
index f572762e7..7bcbdc0f0 100644
--- a/src/filterlist.h
+++ b/src/filterlist.h
@@ -17,7 +17,7 @@ class FilterList : public QObject
   Q_OBJECT;
 
 public:
-  FilterList(Ui::MainWindow* ui, OrganizerCore& organizer, CategoryFactory& factory);
+  FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, CategoryFactory* factory);
 
   void restoreState(const Settings& s);
   void saveState(Settings& s) const;
@@ -35,8 +35,8 @@ class FilterList : public QObject
   class CriteriaItem;
 
   Ui::MainWindow* ui;
-  OrganizerCore& m_core;
-  CategoryFactory& m_factory;
+  OrganizerCore* m_Organizer;
+  CategoryFactory* m_factory;
 
   bool onClick(QMouseEvent* e);
   void onItemActivated(QTreeWidgetItem* item);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ebe7da98d..37113954f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -290,6 +290,19 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
     ui->statusBar->setAPI(ni.getAPIStats(), ni.getAPIUserAccount());
   }
 
+  languageChange(settings.interface().language());
+
+  m_CategoryFactory->loadCategories();
+  m_Filters.reset(new FilterList(ui, &m_OrganizerCore, m_CategoryFactory));
+
+  connect(
+    m_Filters.get(), &FilterList::criteriaChanged,
+    [&](auto&& v) { onFiltersCriteria(v); });
+
+  connect(
+    m_Filters.get(), &FilterList::optionsChanged,
+    [&](auto&& mode, auto&& sep) { onFiltersOptions(mode, sep); });
+
   ui->logList->setCore(m_OrganizerCore);
 
   setupToolbar();
@@ -406,9 +419,13 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore,
           SLOT(nexusApi()));
 
-  connect(NexusInterface::instance().getAccessManager(),
-          SIGNAL(credentialsReceived(const APIUserAccount&)), this,
-          SLOT(updateWindowTitle(const APIUserAccount&)));
+  connect(m_CategoryFactory, SIGNAL(requestNexusCategories()), &m_OrganizerCore, SLOT(requestNexusCategories()));
+
+  connect(
+    NexusInterface::instance(&pluginContainer)->getAccessManager(),
+    SIGNAL(credentialsReceived(const APIUserAccount&)),
+    this,
+    SLOT(updateWindowTitle(const APIUserAccount&)));
 
   connect(NexusInterface::instance().getAccessManager(),
           SIGNAL(credentialsReceived(const APIUserAccount&)),
@@ -2009,9 +2026,9 @@ void MainWindow::fixCategories()
   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {
     ModInfo::Ptr modInfo     = ModInfo::getByIndex(i);
     std::set<int> categories = modInfo->getCategories();
-    for (std::set<int>::iterator iter = categories.begin(); iter != categories.end();
-         ++iter) {
-      if (!m_CategoryFactory.categoryExists(*iter)) {
+    for (std::set<int>::iterator iter = categories.begin();
+         iter != categories.end(); ++iter) {
+      if (!m_CategoryFactory->categoryExists(*iter)) {
         modInfo->setCategory(*iter, false);
       }
     }
@@ -2471,6 +2488,738 @@ void MainWindow::refreshProfile_activated()
   m_OrganizerCore.profileRefresh();
 }
 
+void MainWindow::updateModCount()
+{
+  int activeCount = 0;
+  int visActiveCount = 0;
+  int backupCount = 0;
+  int visBackupCount = 0;
+  int foreignCount = 0;
+  int visForeignCount = 0;
+  int separatorCount = 0;
+  int visSeparatorCount = 0;
+  int regularCount = 0;
+  int visRegularCount = 0;
+
+  QStringList allMods = m_OrganizerCore.modList()->allMods();
+
+  auto hasFlag = [](std::vector<ModInfo::EFlag> flags, ModInfo::EFlag filter) {
+    return std::find(flags.begin(), flags.end(), filter) != flags.end();
+  };
+
+  bool isEnabled;
+  bool isVisible;
+  for (QString mod : allMods) {
+    int modIndex = ModInfo::getIndex(mod);
+    ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
+    std::vector<ModInfo::EFlag> modFlags = modInfo->getFlags();
+    isEnabled = m_OrganizerCore.currentProfile()->modEnabled(modIndex);
+    isVisible = m_ModListSortProxy->filterMatchesMod(modInfo, isEnabled);
+
+    for (auto flag : modFlags) {
+      switch (flag) {
+      case ModInfo::FLAG_BACKUP: backupCount++;
+        if (isVisible)
+          visBackupCount++;
+        break;
+      case ModInfo::FLAG_FOREIGN: foreignCount++;
+        if (isVisible)
+          visForeignCount++;
+        break;
+      case ModInfo::FLAG_SEPARATOR: separatorCount++;
+        if (isVisible)
+          visSeparatorCount++;
+        break;
+      }
+    }
+
+    if (!hasFlag(modFlags, ModInfo::FLAG_BACKUP) &&
+        !hasFlag(modFlags, ModInfo::FLAG_FOREIGN) &&
+        !hasFlag(modFlags, ModInfo::FLAG_SEPARATOR) &&
+        !hasFlag(modFlags, ModInfo::FLAG_OVERWRITE)) {
+      if (isEnabled) {
+        activeCount++;
+        if (isVisible)
+          visActiveCount++;
+      }
+      if (isVisible)
+        visRegularCount++;
+      regularCount++;
+    }
+  }
+
+  ui->activeModsCounter->display(visActiveCount);
+  ui->activeModsCounter->setToolTip(tr("<table cellspacing=\"5\">"
+    "<tr><th>Type</th><th>All</th><th>Visible</th>"
+    "<tr><td>Enabled mods:&emsp;</td><td align=right>%1 / %2</td><td align=right>%3 / %4</td></tr>"
+    "<tr><td>Unmanaged/DLCs:&emsp;</td><td align=right>%5</td><td align=right>%6</td></tr>"
+    "<tr><td>Mod backups:&emsp;</td><td align=right>%7</td><td align=right>%8</td></tr>"
+    "<tr><td>Separators:&emsp;</td><td align=right>%9</td><td align=right>%10</td></tr>"
+    "</table>")
+    .arg(activeCount)
+    .arg(regularCount)
+    .arg(visActiveCount)
+    .arg(visRegularCount)
+    .arg(foreignCount)
+    .arg(visForeignCount)
+    .arg(backupCount)
+    .arg(visBackupCount)
+    .arg(separatorCount)
+    .arg(visSeparatorCount)
+  );
+}
+
+void MainWindow::updatePluginCount()
+{
+  int activeMasterCount = 0;
+  int activeLightMasterCount = 0;
+  int activeRegularCount = 0;
+  int masterCount = 0;
+  int lightMasterCount = 0;
+  int regularCount = 0;
+  int activeVisibleCount = 0;
+
+  PluginList *list = m_OrganizerCore.pluginList();
+  QString filter = ui->espFilterEdit->text();
+
+  for (QString plugin : list->pluginNames()) {
+    bool active = list->isEnabled(plugin);
+    bool visible = m_PluginListSortProxy->filterMatchesPlugin(plugin);
+    if (list->isLight(plugin) || list->isLightFlagged(plugin)) {
+      lightMasterCount++;
+      activeLightMasterCount += active;
+      activeVisibleCount += visible && active;
+    } else if (list->isMaster(plugin)) {
+      masterCount++;
+      activeMasterCount += active;
+      activeVisibleCount += visible && active;
+    } else {
+      regularCount++;
+      activeRegularCount += active;
+      activeVisibleCount += visible && active;
+    }
+  }
+
+  int activeCount = activeMasterCount + activeLightMasterCount + activeRegularCount;
+  int totalCount = masterCount + lightMasterCount + regularCount;
+
+  ui->activePluginsCounter->display(activeVisibleCount);
+  ui->activePluginsCounter->setToolTip(tr("<table cellspacing=\"6\">"
+    "<tr><th>Type</th><th>Active      </th><th>Total</th></tr>"
+    "<tr><td>All plugins:</td><td align=right>%1    </td><td align=right>%2</td></tr>"
+    "<tr><td>ESMs:</td><td align=right>%3    </td><td align=right>%4</td></tr>"
+    "<tr><td>ESPs:</td><td align=right>%7    </td><td align=right>%8</td></tr>"
+    "<tr><td>ESMs+ESPs:</td><td align=right>%9    </td><td align=right>%10</td></tr>"
+    "<tr><td>ESLs:</td><td align=right>%5    </td><td align=right>%6</td></tr>"
+    "</table>")
+    .arg(activeCount).arg(totalCount)
+    .arg(activeMasterCount).arg(masterCount)
+    .arg(activeLightMasterCount).arg(lightMasterCount)
+    .arg(activeRegularCount).arg(regularCount)
+    .arg(activeMasterCount+activeRegularCount).arg(masterCount+regularCount)
+  );
+}
+
+void MainWindow::information_clicked()
+{
+  try {
+    displayModInformation(m_ContextRow);
+  } catch (const std::exception &e) {
+    reportError(e.what());
+  }
+}
+
+void MainWindow::createEmptyMod_clicked()
+{
+  GuessedValue<QString> name;
+  name.setFilter(&fixDirectoryName);
+
+  while (name->isEmpty()) {
+    bool ok;
+    name.update(QInputDialog::getText(this, tr("Create Mod..."),
+                                      tr("This will create an empty mod.\n"
+                                         "Please enter a name:"), QLineEdit::Normal, "", &ok),
+                GUESS_USER);
+    if (!ok) {
+      return;
+    }
+  }
+
+  if (m_OrganizerCore.getMod(name) != nullptr) {
+    reportError(tr("A mod with this name already exists"));
+    return;
+  }
+
+  int newPriority = -1;
+  if (m_ContextRow >= 0 && m_ModListSortProxy->sortColumn() == ModList::COL_PRIORITY) {
+    newPriority = m_OrganizerCore.currentProfile()->getModPriority(m_ContextRow);
+  }
+
+  IModInterface *newMod = m_OrganizerCore.createMod(name);
+  if (newMod == nullptr) {
+    return;
+  }
+
+  m_OrganizerCore.refreshModList();
+
+  if (newPriority >= 0) {
+    m_OrganizerCore.modList()->changeModPriority(ModInfo::getIndex(name), newPriority);
+  }
+}
+
+void MainWindow::createSeparator_clicked()
+{
+  GuessedValue<QString> name;
+  name.setFilter(&fixDirectoryName);
+  while (name->isEmpty())
+  {
+    bool ok;
+    name.update(QInputDialog::getText(this, tr("Create Separator..."),
+      tr("This will create a new separator.\n"
+        "Please enter a name:"), QLineEdit::Normal, "", &ok),
+      GUESS_USER);
+    if (!ok) { return; }
+  }
+  if (m_OrganizerCore.getMod(name) != nullptr)
+  {
+    reportError(tr("A separator with this name already exists"));
+    return;
+  }
+  name->append("_separator");
+  if (m_OrganizerCore.getMod(name) != nullptr)
+  {
+    return;
+  }
+
+  int newPriority = -1;
+  if (m_ContextRow >= 0 && m_ModListSortProxy->sortColumn() == ModList::COL_PRIORITY)
+  {
+    newPriority = m_OrganizerCore.currentProfile()->getModPriority(m_ContextRow);
+  }
+
+  if (m_OrganizerCore.createMod(name) == nullptr) { return; }
+  m_OrganizerCore.refreshModList();
+
+  if (newPriority >= 0)
+  {
+    m_OrganizerCore.modList()->changeModPriority(ModInfo::getIndex(name), newPriority);
+  }
+
+  if (auto c=m_OrganizerCore.settings().colors().previousSeparatorColor()) {
+    ModInfo::getByIndex(ModInfo::getIndex(name))->setColor(*c);
+  }
+}
+
+void MainWindow::setColor_clicked()
+{
+  auto& settings = m_OrganizerCore.settings();
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
+
+  QColorDialog dialog(this);
+  dialog.setOption(QColorDialog::ShowAlphaChannel);
+
+  QColor currentColor = modInfo->color();
+  if (currentColor.isValid()) {
+    dialog.setCurrentColor(currentColor);
+  }
+  else if (auto c=settings.colors().previousSeparatorColor()) {
+    dialog.setCurrentColor(*c);
+  }
+
+  if (!dialog.exec())
+    return;
+
+  currentColor = dialog.currentColor();
+  if (!currentColor.isValid())
+    return;
+
+  settings.colors().setPreviousSeparatorColor(currentColor);
+
+  QItemSelectionModel *selection = ui->modList->selectionModel();
+  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
+       info->setColor(currentColor);
+    }
+  }
+  else {
+    modInfo->setColor(currentColor);
+  }
+}
+
+void MainWindow::resetColor_clicked()
+{
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
+  QColor color = QColor();
+  QItemSelectionModel *selection = ui->modList->selectionModel();
+  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
+       info->setColor(color);
+    }
+  }
+  else {
+    modInfo->setColor(color);
+  }
+
+  m_OrganizerCore.settings().colors().removePreviousSeparatorColor();
+}
+
+void MainWindow::createModFromOverwrite()
+{
+  GuessedValue<QString> name;
+  name.setFilter(&fixDirectoryName);
+
+  while (name->isEmpty()) {
+    bool ok;
+    name.update(QInputDialog::getText(this, tr("Create Mod..."),
+                                      tr("This will move all files from overwrite into a new, regular mod.\n"
+                                         "Please enter a name:"), QLineEdit::Normal, "", &ok),
+                GUESS_USER);
+    if (!ok) {
+      return;
+    }
+  }
+
+  if (m_OrganizerCore.getMod(name) != nullptr) {
+    reportError(tr("A mod with this name already exists"));
+    return;
+  }
+
+  const IModInterface *newMod = m_OrganizerCore.createMod(name);
+  if (newMod == nullptr) {
+    return;
+  }
+
+  doMoveOverwriteContentToMod(newMod->absolutePath());
+}
+
+void MainWindow::moveOverwriteContentToExistingMod()
+{
+  QStringList mods;
+  auto indexesByPriority = m_OrganizerCore.currentProfile()->getAllIndexesByPriority();
+  for (auto & iter : indexesByPriority) {
+    if ((iter.second != UINT_MAX)) {
+      ModInfo::Ptr modInfo = ModInfo::getByIndex(iter.second);
+      if (!modInfo->hasFlag(ModInfo::FLAG_SEPARATOR) && !modInfo->hasFlag(ModInfo::FLAG_FOREIGN) && !modInfo->hasFlag(ModInfo::FLAG_OVERWRITE)) {
+        mods << modInfo->name();
+      }
+    }
+  }
+
+  ListDialog dialog(this);
+  dialog.setWindowTitle("Select a mod...");
+  dialog.setChoices(mods);
+
+  if (dialog.exec() == QDialog::Accepted) {
+    QString result = dialog.getChoice();
+    if (!result.isEmpty()) {
+
+      QString modAbsolutePath;
+
+      for (const auto& mod : m_OrganizerCore.modsSortedByProfilePriority()) {
+        if (result.compare(mod) == 0) {
+          ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(mod));
+          modAbsolutePath = modInfo->absolutePath();
+          break;
+        }
+      }
+
+      if (modAbsolutePath.isNull()) {
+        log::warn("Mod {} has not been found, for some reason", result);
+        return;
+      }
+
+      doMoveOverwriteContentToMod(modAbsolutePath);
+    }
+  }
+}
+
+void MainWindow::doMoveOverwriteContentToMod(const QString &modAbsolutePath)
+{
+  unsigned int overwriteIndex = ModInfo::findMod([](ModInfo::Ptr mod) -> bool {
+    std::vector<ModInfo::EFlag> flags = mod->getFlags();
+    return std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end(); });
+
+  ModInfo::Ptr overwriteInfo = ModInfo::getByIndex(overwriteIndex);
+  bool successful = shellMove((QDir::toNativeSeparators(overwriteInfo->absolutePath()) + "\\*"),
+    (QDir::toNativeSeparators(modAbsolutePath)), false, this);
+
+  if (successful) {
+    MessageDialog::showMessage(tr("Move successful."), this);
+  }
+  else {
+    const auto e = GetLastError();
+    log::error("Move operation failed: {}", formatSystemMessage(e));
+  }
+
+  m_OrganizerCore.refreshModList();
+}
+
+void MainWindow::clearOverwrite()
+{
+  unsigned int overwriteIndex = ModInfo::findMod([](ModInfo::Ptr mod) -> bool {
+    std::vector<ModInfo::EFlag> flags = mod->getFlags();
+    return std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE)
+      != flags.end();
+  });
+
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(overwriteIndex);
+  if (modInfo)
+  {
+    QDir overwriteDir(modInfo->absolutePath());
+    if (QMessageBox::question(this, tr("Are you sure?"),
+      tr("About to recursively delete:\n") + overwriteDir.absolutePath(),
+      QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok)
+    {
+      QStringList delList;
+      for (auto f : overwriteDir.entryList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot))
+        delList.push_back(overwriteDir.absoluteFilePath(f));
+      if (shellDelete(delList, true)) {
+        scheduleCheckForProblems();
+        m_OrganizerCore.refreshModList();
+      } else {
+        const auto e = GetLastError();
+        log::error("Delete operation failed: {}", formatSystemMessage(e));
+      }
+    }
+  }
+}
+
+void MainWindow::cancelModListEditor()
+{
+  ui->modList->setEnabled(false);
+  ui->modList->setEnabled(true);
+}
+
+void MainWindow::on_modList_doubleClicked(const QModelIndex &index)
+{
+  if (!index.isValid()) {
+    return;
+  }
+
+  if (m_OrganizerCore.modList()->timeElapsedSinceLastChecked() <= QApplication::doubleClickInterval()) {
+    // don't interpret double click if we only just checked a mod
+    return;
+  }
+
+  QModelIndex sourceIdx = mapToModel(m_OrganizerCore.modList(), index);
+  if (!sourceIdx.isValid()) {
+    return;
+  }
+
+  Qt::KeyboardModifiers modifiers = QApplication::queryKeyboardModifiers();
+  if (modifiers.testFlag(Qt::ControlModifier)) {
+    try {
+      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
+
+      ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
+      shell::Explore(modInfo->absolutePath());
+
+      // workaround to cancel the editor that might have opened because of
+      // selection-click
+      ui->modList->closePersistentEditor(index);
+    }
+    catch (const std::exception &e) {
+      reportError(e.what());
+    }
+  }
+  else if (modifiers.testFlag(Qt::ShiftModifier)) {
+    try {
+      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
+      QModelIndex idx = m_OrganizerCore.modList()->index(m_ContextRow, 0);
+      visitNexusOrWebPage(idx);
+      ui->modList->closePersistentEditor(index);
+    }
+    catch (const std::exception & e) {
+      reportError(e.what());
+    }
+  }
+  else{
+    try {
+      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
+      sourceIdx.column();
+
+      auto tab = ModInfoTabIDs::None;
+
+      switch (sourceIdx.column()) {
+        case ModList::COL_NOTES: tab = ModInfoTabIDs::Notes; break;
+        case ModList::COL_VERSION: tab = ModInfoTabIDs::Nexus; break;
+        case ModList::COL_MODID: tab = ModInfoTabIDs::Nexus; break;
+        case ModList::COL_GAME: tab = ModInfoTabIDs::Nexus; break;
+        case ModList::COL_CATEGORY: tab = ModInfoTabIDs::Categories; break;
+        case ModList::COL_CONFLICTFLAGS: tab = ModInfoTabIDs::Conflicts; break;
+      }
+
+      displayModInformation(sourceIdx.row(), tab);
+      // workaround to cancel the editor that might have opened because of
+      // selection-click
+      ui->modList->closePersistentEditor(index);
+    }
+    catch (const std::exception &e) {
+      reportError(e.what());
+    }
+  }
+}
+
+void MainWindow::on_listOptionsBtn_pressed()
+{
+  m_ContextRow = -1;
+}
+
+void MainWindow::openOriginInformation_clicked()
+{
+  try {
+    QItemSelectionModel *selection = ui->espList->selectionModel();
+    //we don't want to open multiple modinfodialogs.
+    /*if (selection->hasSelection() && selection->selectedRows().count() > 0) {
+
+      for (QModelIndex idx : selection->selectedRows()) {
+        QString fileName = idx.data().toString();
+        ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+        std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
+
+        if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
+          displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+        }
+      }
+    }
+    else {}*/
+    QModelIndex idx = selection->currentIndex();
+    QString fileName = idx.data().toString();
+
+    ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+    std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
+
+    if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
+      displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+    }
+  }
+  catch (const std::exception &e) {
+    reportError(e.what());
+  }
+}
+
+void MainWindow::on_espList_doubleClicked(const QModelIndex &index)
+{
+  if (!index.isValid()) {
+    return;
+  }
+
+  if (m_OrganizerCore.pluginList()->timeElapsedSinceLastChecked() <= QApplication::doubleClickInterval()) {
+    // don't interpret double click if we only just checked a plugin
+    return;
+  }
+
+  QModelIndex sourceIdx = mapToModel(m_OrganizerCore.pluginList(), index);
+  if (!sourceIdx.isValid()) {
+    return;
+  }
+  try {
+
+    QItemSelectionModel *selection = ui->espList->selectionModel();
+
+    if (selection->hasSelection() && selection->selectedRows().count() == 1) {
+
+      QModelIndex idx = selection->currentIndex();
+      QString fileName = idx.data().toString();
+
+      if (ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)) == UINT_MAX)
+        return;
+
+      ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+      std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
+
+      if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
+
+        Qt::KeyboardModifiers modifiers = QApplication::queryKeyboardModifiers();
+        if (modifiers.testFlag(Qt::ControlModifier)) {
+          openExplorer_activated();
+          // workaround to cancel the editor that might have opened because of
+          // selection-click
+          ui->espList->closePersistentEditor(index);
+        }
+        else {
+
+          displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
+          // workaround to cancel the editor that might have opened because of
+          // selection-click
+          ui->espList->closePersistentEditor(index);
+        }
+      }
+    }
+  }
+  catch (const std::exception &e) {
+    reportError(e.what());
+  }
+}
+
+bool MainWindow::populateMenuCategories(QMenu *menu, int targetID)
+{
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
+  const std::set<int> &categories = modInfo->getCategories();
+
+  bool childEnabled = false;
+
+  for (unsigned int i = 1; i < m_CategoryFactory->numCategories(); ++i) {
+    if (m_CategoryFactory->getParentID(i) == targetID) {
+      QMenu *targetMenu = menu;
+      if (m_CategoryFactory->hasChildren(i)) {
+        targetMenu = menu->addMenu(m_CategoryFactory->getCategoryName(i).replace('&', "&&"));
+      }
+
+      int id = m_CategoryFactory->getCategoryID(i);
+      QScopedPointer<QCheckBox> checkBox(new QCheckBox(targetMenu));
+      bool enabled = categories.find(id) != categories.end();
+      checkBox->setText(m_CategoryFactory->getCategoryName(i).replace('&', "&&"));
+      if (enabled) {
+        childEnabled = true;
+      }
+      checkBox->setChecked(enabled ? Qt::Checked : Qt::Unchecked);
+
+      QScopedPointer<QWidgetAction> checkableAction(new QWidgetAction(targetMenu));
+      checkableAction->setDefaultWidget(checkBox.take());
+      checkableAction->setData(id);
+      targetMenu->addAction(checkableAction.take());
+
+      if (m_CategoryFactory->hasChildren(i)) {
+        if (populateMenuCategories(targetMenu, m_CategoryFactory->getCategoryID(i)) || enabled) {
+          targetMenu->setIcon(QIcon(":/MO/gui/resources/check.png"));
+        }
+      }
+    }
+  }
+  return childEnabled;
+}
+
+void MainWindow::replaceCategoriesFromMenu(QMenu *menu, int modRow)
+{
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(modRow);
+  for (QAction* action : menu->actions()) {
+    if (action->menu() != nullptr) {
+      replaceCategoriesFromMenu(action->menu(), modRow);
+    } else {
+      QWidgetAction *widgetAction = qobject_cast<QWidgetAction*>(action);
+      if (widgetAction != nullptr) {
+        QCheckBox *checkbox = qobject_cast<QCheckBox*>(widgetAction->defaultWidget());
+        modInfo->setCategory(widgetAction->data().toInt(), checkbox->isChecked());
+      }
+    }
+  }
+}
+
+void MainWindow::addRemoveCategoriesFromMenu(QMenu *menu, int modRow, int referenceRow)
+{
+  if (referenceRow != -1 && referenceRow != modRow) {
+    ModInfo::Ptr editedModInfo = ModInfo::getByIndex(referenceRow);
+    for (QAction* action : menu->actions()) {
+      if (action->menu() != nullptr) {
+        addRemoveCategoriesFromMenu(action->menu(), modRow, referenceRow);
+      } else {
+        QWidgetAction *widgetAction = qobject_cast<QWidgetAction*>(action);
+        if (widgetAction != nullptr) {
+          QCheckBox *checkbox = qobject_cast<QCheckBox*>(widgetAction->defaultWidget());
+          int categoryId = widgetAction->data().toInt();
+          bool checkedBefore = editedModInfo->categorySet(categoryId);
+          bool checkedAfter = checkbox->isChecked();
+
+          if (checkedBefore != checkedAfter) { // only update if the category was changed on the edited mod
+            ModInfo::Ptr currentModInfo = ModInfo::getByIndex(modRow);
+            currentModInfo->setCategory(categoryId, checkedAfter);
+          }
+        }
+      }
+    }
+  } else {
+    replaceCategoriesFromMenu(menu, modRow);
+  }
+}
+
+void MainWindow::addRemoveCategories_MenuHandler() {
+  QMenu *menu = qobject_cast<QMenu*>(sender());
+  if (menu == nullptr) {
+    log::error("not a menu?");
+    return;
+  }
+
+  QList<QPersistentModelIndex> selected;
+  for (const QModelIndex &idx : ui->modList->selectionModel()->selectedRows()) {
+    selected.append(QPersistentModelIndex(idx));
+  }
+
+  if (selected.size() > 0) {
+    int minRow = INT_MAX;
+    int maxRow = -1;
+
+    for (const QPersistentModelIndex &idx : selected) {
+      log::debug("change categories on: {}", idx.data().toString());
+      QModelIndex modIdx = mapToModel(m_OrganizerCore.modList(), idx);
+      if (modIdx.row() != m_ContextIdx.row()) {
+        addRemoveCategoriesFromMenu(menu, modIdx.row(), m_ContextIdx.row());
+      }
+      if (idx.row() < minRow) minRow = idx.row();
+      if (idx.row() > maxRow) maxRow = idx.row();
+    }
+    replaceCategoriesFromMenu(menu, m_ContextIdx.row());
+
+    m_OrganizerCore.modList()->notifyChange(minRow, maxRow + 1);
+
+    for (const QPersistentModelIndex &idx : selected) {
+      ui->modList->selectionModel()->select(idx, QItemSelectionModel::Select | QItemSelectionModel::Rows);
+    }
+  } else {
+    //For single mod selections, just do a replace
+    replaceCategoriesFromMenu(menu, m_ContextRow);
+    m_OrganizerCore.modList()->notifyChange(m_ContextRow);
+  }
+
+  refreshFilters();
+}
+
+void MainWindow::replaceCategories_MenuHandler() {
+  QMenu *menu = qobject_cast<QMenu*>(sender());
+  if (menu == nullptr) {
+    log::error("not a menu?");
+    return;
+  }
+
+  QList<QPersistentModelIndex> selected;
+  for (const QModelIndex &idx : ui->modList->selectionModel()->selectedRows()) {
+    selected.append(QPersistentModelIndex(idx));
+  }
+
+  if (selected.size() > 0) {
+    QStringList selectedMods;
+    int minRow = INT_MAX;
+    int maxRow = -1;
+    for (int i = 0; i < selected.size(); ++i) {
+      QModelIndex temp = mapToModel(m_OrganizerCore.modList(), selected.at(i));
+      selectedMods.append(temp.data().toString());
+      replaceCategoriesFromMenu(menu, mapToModel(m_OrganizerCore.modList(), selected.at(i)).row());
+      if (temp.row() < minRow) minRow = temp.row();
+      if (temp.row() > maxRow) maxRow = temp.row();
+    }
+
+    m_OrganizerCore.modList()->notifyChange(minRow, maxRow + 1);
+
+    // find mods by their name because indices are invalidated
+    QAbstractItemModel *model = ui->modList->model();
+    for (const QString &mod : selectedMods) {
+      QModelIndexList matches = model->match(model->index(0, 0), Qt::DisplayRole, mod, 1,
+                                             Qt::MatchFixedString | Qt::MatchCaseSensitive | Qt::MatchRecursive);
+      if (matches.size() > 0) {
+        ui->modList->selectionModel()->select(matches.at(0), QItemSelectionModel::Select | QItemSelectionModel::Rows);
+      }
+    }
+  } else {
+    //For single mod selections, just do a replace
+    replaceCategoriesFromMenu(menu, m_ContextRow);
+    m_OrganizerCore.modList()->notifyChange(m_ContextRow);
+  }
+
+  refreshFilters();
+}
+
 void MainWindow::saveArchiveList()
 {
   if (m_OrganizerCore.isArchivesInit()) {
@@ -2490,6 +3239,180 @@ void MainWindow::saveArchiveList()
   }
 }
 
+void MainWindow::checkModsForUpdates()
+{
+  bool checkingModsForUpdate = false;
+  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
+    checkingModsForUpdate = ModInfo::checkAllForUpdate(&m_PluginContainer, this);
+    NexusInterface::instance(&m_PluginContainer)->requestEndorsementInfo(this, QVariant(), QString());
+    NexusInterface::instance(&m_PluginContainer)->requestTrackingInfo(this, QVariant(), QString());
+  } else {
+    QString apiKey;
+    if (m_OrganizerCore.settings().nexus().apiKey(apiKey)) {
+      m_OrganizerCore.doAfterLogin([this] () { this->checkModsForUpdates(); });
+      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
+    } else {
+      log::warn("{}", tr("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus."));
+    }
+  }
+
+  bool updatesAvailable = false;
+  for (auto mod : m_OrganizerCore.modList()->allMods()) {
+    ModInfo::Ptr modInfo = ModInfo::getByName(mod);
+    if (modInfo->updateAvailable()) {
+      updatesAvailable = true;
+      break;
+    }
+  }
+
+  if (updatesAvailable || checkingModsForUpdate) {
+    m_ModListSortProxy->setCriteria({{
+        ModListSortProxy::TypeSpecial,
+        CategoryFactory::UpdateAvailable,
+        false}
+    });
+
+    m_Filters->setSelection({{
+      ModListSortProxy::TypeSpecial,
+      CategoryFactory::UpdateAvailable,
+      false
+    }});
+  }
+}
+
+void MainWindow::changeVersioningScheme() {
+  if (QMessageBox::question(this, tr("Continue?"),
+        tr("The versioning scheme decides which version is considered newer than another.\n"
+           "This function will guess the versioning scheme under the assumption that the installed version is outdated."),
+        QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes) {
+
+    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
+
+    bool success = false;
+
+    static VersionInfo::VersionScheme schemes[] = { VersionInfo::SCHEME_REGULAR, VersionInfo::SCHEME_DECIMALMARK, VersionInfo::SCHEME_NUMBERSANDLETTERS };
+
+    for (int i = 0; i < sizeof(schemes) / sizeof(VersionInfo::VersionScheme) && !success; ++i) {
+      VersionInfo verOld(info->version().canonicalString(), schemes[i]);
+      VersionInfo verNew(info->newestVersion().canonicalString(), schemes[i]);
+      if (verOld < verNew) {
+        info->setVersion(verOld);
+        info->setNewestVersion(verNew);
+        success = true;
+      }
+    }
+    if (!success) {
+      QMessageBox::information(this, tr("Sorry"),
+          tr("I don't know a versioning scheme where %1 is newer than %2.").arg(info->newestVersion().canonicalString()).arg(info->version().canonicalString()),
+          QMessageBox::Ok);
+    }
+  }
+}
+
+void MainWindow::ignoreUpdate() {
+  QItemSelectionModel *selection = ui->modList->selectionModel();
+  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
+      info->ignoreUpdate(true);
+    }
+  }
+  else {
+    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
+    info->ignoreUpdate(true);
+  }
+  if (m_ModListSortProxy != nullptr)
+    m_ModListSortProxy->invalidate();
+}
+
+void MainWindow::checkModUpdates_clicked()
+{
+  std::multimap<QString, int> IDs;
+  QItemSelectionModel *selection = ui->modList->selectionModel();
+  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
+      IDs.insert(std::make_pair<QString, int>(info->gameName(), info->nexusId()));
+    }
+  } else {
+    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
+    IDs.insert(std::make_pair<QString, int>(info->gameName(), info->nexusId()));
+  }
+  modUpdateCheck(IDs);
+}
+
+void MainWindow::unignoreUpdate()
+{
+  QItemSelectionModel *selection = ui->modList->selectionModel();
+  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
+    for (QModelIndex idx : selection->selectedRows()) {
+      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
+      info->ignoreUpdate(false);
+    }
+  }
+  else {
+    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
+    info->ignoreUpdate(false);
+  }
+  if (m_ModListSortProxy != nullptr)
+    m_ModListSortProxy->invalidate();
+}
+
+void MainWindow::addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu,
+                                              ModInfo::Ptr info) {
+  const std::set<int> &categories = info->getCategories();
+  for (int categoryID : categories) {
+    int catIdx = m_CategoryFactory->getCategoryIndex(categoryID);
+    QWidgetAction *action = new QWidgetAction(primaryCategoryMenu);
+    try {
+      QRadioButton *categoryBox = new QRadioButton(
+          m_CategoryFactory->getCategoryName(catIdx).replace('&', "&&"),
+          primaryCategoryMenu);
+      connect(categoryBox, &QRadioButton::toggled, [info, categoryID](bool enable) {
+        if (enable) {
+          info->setPrimaryCategory(categoryID);
+        }
+      });
+      categoryBox->setChecked(categoryID == info->primaryCategory());
+      action->setDefaultWidget(categoryBox);
+    } catch (const std::exception &e) {
+      log::error("failed to create category checkbox: {}", e.what());
+    }
+
+    action->setData(categoryID);
+    primaryCategoryMenu->addAction(action);
+  }
+}
+
+void MainWindow::addPrimaryCategoryCandidates()
+{
+  QMenu *menu = qobject_cast<QMenu*>(sender());
+  if (menu == nullptr) {
+    log::error("not a menu?");
+    return;
+  }
+  menu->clear();
+  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
+
+  addPrimaryCategoryCandidates(menu, modInfo);
+}
+
+void MainWindow::enableVisibleMods()
+{
+  if (QMessageBox::question(nullptr, tr("Confirm"), tr("Really enable all visible mods?"),
+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    m_ModListSortProxy->enableAllVisible();
+  }
+}
+
+void MainWindow::disableVisibleMods()
+{
+  if (QMessageBox::question(nullptr, tr("Confirm"), tr("Really disable all visible mods?"),
+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    m_ModListSortProxy->disableAllVisible();
+  }
+}
+
 void MainWindow::openInstanceFolder()
 {
   QString dataPath = qApp->property("dataPath").toString();
@@ -2549,6 +3472,184 @@ void MainWindow::openMyGamesFolder()
   shell::Explore(m_OrganizerCore.managedGame()->documentsDirectory());
 }
 
+
+void MainWindow::exportModListCSV()
+{
+	//SelectionDialog selection(tr("Choose what to export"));
+
+	//selection.addChoice(tr("Everything"), tr("All installed mods are included in the list"), 0);
+	//selection.addChoice(tr("Active Mods"), tr("Only active (checked) mods from your current profile are included"), 1);
+	//selection.addChoice(tr("Visible"), tr("All mods visible in the mod list are included"), 2);
+
+	QDialog selection(this);
+	QGridLayout *grid = new QGridLayout;
+	selection.setWindowTitle(tr("Export to csv"));
+
+	QLabel *csvDescription = new QLabel();
+	csvDescription->setText(tr("CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.\nYou can also use online editors and converters instead."));
+	grid->addWidget(csvDescription);
+
+	QGroupBox *groupBoxRows = new QGroupBox(tr("Select what mods you want export:"));
+	QRadioButton *all = new QRadioButton(tr("All installed mods"));
+	QRadioButton *active = new QRadioButton(tr("Only active (checked) mods from your current profile"));
+	QRadioButton *visible = new QRadioButton(tr("All currently visible mods in the mod list"));
+
+	QVBoxLayout *vbox = new QVBoxLayout;
+	vbox->addWidget(all);
+	vbox->addWidget(active);
+	vbox->addWidget(visible);
+	vbox->addStretch(1);
+	groupBoxRows->setLayout(vbox);
+
+
+
+	grid->addWidget(groupBoxRows);
+
+	QButtonGroup *buttonGroupRows = new QButtonGroup();
+	buttonGroupRows->addButton(all, 0);
+	buttonGroupRows->addButton(active, 1);
+	buttonGroupRows->addButton(visible, 2);
+	buttonGroupRows->button(0)->setChecked(true);
+
+
+
+	QGroupBox *groupBoxColumns = new QGroupBox(tr("Choose what Columns to export:"));
+	groupBoxColumns->setFlat(true);
+
+	QCheckBox *mod_Priority = new QCheckBox(tr("Mod_Priority"));
+	mod_Priority->setChecked(true);
+	QCheckBox *mod_Name = new QCheckBox(tr("Mod_Name"));
+	mod_Name->setChecked(true);
+  QCheckBox *mod_Note = new QCheckBox(tr("Notes_column"));
+	QCheckBox *mod_Status = new QCheckBox(tr("Mod_Status"));
+  mod_Status->setChecked(true);
+	QCheckBox *primary_Category = new QCheckBox(tr("Primary_Category"));
+	QCheckBox *nexus_ID = new QCheckBox(tr("Nexus_ID"));
+	QCheckBox *mod_Nexus_URL = new QCheckBox(tr("Mod_Nexus_URL"));
+	QCheckBox *mod_Version = new QCheckBox(tr("Mod_Version"));
+	QCheckBox *install_Date = new QCheckBox(tr("Install_Date"));
+	QCheckBox *download_File_Name = new QCheckBox(tr("Download_File_Name"));
+
+	QVBoxLayout *vbox1 = new QVBoxLayout;
+	vbox1->addWidget(mod_Priority);
+	vbox1->addWidget(mod_Name);
+	vbox1->addWidget(mod_Status);
+  vbox1->addWidget(mod_Note);
+	vbox1->addWidget(primary_Category);
+	vbox1->addWidget(nexus_ID);
+	vbox1->addWidget(mod_Nexus_URL);
+	vbox1->addWidget(mod_Version);
+	vbox1->addWidget(install_Date);
+	vbox1->addWidget(download_File_Name);
+	groupBoxColumns->setLayout(vbox1);
+
+	grid->addWidget(groupBoxColumns);
+
+	QPushButton *ok = new QPushButton("Ok");
+	QPushButton *cancel = new QPushButton("Cancel");
+	QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+
+	connect(buttons, SIGNAL(accepted()), &selection, SLOT(accept()));
+	connect(buttons, SIGNAL(rejected()), &selection, SLOT(reject()));
+
+	grid->addWidget(buttons);
+
+	selection.setLayout(grid);
+
+
+	if (selection.exec() == QDialog::Accepted) {
+
+		unsigned int numMods = ModInfo::getNumMods();
+		int selectedRowID = buttonGroupRows->checkedId();
+
+		try {
+			QBuffer buffer;
+			buffer.open(QIODevice::ReadWrite);
+			CSVBuilder builder(&buffer);
+			builder.setEscapeMode(CSVBuilder::TYPE_STRING, CSVBuilder::QUOTE_ALWAYS);
+			std::vector<std::pair<QString, CSVBuilder::EFieldType> > fields;
+			if (mod_Priority->isChecked())
+				fields.push_back(std::make_pair(QString("#Mod_Priority"), CSVBuilder::TYPE_STRING));
+      if (mod_Status->isChecked())
+        fields.push_back(std::make_pair(QString("#Mod_Status"), CSVBuilder::TYPE_STRING));
+			if (mod_Name->isChecked())
+				fields.push_back(std::make_pair(QString("#Mod_Name"), CSVBuilder::TYPE_STRING));
+      if (mod_Note->isChecked())
+        fields.push_back(std::make_pair(QString("#Note"), CSVBuilder::TYPE_STRING));
+			if (primary_Category->isChecked())
+				fields.push_back(std::make_pair(QString("#Primary_Category"), CSVBuilder::TYPE_STRING));
+			if (nexus_ID->isChecked())
+				fields.push_back(std::make_pair(QString("#Nexus_ID"), CSVBuilder::TYPE_INTEGER));
+			if (mod_Nexus_URL->isChecked())
+				fields.push_back(std::make_pair(QString("#Mod_Nexus_URL"), CSVBuilder::TYPE_STRING));
+			if (mod_Version->isChecked())
+				fields.push_back(std::make_pair(QString("#Mod_Version"), CSVBuilder::TYPE_STRING));
+			if (install_Date->isChecked())
+				fields.push_back(std::make_pair(QString("#Install_Date"), CSVBuilder::TYPE_STRING));
+			if (download_File_Name->isChecked())
+				fields.push_back(std::make_pair(QString("#Download_File_Name"), CSVBuilder::TYPE_STRING));
+
+			builder.setFields(fields);
+
+			builder.writeHeader();
+
+      auto indexesByPriority = m_OrganizerCore.currentProfile()->getAllIndexesByPriority();
+      for (auto& iter : indexesByPriority) {
+				ModInfo::Ptr info = ModInfo::getByIndex(iter.second);
+				bool enabled = m_OrganizerCore.currentProfile()->modEnabled(iter.second);
+				if ((selectedRowID == 1) && !enabled) {
+					continue;
+				}
+				else if ((selectedRowID == 2) && !m_ModListSortProxy->filterMatchesMod(info, enabled)) {
+					continue;
+				}
+				std::vector<ModInfo::EFlag> flags = info->getFlags();
+				if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) == flags.end()) &&
+					(std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) == flags.end())) {
+					if (mod_Priority->isChecked())
+						builder.setRowField("#Mod_Priority", QString("%1").arg(iter.first, 4, 10, QChar('0')));
+          if (mod_Status->isChecked())
+            builder.setRowField("#Mod_Status", (enabled) ? "+" : "-");
+					if (mod_Name->isChecked())
+						builder.setRowField("#Mod_Name", info->name());
+          if (mod_Note->isChecked())
+            builder.setRowField("#Note", QString("%1").arg(info->comments().remove(',')));
+					if (primary_Category->isChecked())
+						builder.setRowField("#Primary_Category", (m_CategoryFactory->categoryExists(info->primaryCategory())) ? m_CategoryFactory->getCategoryNameByID(info->primaryCategory()) : "");
+					if (nexus_ID->isChecked())
+						builder.setRowField("#Nexus_ID", info->nexusId());
+					if (mod_Nexus_URL->isChecked())
+						builder.setRowField("#Mod_Nexus_URL",(info->nexusId()>0)? NexusInterface::instance(&m_PluginContainer)->getModURL(info->nexusId(), info->gameName()) : "");
+					if (mod_Version->isChecked())
+						builder.setRowField("#Mod_Version", info->version().canonicalString());
+					if (install_Date->isChecked())
+						builder.setRowField("#Install_Date", info->creationTime().toString("yyyy/MM/dd HH:mm:ss"));
+					if (download_File_Name->isChecked())
+						builder.setRowField("#Download_File_Name", info->installationFile());
+
+					builder.writeRow();
+				}
+			}
+
+			SaveTextAsDialog saveDialog(this);
+			saveDialog.setText(buffer.data());
+			saveDialog.exec();
+		}
+		catch (const std::exception &e) {
+			reportError(tr("export failed: %1").arg(e.what()));
+		}
+	}
+}
+
+static void addMenuAsPushButton(QMenu *menu, QMenu *subMenu)
+{
+  QPushButton *pushBtn = new QPushButton(subMenu->title());
+  pushBtn->setMenu(subMenu);
+  QWidgetAction *action = new QWidgetAction(menu);
+  action->setDefaultWidget(pushBtn);
+  menu->addAction(action);
+}
+
 QMenu* MainWindow::openFolderMenu()
 {
   QMenu* FolderMenu = new QMenu(this);
@@ -3538,7 +4639,67 @@ void MainWindow::on_displayCategoriesBtn_toggled(bool checked)
   setCategoryListVisible(checked);
 }
 
-void MainWindow::removeFromToolbar(QAction* action)
+void MainWindow::deselectFilters()
+{
+  m_Filters->clearSelection();
+}
+
+void MainWindow::refreshFilters()
+{
+  QItemSelection currentSelection = ui->modList->selectionModel()->selection();
+
+  int idxRow = ui->modList->currentIndex().row();
+  QVariant currentIndexName = ui->modList->model()->index(idxRow, 0).data();
+  ui->modList->setCurrentIndex(QModelIndex());
+
+  m_Filters->refresh();
+
+  ui->modList->selectionModel()->select(currentSelection, QItemSelectionModel::Select);
+
+  QModelIndexList matchList;
+  if (currentIndexName.isValid()) {
+    matchList = ui->modList->model()->match(
+      ui->modList->model()->index(0, 0),
+      Qt::DisplayRole,
+      currentIndexName);
+  }
+
+  if (matchList.size() > 0) {
+    ui->modList->setCurrentIndex(matchList.at(0));
+  }
+}
+
+void MainWindow::onFiltersCriteria(const std::vector<ModListSortProxy::Criteria>& criteria)
+{
+  m_ModListSortProxy->setCriteria(criteria);
+
+  QString label = "?";
+
+  if (criteria.empty()) {
+    label = "";
+  } else if (criteria.size() == 1) {
+    const auto& c = criteria[0];
+
+    if (c.type == ModListSortProxy::TypeContent) {
+      const auto *content = m_OrganizerCore.modDataContents().findById(c.id);
+      label = content ? content->name() : QString();
+    } else {
+      label = m_CategoryFactory->getCategoryNameByID(c.id);
+    }
+
+    if (label.isEmpty()) {
+      log::error("category {}:{} not found", c.type, c.id);
+    }
+  } else {
+    label = tr("<Multiple>");
+  }
+
+  ui->currentCategoryLabel->setText(label);
+  ui->modList->reset();
+}
+
+void MainWindow::onFiltersOptions(
+  ModListSortProxy::FilterMode mode, ModListSortProxy::SeparatorsMode sep)
 {
   const auto& title = action->text();
   auto& list        = *m_OrganizerCore.executablesList();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8cd55c901..42ffc83ec 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -283,7 +283,9 @@ private slots:
 
   QAction* m_ContextAction;
 
-  CategoryFactory& m_CategoryFactory;
+  QAction* m_browseModPage;
+
+  CategoryFactory* m_CategoryFactory;
 
   QTimer m_CheckBSATimer;
   QTimer m_SaveMetaTimer;

From 127db7799ed4847b151a35a16cefab6c494128ef Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Mon, 23 Dec 2019 23:16:36 -0600
Subject: [PATCH 04/43] WIP: Category QObj refactor

---
 src/categories.cpp              |  39 +++----
 src/categories.h                |  40 ++++---
 src/categoriesdialog.cpp        |  41 ++++---
 src/categoriesdialog.h          |   3 +
 src/categoriesdialog.ui         |  75 +++++++++----
 src/installationmanager.cpp     |  10 +-
 src/mainwindow.cpp              |   2 +-
 src/modinfo.cpp                 |  12 +--
 src/modinfodialogcategories.cpp |  18 ++--
 src/modinfodialogcategories.h   |   5 +-
 src/modinforegular.cpp          |  11 +-
 src/modlist.cpp                 |  22 ++--
 src/modlistsortproxy.cpp        | 185 +++++++++++++++-----------------
 13 files changed, 249 insertions(+), 214 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index e64d35c3d..cf8008e5b 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -33,7 +33,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-CategoryFactory* CategoryFactory::s_Instance = nullptr;
 
 QString CategoryFactory::categoriesFilePath()
 {
@@ -47,9 +46,8 @@ QString CategoryFactory::nexusMappingFilePath()
 }
 
 
-CategoryFactory::CategoryFactory()
+CategoryFactory::CategoryFactory() : QObject()
 {
-  atexit(&cleanup);
 }
 
 void CategoryFactory::loadCategories()
@@ -76,7 +74,7 @@ void CategoryFactory::loadCategories()
             bool ok  = false;
             int temp = iter->toInt(&ok);
             if (!ok) {
-              log::error(tr("invalid category id {}"), iter->constData());
+              log::error(tr("invalid category id {}").toStdString(), iter->constData());
             }
             nexusCats.push_back(NexusCategory("Unknown", temp));
           }
@@ -86,7 +84,7 @@ void CategoryFactory::loadCategories()
         int id       = cells[0].toInt(&cell0Ok);
         int parentID = cells[3].trimmed().toInt(&cell3Ok);
         if (!cell0Ok || !cell3Ok) {
-          log::error(tr("invalid category line {}: {}"), lineNum, line.constData());
+          log::error(tr("invalid category line {}: {}").toStdString(), lineNum, line.constData());
         }
         addCategory(id, QString::fromUtf8(cells[1].constData()), nexusCats, parentID);
       } else if (cells.count() == 3) {
@@ -95,13 +93,13 @@ void CategoryFactory::loadCategories()
           int id = cells[0].toInt(&cell0Ok);
           int parentID = cells[2].trimmed().toInt(&cell3Ok);
           if (!cell0Ok || !cell3Ok) {
-            log::error(tr("invalid category line {}: {}"), lineNum, line.constData());
+            log::error(tr("invalid category line {}: {}").toStdString(), lineNum, line.constData());
           }
 
           addCategory(id, QString::fromUtf8(cells[1].constData()), std::vector<NexusCategory>(), parentID);
       } else {
         log::error(
-          tr("invalid category line {}: {} ({} cells)"),
+          tr("invalid category line {}: {} ({} cells)").toStdString(),
           lineNum, line.constData(), cells.count());
       }
     }
@@ -121,11 +119,11 @@ void CategoryFactory::loadCategories()
         bool ok = false;
         int nexID = nexCells[2].toInt(&ok);
         if (!ok) {
-          log::error(tr("invalid nexus ID {}"), nexCells[2].constData());
+          log::error(tr("invalid nexus ID {}").toStdString(), nexCells[2].constData());
         }
         int catID = nexCells[0].toInt(&ok);
         if (!ok) {
-          log::error(tr("invalid category id {}"), nexCells[0].constData());
+          log::error(tr("invalid category id {}").toStdString(), nexCells[0].constData());
         }
         m_NexusMap[NexusCategory(nexName, nexID)] = catID;
       }
@@ -139,10 +137,8 @@ void CategoryFactory::loadCategories()
 
 CategoryFactory* CategoryFactory::instance()
 {
-  if (s_Instance == nullptr) {
-    s_Instance = new CategoryFactory;
-  }
-  return s_Instance;
+  static CategoryFactory s_Instance;
+  return &s_Instance;
 }
 
 void CategoryFactory::reset()
@@ -175,11 +171,6 @@ void CategoryFactory::setParents()
   }
 }
 
-void CategoryFactory::cleanup()
-{
-  delete s_Instance;
-  s_Instance = nullptr;
-}
 
 void CategoryFactory::saveCategories()
 {
@@ -252,7 +243,7 @@ int CategoryFactory::addCategory(const QString& name, const std::vector<NexusCat
 void CategoryFactory::addCategory(int id, const QString& name, int parentID)
 {
   int index = static_cast<int>(m_Categories.size());
-  m_Categories.push_back(Category(index, id, name, parentID));
+  m_Categories.push_back(Category(index, id, name, parentID, std::vector<NexusCategory>()));
   m_IDMap[id] = index;
 }
 
@@ -261,7 +252,9 @@ void CategoryFactory::addCategory(int id, const QString& name, const std::vector
   for (auto nexusCat : nexusCats) {
     m_NexusMap[nexusCat] = id;
   }
-  addCategory(id, name, parentID);
+  int index = static_cast<int>(m_Categories.size());
+  m_Categories.push_back(Category(index, id, name, parentID, nexusCats));
+  m_IDMap[id] = index;
 }
 
 
@@ -323,7 +316,7 @@ bool CategoryFactory::isDescendantOfImpl(int id, int parentID,
       return isDescendantOfImpl(m_Categories[index].m_ParentID, parentID, seen);
     }
   } else {
-    log::warn(tr("{} is no valid category id"), id);
+    log::warn(tr("{} is no valid category id").toStdString(), id);
     return false;
   }
 }
@@ -443,10 +436,10 @@ unsigned int CategoryFactory::resolveNexusID(int nexusID) const
     return el.first.m_ID == nexusID;
     });
   if (result != m_NexusMap.end()) {
-    log::debug(tr("nexus category id {} maps to internal {}"), nexusID, result->second);
+    log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, result->second);
     return result->second;
   } else {
-    log::debug(tr("nexus category id {} not mapped"), nexusID);
+    log::debug(tr("nexus category id {} not mapped").toStdString(), nexusID);
     return 0U;
   }
 }
diff --git a/src/categories.h b/src/categories.h
index 232288a73..e9f007262 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -31,7 +31,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
  *to look up categories, optimized to where the request comes from. Therefore be very
  *careful which of the two you have available
  **/
-class CategoryFactory : QObject {
+class CategoryFactory : public QObject {
   Q_OBJECT;
 
   friend class CategoriesDialog;
@@ -53,14 +53,35 @@ class CategoryFactory : QObject {
   };
 
 public:
+  struct NexusCategory {
+    NexusCategory(const QString& name, const int nexusID)
+      : m_Name(name), m_ID(nexusID) {}
+    QString m_Name;
+    int m_ID;
+
+    friend bool operator==(const NexusCategory& LHS, const NexusCategory& RHS) {
+      return LHS.m_ID == RHS.m_ID;
+    }
+
+    friend bool operator==(const NexusCategory& LHS, const int RHS) {
+      return LHS.m_ID == RHS;
+    }
+
+    friend bool operator<(const NexusCategory& LHS, const NexusCategory& RHS) {
+      return LHS.m_ID < RHS.m_ID;
+    }
+  };
+
   struct Category {
-    Category(int sortValue, int id, const QString& name, int parentID)
-      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false), m_ParentID(parentID) {}
+    Category(int sortValue, int id, const QString& name, int parentID, std::vector<NexusCategory> nexusCats)
+      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false), m_ParentID(parentID)
+      , m_NexusCats(nexusCats) {}
     int m_SortValue;
     int m_ID;
     int m_ParentID;
     bool m_HasChildren;
     QString m_Name;
+    std::vector<NexusCategory> m_NexusCats;
 
     friend bool operator<(const Category& LHS, const Category& RHS)
     {
@@ -68,13 +89,6 @@ class CategoryFactory : QObject {
     }
   };
 
-  struct NexusCategory {
-    NexusCategory(const QString &name, const int nexusID)
-      : m_Name(name), m_ID(nexusID) {}
-    QString m_Name;
-    int m_ID;
-  };
-
 public:
   /**
    * @brief reset the list of categories
@@ -206,7 +220,7 @@ public slots:
   void requestNexusCategories();
 
 private:
-  CategoryFactory();
+  explicit CategoryFactory();
 
   void loadDefaultCategories();
 
@@ -215,11 +229,7 @@ public slots:
 
   void setParents();
 
-  static void cleanup();
-
 private:
-  static CategoryFactory* s_Instance;
-
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
   std::map<NexusCategory, unsigned int> m_NexusMap;
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 70759419a..03a7fc592 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -136,18 +136,19 @@ void CategoriesDialog::commitChanges()
   categories->reset();
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
-    int index             = ui->categoriesTable->verticalHeader()->logicalIndex(i);
-    QString nexusIDString = ui->categoriesTable->item(index, 2)->text();
-    QStringList nexusIDStringList = nexusIDString.split(',', Qt::SkipEmptyParts);
-    std::vector<int> nexusIDs;
-    for (QStringList::iterator iter = nexusIDStringList.begin();
-         iter != nexusIDStringList.end(); ++iter) {
-      nexusIDs.push_back(iter->toInt());
+    int index = ui->categoriesTable->verticalHeader()->logicalIndex(i);
+    QVariantList nexusData = ui->categoriesTable->item(index, 2)->data(Qt::UserRole).toList();
+    std::vector<CategoryFactory::NexusCategory> nexusCats;
+    for (QVariantList::iterator iter = nexusData.begin();
+         iter != nexusData.end(); ++iter) {
+      QVariantList nexusInfo = iter->toList();
+      nexusCats.push_back(CategoryFactory::NexusCategory(nexusInfo[0].toString(), nexusInfo[1].toInt()));
     }
 
     categories->addCategory(
           ui->categoriesTable->item(index, 0)->text().toInt(),
-          ui->categoriesTable->item(index, 1)->text(), nexusIDs,
+          ui->categoriesTable->item(index, 1)->text(),
+          nexusCats,
           ui->categoriesTable->item(index, 3)->text().toInt());
   }
   categories->setParents();
@@ -169,8 +170,8 @@ void CategoriesDialog::refreshIDs()
 
 void CategoriesDialog::fillTable()
 {
-  CategoryFactory& categories = CategoryFactory::instance();
-  QTableWidget* table         = ui->categoriesTable;
+  CategoryFactory* categories = CategoryFactory::instance();
+  QTableWidget* table = ui->categoriesTable;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
@@ -198,9 +199,8 @@ void CategoriesDialog::fillTable()
       3, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
 
   int row = 0;
-  for (std::vector<CategoryFactory::Category>::const_iterator iter =
-           categories.m_Categories.begin();
-       iter != categories.m_Categories.end(); ++iter, ++row) {
+  for (std::vector<CategoryFactory::Category>::const_iterator iter = categories->m_Categories.begin();
+       iter != categories->m_Categories.end(); ++iter, ++row) {
     const CategoryFactory::Category& category = *iter;
     if (category.m_ID == 0) {
       --row;
@@ -213,14 +213,23 @@ void CategoriesDialog::fillTable()
     idItem->setData(Qt::DisplayRole, category.m_ID);
 
     QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(category.m_Name));
-    QScopedPointer<QTableWidgetItem> nexusIDItem(
-        new QTableWidgetItem(MOBase::VectorJoin(category.m_NexusIDs, ",")));
+    QStringList nexusLabel;
+    QVariantList nexusData;
+    for (auto iter = category.m_NexusCats.begin(); iter < category.m_NexusCats.end(); ++iter) {
+      nexusLabel.append(iter->m_Name);
+      QVariantList data;
+      data.append(QVariant(iter->m_Name));
+      data.append(QVariant(iter->m_ID));
+      nexusData.append(data);
+    }
+    QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem(nexusLabel.join(", ")));
+    nexusCatItem->setData(Qt::UserRole, nexusData);
     QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
     parentIDItem->setData(Qt::DisplayRole, category.m_ParentID);
 
     table->setItem(row, 0, idItem.take());
     table->setItem(row, 1, nameItem.take());
-    table->setItem(row, 2, nexusIDItem.take());
+    table->setItem(row, 2, nexusCatItem.take());
     table->setItem(row, 3, parentIDItem.take());
   }
 
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index 2ac84124e..c1c1c6739 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define CATEGORIESDIALOG_H
 
 #include "tutorabledialog.h"
+#include "categories.h"
 #include <set>
 
 namespace Ui
@@ -66,6 +67,8 @@ private slots:
 
   int m_HighestID;
   std::set<int> m_IDs;
+  std::vector<CategoryFactory::NexusCategory> m_NexusCategories;
+
 };
 
 #endif  // CATEGORIESDIALOG_H
diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index 582a76082..03209d53a 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -6,19 +6,32 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>553</width>
+    <width>735</width>
     <height>444</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Categories</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="2" colspan="4">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
     <widget class="QTableWidget" name="categoriesTable">
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
      <property name="dragEnabled">
       <bool>false</bool>
      </property>
@@ -26,7 +39,7 @@
       <bool>false</bool>
      </property>
      <property name="dragDropMode">
-      <enum>QAbstractItemView::NoDragDrop</enum>
+      <enum>QAbstractItemView::DropOnly</enum>
      </property>
      <property name="defaultDropAction">
       <enum>Qt::IgnoreAction</enum>
@@ -46,15 +59,15 @@
      <attribute name="horizontalHeaderVisible">
       <bool>true</bool>
      </attribute>
+     <attribute name="horizontalHeaderMinimumSectionSize">
+      <number>26</number>
+     </attribute>
      <attribute name="horizontalHeaderDefaultSectionSize">
       <number>100</number>
      </attribute>
      <attribute name="horizontalHeaderHighlightSections">
       <bool>true</bool>
      </attribute>
-     <attribute name="horizontalHeaderMinimumSectionSize">
-      <number>26</number>
-     </attribute>
      <attribute name="horizontalHeaderStretchLastSection">
       <bool>false</bool>
      </attribute>
@@ -85,7 +98,15 @@
      </column>
      <column>
       <property name="text">
-       <string>Nexus IDs</string>
+       <string>Parent ID</string>
+      </property>
+      <property name="toolTip">
+       <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Nexus Categories</string>
       </property>
       <property name="toolTip">
        <string>Comma-Separated list of Nexus IDs to be matched to the internal ID.</string>
@@ -100,24 +121,34 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </column>
-     <column>
-      <property name="text">
-       <string>Parent ID</string>
-      </property>
-      <property name="toolTip">
-       <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
-      </property>
-     </column>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="0" column="5">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="title">
+      <string>Nexus Categories</string>
      </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QListWidget" name="listWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="dragEnabled">
+         <bool>true</bool>
+        </property>
+        <property name="dragDropMode">
+         <enum>QAbstractItemView::DragOnly</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 8c2ce78d3..dce81bd19 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -659,12 +659,12 @@ InstallationResult InstallationManager::install(const QString& fileName,
     modName.update(doc.toPlainText(), GUESS_FALLBACK);
     modName.update(metaFile.value("modName", "").toString(), GUESS_META);
 
-    version                    = metaFile.value("version", "").toString();
-    newestVersion              = metaFile.value("newestVersion", "").toString();
-    unsigned int categoryIndex = CategoryFactory::instance().resolveNexusID(
+    version = metaFile.value("version", "").toString();
+    newestVersion = metaFile.value("newestVersion", "").toString();
+    unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(
         metaFile.value("category", 0).toInt());
-    categoryID     = CategoryFactory::instance().getCategoryID(categoryIndex);
-    repository     = metaFile.value("repository", "").toString();
+    categoryID = CategoryFactory::instance()->getCategoryID(categoryIndex);
+    repository = metaFile.value("repository", "").toString();
     fileCategoryID = metaFile.value("fileCategory", 1).toInt();
   }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 37113954f..e9106caac 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -419,7 +419,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore,
           SLOT(nexusApi()));
 
-  connect(m_CategoryFactory, SIGNAL(requestNexusCategories()), &m_OrganizerCore, SLOT(requestNexusCategories()));
+  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), &m_OrganizerCore, SLOT(requestNexusCategories()));
 
   connect(
     NexusInterface::instance(&pluginContainer)->getAccessManager(),
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 1d30ac952..68c8ea9e7 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -493,16 +493,16 @@ void ModInfo::setPluginSelected(const bool& isSelected)
 
 void ModInfo::addCategory(const QString& categoryName)
 {
-  int id = CategoryFactory::instance().getCategoryID(categoryName);
+  int id = CategoryFactory::instance()->getCategoryID(categoryName);
   if (id == -1) {
-    id = CategoryFactory::instance().addCategory(categoryName, std::vector<int>(), 0);
+    id = CategoryFactory::instance()->addCategory(categoryName, std::vector<CategoryFactory::NexusCategory>(), 0);
   }
   setCategory(id, true);
 }
 
 bool ModInfo::removeCategory(const QString& categoryName)
 {
-  int id = CategoryFactory::instance().getCategoryID(categoryName);
+  int id = CategoryFactory::instance()->getCategoryID(categoryName);
   if (id == -1) {
     return false;
   }
@@ -517,9 +517,9 @@ QStringList ModInfo::categories() const
 {
   QStringList result;
 
-  CategoryFactory& catFac = CategoryFactory::instance();
+  CategoryFactory* catFac = CategoryFactory::instance();
   for (int id : m_Categories) {
-    result.append(catFac.getCategoryName(catFac.getCategoryIndex(id)));
+    result.append(catFac->getCategoryName(catFac->getCategoryIndex(id)));
   }
 
   return result;
@@ -549,7 +549,7 @@ bool ModInfo::categorySet(int categoryID) const
   for (std::set<int>::const_iterator iter = m_Categories.begin();
        iter != m_Categories.end(); ++iter) {
     if ((*iter == categoryID) ||
-        (CategoryFactory::instance().isDescendantOf(*iter, categoryID))) {
+        (CategoryFactory::instance()->isDecendantOf(*iter, categoryID))) {
       return true;
     }
   }
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index a7a4ce1e6..8819c0fa8 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -44,19 +44,19 @@ bool CategoriesTab::usesOriginFiles() const
   return false;
 }
 
-void CategoriesTab::add(const CategoryFactory& factory,
-                        const std::set<int>& enabledCategories, QTreeWidgetItem* root,
-                        int rootLevel)
+void CategoriesTab::add(
+  const CategoryFactory* factory, const std::set<int>& enabledCategories,
+  QTreeWidgetItem* root, int rootLevel)
 {
-  for (int i = 0; i < static_cast<int>(factory.numCategories()); ++i) {
-    if (factory.getParentID(i) != rootLevel) {
+  for (int i=0; i<static_cast<int>(factory->numCategories()); ++i) {
+    if (factory->getParentID(i) != rootLevel) {
       continue;
     }
 
-    int categoryID = factory.getCategoryID(i);
+    int categoryID = factory->getCategoryID(i);
 
-    QTreeWidgetItem* newItem =
-        new QTreeWidgetItem(QStringList(factory.getCategoryName(i)));
+    QTreeWidgetItem* newItem
+      = new QTreeWidgetItem(QStringList(factory->getCategoryName(i)));
 
     newItem->setFlags(newItem->flags() | Qt::ItemIsUserCheckable);
 
@@ -67,7 +67,7 @@ void CategoriesTab::add(const CategoryFactory& factory,
 
     newItem->setData(0, Qt::UserRole, categoryID);
 
-    if (factory.hasChildren(i)) {
+    if (factory->hasChildren(i)) {
       add(factory, enabledCategories, newItem, categoryID);
     }
 
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index 03b3555b8..e73bfa32f 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -13,8 +13,9 @@ class CategoriesTab : public ModInfoDialogTab
   bool usesOriginFiles() const override;
 
 private:
-  void add(const CategoryFactory& factory, const std::set<int>& enabledCategories,
-           QTreeWidgetItem* root, int rootLevel);
+  void add(
+    const CategoryFactory* factory, const std::set<int>& enabledCategories,
+    QTreeWidgetItem* root, int rootLevel);
 
   void updatePrimary();
   void addChecked(QTreeWidgetItem* tree);
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index 4c1004e6b..275b76a3a 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -210,8 +210,7 @@ void ModInfoRegular::readMeta()
       // ignore invalid id
       continue;
     }
-    if (ok && (categoryID != 0) &&
-        (CategoryFactory::instance().categoryExists(categoryID))) {
+    if (ok && (categoryID != 0) && (CategoryFactory::instance()->categoryExists(categoryID))) {
       m_Categories.insert(categoryID);
       if (iter == categories.begin()) {
         m_PrimaryCategory = categoryID;
@@ -575,7 +574,7 @@ void ModInfoRegular::setInstallationFile(const QString& fileName)
 
 void ModInfoRegular::addNexusCategory(int categoryID)
 {
-  m_Categories.insert(CategoryFactory::instance().resolveNexusID(categoryID));
+  m_Categories.insert(CategoryFactory::instance()->resolveNexusID(categoryID));
 }
 
 void ModInfoRegular::setIsEndorsed(bool endorsed)
@@ -731,15 +730,15 @@ QString ModInfoRegular::getDescription() const
     const std::set<int>& categories = getCategories();
     std::wostringstream categoryString;
     categoryString << ToWString(tr("Categories: <br>"));
-    CategoryFactory& categoryFactory = CategoryFactory::instance();
+    CategoryFactory* categoryFactory = CategoryFactory::instance();
     for (std::set<int>::const_iterator catIter = categories.begin();
          catIter != categories.end(); ++catIter) {
       if (catIter != categories.begin()) {
         categoryString << " , ";
       }
       categoryString << "<span style=\"white-space: nowrap;\"><i>"
-                     << ToWString(categoryFactory.getCategoryName(
-                            categoryFactory.getCategoryIndex(*catIter)))
+                     << ToWString(categoryFactory->getCategoryName(
+                         categoryFactory->getCategoryIndex(*catIter)))
                      << "</font></span>";
     }
 
diff --git a/src/modlist.cpp b/src/modlist.cpp
index 7a9513695..41d679d9a 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -232,11 +232,11 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
       } else {
         int category = modInfo->primaryCategory();
         if (category != -1) {
-          CategoryFactory& categoryFactory = CategoryFactory::instance();
-          if (categoryFactory.categoryExists(category)) {
+          CategoryFactory* categoryFactory = CategoryFactory::instance();
+          if (categoryFactory->categoryExists(category)) {
             try {
-              int categoryIdx = categoryFactory.getCategoryIndex(category);
-              return categoryFactory.getCategoryName(categoryIdx);
+              int categoryIdx = categoryFactory->getCategoryIndex(category);
+              return categoryFactory->getCategoryName(categoryIdx);
             } catch (const std::exception& e) {
               log::error("failed to retrieve category name: {}", e.what());
               return QString();
@@ -285,11 +285,10 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
   } else if (role == GroupingRole) {
     if (column == COL_CATEGORY) {
       QVariantList categoryNames;
-      std::set<int> categories         = modInfo->getCategories();
-      CategoryFactory& categoryFactory = CategoryFactory::instance();
+      std::set<int> categories = modInfo->getCategories();
+      CategoryFactory* categoryFactory = CategoryFactory::instance();
       for (auto iter = categories.begin(); iter != categories.end(); ++iter) {
-        categoryNames.append(
-            categoryFactory.getCategoryName(categoryFactory.getCategoryIndex(*iter)));
+        categoryNames.append(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
       }
       if (categoryNames.count() != 0) {
         return categoryNames;
@@ -447,17 +446,14 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
       const std::set<int>& categories = modInfo->getCategories();
       std::wostringstream categoryString;
       categoryString << ToWString(tr("Categories: <br>"));
-      CategoryFactory& categoryFactory = CategoryFactory::instance();
+      CategoryFactory* categoryFactory = CategoryFactory::instance();
       for (std::set<int>::const_iterator catIter = categories.begin();
            catIter != categories.end(); ++catIter) {
         if (catIter != categories.begin()) {
           categoryString << " , ";
         }
         try {
-          categoryString << "<span style=\"white-space: nowrap;\"><i>"
-                         << ToWString(categoryFactory.getCategoryName(
-                                categoryFactory.getCategoryIndex(*catIter)))
-                         << "</font></span>";
+          categoryString << "<span style=\"white-space: nowrap;\"><i>" << ToWString(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*catIter))) << "</font></span>";
         } catch (const std::exception& e) {
           log::error("failed to generate tooltip: {}", e.what());
           return QString();
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 704ec10b1..1d54dfa45 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -125,111 +125,104 @@ bool ModListSortProxy::lessThan(const QModelIndex& left, const QModelIndex& righ
             right.data(ModList::PriorityRole).toInt();
 
   switch (left.column()) {
-  case ModList::COL_FLAGS: {
-    std::vector<ModInfo::EFlag> leftFlags  = leftMod->getFlags();
-    std::vector<ModInfo::EFlag> rightFlags = rightMod->getFlags();
-    if (leftFlags.size() != rightFlags.size()) {
-      lt = leftFlags.size() < rightFlags.size();
-    } else {
-      lt = flagsId(leftFlags) < flagsId(rightFlags);
-    }
-  } break;
-  case ModList::COL_CONFLICTFLAGS: {
-    std::vector<ModInfo::EConflictFlag> leftFlags  = leftMod->getConflictFlags();
-    std::vector<ModInfo::EConflictFlag> rightFlags = rightMod->getConflictFlags();
-    if (leftFlags.size() != rightFlags.size()) {
-      lt = leftFlags.size() < rightFlags.size();
-    } else {
-      lt = conflictFlagsId(leftFlags) < conflictFlagsId(rightFlags);
-    }
-  } break;
-  case ModList::COL_CONTENT: {
-    const auto& lContents = leftMod->getContents();
-    const auto& rContents = rightMod->getContents();
-    unsigned int lValue   = 0;
-    unsigned int rValue   = 0;
-    m_Organizer->modDataContents().forEachContentIn(
+    case ModList::COL_FLAGS: {
+      std::vector<ModInfo::EFlag> leftFlags = leftMod->getFlags();
+      std::vector<ModInfo::EFlag> rightFlags = rightMod->getFlags();
+      if (leftFlags.size() != rightFlags.size()) {
+        lt = leftFlags.size() < rightFlags.size();
+      } else {
+        lt = flagsId(leftFlags) < flagsId(rightFlags);
+      }
+    } break;
+    case ModList::COL_CONFLICTFLAGS: {
+      std::vector<ModInfo::EConflictFlag> leftFlags = leftMod->getConflictFlags();
+      std::vector<ModInfo::EConflictFlag> rightFlags = rightMod->getConflictFlags();
+      if (leftFlags.size() != rightFlags.size()) {
+        lt = leftFlags.size() < rightFlags.size();
+      } else {
+        lt = conflictFlagsId(leftFlags) < conflictFlagsId(rightFlags);
+      }
+    } break;
+    case ModList::COL_CONTENT: {
+      const auto& lContents = leftMod->getContents();
+      const auto& rContents = rightMod->getContents();
+      unsigned int lValue   = 0;
+      unsigned int rValue   = 0;
+      m_Organizer->modDataContents().forEachContentIn(
         lContents, [&lValue](auto const& content) {
           lValue += 2U << static_cast<unsigned int>(content.id());
         });
-    m_Organizer->modDataContents().forEachContentIn(
+      m_Organizer->modDataContents().forEachContentIn(
         rContents, [&rValue](auto const& content) {
           rValue += 2U << static_cast<unsigned int>(content.id());
-        });
-    lt = lValue < rValue;
-  } break;
-  case ModList::COL_NAME: {
-    int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
-    if (comp != 0)
-      lt = comp < 0;
-  } break;
-  case ModList::COL_CATEGORY: {
-    if (leftMod->primaryCategory() != rightMod->primaryCategory()) {
-      if (leftMod->primaryCategory() < 0)
-        lt = false;
-      else if (rightMod->primaryCategory() < 0)
-        lt = true;
-      else {
-        try {
-          CategoryFactory& categories = CategoryFactory::instance();
-          QString leftCatName         = categories.getCategoryName(
-              categories.getCategoryIndex(leftMod->primaryCategory()));
-          QString rightCatName = categories.getCategoryName(
-              categories.getCategoryIndex(rightMod->primaryCategory()));
-          lt = leftCatName < rightCatName;
-        } catch (const std::exception& e) {
-          log::error("failed to compare categories: {}", e.what());
-        }
-      }
-    }
-  } break;
-  case ModList::COL_MODID: {
-    if (leftMod->nexusId() != rightMod->nexusId())
-      lt = leftMod->nexusId() < rightMod->nexusId();
-  } break;
-  case ModList::COL_VERSION: {
-    if (leftMod->version() != rightMod->version())
-      lt = leftMod->version() < rightMod->version();
-  } break;
-  case ModList::COL_INSTALLTIME: {
-    QDateTime leftTime  = left.data().toDateTime();
-    QDateTime rightTime = right.data().toDateTime();
-    if (leftTime != rightTime)
-      return leftTime < rightTime;
-  } break;
-  case ModList::COL_GAME: {
-    if (leftMod->gameName() != rightMod->gameName()) {
-      lt = leftMod->gameName() < rightMod->gameName();
-    } else {
-      int comp =
-          QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
+      });
+      lt = lValue < rValue;
+    } break;
+    case ModList::COL_NAME: {
+      int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
       if (comp != 0)
         lt = comp < 0;
-    }
-  } break;
-  case ModList::COL_NOTES: {
-    QString leftComments  = leftMod->comments();
-    QString rightComments = rightMod->comments();
-    if (leftComments != rightComments) {
-      if (leftComments.isEmpty()) {
-        lt = sortOrder() == Qt::DescendingOrder;
-      } else if (rightComments.isEmpty()) {
-        lt = sortOrder() == Qt::AscendingOrder;
+    } break;
+    case ModList::COL_CATEGORY: {
+      if (leftMod->primaryCategory() != rightMod->primaryCategory()) {
+        if (leftMod->primaryCategory() < 0)
+          lt = false;
+        else if (rightMod->primaryCategory() < 0)
+          lt = true;
+        else {
+          try {
+            CategoryFactory* categories = CategoryFactory::instance();
+            QString leftCatName = categories->getCategoryName(categories->getCategoryIndex(leftMod->primaryCategory()));
+            QString rightCatName = categories->getCategoryName(categories->getCategoryIndex(rightMod->primaryCategory()));
+            lt = leftCatName < rightCatName;
+          } catch (const std::exception& e) {
+            log::error("failed to compare categories: {}", e.what());
+          }
+        }
+      }
+    } break;
+    case ModList::COL_MODID: {
+      if (leftMod->nexusId() != rightMod->nexusId())
+        lt = leftMod->nexusId() < rightMod->nexusId();
+    } break;
+    case ModList::COL_VERSION: {
+      if (leftMod->version() != rightMod->version())
+        lt = leftMod->version() < rightMod->version();
+    } break;
+    case ModList::COL_INSTALLTIME: {
+      QDateTime leftTime = left.data().toDateTime();
+      QDateTime rightTime = right.data().toDateTime();
+      if (leftTime != rightTime)
+        return leftTime < rightTime;
+    } break;
+    case ModList::COL_GAME: {
+      if (leftMod->gameName() != rightMod->gameName()) {
+        lt = leftMod->gameName() < rightMod->gameName();
       } else {
-        lt = leftComments < rightComments;
+        int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
+        if (comp != 0)
+          lt = comp < 0;
+       }
+    } break;
+    case ModList::COL_NOTES: {
+      QString leftComments = leftMod->comments();
+      QString rightComments = rightMod->comments();
+      if (leftComments != rightComments) {
+        if (leftComments.isEmpty()) {
+          lt = sortOrder() == Qt::DescendingOrder;
+        } else if (rightComments.isEmpty()) {
+          lt = sortOrder() == Qt::AscendingOrder;
+        } else {
+          lt = leftComments < rightComments;
+        }
       }
-    }
-  } break;
-  case ModList::COL_PRIORITY: {
-    if (leftMod->isBackup() != rightMod->isBackup()) {
-      lt = leftMod->isBackup();
-    } else if (leftMod->isOverwrite() != rightMod->isOverwrite()) {
-      lt = rightMod->isOverwrite();
-    }
-  } break;
-  default: {
-    log::warn("Sorting is not defined for column {}", left.column());
-  } break;
+    } break;
+    case ModList::COL_PRIORITY: {
+      // nop, already compared by priority
+    } break;
+    default: {
+      log::warn("Sorting is not defined for column {}", left.column());
+    } break;
   }
   return lt;
 }

From f764271b1f1fa457af9dd4f7d044005d46fcd84b Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Tue, 24 Dec 2019 15:15:45 -0600
Subject: [PATCH 05/43] WIP: Refactor cat dialog and implement nex cat updates

---
 src/categoriesdialog.cpp      |  58 +++++---
 src/categoriesdialog.h        |  12 +-
 src/categoriesdialog.ui       |  29 ++--
 src/filterlist.cpp            |   7 +-
 src/filterlist.h              |   4 +-
 src/mainwindow.cpp            |   2 +-
 src/nexusinterface.cpp        | 263 ++++++++++++++--------------------
 src/settingsdialog.cpp        |   3 +-
 src/settingsdialoggeneral.cpp |   6 +-
 src/settingsdialoggeneral.h   |   7 +-
 10 files changed, 197 insertions(+), 194 deletions(-)

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 03a7fc592..08397cb87 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settings.h"
 #include "ui_categoriesdialog.h"
 #include "utility.h"
+#include "nexusinterface.h"
 #include <QItemDelegate>
 #include <QLineEdit>
 #include <QMenu>
@@ -102,8 +103,8 @@ class ValidatingDelegate : public QItemDelegate
   QValidator* m_Validator;
 };
 
-CategoriesDialog::CategoriesDialog(QWidget* parent)
-    : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog)
+CategoriesDialog::CategoriesDialog(PluginContainer* pluginContainer, QWidget* parent)
+  : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog), m_PluginContainer(pluginContainer)
 {
   ui->setupUi(this);
   fillTable();
@@ -172,6 +173,7 @@ void CategoriesDialog::fillTable()
 {
   CategoryFactory* categories = CategoryFactory::instance();
   QTableWidget* table = ui->categoriesTable;
+  QListWidget* list = ui->nexusCategoryList;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
@@ -180,23 +182,9 @@ void CategoriesDialog::fillTable()
   table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
   table->verticalHeader()->setSectionsMovable(true);
   table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-#else
-  table->horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
-  table->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
-  table->horizontalHeader()->setResizeMode(2, QHeaderView::Fixed);
-  table->horizontalHeader()->setResizeMode(3, QHeaderView::Fixed);
-  table->verticalHeader()->setMovable(true);
-  table->verticalHeader()->setResizeMode(QHeaderView::Fixed);
-#endif
-
-  table->setItemDelegateForColumn(
-      0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
-  table->setItemDelegateForColumn(
-      2, new ValidatingDelegate(this,
-                                new QRegularExpressionValidator(
-                                    QRegularExpression("([0-9]+)?(,[0-9]+)*"), this)));
-  table->setItemDelegateForColumn(
-      3, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(2, new ValidatingDelegate(this, new QRegExpValidator(QRegExp("([0-9]+)?(,[0-9]+)*"), this)));
+  table->setItemDelegateForColumn(3, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
 
   int row = 0;
   for (std::vector<CategoryFactory::Category>::const_iterator iter = categories->m_Categories.begin();
@@ -233,6 +221,14 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 3, parentIDItem.take());
   }
 
+  for (auto nexusCat : categories->m_NexusMap)
+  {
+    QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
+    nexusItem->setData(Qt::DisplayRole, nexusCat.first.m_Name);
+    nexusItem->setData(Qt::UserRole, nexusCat.first.m_ID);
+    list->addItem(nexusItem.take());
+  }
+
   refreshIDs();
 }
 
@@ -253,6 +249,30 @@ void CategoriesDialog::removeCategory_clicked()
   ui->categoriesTable->removeRow(m_ContextRow);
 }
 
+
+void CategoriesDialog::nexusRefresh_clicked()
+{
+  NexusInterface *nexus = NexusInterface::instance(m_PluginContainer);
+  nexus->requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
+}
+
+void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int)
+{
+  QVariantMap result = resultData.toMap();
+  QVariantList categories = result["categories"].toList().first().toList();
+  auto catFactory = CategoryFactory::instance();
+  QListWidget* list = ui->nexusCategoryList;
+  list->clear();
+  for (auto category : categories) {
+    auto catMap = category.toMap();
+    QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
+    nexusItem->setData(Qt::DisplayRole, catMap["name"].toString());
+    nexusItem->setData(Qt::UserRole, catMap["category_id"].toInt());
+    list->addItem(nexusItem.take());
+  }
+}
+
+
 void CategoriesDialog::on_categoriesTable_customContextMenuRequested(const QPoint& pos)
 {
   m_ContextRow = ui->categoriesTable->rowAt(pos.y());
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index c1c1c6739..b6fe832ff 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tutorabledialog.h"
 #include "categories.h"
+#include "plugincontainer.h"
 #include <set>
 
 namespace Ui
@@ -37,7 +38,7 @@ class CategoriesDialog : public MOBase::TutorableDialog
   Q_OBJECT
 
 public:
-  explicit CategoriesDialog(QWidget* parent = 0);
+  explicit CategoriesDialog(PluginContainer* pluginContainer, QWidget* parent = 0);
   ~CategoriesDialog();
 
   // also saves and restores geometry
@@ -50,11 +51,19 @@ class CategoriesDialog : public MOBase::TutorableDialog
    **/
   void commitChanges();
 
+public slots:
+
+  void nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int);
+
+signals:
+  void refreshNexusCategories();
+
 private slots:
 
   void on_categoriesTable_customContextMenuRequested(const QPoint& pos);
   void addCategory_clicked();
   void removeCategory_clicked();
+  void nexusRefresh_clicked();
   void cellChanged(int row, int column);
 
 private:
@@ -63,6 +72,7 @@ private slots:
 
 private:
   Ui::CategoriesDialog* ui;
+  PluginContainer* m_PluginContainer;
   int m_ContextRow;
 
   int m_HighestID;
diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index 03209d53a..993de2ad1 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -14,16 +14,6 @@
    <string>Categories</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="2" colspan="4">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="3">
     <widget class="QTableWidget" name="categoriesTable">
      <property name="contextMenuPolicy">
@@ -123,6 +113,16 @@ p, li { white-space: pre-wrap; }
      </column>
     </widget>
    </item>
+   <item row="4" column="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="5">
     <widget class="QGroupBox" name="groupBox">
      <property name="layoutDirection">
@@ -133,7 +133,7 @@ p, li { white-space: pre-wrap; }
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QListWidget" name="listWidget">
+       <widget class="QListWidget" name="nexusCategoryList">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
           <horstretch>0</horstretch>
@@ -151,6 +151,13 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
+   <item row="4" column="5">
+    <widget class="QPushButton" name="nexusRefresh">
+     <property name="text">
+      <string>Refresh Nexus Categories</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 548532274..8ac4040cf 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -2,6 +2,7 @@
 #include "categories.h"
 #include "categoriesdialog.h"
 #include "organizercore.h"
+#include "plugincontainer.h"
 #include "settings.h"
 #include "ui_mainwindow.h"
 #include <utility.h>
@@ -188,8 +189,8 @@ class CriteriaItemFilter : public QObject
 };
 
 
-FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, CategoryFactory* factory)
-  : ui(ui), m_Organizer(organizer), m_factory(factory)
+FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory)
+  : ui(ui), m_Organizer(organizer), m_pluginContainer(pluginContainer, m_factory(factory)
 {
   auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
     return cycleItem(item, dir);
@@ -425,7 +426,7 @@ void FilterList::checkCriteria()
 
 void FilterList::editCategories()
 {
-  CategoriesDialog dialog(qApp->activeWindow());
+  CategoriesDialog dialog(m_pluginContainer, qApp->activeWindow());
 
   if (dialog.exec() == QDialog::Accepted) {
     dialog.commitChanges();
diff --git a/src/filterlist.h b/src/filterlist.h
index 7bcbdc0f0..823a63c2c 100644
--- a/src/filterlist.h
+++ b/src/filterlist.h
@@ -9,6 +9,7 @@ namespace Ui
 class MainWindow;
 };
 class CategoryFactory;
+class PluginContainer;
 class Settings;
 class OrganizerCore;
 
@@ -17,7 +18,7 @@ class FilterList : public QObject
   Q_OBJECT;
 
 public:
-  FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, CategoryFactory* factory);
+  FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory);
 
   void restoreState(const Settings& s);
   void saveState(Settings& s) const;
@@ -37,6 +38,7 @@ class FilterList : public QObject
   Ui::MainWindow* ui;
   OrganizerCore* m_Organizer;
   CategoryFactory* m_factory;
+  PluginContainer* m_pluginContainer;
 
   bool onClick(QMouseEvent* e);
   void onItemActivated(QTreeWidgetItem* item);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e9106caac..2b6530599 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -293,7 +293,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   languageChange(settings.interface().language());
 
   m_CategoryFactory->loadCategories();
-  m_Filters.reset(new FilterList(ui, &m_OrganizerCore, m_CategoryFactory));
+  m_Filters.reset(new FilterList(ui, &m_OrganizerCore, &m_PluginContainer, m_CategoryFactory));
 
   connect(
     m_Filters.get(), &FilterList::criteriaChanged,
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 00ecdae34..cece6745e 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -868,101 +868,72 @@ void NexusInterface::nextRequest()
   if (!info.m_Reroute) {
     bool hasParams = false;
     switch (info.m_Type) {
-    case NXMRequestInfo::TYPE_DESCRIPTION:
-    case NXMRequestInfo::TYPE_MODINFO: {
-      url = QString("%1/games/%2/mods/%3")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(info.m_ModID);
-    } break;
-    case NXMRequestInfo::TYPE_CHECKUPDATES: {
-      QString period;
-      switch (info.m_UpdatePeriod) {
-      case UpdatePeriod::DAY:
-        period = "1d";
-        break;
-      case UpdatePeriod::WEEK:
-        period = "1w";
-        break;
-      case UpdatePeriod::MONTH:
-        period = "1m";
-        break;
-      }
-      url = QString("%1/games/%2/mods/updated?period=%3")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(period);
-    } break;
-    case NXMRequestInfo::TYPE_FILES:
-    case NXMRequestInfo::TYPE_GETUPDATES: {
-      url = QString("%1/games/%2/mods/%3/files")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(info.m_ModID);
-    } break;
-    case NXMRequestInfo::TYPE_FILEINFO: {
-      url = QString("%1/games/%2/mods/%3/files/%4")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(info.m_ModID)
-                .arg(info.m_FileID);
-    } break;
-    case NXMRequestInfo::TYPE_DOWNLOADURL: {
-      ModRepositoryFileInfo* fileInfo = qobject_cast<ModRepositoryFileInfo*>(
-          qvariant_cast<QObject*>(info.m_UserData));
-      if (m_User.type() == APIUserAccountTypes::Premium) {
-        url = QString("%1/games/%2/mods/%3/files/%4/download_link")
-                  .arg(info.m_URL)
-                  .arg(info.m_GameName)
-                  .arg(info.m_ModID)
-                  .arg(info.m_FileID);
-      } else if (!fileInfo->nexusKey.isEmpty() && fileInfo->nexusExpires &&
-                 fileInfo->nexusDownloadUser == m_User.id().toInt()) {
-        url = QString("%1/games/%2/mods/%3/files/%4/download_link?key=%5&expires=%6")
+      case NXMRequestInfo::TYPE_DESCRIPTION:
+      case NXMRequestInfo::TYPE_MODINFO: {
+        url = QString("%1/games/%2/mods/%3")
                   .arg(info.m_URL)
                   .arg(info.m_GameName)
-                  .arg(info.m_ModID)
-                  .arg(info.m_FileID)
-                  .arg(fileInfo->nexusKey)
-                  .arg(fileInfo->nexusExpires);
-      } else {
-        log::warn("{}", tr("Aborting download: Either you clicked on a premium-only "
-                           "link and your account is not premium, "
-                           "or the download link was generated by a different account "
-                           "than the one stored in Mod Organizer."));
-        return;
-      }
-    } break;
-    case NXMRequestInfo::TYPE_ENDORSEMENTS: {
-      url = QString("%1/user/endorsements").arg(info.m_URL);
-    } break;
-    case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
-      QString endorse = info.m_Endorse ? "endorse" : "abstain";
-      url             = QString("%1/games/%2/mods/%3/%4")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(info.m_ModID)
-                .arg(endorse);
-      postObject.insert("Version", info.m_ModVersion);
-      postData.setObject(postObject);
-    } break;
-    case NXMRequestInfo::TYPE_TOGGLETRACKING: {
-      url = QStringLiteral("%1/user/tracked_mods?domain_name=%2")
-                .arg(info.m_URL)
-                .arg(info.m_GameName);
-      postObject.insert("mod_id", info.m_ModID);
-      postData.setObject(postObject);
-      requestIsDelete = !info.m_Track;
-    } break;
-    case NXMRequestInfo::TYPE_TRACKEDMODS: {
-      url = QStringLiteral("%1/user/tracked_mods").arg(info.m_URL);
-    } break;
-    case NXMRequestInfo::TYPE_FILEINFO_MD5: {
-      url = QStringLiteral("%1/games/%2/mods/md5_search/%3")
-                .arg(info.m_URL)
-                .arg(info.m_GameName)
-                .arg(QString(info.m_Hash.toHex()));
-    }
+                  .arg(info.m_ModID);
+      } break;
+      case NXMRequestInfo::TYPE_CHECKUPDATES: {
+        QString period;
+        switch (info.m_UpdatePeriod) {
+        case UpdatePeriod::DAY:
+          period = "1d";
+          break;
+        case UpdatePeriod::WEEK:
+          period = "1w";
+          break;
+        case UpdatePeriod::MONTH:
+          period = "1m";
+          break;
+        }
+        url = QString("%1/games/%2/mods/updated?period=%3").arg(info.m_URL).arg(info.m_GameName).arg(period);
+      } break;
+      case NXMRequestInfo::TYPE_FILES:
+      case NXMRequestInfo::TYPE_GETUPDATES: {
+        url = QString("%1/games/%2/mods/%3/files").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID);
+      } break;
+      case NXMRequestInfo::TYPE_FILEINFO: {
+        url = QString("%1/games/%2/mods/%3/files/%4").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID);
+      } break;
+      case NXMRequestInfo::TYPE_DOWNLOADURL: {
+        ModRepositoryFileInfo *fileInfo = qobject_cast<ModRepositoryFileInfo*>(qvariant_cast<QObject*>(info.m_UserData));
+        if (m_User.type() == APIUserAccountTypes::Premium) {
+          url = QString("%1/games/%2/mods/%3/files/%4/download_link").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID);
+        } else if (!fileInfo->nexusKey.isEmpty() && fileInfo->nexusExpires && fileInfo->nexusDownloadUser == m_User.id().toInt()) {
+          url = QString("%1/games/%2/mods/%3/files/%4/download_link?key=%5&expires=%6")
+          .arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID).arg(fileInfo->nexusKey).arg(fileInfo->nexusExpires);
+        } else {
+          log::warn("{}", tr("Aborting download: Either you clicked on a premium-only link and your account is not premium, "
+            "or the download link was generated by a different account than the one stored in Mod Organizer."));
+          return;
+        }
+      } break;
+      case NXMRequestInfo::TYPE_ENDORSEMENTS: {
+        url = QString("%1/user/endorsements").arg(info.m_URL);
+      } break;
+      case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
+        QString endorse = info.m_Endorse ? "endorse" : "abstain";
+        url = QString("%1/games/%2/mods/%3/%4").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(endorse);
+        postObject.insert("Version", info.m_ModVersion);
+        postData.setObject(postObject);
+      } break;
+      case NXMRequestInfo::TYPE_TOGGLETRACKING: {
+        url = QStringLiteral("%1/user/tracked_mods?domain_name=%2").arg(info.m_URL).arg(info.m_GameName);
+        postObject.insert("mod_id", info.m_ModID);
+        postData.setObject(postObject);
+        requestIsDelete = !info.m_Track;
+      } break;
+      case NXMRequestInfo::TYPE_TRACKEDMODS: {
+        url = QStringLiteral("%1/user/tracked_mods").arg(info.m_URL);
+      } break;
+      case NXMRequestInfo::TYPE_FILEINFO_MD5: {
+        url = QStringLiteral("%1/games/%2/mods/md5_search/%3").arg(info.m_URL).arg(info.m_GameName).arg(QString(info.m_Hash.toHex()));
+      } break;
+      case NXMRequestInfo::TYPE_GAMEINFO: {
+        url = QStringLiteral("%1/games/%2").arg(info.m_URL).arg(info.m_GameName);
+      } break;
     }
   } else {
     url = info.m_URL;
@@ -1074,65 +1045,53 @@ void NexusInterface::requestFinished(std::list<NXMRequestInfo>::iterator iter)
       if (!responseDoc.isNull()) {
         QVariant result = responseDoc.toVariant();
         switch (iter->m_Type) {
-        case NXMRequestInfo::TYPE_DESCRIPTION: {
-          emit nxmDescriptionAvailable(iter->m_GameName, iter->m_ModID,
-                                       iter->m_UserData, result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_MODINFO: {
-          emit nxmModInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                   result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_CHECKUPDATES: {
-          emit nxmUpdateInfoAvailable(iter->m_GameName, iter->m_UserData, result,
-                                      iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_FILES: {
-          emit nxmFilesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                 result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_GETUPDATES: {
-          emit nxmUpdatesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                   result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_FILEINFO: {
-          emit nxmFileInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID,
-                                    iter->m_UserData, result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_DOWNLOADURL: {
-          emit nxmDownloadURLsAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID,
-                                        iter->m_UserData, result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_ENDORSEMENTS: {
-          emit nxmEndorsementsAvailable(iter->m_UserData, result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
-          emit nxmEndorsementToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                     result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_TOGGLETRACKING: {
-          auto results = result.toMap();
-          auto message = results["message"].toString();
-          if (message.contains(
-                  QRegularExpression("User [0-9]+ is already Tracking Mod: [0-9]+")) ||
-              message.contains(
-                  QRegularExpression("User [0-9]+ is now Tracking Mod: [0-9]+"))) {
-            emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                    true, iter->m_ID);
-          } else if (message.contains(QRegularExpression(
-                         "User [0-9]+ is no longer tracking [0-9]+")) ||
-                     message.contains(QRegularExpression(
-                         "Users is not tracking mod. Unable to untrack."))) {
-            emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
-                                    false, iter->m_ID);
-          }
-        } break;
-        case NXMRequestInfo::TYPE_TRACKEDMODS: {
-          emit nxmTrackedModsAvailable(iter->m_UserData, result, iter->m_ID);
-        } break;
-        case NXMRequestInfo::TYPE_FILEINFO_MD5: {
-          emit nxmFileInfoFromMd5Available(iter->m_GameName, iter->m_UserData, result,
-                                           iter->m_ID);
-        } break;
+          case NXMRequestInfo::TYPE_DESCRIPTION: {
+            emit nxmDescriptionAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_MODINFO: {
+            emit nxmModInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_CHECKUPDATES: {
+            emit nxmUpdateInfoAvailable(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_FILES: {
+            emit nxmFilesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_GETUPDATES: {
+            emit nxmUpdatesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_FILEINFO: {
+            emit nxmFileInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_DOWNLOADURL: {
+            emit nxmDownloadURLsAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_ENDORSEMENTS: {
+            emit nxmEndorsementsAvailable(iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
+            emit nxmEndorsementToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_TOGGLETRACKING: {
+            auto results = result.toMap();
+            auto message = results["message"].toString();
+            if (message.contains(QRegularExpression("User [0-9]+ is already Tracking Mod: [0-9]+")) ||
+                message.contains(QRegularExpression("User [0-9]+ is now Tracking Mod: [0-9]+"))) {
+              emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, true, iter->m_ID);
+            } else if (message.contains(QRegularExpression("User [0-9]+ is no longer tracking [0-9]+")) ||
+                       message.contains(QRegularExpression("Users is not tracking mod. Unable to untrack."))) {
+              emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, false, iter->m_ID);
+            }
+          } break;
+          case NXMRequestInfo::TYPE_TRACKEDMODS: {
+            emit nxmTrackedModsAvailable(iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_FILEINFO_MD5: {
+            emit nxmFileInfoFromMd5Available(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
+          } break;
+          case NXMRequestInfo::TYPE_GAMEINFO: {
+            emit nxmGameInfoAvailable(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
+          } break;
         }
 
         m_User.limits(parseLimits(reply));
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 425a1cb80..6ad6fdea7 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -37,8 +37,7 @@ SettingsDialog::SettingsDialog(PluginContainer* pluginContainer, Settings& setti
 {
   ui->setupUi(this);
 
-  m_tabs.push_back(
-      std::unique_ptr<SettingsTab>(new GeneralSettingsTab(settings, *this)));
+  m_tabs.push_back(std::unique_ptr<SettingsTab>(new GeneralSettingsTab(settings, m_pluginContainer, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new ThemeSettingsTab(settings, *this)));
   m_tabs.push_back(
       std::unique_ptr<SettingsTab>(new ModListSettingsTab(settings, *this)));
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 7acaa190b..95580723b 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -8,8 +8,8 @@
 
 using namespace MOBase;
 
-GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
-    : SettingsTab(s, d)
+GeneralSettingsTab::GeneralSettingsTab(Settings& s, PluginContainer* pluginContainer, SettingsDialog& d)
+  : SettingsTab(s, d), m_PluginContainer(pluginContainer)
 {
   // language
   addLanguages();
@@ -159,7 +159,7 @@ void GeneralSettingsTab::resetDialogs()
 
 void GeneralSettingsTab::onEditCategories()
 {
-  CategoriesDialog catDialog(&dialog());
+  CategoriesDialog dialog(m_PluginContainer, &dialog());
 
   if (catDialog.exec() == QDialog::Accepted) {
     catDialog.commitChanges();
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index 619381905..ffbeb50cf 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -3,11 +3,12 @@
 
 #include "settings.h"
 #include "settingsdialog.h"
+#include "plugincontainer.h"
 
 class GeneralSettingsTab : public SettingsTab
 {
 public:
-  GeneralSettingsTab(Settings& settings, SettingsDialog& dialog);
+  GeneralSettingsTab(Settings& settings, PluginContainer *pluginContainer, SettingsDialog& dialog);
 
   void update();
 
@@ -19,6 +20,10 @@ class GeneralSettingsTab : public SettingsTab
 
   void onEditCategories();
   void onResetDialogs();
+
+private:
+  PluginContainer* m_PluginContainer;
+
 };
 
 #endif  // SETTINGSDIALOGGENERAL_H

From 2f7478f8fc3ab047eaab44cd666bcc06bf15a127 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Tue, 31 Dec 2019 02:42:00 -0600
Subject: [PATCH 06/43] WIP: Fix data storage and fix loading

---
 src/categories.cpp       |  62 ++++++++++++-----------
 src/categories.h         |   3 +-
 src/categoriesdialog.cpp | 103 ++++++++++++++++++++++++++++-----------
 src/categoriesdialog.h   |   1 +
 src/categoriesdialog.ui  |  49 ++++++++++++-------
 src/mainwindow.cpp       |  61 ++++++++++++++++++++++-
 src/mainwindow.h         |   7 +++
 7 files changed, 210 insertions(+), 76 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index cf8008e5b..59b26c071 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -114,18 +114,25 @@ void CategoryFactory::loadCategories()
         QByteArray nexLine = nexusMapFile.readLine();
         ++nexLineNum;
         QList<QByteArray> nexCells = nexLine.split('|');
-        std::vector<NexusCategory> nexusCats;
-        QString nexName = nexCells[1];
-        bool ok = false;
-        int nexID = nexCells[2].toInt(&ok);
-        if (!ok) {
-          log::error(tr("invalid nexus ID {}").toStdString(), nexCells[2].constData());
-        }
-        int catID = nexCells[0].toInt(&ok);
-        if (!ok) {
-          log::error(tr("invalid category id {}").toStdString(), nexCells[0].constData());
+        if (nexCells.count() == 3) {
+          std::vector<NexusCategory> nexusCats;
+          QString nexName = nexCells[1];
+          bool ok = false;
+          int nexID = nexCells[2].toInt(&ok);
+          if (!ok) {
+            log::error(tr("invalid nexus ID {}").toStdString(), nexCells[2].constData());
+          }
+          int catID = nexCells[0].toInt(&ok);
+          if (!ok) {
+            log::error(tr("invalid category id {}").toStdString(), nexCells[0].constData());
+          }
+          m_NexusMap.insert_or_assign(nexID, NexusCategory(nexName, nexID));
+          m_NexusMap.at(nexID).m_CategoryID = catID;
+        } else {
+          log::error(
+            tr("invalid nexus category line {}: {} ({} cells)").toStdString(),
+            lineNum, nexLine.constData(), nexCells.count());
         }
-        m_NexusMap[NexusCategory(nexName, nexID)] = catID;
       }
     }
     nexusMapFile.close();
@@ -206,14 +213,14 @@ void CategoryFactory::saveCategories()
   }
 
   nexusMapFile.resize(0);
-  QByteArray line;
   for (auto iter = m_NexusMap.begin(); iter != m_NexusMap.end(); ++iter) {
-    line.append(iter->first.m_Name).append("|");
-    line.append(iter->first.m_ID).append("|");
-    line.append(iter->second).append("\n");
-    categoryFile.write(line);
+    QByteArray line;
+    line.append(QByteArray::number(iter->second.m_CategoryID)).append("|");
+    line.append(iter->second.m_Name.toUtf8()).append("|");
+    line.append(QByteArray::number(iter->second.m_ID)).append("\n");
+    nexusMapFile.write(line);
   }
-  categoryFile.close();
+  nexusMapFile.close();
 }
 
 unsigned int
@@ -250,7 +257,8 @@ void CategoryFactory::addCategory(int id, const QString& name, int parentID)
 void CategoryFactory::addCategory(int id, const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID)
 {
   for (auto nexusCat : nexusCats) {
-    m_NexusMap[nexusCat] = id;
+    m_NexusMap.insert_or_assign(nexusCat.m_ID, nexusCat);
+    m_NexusMap.at(nexusCat.m_ID).m_CategoryID = id;
   }
   int index = static_cast<int>(m_Categories.size());
   m_Categories.push_back(Category(index, id, name, parentID, nexusCats));
@@ -262,11 +270,11 @@ void CategoryFactory::loadDefaultCategories()
 {
   // the order here is relevant as it defines the order in which the
   // mods appear in the combo box
-  if (QMessageBox::question(nullptr, tr("Load Nexus Categories?"),
-    tr("This is either a new or old instance which lacks modern Nexus category mappings. Would you like to import and map categories from Nexus now?"),
-    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-    emit requestNexusCategories();
-  }
+  //if (QMessageBox::question(nullptr, tr("Load Nexus Categories?"),
+  //  tr("This is either a new or old instance which lacks modern Nexus category mappings. Would you like to import and map categories from Nexus now?"),
+  //  QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+  //  emit requestNexusCategories();
+  //}
 }
 
 
@@ -432,12 +440,10 @@ int CategoryFactory::getCategoryID(const QString& name) const
 
 unsigned int CategoryFactory::resolveNexusID(int nexusID) const
 {
-  auto result = std::find_if(m_NexusMap.begin(), m_NexusMap.end(), [nexusID](const std::pair<NexusCategory, unsigned int> el) {
-    return el.first.m_ID == nexusID;
-    });
+  auto result = m_NexusMap.find(nexusID);
   if (result != m_NexusMap.end()) {
-    log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, result->second);
-    return result->second;
+    log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, result->second.m_ID);
+    return m_IDMap.at(result->second.m_CategoryID);
   } else {
     log::debug(tr("nexus category id {} not mapped").toStdString(), nexusID);
     return 0U;
diff --git a/src/categories.h b/src/categories.h
index e9f007262..63d726723 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -58,6 +58,7 @@ class CategoryFactory : public QObject {
       : m_Name(name), m_ID(nexusID) {}
     QString m_Name;
     int m_ID;
+    int m_CategoryID = -1;
 
     friend bool operator==(const NexusCategory& LHS, const NexusCategory& RHS) {
       return LHS.m_ID == RHS.m_ID;
@@ -232,7 +233,7 @@ public slots:
 private:
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
-  std::map<NexusCategory, unsigned int> m_NexusMap;
+  std::map<int, NexusCategory> m_NexusMap;
 
 private:
   // called by isDescendantOf()
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 08397cb87..a94484ae9 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -109,7 +109,9 @@ CategoriesDialog::CategoriesDialog(PluginContainer* pluginContainer, QWidget* pa
   ui->setupUi(this);
   fillTable();
   connect(ui->categoriesTable, SIGNAL(cellChanged(int, int)), this,
-          SLOT(cellChanged(int, int)));
+          SLOT(cellChanged(int,int)));
+  connect(ui->nexusRefresh, SIGNAL(clicked()), this, SLOT(nexusRefresh_clicked()));
+  connect(ui->nexusImportButton, SIGNAL(clicked()), this, SLOT(nexusImport_clicked()));
 }
 
 CategoriesDialog::~CategoriesDialog()
@@ -138,19 +140,17 @@ void CategoriesDialog::commitChanges()
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
     int index = ui->categoriesTable->verticalHeader()->logicalIndex(i);
-    QVariantList nexusData = ui->categoriesTable->item(index, 2)->data(Qt::UserRole).toList();
+    QVariantList nexusData = ui->categoriesTable->item(index, 3)->data(Qt::UserRole).toList();
     std::vector<CategoryFactory::NexusCategory> nexusCats;
-    for (QVariantList::iterator iter = nexusData.begin();
-         iter != nexusData.end(); ++iter) {
-      QVariantList nexusInfo = iter->toList();
-      nexusCats.push_back(CategoryFactory::NexusCategory(nexusInfo[0].toString(), nexusInfo[1].toInt()));
+    for (auto nexusCat : nexusData) {
+      nexusCats.push_back(CategoryFactory::NexusCategory(nexusCat.toList()[0].toString(), nexusCat.toList()[1].toInt()));
     }
 
     categories->addCategory(
           ui->categoriesTable->item(index, 0)->text().toInt(),
           ui->categoriesTable->item(index, 1)->text(),
           nexusCats,
-          ui->categoriesTable->item(index, 3)->text().toInt());
+          ui->categoriesTable->item(index, 2)->text().toInt());
   }
   categories->setParents();
 
@@ -179,12 +179,12 @@ void CategoriesDialog::fillTable()
   table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
   table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
   table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
-  table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
+  table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Stretch);
   table->verticalHeader()->setSectionsMovable(true);
   table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
   table->setItemDelegateForColumn(0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
-  table->setItemDelegateForColumn(2, new ValidatingDelegate(this, new QRegExpValidator(QRegExp("([0-9]+)?(,[0-9]+)*"), this)));
-  table->setItemDelegateForColumn(3, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(2, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(3, new ValidatingDelegate(this, new QRegExpValidator(QRegExp("([0-9]+)?(,[0-9]+)*"), this)));
 
   int row = 0;
   for (std::vector<CategoryFactory::Category>::const_iterator iter = categories->m_Categories.begin();
@@ -201,32 +201,36 @@ void CategoriesDialog::fillTable()
     idItem->setData(Qt::DisplayRole, category.m_ID);
 
     QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(category.m_Name));
-    QStringList nexusLabel;
-    QVariantList nexusData;
-    for (auto iter = category.m_NexusCats.begin(); iter < category.m_NexusCats.end(); ++iter) {
-      nexusLabel.append(iter->m_Name);
-      QVariantList data;
-      data.append(QVariant(iter->m_Name));
-      data.append(QVariant(iter->m_ID));
-      nexusData.append(data);
-    }
-    QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem(nexusLabel.join(", ")));
-    nexusCatItem->setData(Qt::UserRole, nexusData);
     QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
     parentIDItem->setData(Qt::DisplayRole, category.m_ParentID);
+    QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem());
 
     table->setItem(row, 0, idItem.take());
     table->setItem(row, 1, nameItem.take());
-    table->setItem(row, 2, nexusCatItem.take());
-    table->setItem(row, 3, parentIDItem.take());
+    table->setItem(row, 2, parentIDItem.take());
+    table->setItem(row, 3, nexusCatItem.take());
   }
 
   for (auto nexusCat : categories->m_NexusMap)
   {
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
-    nexusItem->setData(Qt::DisplayRole, nexusCat.first.m_Name);
-    nexusItem->setData(Qt::UserRole, nexusCat.first.m_ID);
+    nexusItem->setData(Qt::DisplayRole, nexusCat.second.m_Name);
+    nexusItem->setData(Qt::UserRole, nexusCat.second.m_ID);
     list->addItem(nexusItem.take());
+    auto item = table->item(categories->resolveNexusID(nexusCat.first)-1, 3);
+    if (item != nullptr) {
+      auto itemData = item->data(Qt::UserRole).toList();
+      QVariantList newData;
+      newData.append(nexusCat.second.m_Name);
+      newData.append(nexusCat.second.m_ID);
+      itemData.insert(itemData.length(), newData);
+      QStringList names;
+      for (auto cat : itemData) {
+        names.append(categories->getCategoryName(categories->resolveNexusID(cat.toList()[1].toInt())));
+      }
+      item->setData(Qt::UserRole, itemData);
+      item->setData(Qt::DisplayRole, names.join(", "));
+    }
   }
 
   refreshIDs();
@@ -240,8 +244,8 @@ void CategoriesDialog::addCategory_clicked()
   ui->categoriesTable->setItem(row, 0,
                                new QTableWidgetItem(QString::number(++m_HighestID)));
   ui->categoriesTable->setItem(row, 1, new QTableWidgetItem("new"));
-  ui->categoriesTable->setItem(row, 2, new QTableWidgetItem(""));
-  ui->categoriesTable->setItem(row, 3, new QTableWidgetItem("0"));
+  ui->categoriesTable->setItem(row, 2, new QTableWidgetItem("0"));
+  ui->categoriesTable->setItem(row, 3, new QTableWidgetItem(""));
 }
 
 void CategoriesDialog::removeCategory_clicked()
@@ -256,10 +260,53 @@ void CategoriesDialog::nexusRefresh_clicked()
   nexus->requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
 }
 
+
+void CategoriesDialog::nexusImport_clicked()
+{
+  if (QMessageBox::question(nullptr, tr("Import Nexus Categories?"),
+    tr("This will overwrite your existing categories with the loaded Nexus categories."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    QTableWidget* table = ui->categoriesTable;
+    QListWidget* list = ui->nexusCategoryList;
+
+    table->setRowCount(0);
+    refreshIDs();
+    int row = 0;
+    for (int i = 0; i < list->count(); ++i) {
+      row = table->rowCount();
+      table->insertRow(table->rowCount());
+      //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
+
+      QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
+      idItem->setData(Qt::DisplayRole, ++m_HighestID);
+
+      QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(list->item(i)->data(Qt::DisplayRole).toString()));
+      QStringList nexusLabel;
+      QVariantList nexusData;
+      nexusLabel.append(list->item(i)->data(Qt::DisplayRole).toString());
+      QVariantList data;
+      data.append(QVariant(list->item(i)->data(Qt::DisplayRole).toString()));
+      data.append(QVariant(list->item(i)->data(Qt::UserRole).toInt()));
+      nexusData.insert(nexusData.size(), data);
+      QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem(nexusLabel.join(", ")));
+      nexusCatItem->setData(Qt::UserRole, nexusData);
+      QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
+      parentIDItem->setData(Qt::DisplayRole, 0);
+
+      table->setItem(row, 0, idItem.take());
+      table->setItem(row, 1, nameItem.take());
+      table->setItem(row, 2, parentIDItem.take());
+      table->setItem(row, 3, nexusCatItem.take());
+    }
+    refreshIDs();
+  }
+}
+
+
 void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int)
 {
   QVariantMap result = resultData.toMap();
-  QVariantList categories = result["categories"].toList().first().toList();
+  QVariantList categories = result["categories"].toList();
   auto catFactory = CategoryFactory::instance();
   QListWidget* list = ui->nexusCategoryList;
   list->clear();
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index b6fe832ff..49749a0f8 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -64,6 +64,7 @@ private slots:
   void addCategory_clicked();
   void removeCategory_clicked();
   void nexusRefresh_clicked();
+  void nexusImport_clicked();
   void cellChanged(int row, int column);
 
 private:
diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index 993de2ad1..d2fbf5377 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -14,6 +14,36 @@
    <string>Categories</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="4" column="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="5">
+    <widget class="QPushButton" name="nexusRefresh">
+     <property name="text">
+      <string>Refresh from Nexus</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4">
+    <widget class="QPushButton" name="nexusImportButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>&lt;-- Import Nexus Cats</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="3">
     <widget class="QTableWidget" name="categoriesTable">
      <property name="contextMenuPolicy">
@@ -113,17 +143,7 @@ p, li { white-space: pre-wrap; }
      </column>
     </widget>
    </item>
-   <item row="4" column="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="5">
+   <item row="0" column="4" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
@@ -151,13 +171,6 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="4" column="5">
-    <widget class="QPushButton" name="nexusRefresh">
-     <property name="text">
-      <string>Refresh Nexus Categories</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2b6530599..76b7e37ff 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -419,7 +419,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore,
           SLOT(nexusApi()));
 
-  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), &m_OrganizerCore, SLOT(requestNexusCategories()));
+  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
 
   connect(
     NexusInterface::instance(&pluginContainer)->getAccessManager(),
@@ -3913,6 +3913,65 @@ void MainWindow::originModified(int originID)
   DirectoryRefresher::cleanStructure(m_OrganizerCore.directoryStructure());
 }
 
+
+void MainWindow::enableSelectedPlugins_clicked()
+{
+  m_OrganizerCore.pluginList()->enableSelected(ui->espList->selectionModel());
+}
+
+
+void MainWindow::disableSelectedPlugins_clicked()
+{
+  m_OrganizerCore.pluginList()->disableSelected(ui->espList->selectionModel());
+}
+
+void MainWindow::sendSelectedPluginsToTop_clicked()
+{
+  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), 0);
+}
+
+void MainWindow::sendSelectedPluginsToBottom_clicked()
+{
+  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), INT_MAX);
+}
+
+void MainWindow::sendSelectedPluginsToPriority_clicked()
+{
+  bool ok;
+  int newPriority = QInputDialog::getInt(this,
+    tr("Set Priority"), tr("Set the priority of the selected plugins"),
+    0, 0, INT_MAX, 1, &ok);
+  if (!ok) return;
+
+  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), newPriority);
+}
+
+void MainWindow::requestNexusCategories()
+{
+  CategoriesDialog dialog(&m_PluginContainer, this);
+
+  if (dialog.exec() == QDialog::Accepted) {
+    dialog.commitChanges();
+  }
+}
+
+void MainWindow::enableSelectedMods_clicked()
+{
+  m_OrganizerCore.modList()->enableSelected(ui->modList->selectionModel());
+  if (m_ModListSortProxy != nullptr) {
+    m_ModListSortProxy->invalidate();
+  }
+}
+
+
+void MainWindow::disableSelectedMods_clicked()
+{
+  m_OrganizerCore.modList()->disableSelected(ui->modList->selectionModel());
+  if (m_ModListSortProxy != nullptr) {
+    m_ModListSortProxy->invalidate();
+  }
+}
+
 void MainWindow::updateAvailable()
 {
   ui->actionUpdate->setEnabled(true);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 42ffc83ec..50ff893ff 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -157,6 +157,13 @@ class MainWindow : public QMainWindow, public IUserInterface
 public slots:
   void refresherProgress(const DirectoryRefreshProgress* p);
 
+  void directory_refreshed();
+
+  void toolPluginInvoke();
+  void modPagePluginInvoke();
+
+  void requestNexusCategories();
+
 signals:
   // emitted after the information dialog has been closed, used by tutorials
   //

From 375b8e613eda4be77f01eb9a079caa741b958112 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Thu, 9 Jan 2020 18:06:07 -0600
Subject: [PATCH 07/43] Implement drag & drop nexus cat assignment

---
 src/CMakeLists.txt       |  1 +
 src/categoriesdialog.cpp |  2 +-
 src/categoriesdialog.ui  | 12 ++++++-
 src/categoriestable.cpp  | 76 ++++++++++++++++++++++++++++++++++++++++
 src/categoriestable.h    | 37 +++++++++++++++++++
 5 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 src/categoriestable.cpp
 create mode 100644 src/categoriestable.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 500b0ca5b..125b6ebd4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,6 +44,7 @@ mo2_add_filter(NAME src/browser GROUPS
 
 mo2_add_filter(NAME src/core GROUPS
 	categories
+    categoriestable
 	archivefiletree
 	installationmanager
 	nexusinterface
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index a94484ae9..3f4ea0347 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -226,7 +226,7 @@ void CategoriesDialog::fillTable()
       itemData.insert(itemData.length(), newData);
       QStringList names;
       for (auto cat : itemData) {
-        names.append(categories->getCategoryName(categories->resolveNexusID(cat.toList()[1].toInt())));
+        names.append(cat.toList()[0].toString());
       }
       item->setData(Qt::UserRole, itemData);
       item->setData(Qt::DisplayRole, names.join(", "));
diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index d2fbf5377..04aa57043 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -45,7 +45,7 @@
     </widget>
    </item>
    <item row="0" column="3">
-    <widget class="QTableWidget" name="categoriesTable">
+    <widget class="CategoriesTable" name="categoriesTable">
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
@@ -145,6 +145,9 @@ p, li { white-space: pre-wrap; }
    </item>
    <item row="0" column="4" colspan="2">
     <widget class="QGroupBox" name="groupBox">
+     <property name="toolTip">
+      <string>Drag &amp; drop nexus categories from this pane onto the target category on the left.</string>
+     </property>
      <property name="layoutDirection">
       <enum>Qt::LeftToRight</enum>
      </property>
@@ -173,6 +176,13 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CategoriesTable</class>
+   <extends>QTableWidget</extends>
+   <header>categoriestable.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
diff --git a/src/categoriestable.cpp b/src/categoriestable.cpp
new file mode 100644
index 000000000..ed45826f3
--- /dev/null
+++ b/src/categoriestable.cpp
@@ -0,0 +1,76 @@
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer 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.
+
+Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "categoriestable.h"
+
+CategoriesTable::CategoriesTable(QWidget* parent) : QTableWidget(parent) {}
+
+bool CategoriesTable::dropMimeData(int row, int column, const QMimeData* data, Qt::DropAction action)
+{
+  if (row == -1)
+    return false;
+
+  if (action == Qt::IgnoreAction)
+    return true;
+
+  if (!data->hasFormat("application/x-qabstractitemmodeldatalist"))
+    return false;
+
+  QByteArray encoded = data->data("application/x-qabstractitemmodeldatalist");
+  QDataStream stream(&encoded, QIODevice::ReadOnly);
+
+  while (!stream.atEnd())
+  {
+    int curRow, curCol;
+    QMap<int, QVariant> roleDataMap;
+    stream >> curRow >> curCol >> roleDataMap;
+
+    for (auto item : findItems(roleDataMap.value(Qt::DisplayRole).toString(), Qt::MatchContains | Qt::MatchWrap))
+    {
+      if (item->column() != 3) continue;
+      QVariantList newData;
+      for (auto nexData : item->data(Qt::UserRole).toList()) {
+        if (nexData.toList()[1].toInt() != roleDataMap.value(Qt::UserRole)) {
+          newData.insert(newData.length(), nexData);
+        }
+      }
+      QStringList names;
+      for (auto nexData : newData) {
+        names.append(nexData.toList()[0].toString());
+      }
+      item->setData(Qt::DisplayRole, names.join(", "));
+      item->setData(Qt::UserRole, newData);
+    }
+
+    auto nexusItem = item(row, 3);
+    auto itemData = nexusItem->data(Qt::UserRole).toList();
+    QVariantList newData;
+    newData.append(roleDataMap.value(Qt::DisplayRole).toString());
+    newData.append(roleDataMap.value(Qt::UserRole).toInt());
+    itemData.insert(itemData.length(), newData);
+    QStringList names;
+    for (auto cat : itemData) {
+      names.append(cat.toList()[0].toString());
+    }
+    nexusItem->setData(Qt::UserRole, itemData);
+    nexusItem->setData(Qt::DisplayRole, names.join(", "));
+  }
+
+  return true;
+}
diff --git a/src/categoriestable.h b/src/categoriestable.h
new file mode 100644
index 000000000..7aaf62a94
--- /dev/null
+++ b/src/categoriestable.h
@@ -0,0 +1,37 @@
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer 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.
+
+Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CATEGORIESTABLE_H
+#define CATEGORIESTABLE_H
+
+#include <QTableWidget>
+#include <log.h>
+
+class CategoriesTable : public QTableWidget
+{
+  Q_OBJECT
+public:
+  CategoriesTable(QWidget *parent = 0);
+
+protected:
+  virtual bool dropMimeData(int row, int column, const QMimeData* data, Qt::DropAction action);
+
+};
+
+#endif // CATEGORIESTABLE_H

From 6016b04ef0d458e14f9d556dfc2cd67b2604b83e Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 6 Oct 2020 15:48:20 -0500
Subject: [PATCH 08/43] Fix rebase issue

---
 src/filterlist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 8ac4040cf..45dab1098 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -190,7 +190,7 @@ class CriteriaItemFilter : public QObject
 
 
 FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory)
-  : ui(ui), m_Organizer(organizer), m_pluginContainer(pluginContainer, m_factory(factory)
+  : ui(ui), m_Organizer(organizer), m_pluginContainer(pluginContainer), m_factory(factory)
 {
   auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
     return cycleItem(item, dir);

From 69f953a3fb181eddaf730e83e2ac63ec7f154b14 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Wed, 27 Jan 2021 12:01:09 -0600
Subject: [PATCH 09/43] Refactoring for upstream merge

---
 src/categoriesdialog.cpp   |  7 ++++---
 src/filterlist.cpp         |  2 +-
 src/mainwindow.cpp         |  6 +++++-
 src/moapplication.cpp      |  2 +-
 src/modinfo.cpp            |  2 +-
 src/modlistcontextmenu.cpp | 26 +++++++++++++-------------
 src/modlistcontextmenu.h   | 12 ++++++------
 src/modlistview.cpp        |  2 +-
 8 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 3f4ea0347..4019f1979 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -256,8 +256,9 @@ void CategoriesDialog::removeCategory_clicked()
 
 void CategoriesDialog::nexusRefresh_clicked()
 {
-  NexusInterface *nexus = NexusInterface::instance(m_PluginContainer);
-  nexus->requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
+  NexusInterface &nexus = NexusInterface::instance();
+  nexus.setPluginContainer(m_PluginContainer);
+  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
 }
 
 
@@ -307,7 +308,7 @@ void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant
 {
   QVariantMap result = resultData.toMap();
   QVariantList categories = result["categories"].toList();
-  auto catFactory = CategoryFactory::instance();
+  CategoryFactory *catFactory = CategoryFactory::instance();
   QListWidget* list = ui->nexusCategoryList;
   list->clear();
   for (auto category : categories) {
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 45dab1098..ba0671a78 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -426,7 +426,7 @@ void FilterList::checkCriteria()
 
 void FilterList::editCategories()
 {
-  CategoriesDialog dialog(m_pluginContainer, qApp->activeWindow());
+  CategoriesDialog dialog(&m_core.pluginContainer(), qApp->activeWindow());
 
   if (dialog.exec() == QDialog::Accepted) {
     dialog.commitChanges();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 76b7e37ff..0521a17c7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -303,6 +303,8 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
     m_Filters.get(), &FilterList::optionsChanged,
     [&](auto&& mode, auto&& sep) { onFiltersOptions(mode, sep); });
 
+  m_CategoryFactory->loadCategories();
+
   ui->logList->setCore(m_OrganizerCore);
 
   setupToolbar();
@@ -421,6 +423,8 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
 
   connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
 
+  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
+
   connect(
     NexusInterface::instance(&pluginContainer)->getAccessManager(),
     SIGNAL(credentialsReceived(const APIUserAccount&)),
@@ -552,7 +556,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
 
 void MainWindow::setupModList()
 {
-  ui->modList->setup(m_OrganizerCore, m_CategoryFactory, this, ui);
+  ui->modList->setup(m_OrganizerCore, *m_CategoryFactory, this, ui);
 
   connect(&ui->modList->actions(), &ModListViewActions::overwriteCleared, [=]() {
     scheduleCheckForProblems();
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index e131d3d96..7e95217ed 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -296,7 +296,7 @@ int MOApplication::setup(MOMultiProcess& multiProcess, bool forceSelect)
             m_instance->gamePlugin()->steamAPPId(),
             m_instance->gamePlugin()->gameDirectory().absolutePath());
 
-  CategoryFactory::instance().loadCategories();
+  CategoryFactory::instance()->loadCategories();
   m_core->updateExecutablesList();
   m_core->updateModInfoFromDisc();
   m_core->setCurrentProfile(m_instance->profileName());
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 68c8ea9e7..5ef36ef0d 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -549,7 +549,7 @@ bool ModInfo::categorySet(int categoryID) const
   for (std::set<int>::const_iterator iter = m_Categories.begin();
        iter != m_Categories.end(); ++iter) {
     if ((*iter == categoryID) ||
-        (CategoryFactory::instance()->isDecendantOf(*iter, categoryID))) {
+        (CategoryFactory::instance()->isDescendantOf(*iter, categoryID))) {
       return true;
     }
   }
diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index e88cadc8a..8c9c02066 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -100,7 +100,7 @@ void ModListGlobalContextMenu::populate(OrganizerCore& core, ModListView* view,
   });
 }
 
-ModListChangeCategoryMenu::ModListChangeCategoryMenu(CategoryFactory& categories,
+ModListChangeCategoryMenu::ModListChangeCategoryMenu(CategoryFactory* categories,
                                                      ModInfo::Ptr mod, QMenu* parent)
     : QMenu(tr("Change Categories"), parent)
 {
@@ -131,24 +131,24 @@ ModListChangeCategoryMenu::categories(const QMenu* menu) const
   return cats;
 }
 
-bool ModListChangeCategoryMenu::populate(QMenu* menu, CategoryFactory& factory,
+bool ModListChangeCategoryMenu::populate(QMenu* menu, CategoryFactory* factory,
                                          ModInfo::Ptr mod, int targetId)
 {
   const std::set<int>& categories = mod->getCategories();
 
   bool childEnabled = false;
 
-  for (unsigned int i = 1; i < factory.numCategories(); ++i) {
-    if (factory.getParentID(i) == targetId) {
+  for (unsigned int i = 1; i < factory->numCategories(); ++i) {
+    if (factory->getParentID(i) == targetId) {
       QMenu* targetMenu = menu;
-      if (factory.hasChildren(i)) {
-        targetMenu = menu->addMenu(factory.getCategoryName(i).replace('&', "&&"));
+      if (factory->hasChildren(i)) {
+        targetMenu = menu->addMenu(factory->getCategoryName(i).replace('&', "&&"));
       }
 
-      int id = factory.getCategoryID(i);
+      int id = factory->getCategoryID(i);
       QScopedPointer<QCheckBox> checkBox(new QCheckBox(targetMenu));
       bool enabled = categories.find(id) != categories.end();
-      checkBox->setText(factory.getCategoryName(i).replace('&', "&&"));
+      checkBox->setText(factory->getCategoryName(i).replace('&', "&&"));
       if (enabled) {
         childEnabled = true;
       }
@@ -159,8 +159,8 @@ bool ModListChangeCategoryMenu::populate(QMenu* menu, CategoryFactory& factory,
       checkableAction->setData(id);
       targetMenu->addAction(checkableAction.take());
 
-      if (factory.hasChildren(i)) {
-        if (populate(targetMenu, factory, mod, factory.getCategoryID(i)) || enabled) {
+      if (factory->hasChildren(i)) {
+        if (populate(targetMenu, factory, mod, factory->getCategoryID(i)) || enabled) {
           targetMenu->setIcon(QIcon(":/MO/gui/resources/check.png"));
         }
       }
@@ -169,7 +169,7 @@ bool ModListChangeCategoryMenu::populate(QMenu* menu, CategoryFactory& factory,
   return childEnabled;
 }
 
-ModListPrimaryCategoryMenu::ModListPrimaryCategoryMenu(CategoryFactory& categories,
+ModListPrimaryCategoryMenu::ModListPrimaryCategoryMenu(CategoryFactory* categories,
                                                        ModInfo::Ptr mod, QMenu* parent)
     : QMenu(tr("Primary Category"), parent)
 {
@@ -178,7 +178,7 @@ ModListPrimaryCategoryMenu::ModListPrimaryCategoryMenu(CategoryFactory& categori
   });
 }
 
-void ModListPrimaryCategoryMenu::populate(const CategoryFactory& factory,
+void ModListPrimaryCategoryMenu::populate(const CategoryFactory* factory,
                                           ModInfo::Ptr mod)
 {
   clear();
@@ -216,7 +216,7 @@ int ModListPrimaryCategoryMenu::primaryCategory() const
 }
 
 ModListContextMenu::ModListContextMenu(const QModelIndex& index, OrganizerCore& core,
-                                       CategoryFactory& categories, ModListView* view)
+                                       CategoryFactory* categories, ModListView* view)
     : QMenu(view), m_core(core), m_categories(categories),
       m_index(index.model() == view->model() ? view->indexViewToModel(index) : index),
       m_view(view), m_actions(view->actions())
diff --git a/src/modlistcontextmenu.h b/src/modlistcontextmenu.h
index 320ece934..c2fe5bbfb 100644
--- a/src/modlistcontextmenu.h
+++ b/src/modlistcontextmenu.h
@@ -36,7 +36,7 @@ class ModListChangeCategoryMenu : public QMenu
 {
   Q_OBJECT
 public:
-  ModListChangeCategoryMenu(CategoryFactory& categories, ModInfo::Ptr mod,
+  ModListChangeCategoryMenu(CategoryFactory* categories, ModInfo::Ptr mod,
                             QMenu* parent = nullptr);
 
   // return a list of pair <category id, enabled> from the menu
@@ -47,7 +47,7 @@ class ModListChangeCategoryMenu : public QMenu
   // populate the tree with the category, using the enabled/disabled state from the
   // given mod
   //
-  bool populate(QMenu* menu, CategoryFactory& categories, ModInfo::Ptr mod,
+  bool populate(QMenu* menu, CategoryFactory* categories, ModInfo::Ptr mod,
                 int targetId = 0);
 
   // internal implementation of categories() for recursion
@@ -59,7 +59,7 @@ class ModListPrimaryCategoryMenu : public QMenu
 {
   Q_OBJECT
 public:
-  ModListPrimaryCategoryMenu(CategoryFactory& categories, ModInfo::Ptr mod,
+  ModListPrimaryCategoryMenu(CategoryFactory* categories, ModInfo::Ptr mod,
                              QMenu* parent = nullptr);
 
   // return the selected primary category
@@ -69,7 +69,7 @@ class ModListPrimaryCategoryMenu : public QMenu
 private:
   // populate the categories
   //
-  void populate(const CategoryFactory& categories, ModInfo::Ptr mod);
+  void populate(const CategoryFactory* categories, ModInfo::Ptr mod);
 };
 
 class ModListContextMenu : public QMenu
@@ -81,7 +81,7 @@ class ModListContextMenu : public QMenu
   // valid
   //
   ModListContextMenu(const QModelIndex& index, OrganizerCore& core,
-                     CategoryFactory& categories, ModListView* modListView);
+                     CategoryFactory* categories, ModListView* modListView);
 
 private:
   // adds the "Send to... " context menu
@@ -105,7 +105,7 @@ class ModListContextMenu : public QMenu
   void addRegularActions(ModInfo::Ptr mod);
 
   OrganizerCore& m_core;
-  CategoryFactory& m_categories;
+  CategoryFactory* m_categories;
   QModelIndex m_index;
   QModelIndexList m_selected;
   ModListView* m_view;
diff --git a/src/modlistview.cpp b/src/modlistview.cpp
index 73bbd33df..944825fac 100644
--- a/src/modlistview.cpp
+++ b/src/modlistview.cpp
@@ -970,7 +970,7 @@ void ModListView::onCustomContextMenuRequested(const QPoint& pos)
       // no selection
       ModListGlobalContextMenu(*m_core, this).exec(viewport()->mapToGlobal(pos));
     } else {
-      ModListContextMenu(contextIdx, *m_core, *m_categories, this)
+      ModListContextMenu(contextIdx, *m_core, m_categories, this)
           .exec(viewport()->mapToGlobal(pos));
     }
   } catch (const std::exception& e) {

From 535623693e63569f485c15984274ea65c4d0c872 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Fri, 30 Jul 2021 21:29:16 -0500
Subject: [PATCH 10/43] Add menu item to auto-assign categories based on nexus
 assignments

---
 src/downloadmanager.cpp    | 21 +++++++++++++++++++++
 src/downloadmanager.h      | 16 ++++++++++++++++
 src/modlistcontextmenu.cpp |  3 +++
 src/modlistviewactions.cpp | 18 ++++++++++++++++++
 src/modlistviewactions.h   |  5 +++++
 5 files changed, 63 insertions(+)

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 5ccbdb4da..6cf3a95cb 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1321,6 +1321,19 @@ QString DownloadManager::getFileName(int index) const
   return m_ActiveDownloads.at(index)->m_FileName;
 }
 
+int DownloadManager::getDownloadIndex(QString filename) const
+{
+  auto file = std::find_if(m_ActiveDownloads.begin(), m_ActiveDownloads.end(), [=](DownloadManager::DownloadInfo *const val) {
+      if (val->m_FileName == filename) return true;
+      return false;
+    });
+  if (file != m_ActiveDownloads.end()) {
+    int fileIndex = m_ActiveDownloads.indexOf(*file);
+    return fileIndex;
+  }
+  return -1;
+}
+
 QDateTime DownloadManager::getFileTime(int index) const
 {
   if ((index < 0) || (index >= m_ActiveDownloads.size())) {
@@ -1389,6 +1402,14 @@ int DownloadManager::getModID(int index) const
   return m_ActiveDownloads.at(index)->m_FileInfo->modID;
 }
 
+int DownloadManager::getCategoryID(int index) const
+{
+  if ((index < 0) || (index >= m_ActiveDownloads.size())) {
+    throw MyException(tr("mod id: invalid download index %1").arg(index));
+  }
+  return m_ActiveDownloads.at(index)->m_FileInfo->categoryID;
+}
+
 QString DownloadManager::getDisplayGameName(int index) const
 {
   if ((index < 0) || (index >= m_ActiveDownloads.size())) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 305c10e3e..359455d95 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -298,6 +298,14 @@ class DownloadManager : public QObject
    **/
   QString getFileName(int index) const;
 
+  /**
+   * @brief retrieve the file index from the filename
+   *
+   * @param filename the filename of the download
+   * @return the index of the file
+   */
+  int getDownloadIndex(QString filename) const;
+
   /**
    * @brief retrieve the file size of the download specified by index
    *
@@ -348,6 +356,14 @@ class DownloadManager : public QObject
    **/
   int getModID(int index) const;
 
+  /**
+   * @brief retrieve the nexus category id of the download specified by index
+   *
+   * @param index index of the file to look up
+   * @return the nexus category id
+   */
+  int getCategoryID(int index) const;
+
   /**
    * @brief retrieve the displayable game name of the download specified by the index
    *
diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index 8c9c02066..66766b0e4 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -94,6 +94,9 @@ void ModListGlobalContextMenu::populate(OrganizerCore& core, ModListView* view,
   addAction(tr("Check for updates"), [=]() {
     view->actions().checkModsForUpdates();
   });
+  addAction(tr("Auto assign categories"), [=]() {
+   view->actions().assignCategories();
+  });
   addAction(tr("Refresh"), &core, &OrganizerCore::profileRefresh);
   addAction(tr("Export to csv..."), [=]() {
     view->actions().exportModListCSV();
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index a6f0f07ee..21079f1d6 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -12,6 +12,7 @@
 #include "categories.h"
 #include "csvbuilder.h"
 #include "directoryrefresher.h"
+#include "downloadmanager.h"
 #include "filedialogmemory.h"
 #include "filterlist.h"
 #include "listdialog.h"
@@ -259,6 +260,23 @@ void ModListViewActions::checkModsForUpdates() const
   }
 }
 
+void ModListViewActions::assignCategories() const
+{
+  for (auto mod : m_core.modList()->allMods()) {
+    ModInfo::Ptr modInfo = ModInfo::getByName(mod);
+    for (auto category : modInfo->categories()) {
+      modInfo->removeCategory(category);
+    }
+    QString file = modInfo->installationFile();
+    auto download = m_core.downloadManager()->getDownloadIndex(file);
+    if (download >= 0) {
+      int nexusCategory = m_core.downloadManager()->getCategoryID(download);
+      int category = CategoryFactory::instance()->resolveNexusID(nexusCategory);
+      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(category), true);
+    }
+  }
+}
+
 void ModListViewActions::checkModsForUpdates(
     std::multimap<QString, int> const& IDs) const
 {
diff --git a/src/modlistviewactions.h b/src/modlistviewactions.h
index 5927654ff..3805f98b7 100644
--- a/src/modlistviewactions.h
+++ b/src/modlistviewactions.h
@@ -13,6 +13,7 @@ class MainWindow;
 class ModListView;
 class PluginListView;
 class OrganizerCore;
+class DownloadManager;
 
 class ModListViewActions : public QObject
 {
@@ -53,6 +54,10 @@ class ModListViewActions : public QObject
   void checkModsForUpdates() const;
   void checkModsForUpdates(const QModelIndexList& indices) const;
 
+  // auto-assign categories based on nexus ID
+  //
+  void assignCategories() const;
+
   // start the "Export Mod List" dialog
   //
   void exportModListCSV() const;

From b9f05672b9692c96d39b8ff27e571a30cb82cd44 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Fri, 24 Dec 2021 17:54:55 -0600
Subject: [PATCH 11/43] Allow remapping category from context menu

---
 src/categoriesdialog.cpp   |  7 +++++++
 src/categoriesdialog.h     |  1 +
 src/modlistcontextmenu.cpp |  4 ++++
 src/modlistviewactions.cpp | 14 ++++++++++++++
 src/modlistviewactions.h   |  1 +
 src/nexusinterface.cpp     |  4 ++--
 6 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 4019f1979..92afda605 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -23,6 +23,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "ui_categoriesdialog.h"
 #include "utility.h"
 #include "nexusinterface.h"
+#include "messagedialog.h"
 #include <QItemDelegate>
 #include <QLineEdit>
 #include <QMenu>
@@ -321,6 +322,12 @@ void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant
 }
 
 
+void CategoriesDialog::nxmRequestFailed(QString, int, int, QVariant, int, int errorCode, const QString& errorMessage)
+{
+  MessageDialog::showMessage(tr("Error %1: Request to Nexus failed: %2").arg(errorCode).arg(errorMessage), this);
+}
+
+
 void CategoriesDialog::on_categoriesTable_customContextMenuRequested(const QPoint& pos)
 {
   m_ContextRow = ui->categoriesTable->rowAt(pos.y());
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index 49749a0f8..a2bd7240a 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -54,6 +54,7 @@ class CategoriesDialog : public MOBase::TutorableDialog
 public slots:
 
   void nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int);
+  void nxmRequestFailed(QString, int, int, QVariant, int, int errorCode, const QString& errorMessage);
 
 signals:
   void refreshNexusCategories();
diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index 66766b0e4..096976c15 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -561,6 +561,10 @@ void ModListContextMenu::addRegularActions(ModInfo::Ptr mod)
     }
   }
 
+  if (mod->nexusId() > 0 && !mod->installationFile().isEmpty()) {
+    addAction(tr("Remap Category (From Nexus)"), [=]() { m_actions.remapCategory(m_selected); });
+  }
+
   if (mod->nexusId() > 0 && Settings::instance().nexus().trackedIntegration()) {
     switch (mod->trackedState()) {
     case TrackedState::TRACKED_FALSE: {
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index 21079f1d6..b9d0f419f 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -1100,6 +1100,20 @@ void ModListViewActions::willNotEndorsed(const QModelIndexList& indices) const
   }
 }
 
+void ModListViewActions::remapCategory(const QModelIndexList& indices) const
+{
+  for (auto& idx : indices) {
+    ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(ModList::IndexRole).toInt());
+
+    int downloadIndex = m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
+    if (downloadIndex >= 0) {
+      auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
+      unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(downloadInfo->categoryID);
+      modInfo->setPrimaryCategory(CategoryFactory::instance()->getCategoryID(categoryIndex));
+    }
+  }
+}
+
 void ModListViewActions::setColor(const QModelIndexList& indices,
                                   const QModelIndex& refIndex) const
 {
diff --git a/src/modlistviewactions.h b/src/modlistviewactions.h
index 3805f98b7..ad20e7840 100644
--- a/src/modlistviewactions.h
+++ b/src/modlistviewactions.h
@@ -98,6 +98,7 @@ class ModListViewActions : public QObject
   void setTracked(const QModelIndexList& indices, bool tracked) const;
   void setEndorsed(const QModelIndexList& indices, bool endorsed) const;
   void willNotEndorsed(const QModelIndexList& indices) const;
+  void remapCategory(const QModelIndexList& indices) const;
 
   // set/reset color of the given selection, using the given reference index (index
   // at which the context menu was shown)
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index cece6745e..9db787915 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -762,8 +762,8 @@ int NexusInterface::requestGameInfo(QString gameName, QObject* receiver, QVarian
   connect(this, SIGNAL(nxmGameInfoAvailable(QString, QVariant, QVariant, int)),
     receiver, SLOT(nxmGameInfoAvailable(QString, QVariant, QVariant, int)), Qt::UniqueConnection);
 
-  connect(this, SIGNAL(nxmRequestFailed(QString, int, int, QVariant, int, QNetworkReply::NetworkError, QString)),
-    receiver, SLOT(nxmRequestFailed(QString, int, int, QVariant, int, QNetworkReply::NetworkError, QString)), Qt::UniqueConnection);
+  connect(this, SIGNAL(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)),
+    receiver, SLOT(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)), Qt::UniqueConnection);
 
   nextRequest();
   return requestInfo.m_ID;

From 3243101eed11febbf6f4e410af3f7db3169ba205 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 25 Dec 2021 00:58:22 -0600
Subject: [PATCH 12/43] Fix issues with category reset and NX save

---
 src/categories.cpp       | 90 +++++++++++++++++++++++++++++++++-------
 src/categories.h         | 10 +----
 src/categoriesdialog.cpp | 13 ++++++
 3 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 59b26c071..ffc46abce 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -151,6 +151,7 @@ CategoryFactory* CategoryFactory::instance()
 void CategoryFactory::reset()
 {
   m_Categories.clear();
+  m_NexusMap.clear();
   m_IDMap.clear();
   // 28 =
   // 43 = Savegames (makes no sense to install them through MO)
@@ -265,22 +266,78 @@ void CategoryFactory::addCategory(int id, const QString& name, const std::vector
   m_IDMap[id] = index;
 }
 
-
-void CategoryFactory::loadDefaultCategories()
+void CategoryFactory::setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats)
 {
-  // the order here is relevant as it defines the order in which the
-  // mods appear in the combo box
-  //if (QMessageBox::question(nullptr, tr("Load Nexus Categories?"),
-  //  tr("This is either a new or old instance which lacks modern Nexus category mappings. Would you like to import and map categories from Nexus now?"),
-  //  QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-  //  emit requestNexusCategories();
-  //}
+  m_NexusMap.empty();
+  for (auto nexusCat : nexusCats) {
+    m_NexusMap.insert_or_assign(nexusCat.m_ID, nexusCat);
+  }
+
+  saveCategories();
 }
 
 
-void CategoryFactory::mapNexusCategories(QString, QVariant, QVariant result)
+void CategoryFactory::loadDefaultCategories()
 {
-
+  // the order here is relevant as it defines the order in which the
+  // mods appear in the combo box
+  addCategory(1, "Animations", 0);
+  addCategory(52, "Poses", 1);
+  addCategory(2, "Armour", 0);
+  addCategory(53, "Power Armor", 2);
+  addCategory(3, "Audio", 0);
+  addCategory(38, "Music", 0);
+  addCategory(39, "Voice", 0);
+  addCategory(5, "Clothing", 0);
+  addCategory(41, "Jewelry", 5);
+  addCategory(42, "Backpacks", 5);
+  addCategory(6, "Collectables", 0);
+  addCategory(28, "Companions", 0);
+  addCategory(7, "Creatures, Mounts, & Vehicles", 0);
+  addCategory(8, "Factions", 0);
+  addCategory(9, "Gameplay", 0);
+  addCategory(27, "Combat", 9);
+  addCategory(43, "Crafting", 9);
+  addCategory(48, "Overhauls", 9);
+  addCategory(49, "Perks", 9);
+  addCategory(54, "Radio", 9);
+  addCategory(55, "Shouts", 9);
+  addCategory(22, "Skills & Levelling", 9);
+  addCategory(58, "Weather & Lighting", 9);
+  addCategory(44, "Equipment", 43);
+  addCategory(45, "Home/Settlement", 43);
+  addCategory(10, "Body, Face, & Hair", 0);
+  addCategory(39, "Tattoos", 10);
+  addCategory(40, "Character Presets", 0);
+  addCategory(11, "Items", 0);
+  addCategory(32, "Mercantile", 0);
+  addCategory(37, "Ammo", 11);
+  addCategory(19, "Weapons", 11);
+  addCategory(36, "Weapon & Armour Sets", 11);
+  addCategory(23, "Player Homes", 0);
+  addCategory(25, "Castles & Mansions", 23);
+  addCategory(51, "Settlements", 23);
+  addCategory(12, "Locations", 0);
+  addCategory(4, "Cities", 12);
+  addCategory(31, "Landscape Changes", 0);
+  addCategory(29, "Environment", 0);
+  addCategory(30, "Immersion", 0);
+  addCategory(20, "Magic", 0);
+  addCategory(21, "Models & Textures", 0);
+  addCategory(33, "Modders resources", 0);
+  addCategory(13, "NPCs", 0);
+  addCategory(24, "Bugfixes", 0);
+  addCategory(14, "Patches", 24);
+  addCategory(35, "Utilities", 0);
+  addCategory(26, "Cheats", 0);
+  addCategory(15, "Quests", 0);
+  addCategory(16, "Races & Classes", 0);
+  addCategory(34, "Stealth", 0);
+  addCategory(17, "UI", 0);
+  addCategory(18, "Visuals", 0);
+  addCategory(50, "Pip-Boy", 18);
+  addCategory(46, "Shader Presets", 0);
+  addCategory(47, "Miscellaneous", 0);
 }
 
 int CategoryFactory::getParentID(unsigned int index) const
@@ -442,10 +499,11 @@ unsigned int CategoryFactory::resolveNexusID(int nexusID) const
 {
   auto result = m_NexusMap.find(nexusID);
   if (result != m_NexusMap.end()) {
-    log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, result->second.m_ID);
-    return m_IDMap.at(result->second.m_CategoryID);
-  } else {
-    log::debug(tr("nexus category id {} not mapped").toStdString(), nexusID);
-    return 0U;
+    if (m_IDMap.count(result->second.m_CategoryID)) {
+      log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, m_IDMap.at(result->second.m_CategoryID));
+      return m_IDMap.at(result->second.m_CategoryID);
+    }
   }
+  log::debug(tr("nexus category id {} not mapped").toStdString(), nexusID);
+  return 0U;
 }
diff --git a/src/categories.h b/src/categories.h
index 63d726723..a1aa92fc8 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -106,6 +106,8 @@ class CategoryFactory : public QObject {
    **/
   void saveCategories();
 
+  void setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats);
+
   int addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID);
 
   /**
@@ -212,14 +214,6 @@ class CategoryFactory : public QObject {
    */
   static QString nexusMappingFilePath();
 
-public slots:
-
-  void mapNexusCategories(QString, QVariant, QVariant data);
-
-signals:
-
-  void requestNexusCategories();
-
 private:
   explicit CategoryFactory();
 
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 92afda605..a14ec8c2d 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -153,8 +153,21 @@ void CategoriesDialog::commitChanges()
           nexusCats,
           ui->categoriesTable->item(index, 2)->text().toInt());
   }
+
   categories->setParents();
 
+  std::vector<CategoryFactory::NexusCategory> nexusCats;
+  for (int i = 0; i < ui->nexusCategoryList->count(); ++i) {
+      nexusCats.push_back(
+        CategoryFactory::NexusCategory(
+          ui->nexusCategoryList->item(i)->data(Qt::DisplayRole).toString(),
+          ui->nexusCategoryList->item(i)->data(Qt::UserRole).toInt()
+        )
+      );
+  }
+
+  categories->setNexusCategories(nexusCats);
+
   categories->saveCategories();
 }
 

From 8f31a1ceec7de25ef8fdfcb52c039ad85a9124b3 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 25 Dec 2021 00:59:12 -0600
Subject: [PATCH 13/43] Category setup dialog for new instances

---
 src/mainwindow.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++--
 src/mainwindow.h   |  3 +++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0521a17c7..3005ab8f6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -423,8 +423,6 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
 
   connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
 
-  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
-
   connect(
     NexusInterface::instance(&pluginContainer)->getAccessManager(),
     SIGNAL(credentialsReceived(const APIUserAccount&)),
@@ -1287,6 +1285,28 @@ void MainWindow::showEvent(QShowEvent* event)
         gameSupportTriggered();
       }
 
+      QMessageBox newCatDialog;
+      newCatDialog.setWindowTitle("Import Categories");
+      newCatDialog.setText(tr("Please choose how to handle the default category setup.\n\n"
+        "If you've already connected to Nexus, you can automatically import Nexus categories for this game (if applicable). Otherwise, use the old Mod Organizer default category structure, or leave the categories blank."));
+      QPushButton importBtn(tr("&Import Nexus Categories"));
+      connect(&importBtn, &QPushButton::clicked, this, &MainWindow::importCategories);
+      QPushButton defaultBtn(tr("Use &Default Categories"));
+      QPushButton cancelBtn(tr("Do &Nothing"));
+      if (NexusInterface::instance().getAccessManager()->validated()) {
+        newCatDialog.addButton(&importBtn, QMessageBox::ButtonRole::AcceptRole);
+      }
+      newCatDialog.addButton(&defaultBtn, QMessageBox::ButtonRole::AcceptRole);
+      newCatDialog.addButton(&cancelBtn, QMessageBox::ButtonRole::RejectRole);
+      newCatDialog.exec();
+      disconnect(&importBtn, &QPushButton::clicked, this, &MainWindow::importCategories);
+      if (newCatDialog.clickedButton() == &cancelBtn) {
+        m_CategoryFactory->reset();
+      } else if (newCatDialog.clickedButton() == &defaultBtn) {
+        m_CategoryFactory->loadCategories();
+      }
+      m_CategoryFactory->saveCategories();
+
       m_OrganizerCore.settings().setFirstStart(false);
     }
 
@@ -2392,6 +2412,13 @@ void MainWindow::modInstalled(const QString& modName)
       {m_OrganizerCore.modList()->index(index, 0)});
 }
 
+void MainWindow::importCategories(bool)
+{
+  NexusInterface& nexus = NexusInterface::instance();
+  nexus.setPluginContainer(&m_OrganizerCore.pluginContainer());
+  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
+}
+
 void MainWindow::showMessage(const QString& message)
 {
   MessageDialog::showMessage(message, this);
@@ -4517,6 +4544,29 @@ void MainWindow::nxmDownloadURLs(QString, int, int, QVariant, QVariant resultDat
   m_OrganizerCore.settings().network().updateServers(servers);
 }
 
+void MainWindow::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int)
+{
+  QVariantMap result = resultData.toMap();
+  QVariantList categories = result["categories"].toList();
+  CategoryFactory* catFactory = CategoryFactory::instance();
+  catFactory->reset();
+  for (auto category : categories) {
+    auto catMap = category.toMap();
+    std::vector<CategoryFactory::NexusCategory> nexusCat;
+    nexusCat.push_back(
+      CategoryFactory::NexusCategory(
+        catMap["name"].toString(),
+        catMap["category_id"].toInt()
+      )
+    );
+    catFactory->addCategory(
+      catMap["name"].toString(),
+      nexusCat,
+      0
+    );
+  }
+}
+
 void MainWindow::nxmRequestFailed(QString gameName, int modID, int, QVariant, int,
                                   int errorCode, const QString& errorString)
 {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 50ff893ff..dd3ff823d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -368,6 +368,8 @@ private slots:
 
   void modInstalled(const QString& modName);
 
+  void importCategories(bool);
+
   // update info
   void nxmUpdateInfoAvailable(QString gameName, QVariant userData, QVariant resultData,
                               int requestID);
@@ -381,6 +383,7 @@ private slots:
   void nxmTrackedModsAvailable(QVariant userData, QVariant resultData, int);
   void nxmDownloadURLs(QString, int modID, int fileID, QVariant userData,
                        QVariant resultData, int requestID);
+  void nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int);
   void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
                         int requestID, int errorCode, const QString& errorString);
 

From 9a801f65013396e02c228785d84f9694d4b187c6 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 25 Dec 2021 20:55:02 -0600
Subject: [PATCH 14/43] Don't overwrite existing Nexus category mappings

---
 src/categories.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index ffc46abce..b1bd899ea 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -270,7 +270,7 @@ void CategoryFactory::setNexusCategories(std::vector<CategoryFactory::NexusCateg
 {
   m_NexusMap.empty();
   for (auto nexusCat : nexusCats) {
-    m_NexusMap.insert_or_assign(nexusCat.m_ID, nexusCat);
+    m_NexusMap.emplace(nexusCat.m_ID, nexusCat);
   }
 
   saveCategories();

From eeddc993a7ee1785d2beaac8e6f3bf0bc155c158 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sun, 26 Dec 2021 19:52:40 -0600
Subject: [PATCH 15/43] Add reminder dialog for old instances

---
 src/mainwindow.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++---
 src/mainwindow.h   |  2 ++
 src/settings.cpp   | 10 ++++++++++
 src/settings.h     |  3 +++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3005ab8f6..99273d463 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1290,7 +1290,6 @@ void MainWindow::showEvent(QShowEvent* event)
       newCatDialog.setText(tr("Please choose how to handle the default category setup.\n\n"
         "If you've already connected to Nexus, you can automatically import Nexus categories for this game (if applicable). Otherwise, use the old Mod Organizer default category structure, or leave the categories blank."));
       QPushButton importBtn(tr("&Import Nexus Categories"));
-      connect(&importBtn, &QPushButton::clicked, this, &MainWindow::importCategories);
       QPushButton defaultBtn(tr("Use &Default Categories"));
       QPushButton cancelBtn(tr("Do &Nothing"));
       if (NexusInterface::instance().getAccessManager()->validated()) {
@@ -1299,8 +1298,9 @@ void MainWindow::showEvent(QShowEvent* event)
       newCatDialog.addButton(&defaultBtn, QMessageBox::ButtonRole::AcceptRole);
       newCatDialog.addButton(&cancelBtn, QMessageBox::ButtonRole::RejectRole);
       newCatDialog.exec();
-      disconnect(&importBtn, &QPushButton::clicked, this, &MainWindow::importCategories);
-      if (newCatDialog.clickedButton() == &cancelBtn) {
+      if (newCatDialog.clickedButton() == &importBtn) {
+        importCategories(false);
+      } else if (newCatDialog.clickedButton() == &cancelBtn) {
         m_CategoryFactory->reset();
       } else if (newCatDialog.clickedButton() == &defaultBtn) {
         m_CategoryFactory->loadCategories();
@@ -1308,6 +1308,43 @@ void MainWindow::showEvent(QShowEvent* event)
       m_CategoryFactory->saveCategories();
 
       m_OrganizerCore.settings().setFirstStart(false);
+    } else {
+      auto& settings = m_OrganizerCore.settings();
+      if (m_LastVersion < QVersionNumber(2, 5) && !GlobalSettings::hideCategoryReminder()) {
+        QMessageBox migrateCatDialog;
+        migrateCatDialog.setWindowTitle("Category Updates");
+        migrateCatDialog.setText(
+          tr(
+            "This is your first time running version 2.5 or higher with an old MO2 instance. The category system now relies on an updated system to map Nexus categories.\n\n"
+            "In order to assign Nexus categories automatically, you will need to import the Nexus categories for the currently managed game and map them to your preferred category structure.\n\n"
+            "You can either manually open the category editor, via the Settings dialog or the category filter sidebar, and set up the mappings as you see fit, or you can automatically import and map the categories as defined on Nexus.\n\n"
+            "As a final option, you can disable Nexus category mapping altogether, which can be changed at any time in the Settings dialog."
+          )
+        );
+        QPushButton importBtn(tr("&Import Nexus Categories"));
+        QPushButton openSettingsBtn(tr("&Open Categories Dialog"));
+        QPushButton showTutorialBtn(tr("&Show Tutorial"));
+        QPushButton closeBtn(tr("&Close"));
+        QCheckBox dontShow(tr("&Don't show this again"));
+        if (NexusInterface::instance().getAccessManager()->validated()) {
+          migrateCatDialog.addButton(&importBtn, QMessageBox::ButtonRole::AcceptRole);
+        }
+        migrateCatDialog.addButton(&openSettingsBtn, QMessageBox::ButtonRole::AcceptRole);
+        migrateCatDialog.addButton(&showTutorialBtn, QMessageBox::ButtonRole::AcceptRole);
+        migrateCatDialog.addButton(&closeBtn, QMessageBox::ButtonRole::RejectRole);
+        migrateCatDialog.setCheckBox(&dontShow);
+        migrateCatDialog.exec();
+        if (migrateCatDialog.clickedButton() == &importBtn) {
+          importCategories(dontShow.isChecked());
+        } else if (migrateCatDialog.clickedButton() == &openSettingsBtn) {
+          this->ui->filtersEdit->click();
+        } else if (migrateCatDialog.clickedButton() == &showTutorialBtn) {
+          // TODO: Implement tutorial
+        }
+        if (dontShow.isChecked()) {
+          GlobalSettings::setHideCategoryReminder(true);
+        }
+      }
     }
 
     m_OrganizerCore.settings().widgets().restoreIndex(ui->groupCombo);
@@ -2138,6 +2175,8 @@ void MainWindow::processUpdates()
   const auto lastVersion    = settings.version().value_or(earliest);
   const auto currentVersion = m_OrganizerCore.getVersion().asQVersionNumber();
 
+  m_LastVersion = lastVersion;
+
   settings.processUpdates(currentVersion, lastVersion);
 
   if (!settings.firstStart()) {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index dd3ff823d..2db1a9d7f 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -326,6 +326,8 @@ private slots:
   std::atomic<bool> m_ProblemsCheckRequired;
   std::mutex m_CheckForProblemsMutex;
 
+  QVersionNumber m_LastVersion;
+
   Executable* getSelectedExecutable();
 
 private slots:
diff --git a/src/settings.cpp b/src/settings.cpp
index b568d8028..ec9bb3628 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -2430,6 +2430,16 @@ void GlobalSettings::setHideTutorialQuestion(bool b)
   settings().setValue("HideTutorialQuestion", b);
 }
 
+bool GlobalSettings::hideCategoryReminder()
+{
+  return settings().value("HideCategoryReminder", false).toBool();
+}
+
+void GlobalSettings::setHideCategoryReminder(bool b)
+{
+  settings().setValue("HideCategoryReminder", b);
+}
+
 bool GlobalSettings::nexusApiKey(QString& apiKey)
 {
   QString tempKey = getWindowsCredential("APIKEY");
diff --git a/src/settings.h b/src/settings.h
index 34a8669af..66dbf81c3 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -923,6 +923,9 @@ class GlobalSettings
   static bool hideTutorialQuestion();
   static void setHideTutorialQuestion(bool b);
 
+  static bool hideCategoryReminder();
+  static void setHideCategoryReminder(bool b);
+
   // if the key exists from the credentials store, puts it in `apiKey` and
   // returns true; otherwise, returns false and leaves `apiKey` untouched
   //

From 05edcc8ab4c47e2ec82a10e40ce0033371bf6fee Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sun, 17 Apr 2022 20:24:06 -0500
Subject: [PATCH 16/43] C++20 fixes

---
 src/moapplication.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/moapplication.h b/src/moapplication.h
index 498242f3e..43ae62435 100644
--- a/src/moapplication.h
+++ b/src/moapplication.h
@@ -23,6 +23,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "env.h"
 #include <QApplication>
 #include <QFileSystemWatcher>
+#include "env.h"
 
 class Settings;
 class MOMultiProcess;

From fba3d52f5645bf2b0ec4a61f9b7fed9c4d481637 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 20 Oct 2022 22:54:29 -0500
Subject: [PATCH 17/43] Preserve old category if Nexus category can't be mapped

---
 src/modlistviewactions.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index b9d0f419f..5fc2aea97 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -264,15 +264,17 @@ void ModListViewActions::assignCategories() const
 {
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
-    for (auto category : modInfo->categories()) {
-      modInfo->removeCategory(category);
-    }
     QString file = modInfo->installationFile();
     auto download = m_core.downloadManager()->getDownloadIndex(file);
     if (download >= 0) {
       int nexusCategory = m_core.downloadManager()->getCategoryID(download);
-      int category = CategoryFactory::instance()->resolveNexusID(nexusCategory);
-      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(category), true);
+      int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
+      if (newCategory != 0) {
+        for (auto category : modInfo->categories()) {
+          modInfo->removeCategory(category);
+        }
+      }
+      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory), true);
     }
   }
 }
@@ -1109,7 +1111,8 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
     if (downloadIndex >= 0) {
       auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
       unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(downloadInfo->categoryID);
-      modInfo->setPrimaryCategory(CategoryFactory::instance()->getCategoryID(categoryIndex));
+      if (categoryIndex != 0)
+        modInfo->setPrimaryCategory(CategoryFactory::instance()->getCategoryID(categoryIndex));
     }
   }
 }

From 41c4d0922946b2f7b090f0d5844e04eb138e9c1a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 5 Sep 2023 03:15:14 -0500
Subject: [PATCH 18/43] Fix merge issues

---
 src/categories.cpp | 11 +++++++++++
 src/categories.h   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/categories.cpp b/src/categories.cpp
index b1bd899ea..3d6257919 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -33,6 +33,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
+CategoryFactory* CategoryFactory::s_Instance = nullptr;
 
 QString CategoryFactory::categoriesFilePath()
 {
@@ -50,6 +51,11 @@ CategoryFactory::CategoryFactory() : QObject()
 {
 }
 
+QString CategoryFactory::nexusMappingFilePath()
+{
+  return qApp->property("dataPath").toString() + "/nexuscatmap.dat";
+}
+
 void CategoryFactory::loadCategories()
 {
   reset();
@@ -179,6 +185,11 @@ void CategoryFactory::setParents()
   }
 }
 
+void CategoryFactory::cleanup()
+{
+  delete s_Instance;
+  s_Instance = nullptr;
+}
 
 void CategoryFactory::saveCategories()
 {
diff --git a/src/categories.h b/src/categories.h
index a1aa92fc8..1df7295b7 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -224,7 +224,11 @@ class CategoryFactory : public QObject {
 
   void setParents();
 
+  static void cleanup();
+
 private:
+  static CategoryFactory* s_Instance;
+
   std::vector<Category> m_Categories;
   std::map<int, unsigned int> m_IDMap;
   std::map<int, NexusCategory> m_NexusMap;

From 6dfe55f444bbe59899b583a5c795714bf50e91f7 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 12 Sep 2023 14:58:13 -0500
Subject: [PATCH 19/43] Fix archive parsing and BSA invalidation

---
 src/profile.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/profile.cpp b/src/profile.cpp
index d4299a7b0..13ce41c7e 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -177,7 +177,8 @@ void Profile::findProfileSettings()
     }
   }
 
-  if (setting("", "LocalSettings") == QVariant()) {
+  if (setting("", "LocalSettings") ==
+      QVariant()) {
     QString backupFile = getIniFileName() + "_";
     if (m_Directory.exists(backupFile)) {
       storeSetting("", "LocalSettings", true);

From 4342fe3ce16e1e14fb44cf2676e3887002f67ec4 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Mon, 18 Sep 2023 21:30:39 -0500
Subject: [PATCH 20/43] Several updates * No longer cause an error when
 deleting a category that's being used * Add a dialog when installing a mod
 with no Nexus mapping (if not disabled) * Allow disabling Nexus category
 mapping in Settings (Nexus tab) * Add context option to remove nexus mappings
 in the category editor * Some clang style fixes

---
 src/categories.cpp          |    2 +
 src/categories.h            |    3 +
 src/categoriesdialog.cpp    |  114 ++-
 src/categoriesdialog.h      |    7 +-
 src/installationmanager.cpp |   34 +-
 src/mainwindow.cpp          |   79 +-
 src/mainwindow.h            |    2 +
 src/organizer_en.ts         | 1736 ++++++++++++++++++++---------------
 src/organizercore.cpp       |   36 +-
 src/settings.cpp            |   10 +
 src/settings.h              |    5 +
 src/settingsdialog.ui       |   20 +-
 src/settingsdialognexus.cpp |    2 +
 13 files changed, 1215 insertions(+), 835 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 3d6257919..7fd60c508 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -233,6 +233,8 @@ void CategoryFactory::saveCategories()
     nexusMapFile.write(line);
   }
   nexusMapFile.close();
+
+  emit categoriesSaved();
 }
 
 unsigned int
diff --git a/src/categories.h b/src/categories.h
index 1df7295b7..86e66b1c8 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -214,6 +214,9 @@ class CategoryFactory : public QObject {
    */
   static QString nexusMappingFilePath();
 
+signals:
+  void categoriesSaved();
+
 private:
   explicit CategoryFactory();
 
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index a14ec8c2d..d97edb8ef 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -19,11 +19,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "categoriesdialog.h"
 #include "categories.h"
+#include "messagedialog.h"
+#include "nexusinterface.h"
 #include "settings.h"
 #include "ui_categoriesdialog.h"
 #include "utility.h"
-#include "nexusinterface.h"
-#include "messagedialog.h"
 #include <QItemDelegate>
 #include <QLineEdit>
 #include <QMenu>
@@ -105,14 +105,21 @@ class ValidatingDelegate : public QItemDelegate
 };
 
 CategoriesDialog::CategoriesDialog(PluginContainer* pluginContainer, QWidget* parent)
-  : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog), m_PluginContainer(pluginContainer)
+    : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog),
+      m_PluginContainer(pluginContainer)
 {
   ui->setupUi(this);
   fillTable();
   connect(ui->categoriesTable, SIGNAL(cellChanged(int, int)), this,
-          SLOT(cellChanged(int,int)));
-  connect(ui->nexusRefresh, SIGNAL(clicked()), this, SLOT(nexusRefresh_clicked()));
-  connect(ui->nexusImportButton, SIGNAL(clicked()), this, SLOT(nexusImport_clicked()));
+          SLOT(cellChanged(int, int)));
+  if (Settings::instance().nexus().categoryMappings()) {
+    connect(ui->nexusRefresh, SIGNAL(clicked()), this, SLOT(nexusRefresh_clicked()));
+    connect(ui->nexusImportButton, SIGNAL(clicked()), this,
+            SLOT(nexusImport_clicked()));
+    ui->nexusCategoryList->setDisabled(false);
+  } else {
+    ui->nexusCategoryList->setDisabled(true);
+  }
 }
 
 CategoriesDialog::~CategoriesDialog()
@@ -141,29 +148,26 @@ void CategoriesDialog::commitChanges()
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
     int index = ui->categoriesTable->verticalHeader()->logicalIndex(i);
-    QVariantList nexusData = ui->categoriesTable->item(index, 3)->data(Qt::UserRole).toList();
+    QVariantList nexusData =
+        ui->categoriesTable->item(index, 3)->data(Qt::UserRole).toList();
     std::vector<CategoryFactory::NexusCategory> nexusCats;
     for (auto nexusCat : nexusData) {
-      nexusCats.push_back(CategoryFactory::NexusCategory(nexusCat.toList()[0].toString(), nexusCat.toList()[1].toInt()));
+      nexusCats.push_back(CategoryFactory::NexusCategory(
+          nexusCat.toList()[0].toString(), nexusCat.toList()[1].toInt()));
     }
 
-    categories->addCategory(
-          ui->categoriesTable->item(index, 0)->text().toInt(),
-          ui->categoriesTable->item(index, 1)->text(),
-          nexusCats,
-          ui->categoriesTable->item(index, 2)->text().toInt());
+    categories->addCategory(ui->categoriesTable->item(index, 0)->text().toInt(),
+                            ui->categoriesTable->item(index, 1)->text(), nexusCats,
+                            ui->categoriesTable->item(index, 2)->text().toInt());
   }
 
   categories->setParents();
 
   std::vector<CategoryFactory::NexusCategory> nexusCats;
   for (int i = 0; i < ui->nexusCategoryList->count(); ++i) {
-      nexusCats.push_back(
-        CategoryFactory::NexusCategory(
-          ui->nexusCategoryList->item(i)->data(Qt::DisplayRole).toString(),
-          ui->nexusCategoryList->item(i)->data(Qt::UserRole).toInt()
-        )
-      );
+    nexusCats.push_back(CategoryFactory::NexusCategory(
+        ui->nexusCategoryList->item(i)->data(Qt::DisplayRole).toString(),
+        ui->nexusCategoryList->item(i)->data(Qt::UserRole).toInt()));
   }
 
   categories->setNexusCategories(nexusCats);
@@ -186,8 +190,8 @@ void CategoriesDialog::refreshIDs()
 void CategoriesDialog::fillTable()
 {
   CategoryFactory* categories = CategoryFactory::instance();
-  QTableWidget* table = ui->categoriesTable;
-  QListWidget* list = ui->nexusCategoryList;
+  QTableWidget* table         = ui->categoriesTable;
+  QListWidget* list           = ui->nexusCategoryList;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
@@ -196,12 +200,18 @@ void CategoriesDialog::fillTable()
   table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Stretch);
   table->verticalHeader()->setSectionsMovable(true);
   table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-  table->setItemDelegateForColumn(0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
-  table->setItemDelegateForColumn(2, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
-  table->setItemDelegateForColumn(3, new ValidatingDelegate(this, new QRegExpValidator(QRegExp("([0-9]+)?(,[0-9]+)*"), this)));
+  table->setItemDelegateForColumn(
+      0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(
+      2, new ValidatingDelegate(this, new ExistingIDValidator(m_IDs)));
+  table->setItemDelegateForColumn(
+      3, new ValidatingDelegate(this,
+                                new QRegularExpressionValidator(
+                                    QRegularExpression("([0-9]+)?(,[0-9]+)*"), this)));
 
   int row = 0;
-  for (std::vector<CategoryFactory::Category>::const_iterator iter = categories->m_Categories.begin();
+  for (std::vector<CategoryFactory::Category>::const_iterator iter =
+           categories->m_Categories.begin();
        iter != categories->m_Categories.end(); ++iter, ++row) {
     const CategoryFactory::Category& category = *iter;
     if (category.m_ID == 0) {
@@ -225,13 +235,12 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 3, nexusCatItem.take());
   }
 
-  for (auto nexusCat : categories->m_NexusMap)
-  {
+  for (auto nexusCat : categories->m_NexusMap) {
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
     nexusItem->setData(Qt::DisplayRole, nexusCat.second.m_Name);
     nexusItem->setData(Qt::UserRole, nexusCat.second.m_ID);
     list->addItem(nexusItem.take());
-    auto item = table->item(categories->resolveNexusID(nexusCat.first)-1, 3);
+    auto item = table->item(categories->resolveNexusID(nexusCat.first) - 1, 3);
     if (item != nullptr) {
       auto itemData = item->data(Qt::UserRole).toList();
       QVariantList newData;
@@ -267,22 +276,29 @@ void CategoriesDialog::removeCategory_clicked()
   ui->categoriesTable->removeRow(m_ContextRow);
 }
 
+void CategoriesDialog::removeNexusMap_clicked()
+{
+  ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::UserRole, QVariantList());
+  ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::DisplayRole, QString());
+  // ui->categoriesTable->update();
+}
 
 void CategoriesDialog::nexusRefresh_clicked()
 {
-  NexusInterface &nexus = NexusInterface::instance();
+  NexusInterface& nexus = NexusInterface::instance();
   nexus.setPluginContainer(m_PluginContainer);
-  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
+  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this,
+                        QVariant(), QString());
 }
 
-
 void CategoriesDialog::nexusImport_clicked()
 {
   if (QMessageBox::question(nullptr, tr("Import Nexus Categories?"),
-    tr("This will overwrite your existing categories with the loaded Nexus categories."),
-    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+                            tr("This will overwrite your existing categories with the "
+                               "loaded Nexus categories."),
+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     QTableWidget* table = ui->categoriesTable;
-    QListWidget* list = ui->nexusCategoryList;
+    QListWidget* list   = ui->nexusCategoryList;
 
     table->setRowCount(0);
     refreshIDs();
@@ -295,7 +311,8 @@ void CategoriesDialog::nexusImport_clicked()
       QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
       idItem->setData(Qt::DisplayRole, ++m_HighestID);
 
-      QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(list->item(i)->data(Qt::DisplayRole).toString()));
+      QScopedPointer<QTableWidgetItem> nameItem(
+          new QTableWidgetItem(list->item(i)->data(Qt::DisplayRole).toString()));
       QStringList nexusLabel;
       QVariantList nexusData;
       nexusLabel.append(list->item(i)->data(Qt::DisplayRole).toString());
@@ -303,7 +320,8 @@ void CategoriesDialog::nexusImport_clicked()
       data.append(QVariant(list->item(i)->data(Qt::DisplayRole).toString()));
       data.append(QVariant(list->item(i)->data(Qt::UserRole).toInt()));
       nexusData.insert(nexusData.size(), data);
-      QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem(nexusLabel.join(", ")));
+      QScopedPointer<QTableWidgetItem> nexusCatItem(
+          new QTableWidgetItem(nexusLabel.join(", ")));
       nexusCatItem->setData(Qt::UserRole, nexusData);
       QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
       parentIDItem->setData(Qt::DisplayRole, 0);
@@ -317,13 +335,13 @@ void CategoriesDialog::nexusImport_clicked()
   }
 }
 
-
-void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int)
+void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant,
+                                            QVariant resultData, int)
 {
-  QVariantMap result = resultData.toMap();
-  QVariantList categories = result["categories"].toList();
-  CategoryFactory *catFactory = CategoryFactory::instance();
-  QListWidget* list = ui->nexusCategoryList;
+  QVariantMap result          = resultData.toMap();
+  QVariantList categories     = result["categories"].toList();
+  CategoryFactory* catFactory = CategoryFactory::instance();
+  QListWidget* list           = ui->nexusCategoryList;
   list->clear();
   for (auto category : categories) {
     auto catMap = category.toMap();
@@ -334,19 +352,23 @@ void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant, QVariant
   }
 }
 
-
-void CategoriesDialog::nxmRequestFailed(QString, int, int, QVariant, int, int errorCode, const QString& errorMessage)
+void CategoriesDialog::nxmRequestFailed(QString, int, int, QVariant, int, int errorCode,
+                                        const QString& errorMessage)
 {
-  MessageDialog::showMessage(tr("Error %1: Request to Nexus failed: %2").arg(errorCode).arg(errorMessage), this);
+  MessageDialog::showMessage(
+      tr("Error %1: Request to Nexus failed: %2").arg(errorCode).arg(errorMessage),
+      this);
 }
 
-
 void CategoriesDialog::on_categoriesTable_customContextMenuRequested(const QPoint& pos)
 {
   m_ContextRow = ui->categoriesTable->rowAt(pos.y());
   QMenu menu;
   menu.addAction(tr("Add"), this, SLOT(addCategory_clicked()));
   menu.addAction(tr("Remove"), this, SLOT(removeCategory_clicked()));
+  if (Settings::instance().nexus().categoryMappings()) {
+    menu.addAction(tr("Remove Nexus Mapping(s)"), this, SLOT(removeNexusMap_clicked()));
+  }
 
   menu.exec(ui->categoriesTable->mapToGlobal(pos));
 }
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index a2bd7240a..1bcf273cd 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -20,9 +20,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CATEGORIESDIALOG_H
 #define CATEGORIESDIALOG_H
 
-#include "tutorabledialog.h"
 #include "categories.h"
 #include "plugincontainer.h"
+#include "tutorabledialog.h"
 #include <set>
 
 namespace Ui
@@ -54,7 +54,8 @@ class CategoriesDialog : public MOBase::TutorableDialog
 public slots:
 
   void nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int);
-  void nxmRequestFailed(QString, int, int, QVariant, int, int errorCode, const QString& errorMessage);
+  void nxmRequestFailed(QString, int, int, QVariant, int, int errorCode,
+                        const QString& errorMessage);
 
 signals:
   void refreshNexusCategories();
@@ -64,6 +65,7 @@ private slots:
   void on_categoriesTable_customContextMenuRequested(const QPoint& pos);
   void addCategory_clicked();
   void removeCategory_clicked();
+  void removeNexusMap_clicked();
   void nexusRefresh_clicked();
   void nexusImport_clicked();
   void cellChanged(int row, int column);
@@ -80,7 +82,6 @@ private slots:
   int m_HighestID;
   std::set<int> m_IDs;
   std::vector<CategoryFactory::NexusCategory> m_NexusCategories;
-
 };
 
 #endif  // CATEGORIESDIALOG_H
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index dce81bd19..901c636cb 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -645,6 +645,7 @@ InstallationResult InstallationManager::install(const QString& fileName,
   QString gameName      = "";
   QString version       = "";
   QString newestVersion = "";
+  int category          = 0;
   int categoryID        = 0;
   int fileCategoryID    = 1;
   QString repository    = "Nexus";
@@ -659,12 +660,33 @@ InstallationResult InstallationManager::install(const QString& fileName,
     modName.update(doc.toPlainText(), GUESS_FALLBACK);
     modName.update(metaFile.value("modName", "").toString(), GUESS_META);
 
-    version = metaFile.value("version", "").toString();
-    newestVersion = metaFile.value("newestVersion", "").toString();
-    unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(
-        metaFile.value("category", 0).toInt());
-    categoryID = CategoryFactory::instance()->getCategoryID(categoryIndex);
-    repository = metaFile.value("repository", "").toString();
+    version                    = metaFile.value("version", "").toString();
+    newestVersion              = metaFile.value("newestVersion", "").toString();
+    category                   = metaFile.value("category", 0).toInt();
+    unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(category);
+    if (category != 0 && categoryIndex == 0U &&
+        Settings::instance().nexus().categoryMappings()) {
+      QMessageBox nexusQuery;
+      nexusQuery.setText(tr(
+          "This Nexus category has not yet been mapped. Do you wish to proceed without "
+          "setting a category, proceed and disable automatic Nexus mappings, or stop "
+          "and configure your category mappings?"));
+      nexusQuery.addButton(tr("&Proceed"), QMessageBox::YesRole);
+      nexusQuery.addButton(tr("&Disable"), QMessageBox::AcceptRole);
+      nexusQuery.addButton(tr("&Stop && Configure"), QMessageBox::DestructiveRole);
+      auto ret = nexusQuery.exec();
+      switch (ret) {
+      case 1:
+        Settings::instance().nexus().setCategoryMappings(false);
+      case 0:
+        break;
+      case 2:
+        return MOBase::IPluginInstaller::RESULT_CATEGORYREQUESTED;
+      }
+    } else {
+      categoryID = CategoryFactory::instance()->getCategoryID(categoryIndex);
+    }
+    repository     = metaFile.value("repository", "").toString();
     fileCategoryID = metaFile.value("fileCategory", 1).toInt();
   }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 99273d463..18a288c64 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -472,6 +472,9 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this,
           &MainWindow::modInstalled);
 
+  connect(m_CategoryFactory, &CategoryFactory::categoriesSaved, this,
+          &MainWindow::categoriesSaved);
+
   m_CheckBSATimer.setSingleShot(true);
   connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));
 
@@ -1286,9 +1289,12 @@ void MainWindow::showEvent(QShowEvent* event)
       }
 
       QMessageBox newCatDialog;
-      newCatDialog.setWindowTitle("Import Categories");
-      newCatDialog.setText(tr("Please choose how to handle the default category setup.\n\n"
-        "If you've already connected to Nexus, you can automatically import Nexus categories for this game (if applicable). Otherwise, use the old Mod Organizer default category structure, or leave the categories blank."));
+      newCatDialog.setWindowTitle(tr("Import Categories"));
+      newCatDialog.setText(
+          tr("Please choose how to handle the default category setup.\n\n"
+             "If you've already connected to Nexus, you can automatically import Nexus "
+             "categories for this game (if applicable). Otherwise, use the old Mod "
+             "Organizer default category structure, or leave the categories blank."));
       QPushButton importBtn(tr("&Import Nexus Categories"));
       QPushButton defaultBtn(tr("Use &Default Categories"));
       QPushButton cancelBtn(tr("Do &Nothing"));
@@ -1310,17 +1316,23 @@ void MainWindow::showEvent(QShowEvent* event)
       m_OrganizerCore.settings().setFirstStart(false);
     } else {
       auto& settings = m_OrganizerCore.settings();
-      if (m_LastVersion < QVersionNumber(2, 5) && !GlobalSettings::hideCategoryReminder()) {
+      if (m_LastVersion < QVersionNumber(2, 5) &&
+          !GlobalSettings::hideCategoryReminder()) {
         QMessageBox migrateCatDialog;
         migrateCatDialog.setWindowTitle("Category Updates");
         migrateCatDialog.setText(
-          tr(
-            "This is your first time running version 2.5 or higher with an old MO2 instance. The category system now relies on an updated system to map Nexus categories.\n\n"
-            "In order to assign Nexus categories automatically, you will need to import the Nexus categories for the currently managed game and map them to your preferred category structure.\n\n"
-            "You can either manually open the category editor, via the Settings dialog or the category filter sidebar, and set up the mappings as you see fit, or you can automatically import and map the categories as defined on Nexus.\n\n"
-            "As a final option, you can disable Nexus category mapping altogether, which can be changed at any time in the Settings dialog."
-          )
-        );
+            tr("This is your first time running version 2.5 or higher with an old MO2 "
+               "instance. The category system now relies on an updated system to map "
+               "Nexus categories.\n\n"
+               "In order to assign Nexus categories automatically, you will need to "
+               "import the Nexus categories for the currently managed game and map "
+               "them to your preferred category structure.\n\n"
+               "You can either manually open the category editor, via the Settings "
+               "dialog or the category filter sidebar, and set up the mappings as you "
+               "see fit, or you can automatically import and map the categories as "
+               "defined on Nexus.\n\n"
+               "As a final option, you can disable Nexus category mapping altogether, "
+               "which can be changed at any time in the Settings dialog."));
         QPushButton importBtn(tr("&Import Nexus Categories"));
         QPushButton openSettingsBtn(tr("&Open Categories Dialog"));
         QPushButton showTutorialBtn(tr("&Show Tutorial"));
@@ -1329,8 +1341,10 @@ void MainWindow::showEvent(QShowEvent* event)
         if (NexusInterface::instance().getAccessManager()->validated()) {
           migrateCatDialog.addButton(&importBtn, QMessageBox::ButtonRole::AcceptRole);
         }
-        migrateCatDialog.addButton(&openSettingsBtn, QMessageBox::ButtonRole::AcceptRole);
-        migrateCatDialog.addButton(&showTutorialBtn, QMessageBox::ButtonRole::AcceptRole);
+        migrateCatDialog.addButton(&openSettingsBtn,
+                                   QMessageBox::ButtonRole::AcceptRole);
+        migrateCatDialog.addButton(&showTutorialBtn,
+                                   QMessageBox::ButtonRole::AcceptRole);
         migrateCatDialog.addButton(&closeBtn, QMessageBox::ButtonRole::RejectRole);
         migrateCatDialog.setCheckBox(&dontShow);
         migrateCatDialog.exec();
@@ -2087,8 +2101,8 @@ void MainWindow::fixCategories()
   for (unsigned int i = 0; i < ModInfo::getNumMods(); ++i) {
     ModInfo::Ptr modInfo     = ModInfo::getByIndex(i);
     std::set<int> categories = modInfo->getCategories();
-    for (std::set<int>::iterator iter = categories.begin();
-         iter != categories.end(); ++iter) {
+    for (std::set<int>::iterator iter = categories.begin(); iter != categories.end();
+         ++iter) {
       if (!m_CategoryFactory->categoryExists(*iter)) {
         modInfo->setCategory(*iter, false);
       }
@@ -2455,7 +2469,8 @@ void MainWindow::importCategories(bool)
 {
   NexusInterface& nexus = NexusInterface::instance();
   nexus.setPluginContainer(&m_OrganizerCore.pluginContainer());
-  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this, QVariant(), QString());
+  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this,
+                        QVariant(), QString());
 }
 
 void MainWindow::showMessage(const QString& message)
@@ -3916,6 +3931,17 @@ void MainWindow::onPluginRegistrationChanged()
   m_DownloadsTab->update();
 }
 
+void MainWindow::categoriesSaved()
+{
+  for (auto modName : m_OrganizerCore.modList()->allMods()) {
+    auto mod = ModInfo::getByName(modName);
+    for (auto category : mod->getCategories()) {
+      if (!m_CategoryFactory->categoryExists(category))
+        mod->setCategory(category, false);
+    }
+  }
+}
+
 void MainWindow::on_actionNexus_triggered()
 {
   const IPluginGame* game = m_OrganizerCore.managedGame();
@@ -4583,26 +4609,19 @@ void MainWindow::nxmDownloadURLs(QString, int, int, QVariant, QVariant resultDat
   m_OrganizerCore.settings().network().updateServers(servers);
 }
 
-void MainWindow::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int)
+void MainWindow::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData,
+                                      int)
 {
-  QVariantMap result = resultData.toMap();
-  QVariantList categories = result["categories"].toList();
+  QVariantMap result          = resultData.toMap();
+  QVariantList categories     = result["categories"].toList();
   CategoryFactory* catFactory = CategoryFactory::instance();
   catFactory->reset();
   for (auto category : categories) {
     auto catMap = category.toMap();
     std::vector<CategoryFactory::NexusCategory> nexusCat;
-    nexusCat.push_back(
-      CategoryFactory::NexusCategory(
-        catMap["name"].toString(),
-        catMap["category_id"].toInt()
-      )
-    );
-    catFactory->addCategory(
-      catMap["name"].toString(),
-      nexusCat,
-      0
-    );
+    nexusCat.push_back(CategoryFactory::NexusCategory(catMap["name"].toString(),
+                                                      catMap["category_id"].toInt()));
+    catFactory->addCategory(catMap["name"].toString(), nexusCat, 0);
   }
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 2db1a9d7f..67e88846b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -372,6 +372,8 @@ private slots:
 
   void importCategories(bool);
 
+  void categoriesSaved();
+
   // update info
   void nxmUpdateInfoAvailable(QString gameName, QVariant userData, QVariant resultData,
                               int requestID);
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 18eaac8e9..389d84aee 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -224,43 +224,64 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="66"/>
+        <location filename="categoriesdialog.ui" line="30"/>
+        <source>Refresh from Nexus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.ui" line="43"/>
+        <source>&lt;-- Import Nexus Cats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.ui" line="99"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="69"/>
+        <location filename="categoriesdialog.ui" line="102"/>
         <source>Internal ID for the category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="72"/>
+        <location filename="categoriesdialog.ui" line="105"/>
         <source>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="77"/>
+        <location filename="categoriesdialog.ui" line="110"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="80"/>
-        <location filename="categoriesdialog.ui" line="83"/>
+        <location filename="categoriesdialog.ui" line="113"/>
+        <location filename="categoriesdialog.ui" line="116"/>
         <source>Name of the Categorie used for display.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="88"/>
-        <source>Nexus IDs</source>
+        <location filename="categoriesdialog.ui" line="121"/>
+        <source>Parent ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.ui" line="124"/>
+        <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.ui" line="129"/>
+        <location filename="categoriesdialog.ui" line="155"/>
+        <source>Nexus Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="91"/>
+        <location filename="categoriesdialog.ui" line="132"/>
         <source>Comma-Separated list of Nexus IDs to be matched to the internal ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="94"/>
+        <location filename="categoriesdialog.ui" line="135"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -271,25 +292,108 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="105"/>
-        <source>Parent ID</source>
+        <location filename="categoriesdialog.ui" line="149"/>
+        <source>Drag &amp; drop nexus categories from this pane onto the target category on the left.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="108"/>
-        <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source>
+        <location filename="categoriesdialog.cpp" line="295"/>
+        <source>Import Nexus Categories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="250"/>
+        <location filename="categoriesdialog.cpp" line="296"/>
+        <source>This will overwrite your existing categories with the loaded Nexus categories.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.cpp" line="358"/>
+        <source>Error %1: Request to Nexus failed: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categoriesdialog.cpp" line="366"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="251"/>
+        <location filename="categoriesdialog.cpp" line="367"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="categoriesdialog.cpp" line="369"/>
+        <source>Remove Nexus Mapping(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryFactory</name>
+    <message>
+        <location filename="categories.cpp" line="78"/>
+        <location filename="categories.cpp" line="128"/>
+        <source>invalid category id {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="88"/>
+        <location filename="categories.cpp" line="97"/>
+        <source>invalid category line {}: {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="103"/>
+        <source>invalid category line {}: {} ({} cells)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="124"/>
+        <source>invalid nexus ID {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="134"/>
+        <source>invalid nexus category line {}: {} ({} cells)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="194"/>
+        <source>Failed to save custom categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="218"/>
+        <source>Failed to save nexus category mappings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="356"/>
+        <location filename="categories.cpp" line="402"/>
+        <location filename="categories.cpp" line="411"/>
+        <location filename="categories.cpp" line="479"/>
+        <source>invalid category index: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="394"/>
+        <source>{} is no valid category id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="489"/>
+        <source>invalid category id: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="513"/>
+        <source>nexus category id {} maps to internal {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="517"/>
+        <source>nexus category id {} not mapped</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConflictsTab</name>
@@ -347,283 +451,303 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="42"/>
+        <location filename="createinstancedialog.ui" line="41"/>
         <source>Creating a new instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="75"/>
+        <location filename="createinstancedialog.ui" line="74"/>
         <source>&lt;h3&gt;What is an instance?&lt;/h3&gt;
 &lt;p&gt;An instance is a full set of mods, downloads, profiles and configuration for a game. Each game must be managed in its own instance. Mod Organizer can freely switch between instances.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="89"/>
+        <location filename="createinstancedialog.ui" line="88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/ModOrganizer2/modorganizer/wiki/Instances&quot;&gt;More information&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="112"/>
+        <location filename="createinstancedialog.ui" line="111"/>
         <source>Never show this page again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="138"/>
+        <location filename="createinstancedialog.ui" line="137"/>
         <source>&lt;h3&gt;Select the type of instance to create.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="175"/>
+        <location filename="createinstancedialog.ui" line="174"/>
         <source>Create a global instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="181"/>
+        <location filename="createinstancedialog.ui" line="180"/>
         <source>Global instances are stored in %1, but some paths can be changed to be on a different drive if necessary. A single installation of Mod Organizer can manage multiple global instances.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="188"/>
+        <location filename="createinstancedialog.ui" line="187"/>
         <source>Create a portable instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="194"/>
+        <location filename="createinstancedialog.ui" line="193"/>
         <source>A portable instance stores everything in Mod Organizer&apos;s installation folder, currently %1. There can only be one portable instance per installation of Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="204"/>
+        <location filename="createinstancedialog.ui" line="203"/>
         <source>A portable instance already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="249"/>
+        <location filename="createinstancedialog.ui" line="248"/>
         <source>&lt;h3&gt;Select the game to manage.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="338"/>
+        <location filename="createinstancedialog.ui" line="337"/>
         <source>Show all supported games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="358"/>
+        <location filename="createinstancedialog.ui" line="357"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="390"/>
+        <location filename="createinstancedialog.ui" line="389"/>
         <source>&lt;h3&gt;Select the game edition.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="397"/>
+        <location filename="createinstancedialog.ui" line="396"/>
         <source>This game has multiple variants. The correct one must be selected or Mod Organizer will not be able to launch the game properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="494"/>
+        <location filename="createinstancedialog.ui" line="493"/>
         <source>&lt;h3&gt;Customize the name for this &lt;span style=&quot;white-space: nowrap;&quot;&gt;%1&lt;/span&gt; instance.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="513"/>
+        <location filename="createinstancedialog.ui" line="512"/>
         <source>Instance name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="520"/>
+        <location filename="createinstancedialog.ui" line="519"/>
         <source>There is already an instance with this name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="527"/>
+        <location filename="createinstancedialog.ui" line="526"/>
         <source>The name contains invalid characters. It must be a valid folder name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="569"/>
+        <location filename="createinstancedialog.ui" line="568"/>
+        <source>&lt;h3&gt;Configure your profile settings.&lt;/h3&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialog.ui" line="587"/>
+        <source>Use profile-specific game INI files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialog.ui" line="597"/>
+        <source>Use profile-specific save games</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialog.ui" line="607"/>
+        <source>Automatic archive invalidation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialog.ui" line="652"/>
         <source>&lt;h3&gt;Select a folder where the data should be stored.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="579"/>
+        <location filename="createinstancedialog.ui" line="662"/>
         <source>This includes downloads, mods, profiles and overwrite for your &lt;b&gt;%1&lt;/b&gt; instance. If there is enough space on this drive, you should use the default folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="629"/>
-        <location filename="createinstancedialog.ui" line="711"/>
-        <location filename="createinstancedialog.ui" line="718"/>
-        <location filename="createinstancedialog.ui" line="760"/>
-        <location filename="createinstancedialog.ui" line="819"/>
-        <location filename="createinstancedialog.ui" line="826"/>
+        <location filename="createinstancedialog.ui" line="712"/>
+        <location filename="createinstancedialog.ui" line="794"/>
+        <location filename="createinstancedialog.ui" line="801"/>
+        <location filename="createinstancedialog.ui" line="843"/>
+        <location filename="createinstancedialog.ui" line="902"/>
+        <location filename="createinstancedialog.ui" line="909"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="636"/>
+        <location filename="createinstancedialog.ui" line="719"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="656"/>
+        <location filename="createinstancedialog.ui" line="739"/>
         <source>Warning: This folder already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="663"/>
-        <location filename="createinstancedialog.ui" line="732"/>
-        <location filename="createinstancedialog.ui" line="739"/>
-        <location filename="createinstancedialog.ui" line="767"/>
-        <location filename="createinstancedialog.ui" line="791"/>
-        <location filename="createinstancedialog.ui" line="798"/>
+        <location filename="createinstancedialog.ui" line="746"/>
+        <location filename="createinstancedialog.ui" line="815"/>
+        <location filename="createinstancedialog.ui" line="822"/>
+        <location filename="createinstancedialog.ui" line="850"/>
+        <location filename="createinstancedialog.ui" line="874"/>
+        <location filename="createinstancedialog.ui" line="881"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="670"/>
+        <location filename="createinstancedialog.ui" line="753"/>
         <source>Warning: The folder contains invalid characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="725"/>
+        <location filename="createinstancedialog.ui" line="808"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="746"/>
+        <location filename="createinstancedialog.ui" line="829"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="753"/>
+        <location filename="createinstancedialog.ui" line="836"/>
         <source>Base directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="774"/>
+        <location filename="createinstancedialog.ui" line="857"/>
         <source>Warning: The folder %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="784"/>
+        <location filename="createinstancedialog.ui" line="867"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="805"/>
+        <location filename="createinstancedialog.ui" line="888"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="812"/>
+        <location filename="createinstancedialog.ui" line="895"/>
         <source>Use %BASE_DIR% to refer to the Base Directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="846"/>
+        <location filename="createinstancedialog.ui" line="929"/>
         <source>Warning: The folder %1 contains invalid characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="897"/>
+        <location filename="createinstancedialog.ui" line="980"/>
         <source>Show advanced options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="929"/>
+        <location filename="createinstancedialog.ui" line="1012"/>
         <source>&lt;h3&gt;Link Mod Organizer with your Nexus account&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="936"/>
+        <location filename="createinstancedialog.ui" line="1019"/>
         <source>Linking with Nexus allows you to download mods directly from Mod Organizer and automatically check for updates. This is optional.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1000"/>
+        <location filename="createinstancedialog.ui" line="1083"/>
         <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1020"/>
+        <location filename="createinstancedialog.ui" line="1103"/>
         <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1071"/>
+        <location filename="createinstancedialog.ui" line="1154"/>
         <source>&lt;h3&gt;Confirmation&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1078"/>
+        <location filename="createinstancedialog.ui" line="1161"/>
         <source>The instance is about to be created. Review the information below and press &apos;Finish&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1119"/>
+        <location filename="createinstancedialog.ui" line="1202"/>
         <source>Instance creation log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1154"/>
+        <location filename="createinstancedialog.ui" line="1237"/>
         <source>Launch the new instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1202"/>
+        <location filename="createinstancedialog.ui" line="1285"/>
         <source>&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1209"/>
+        <location filename="createinstancedialog.ui" line="1292"/>
         <source>Next &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1219"/>
+        <location filename="createinstancedialog.ui" line="1302"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="254"/>
+        <location filename="createinstancedialog.cpp" line="255"/>
         <source>Setting up instance %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="255"/>
+        <location filename="createinstancedialog.cpp" line="256"/>
         <source>Setting up an instance %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="301"/>
+        <location filename="createinstancedialog.cpp" line="302"/>
         <source>Creating instance...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="358"/>
+        <location filename="createinstancedialog.cpp" line="363"/>
         <source>Writing %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="370"/>
+        <location filename="createinstancedialog.cpp" line="375"/>
         <source>Format error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="374"/>
+        <location filename="createinstancedialog.cpp" line="379"/>
         <source>Error %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="386"/>
+        <location filename="createinstancedialog.cpp" line="391"/>
         <source>Done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="436"/>
+        <location filename="createinstancedialog.cpp" line="441"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,32 +1126,32 @@ Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="544"/>
+        <location filename="downloadmanager.cpp" line="564"/>
         <source>failed to download %1: could not open output file: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="573"/>
+        <location filename="downloadmanager.cpp" line="593"/>
         <source>Download again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="574"/>
+        <location filename="downloadmanager.cpp" line="594"/>
         <source>A file with the same name &quot;%1&quot; has already been downloaded. Do you want to download it again? The new file will receive a different name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="638"/>
+        <location filename="downloadmanager.cpp" line="661"/>
         <source>Wrong Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="639"/>
+        <location filename="downloadmanager.cpp" line="662"/>
         <source>The download link is for a mod for &quot;%1&quot; but this instance of MO has been set up for &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="653"/>
+        <location filename="downloadmanager.cpp" line="676"/>
         <source>There is already a download queued for this file.
 
 Mod %1
@@ -1035,12 +1159,12 @@ File %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="660"/>
+        <location filename="downloadmanager.cpp" line="683"/>
         <source>Already Queued</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="673"/>
+        <location filename="downloadmanager.cpp" line="696"/>
         <source>There is already a download started for this file.
 
 Mod %1:	%2
@@ -1048,287 +1172,288 @@ File %3:	%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="709"/>
+        <location filename="downloadmanager.cpp" line="732"/>
         <source>Already Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="741"/>
-        <location filename="downloadmanager.cpp" line="875"/>
+        <location filename="downloadmanager.cpp" line="764"/>
+        <location filename="downloadmanager.cpp" line="898"/>
         <source>remove: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="760"/>
+        <location filename="downloadmanager.cpp" line="783"/>
         <source>failed to delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="767"/>
+        <location filename="downloadmanager.cpp" line="790"/>
         <source>failed to delete meta file for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="828"/>
+        <location filename="downloadmanager.cpp" line="851"/>
         <source>restore: invalid download index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="896"/>
+        <location filename="downloadmanager.cpp" line="919"/>
         <source>cancel: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="908"/>
+        <location filename="downloadmanager.cpp" line="931"/>
         <source>pause: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="930"/>
+        <location filename="downloadmanager.cpp" line="953"/>
         <source>resume: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="941"/>
+        <location filename="downloadmanager.cpp" line="964"/>
         <source>resume (int): invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="967"/>
+        <location filename="downloadmanager.cpp" line="989"/>
         <source>No known download urls. Sorry, this download can&apos;t be resumed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1010"/>
-        <location filename="downloadmanager.cpp" line="1069"/>
+        <location filename="downloadmanager.cpp" line="1032"/>
+        <location filename="downloadmanager.cpp" line="1091"/>
         <source>query: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1032"/>
+        <location filename="downloadmanager.cpp" line="1054"/>
         <source>Please enter the nexus mod id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1033"/>
+        <location filename="downloadmanager.cpp" line="1055"/>
         <source>Mod ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1045"/>
+        <location filename="downloadmanager.cpp" line="1067"/>
         <source>Please select the source game code for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1103"/>
+        <location filename="downloadmanager.cpp" line="1125"/>
         <source>Hashing download file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1104"/>
+        <location filename="downloadmanager.cpp" line="1126"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1131"/>
+        <location filename="downloadmanager.cpp" line="1153"/>
         <source>VisitNexus: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1151"/>
+        <location filename="downloadmanager.cpp" line="1173"/>
         <source>Nexus ID for this Mod is unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1158"/>
+        <location filename="downloadmanager.cpp" line="1180"/>
         <source>OpenFile: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1202"/>
+        <location filename="downloadmanager.cpp" line="1224"/>
         <source>OpenFileInDownloadsFolder: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1235"/>
+        <location filename="downloadmanager.cpp" line="1257"/>
         <source>get pending: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1244"/>
+        <location filename="downloadmanager.cpp" line="1266"/>
         <source>get path: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1254"/>
+        <location filename="downloadmanager.cpp" line="1276"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1256"/>
+        <location filename="downloadmanager.cpp" line="1278"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1258"/>
+        <location filename="downloadmanager.cpp" line="1280"/>
         <source>Optional</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1260"/>
+        <location filename="downloadmanager.cpp" line="1282"/>
         <source>Old</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1262"/>
+        <location filename="downloadmanager.cpp" line="1284"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1264"/>
+        <location filename="downloadmanager.cpp" line="1286"/>
         <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1266"/>
+        <location filename="downloadmanager.cpp" line="1288"/>
         <source>Archived</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1268"/>
+        <location filename="downloadmanager.cpp" line="1290"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1275"/>
+        <location filename="downloadmanager.cpp" line="1297"/>
         <source>display name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1296"/>
+        <location filename="downloadmanager.cpp" line="1318"/>
         <source>file name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1305"/>
+        <location filename="downloadmanager.cpp" line="1340"/>
         <source>file time: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1324"/>
+        <location filename="downloadmanager.cpp" line="1359"/>
         <source>file size: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1333"/>
+        <location filename="downloadmanager.cpp" line="1368"/>
         <source>progress: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1342"/>
+        <location filename="downloadmanager.cpp" line="1377"/>
         <source>state: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1351"/>
+        <location filename="downloadmanager.cpp" line="1386"/>
         <source>infocomplete: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1365"/>
-        <location filename="downloadmanager.cpp" line="1373"/>
-        <location filename="downloadmanager.cpp" line="1386"/>
+        <location filename="downloadmanager.cpp" line="1400"/>
+        <location filename="downloadmanager.cpp" line="1408"/>
+        <location filename="downloadmanager.cpp" line="1416"/>
+        <location filename="downloadmanager.cpp" line="1429"/>
         <source>mod id: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1394"/>
+        <location filename="downloadmanager.cpp" line="1437"/>
         <source>ishidden: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1402"/>
+        <location filename="downloadmanager.cpp" line="1445"/>
         <source>file info: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1411"/>
+        <location filename="downloadmanager.cpp" line="1454"/>
         <source>mark installed: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1456"/>
+        <location filename="downloadmanager.cpp" line="1499"/>
         <source>mark uninstalled: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1625"/>
+        <location filename="downloadmanager.cpp" line="1668"/>
         <source>%1% - %2 - ~%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1636"/>
+        <location filename="downloadmanager.cpp" line="1679"/>
         <source>Memory allocation error (in processing progress event).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1645"/>
+        <location filename="downloadmanager.cpp" line="1688"/>
         <source>Memory allocation error (in processing downloaded data).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1767"/>
+        <location filename="downloadmanager.cpp" line="1810"/>
         <source>Information updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1769"/>
-        <location filename="downloadmanager.cpp" line="1792"/>
+        <location filename="downloadmanager.cpp" line="1812"/>
+        <location filename="downloadmanager.cpp" line="1835"/>
         <source>No matching file found on Nexus! Maybe this file is no longer available or it was renamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1772"/>
+        <location filename="downloadmanager.cpp" line="1815"/>
         <source>No file on Nexus matches the selected file by name. Please manually choose the correct one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1969"/>
+        <location filename="downloadmanager.cpp" line="2012"/>
         <source>No download server available. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2139"/>
+        <location filename="downloadmanager.cpp" line="2182"/>
         <source>Failed to request file info from nexus: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2167"/>
+        <location filename="downloadmanager.cpp" line="2214"/>
         <source>Warning: Content type is: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2174"/>
+        <location filename="downloadmanager.cpp" line="2221"/>
         <source>Download header content length: %1 downloaded file size: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2178"/>
+        <location filename="downloadmanager.cpp" line="2225"/>
         <source>Download failed: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2203"/>
+        <location filename="downloadmanager.cpp" line="2250"/>
         <source>We were unable to download the file due to errors after four retries. There may be an issue with the Nexus servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2292"/>
+        <location filename="downloadmanager.cpp" line="2339"/>
         <source>failed to re-open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2340"/>
+        <location filename="downloadmanager.cpp" line="2387"/>
         <source>Unable to write download to drive (return %1).
 Check the drive&apos;s available storage.
 
@@ -1977,22 +2102,22 @@ Right now the only case I know of where this needs to be overwritten is for the
 <context>
     <name>FilterList</name>
     <message>
-        <location filename="filterlist.cpp" line="223"/>
+        <location filename="filterlist.cpp" line="224"/>
         <source>Filter separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="225"/>
+        <location filename="filterlist.cpp" line="226"/>
         <source>Show separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="227"/>
+        <location filename="filterlist.cpp" line="228"/>
         <source>Hide separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="268"/>
+        <location filename="filterlist.cpp" line="269"/>
         <source>Contains %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2317,68 +2442,88 @@ Right now the only case I know of where this needs to be overwritten is for the
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="772"/>
+        <location filename="installationmanager.cpp" line="670"/>
+        <source>This Nexus category has not yet been mapped. Do you wish to proceed without setting a category, proceed and disable automatic Nexus mappings, or stop and configure your category mappings?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="installationmanager.cpp" line="674"/>
+        <source>&amp;Proceed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="installationmanager.cpp" line="675"/>
+        <source>&amp;Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="installationmanager.cpp" line="676"/>
+        <source>&amp;Stop &amp;&amp; Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="installationmanager.cpp" line="794"/>
         <source>Invalid file tree returned by plugin.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="819"/>
+        <location filename="installationmanager.cpp" line="841"/>
         <source>Installation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="820"/>
+        <location filename="installationmanager.cpp" line="842"/>
         <source>Something went wrong while installing this mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="844"/>
+        <location filename="installationmanager.cpp" line="866"/>
         <source>None of the available installer plugins were able to handle that archive.
 This is likely due to a corrupted or incompatible download or unrecognized archive format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="856"/>
+        <location filename="installationmanager.cpp" line="878"/>
         <source>no error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="859"/>
+        <location filename="installationmanager.cpp" line="881"/>
         <source>7z.dll not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="862"/>
+        <location filename="installationmanager.cpp" line="884"/>
         <source>7z.dll isn&apos;t valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="865"/>
+        <location filename="installationmanager.cpp" line="887"/>
         <source>archive not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="868"/>
+        <location filename="installationmanager.cpp" line="890"/>
         <source>failed to open archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="871"/>
+        <location filename="installationmanager.cpp" line="893"/>
         <source>unsupported archive type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="874"/>
+        <location filename="installationmanager.cpp" line="896"/>
         <source>internal library error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="877"/>
+        <location filename="installationmanager.cpp" line="899"/>
         <source>archive invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="881"/>
+        <location filename="installationmanager.cpp" line="903"/>
         <source>unknown archive error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3188,7 +3333,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwindow.ui" line="1253"/>
-        <location filename="mainwindow.cpp" line="1156"/>
+        <location filename="mainwindow.cpp" line="1161"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3446,7 +3591,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="mainwindow.ui" line="1823"/>
         <location filename="mainwindow.ui" line="1826"/>
-        <location filename="mainwindow.cpp" line="2855"/>
+        <location filename="mainwindow.cpp" line="2951"/>
         <source>Endorse Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3530,429 +3675,488 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="350"/>
+        <location filename="mainwindow.cpp" line="352"/>
         <source>Toolbar and Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
+        <location filename="mainwindow.cpp" line="354"/>
         <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="356"/>
         <source>Start Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="375"/>
+        <location filename="mainwindow.cpp" line="377"/>
         <source>There is no supported sort mechanism for this game. You will probably have to use a third-party tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="635"/>
+        <location filename="mainwindow.cpp" line="640"/>
         <source>Crash on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="636"/>
+        <location filename="mainwindow.cpp" line="641"/>
         <source>MO crashed while exiting.  Some settings may not be saved.
 
 Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="942"/>
+        <location filename="mainwindow.cpp" line="947"/>
         <source>There are notifications to read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="962"/>
+        <location filename="mainwindow.cpp" line="967"/>
         <source>There are no notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1063"/>
+        <location filename="mainwindow.cpp" line="1068"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1067"/>
+        <location filename="mainwindow.cpp" line="1072"/>
         <source>Won&apos;t Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1083"/>
+        <location filename="mainwindow.cpp" line="1088"/>
         <source>Help on UI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1087"/>
+        <location filename="mainwindow.cpp" line="1092"/>
         <source>Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1092"/>
-        <location filename="mainwindow.cpp" line="1260"/>
+        <location filename="mainwindow.cpp" line="1097"/>
+        <location filename="mainwindow.cpp" line="1265"/>
         <source>Game Support Wiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1097"/>
+        <location filename="mainwindow.cpp" line="1102"/>
         <source>Chat on Discord</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1101"/>
+        <location filename="mainwindow.cpp" line="1106"/>
         <source>Report Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1105"/>
+        <location filename="mainwindow.cpp" line="1110"/>
         <source>Tutorials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1147"/>
+        <location filename="mainwindow.cpp" line="1152"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1148"/>
+        <location filename="mainwindow.cpp" line="1153"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1157"/>
+        <location filename="mainwindow.cpp" line="1162"/>
         <source>Please enter a name for the new profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1165"/>
+        <location filename="mainwindow.cpp" line="1170"/>
         <source>failed to create profile: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1202"/>
+        <location filename="mainwindow.cpp" line="1207"/>
         <source>Show tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1203"/>
+        <location filename="mainwindow.cpp" line="1208"/>
         <source>You are starting Mod Organizer for the first time. Do you want to show a tutorial of its basic features? If you choose no you can always start the tutorial from the &quot;Help&quot; menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1208"/>
+        <location filename="mainwindow.cpp" line="1213"/>
         <source>Never ask to show tutorials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1266"/>
         <source>Do you know how to mod this game? Do you need to learn? There&apos;s a game support wiki available! Click OK to open the wiki. In the future, you can access this link from the &quot;Help&quot; menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1371"/>
+        <location filename="mainwindow.cpp" line="1275"/>
+        <source>Import Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1277"/>
+        <source>Please choose how to handle the default category setup.
+
+If you&apos;ve already connected to Nexus, you can automatically import Nexus categories for this game (if applicable). Otherwise, use the old Mod Organizer default category structure, or leave the categories blank.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1281"/>
+        <location filename="mainwindow.cpp" line="1319"/>
+        <source>&amp;Import Nexus Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1282"/>
+        <source>Use &amp;Default Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1283"/>
+        <source>Do &amp;Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1307"/>
+        <source>This is your first time running version 2.5 or higher with an old MO2 instance. The category system now relies on an updated system to map Nexus categories.
+
+In order to assign Nexus categories automatically, you will need to import the Nexus categories for the currently managed game and map them to your preferred category structure.
+
+You can either manually open the category editor, via the Settings dialog or the category filter sidebar, and set up the mappings as you see fit, or you can automatically import and map the categories as defined on Nexus.
+
+As a final option, you can disable Nexus category mapping altogether, which can be changed at any time in the Settings dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1320"/>
+        <source>&amp;Open Categories Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1321"/>
+        <source>&amp;Show Tutorial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1322"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1323"/>
+        <source>&amp;Don&apos;t show this again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1446"/>
         <source>Downloads in progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1372"/>
+        <location filename="mainwindow.cpp" line="1447"/>
         <source>There are still downloads in progress, do you really want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1431"/>
+        <location filename="mainwindow.cpp" line="1506"/>
         <source>Plugin &quot;%1&quot; failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1433"/>
+        <location filename="mainwindow.cpp" line="1508"/>
         <source>Plugin &quot;%1&quot; failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1800"/>
+        <location filename="mainwindow.cpp" line="1875"/>
         <source>&lt;Edit...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1811"/>
+        <location filename="mainwindow.cpp" line="1886"/>
         <source>(no executables)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1977"/>
+        <location filename="mainwindow.cpp" line="2052"/>
         <source>This bsa is enabled in the ini file so it may be required!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2028"/>
+        <location filename="mainwindow.cpp" line="2103"/>
         <source>Activating Network Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2122"/>
+        <location filename="mainwindow.cpp" line="2199"/>
         <source>Notice: Your current MO version (%1) is lower than the previously used one (%2). The GUI may not downgrade gracefully, so you may experience oddities. However, there should be no serious issues.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2268"/>
+        <location filename="mainwindow.cpp" line="2345"/>
         <source>Start Tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2269"/>
+        <location filename="mainwindow.cpp" line="2346"/>
         <source>You&apos;re about to start a tutorial. For technical reasons it&apos;s not possible to end the tutorial early. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2400"/>
+        <location filename="mainwindow.cpp" line="2485"/>
         <source>failed to change origin name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2430"/>
+        <location filename="mainwindow.cpp" line="2515"/>
         <source>failed to move &quot;%1&quot; from mod &quot;%2&quot; to &quot;%3&quot;: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2557"/>
+        <location filename="mainwindow.cpp" line="2642"/>
         <source>Open Game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2558"/>
+        <location filename="mainwindow.cpp" line="2643"/>
         <source>Open MyGames folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2559"/>
+        <location filename="mainwindow.cpp" line="2644"/>
         <source>Open INIs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2564"/>
+        <location filename="mainwindow.cpp" line="2649"/>
         <source>Open Instance folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2565"/>
+        <location filename="mainwindow.cpp" line="2650"/>
         <source>Open Mods folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2566"/>
+        <location filename="mainwindow.cpp" line="2651"/>
         <source>Open Profile folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2567"/>
+        <location filename="mainwindow.cpp" line="2652"/>
         <source>Open Downloads folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2573"/>
+        <location filename="mainwindow.cpp" line="2658"/>
         <source>Open MO2 Install folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2574"/>
+        <location filename="mainwindow.cpp" line="2659"/>
         <source>Open MO2 Plugins folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2575"/>
+        <location filename="mainwindow.cpp" line="2660"/>
         <source>Open MO2 Stylesheets folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2577"/>
+        <location filename="mainwindow.cpp" line="2662"/>
         <source>Open MO2 Logs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2657"/>
+        <location filename="mainwindow.cpp" line="2742"/>
         <source>Restart Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2659"/>
+        <location filename="mainwindow.cpp" line="2744"/>
         <source>Mod Organizer must restart to finish configuration changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2661"/>
+        <location filename="mainwindow.cpp" line="2746"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2663"/>
+        <location filename="mainwindow.cpp" line="2748"/>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2663"/>
+        <location filename="mainwindow.cpp" line="2748"/>
         <source>Some things might be weird.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2688"/>
+        <location filename="mainwindow.cpp" line="2773"/>
         <source>Can&apos;t change download directory while downloads are in progress!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2818"/>
+        <location filename="mainwindow.cpp" line="2914"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2856"/>
+        <location filename="mainwindow.cpp" line="2952"/>
         <source>Do you want to endorse Mod Organizer on %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2875"/>
+        <location filename="mainwindow.cpp" line="2971"/>
         <source>Abstain from Endorsing Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2876"/>
+        <location filename="mainwindow.cpp" line="2972"/>
         <source>Are you sure you want to abstain from endorsing Mod Organizer 2?
 You will have to visit the mod page on the %1 Nexus site to change your mind.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2904"/>
+        <location filename="mainwindow.cpp" line="3000"/>
         <source>Thank you for endorsing MO2! :)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2909"/>
+        <location filename="mainwindow.cpp" line="3005"/>
         <source>Please reconsider endorsing MO2 on Nexus!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3022"/>
+        <location filename="mainwindow.cpp" line="3118"/>
         <source>None of your %1 mods appear to have had recent file updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3035"/>
+        <location filename="mainwindow.cpp" line="3131"/>
         <source>All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3263"/>
+        <location filename="mainwindow.cpp" line="3359"/>
         <source>Thank you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3264"/>
+        <location filename="mainwindow.cpp" line="3360"/>
         <source>Thank you for your endorsement!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3362"/>
+        <location filename="mainwindow.cpp" line="3474"/>
         <source>Mod ID %1 no longer seems to be available on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3380"/>
+        <location filename="mainwindow.cpp" line="3492"/>
         <source>Error %1: Request to Nexus failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3397"/>
-        <location filename="mainwindow.cpp" line="3470"/>
+        <location filename="mainwindow.cpp" line="3509"/>
+        <location filename="mainwindow.cpp" line="3582"/>
         <source>failed to read %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3410"/>
+        <location filename="mainwindow.cpp" line="3522"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3411"/>
+        <location filename="mainwindow.cpp" line="3523"/>
         <source>failed to extract %1 (errorcode %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3445"/>
+        <location filename="mainwindow.cpp" line="3557"/>
         <source>Extract BSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3484"/>
+        <location filename="mainwindow.cpp" line="3596"/>
         <source>This archive contains invalid hashes. Some files may be broken.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3494"/>
+        <location filename="mainwindow.cpp" line="3606"/>
         <source>Extract...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3563"/>
+        <location filename="mainwindow.cpp" line="3675"/>
         <source>Remove &apos;%1&apos; from the toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3619"/>
+        <location filename="mainwindow.cpp" line="3731"/>
         <source>Backup of load order created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3630"/>
+        <location filename="mainwindow.cpp" line="3742"/>
         <source>Choose backup to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3647"/>
+        <location filename="mainwindow.cpp" line="3759"/>
         <source>No Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3648"/>
+        <location filename="mainwindow.cpp" line="3760"/>
         <source>There are no backups to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3672"/>
-        <location filename="mainwindow.cpp" line="3696"/>
+        <location filename="mainwindow.cpp" line="3784"/>
+        <location filename="mainwindow.cpp" line="3808"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3673"/>
-        <location filename="mainwindow.cpp" line="3697"/>
+        <location filename="mainwindow.cpp" line="3785"/>
+        <location filename="mainwindow.cpp" line="3809"/>
         <source>Failed to restore the backup. Errorcode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3685"/>
+        <location filename="mainwindow.cpp" line="3797"/>
         <source>Backup of mod list created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3765"/>
+        <location filename="mainwindow.cpp" line="3877"/>
         <source>A file with the same name has already been downloaded. What would you like to do?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3767"/>
+        <location filename="mainwindow.cpp" line="3879"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3768"/>
+        <location filename="mainwindow.cpp" line="3880"/>
         <source>Rename new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3769"/>
+        <location filename="mainwindow.cpp" line="3881"/>
         <source>Ignore file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4701,7 +4905,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListChangeCategoryMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="105"/>
+        <location filename="modlistcontextmenu.cpp" line="108"/>
         <source>Change Categories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4709,236 +4913,241 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListContextMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="234"/>
+        <location filename="modlistcontextmenu.cpp" line="237"/>
         <source>All Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="241"/>
+        <location filename="modlistcontextmenu.cpp" line="244"/>
         <source>Collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="242"/>
+        <location filename="modlistcontextmenu.cpp" line="245"/>
         <source>Collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="246"/>
+        <location filename="modlistcontextmenu.cpp" line="249"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="266"/>
+        <location filename="modlistcontextmenu.cpp" line="269"/>
         <source>Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="311"/>
+        <location filename="modlistcontextmenu.cpp" line="314"/>
         <source>Send to... </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="312"/>
+        <location filename="modlistcontextmenu.cpp" line="315"/>
         <source>Lowest priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="315"/>
+        <location filename="modlistcontextmenu.cpp" line="318"/>
         <source>Highest priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="318"/>
+        <location filename="modlistcontextmenu.cpp" line="321"/>
         <source>Priority...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="321"/>
+        <location filename="modlistcontextmenu.cpp" line="324"/>
         <source>Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="325"/>
+        <location filename="modlistcontextmenu.cpp" line="328"/>
         <source>First conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="330"/>
+        <location filename="modlistcontextmenu.cpp" line="333"/>
         <source>Last conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="360"/>
+        <location filename="modlistcontextmenu.cpp" line="363"/>
         <source>Sync to Mods...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="363"/>
+        <location filename="modlistcontextmenu.cpp" line="366"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="366"/>
+        <location filename="modlistcontextmenu.cpp" line="369"/>
         <source>Move content to Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="369"/>
+        <location filename="modlistcontextmenu.cpp" line="372"/>
         <source>Clear Overwrite...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="373"/>
-        <location filename="modlistcontextmenu.cpp" line="450"/>
-        <location filename="modlistcontextmenu.cpp" line="611"/>
+        <location filename="modlistcontextmenu.cpp" line="376"/>
+        <location filename="modlistcontextmenu.cpp" line="453"/>
+        <location filename="modlistcontextmenu.cpp" line="618"/>
         <source>Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="383"/>
+        <location filename="modlistcontextmenu.cpp" line="386"/>
         <source>Rename Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="386"/>
+        <location filename="modlistcontextmenu.cpp" line="389"/>
         <source>Remove Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="395"/>
-        <location filename="modlistcontextmenu.cpp" line="522"/>
+        <location filename="modlistcontextmenu.cpp" line="398"/>
+        <location filename="modlistcontextmenu.cpp" line="525"/>
         <source>Select Color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="400"/>
-        <location filename="modlistcontextmenu.cpp" line="526"/>
+        <location filename="modlistcontextmenu.cpp" line="403"/>
+        <location filename="modlistcontextmenu.cpp" line="529"/>
         <source>Reset Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="418"/>
+        <location filename="modlistcontextmenu.cpp" line="421"/>
         <source>Restore Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="421"/>
+        <location filename="modlistcontextmenu.cpp" line="424"/>
         <source>Remove Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="426"/>
-        <location filename="modlistcontextmenu.cpp" line="584"/>
+        <location filename="modlistcontextmenu.cpp" line="429"/>
+        <location filename="modlistcontextmenu.cpp" line="591"/>
         <source>Ignore missing data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="432"/>
-        <location filename="modlistcontextmenu.cpp" line="591"/>
+        <location filename="modlistcontextmenu.cpp" line="435"/>
+        <location filename="modlistcontextmenu.cpp" line="598"/>
         <source>Mark as converted/working</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="438"/>
-        <location filename="modlistcontextmenu.cpp" line="599"/>
+        <location filename="modlistcontextmenu.cpp" line="441"/>
+        <location filename="modlistcontextmenu.cpp" line="606"/>
         <source>Visit on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="445"/>
-        <location filename="modlistcontextmenu.cpp" line="606"/>
+        <location filename="modlistcontextmenu.cpp" line="448"/>
+        <location filename="modlistcontextmenu.cpp" line="613"/>
         <source>Visit on %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="463"/>
+        <location filename="modlistcontextmenu.cpp" line="466"/>
         <source>Change versioning scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="469"/>
+        <location filename="modlistcontextmenu.cpp" line="472"/>
         <source>Force-check updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="473"/>
+        <location filename="modlistcontextmenu.cpp" line="476"/>
         <source>Un-ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="478"/>
+        <location filename="modlistcontextmenu.cpp" line="481"/>
         <source>Ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="485"/>
+        <location filename="modlistcontextmenu.cpp" line="488"/>
         <source>Enable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="488"/>
+        <location filename="modlistcontextmenu.cpp" line="491"/>
         <source>Disable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="499"/>
+        <location filename="modlistcontextmenu.cpp" line="502"/>
         <source>Rename Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="502"/>
+        <location filename="modlistcontextmenu.cpp" line="505"/>
         <source>Reinstall Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="505"/>
+        <location filename="modlistcontextmenu.cpp" line="508"/>
         <source>Remove Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="508"/>
+        <location filename="modlistcontextmenu.cpp" line="511"/>
         <source>Create Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="514"/>
+        <location filename="modlistcontextmenu.cpp" line="517"/>
         <source>Restore hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="536"/>
+        <location filename="modlistcontextmenu.cpp" line="539"/>
         <source>Un-Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="541"/>
-        <location filename="modlistcontextmenu.cpp" line="549"/>
+        <location filename="modlistcontextmenu.cpp" line="544"/>
+        <location filename="modlistcontextmenu.cpp" line="552"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="544"/>
+        <location filename="modlistcontextmenu.cpp" line="547"/>
         <source>Won&apos;t endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="554"/>
+        <location filename="modlistcontextmenu.cpp" line="557"/>
         <source>Endorsement state unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="564"/>
+        <location filename="modlistcontextmenu.cpp" line="565"/>
+        <source>Remap Category (From Nexus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlistcontextmenu.cpp" line="571"/>
         <source>Start tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="569"/>
+        <location filename="modlistcontextmenu.cpp" line="576"/>
         <source>Stop tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="574"/>
+        <location filename="modlistcontextmenu.cpp" line="581"/>
         <source>Tracked state unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5032,11 +5241,16 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="97"/>
+        <source>Auto assign categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlistcontextmenu.cpp" line="100"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="98"/>
+        <location filename="modlistcontextmenu.cpp" line="101"/>
         <source>Export to csv...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5044,7 +5258,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListPrimaryCategoryMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="174"/>
+        <location filename="modlistcontextmenu.cpp" line="177"/>
         <source>Primary Category</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5099,313 +5313,313 @@ Please enter the name:</source>
 <context>
     <name>ModListViewActions</name>
     <message>
-        <location filename="modlistviewactions.cpp" line="98"/>
+        <location filename="modlistviewactions.cpp" line="100"/>
         <source>Choose Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="99"/>
+        <location filename="modlistviewactions.cpp" line="101"/>
         <source>Mod Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="119"/>
-        <location filename="modlistviewactions.cpp" line="1261"/>
+        <location filename="modlistviewactions.cpp" line="121"/>
+        <location filename="modlistviewactions.cpp" line="1297"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="120"/>
+        <location filename="modlistviewactions.cpp" line="122"/>
         <source>This will create an empty mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="130"/>
-        <location filename="modlistviewactions.cpp" line="1272"/>
+        <location filename="modlistviewactions.cpp" line="132"/>
+        <location filename="modlistviewactions.cpp" line="1308"/>
         <source>A mod with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="157"/>
+        <location filename="modlistviewactions.cpp" line="159"/>
         <source>Create Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="158"/>
+        <location filename="modlistviewactions.cpp" line="160"/>
         <source>This will create a new separator.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="167"/>
+        <location filename="modlistviewactions.cpp" line="169"/>
         <source>A separator with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="215"/>
+        <location filename="modlistviewactions.cpp" line="217"/>
         <source>Really enable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="215"/>
+        <location filename="modlistviewactions.cpp" line="217"/>
         <source>Really disable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="216"/>
-        <location filename="modlistviewactions.cpp" line="752"/>
-        <location filename="modlistviewactions.cpp" line="1001"/>
+        <location filename="modlistviewactions.cpp" line="218"/>
+        <location filename="modlistviewactions.cpp" line="773"/>
+        <location filename="modlistviewactions.cpp" line="1022"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="239"/>
-        <location filename="modlistviewactions.cpp" line="279"/>
+        <location filename="modlistviewactions.cpp" line="241"/>
+        <location filename="modlistviewactions.cpp" line="300"/>
         <source>You are not currently authenticated with Nexus. Please do so under Settings -&gt; Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="298"/>
+        <location filename="modlistviewactions.cpp" line="319"/>
         <source>Export to csv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="302"/>
+        <location filename="modlistviewactions.cpp" line="323"/>
         <source>CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.
 You can also use online editors and converters instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="307"/>
+        <location filename="modlistviewactions.cpp" line="328"/>
         <source>Select what mods you want export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="308"/>
+        <location filename="modlistviewactions.cpp" line="329"/>
         <source>All installed mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="310"/>
+        <location filename="modlistviewactions.cpp" line="331"/>
         <source>Only active (checked) mods from your current profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="312"/>
+        <location filename="modlistviewactions.cpp" line="333"/>
         <source>All currently visible mods in the mod list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="329"/>
+        <location filename="modlistviewactions.cpp" line="350"/>
         <source>Choose what Columns to export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="332"/>
+        <location filename="modlistviewactions.cpp" line="353"/>
         <source>Mod_Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="334"/>
+        <location filename="modlistviewactions.cpp" line="355"/>
         <source>Mod_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="336"/>
+        <location filename="modlistviewactions.cpp" line="357"/>
         <source>Notes_column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="337"/>
+        <location filename="modlistviewactions.cpp" line="358"/>
         <source>Mod_Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="339"/>
+        <location filename="modlistviewactions.cpp" line="360"/>
         <source>Primary_Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="340"/>
+        <location filename="modlistviewactions.cpp" line="361"/>
         <source>Nexus_ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="341"/>
+        <location filename="modlistviewactions.cpp" line="362"/>
         <source>Mod_Nexus_URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="342"/>
+        <location filename="modlistviewactions.cpp" line="363"/>
         <source>Mod_Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="343"/>
+        <location filename="modlistviewactions.cpp" line="364"/>
         <source>Install_Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="344"/>
+        <location filename="modlistviewactions.cpp" line="365"/>
         <source>Download_File_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="471"/>
+        <location filename="modlistviewactions.cpp" line="492"/>
         <source>export failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="525"/>
+        <location filename="modlistviewactions.cpp" line="546"/>
         <source>Failed to display overwrite dialog: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="586"/>
+        <location filename="modlistviewactions.cpp" line="607"/>
         <source>Set Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="587"/>
+        <location filename="modlistviewactions.cpp" line="608"/>
         <source>Set the priority of the selected mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="717"/>
+        <location filename="modlistviewactions.cpp" line="738"/>
         <source>failed to rename mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="753"/>
+        <location filename="modlistviewactions.cpp" line="774"/>
         <source>Remove the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="770"/>
+        <location filename="modlistviewactions.cpp" line="791"/>
         <source>failed to remove mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="798"/>
+        <location filename="modlistviewactions.cpp" line="819"/>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="799"/>
+        <location filename="modlistviewactions.cpp" line="820"/>
         <source>The versioning scheme decides which version is considered newer than another.
 This function will guess the versioning scheme under the assumption that the installed version is outdated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="825"/>
+        <location filename="modlistviewactions.cpp" line="846"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="826"/>
+        <location filename="modlistviewactions.cpp" line="847"/>
         <source>I don&apos;t know a versioning scheme where %1 is newer than %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="847"/>
+        <location filename="modlistviewactions.cpp" line="868"/>
         <source>Opening Nexus Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="848"/>
+        <location filename="modlistviewactions.cpp" line="869"/>
         <source>You are trying to open %1 links to Nexus Mods.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="871"/>
-        <location filename="modlistviewactions.cpp" line="893"/>
+        <location filename="modlistviewactions.cpp" line="892"/>
+        <location filename="modlistviewactions.cpp" line="914"/>
         <source>Opening Web Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="872"/>
-        <location filename="modlistviewactions.cpp" line="894"/>
+        <location filename="modlistviewactions.cpp" line="893"/>
+        <location filename="modlistviewactions.cpp" line="915"/>
         <source>You are trying to open %1 Web Pages.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="944"/>
-        <location filename="modlistviewactions.cpp" line="949"/>
-        <location filename="modlistviewactions.cpp" line="960"/>
+        <location filename="modlistviewactions.cpp" line="965"/>
+        <location filename="modlistviewactions.cpp" line="970"/>
+        <location filename="modlistviewactions.cpp" line="981"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="945"/>
+        <location filename="modlistviewactions.cpp" line="966"/>
         <source>Installation file no longer exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="950"/>
+        <location filename="modlistviewactions.cpp" line="971"/>
         <source>Mods installed with old versions of MO can&apos;t be reinstalled in this way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="960"/>
+        <location filename="modlistviewactions.cpp" line="981"/>
         <source>Failed to create backup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1002"/>
+        <location filename="modlistviewactions.cpp" line="1023"/>
         <source>Restore all hidden files in the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1035"/>
-        <location filename="modlistviewactions.cpp" line="1331"/>
+        <location filename="modlistviewactions.cpp" line="1056"/>
+        <location filename="modlistviewactions.cpp" line="1367"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1036"/>
+        <location filename="modlistviewactions.cpp" line="1057"/>
         <source>About to restore all hidden files in:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1069"/>
+        <location filename="modlistviewactions.cpp" line="1090"/>
         <source>Endorsing multiple mods will take a while. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1213"/>
+        <location filename="modlistviewactions.cpp" line="1249"/>
         <source>Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1214"/>
+        <location filename="modlistviewactions.cpp" line="1250"/>
         <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1218"/>
+        <location filename="modlistviewactions.cpp" line="1254"/>
         <source>failed to remove mod &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1224"/>
+        <location filename="modlistviewactions.cpp" line="1260"/>
         <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1243"/>
+        <location filename="modlistviewactions.cpp" line="1279"/>
         <source>Move successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1262"/>
+        <location filename="modlistviewactions.cpp" line="1298"/>
         <source>This will move all files from overwrite into a new, regular mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1332"/>
+        <location filename="modlistviewactions.cpp" line="1368"/>
         <source>About to recursively delete:
 </source>
         <translation type="unfinished"></translation>
@@ -5470,32 +5684,32 @@ Please enter a name:</source>
 <context>
     <name>NexusInterface</name>
     <message>
-        <location filename="nexusinterface.cpp" line="339"/>
+        <location filename="nexusinterface.cpp" line="353"/>
         <source>Please pick the mod ID for &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="805"/>
+        <location filename="nexusinterface.cpp" line="839"/>
         <source>You must authorize MO2 in Settings -&gt; Nexus to use the Nexus API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="814"/>
+        <location filename="nexusinterface.cpp" line="848"/>
         <source>You&apos;ve exceeded the Nexus API rate limit and requests are now being throttled. Your next batch of requests will be available in approximately %1 minutes and %2 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="895"/>
+        <location filename="nexusinterface.cpp" line="929"/>
         <source>Aborting download: Either you clicked on a premium-only link and your account is not premium, or the download link was generated by a different account than the one stored in Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1033"/>
+        <location filename="nexusinterface.cpp" line="1072"/>
         <source>empty response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1109"/>
+        <location filename="nexusinterface.cpp" line="1152"/>
         <source>invalid response</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5586,207 +5800,207 @@ Please enter a name:</source>
 <context>
     <name>OrganizerCore</name>
     <message>
-        <location filename="organizercore.cpp" line="197"/>
+        <location filename="organizercore.cpp" line="198"/>
         <source>File is write protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="199"/>
+        <location filename="organizercore.cpp" line="200"/>
         <source>Invalid file format (probably a bug)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="201"/>
+        <location filename="organizercore.cpp" line="202"/>
         <source>Unknown error %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="205"/>
+        <location filename="organizercore.cpp" line="206"/>
         <source>Failed to write settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="206"/>
+        <location filename="organizercore.cpp" line="207"/>
         <source>An error occurred trying to write back MO settings to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="360"/>
+        <location filename="organizercore.cpp" line="361"/>
         <source>Download started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="363"/>
+        <location filename="organizercore.cpp" line="364"/>
         <source>Download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="562"/>
+        <location filename="organizercore.cpp" line="563"/>
         <source>The selected profile &apos;%1&apos; does not exist. The profile &apos;%2&apos; will be used instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="742"/>
+        <location filename="organizercore.cpp" line="743"/>
         <source>Installation cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="743"/>
+        <location filename="organizercore.cpp" line="744"/>
         <source>Another installation is currently in progress.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="756"/>
+        <location filename="organizercore.cpp" line="757"/>
         <source>Installation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="788"/>
+        <location filename="organizercore.cpp" line="790"/>
         <source>Configure Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="789"/>
+        <location filename="organizercore.cpp" line="791"/>
         <source>This mod contains ini tweaks. Do you want to configure them now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="799"/>
+        <location filename="organizercore.cpp" line="801"/>
         <source>mod not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="807"/>
+        <location filename="organizercore.cpp" line="817"/>
         <source>Extraction cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="808"/>
+        <location filename="organizercore.cpp" line="818"/>
         <source>The installation was cancelled while extracting files. If this was prior to a FOMOD setup, this warning may be ignored. However, if this was during installation, the mod will likely be missing files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1031"/>
+        <location filename="organizercore.cpp" line="1043"/>
         <source>file not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1047"/>
+        <location filename="organizercore.cpp" line="1059"/>
         <source>failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1095"/>
+        <location filename="organizercore.cpp" line="1107"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1096"/>
+        <location filename="organizercore.cpp" line="1108"/>
         <source>Sorry, can&apos;t preview anything. This function currently does not support extracting from bsas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1107"/>
+        <location filename="organizercore.cpp" line="1119"/>
         <source>File &apos;%1&apos; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1115"/>
+        <location filename="organizercore.cpp" line="1127"/>
         <source>Failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1220"/>
+        <location filename="organizercore.cpp" line="1232"/>
         <source>Failed to refresh list of esps: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1328"/>
+        <location filename="organizercore.cpp" line="1340"/>
         <source>Multiple esps/esls activated, please check that they don&apos;t conflict.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1399"/>
+        <location filename="organizercore.cpp" line="1411"/>
         <source>You need to be logged in with Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1443"/>
+        <location filename="organizercore.cpp" line="1455"/>
         <source>Download?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1444"/>
+        <location filename="organizercore.cpp" line="1456"/>
         <source>A download has been started but no installed page plugin recognizes it.
 If you download anyway no information (i.e. version) will be associated with the download.
 Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1665"/>
-        <location filename="organizercore.cpp" line="1717"/>
+        <location filename="organizercore.cpp" line="1677"/>
+        <location filename="organizercore.cpp" line="1729"/>
         <source>failed to update mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1724"/>
-        <location filename="organizercore.cpp" line="1741"/>
+        <location filename="organizercore.cpp" line="1736"/>
+        <location filename="organizercore.cpp" line="1753"/>
         <source>login successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1750"/>
+        <location filename="organizercore.cpp" line="1762"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1751"/>
+        <location filename="organizercore.cpp" line="1763"/>
         <source>Login failed, try again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1759"/>
+        <location filename="organizercore.cpp" line="1771"/>
         <source>login failed: %1. Download will not be associated with an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1767"/>
+        <location filename="organizercore.cpp" line="1779"/>
         <source>login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1777"/>
+        <location filename="organizercore.cpp" line="1789"/>
         <source>login failed: %1. You need to log-in with Nexus to update MO.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1824"/>
+        <location filename="organizercore.cpp" line="1836"/>
         <source>MO1 &quot;Script Extender&quot; load mechanism has left hook.dll in your game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1828"/>
-        <location filename="organizercore.cpp" line="1849"/>
+        <location filename="organizercore.cpp" line="1840"/>
+        <location filename="organizercore.cpp" line="1861"/>
         <source>Description missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1837"/>
+        <location filename="organizercore.cpp" line="1849"/>
         <source>&lt;a href=&quot;%1&quot;&gt;hook.dll&lt;/a&gt; has been found in your game folder (right click to copy the full path). This is most likely a leftover of setting the ModOrganizer 1 load mechanism to &quot;Script Extender&quot;, in which case you must remove this file either by changing the load mechanism in ModOrganizer 1 or manually removing the file, otherwise the game is likely to crash and burn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1874"/>
+        <location filename="organizercore.cpp" line="1886"/>
         <source>failed to save load order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1946"/>
+        <location filename="organizercore.cpp" line="1958"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2026"/>
+        <location filename="organizercore.cpp" line="2038"/>
         <source>The designated write target &quot;%1&quot; is not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6007,92 +6221,97 @@ Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="242"/>
+        <location filename="pluginlist.cpp" line="246"/>
         <source>failed to update esp info for file %1 (source id: %2), error: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="400"/>
+        <location filename="pluginlist.cpp" line="405"/>
         <source>Plugin not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1238"/>
+        <location filename="pluginlist.cpp" line="1254"/>
         <source>Origin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1242"/>
+        <location filename="pluginlist.cpp" line="1258"/>
         <source>This plugin can&apos;t be disabled (enforced by the game).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1245"/>
+        <location filename="pluginlist.cpp" line="1262"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1250"/>
+        <location filename="pluginlist.cpp" line="1267"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1255"/>
+        <location filename="pluginlist.cpp" line="1272"/>
         <source>Missing Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1267"/>
+        <location filename="pluginlist.cpp" line="1284"/>
         <source>Enabled Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1273"/>
+        <location filename="pluginlist.cpp" line="1295"/>
         <source>Loads Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1277"/>
+        <location filename="pluginlist.cpp" line="1296"/>
         <source>There are Archives connected to this plugin. Their assets will be added to your game, overwriting in case of conflicts following the plugin order. Loose files will always overwrite assets from Archives. (This flag only checks for Archives from the same mod as the plugin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1286"/>
+        <location filename="pluginlist.cpp" line="1304"/>
         <source>Loads INI settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1289"/>
+        <location filename="pluginlist.cpp" line="1307"/>
         <source>There is an ini file connected to this plugin. Its settings will be added to your game settings, overwriting in case of conflicts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1295"/>
-        <source>This ESP is flagged as an ESL. It will adhere to the ESP load order but the records will be loaded in ESL space.</source>
+        <location filename="pluginlist.cpp" line="1314"/>
+        <source>This %1 is flagged as an ESL. It will adhere to the %1 load order but the records will be loaded in ESL space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1327"/>
+        <location filename="pluginlist.cpp" line="1320"/>
+        <source>This game does not currently permit custom plugin loading. There may be manual workarounds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pluginlist.cpp" line="1351"/>
         <source>Incompatible with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1333"/>
+        <location filename="pluginlist.cpp" line="1357"/>
         <source>Depends on missing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1341"/>
+        <location filename="pluginlist.cpp" line="1365"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1345"/>
+        <location filename="pluginlist.cpp" line="1369"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1618"/>
+        <location filename="pluginlist.cpp" line="1642"/>
         <source>failed to restore load order for %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6336,61 +6555,61 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="253"/>
+        <location filename="profile.cpp" line="277"/>
         <source>failed to write mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="264"/>
+        <location filename="profile.cpp" line="288"/>
         <source>failed to update tweaked ini file, wrong settings may be used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="286"/>
+        <location filename="profile.cpp" line="310"/>
         <source>failed to create tweaked ini: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="312"/>
+        <location filename="profile.cpp" line="336"/>
         <source>failed to open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="404"/>
+        <location filename="profile.cpp" line="428"/>
         <source>&quot;%1&quot; is missing or inaccessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="466"/>
-        <location filename="profile.cpp" line="504"/>
-        <location filename="profile.cpp" line="596"/>
-        <location filename="profile.cpp" line="654"/>
-        <location filename="profile.cpp" line="663"/>
+        <location filename="profile.cpp" line="490"/>
+        <location filename="profile.cpp" line="528"/>
+        <location filename="profile.cpp" line="620"/>
+        <location filename="profile.cpp" line="678"/>
+        <location filename="profile.cpp" line="687"/>
         <source>invalid mod index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="549"/>
+        <location filename="profile.cpp" line="573"/>
         <source>A mod named &quot;overwrite&quot; was detected, disabled, and moved to the highest priority on the mod list. You may want to rename this mod and enable it again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="838"/>
+        <location filename="profile.cpp" line="864"/>
         <source>Delete profile-specific save games?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="839"/>
+        <location filename="profile.cpp" line="865"/>
         <source>Do you want to delete the profile-specific save games? (If you select &quot;No&quot;, the save games will show up again if you re-enable profile-specific save games)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="873"/>
+        <location filename="profile.cpp" line="900"/>
         <source>Missing profile-specific game INI files!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="874"/>
+        <location filename="profile.cpp" line="901"/>
         <source>Some of your profile-specific game INI files were missing.  They will now be copied from the vanilla game folder.  You might want to double-check your settings.
 
 Missing files:
@@ -6398,12 +6617,12 @@ Missing files:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="893"/>
+        <location filename="profile.cpp" line="920"/>
         <source>Delete profile-specific game INI files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="894"/>
+        <location filename="profile.cpp" line="921"/>
         <source>Do you want to delete the profile-specific game INI files? (If you select &quot;No&quot;, the INI files will be used again if you re-enable profile-specific game INI files.)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6693,78 +6912,60 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="142"/>
-        <source>Failed to save custom categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="268"/>
-        <location filename="categories.cpp" line="314"/>
-        <location filename="categories.cpp" line="323"/>
-        <location filename="categories.cpp" line="391"/>
-        <source>invalid category index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="334"/>
+        <location filename="categories.cpp" line="422"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="337"/>
+        <location filename="categories.cpp" line="425"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="340"/>
+        <location filename="categories.cpp" line="428"/>
         <source>Has category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="343"/>
+        <location filename="categories.cpp" line="431"/>
         <source>Conflicted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="346"/>
+        <location filename="categories.cpp" line="434"/>
         <source>Has hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="349"/>
+        <location filename="categories.cpp" line="437"/>
         <source>Endorsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="352"/>
+        <location filename="categories.cpp" line="440"/>
         <source>Has backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="355"/>
+        <location filename="categories.cpp" line="443"/>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="358"/>
+        <location filename="categories.cpp" line="446"/>
         <source>Has valid game data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="361"/>
+        <location filename="categories.cpp" line="449"/>
         <source>Has Nexus ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="364"/>
+        <location filename="categories.cpp" line="452"/>
         <source>Tracked on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="categories.cpp" line="401"/>
-        <source>invalid category id: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="colortable.cpp" line="200"/>
         <source>Is overwritten (loose files)</source>
@@ -6796,25 +6997,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="289"/>
+        <location filename="commandline.cpp" line="290"/>
         <source>failed to start application: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="751"/>
+        <location filename="commandline.cpp" line="752"/>
         <source>Executable &apos;%1&apos; not found in instance &apos;%2&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="777"/>
+        <location filename="commandline.cpp" line="778"/>
         <source>Failed to run &apos;%1&apos;. The logs might have more information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="786"/>
+        <location filename="commandline.cpp" line="787"/>
         <source>Failed to run &apos;%1&apos;. The logs might have more information. %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="commandline.cpp" line="870"/>
+        <source>Download URL must start with https://</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="commandline.cpp" line="875"/>
+        <source>Download started</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="createinstancedialog.cpp" line="77"/>
         <source>Creating %1</source>
@@ -6834,7 +7045,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="createinstancedialogpages.cpp" line="37"/>
-        <location filename="createinstancedialogpages.cpp" line="1210"/>
+        <location filename="createinstancedialogpages.cpp" line="1234"/>
         <source>Instance type: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6844,81 +7055,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="293"/>
+        <location filename="createinstancedialogpages.cpp" line="299"/>
         <source>Find game installation for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="341"/>
+        <location filename="createinstancedialogpages.cpp" line="347"/>
         <source>Find game installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="390"/>
-        <location filename="createinstancedialogpages.cpp" line="677"/>
-        <location filename="createinstancedialogpages.cpp" line="678"/>
+        <location filename="createinstancedialogpages.cpp" line="396"/>
+        <location filename="createinstancedialogpages.cpp" line="683"/>
+        <location filename="createinstancedialogpages.cpp" line="684"/>
         <source>Unrecognized game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="392"/>
+        <location filename="createinstancedialogpages.cpp" line="398"/>
         <source>The folder %1 does not seem to contain a game Mod Organizer can manage.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="395"/>
+        <location filename="createinstancedialogpages.cpp" line="401"/>
         <source>See details for the list of supported games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="472"/>
+        <location filename="createinstancedialogpages.cpp" line="478"/>
         <source>No installation found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="543"/>
+        <location filename="createinstancedialogpages.cpp" line="549"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="544"/>
+        <location filename="createinstancedialogpages.cpp" line="550"/>
         <source>The folder must contain a valid game installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="655"/>
-        <location filename="createinstancedialogpages.cpp" line="656"/>
+        <location filename="createinstancedialogpages.cpp" line="661"/>
+        <location filename="createinstancedialogpages.cpp" line="662"/>
         <source>Microsoft Store game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="658"/>
+        <location filename="createinstancedialogpages.cpp" line="664"/>
         <source>The folder %1 seems to be a Microsoft Store game install.  Games installed through the Microsoft Store are not supported by Mod Organizer and will not work properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="664"/>
-        <location filename="createinstancedialogpages.cpp" line="686"/>
-        <location filename="createinstancedialogpages.cpp" line="712"/>
+        <location filename="createinstancedialogpages.cpp" line="670"/>
+        <location filename="createinstancedialogpages.cpp" line="692"/>
+        <location filename="createinstancedialogpages.cpp" line="718"/>
         <source>Use this folder for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="665"/>
+        <location filename="createinstancedialogpages.cpp" line="671"/>
         <source>Use this folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="666"/>
-        <location filename="createinstancedialogpages.cpp" line="687"/>
-        <location filename="createinstancedialogpages.cpp" line="713"/>
+        <location filename="createinstancedialogpages.cpp" line="672"/>
+        <location filename="createinstancedialogpages.cpp" line="693"/>
+        <location filename="createinstancedialogpages.cpp" line="719"/>
         <source>I know what I&apos;m doing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="667"/>
-        <location filename="createinstancedialogpages.cpp" line="688"/>
-        <location filename="createinstancedialogpages.cpp" line="714"/>
+        <location filename="createinstancedialogpages.cpp" line="673"/>
+        <location filename="createinstancedialogpages.cpp" line="694"/>
+        <location filename="createinstancedialogpages.cpp" line="720"/>
         <location filename="settingsdialognexus.cpp" line="270"/>
         <location filename="settingsdialognexus.cpp" line="277"/>
         <location filename="settingsdialogworkarounds.cpp" line="142"/>
@@ -6934,69 +7145,103 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="680"/>
+        <location filename="createinstancedialogpages.cpp" line="686"/>
         <source>The folder %1 does not seem to contain an installation for &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%2&lt;/span&gt; or for any other game Mod Organizer can manage.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="699"/>
-        <location filename="createinstancedialogpages.cpp" line="700"/>
+        <location filename="createinstancedialogpages.cpp" line="705"/>
+        <location filename="createinstancedialogpages.cpp" line="706"/>
         <source>Incorrect game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="702"/>
+        <location filename="createinstancedialogpages.cpp" line="708"/>
         <source>The folder %1 seems to contain an installation for &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%2&lt;/span&gt;, not &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%3&lt;/span&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="710"/>
+        <location filename="createinstancedialogpages.cpp" line="716"/>
         <source>Manage %1 instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1212"/>
+        <location filename="createinstancedialogpages.cpp" line="1236"/>
         <source>Instance location: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1215"/>
+        <location filename="createinstancedialogpages.cpp" line="1239"/>
         <source>Instance name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1221"/>
-        <location filename="createinstancedialogpages.cpp" line="1225"/>
+        <location filename="createinstancedialogpages.cpp" line="1242"/>
+        <source>Profile settings:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1244"/>
+        <source>  Local INIs: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1245"/>
+        <location filename="createinstancedialogpages.cpp" line="1248"/>
+        <location filename="createinstancedialogpages.cpp" line="1250"/>
+        <source>yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1245"/>
+        <location filename="createinstancedialogpages.cpp" line="1248"/>
+        <location filename="createinstancedialogpages.cpp" line="1251"/>
+        <source>no</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1247"/>
+        <source>  Local Saves: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1249"/>
+        <source>  Automatic Archive Invalidation: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="createinstancedialogpages.cpp" line="1256"/>
+        <location filename="createinstancedialogpages.cpp" line="1260"/>
         <source>Base directory: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1226"/>
+        <location filename="createinstancedialogpages.cpp" line="1261"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1227"/>
+        <location filename="createinstancedialogpages.cpp" line="1262"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1228"/>
+        <location filename="createinstancedialogpages.cpp" line="1263"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1229"/>
+        <location filename="createinstancedialogpages.cpp" line="1264"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1238"/>
+        <location filename="createinstancedialogpages.cpp" line="1273"/>
         <source>Game: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1239"/>
+        <location filename="createinstancedialogpages.cpp" line="1274"/>
         <source>Game location: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7138,7 +7383,7 @@ Destination:<byte value="xd"/>
     <message>
         <location filename="loglist.cpp" line="384"/>
         <location filename="loot.cpp" line="396"/>
-        <location filename="organizercore.cpp" line="388"/>
+        <location filename="organizercore.cpp" line="389"/>
         <location filename="settingsdialogdiagnostics.cpp" line="37"/>
         <location filename="settingsdialogdiagnostics.cpp" line="63"/>
         <location filename="settingsdialogpaths.cpp" line="100"/>
@@ -7150,7 +7395,7 @@ Destination:<byte value="xd"/>
     </message>
     <message>
         <location filename="loglist.cpp" line="385"/>
-        <location filename="organizercore.cpp" line="389"/>
+        <location filename="organizercore.cpp" line="390"/>
         <source>Failed to create &quot;%1&quot;. Your user account probably lacks permission.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7257,23 +7502,23 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1255"/>
+        <location filename="mainwindow.cpp" line="1260"/>
         <source>Please use &quot;Help&quot; from the toolbar to get usage instructions to all elements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1526"/>
+        <location filename="mainwindow.cpp" line="1601"/>
         <source>Visit %1 on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1742"/>
-        <location filename="mainwindow.cpp" line="2790"/>
+        <location filename="mainwindow.cpp" line="1817"/>
+        <location filename="mainwindow.cpp" line="2886"/>
         <source>&lt;Manage...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1754"/>
+        <location filename="mainwindow.cpp" line="1829"/>
         <source>failed to parse profile %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7411,7 +7656,7 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="407"/>
+        <location filename="organizercore.cpp" line="408"/>
         <source>One of the configured MO2 directories (profiles, mods, or overwrite) is on a path containing a symbolic (or other) link. This is likely to be incompatible with MO2&apos;s virtual filesystem.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7421,12 +7666,12 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="699"/>
+        <location filename="pluginlist.cpp" line="708"/>
         <source>failed to access %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="713"/>
+        <location filename="pluginlist.cpp" line="722"/>
         <source>failed to set file time %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7479,19 +7724,19 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1367"/>
-        <location filename="settings.cpp" line="1391"/>
-        <location filename="settings.cpp" line="1439"/>
+        <location filename="settings.cpp" line="1397"/>
+        <location filename="settings.cpp" line="1421"/>
+        <location filename="settings.cpp" line="1469"/>
         <source>attempt to store setting for unknown plugin &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1927"/>
+        <location filename="settings.cpp" line="1967"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1928"/>
+        <location filename="settings.cpp" line="1968"/>
         <source>Failed to start the helper application: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7528,12 +7773,12 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="161"/>
+        <location filename="settingsdialoggeneral.cpp" line="171"/>
         <source>Confirm?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="162"/>
+        <location filename="settingsdialoggeneral.cpp" line="172"/>
         <source>This will reset all the choices you made to dialogs and make them all visible again. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7552,26 +7797,26 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="440"/>
-        <location filename="settingsdialognexus.cpp" line="441"/>
         <location filename="settingsdialognexus.cpp" line="442"/>
         <location filename="settingsdialognexus.cpp" line="443"/>
         <location filename="settingsdialognexus.cpp" line="444"/>
+        <location filename="settingsdialognexus.cpp" line="445"/>
+        <location filename="settingsdialognexus.cpp" line="446"/>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="456"/>
+        <location filename="settingsdialognexus.cpp" line="458"/>
         <source>Executables (*.exe)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="456"/>
+        <location filename="settingsdialognexus.cpp" line="458"/>
         <source>All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="459"/>
+        <location filename="settingsdialognexus.cpp" line="461"/>
         <source>Select the browser executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7954,17 +8199,17 @@ You can restart Mod Organizer as administrator and try launching the program aga
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="47"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="46"/>
         <source>%1, #%2, Level %3, %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="100"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="99"/>
         <source>failed to open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="109"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="108"/>
         <source>wrong file format - expected %1 got %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8455,128 +8700,148 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="settingsdialog.ui" line="210"/>
+        <source>Profile Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="216"/>
+        <source>Local INIs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="223"/>
+        <source>Local Saves</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="230"/>
+        <source>Automatic Archive Invalidation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="240"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="228"/>
-        <location filename="settingsdialog.ui" line="231"/>
+        <location filename="settingsdialog.ui" line="258"/>
+        <location filename="settingsdialog.ui" line="261"/>
         <source>Dialogs will always be centered on the main window, but will remember their size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="234"/>
+        <location filename="settingsdialog.ui" line="264"/>
         <source>Always center dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="241"/>
+        <location filename="settingsdialog.ui" line="271"/>
         <source>Show confirmation when changing instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="248"/>
-        <location filename="settingsdialog.ui" line="251"/>
+        <location filename="settingsdialog.ui" line="278"/>
+        <location filename="settingsdialog.ui" line="281"/>
         <source>Show the menubar when the Alt key is pressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="254"/>
+        <location filename="settingsdialog.ui" line="284"/>
         <source>Show menubar when pressing Alt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="261"/>
+        <location filename="settingsdialog.ui" line="291"/>
         <source>Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="264"/>
+        <location filename="settingsdialog.ui" line="294"/>
         <source>Open previews on double-click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="295"/>
-        <location filename="settingsdialog.ui" line="298"/>
+        <location filename="settingsdialog.ui" line="325"/>
+        <location filename="settingsdialog.ui" line="328"/>
         <source>Reset all choices made in dialogs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="301"/>
+        <location filename="settingsdialog.ui" line="331"/>
         <source>Reset Dialog Choices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="308"/>
-        <location filename="settingsdialog.ui" line="311"/>
+        <location filename="settingsdialog.ui" line="338"/>
+        <location filename="settingsdialog.ui" line="341"/>
         <source>Modify the categories available to arrange your mods.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="314"/>
+        <location filename="settingsdialog.ui" line="344"/>
         <source>Configure Mod Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="355"/>
+        <location filename="settingsdialog.ui" line="385"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="361"/>
+        <location filename="settingsdialog.ui" line="391"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="370"/>
-        <location filename="settingsdialog.ui" line="373"/>
+        <location filename="settingsdialog.ui" line="400"/>
+        <location filename="settingsdialog.ui" line="403"/>
         <source>Visual theme of the user interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="380"/>
+        <location filename="settingsdialog.ui" line="410"/>
         <source>Explore...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="405"/>
+        <location filename="settingsdialog.ui" line="435"/>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="457"/>
-        <location filename="settingsdialog.ui" line="460"/>
+        <location filename="settingsdialog.ui" line="487"/>
+        <location filename="settingsdialog.ui" line="490"/>
         <source>Reset all colors to their default value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="463"/>
+        <location filename="settingsdialog.ui" line="493"/>
         <source>Reset Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="482"/>
+        <location filename="settingsdialog.ui" line="512"/>
         <source>Mod List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="503"/>
-        <location filename="settingsdialog.ui" line="506"/>
+        <location filename="settingsdialog.ui" line="533"/>
+        <location filename="settingsdialog.ui" line="536"/>
         <source>Colors set on separators will also be shown in the mod list scrollbar at the location of the separator. This can be useful for quickly navigating to a specific separator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="509"/>
+        <location filename="settingsdialog.ui" line="539"/>
         <source>Show mod list separator colors on the scrollbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="519"/>
+        <location filename="settingsdialog.ui" line="549"/>
         <source>Disable this to no longer display mods installed outside MO in the mod list (left pane). Assets from those mods will then be treated as having lowest mod priority together with the original game content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="522"/>
+        <location filename="settingsdialog.ui" line="552"/>
         <source>By default Mod Organizer will display esp+bsa bundles installed with foreign tools as mods (left pane). This allows you to control their priority in relation to other mods. This is particularly useful if you also use Steam Workshop to install mods.
 However, if you installed loose file mods outside MO which conflict with BSAs also installed outside MO those conflicts can&apos;t be resolved correctly.
 
@@ -8584,447 +8849,452 @@ If you disable this feature, MO will only display official DLCs this way. Please
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="528"/>
+        <location filename="settingsdialog.ui" line="558"/>
         <source>Display mods installed outside MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="538"/>
-        <location filename="settingsdialog.ui" line="541"/>
+        <location filename="settingsdialog.ui" line="568"/>
+        <location filename="settingsdialog.ui" line="571"/>
         <source>Save the current filters when closing MO2 and restore them on startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="544"/>
+        <location filename="settingsdialog.ui" line="574"/>
         <source>Remember selected filters after restarting MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="551"/>
-        <location filename="settingsdialog.ui" line="554"/>
+        <location filename="settingsdialog.ui" line="581"/>
+        <location filename="settingsdialog.ui" line="584"/>
         <source>Check if updates are available for mods after installing them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="557"/>
+        <location filename="settingsdialog.ui" line="587"/>
         <source>Check for updates when installing mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="567"/>
-        <location filename="settingsdialog.ui" line="570"/>
+        <location filename="settingsdialog.ui" line="597"/>
+        <location filename="settingsdialog.ui" line="600"/>
         <source>Automatically collapse separators, categories or nexus ids after a delay when hovering them during drag.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="573"/>
+        <location filename="settingsdialog.ui" line="603"/>
         <source>Automatically collapse items during drag on hover</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="599"/>
+        <location filename="settingsdialog.ui" line="629"/>
         <source>Collapsible Separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="619"/>
-        <location filename="settingsdialog.ui" line="622"/>
+        <location filename="settingsdialog.ui" line="649"/>
+        <location filename="settingsdialog.ui" line="652"/>
         <source>Highlight collapsed separators based on conflicts and plugins from mods inside them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="625"/>
+        <location filename="settingsdialog.ui" line="655"/>
         <source>on separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="635"/>
+        <location filename="settingsdialog.ui" line="665"/>
         <source>Enable when sorting by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="642"/>
+        <location filename="settingsdialog.ui" line="672"/>
         <source>Show conflicts and plugins </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="649"/>
-        <location filename="settingsdialog.ui" line="652"/>
+        <location filename="settingsdialog.ui" line="679"/>
+        <location filename="settingsdialog.ui" line="682"/>
         <source>When selecting a collapsed separator, highlight conflicting mods and plugins from mods inside the separator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="655"/>
+        <location filename="settingsdialog.ui" line="685"/>
         <source>from separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="665"/>
+        <location filename="settingsdialog.ui" line="695"/>
         <source>ascending priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="675"/>
+        <location filename="settingsdialog.ui" line="705"/>
         <source>descending  priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="682"/>
+        <location filename="settingsdialog.ui" line="712"/>
         <source>Show icons on separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="704"/>
+        <location filename="settingsdialog.ui" line="734"/>
         <source>conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="714"/>
+        <location filename="settingsdialog.ui" line="744"/>
         <source>flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="724"/>
+        <location filename="settingsdialog.ui" line="754"/>
         <source>content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="734"/>
+        <location filename="settingsdialog.ui" line="764"/>
         <source>version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="762"/>
-        <location filename="settingsdialog.ui" line="765"/>
+        <location filename="settingsdialog.ui" line="792"/>
+        <location filename="settingsdialog.ui" line="795"/>
         <source>Do not share the collapse/expanded state of separators between profiles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="768"/>
+        <location filename="settingsdialog.ui" line="798"/>
         <source>Profile-specific collapse states for separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="792"/>
+        <location filename="settingsdialog.ui" line="822"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="800"/>
-        <location filename="settingsdialog.ui" line="817"/>
-        <location filename="settingsdialog.ui" line="914"/>
-        <location filename="settingsdialog.ui" line="972"/>
-        <location filename="settingsdialog.ui" line="1941"/>
+        <location filename="settingsdialog.ui" line="830"/>
+        <location filename="settingsdialog.ui" line="847"/>
+        <location filename="settingsdialog.ui" line="944"/>
+        <location filename="settingsdialog.ui" line="1002"/>
+        <location filename="settingsdialog.ui" line="1981"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="827"/>
+        <location filename="settingsdialog.ui" line="857"/>
         <source>Caches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="834"/>
+        <location filename="settingsdialog.ui" line="864"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="841"/>
-        <location filename="settingsdialog.ui" line="844"/>
+        <location filename="settingsdialog.ui" line="871"/>
+        <location filename="settingsdialog.ui" line="874"/>
         <source>Directory where downloads are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="861"/>
+        <location filename="settingsdialog.ui" line="891"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="881"/>
+        <location filename="settingsdialog.ui" line="911"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="904"/>
+        <location filename="settingsdialog.ui" line="934"/>
         <source>Directory where mods are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="907"/>
+        <location filename="settingsdialog.ui" line="937"/>
         <source>Directory where mods are stored. Please note that changing this will break all associations of profiles with mods that don&apos;t exist in the new location (with the same name).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="931"/>
+        <location filename="settingsdialog.ui" line="961"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="951"/>
+        <location filename="settingsdialog.ui" line="981"/>
         <source>Managed Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="958"/>
+        <location filename="settingsdialog.ui" line="988"/>
         <source>Base Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="965"/>
+        <location filename="settingsdialog.ui" line="995"/>
         <source>Use %BASE_DIR% to refer to the Base Directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="994"/>
+        <location filename="settingsdialog.ui" line="1024"/>
         <source> All directories must be writable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1002"/>
+        <location filename="settingsdialog.ui" line="1032"/>
         <source>Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1050"/>
+        <location filename="settingsdialog.ui" line="1080"/>
         <source>Nexus Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1059"/>
+        <location filename="settingsdialog.ui" line="1089"/>
         <source>User ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1076"/>
+        <location filename="settingsdialog.ui" line="1106"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1090"/>
+        <location filename="settingsdialog.ui" line="1120"/>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1107"/>
+        <location filename="settingsdialog.ui" line="1137"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1116"/>
+        <location filename="settingsdialog.ui" line="1146"/>
         <source>Daily requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1130"/>
+        <location filename="settingsdialog.ui" line="1160"/>
         <source>Hourly requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1149"/>
+        <location filename="settingsdialog.ui" line="1179"/>
         <source>Nexus Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1170"/>
+        <location filename="settingsdialog.ui" line="1200"/>
         <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1177"/>
+        <location filename="settingsdialog.ui" line="1207"/>
         <source>Manually enter the API key and try to login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1180"/>
+        <location filename="settingsdialog.ui" line="1210"/>
         <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1187"/>
+        <location filename="settingsdialog.ui" line="1217"/>
         <source>Clear the stored Nexus API key and force reauthorization.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1190"/>
+        <location filename="settingsdialog.ui" line="1220"/>
         <source>Disconnect from Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1263"/>
-        <location filename="settingsdialog.ui" line="1728"/>
+        <location filename="settingsdialog.ui" line="1293"/>
+        <location filename="settingsdialog.ui" line="1768"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1296"/>
+        <location filename="settingsdialog.ui" line="1326"/>
         <source>Endorsement Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1306"/>
+        <location filename="settingsdialog.ui" line="1336"/>
         <source>Tracked Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1316"/>
-        <location filename="settingsdialog.ui" line="1319"/>
+        <location filename="settingsdialog.ui" line="1346"/>
+        <source>Use Nexus category mappings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="1356"/>
+        <location filename="settingsdialog.ui" line="1359"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, a counter is displayed in the bottom right corner.  This informs the user of their remaining API requests.  The Nexus API becomes unusable once these API requests run out.  Checking this option will hide that counter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1322"/>
+        <location filename="settingsdialog.ui" line="1362"/>
         <source>Hide API Request Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1347"/>
+        <location filename="settingsdialog.ui" line="1387"/>
         <source>Associate with &quot;Download with manager&quot; links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1354"/>
+        <location filename="settingsdialog.ui" line="1394"/>
         <source>Remove cache and cookies.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1357"/>
+        <location filename="settingsdialog.ui" line="1397"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1370"/>
+        <location filename="settingsdialog.ui" line="1410"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1393"/>
+        <location filename="settingsdialog.ui" line="1433"/>
         <source>Known Servers (updated on download)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1414"/>
+        <location filename="settingsdialog.ui" line="1454"/>
         <source>Preferred Servers (Drag &amp; Drop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1441"/>
+        <location filename="settingsdialog.ui" line="1481"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1542"/>
+        <location filename="settingsdialog.ui" line="1582"/>
         <source>Author:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1562"/>
+        <location filename="settingsdialog.ui" line="1602"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1582"/>
+        <location filename="settingsdialog.ui" line="1622"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1605"/>
+        <location filename="settingsdialog.ui" line="1645"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1634"/>
+        <location filename="settingsdialog.ui" line="1674"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1639"/>
+        <location filename="settingsdialog.ui" line="1679"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1647"/>
+        <location filename="settingsdialog.ui" line="1687"/>
         <source>No plugin found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1668"/>
+        <location filename="settingsdialog.ui" line="1708"/>
         <source>Blacklisted Plugins (use &lt;del&gt; to remove):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1682"/>
+        <location filename="settingsdialog.ui" line="1722"/>
         <source>Workarounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1746"/>
+        <location filename="settingsdialog.ui" line="1786"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1749"/>
+        <location filename="settingsdialog.ui" line="1789"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)
 Uncheck this if you want to use Mod Organizer with total conversions (like Nehrim) but be aware that the game will crash if required files are not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1753"/>
+        <location filename="settingsdialog.ui" line="1793"/>
         <source>Force-enable game files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1763"/>
+        <location filename="settingsdialog.ui" line="1803"/>
         <source>Enable parsing of Archives. This is an Experimental Feature. Has negative effects on performance and known incorrectness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1766"/>
+        <location filename="settingsdialog.ui" line="1806"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, MO will parse archive files (BSA, BA2) to calculate conflicts between the contents of the archive files and other loose files. This process has a noticeable cost in performance.&lt;/p&gt;&lt;p&gt;This feature should not be confused with the archive management feature offered by MO1. MO2 will only show conflicts with archives and will NOT load them into the game or program.&lt;/p&gt;&lt;p&gt;If you disable this feature, MO will only display conflicts between loose files.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1769"/>
+        <location filename="settingsdialog.ui" line="1809"/>
         <source>Enable archives parsing (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1779"/>
-        <location filename="settingsdialog.ui" line="1782"/>
+        <location filename="settingsdialog.ui" line="1819"/>
+        <location filename="settingsdialog.ui" line="1822"/>
         <source>Disable this to prevent the GUI from being locked when running an executable.  This may result in abnormal behavior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1785"/>
+        <location filename="settingsdialog.ui" line="1825"/>
         <source>Lock GUI when running executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1798"/>
+        <location filename="settingsdialog.ui" line="1838"/>
         <source>Steam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1807"/>
+        <location filename="settingsdialog.ui" line="1847"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1821"/>
+        <location filename="settingsdialog.ui" line="1861"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1828"/>
+        <location filename="settingsdialog.ui" line="1868"/>
         <source>Steam App ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1835"/>
+        <location filename="settingsdialog.ui" line="1875"/>
         <source>The Steam AppID for your game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1838"/>
+        <location filename="settingsdialog.ui" line="1878"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -9040,68 +9310,68 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1865"/>
+        <location filename="settingsdialog.ui" line="1905"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1871"/>
+        <location filename="settingsdialog.ui" line="1911"/>
         <source>Disable automatic internet features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1874"/>
+        <location filename="settingsdialog.ui" line="1914"/>
         <source>Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1877"/>
+        <location filename="settingsdialog.ui" line="1917"/>
         <source>Offline Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1884"/>
+        <location filename="settingsdialog.ui" line="1924"/>
         <source>Use a proxy for network connections.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1887"/>
+        <location filename="settingsdialog.ui" line="1927"/>
         <source>Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1890"/>
+        <location filename="settingsdialog.ui" line="1930"/>
         <source>Use System HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1912"/>
-        <location filename="settingsdialog.ui" line="1915"/>
-        <location filename="settingsdialog.ui" line="1918"/>
-        <location filename="settingsdialog.ui" line="1928"/>
-        <location filename="settingsdialog.ui" line="1931"/>
-        <location filename="settingsdialog.ui" line="1934"/>
+        <location filename="settingsdialog.ui" line="1952"/>
+        <location filename="settingsdialog.ui" line="1955"/>
+        <location filename="settingsdialog.ui" line="1958"/>
+        <location filename="settingsdialog.ui" line="1968"/>
+        <location filename="settingsdialog.ui" line="1971"/>
+        <location filename="settingsdialog.ui" line="1974"/>
         <source>Use &quot;%1&quot; as a placeholder for the URL.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1921"/>
+        <location filename="settingsdialog.ui" line="1961"/>
         <source>Custom browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1969"/>
-        <location filename="settingsdialog.ui" line="1972"/>
+        <location filename="settingsdialog.ui" line="2009"/>
+        <location filename="settingsdialog.ui" line="2012"/>
         <source>Resets the window geometries for all windows.  This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1975"/>
+        <location filename="settingsdialog.ui" line="2015"/>
         <source>Reset Window Geometries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1982"/>
+        <location filename="settingsdialog.ui" line="2022"/>
         <source>Add executables to the blacklist to prevent them from
 accessing the virtual file system. This is useful to prevent
 unintended programs from being hooked. Hooking unintended
@@ -9110,54 +9380,54 @@ programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1989"/>
+        <location filename="settingsdialog.ui" line="2029"/>
         <source>Add executables to the blacklist to prevent them from accessing the virtual file system.  This is useful to prevent unintended programs from being hooked.  Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1992"/>
+        <location filename="settingsdialog.ui" line="2032"/>
         <source>Executables Blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2002"/>
-        <location filename="settingsdialog.ui" line="2006"/>
+        <location filename="settingsdialog.ui" line="2042"/>
+        <location filename="settingsdialog.ui" line="2046"/>
         <source>For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles.
 For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2010"/>
+        <location filename="settingsdialog.ui" line="2050"/>
         <source>Back-date BSAs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2054"/>
+        <location filename="settingsdialog.ui" line="2094"/>
         <source>These are workarounds for problems with Mod Organizer. Please make sure you read the help text before changing anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2065"/>
+        <location filename="settingsdialog.ui" line="2105"/>
         <source>Diagnostics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2074"/>
+        <location filename="settingsdialog.ui" line="2114"/>
         <source>Logs and Crashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2083"/>
+        <location filename="settingsdialog.ui" line="2123"/>
         <source>Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2090"/>
+        <location filename="settingsdialog.ui" line="2130"/>
         <source>Decides the amount of data printed to &quot;ModOrganizer.log&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2093"/>
+        <location filename="settingsdialog.ui" line="2133"/>
         <source>
                                     Decides the amount of data printed to &quot;ModOrganizer.log&quot;.
                                     &quot;Debug&quot; produces very useful information for finding problems. There is usually no noteworthy performance impact but the file may become rather large. If this is a problem you may prefer the &quot;Info&quot; level for regular use. On the &quot;Error&quot; level the log file usually remains empty.
@@ -9165,17 +9435,17 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2103"/>
+        <location filename="settingsdialog.ui" line="2143"/>
         <source>Crash Dumps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2110"/>
+        <location filename="settingsdialog.ui" line="2150"/>
         <source>Decides which type of crash dumps are collected when injected processes crash.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2113"/>
+        <location filename="settingsdialog.ui" line="2153"/>
         <source>
                                     Decides which type of crash dumps are collected when injected processes crash.
                                     &quot;None&quot; Disables the generation of crash dumps by MO.
@@ -9186,17 +9456,17 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2126"/>
+        <location filename="settingsdialog.ui" line="2166"/>
         <source>Max Dumps To Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2133"/>
+        <location filename="settingsdialog.ui" line="2173"/>
         <source>Maximum number of crash dumps to keep on disk. Use 0 for unlimited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2136"/>
+        <location filename="settingsdialog.ui" line="2176"/>
         <source>
                                     Maximum number of crash dumps to keep on disk. Use 0 for unlimited.
                                     Set &quot;Crash Dumps&quot; above to None to disable crash dump collection.
@@ -9204,22 +9474,22 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2149"/>
+        <location filename="settingsdialog.ui" line="2189"/>
         <source>Integrated LOOT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2158"/>
+        <location filename="settingsdialog.ui" line="2198"/>
         <source>LOOT Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2171"/>
+        <location filename="settingsdialog.ui" line="2211"/>
         <source>Hint: right click link and copy link location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2174"/>
+        <location filename="settingsdialog.ui" line="2214"/>
         <source>
                             Logs and crash dumps are stored under your current instance in the &lt;a href=&quot;LOGS_FULL_PATH&quot;&gt;LOGS_DIR&lt;/a&gt;
                             and &lt;a href=&quot;DUMPS_FULL_PATH&quot;&gt;DUMPS_DIR&lt;/a&gt; folders.
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index e3d1ff293..3781a4e1f 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1,4 +1,5 @@
 #include "organizercore.h"
+#include "categoriesdialog.h"
 #include "credentialsdialog.h"
 #include "delayedfilewriter.h"
 #include "directoryrefresher.h"
@@ -759,8 +760,9 @@ OrganizerCore::doInstall(const QString& archivePath, GuessedValue<QString> modNa
     // this prevents issue with third-party plugins, e.g., if the installed mod is
     // activated before the structure is ready
     //
-    // we need to fetch modIndex() within the call back because the index is only valid
-    // after the call to refresh(), but we do not want to connect after refresh()
+    // we need to fetch modIndex() within the call back because the index is only
+    // valid after the call to refresh(), but we do not want to connect after
+    // refresh()
     //
     connect(
         this, &OrganizerCore::directoryStructureReady, this,
@@ -801,16 +803,26 @@ OrganizerCore::doInstall(const QString& archivePath, GuessedValue<QString> modNa
     emit modInstalled(modName);
     return {modIndex, modInfo};
   } else {
-    m_InstallationManager.notifyInstallationEnd(result, nullptr);
-    if (m_InstallationManager.wasCancelled()) {
-      QMessageBox::information(
-          qApp->activeWindow(), tr("Extraction cancelled"),
-          tr("The installation was cancelled while extracting files. "
-             "If this was prior to a FOMOD setup, this warning may be ignored. "
-             "However, if this was during installation, the mod will likely be missing "
-             "files."),
-          QMessageBox::Ok);
-      refresh();
+    if (result.result() == MOBase::IPluginInstaller::RESULT_CATEGORYREQUESTED) {
+      CategoriesDialog dialog(&pluginContainer(), qApp->activeWindow());
+
+      if (dialog.exec() == QDialog::Accepted) {
+        dialog.commitChanges();
+        refresh();
+      }
+    } else {
+      m_InstallationManager.notifyInstallationEnd(result, nullptr);
+      if (m_InstallationManager.wasCancelled()) {
+        QMessageBox::information(
+            qApp->activeWindow(), tr("Extraction cancelled"),
+            tr("The installation was cancelled while extracting files. "
+               "If this was prior to a FOMOD setup, this warning may be ignored. "
+               "However, if this was during installation, the mod will likely be "
+               "missing "
+               "files."),
+            QMessageBox::Ok);
+        refresh();
+      }
     }
   }
 
diff --git a/src/settings.cpp b/src/settings.cpp
index ec9bb3628..17de38eaa 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1936,6 +1936,16 @@ void NexusSettings::setTrackedIntegration(bool b) const
   set(m_Settings, "Settings", "tracked_integration", b);
 }
 
+bool NexusSettings::categoryMappings() const
+{
+  return get<bool>(m_Settings, "Settings", "category_mappings", true);
+}
+
+void NexusSettings::setCategoryMappings(bool b) const
+{
+  set(m_Settings, "Settings", "category_mappings", b);
+}
+
 void NexusSettings::registerAsNXMHandler(bool force)
 {
   const auto nxmPath = QCoreApplication::applicationDirPath() + "/" +
diff --git a/src/settings.h b/src/settings.h
index 66dbf81c3..e7ca47a97 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -514,6 +514,11 @@ class NexusSettings
   bool trackedIntegration() const;
   void setTrackedIntegration(bool b) const;
 
+  // returns whether nexus category mappings are enabled
+  //
+  bool categoryMappings() const;
+  void setCategoryMappings(bool b) const;
+
   // registers MO as the handler for nxm links
   //
   // if 'force' is true, the registration dialog will be shown even if the user
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 27949c3aa..40921d9db 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>4</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">
@@ -1052,8 +1052,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>778</width>
-            <height>497</height>
+            <width>761</width>
+            <height>515</height>
            </rect>
           </property>
           <property name="autoFillBackground">
@@ -1340,6 +1340,16 @@ If you disable this feature, MO will only display official DLCs this way. Please
                    </property>
                   </widget>
                  </item>
+                 <item>
+                  <widget class="QCheckBox" name="categoryMappingsBox">
+                   <property name="text">
+                    <string>Use Nexus category mappings</string>
+                   </property>
+                   <property name="checked">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QCheckBox" name="hideAPICounterBox">
                    <property name="toolTip">
@@ -1732,8 +1742,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>778</width>
-            <height>475</height>
+            <width>390</width>
+            <height>342</height>
            </rect>
           </property>
           <property name="autoFillBackground">
diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
index 2e706e42c..abd487f14 100644
--- a/src/settingsdialognexus.cpp
+++ b/src/settingsdialognexus.cpp
@@ -294,6 +294,7 @@ NexusSettingsTab::NexusSettingsTab(Settings& s, SettingsDialog& d) : SettingsTab
 {
   ui->endorsementBox->setChecked(settings().nexus().endorsementIntegration());
   ui->trackedBox->setChecked(settings().nexus().trackedIntegration());
+  ui->categoryMappingsBox->setChecked(settings().nexus().categoryMappings());
   ui->hideAPICounterBox->setChecked(settings().interface().hideAPICounter());
 
   // display server preferences
@@ -359,6 +360,7 @@ void NexusSettingsTab::update()
 {
   settings().nexus().setEndorsementIntegration(ui->endorsementBox->isChecked());
   settings().nexus().setTrackedIntegration(ui->trackedBox->isChecked());
+  settings().nexus().setCategoryMappings(ui->categoryMappingsBox->isChecked());
   settings().interface().setHideAPICounter(ui->hideAPICounterBox->isChecked());
 
   auto servers = settings().network().servers();

From f6bb73deb21228acf0e7f74500f50421143aa739 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Mon, 18 Sep 2023 21:44:45 -0500
Subject: [PATCH 21/43] Clang cleanup

---
 src/categories.cpp            |  62 ++++---
 src/categories.h              |  36 ++--
 src/categoriestable.cpp       |  15 +-
 src/categoriestable.h         |   8 +-
 src/downloadmanager.cpp       |  10 +-
 src/modinfo.cpp               |   3 +-
 src/modinforegular.cpp        |   2 +-
 src/modlistcontextmenu.cpp    |   4 +-
 src/modlistviewactions.cpp    |  18 +-
 src/nexusinterface.cpp        | 320 +++++++++++++++++++---------------
 src/nexusinterface.h          |  26 +--
 src/organizer_en.ts           | 260 +++++++++++++--------------
 src/profile.cpp               |   3 +-
 src/settingsdialog.cpp        |   3 +-
 src/settingsdialoggeneral.cpp |   5 +-
 src/settingsdialoggeneral.h   |   6 +-
 16 files changed, 428 insertions(+), 353 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 7fd60c508..61cd6334a 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -90,23 +90,25 @@ void CategoryFactory::loadCategories()
         int id       = cells[0].toInt(&cell0Ok);
         int parentID = cells[3].trimmed().toInt(&cell3Ok);
         if (!cell0Ok || !cell3Ok) {
-          log::error(tr("invalid category line {}: {}").toStdString(), lineNum, line.constData());
+          log::error(tr("invalid category line {}: {}").toStdString(), lineNum,
+                     line.constData());
         }
         addCategory(id, QString::fromUtf8(cells[1].constData()), nexusCats, parentID);
       } else if (cells.count() == 3) {
-          bool cell0Ok = true;
-          bool cell3Ok = true;
-          int id = cells[0].toInt(&cell0Ok);
-          int parentID = cells[2].trimmed().toInt(&cell3Ok);
-          if (!cell0Ok || !cell3Ok) {
-            log::error(tr("invalid category line {}: {}").toStdString(), lineNum, line.constData());
-          }
+        bool cell0Ok = true;
+        bool cell3Ok = true;
+        int id       = cells[0].toInt(&cell0Ok);
+        int parentID = cells[2].trimmed().toInt(&cell3Ok);
+        if (!cell0Ok || !cell3Ok) {
+          log::error(tr("invalid category line {}: {}").toStdString(), lineNum,
+                     line.constData());
+        }
 
-          addCategory(id, QString::fromUtf8(cells[1].constData()), std::vector<NexusCategory>(), parentID);
+        addCategory(id, QString::fromUtf8(cells[1].constData()),
+                    std::vector<NexusCategory>(), parentID);
       } else {
-        log::error(
-          tr("invalid category line {}: {} ({} cells)").toStdString(),
-          lineNum, line.constData(), cells.count());
+        log::error(tr("invalid category line {}: {} ({} cells)").toStdString(), lineNum,
+                   line.constData(), cells.count());
       }
     }
     categoryFile.close();
@@ -123,21 +125,22 @@ void CategoryFactory::loadCategories()
         if (nexCells.count() == 3) {
           std::vector<NexusCategory> nexusCats;
           QString nexName = nexCells[1];
-          bool ok = false;
-          int nexID = nexCells[2].toInt(&ok);
+          bool ok         = false;
+          int nexID       = nexCells[2].toInt(&ok);
           if (!ok) {
-            log::error(tr("invalid nexus ID {}").toStdString(), nexCells[2].constData());
+            log::error(tr("invalid nexus ID {}").toStdString(),
+                       nexCells[2].constData());
           }
           int catID = nexCells[0].toInt(&ok);
           if (!ok) {
-            log::error(tr("invalid category id {}").toStdString(), nexCells[0].constData());
+            log::error(tr("invalid category id {}").toStdString(),
+                       nexCells[0].constData());
           }
           m_NexusMap.insert_or_assign(nexID, NexusCategory(nexName, nexID));
           m_NexusMap.at(nexID).m_CategoryID = catID;
         } else {
-          log::error(
-            tr("invalid nexus category line {}: {} ({} cells)").toStdString(),
-            lineNum, nexLine.constData(), nexCells.count());
+          log::error(tr("invalid nexus category line {}: {} ({} cells)").toStdString(),
+                     lineNum, nexLine.constData(), nexCells.count());
         }
       }
     }
@@ -145,7 +148,8 @@ void CategoryFactory::loadCategories()
   }
   std::sort(m_Categories.begin(), m_Categories.end());
   setParents();
-  if (needLoad) loadDefaultCategories();
+  if (needLoad)
+    loadDefaultCategories();
 }
 
 CategoryFactory* CategoryFactory::instance()
@@ -249,7 +253,9 @@ CategoryFactory::countCategories(std::function<bool(const Category& category)> f
   return result;
 }
 
-int CategoryFactory::addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID)
+int CategoryFactory::addCategory(const QString& name,
+                                 const std::vector<NexusCategory>& nexusCats,
+                                 int parentID)
 {
   int id = 1;
   while (m_IDMap.find(id) != m_IDMap.end()) {
@@ -264,11 +270,14 @@ int CategoryFactory::addCategory(const QString& name, const std::vector<NexusCat
 void CategoryFactory::addCategory(int id, const QString& name, int parentID)
 {
   int index = static_cast<int>(m_Categories.size());
-  m_Categories.push_back(Category(index, id, name, parentID, std::vector<NexusCategory>()));
+  m_Categories.push_back(
+      Category(index, id, name, parentID, std::vector<NexusCategory>()));
   m_IDMap[id] = index;
 }
 
-void CategoryFactory::addCategory(int id, const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID)
+void CategoryFactory::addCategory(int id, const QString& name,
+                                  const std::vector<NexusCategory>& nexusCats,
+                                  int parentID)
 {
   for (auto nexusCat : nexusCats) {
     m_NexusMap.insert_or_assign(nexusCat.m_ID, nexusCat);
@@ -279,7 +288,8 @@ void CategoryFactory::addCategory(int id, const QString& name, const std::vector
   m_IDMap[id] = index;
 }
 
-void CategoryFactory::setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats)
+void CategoryFactory::setNexusCategories(
+    std::vector<CategoryFactory::NexusCategory>& nexusCats)
 {
   m_NexusMap.empty();
   for (auto nexusCat : nexusCats) {
@@ -289,7 +299,6 @@ void CategoryFactory::setNexusCategories(std::vector<CategoryFactory::NexusCateg
   saveCategories();
 }
 
-
 void CategoryFactory::loadDefaultCategories()
 {
   // the order here is relevant as it defines the order in which the
@@ -513,7 +522,8 @@ unsigned int CategoryFactory::resolveNexusID(int nexusID) const
   auto result = m_NexusMap.find(nexusID);
   if (result != m_NexusMap.end()) {
     if (m_IDMap.count(result->second.m_CategoryID)) {
-      log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID, m_IDMap.at(result->second.m_CategoryID));
+      log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID,
+                 m_IDMap.at(result->second.m_CategoryID));
       return m_IDMap.at(result->second.m_CategoryID);
     }
   }
diff --git a/src/categories.h b/src/categories.h
index 86e66b1c8..3f91e6c52 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -31,7 +31,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
  *to look up categories, optimized to where the request comes from. Therefore be very
  *careful which of the two you have available
  **/
-class CategoryFactory : public QObject {
+class CategoryFactory : public QObject
+{
   Q_OBJECT;
 
   friend class CategoriesDialog;
@@ -53,30 +54,37 @@ class CategoryFactory : public QObject {
   };
 
 public:
-  struct NexusCategory {
-    NexusCategory(const QString& name, const int nexusID)
-      : m_Name(name), m_ID(nexusID) {}
+  struct NexusCategory
+  {
+    NexusCategory(const QString& name, const int nexusID) : m_Name(name), m_ID(nexusID)
+    {}
     QString m_Name;
     int m_ID;
     int m_CategoryID = -1;
 
-    friend bool operator==(const NexusCategory& LHS, const NexusCategory& RHS) {
+    friend bool operator==(const NexusCategory& LHS, const NexusCategory& RHS)
+    {
       return LHS.m_ID == RHS.m_ID;
     }
 
-    friend bool operator==(const NexusCategory& LHS, const int RHS) {
+    friend bool operator==(const NexusCategory& LHS, const int RHS)
+    {
       return LHS.m_ID == RHS;
     }
 
-    friend bool operator<(const NexusCategory& LHS, const NexusCategory& RHS) {
+    friend bool operator<(const NexusCategory& LHS, const NexusCategory& RHS)
+    {
       return LHS.m_ID < RHS.m_ID;
     }
   };
 
-  struct Category {
-    Category(int sortValue, int id, const QString& name, int parentID, std::vector<NexusCategory> nexusCats)
-      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false), m_ParentID(parentID)
-      , m_NexusCats(nexusCats) {}
+  struct Category
+  {
+    Category(int sortValue, int id, const QString& name, int parentID,
+             std::vector<NexusCategory> nexusCats)
+        : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
+          m_ParentID(parentID), m_NexusCats(nexusCats)
+    {}
     int m_SortValue;
     int m_ID;
     int m_ParentID;
@@ -108,7 +116,8 @@ class CategoryFactory : public QObject {
 
   void setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats);
 
-  int addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID);
+  int addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats,
+                  int parentID);
 
   /**
    * @brief retrieve the number of available categories
@@ -222,7 +231,8 @@ class CategoryFactory : public QObject {
 
   void loadDefaultCategories();
 
-  void addCategory(int id, const QString& name, const std::vector<NexusCategory>& nexusCats, int parentID);
+  void addCategory(int id, const QString& name,
+                   const std::vector<NexusCategory>& nexusCats, int parentID);
   void addCategory(int id, const QString& name, int parentID);
 
   void setParents();
diff --git a/src/categoriestable.cpp b/src/categoriestable.cpp
index ed45826f3..fc53fb585 100644
--- a/src/categoriestable.cpp
+++ b/src/categoriestable.cpp
@@ -21,7 +21,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 CategoriesTable::CategoriesTable(QWidget* parent) : QTableWidget(parent) {}
 
-bool CategoriesTable::dropMimeData(int row, int column, const QMimeData* data, Qt::DropAction action)
+bool CategoriesTable::dropMimeData(int row, int column, const QMimeData* data,
+                                   Qt::DropAction action)
 {
   if (row == -1)
     return false;
@@ -35,15 +36,15 @@ bool CategoriesTable::dropMimeData(int row, int column, const QMimeData* data, Q
   QByteArray encoded = data->data("application/x-qabstractitemmodeldatalist");
   QDataStream stream(&encoded, QIODevice::ReadOnly);
 
-  while (!stream.atEnd())
-  {
+  while (!stream.atEnd()) {
     int curRow, curCol;
     QMap<int, QVariant> roleDataMap;
     stream >> curRow >> curCol >> roleDataMap;
 
-    for (auto item : findItems(roleDataMap.value(Qt::DisplayRole).toString(), Qt::MatchContains | Qt::MatchWrap))
-    {
-      if (item->column() != 3) continue;
+    for (auto item : findItems(roleDataMap.value(Qt::DisplayRole).toString(),
+                               Qt::MatchContains | Qt::MatchWrap)) {
+      if (item->column() != 3)
+        continue;
       QVariantList newData;
       for (auto nexData : item->data(Qt::UserRole).toList()) {
         if (nexData.toList()[1].toInt() != roleDataMap.value(Qt::UserRole)) {
@@ -59,7 +60,7 @@ bool CategoriesTable::dropMimeData(int row, int column, const QMimeData* data, Q
     }
 
     auto nexusItem = item(row, 3);
-    auto itemData = nexusItem->data(Qt::UserRole).toList();
+    auto itemData  = nexusItem->data(Qt::UserRole).toList();
     QVariantList newData;
     newData.append(roleDataMap.value(Qt::DisplayRole).toString());
     newData.append(roleDataMap.value(Qt::UserRole).toInt());
diff --git a/src/categoriestable.h b/src/categoriestable.h
index 7aaf62a94..8ec797dee 100644
--- a/src/categoriestable.h
+++ b/src/categoriestable.h
@@ -27,11 +27,11 @@ class CategoriesTable : public QTableWidget
 {
   Q_OBJECT
 public:
-  CategoriesTable(QWidget *parent = 0);
+  CategoriesTable(QWidget* parent = 0);
 
 protected:
-  virtual bool dropMimeData(int row, int column, const QMimeData* data, Qt::DropAction action);
-
+  virtual bool dropMimeData(int row, int column, const QMimeData* data,
+                            Qt::DropAction action);
 };
 
-#endif // CATEGORIESTABLE_H
+#endif  // CATEGORIESTABLE_H
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 6cf3a95cb..3e5303c6d 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1323,10 +1323,12 @@ QString DownloadManager::getFileName(int index) const
 
 int DownloadManager::getDownloadIndex(QString filename) const
 {
-  auto file = std::find_if(m_ActiveDownloads.begin(), m_ActiveDownloads.end(), [=](DownloadManager::DownloadInfo *const val) {
-      if (val->m_FileName == filename) return true;
-      return false;
-    });
+  auto file = std::find_if(m_ActiveDownloads.begin(), m_ActiveDownloads.end(),
+                           [=](DownloadManager::DownloadInfo* const val) {
+                             if (val->m_FileName == filename)
+                               return true;
+                             return false;
+                           });
   if (file != m_ActiveDownloads.end()) {
     int fileIndex = m_ActiveDownloads.indexOf(*file);
     return fileIndex;
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 5ef36ef0d..0ae28e737 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -495,7 +495,8 @@ void ModInfo::addCategory(const QString& categoryName)
 {
   int id = CategoryFactory::instance()->getCategoryID(categoryName);
   if (id == -1) {
-    id = CategoryFactory::instance()->addCategory(categoryName, std::vector<CategoryFactory::NexusCategory>(), 0);
+    id = CategoryFactory::instance()->addCategory(
+        categoryName, std::vector<CategoryFactory::NexusCategory>(), 0);
   }
   setCategory(id, true);
 }
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index 275b76a3a..9cb893071 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -738,7 +738,7 @@ QString ModInfoRegular::getDescription() const
       }
       categoryString << "<span style=\"white-space: nowrap;\"><i>"
                      << ToWString(categoryFactory->getCategoryName(
-                         categoryFactory->getCategoryIndex(*catIter)))
+                            categoryFactory->getCategoryIndex(*catIter)))
                      << "</font></span>";
     }
 
diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index 096976c15..6954652e0 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -562,7 +562,9 @@ void ModListContextMenu::addRegularActions(ModInfo::Ptr mod)
   }
 
   if (mod->nexusId() > 0 && !mod->installationFile().isEmpty()) {
-    addAction(tr("Remap Category (From Nexus)"), [=]() { m_actions.remapCategory(m_selected); });
+    addAction(tr("Remap Category (From Nexus)"), [=]() {
+      m_actions.remapCategory(m_selected);
+    });
   }
 
   if (mod->nexusId() > 0 && Settings::instance().nexus().trackedIntegration()) {
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index 5fc2aea97..aa962c1e0 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -264,17 +264,18 @@ void ModListViewActions::assignCategories() const
 {
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
-    QString file = modInfo->installationFile();
-    auto download = m_core.downloadManager()->getDownloadIndex(file);
+    QString file         = modInfo->installationFile();
+    auto download        = m_core.downloadManager()->getDownloadIndex(file);
     if (download >= 0) {
       int nexusCategory = m_core.downloadManager()->getCategoryID(download);
-      int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
+      int newCategory   = CategoryFactory::instance()->resolveNexusID(nexusCategory);
       if (newCategory != 0) {
         for (auto category : modInfo->categories()) {
           modInfo->removeCategory(category);
         }
       }
-      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory), true);
+      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory),
+                           true);
     }
   }
 }
@@ -1107,12 +1108,15 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
   for (auto& idx : indices) {
     ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(ModList::IndexRole).toInt());
 
-    int downloadIndex = m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
+    int downloadIndex =
+        m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
     if (downloadIndex >= 0) {
       auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
-      unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(downloadInfo->categoryID);
+      unsigned int categoryIndex =
+          CategoryFactory::instance()->resolveNexusID(downloadInfo->categoryID);
       if (categoryIndex != 0)
-        modInfo->setPrimaryCategory(CategoryFactory::instance()->getCategoryID(categoryIndex));
+        modInfo->setPrimaryCategory(
+            CategoryFactory::instance()->getCategoryID(categoryIndex));
     }
   }
 }
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 9db787915..6a39128f4 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -93,7 +93,8 @@ void NexusBridge::requestToggleTracking(QString gameName, int modID, bool track,
 
 void NexusBridge::requestGameInfo(QString gameName, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestGameInfo(gameName, this, userData, m_SubModule));
+  m_RequestIDs.insert(
+      m_Interface->requestGameInfo(gameName, this, userData, m_SubModule));
 }
 
 void NexusBridge::nxmDescriptionAvailable(QString gameName, int modID,
@@ -199,7 +200,8 @@ void NexusBridge::nxmTrackingToggled(QString gameName, int modID, QVariant userD
   }
 }
 
-void NexusBridge::nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID)
+void NexusBridge::nxmGameInfoAvailable(QString gameName, QVariant userData,
+                                       QVariant resultData, int requestID)
 {
   std::set<int>::iterator iter = m_RequestIDs.find(requestID);
   if (iter != m_RequestIDs.end()) {
@@ -749,7 +751,9 @@ int NexusInterface::requestToggleTracking(QString gameName, int modID, bool trac
   return requestInfo.m_ID;
 }
 
-int NexusInterface::requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule, MOBase::IPluginGame const* game)
+int NexusInterface::requestGameInfo(QString gameName, QObject* receiver,
+                                    QVariant userData, const QString& subModule,
+                                    MOBase::IPluginGame const* game)
 {
   if (m_User.shouldThrottle()) {
     throttledWarning(m_User);
@@ -760,10 +764,13 @@ int NexusInterface::requestGameInfo(QString gameName, QObject* receiver, QVarian
   m_RequestQueue.enqueue(requestInfo);
 
   connect(this, SIGNAL(nxmGameInfoAvailable(QString, QVariant, QVariant, int)),
-    receiver, SLOT(nxmGameInfoAvailable(QString, QVariant, QVariant, int)), Qt::UniqueConnection);
+          receiver, SLOT(nxmGameInfoAvailable(QString, QVariant, QVariant, int)),
+          Qt::UniqueConnection);
 
-  connect(this, SIGNAL(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)),
-    receiver, SLOT(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)), Qt::UniqueConnection);
+  connect(
+      this, SIGNAL(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)),
+      receiver, SLOT(nxmRequestFailed(QString, int, int, QVariant, int, int, QString)),
+      Qt::UniqueConnection);
 
   nextRequest();
   return requestInfo.m_ID;
@@ -868,72 +875,104 @@ void NexusInterface::nextRequest()
   if (!info.m_Reroute) {
     bool hasParams = false;
     switch (info.m_Type) {
-      case NXMRequestInfo::TYPE_DESCRIPTION:
-      case NXMRequestInfo::TYPE_MODINFO: {
-        url = QString("%1/games/%2/mods/%3")
+    case NXMRequestInfo::TYPE_DESCRIPTION:
+    case NXMRequestInfo::TYPE_MODINFO: {
+      url = QString("%1/games/%2/mods/%3")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(info.m_ModID);
+    } break;
+    case NXMRequestInfo::TYPE_CHECKUPDATES: {
+      QString period;
+      switch (info.m_UpdatePeriod) {
+      case UpdatePeriod::DAY:
+        period = "1d";
+        break;
+      case UpdatePeriod::WEEK:
+        period = "1w";
+        break;
+      case UpdatePeriod::MONTH:
+        period = "1m";
+        break;
+      }
+      url = QString("%1/games/%2/mods/updated?period=%3")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(period);
+    } break;
+    case NXMRequestInfo::TYPE_FILES:
+    case NXMRequestInfo::TYPE_GETUPDATES: {
+      url = QString("%1/games/%2/mods/%3/files")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(info.m_ModID);
+    } break;
+    case NXMRequestInfo::TYPE_FILEINFO: {
+      url = QString("%1/games/%2/mods/%3/files/%4")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(info.m_ModID)
+                .arg(info.m_FileID);
+    } break;
+    case NXMRequestInfo::TYPE_DOWNLOADURL: {
+      ModRepositoryFileInfo* fileInfo = qobject_cast<ModRepositoryFileInfo*>(
+          qvariant_cast<QObject*>(info.m_UserData));
+      if (m_User.type() == APIUserAccountTypes::Premium) {
+        url = QString("%1/games/%2/mods/%3/files/%4/download_link")
                   .arg(info.m_URL)
                   .arg(info.m_GameName)
-                  .arg(info.m_ModID);
-      } break;
-      case NXMRequestInfo::TYPE_CHECKUPDATES: {
-        QString period;
-        switch (info.m_UpdatePeriod) {
-        case UpdatePeriod::DAY:
-          period = "1d";
-          break;
-        case UpdatePeriod::WEEK:
-          period = "1w";
-          break;
-        case UpdatePeriod::MONTH:
-          period = "1m";
-          break;
-        }
-        url = QString("%1/games/%2/mods/updated?period=%3").arg(info.m_URL).arg(info.m_GameName).arg(period);
-      } break;
-      case NXMRequestInfo::TYPE_FILES:
-      case NXMRequestInfo::TYPE_GETUPDATES: {
-        url = QString("%1/games/%2/mods/%3/files").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID);
-      } break;
-      case NXMRequestInfo::TYPE_FILEINFO: {
-        url = QString("%1/games/%2/mods/%3/files/%4").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID);
-      } break;
-      case NXMRequestInfo::TYPE_DOWNLOADURL: {
-        ModRepositoryFileInfo *fileInfo = qobject_cast<ModRepositoryFileInfo*>(qvariant_cast<QObject*>(info.m_UserData));
-        if (m_User.type() == APIUserAccountTypes::Premium) {
-          url = QString("%1/games/%2/mods/%3/files/%4/download_link").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID);
-        } else if (!fileInfo->nexusKey.isEmpty() && fileInfo->nexusExpires && fileInfo->nexusDownloadUser == m_User.id().toInt()) {
-          url = QString("%1/games/%2/mods/%3/files/%4/download_link?key=%5&expires=%6")
-          .arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(info.m_FileID).arg(fileInfo->nexusKey).arg(fileInfo->nexusExpires);
-        } else {
-          log::warn("{}", tr("Aborting download: Either you clicked on a premium-only link and your account is not premium, "
-            "or the download link was generated by a different account than the one stored in Mod Organizer."));
-          return;
-        }
-      } break;
-      case NXMRequestInfo::TYPE_ENDORSEMENTS: {
-        url = QString("%1/user/endorsements").arg(info.m_URL);
-      } break;
-      case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
-        QString endorse = info.m_Endorse ? "endorse" : "abstain";
-        url = QString("%1/games/%2/mods/%3/%4").arg(info.m_URL).arg(info.m_GameName).arg(info.m_ModID).arg(endorse);
-        postObject.insert("Version", info.m_ModVersion);
-        postData.setObject(postObject);
-      } break;
-      case NXMRequestInfo::TYPE_TOGGLETRACKING: {
-        url = QStringLiteral("%1/user/tracked_mods?domain_name=%2").arg(info.m_URL).arg(info.m_GameName);
-        postObject.insert("mod_id", info.m_ModID);
-        postData.setObject(postObject);
-        requestIsDelete = !info.m_Track;
-      } break;
-      case NXMRequestInfo::TYPE_TRACKEDMODS: {
-        url = QStringLiteral("%1/user/tracked_mods").arg(info.m_URL);
-      } break;
-      case NXMRequestInfo::TYPE_FILEINFO_MD5: {
-        url = QStringLiteral("%1/games/%2/mods/md5_search/%3").arg(info.m_URL).arg(info.m_GameName).arg(QString(info.m_Hash.toHex()));
-      } break;
-      case NXMRequestInfo::TYPE_GAMEINFO: {
-        url = QStringLiteral("%1/games/%2").arg(info.m_URL).arg(info.m_GameName);
-      } break;
+                  .arg(info.m_ModID)
+                  .arg(info.m_FileID);
+      } else if (!fileInfo->nexusKey.isEmpty() && fileInfo->nexusExpires &&
+                 fileInfo->nexusDownloadUser == m_User.id().toInt()) {
+        url = QString("%1/games/%2/mods/%3/files/%4/download_link?key=%5&expires=%6")
+                  .arg(info.m_URL)
+                  .arg(info.m_GameName)
+                  .arg(info.m_ModID)
+                  .arg(info.m_FileID)
+                  .arg(fileInfo->nexusKey)
+                  .arg(fileInfo->nexusExpires);
+      } else {
+        log::warn("{}", tr("Aborting download: Either you clicked on a premium-only "
+                           "link and your account is not premium, "
+                           "or the download link was generated by a different account "
+                           "than the one stored in Mod Organizer."));
+        return;
+      }
+    } break;
+    case NXMRequestInfo::TYPE_ENDORSEMENTS: {
+      url = QString("%1/user/endorsements").arg(info.m_URL);
+    } break;
+    case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
+      QString endorse = info.m_Endorse ? "endorse" : "abstain";
+      url             = QString("%1/games/%2/mods/%3/%4")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(info.m_ModID)
+                .arg(endorse);
+      postObject.insert("Version", info.m_ModVersion);
+      postData.setObject(postObject);
+    } break;
+    case NXMRequestInfo::TYPE_TOGGLETRACKING: {
+      url = QStringLiteral("%1/user/tracked_mods?domain_name=%2")
+                .arg(info.m_URL)
+                .arg(info.m_GameName);
+      postObject.insert("mod_id", info.m_ModID);
+      postData.setObject(postObject);
+      requestIsDelete = !info.m_Track;
+    } break;
+    case NXMRequestInfo::TYPE_TRACKEDMODS: {
+      url = QStringLiteral("%1/user/tracked_mods").arg(info.m_URL);
+    } break;
+    case NXMRequestInfo::TYPE_FILEINFO_MD5: {
+      url = QStringLiteral("%1/games/%2/mods/md5_search/%3")
+                .arg(info.m_URL)
+                .arg(info.m_GameName)
+                .arg(QString(info.m_Hash.toHex()));
+    } break;
+    case NXMRequestInfo::TYPE_GAMEINFO: {
+      url = QStringLiteral("%1/games/%2").arg(info.m_URL).arg(info.m_GameName);
+    }
     }
   } else {
     url = info.m_URL;
@@ -1045,53 +1084,69 @@ void NexusInterface::requestFinished(std::list<NXMRequestInfo>::iterator iter)
       if (!responseDoc.isNull()) {
         QVariant result = responseDoc.toVariant();
         switch (iter->m_Type) {
-          case NXMRequestInfo::TYPE_DESCRIPTION: {
-            emit nxmDescriptionAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_MODINFO: {
-            emit nxmModInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_CHECKUPDATES: {
-            emit nxmUpdateInfoAvailable(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_FILES: {
-            emit nxmFilesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_GETUPDATES: {
-            emit nxmUpdatesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_FILEINFO: {
-            emit nxmFileInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_DOWNLOADURL: {
-            emit nxmDownloadURLsAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_ENDORSEMENTS: {
-            emit nxmEndorsementsAvailable(iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
-            emit nxmEndorsementToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_TOGGLETRACKING: {
-            auto results = result.toMap();
-            auto message = results["message"].toString();
-            if (message.contains(QRegularExpression("User [0-9]+ is already Tracking Mod: [0-9]+")) ||
-                message.contains(QRegularExpression("User [0-9]+ is now Tracking Mod: [0-9]+"))) {
-              emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, true, iter->m_ID);
-            } else if (message.contains(QRegularExpression("User [0-9]+ is no longer tracking [0-9]+")) ||
-                       message.contains(QRegularExpression("Users is not tracking mod. Unable to untrack."))) {
-              emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData, false, iter->m_ID);
-            }
-          } break;
-          case NXMRequestInfo::TYPE_TRACKEDMODS: {
-            emit nxmTrackedModsAvailable(iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_FILEINFO_MD5: {
-            emit nxmFileInfoFromMd5Available(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
-          } break;
-          case NXMRequestInfo::TYPE_GAMEINFO: {
-            emit nxmGameInfoAvailable(iter->m_GameName, iter->m_UserData, result, iter->m_ID);
-          } break;
+        case NXMRequestInfo::TYPE_DESCRIPTION: {
+          emit nxmDescriptionAvailable(iter->m_GameName, iter->m_ModID,
+                                       iter->m_UserData, result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_MODINFO: {
+          emit nxmModInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                   result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_CHECKUPDATES: {
+          emit nxmUpdateInfoAvailable(iter->m_GameName, iter->m_UserData, result,
+                                      iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_FILES: {
+          emit nxmFilesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                 result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_GETUPDATES: {
+          emit nxmUpdatesAvailable(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                   result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_FILEINFO: {
+          emit nxmFileInfoAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID,
+                                    iter->m_UserData, result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_DOWNLOADURL: {
+          emit nxmDownloadURLsAvailable(iter->m_GameName, iter->m_ModID, iter->m_FileID,
+                                        iter->m_UserData, result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_ENDORSEMENTS: {
+          emit nxmEndorsementsAvailable(iter->m_UserData, result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
+          emit nxmEndorsementToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                     result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_TOGGLETRACKING: {
+          auto results = result.toMap();
+          auto message = results["message"].toString();
+          if (message.contains(
+                  QRegularExpression("User [0-9]+ is already Tracking Mod: [0-9]+")) ||
+              message.contains(
+                  QRegularExpression("User [0-9]+ is now Tracking Mod: [0-9]+"))) {
+            emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                    true, iter->m_ID);
+          } else if (message.contains(QRegularExpression(
+                         "User [0-9]+ is no longer tracking [0-9]+")) ||
+                     message.contains(QRegularExpression(
+                         "Users is not tracking mod. Unable to untrack."))) {
+            emit nxmTrackingToggled(iter->m_GameName, iter->m_ModID, iter->m_UserData,
+                                    false, iter->m_ID);
+          }
+        } break;
+        case NXMRequestInfo::TYPE_TRACKEDMODS: {
+          emit nxmTrackedModsAvailable(iter->m_UserData, result, iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_FILEINFO_MD5: {
+          emit nxmFileInfoFromMd5Available(iter->m_GameName, iter->m_UserData, result,
+                                           iter->m_ID);
+        } break;
+        case NXMRequestInfo::TYPE_GAMEINFO: {
+          emit nxmGameInfoAvailable(iter->m_GameName, iter->m_UserData, result,
+                                    iter->m_ID);
+        } break;
         }
 
         m_User.limits(parseLimits(reply));
@@ -1194,28 +1249,15 @@ NexusInterface::NXMRequestInfo::NXMRequestInfo(
       m_Endorse(false), m_Track(false), m_Hash(QByteArray())
 {}
 
-NexusInterface::NXMRequestInfo::NXMRequestInfo(Type type
-  , QVariant userData
-  , const QString & subModule
-  , MOBase::IPluginGame const *game
-)
-  : m_ModID(0)
-  , m_ModVersion("0")
-  , m_FileID(0)
-  , m_Reply(nullptr)
-  , m_Type(type)
-  , m_UpdatePeriod(UpdatePeriod::NONE)
-  , m_UserData(userData)
-  , m_Timeout(nullptr)
-  , m_Reroute(false)
-  , m_ID(s_NextID.fetchAndAddAcquire(1))
-  , m_URL(get_management_url())
-  , m_SubModule(subModule)
-  , m_NexusGameID(game->nexusGameID())
-  , m_GameName(game->gameNexusName())
-  , m_Endorse(false)
-  , m_Track(false)
-  , m_Hash(QByteArray())
+NexusInterface::NXMRequestInfo::NXMRequestInfo(Type type, QVariant userData,
+                                               const QString& subModule,
+                                               MOBase::IPluginGame const* game)
+    : m_ModID(0), m_ModVersion("0"), m_FileID(0), m_Reply(nullptr), m_Type(type),
+      m_UpdatePeriod(UpdatePeriod::NONE), m_UserData(userData), m_Timeout(nullptr),
+      m_Reroute(false), m_ID(s_NextID.fetchAndAddAcquire(1)),
+      m_URL(get_management_url()), m_SubModule(subModule),
+      m_NexusGameID(game->nexusGameID()), m_GameName(game->gameNexusName()),
+      m_Endorse(false), m_Track(false), m_Hash(QByteArray())
 {}
 
 NexusInterface::NXMRequestInfo::NXMRequestInfo(
diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index 95e461688..b79127afa 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -467,17 +467,18 @@ class NexusInterface : public QObject
   }
 
   /**
-  * @param gameName the game short name to support multiple game sources
-  * @brief toggle tracking state of the mod
-  * @param modID id of the mod
-  * @param track true if the mod should be tracked, false for not tracked
-  * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)
-  * @param userData user data to be returned with the result
-  * @param game the game with which the mods are associated
-  * @return int an id to identify the request
-  */
-  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule,
-    MOBase::IPluginGame const* game);
+   * @param gameName the game short name to support multiple game sources
+   * @brief toggle tracking state of the mod
+   * @param modID id of the mod
+   * @param track true if the mod should be tracked, false for not tracked
+   * @param receiver the object to receive the result asynchronously via a signal
+   * (nxmFilesAvailable)
+   * @param userData user data to be returned with the result
+   * @param game the game with which the mods are associated
+   * @return int an id to identify the request
+   */
+  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData,
+                      const QString& subModule, MOBase::IPluginGame const* game);
 
   /**
    *
@@ -651,7 +652,8 @@ private slots:
                    const QString& subModule, MOBase::IPluginGame const* game);
     NXMRequestInfo(int modID, int fileID, Type type, QVariant userData,
                    const QString& subModule, MOBase::IPluginGame const* game);
-    NXMRequestInfo(Type type, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);
+    NXMRequestInfo(Type type, QVariant userData, const QString& subModule,
+                   MOBase::IPluginGame const* game);
     NXMRequestInfo(Type type, QVariant userData, const QString& subModule);
     NXMRequestInfo(UpdatePeriod period, Type type, QVariant userData,
                    const QString& subModule, MOBase::IPluginGame const* game);
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 389d84aee..71be41879 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -330,67 +330,67 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CategoryFactory</name>
     <message>
-        <location filename="categories.cpp" line="78"/>
-        <location filename="categories.cpp" line="128"/>
+        <location filename="categories.cpp" line="77"/>
+        <location filename="categories.cpp" line="130"/>
         <source>invalid category id {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="88"/>
+        <location filename="categories.cpp" line="87"/>
         <location filename="categories.cpp" line="97"/>
         <source>invalid category line {}: {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="103"/>
+        <location filename="categories.cpp" line="104"/>
         <source>invalid category line {}: {} ({} cells)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="124"/>
+        <location filename="categories.cpp" line="125"/>
         <source>invalid nexus ID {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="134"/>
+        <location filename="categories.cpp" line="136"/>
         <source>invalid nexus category line {}: {} ({} cells)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="194"/>
+        <location filename="categories.cpp" line="197"/>
         <source>Failed to save custom categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="218"/>
+        <location filename="categories.cpp" line="221"/>
         <source>Failed to save nexus category mappings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="356"/>
-        <location filename="categories.cpp" line="402"/>
-        <location filename="categories.cpp" line="411"/>
-        <location filename="categories.cpp" line="479"/>
+        <location filename="categories.cpp" line="362"/>
+        <location filename="categories.cpp" line="408"/>
+        <location filename="categories.cpp" line="417"/>
+        <location filename="categories.cpp" line="485"/>
         <source>invalid category index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="394"/>
+        <location filename="categories.cpp" line="400"/>
         <source>{} is no valid category id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="489"/>
+        <location filename="categories.cpp" line="495"/>
         <source>invalid category id: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="513"/>
+        <location filename="categories.cpp" line="519"/>
         <source>nexus category id {} maps to internal {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="517"/>
+        <location filename="categories.cpp" line="524"/>
         <source>nexus category id {} not mapped</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1334,126 +1334,126 @@ File %3:	%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1340"/>
+        <location filename="downloadmanager.cpp" line="1342"/>
         <source>file time: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1359"/>
+        <location filename="downloadmanager.cpp" line="1361"/>
         <source>file size: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1368"/>
+        <location filename="downloadmanager.cpp" line="1370"/>
         <source>progress: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1377"/>
+        <location filename="downloadmanager.cpp" line="1379"/>
         <source>state: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1386"/>
+        <location filename="downloadmanager.cpp" line="1388"/>
         <source>infocomplete: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1400"/>
-        <location filename="downloadmanager.cpp" line="1408"/>
-        <location filename="downloadmanager.cpp" line="1416"/>
-        <location filename="downloadmanager.cpp" line="1429"/>
+        <location filename="downloadmanager.cpp" line="1402"/>
+        <location filename="downloadmanager.cpp" line="1410"/>
+        <location filename="downloadmanager.cpp" line="1418"/>
+        <location filename="downloadmanager.cpp" line="1431"/>
         <source>mod id: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1437"/>
+        <location filename="downloadmanager.cpp" line="1439"/>
         <source>ishidden: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1445"/>
+        <location filename="downloadmanager.cpp" line="1447"/>
         <source>file info: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1454"/>
+        <location filename="downloadmanager.cpp" line="1456"/>
         <source>mark installed: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1499"/>
+        <location filename="downloadmanager.cpp" line="1501"/>
         <source>mark uninstalled: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1668"/>
+        <location filename="downloadmanager.cpp" line="1670"/>
         <source>%1% - %2 - ~%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1679"/>
+        <location filename="downloadmanager.cpp" line="1681"/>
         <source>Memory allocation error (in processing progress event).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1688"/>
+        <location filename="downloadmanager.cpp" line="1690"/>
         <source>Memory allocation error (in processing downloaded data).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1810"/>
+        <location filename="downloadmanager.cpp" line="1812"/>
         <source>Information updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1812"/>
-        <location filename="downloadmanager.cpp" line="1835"/>
+        <location filename="downloadmanager.cpp" line="1814"/>
+        <location filename="downloadmanager.cpp" line="1837"/>
         <source>No matching file found on Nexus! Maybe this file is no longer available or it was renamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1815"/>
+        <location filename="downloadmanager.cpp" line="1817"/>
         <source>No file on Nexus matches the selected file by name. Please manually choose the correct one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2012"/>
+        <location filename="downloadmanager.cpp" line="2014"/>
         <source>No download server available. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2182"/>
+        <location filename="downloadmanager.cpp" line="2184"/>
         <source>Failed to request file info from nexus: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2214"/>
+        <location filename="downloadmanager.cpp" line="2216"/>
         <source>Warning: Content type is: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2221"/>
+        <location filename="downloadmanager.cpp" line="2223"/>
         <source>Download header content length: %1 downloaded file size: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2225"/>
+        <location filename="downloadmanager.cpp" line="2227"/>
         <source>Download failed: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2250"/>
+        <location filename="downloadmanager.cpp" line="2252"/>
         <source>We were unable to download the file due to errors after four retries. There may be an issue with the Nexus servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2339"/>
+        <location filename="downloadmanager.cpp" line="2341"/>
         <source>failed to re-open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2387"/>
+        <location filename="downloadmanager.cpp" line="2389"/>
         <source>Unable to write download to drive (return %1).
 Check the drive&apos;s available storage.
 
@@ -4995,7 +4995,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="modlistcontextmenu.cpp" line="376"/>
         <location filename="modlistcontextmenu.cpp" line="453"/>
-        <location filename="modlistcontextmenu.cpp" line="618"/>
+        <location filename="modlistcontextmenu.cpp" line="620"/>
         <source>Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5033,25 +5033,25 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="429"/>
-        <location filename="modlistcontextmenu.cpp" line="591"/>
+        <location filename="modlistcontextmenu.cpp" line="593"/>
         <source>Ignore missing data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="435"/>
-        <location filename="modlistcontextmenu.cpp" line="598"/>
+        <location filename="modlistcontextmenu.cpp" line="600"/>
         <source>Mark as converted/working</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="441"/>
-        <location filename="modlistcontextmenu.cpp" line="606"/>
+        <location filename="modlistcontextmenu.cpp" line="608"/>
         <source>Visit on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="448"/>
-        <location filename="modlistcontextmenu.cpp" line="613"/>
+        <location filename="modlistcontextmenu.cpp" line="615"/>
         <source>Visit on %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5137,17 +5137,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="571"/>
+        <location filename="modlistcontextmenu.cpp" line="573"/>
         <source>Start tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="576"/>
+        <location filename="modlistcontextmenu.cpp" line="578"/>
         <source>Stop tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="581"/>
+        <location filename="modlistcontextmenu.cpp" line="583"/>
         <source>Tracked state unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5313,68 +5313,68 @@ Please enter the name:</source>
 <context>
     <name>ModListViewActions</name>
     <message>
-        <location filename="modlistviewactions.cpp" line="100"/>
+        <location filename="modlistviewactions.cpp" line="99"/>
         <source>Choose Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="101"/>
+        <location filename="modlistviewactions.cpp" line="100"/>
         <source>Mod Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="121"/>
-        <location filename="modlistviewactions.cpp" line="1297"/>
+        <location filename="modlistviewactions.cpp" line="120"/>
+        <location filename="modlistviewactions.cpp" line="1300"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="122"/>
+        <location filename="modlistviewactions.cpp" line="121"/>
         <source>This will create an empty mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="132"/>
-        <location filename="modlistviewactions.cpp" line="1308"/>
+        <location filename="modlistviewactions.cpp" line="131"/>
+        <location filename="modlistviewactions.cpp" line="1311"/>
         <source>A mod with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="159"/>
+        <location filename="modlistviewactions.cpp" line="158"/>
         <source>Create Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="160"/>
+        <location filename="modlistviewactions.cpp" line="159"/>
         <source>This will create a new separator.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="169"/>
+        <location filename="modlistviewactions.cpp" line="168"/>
         <source>A separator with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="217"/>
+        <location filename="modlistviewactions.cpp" line="216"/>
         <source>Really enable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="217"/>
+        <location filename="modlistviewactions.cpp" line="216"/>
         <source>Really disable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="218"/>
+        <location filename="modlistviewactions.cpp" line="217"/>
         <location filename="modlistviewactions.cpp" line="773"/>
         <location filename="modlistviewactions.cpp" line="1022"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="241"/>
+        <location filename="modlistviewactions.cpp" line="240"/>
         <location filename="modlistviewactions.cpp" line="300"/>
         <source>You are not currently authenticated with Nexus. Please do so under Settings -&gt; Nexus.</source>
         <translation type="unfinished"></translation>
@@ -5572,7 +5572,7 @@ This function will guess the versioning scheme under the assumption that the ins
     </message>
     <message>
         <location filename="modlistviewactions.cpp" line="1056"/>
-        <location filename="modlistviewactions.cpp" line="1367"/>
+        <location filename="modlistviewactions.cpp" line="1370"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5588,38 +5588,38 @@ This function will guess the versioning scheme under the assumption that the ins
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1249"/>
+        <location filename="modlistviewactions.cpp" line="1252"/>
         <source>Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1250"/>
+        <location filename="modlistviewactions.cpp" line="1253"/>
         <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1254"/>
+        <location filename="modlistviewactions.cpp" line="1257"/>
         <source>failed to remove mod &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1260"/>
+        <location filename="modlistviewactions.cpp" line="1263"/>
         <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1279"/>
+        <location filename="modlistviewactions.cpp" line="1282"/>
         <source>Move successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1298"/>
+        <location filename="modlistviewactions.cpp" line="1301"/>
         <source>This will move all files from overwrite into a new, regular mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1368"/>
+        <location filename="modlistviewactions.cpp" line="1371"/>
         <source>About to recursively delete:
 </source>
         <translation type="unfinished"></translation>
@@ -5684,32 +5684,32 @@ Please enter a name:</source>
 <context>
     <name>NexusInterface</name>
     <message>
-        <location filename="nexusinterface.cpp" line="353"/>
+        <location filename="nexusinterface.cpp" line="355"/>
         <source>Please pick the mod ID for &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="839"/>
+        <location filename="nexusinterface.cpp" line="846"/>
         <source>You must authorize MO2 in Settings -&gt; Nexus to use the Nexus API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="848"/>
+        <location filename="nexusinterface.cpp" line="855"/>
         <source>You&apos;ve exceeded the Nexus API rate limit and requests are now being throttled. Your next batch of requests will be available in approximately %1 minutes and %2 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="929"/>
+        <location filename="nexusinterface.cpp" line="936"/>
         <source>Aborting download: Either you clicked on a premium-only link and your account is not premium, or the download link was generated by a different account than the one stored in Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1072"/>
+        <location filename="nexusinterface.cpp" line="1077"/>
         <source>empty response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1152"/>
+        <location filename="nexusinterface.cpp" line="1157"/>
         <source>invalid response</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6555,61 +6555,61 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="277"/>
+        <location filename="profile.cpp" line="276"/>
         <source>failed to write mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="288"/>
+        <location filename="profile.cpp" line="287"/>
         <source>failed to update tweaked ini file, wrong settings may be used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="310"/>
+        <location filename="profile.cpp" line="309"/>
         <source>failed to create tweaked ini: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="336"/>
+        <location filename="profile.cpp" line="335"/>
         <source>failed to open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="428"/>
+        <location filename="profile.cpp" line="427"/>
         <source>&quot;%1&quot; is missing or inaccessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="490"/>
-        <location filename="profile.cpp" line="528"/>
-        <location filename="profile.cpp" line="620"/>
-        <location filename="profile.cpp" line="678"/>
-        <location filename="profile.cpp" line="687"/>
+        <location filename="profile.cpp" line="489"/>
+        <location filename="profile.cpp" line="527"/>
+        <location filename="profile.cpp" line="619"/>
+        <location filename="profile.cpp" line="677"/>
+        <location filename="profile.cpp" line="686"/>
         <source>invalid mod index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="573"/>
+        <location filename="profile.cpp" line="572"/>
         <source>A mod named &quot;overwrite&quot; was detected, disabled, and moved to the highest priority on the mod list. You may want to rename this mod and enable it again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="864"/>
+        <location filename="profile.cpp" line="863"/>
         <source>Delete profile-specific save games?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="865"/>
+        <location filename="profile.cpp" line="864"/>
         <source>Do you want to delete the profile-specific save games? (If you select &quot;No&quot;, the save games will show up again if you re-enable profile-specific save games)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="900"/>
+        <location filename="profile.cpp" line="899"/>
         <source>Missing profile-specific game INI files!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="901"/>
+        <location filename="profile.cpp" line="900"/>
         <source>Some of your profile-specific game INI files were missing.  They will now be copied from the vanilla game folder.  You might want to double-check your settings.
 
 Missing files:
@@ -6617,12 +6617,12 @@ Missing files:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="920"/>
+        <location filename="profile.cpp" line="919"/>
         <source>Delete profile-specific game INI files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="921"/>
+        <location filename="profile.cpp" line="920"/>
         <source>Do you want to delete the profile-specific game INI files? (If you select &quot;No&quot;, the INI files will be used again if you re-enable profile-specific game INI files.)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6912,57 +6912,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="422"/>
+        <location filename="categories.cpp" line="428"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="425"/>
+        <location filename="categories.cpp" line="431"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="428"/>
+        <location filename="categories.cpp" line="434"/>
         <source>Has category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="431"/>
+        <location filename="categories.cpp" line="437"/>
         <source>Conflicted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="434"/>
+        <location filename="categories.cpp" line="440"/>
         <source>Has hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="437"/>
+        <location filename="categories.cpp" line="443"/>
         <source>Endorsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="440"/>
+        <location filename="categories.cpp" line="446"/>
         <source>Has backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="443"/>
+        <location filename="categories.cpp" line="449"/>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="446"/>
+        <location filename="categories.cpp" line="452"/>
         <source>Has valid game data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="449"/>
+        <location filename="categories.cpp" line="455"/>
         <source>Has Nexus ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="452"/>
+        <location filename="categories.cpp" line="458"/>
         <source>Tracked on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7045,7 +7045,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="createinstancedialogpages.cpp" line="37"/>
-        <location filename="createinstancedialogpages.cpp" line="1234"/>
+        <location filename="createinstancedialogpages.cpp" line="1232"/>
         <source>Instance type: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7166,82 +7166,82 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1236"/>
+        <location filename="createinstancedialogpages.cpp" line="1234"/>
         <source>Instance location: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1239"/>
+        <location filename="createinstancedialogpages.cpp" line="1237"/>
         <source>Instance name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1242"/>
+        <location filename="createinstancedialogpages.cpp" line="1240"/>
         <source>Profile settings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1244"/>
+        <location filename="createinstancedialogpages.cpp" line="1242"/>
         <source>  Local INIs: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1245"/>
+        <location filename="createinstancedialogpages.cpp" line="1243"/>
+        <location filename="createinstancedialogpages.cpp" line="1246"/>
         <location filename="createinstancedialogpages.cpp" line="1248"/>
-        <location filename="createinstancedialogpages.cpp" line="1250"/>
         <source>yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1245"/>
-        <location filename="createinstancedialogpages.cpp" line="1248"/>
-        <location filename="createinstancedialogpages.cpp" line="1251"/>
+        <location filename="createinstancedialogpages.cpp" line="1243"/>
+        <location filename="createinstancedialogpages.cpp" line="1246"/>
+        <location filename="createinstancedialogpages.cpp" line="1249"/>
         <source>no</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1247"/>
+        <location filename="createinstancedialogpages.cpp" line="1245"/>
         <source>  Local Saves: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1249"/>
+        <location filename="createinstancedialogpages.cpp" line="1247"/>
         <source>  Automatic Archive Invalidation: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1256"/>
-        <location filename="createinstancedialogpages.cpp" line="1260"/>
+        <location filename="createinstancedialogpages.cpp" line="1254"/>
+        <location filename="createinstancedialogpages.cpp" line="1258"/>
         <source>Base directory: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1261"/>
+        <location filename="createinstancedialogpages.cpp" line="1259"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1262"/>
+        <location filename="createinstancedialogpages.cpp" line="1260"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1263"/>
+        <location filename="createinstancedialogpages.cpp" line="1261"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1264"/>
+        <location filename="createinstancedialogpages.cpp" line="1262"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1273"/>
+        <location filename="createinstancedialogpages.cpp" line="1271"/>
         <source>Game: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1274"/>
+        <location filename="createinstancedialogpages.cpp" line="1272"/>
         <source>Game location: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7773,12 +7773,12 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="171"/>
+        <location filename="settingsdialoggeneral.cpp" line="173"/>
         <source>Confirm?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="172"/>
+        <location filename="settingsdialoggeneral.cpp" line="174"/>
         <source>This will reset all the choices you made to dialogs and make them all visible again. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/profile.cpp b/src/profile.cpp
index 13ce41c7e..d4299a7b0 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -177,8 +177,7 @@ void Profile::findProfileSettings()
     }
   }
 
-  if (setting("", "LocalSettings") ==
-      QVariant()) {
+  if (setting("", "LocalSettings") == QVariant()) {
     QString backupFile = getIniFileName() + "_";
     if (m_Directory.exists(backupFile)) {
       storeSetting("", "LocalSettings", true);
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 6ad6fdea7..67c9dd5d4 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -37,7 +37,8 @@ SettingsDialog::SettingsDialog(PluginContainer* pluginContainer, Settings& setti
 {
   ui->setupUi(this);
 
-  m_tabs.push_back(std::unique_ptr<SettingsTab>(new GeneralSettingsTab(settings, m_pluginContainer, *this)));
+  m_tabs.push_back(std::unique_ptr<SettingsTab>(
+      new GeneralSettingsTab(settings, m_pluginContainer, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new ThemeSettingsTab(settings, *this)));
   m_tabs.push_back(
       std::unique_ptr<SettingsTab>(new ModListSettingsTab(settings, *this)));
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 95580723b..4ce721109 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -8,8 +8,9 @@
 
 using namespace MOBase;
 
-GeneralSettingsTab::GeneralSettingsTab(Settings& s, PluginContainer* pluginContainer, SettingsDialog& d)
-  : SettingsTab(s, d), m_PluginContainer(pluginContainer)
+GeneralSettingsTab::GeneralSettingsTab(Settings& s, PluginContainer* pluginContainer,
+                                       SettingsDialog& d)
+    : SettingsTab(s, d), m_PluginContainer(pluginContainer)
 {
   // language
   addLanguages();
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index ffbeb50cf..aa11edbb3 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -1,14 +1,15 @@
 #ifndef SETTINGSDIALOGGENERAL_H
 #define SETTINGSDIALOGGENERAL_H
 
+#include "plugincontainer.h"
 #include "settings.h"
 #include "settingsdialog.h"
-#include "plugincontainer.h"
 
 class GeneralSettingsTab : public SettingsTab
 {
 public:
-  GeneralSettingsTab(Settings& settings, PluginContainer *pluginContainer, SettingsDialog& dialog);
+  GeneralSettingsTab(Settings& settings, PluginContainer* pluginContainer,
+                     SettingsDialog& dialog);
 
   void update();
 
@@ -23,7 +24,6 @@ class GeneralSettingsTab : public SettingsTab
 
 private:
   PluginContainer* m_PluginContainer;
-
 };
 
 #endif  // SETTINGSDIALOGGENERAL_H

From c50ad588432a27612fe5be39b1520e2962d5eef7 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 19 Sep 2023 02:37:24 -0500
Subject: [PATCH 22/43] Add nexus category ID to mod info - We will check the
 mod info first then fall back to the download file - Add category field in
 the info dialog nexus tab

---
 src/mainwindow.cpp         |   2 +
 src/modinfo.h              |  10 ++
 src/modinfobackup.h        |   2 +
 src/modinfodialog.ui       |  25 +++-
 src/modinfodialognexus.cpp |  16 +++
 src/modinfodialognexus.h   |   1 +
 src/modinfoforeign.h       |   2 +
 src/modinfooverwrite.h     |   2 +
 src/modinforegular.cpp     |  23 +++-
 src/modinforegular.h       |  11 ++
 src/modinfoseparator.h     |   2 +
 src/modlistviewactions.cpp |  44 ++++---
 src/organizer_en.ts        | 233 +++++++++++++++++++------------------
 src/version.rc             |  53 ++++-----
 14 files changed, 255 insertions(+), 171 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 18a288c64..ac4e093d1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4476,6 +4476,8 @@ void MainWindow::nxmModInfoAvailable(QString gameName, int modID, QVariant userD
 
     mod->setNexusDescription(result["description"].toString());
 
+    mod->setNexusCategory(result["category_id"].toInt());
+
     if ((mod->endorsedState() != EndorsedState::ENDORSED_NEVER) &&
         (result.contains("endorsement"))) {
       QVariantMap endorsement   = result["endorsement"].toMap();
diff --git a/src/modinfo.h b/src/modinfo.h
index 9895d44c6..0736aa206 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -887,6 +887,16 @@ class ModInfo : public QObject, public MOBase::IModInterface
    * @brief Set the last time the mod was updated on Nexus.
    */
   virtual void setNexusLastModified(QDateTime time) = 0;
+  
+  /**
+   * @return the assigned nexus category ID
+   */
+  virtual int getNexusCategory() const = 0;
+
+  /**
+   * @brief Assigns the given Nexus category ID
+   */
+  virtual void setNexusCategory(int category) = 0;
 
 public:  // Conflicts
   // retrieve the list of mods (as mod index) that are overwritten by this one.
diff --git a/src/modinfobackup.h b/src/modinfobackup.h
index 01abf1845..0c3c29d77 100644
--- a/src/modinfobackup.h
+++ b/src/modinfobackup.h
@@ -38,6 +38,8 @@ class ModInfoBackup : public ModInfoRegular
   virtual QDateTime getNexusLastModified() const override { return QDateTime(); }
   virtual void setNexusLastModified(QDateTime) override {}
   virtual QString getNexusDescription() const override { return QString(); }
+  virtual void setNexusCategory(int) override {}
+  virtual int getNexusCategory() const override { return 0; }
   virtual bool isBackup() const override { return true; }
 
   virtual void addInstalledFile(int, int) override {}
diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 269aebe3f..53655aa53 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -966,7 +966,7 @@ text-align: left;</string>
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0,0,0,0,0,1">
+           <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0,0,0,0,0,0,0,1">
             <item>
              <widget class="QLabel" name="label_3">
               <property name="text">
@@ -1026,6 +1026,29 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QLabel" name="categoryLabel">
+              <property name="text">
+               <string>Category</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="category">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>1</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="baseSize">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </widget>
+            </item>
             <item>
              <spacer name="horizontalSpacer_2">
               <property name="orientation">
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 566361458..485f138a9 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -32,6 +32,9 @@ NexusTab::NexusTab(ModInfoDialogTabContext cx)
   connect(ui->version, &QLineEdit::editingFinished, [&] {
     onVersionChanged();
   });
+  connect(ui->category, &QLineEdit::editingFinished, [&] {
+    onCategoryChanged();
+  });
 
   connect(ui->refresh, &QPushButton::clicked, [&] {
     onRefreshBrowser();
@@ -75,6 +78,7 @@ void NexusTab::clear()
   ui->modID->clear();
   ui->sourceGame->clear();
   ui->version->clear();
+  ui->category->clear();
   ui->browser->setPage(new NexusTabWebpage(ui->browser));
   ui->hasCustomURL->setChecked(false);
   ui->customURL->clear();
@@ -108,6 +112,8 @@ void NexusTab::update()
 
   ui->sourceGame->setCurrentIndex(ui->sourceGame->findData(gameName));
 
+  ui->category->setText(QString("%1").arg(mod().getNexusCategory()));
+
   auto* page = new NexusTabWebpage(ui->browser);
   ui->browser->setPage(page);
 
@@ -360,6 +366,16 @@ void NexusTab::onVersionChanged()
   updateVersionColor();
 }
 
+void NexusTab::onCategoryChanged()
+{
+  if (m_loading) {
+    return;
+  }
+
+  int category = ui->category->text().toInt();
+  mod().setNexusCategory(category);
+}
+
 void NexusTab::onRefreshBrowser()
 {
   const auto modID = mod().nexusId();
diff --git a/src/modinfodialognexus.h b/src/modinfodialognexus.h
index e9a8720f3..e752018a4 100644
--- a/src/modinfodialognexus.h
+++ b/src/modinfodialognexus.h
@@ -57,6 +57,7 @@ class NexusTab : public ModInfoDialogTab
   void onModIDChanged();
   void onSourceGameChanged();
   void onVersionChanged();
+  void onCategoryChanged();
 
   void onRefreshBrowser();
   void onVisitNexus();
diff --git a/src/modinfoforeign.h b/src/modinfoforeign.h
index 2c956fb7f..dc66e1b04 100644
--- a/src/modinfoforeign.h
+++ b/src/modinfoforeign.h
@@ -60,6 +60,8 @@ class ModInfoForeign : public ModInfoWithConflictInfo
   virtual void setNexusFileStatus(int) override {}
   virtual QDateTime getLastNexusUpdate() const override { return QDateTime(); }
   virtual void setLastNexusUpdate(QDateTime) override {}
+  virtual int getNexusCategory() const override { return 0; }
+  virtual void setNexusCategory(int) override {}
   virtual QDateTime getLastNexusQuery() const override { return QDateTime(); }
   virtual void setLastNexusQuery(QDateTime) override {}
   virtual QDateTime getNexusLastModified() const override { return QDateTime(); }
diff --git a/src/modinfooverwrite.h b/src/modinfooverwrite.h
index 02154902a..45b5bbdd0 100644
--- a/src/modinfooverwrite.h
+++ b/src/modinfooverwrite.h
@@ -68,6 +68,8 @@ class ModInfoOverwrite : public ModInfoWithConflictInfo
   virtual QDateTime getNexusLastModified() const override { return QDateTime(); }
   virtual void setNexusLastModified(QDateTime) override {}
   virtual QString getNexusDescription() const override { return QString(); }
+  virtual void setNexusCategory(int) override {}
+  virtual int getNexusCategory() const override { return 0; }
   virtual QStringList archives(bool checkOnDisk = false) override;
   virtual void addInstalledFile(int, int) override {}
   virtual std::set<std::pair<int, int>> installedFiles() const override { return {}; }
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index 9cb893071..e238075a8 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -97,6 +97,7 @@ void ModInfoRegular::readMeta()
   m_InstallationFile = metaFile.value("installationFile", "").toString();
   m_NexusDescription = metaFile.value("nexusDescription", "").toString();
   m_NexusFileStatus  = metaFile.value("nexusFileStatus", "1").toInt();
+  m_NexusCategory    = metaFile.value("nexusCategory", 0).toInt();
   m_Repository       = metaFile.value("repository", "Nexus").toString();
   m_Converted        = metaFile.value("converted", false).toBool();
   m_Validated        = metaFile.value("validated", false).toBool();
@@ -171,10 +172,11 @@ void ModInfoRegular::readMeta()
   m_NexusLastModified = QDateTime::fromString(
       metaFile.value("nexusLastModified", QDateTime::currentDateTimeUtc()).toString(),
       Qt::ISODate);
-  m_Color        = metaFile.value("color", QColor()).value<QColor>();
-  m_TrackedState = metaFile.value("tracked", false).toBool()
-                       ? TrackedState::TRACKED_TRUE
-                       : TrackedState::TRACKED_FALSE;
+  m_NexusCategory = metaFile.value("nexusCategory", 0).toInt();
+  m_Color         = metaFile.value("color", QColor()).value<QColor>();
+  m_TrackedState  = metaFile.value("tracked", false).toBool()
+                        ? TrackedState::TRACKED_TRUE
+                        : TrackedState::TRACKED_FALSE;
   if (metaFile.contains("endorsed")) {
     if (metaFile.value("endorsed").canConvert<int>()) {
       using ut = std::underlying_type_t<EndorsedState>;
@@ -266,6 +268,7 @@ void ModInfoRegular::saveMeta()
       metaFile.setValue("lastNexusQuery", m_LastNexusQuery.toString(Qt::ISODate));
       metaFile.setValue("lastNexusUpdate", m_LastNexusUpdate.toString(Qt::ISODate));
       metaFile.setValue("nexusLastModified", m_NexusLastModified.toString(Qt::ISODate));
+      metaFile.setValue("nexusCategory", m_NexusCategory);
       metaFile.setValue("converted", m_Converted);
       metaFile.setValue("validated", m_Validated);
       metaFile.setValue("color", m_Color);
@@ -833,6 +836,18 @@ void ModInfoRegular::setNexusLastModified(QDateTime time)
   emit modDetailsUpdated(true);
 }
 
+int ModInfoRegular::getNexusCategory() const
+{
+  return m_NexusCategory;
+}
+
+void ModInfoRegular::setNexusCategory(int category)
+{
+  m_NexusCategory   = category;
+  m_MetaInfoChanged = true;
+  saveMeta();
+}
+
 void ModInfoRegular::setCustomURL(QString const& url)
 {
   m_CustomURL       = url;
diff --git a/src/modinforegular.h b/src/modinforegular.h
index 6c85d66c3..a408d966a 100644
--- a/src/modinforegular.h
+++ b/src/modinforegular.h
@@ -379,6 +379,16 @@ class ModInfoRegular : public ModInfoWithConflictInfo
    */
   virtual void setNexusLastModified(QDateTime time) override;
 
+  /**
+   * @return the assigned nexus category ID
+   */
+  virtual int getNexusCategory() const override;
+
+  /**
+   * @brief Assigns the given Nexus category ID
+   */
+  virtual void setNexusCategory(int category) override;
+
   virtual QStringList archives(bool checkOnDisk = false) override;
 
   virtual void setColor(QColor color) override;
@@ -457,6 +467,7 @@ private slots:
   QDateTime m_LastNexusQuery;
   QDateTime m_LastNexusUpdate;
   QDateTime m_NexusLastModified;
+  int m_NexusCategory;
 
   QColor m_Color;
 
diff --git a/src/modinfoseparator.h b/src/modinfoseparator.h
index c34dd92bc..67bc3d561 100644
--- a/src/modinfoseparator.h
+++ b/src/modinfoseparator.h
@@ -45,6 +45,8 @@ class ModInfoSeparator : public ModInfoRegular
   virtual void setLastNexusQuery(QDateTime) override {}
   virtual QDateTime getNexusLastModified() const override { return QDateTime(); }
   virtual void setNexusLastModified(QDateTime) override {}
+  virtual int getNexusCategory() const override { return 0; }
+  virtual void setNexusCategory(int) override {}
   virtual QDateTime creationTime() const override { return QDateTime(); }
   virtual QString getNexusDescription() const override { return QString(); }
   virtual void addInstalledFile(int /*modId*/, int /*fileId*/) override {}
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index aa962c1e0..a86c90676 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -265,18 +265,20 @@ void ModListViewActions::assignCategories() const
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
     QString file         = modInfo->installationFile();
-    auto download        = m_core.downloadManager()->getDownloadIndex(file);
-    if (download >= 0) {
-      int nexusCategory = m_core.downloadManager()->getCategoryID(download);
-      int newCategory   = CategoryFactory::instance()->resolveNexusID(nexusCategory);
-      if (newCategory != 0) {
-        for (auto category : modInfo->categories()) {
-          modInfo->removeCategory(category);
-        }
+    int nexusCategory    = modInfo->getNexusCategory();
+    if (!nexusCategory) {
+      auto download = m_core.downloadManager()->getDownloadIndex(file);
+      if (download >= 0) {
+        int nexusCategory = m_core.downloadManager()->getCategoryID(download);
+      }
+    }
+    int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
+    if (newCategory != 0) {
+      for (auto category : modInfo->categories()) {
+        modInfo->removeCategory(category);
       }
-      modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory),
-                           true);
     }
+    modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory), true);
   }
 }
 
@@ -1108,16 +1110,20 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
   for (auto& idx : indices) {
     ModInfo::Ptr modInfo = ModInfo::getByIndex(idx.data(ModList::IndexRole).toInt());
 
-    int downloadIndex =
-        m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
-    if (downloadIndex >= 0) {
-      auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
-      unsigned int categoryIndex =
-          CategoryFactory::instance()->resolveNexusID(downloadInfo->categoryID);
-      if (categoryIndex != 0)
-        modInfo->setPrimaryCategory(
-            CategoryFactory::instance()->getCategoryID(categoryIndex));
+    int categoryID = modInfo->getNexusCategory();
+    if (!categoryID) {
+      int downloadIndex =
+          m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
+      if (downloadIndex >= 0) {
+        auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
+        categoryID        = downloadInfo->categoryID;
+      }
     }
+    unsigned int categoryIndex =
+        CategoryFactory::instance()->resolveNexusID(categoryID);
+    if (categoryIndex != 0)
+      modInfo->setPrimaryCategory(
+          CategoryFactory::instance()->getCategoryID(categoryIndex));
   }
 }
 
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 71be41879..228b275a3 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -4048,115 +4048,115 @@ You will have to visit the mod page on the %1 Nexus site to change your mind.</s
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3359"/>
+        <location filename="mainwindow.cpp" line="3361"/>
         <source>Thank you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3360"/>
+        <location filename="mainwindow.cpp" line="3362"/>
         <source>Thank you for your endorsement!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3474"/>
+        <location filename="mainwindow.cpp" line="3476"/>
         <source>Mod ID %1 no longer seems to be available on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3492"/>
+        <location filename="mainwindow.cpp" line="3494"/>
         <source>Error %1: Request to Nexus failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3509"/>
-        <location filename="mainwindow.cpp" line="3582"/>
+        <location filename="mainwindow.cpp" line="3511"/>
+        <location filename="mainwindow.cpp" line="3584"/>
         <source>failed to read %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3522"/>
+        <location filename="mainwindow.cpp" line="3524"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3523"/>
+        <location filename="mainwindow.cpp" line="3525"/>
         <source>failed to extract %1 (errorcode %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3557"/>
+        <location filename="mainwindow.cpp" line="3559"/>
         <source>Extract BSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3596"/>
+        <location filename="mainwindow.cpp" line="3598"/>
         <source>This archive contains invalid hashes. Some files may be broken.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3606"/>
+        <location filename="mainwindow.cpp" line="3608"/>
         <source>Extract...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3675"/>
+        <location filename="mainwindow.cpp" line="3677"/>
         <source>Remove &apos;%1&apos; from the toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3731"/>
+        <location filename="mainwindow.cpp" line="3733"/>
         <source>Backup of load order created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3742"/>
+        <location filename="mainwindow.cpp" line="3744"/>
         <source>Choose backup to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3759"/>
+        <location filename="mainwindow.cpp" line="3761"/>
         <source>No Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3760"/>
+        <location filename="mainwindow.cpp" line="3762"/>
         <source>There are no backups to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3784"/>
-        <location filename="mainwindow.cpp" line="3808"/>
+        <location filename="mainwindow.cpp" line="3786"/>
+        <location filename="mainwindow.cpp" line="3810"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3785"/>
-        <location filename="mainwindow.cpp" line="3809"/>
+        <location filename="mainwindow.cpp" line="3787"/>
+        <location filename="mainwindow.cpp" line="3811"/>
         <source>Failed to restore the backup. Errorcode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3797"/>
+        <location filename="mainwindow.cpp" line="3799"/>
         <source>Backup of mod list created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3877"/>
+        <location filename="mainwindow.cpp" line="3879"/>
         <source>A file with the same name has already been downloaded. What would you like to do?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3879"/>
+        <location filename="mainwindow.cpp" line="3881"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3880"/>
+        <location filename="mainwindow.cpp" line="3882"/>
         <source>Rename new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3881"/>
+        <location filename="mainwindow.cpp" line="3883"/>
         <source>Ignore file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4480,88 +4480,93 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1068"/>
-        <location filename="modinfodialog.ui" line="1074"/>
+        <location filename="modinfodialog.ui" line="1032"/>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.ui" line="1091"/>
+        <location filename="modinfodialog.ui" line="1097"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1071"/>
+        <location filename="modinfodialog.ui" line="1094"/>
         <source>Refresh all information from Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1085"/>
-        <location filename="modinfodialog.ui" line="1210"/>
+        <location filename="modinfodialog.ui" line="1108"/>
+        <location filename="modinfodialog.ui" line="1233"/>
         <source>Open in Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1096"/>
+        <location filename="modinfodialog.ui" line="1119"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1107"/>
+        <location filename="modinfodialog.ui" line="1130"/>
         <source>Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1174"/>
+        <location filename="modinfodialog.ui" line="1197"/>
         <source>about:blank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1200"/>
+        <location filename="modinfodialog.ui" line="1223"/>
         <source>Use Custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1221"/>
+        <location filename="modinfodialog.ui" line="1244"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1229"/>
-        <location filename="modinfodialog.ui" line="1232"/>
-        <location filename="modinfodialog.ui" line="1235"/>
+        <location filename="modinfodialog.ui" line="1252"/>
+        <location filename="modinfodialog.ui" line="1255"/>
+        <location filename="modinfodialog.ui" line="1258"/>
         <source>Enter comments about the mod here.  These are displayed in the notes column of the mod list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1242"/>
+        <location filename="modinfodialog.ui" line="1265"/>
         <source>Set Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1249"/>
+        <location filename="modinfodialog.ui" line="1272"/>
         <source>Reset Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1258"/>
-        <location filename="modinfodialog.ui" line="1261"/>
-        <location filename="modinfodialog.ui" line="1267"/>
+        <location filename="modinfodialog.ui" line="1281"/>
+        <location filename="modinfodialog.ui" line="1284"/>
+        <location filename="modinfodialog.ui" line="1290"/>
         <source>Enter notes about the mod here.  These can be viewed in the mod list by hovering over the notes column or the flags column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1275"/>
+        <location filename="modinfodialog.ui" line="1298"/>
         <source>Filetree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1289"/>
+        <location filename="modinfodialog.ui" line="1312"/>
         <source>Open Mod in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1314"/>
+        <location filename="modinfodialog.ui" line="1337"/>
         <source>A directory view of this mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1317"/>
+        <location filename="modinfodialog.ui" line="1340"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -4571,17 +4576,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1353"/>
+        <location filename="modinfodialog.ui" line="1376"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1363"/>
+        <location filename="modinfodialog.ui" line="1386"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1386"/>
+        <location filename="modinfodialog.ui" line="1409"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4620,12 +4625,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModInfoRegular</name>
     <message>
-        <location filename="modinforegular.cpp" line="727"/>
+        <location filename="modinforegular.cpp" line="730"/>
         <source>%1 contains no esp/esm/esl and no asset (textures, meshes, interface, ...) directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinforegular.cpp" line="733"/>
+        <location filename="modinforegular.cpp" line="736"/>
         <source>Categories: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5324,7 +5329,7 @@ Please enter the name:</source>
     </message>
     <message>
         <location filename="modlistviewactions.cpp" line="120"/>
-        <location filename="modlistviewactions.cpp" line="1300"/>
+        <location filename="modlistviewactions.cpp" line="1306"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5336,7 +5341,7 @@ Please enter a name:</source>
     </message>
     <message>
         <location filename="modlistviewactions.cpp" line="131"/>
-        <location filename="modlistviewactions.cpp" line="1311"/>
+        <location filename="modlistviewactions.cpp" line="1317"/>
         <source>A mod with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5368,258 +5373,258 @@ Please enter a name:</source>
     </message>
     <message>
         <location filename="modlistviewactions.cpp" line="217"/>
-        <location filename="modlistviewactions.cpp" line="773"/>
-        <location filename="modlistviewactions.cpp" line="1022"/>
+        <location filename="modlistviewactions.cpp" line="775"/>
+        <location filename="modlistviewactions.cpp" line="1024"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="modlistviewactions.cpp" line="240"/>
-        <location filename="modlistviewactions.cpp" line="300"/>
+        <location filename="modlistviewactions.cpp" line="302"/>
         <source>You are not currently authenticated with Nexus. Please do so under Settings -&gt; Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="319"/>
+        <location filename="modlistviewactions.cpp" line="321"/>
         <source>Export to csv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="323"/>
+        <location filename="modlistviewactions.cpp" line="325"/>
         <source>CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.
 You can also use online editors and converters instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="328"/>
+        <location filename="modlistviewactions.cpp" line="330"/>
         <source>Select what mods you want export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="329"/>
+        <location filename="modlistviewactions.cpp" line="331"/>
         <source>All installed mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="331"/>
+        <location filename="modlistviewactions.cpp" line="333"/>
         <source>Only active (checked) mods from your current profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="333"/>
+        <location filename="modlistviewactions.cpp" line="335"/>
         <source>All currently visible mods in the mod list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="350"/>
+        <location filename="modlistviewactions.cpp" line="352"/>
         <source>Choose what Columns to export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="353"/>
+        <location filename="modlistviewactions.cpp" line="355"/>
         <source>Mod_Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="355"/>
+        <location filename="modlistviewactions.cpp" line="357"/>
         <source>Mod_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="357"/>
+        <location filename="modlistviewactions.cpp" line="359"/>
         <source>Notes_column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="358"/>
+        <location filename="modlistviewactions.cpp" line="360"/>
         <source>Mod_Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="360"/>
+        <location filename="modlistviewactions.cpp" line="362"/>
         <source>Primary_Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="361"/>
+        <location filename="modlistviewactions.cpp" line="363"/>
         <source>Nexus_ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="362"/>
+        <location filename="modlistviewactions.cpp" line="364"/>
         <source>Mod_Nexus_URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="363"/>
+        <location filename="modlistviewactions.cpp" line="365"/>
         <source>Mod_Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="364"/>
+        <location filename="modlistviewactions.cpp" line="366"/>
         <source>Install_Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="365"/>
+        <location filename="modlistviewactions.cpp" line="367"/>
         <source>Download_File_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="492"/>
+        <location filename="modlistviewactions.cpp" line="494"/>
         <source>export failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="546"/>
+        <location filename="modlistviewactions.cpp" line="548"/>
         <source>Failed to display overwrite dialog: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="607"/>
+        <location filename="modlistviewactions.cpp" line="609"/>
         <source>Set Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="608"/>
+        <location filename="modlistviewactions.cpp" line="610"/>
         <source>Set the priority of the selected mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="738"/>
+        <location filename="modlistviewactions.cpp" line="740"/>
         <source>failed to rename mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="774"/>
+        <location filename="modlistviewactions.cpp" line="776"/>
         <source>Remove the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="791"/>
+        <location filename="modlistviewactions.cpp" line="793"/>
         <source>failed to remove mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="819"/>
+        <location filename="modlistviewactions.cpp" line="821"/>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="820"/>
+        <location filename="modlistviewactions.cpp" line="822"/>
         <source>The versioning scheme decides which version is considered newer than another.
 This function will guess the versioning scheme under the assumption that the installed version is outdated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="846"/>
+        <location filename="modlistviewactions.cpp" line="848"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="847"/>
+        <location filename="modlistviewactions.cpp" line="849"/>
         <source>I don&apos;t know a versioning scheme where %1 is newer than %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="868"/>
+        <location filename="modlistviewactions.cpp" line="870"/>
         <source>Opening Nexus Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="869"/>
+        <location filename="modlistviewactions.cpp" line="871"/>
         <source>You are trying to open %1 links to Nexus Mods.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="892"/>
-        <location filename="modlistviewactions.cpp" line="914"/>
+        <location filename="modlistviewactions.cpp" line="894"/>
+        <location filename="modlistviewactions.cpp" line="916"/>
         <source>Opening Web Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="893"/>
-        <location filename="modlistviewactions.cpp" line="915"/>
+        <location filename="modlistviewactions.cpp" line="895"/>
+        <location filename="modlistviewactions.cpp" line="917"/>
         <source>You are trying to open %1 Web Pages.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="965"/>
-        <location filename="modlistviewactions.cpp" line="970"/>
-        <location filename="modlistviewactions.cpp" line="981"/>
+        <location filename="modlistviewactions.cpp" line="967"/>
+        <location filename="modlistviewactions.cpp" line="972"/>
+        <location filename="modlistviewactions.cpp" line="983"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="966"/>
+        <location filename="modlistviewactions.cpp" line="968"/>
         <source>Installation file no longer exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="971"/>
+        <location filename="modlistviewactions.cpp" line="973"/>
         <source>Mods installed with old versions of MO can&apos;t be reinstalled in this way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="981"/>
+        <location filename="modlistviewactions.cpp" line="983"/>
         <source>Failed to create backup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1023"/>
+        <location filename="modlistviewactions.cpp" line="1025"/>
         <source>Restore all hidden files in the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1056"/>
-        <location filename="modlistviewactions.cpp" line="1370"/>
+        <location filename="modlistviewactions.cpp" line="1058"/>
+        <location filename="modlistviewactions.cpp" line="1376"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1057"/>
+        <location filename="modlistviewactions.cpp" line="1059"/>
         <source>About to restore all hidden files in:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1090"/>
+        <location filename="modlistviewactions.cpp" line="1092"/>
         <source>Endorsing multiple mods will take a while. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1252"/>
+        <location filename="modlistviewactions.cpp" line="1258"/>
         <source>Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1253"/>
+        <location filename="modlistviewactions.cpp" line="1259"/>
         <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1257"/>
+        <location filename="modlistviewactions.cpp" line="1263"/>
         <source>failed to remove mod &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1263"/>
+        <location filename="modlistviewactions.cpp" line="1269"/>
         <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1282"/>
+        <location filename="modlistviewactions.cpp" line="1288"/>
         <source>Move successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1301"/>
+        <location filename="modlistviewactions.cpp" line="1307"/>
         <source>This will move all files from overwrite into a new, regular mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1371"/>
+        <location filename="modlistviewactions.cpp" line="1377"/>
         <source>About to recursively delete:
 </source>
         <translation type="unfinished"></translation>
@@ -5760,27 +5765,27 @@ Please enter a name:</source>
 <context>
     <name>NexusTab</name>
     <message>
-        <location filename="modinfodialognexus.cpp" line="150"/>
+        <location filename="modinfodialognexus.cpp" line="156"/>
         <source>Current Version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="153"/>
+        <location filename="modinfodialognexus.cpp" line="159"/>
         <source>No update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="185"/>
+        <location filename="modinfodialognexus.cpp" line="191"/>
         <source>Tracked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="188"/>
+        <location filename="modinfodialognexus.cpp" line="194"/>
         <source>Untracked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="301"/>
+        <location filename="modinfodialognexus.cpp" line="307"/>
         <source>
       &lt;div style=&quot;text-align: center;&quot;&gt;
       &lt;p&gt;This mod does not have a valid Nexus ID. You can add a custom web
diff --git a/src/version.rc b/src/version.rc
index 0db83d44d..aa92aee1d 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,37 +1,24 @@
 #include "Winver.h"
 
-// If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
-// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
-// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
-#define VER_FILEVERSION     2,5,0
-#define VER_FILEVERSION_STR "2.5.0-beta7\0"
+// If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses
+// VER_FILEVERSION to determine version number. Otherwise, if letters are used in
+// VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser Otherwise, uses the
+// numbers from VER_FILEVERSION and sets the release type as pre-alpha
+#define VER_FILEVERSION 2, 5, 0
+#define VER_FILEVERSION_STR "2.5.0-beta9\0"
 
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION     VER_FILEVERSION
-PRODUCTVERSION  VER_FILEVERSION
-FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-FILEFLAGS       VS_FF_PRERELEASE
-FILEOS          VOS__WINDOWS32
-FILETYPE        VFT_APP
-FILESUBTYPE     (0)
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-        VALUE "FileVersion", VER_FILEVERSION_STR
-        VALUE "CompanyName", "Mod Organizer 2 Team\0"
-        VALUE "FileDescription",  "Mod Organizer 2 GUI\0"
-        VALUE "OriginalFilename", "ModOrganizer.exe\0"
-        VALUE "InternalName", "ModOrganizer2\0"
-        VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 contributors\0"
-        VALUE "ProductName",      "Mod Organizer 2\0"
-        VALUE "ProductVersion", VER_FILEVERSION_STR
-      END
-    END
+VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION PRODUCTVERSION VER_FILEVERSION
+    FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS VS_FF_PRERELEASE FILEOS VOS__WINDOWS32
+        FILETYPE VFT_APP FILESUBTYPE(0) BEGIN BLOCK
+    "StringFileInfo" BEGIN BLOCK "040904B0" BEGIN VALUE "FileVersion",
+    VER_FILEVERSION_STR VALUE "CompanyName",
+    "Mod Organizer 2 Team\0" VALUE "FileDescription",
+    "Mod Organizer 2 GUI\0" VALUE "OriginalFilename",
+    "ModOrganizer.exe\0" VALUE "InternalName", "ModOrganizer2\0" VALUE "LegalCopyright",
+    "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 "
+    "contributors\0" VALUE "ProductName",
+    "Mod Organizer 2\0" VALUE "ProductVersion",
+    VER_FILEVERSION_STR END END
 
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x0409, 1200
-    END
-END
+    BLOCK "VarFileInfo" BEGIN VALUE "Translation",
+    0x0409, 1200 END END

From 59bc9e316797346b34ebfbcfe15c96f45c370dab Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 19 Sep 2023 02:59:40 -0500
Subject: [PATCH 23/43] Make the category table sortable

---
 src/categoriesdialog.ui | 439 ++++++++++++++++++++--------------------
 src/organizer_en.ts     |  40 ++--
 2 files changed, 247 insertions(+), 232 deletions(-)

diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index 04aa57043..d1966867c 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -1,221 +1,226 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CategoriesDialog</class>
- <widget class="QDialog" name="CategoriesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>735</width>
-    <height>444</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Categories</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="5">
-    <widget class="QPushButton" name="nexusRefresh">
-     <property name="text">
-      <string>Refresh from Nexus</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="4">
-    <widget class="QPushButton" name="nexusImportButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&lt;-- Import Nexus Cats</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="CategoriesTable" name="categoriesTable">
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="acceptDrops">
-      <bool>true</bool>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::DropOnly</enum>
-     </property>
-     <property name="defaultDropAction">
-      <enum>Qt::IgnoreAction</enum>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <property name="gridStyle">
-      <enum>Qt::DashLine</enum>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
-     </property>
-     <attribute name="horizontalHeaderVisible">
-      <bool>true</bool>
-     </attribute>
-     <attribute name="horizontalHeaderMinimumSectionSize">
-      <number>26</number>
-     </attribute>
-     <attribute name="horizontalHeaderDefaultSectionSize">
-      <number>100</number>
-     </attribute>
-     <attribute name="horizontalHeaderHighlightSections">
-      <bool>true</bool>
-     </attribute>
-     <attribute name="horizontalHeaderStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-     <attribute name="verticalHeaderVisible">
-      <bool>true</bool>
-     </attribute>
-     <column>
-      <property name="text">
-       <string>ID</string>
-      </property>
-      <property name="toolTip">
-       <string>Internal ID for the category.</string>
-      </property>
-      <property name="whatsThis">
-       <string>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Name</string>
-      </property>
-      <property name="toolTip">
-       <string>Name of the Categorie used for display.</string>
-      </property>
-      <property name="whatsThis">
-       <string>Name of the Categorie used for display.</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Parent ID</string>
-      </property>
-      <property name="toolTip">
-       <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Nexus Categories</string>
-      </property>
-      <property name="toolTip">
-       <string>Comma-Separated list of Nexus IDs to be matched to the internal ID.</string>
-      </property>
-      <property name="whatsThis">
-       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="0" column="4" colspan="2">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="toolTip">
-      <string>Drag &amp; drop nexus categories from this pane onto the target category on the left.</string>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="title">
-      <string>Nexus Categories</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QListWidget" name="nexusCategoryList">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="dragEnabled">
-         <bool>true</bool>
-        </property>
-        <property name="dragDropMode">
-         <enum>QAbstractItemView::DragOnly</enum>
-        </property>
-       </widget>
+  <class>CategoriesDialog</class>
+  <widget class="QDialog" name="CategoriesDialog">
+    <property name="geometry">
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>735</width>
+        <height>444</height>
+      </rect>
+    </property>
+    <property name="windowTitle">
+      <string>Categories</string>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+      <item row="4" column="3">
+        <widget class="QDialogButtonBox" name="buttonBox">
+          <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="standardButtons">
+            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+          </property>
+        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>CategoriesTable</class>
-   <extends>QTableWidget</extends>
-   <header>categoriestable.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>CategoriesDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>CategoriesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+      <item row="4" column="5">
+        <widget class="QPushButton" name="nexusRefresh">
+          <property name="text">
+            <string>Refresh from Nexus</string>
+          </property>
+        </widget>
+      </item>
+      <item row="4" column="4">
+        <widget class="QPushButton" name="nexusImportButton">
+          <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+            </sizepolicy>
+          </property>
+          <property name="text">
+            <string>&lt;-- Import Nexus Cats</string>
+          </property>
+        </widget>
+      </item>
+      <item row="0" column="3">
+        <widget class="CategoriesTable" name="categoriesTable">
+          <property name="contextMenuPolicy">
+            <enum>Qt::CustomContextMenu</enum>
+          </property>
+          <property name="acceptDrops">
+            <bool>true</bool>
+          </property>
+          <property name="dragEnabled">
+            <bool>false</bool>
+          </property>
+          <property name="dragDropOverwriteMode">
+            <bool>false</bool>
+          </property>
+          <property name="dragDropMode">
+            <enum>QAbstractItemView::DropOnly</enum>
+          </property>
+          <property name="defaultDropAction">
+            <enum>Qt::IgnoreAction</enum>
+          </property>
+          <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+          </property>
+          <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+          <property name="gridStyle">
+            <enum>Qt::DashLine</enum>
+          </property>
+          <property name="sortingEnabled">
+            <bool>true</bool>
+          </property>
+          <property name="wordWrap">
+            <bool>false</bool>
+          </property>
+          <attribute name="horizontalHeaderVisible">
+            <bool>true</bool>
+          </attribute>
+          <attribute name="horizontalHeaderMinimumSectionSize">
+            <number>26</number>
+          </attribute>
+          <attribute name="horizontalHeaderDefaultSectionSize">
+            <number>100</number>
+          </attribute>
+          <attribute name="horizontalHeaderHighlightSections">
+            <bool>true</bool>
+          </attribute>
+          <attribute name="horizontalHeaderStretchLastSection">
+            <bool>false</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+            <bool>true</bool>
+          </attribute>
+          <column>
+            <property name="text">
+              <string>ID</string>
+            </property>
+            <property name="toolTip">
+              <string>Internal ID for the category.</string>
+            </property>
+            <property name="whatsThis">
+              <string>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</string>
+            </property>
+          </column>
+          <column>
+            <property name="text">
+              <string>Name</string>
+            </property>
+            <property name="toolTip">
+              <string>The display name of the category.</string>
+            </property>
+            <property name="whatsThis">
+              <string>The display name of the category.</string>
+            </property>
+          </column>
+          <column>
+            <property name="text">
+              <string>Parent ID</string>
+            </property>
+            <property name="toolTip">
+              <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
+            </property>
+          </column>
+          <column>
+            <property name="text">
+              <string>Nexus Categories</string>
+            </property>
+            <property name="toolTip">
+              <string>Comma-Separated list of Nexus IDs to be matched to the internal ID.</string>
+            </property>
+            <property name="whatsThis">
+              <string>
+                &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+                &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+                p, li { white-space: pre-wrap; }
+                &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
+                &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
+                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+              </string>
+            </property>
+          </column>
+        </widget>
+      </item>
+      <item row="0" column="4" colspan="2">
+        <widget class="QGroupBox" name="groupBox">
+          <property name="toolTip">
+            <string>Drag &amp; drop nexus categories from this pane onto the target category on the left.</string>
+          </property>
+          <property name="layoutDirection">
+            <enum>Qt::LeftToRight</enum>
+          </property>
+          <property name="title">
+            <string>Nexus Categories</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
+            <item>
+              <widget class="QListWidget" name="nexusCategoryList">
+                <property name="sizePolicy">
+                  <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                  </sizepolicy>
+                </property>
+                <property name="dragEnabled">
+                  <bool>true</bool>
+                </property>
+                <property name="dragDropMode">
+                  <enum>QAbstractItemView::DragOnly</enum>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </widget>
+      </item>
+    </layout>
+  </widget>
+  <customwidgets>
+    <customwidget>
+      <class>CategoriesTable</class>
+      <extends>QTableWidget</extends>
+      <header>categoriestable.h</header>
+    </customwidget>
+  </customwidgets>
+  <resources/>
+  <connections>
+    <connection>
+      <sender>buttonBox</sender>
+      <signal>accepted()</signal>
+      <receiver>CategoriesDialog</receiver>
+      <slot>accept()</slot>
+      <hints>
+        <hint type="sourcelabel">
+          <x>248</x>
+          <y>254</y>
+        </hint>
+        <hint type="destinationlabel">
+          <x>157</x>
+          <y>274</y>
+        </hint>
+      </hints>
+    </connection>
+    <connection>
+      <sender>buttonBox</sender>
+      <signal>rejected()</signal>
+      <receiver>CategoriesDialog</receiver>
+      <slot>reject()</slot>
+      <hints>
+        <hint type="sourcelabel">
+          <x>316</x>
+          <y>260</y>
+        </hint>
+        <hint type="destinationlabel">
+          <x>286</x>
+          <y>274</y>
+        </hint>
+      </hints>
+    </connection>
+  </connections>
 </ui>
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 228b275a3..9eef07f70 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -234,65 +234,75 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="99"/>
+        <location filename="categoriesdialog.ui" line="102"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="102"/>
+        <location filename="categoriesdialog.ui" line="105"/>
         <source>Internal ID for the category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="105"/>
+        <location filename="categoriesdialog.ui" line="108"/>
         <source>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="110"/>
+        <location filename="categoriesdialog.ui" line="113"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="113"/>
         <location filename="categoriesdialog.ui" line="116"/>
-        <source>Name of the Categorie used for display.</source>
+        <location filename="categoriesdialog.ui" line="119"/>
+        <source>The display name of the category.</source>
+        <oldsource>Name of the Categorie used for display.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="121"/>
+        <location filename="categoriesdialog.ui" line="124"/>
         <source>Parent ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="124"/>
+        <location filename="categoriesdialog.ui" line="127"/>
         <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="129"/>
-        <location filename="categoriesdialog.ui" line="155"/>
+        <location filename="categoriesdialog.ui" line="132"/>
+        <location filename="categoriesdialog.ui" line="160"/>
         <source>Nexus Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="132"/>
+        <location filename="categoriesdialog.ui" line="135"/>
         <source>Comma-Separated list of Nexus IDs to be matched to the internal ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="135"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <location filename="categoriesdialog.ui" line="138"/>
+        <source>
+                &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+                &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+                p, li { white-space: pre-wrap; }
+                &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
+                &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
+                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+              </source>
+        <oldsource>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="149"/>
+        <location filename="categoriesdialog.ui" line="154"/>
         <source>Drag &amp; drop nexus categories from this pane onto the target category on the left.</source>
         <translation type="unfinished"></translation>
     </message>

From f8b015220d7b743bdf6829fae610e7dfe33cf176 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Tue, 19 Sep 2023 03:22:12 -0500
Subject: [PATCH 24/43] Cleanup

---
 src/modinfo.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modinfo.h b/src/modinfo.h
index 0736aa206..d9e87ae05 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -887,7 +887,7 @@ class ModInfo : public QObject, public MOBase::IModInterface
    * @brief Set the last time the mod was updated on Nexus.
    */
   virtual void setNexusLastModified(QDateTime time) = 0;
-  
+
   /**
    * @return the assigned nexus category ID
    */

From 049a7e2efd4a42437cc6e06b59d9a28cc65457bc Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Wed, 20 Sep 2023 20:44:20 -0500
Subject: [PATCH 25/43] Dialogs and bugfixes

---
 src/installationmanager.cpp | 19 ++++++++++---------
 src/modlistviewactions.cpp  | 17 ++++++++++++++++-
 src/settings.cpp            | 10 ++++++++++
 src/settings.h              |  3 +++
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 901c636cb..3f247b388 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -667,20 +667,21 @@ InstallationResult InstallationManager::install(const QString& fileName,
     if (category != 0 && categoryIndex == 0U &&
         Settings::instance().nexus().categoryMappings()) {
       QMessageBox nexusQuery;
+      nexusQuery.setWindowTitle(tr("No category found"));
       nexusQuery.setText(tr(
           "This Nexus category has not yet been mapped. Do you wish to proceed without "
           "setting a category, proceed and disable automatic Nexus mappings, or stop "
           "and configure your category mappings?"));
-      nexusQuery.addButton(tr("&Proceed"), QMessageBox::YesRole);
-      nexusQuery.addButton(tr("&Disable"), QMessageBox::AcceptRole);
-      nexusQuery.addButton(tr("&Stop && Configure"), QMessageBox::DestructiveRole);
-      auto ret = nexusQuery.exec();
-      switch (ret) {
-      case 1:
+      QPushButton* proceedButton =
+          nexusQuery.addButton(tr("&Proceed"), QMessageBox::YesRole);
+      QPushButton* disableButton =
+          nexusQuery.addButton(tr("&Disable"), QMessageBox::AcceptRole);
+      QPushButton* stopButton =
+          nexusQuery.addButton(tr("&Stop && Configure"), QMessageBox::DestructiveRole);
+      nexusQuery.exec();
+      if (nexusQuery.clickedButton() == disableButton) {
         Settings::instance().nexus().setCategoryMappings(false);
-      case 0:
-        break;
-      case 2:
+      } else if (nexusQuery.clickedButton() == stopButton) {
         return MOBase::IPluginInstaller::RESULT_CATEGORYREQUESTED;
       }
     } else {
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index a86c90676..fd2f5c68d 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -262,6 +262,21 @@ void ModListViewActions::checkModsForUpdates() const
 
 void ModListViewActions::assignCategories() const
 {
+  if (!GlobalSettings::hideAssignCategoriesQuestion()) {
+    QMessageBox warning;
+    warning.setWindowTitle(tr("Are you sure?"));
+    warning.setText(
+        tr("This action will remove any existing categories on any mod with a valid "
+           "Nexus category mapping. Are you certain you want to proceed?"));
+    warning.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
+    QCheckBox dontShow(tr("&Don't show this again"));
+    warning.setCheckBox(&dontShow);
+    auto result = warning.exec();
+    if (dontShow.isChecked())
+      GlobalSettings::setHideAssignCategoriesQuestion(true);
+    if (result == QMessageBox::Cancel)
+      return;
+  }
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
     QString file         = modInfo->installationFile();
@@ -269,7 +284,7 @@ void ModListViewActions::assignCategories() const
     if (!nexusCategory) {
       auto download = m_core.downloadManager()->getDownloadIndex(file);
       if (download >= 0) {
-        int nexusCategory = m_core.downloadManager()->getCategoryID(download);
+        nexusCategory = m_core.downloadManager()->getCategoryID(download);
       }
     }
     int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
diff --git a/src/settings.cpp b/src/settings.cpp
index 17de38eaa..04a094676 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -2450,6 +2450,16 @@ void GlobalSettings::setHideCategoryReminder(bool b)
   settings().setValue("HideCategoryReminder", b);
 }
 
+bool GlobalSettings::hideAssignCategoriesQuestion()
+{
+  return settings().value("HideAssignCategoriesQuestion", false).toBool();
+}
+
+void GlobalSettings::setHideAssignCategoriesQuestion(bool b)
+{
+  settings().setValue("HideAssignCategoriesQuestion", b);
+}
+
 bool GlobalSettings::nexusApiKey(QString& apiKey)
 {
   QString tempKey = getWindowsCredential("APIKEY");
diff --git a/src/settings.h b/src/settings.h
index e7ca47a97..30254c066 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -931,6 +931,9 @@ class GlobalSettings
   static bool hideCategoryReminder();
   static void setHideCategoryReminder(bool b);
 
+  static bool hideAssignCategoriesQuestion();
+  static void setHideAssignCategoriesQuestion(bool b);
+
   // if the key exists from the credentials store, puts it in `apiKey` and
   // returns true; otherwise, returns false and leaves `apiKey` untouched
   //

From e18452ee76b69ddbc1b6140b8f79b2378982c5b3 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 00:02:52 -0500
Subject: [PATCH 26/43] Category dialog tweaks for clarity

---
 src/categoriesdialog.ui | 446 +++++++++++++++++++++-------------------
 1 file changed, 232 insertions(+), 214 deletions(-)

diff --git a/src/categoriesdialog.ui b/src/categoriesdialog.ui
index d1966867c..4f96d8a6b 100644
--- a/src/categoriesdialog.ui
+++ b/src/categoriesdialog.ui
@@ -1,141 +1,147 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
-  <class>CategoriesDialog</class>
-  <widget class="QDialog" name="CategoriesDialog">
-    <property name="geometry">
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>735</width>
-        <height>444</height>
-      </rect>
-    </property>
-    <property name="windowTitle">
-      <string>Categories</string>
-    </property>
-    <layout class="QGridLayout" name="gridLayout">
-      <item row="4" column="3">
-        <widget class="QDialogButtonBox" name="buttonBox">
-          <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="standardButtons">
-            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-          </property>
-        </widget>
-      </item>
-      <item row="4" column="5">
-        <widget class="QPushButton" name="nexusRefresh">
-          <property name="text">
-            <string>Refresh from Nexus</string>
-          </property>
-        </widget>
-      </item>
-      <item row="4" column="4">
-        <widget class="QPushButton" name="nexusImportButton">
-          <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-            </sizepolicy>
-          </property>
-          <property name="text">
-            <string>&lt;-- Import Nexus Cats</string>
-          </property>
-        </widget>
-      </item>
-      <item row="0" column="3">
-        <widget class="CategoriesTable" name="categoriesTable">
-          <property name="contextMenuPolicy">
-            <enum>Qt::CustomContextMenu</enum>
-          </property>
-          <property name="acceptDrops">
-            <bool>true</bool>
-          </property>
-          <property name="dragEnabled">
-            <bool>false</bool>
-          </property>
-          <property name="dragDropOverwriteMode">
-            <bool>false</bool>
-          </property>
-          <property name="dragDropMode">
-            <enum>QAbstractItemView::DropOnly</enum>
-          </property>
-          <property name="defaultDropAction">
-            <enum>Qt::IgnoreAction</enum>
-          </property>
-          <property name="selectionMode">
-            <enum>QAbstractItemView::SingleSelection</enum>
-          </property>
-          <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
-          </property>
-          <property name="gridStyle">
-            <enum>Qt::DashLine</enum>
-          </property>
-          <property name="sortingEnabled">
-            <bool>true</bool>
-          </property>
-          <property name="wordWrap">
-            <bool>false</bool>
-          </property>
-          <attribute name="horizontalHeaderVisible">
-            <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderMinimumSectionSize">
-            <number>26</number>
-          </attribute>
-          <attribute name="horizontalHeaderDefaultSectionSize">
-            <number>100</number>
-          </attribute>
-          <attribute name="horizontalHeaderHighlightSections">
-            <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderStretchLastSection">
-            <bool>false</bool>
-          </attribute>
-          <attribute name="verticalHeaderVisible">
-            <bool>true</bool>
-          </attribute>
-          <column>
-            <property name="text">
-              <string>ID</string>
-            </property>
-            <property name="toolTip">
-              <string>Internal ID for the category.</string>
-            </property>
-            <property name="whatsThis">
-              <string>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</string>
-            </property>
-          </column>
-          <column>
-            <property name="text">
-              <string>Name</string>
-            </property>
-            <property name="toolTip">
-              <string>The display name of the category.</string>
-            </property>
-            <property name="whatsThis">
-              <string>The display name of the category.</string>
-            </property>
-          </column>
-          <column>
-            <property name="text">
-              <string>Parent ID</string>
-            </property>
-            <property name="toolTip">
-              <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
-            </property>
-          </column>
-          <column>
-            <property name="text">
-              <string>Nexus Categories</string>
-            </property>
-            <property name="toolTip">
-              <string>Comma-Separated list of Nexus IDs to be matched to the internal ID.</string>
-            </property>
-            <property name="whatsThis">
-              <string>
+ <class>CategoriesDialog</class>
+ <widget class="QDialog" name="CategoriesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>711</width>
+    <height>434</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Categories</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="4" column="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="5">
+    <widget class="QPushButton" name="nexusRefresh">
+     <property name="text">
+      <string>Refresh from Nexus</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4">
+    <widget class="QPushButton" name="nexusImportButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>&lt;-- Import Nexus Cats</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3">
+    <widget class="CategoriesTable" name="categoriesTable">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="contextMenuPolicy">
+      <enum>Qt::CustomContextMenu</enum>
+     </property>
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::DropOnly</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::IgnoreAction</enum>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="gridStyle">
+      <enum>Qt::DashLine</enum>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="wordWrap">
+      <bool>false</bool>
+     </property>
+     <attribute name="horizontalHeaderVisible">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="horizontalHeaderMinimumSectionSize">
+      <number>26</number>
+     </attribute>
+     <attribute name="horizontalHeaderDefaultSectionSize">
+      <number>100</number>
+     </attribute>
+     <attribute name="horizontalHeaderHighlightSections">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="horizontalHeaderStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="verticalHeaderVisible">
+      <bool>true</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>ID</string>
+      </property>
+      <property name="toolTip">
+       <string>Internal ID for the category.</string>
+      </property>
+      <property name="whatsThis">
+       <string>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+      <property name="toolTip">
+       <string>The display name of the category.</string>
+      </property>
+      <property name="whatsThis">
+       <string>The display name of the category.</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Parent ID</string>
+      </property>
+      <property name="toolTip">
+       <string>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Nexus Categories</string>
+      </property>
+      <property name="toolTip">
+       <string>Comma-Separated list of Nexus IDs to be matched to the internal ID.</string>
+      </property>
+      <property name="whatsThis">
+       <string>
                 &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
                 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
                 p, li { white-space: pre-wrap; }
@@ -144,83 +150,95 @@
                 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
                 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
               </string>
-            </property>
-          </column>
-        </widget>
-      </item>
-      <item row="0" column="4" colspan="2">
-        <widget class="QGroupBox" name="groupBox">
-          <property name="toolTip">
-            <string>Drag &amp; drop nexus categories from this pane onto the target category on the left.</string>
-          </property>
-          <property name="layoutDirection">
-            <enum>Qt::LeftToRight</enum>
-          </property>
-          <property name="title">
-            <string>Nexus Categories</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout">
-            <item>
-              <widget class="QListWidget" name="nexusCategoryList">
-                <property name="sizePolicy">
-                  <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                  </sizepolicy>
-                </property>
-                <property name="dragEnabled">
-                  <bool>true</bool>
-                </property>
-                <property name="dragDropMode">
-                  <enum>QAbstractItemView::DragOnly</enum>
-                </property>
-              </widget>
-            </item>
-          </layout>
-        </widget>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="0" column="4" colspan="2">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>Drag &amp; drop nexus categories from this pane onto the target category on the left.</string>
+     </property>
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="title">
+      <string>Nexus Categories (Drag &amp;&amp; Drop to Assign)</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QListWidget" name="nexusCategoryList">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="dragEnabled">
+         <bool>true</bool>
+        </property>
+        <property name="dragDropMode">
+         <enum>QAbstractItemView::DragOnly</enum>
+        </property>
+       </widget>
       </item>
-    </layout>
-  </widget>
-  <customwidgets>
-    <customwidget>
-      <class>CategoriesTable</class>
-      <extends>QTableWidget</extends>
-      <header>categoriestable.h</header>
-    </customwidget>
-  </customwidgets>
-  <resources/>
-  <connections>
-    <connection>
-      <sender>buttonBox</sender>
-      <signal>accepted()</signal>
-      <receiver>CategoriesDialog</receiver>
-      <slot>accept()</slot>
-      <hints>
-        <hint type="sourcelabel">
-          <x>248</x>
-          <y>254</y>
-        </hint>
-        <hint type="destinationlabel">
-          <x>157</x>
-          <y>274</y>
-        </hint>
-      </hints>
-    </connection>
-    <connection>
-      <sender>buttonBox</sender>
-      <signal>rejected()</signal>
-      <receiver>CategoriesDialog</receiver>
-      <slot>reject()</slot>
-      <hints>
-        <hint type="sourcelabel">
-          <x>316</x>
-          <y>260</y>
-        </hint>
-        <hint type="destinationlabel">
-          <x>286</x>
-          <y>274</y>
-        </hint>
-      </hints>
-    </connection>
-  </connections>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CategoriesTable</class>
+   <extends>QTableWidget</extends>
+   <header>categoriestable.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>CategoriesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>CategoriesDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

From 639fc787bfbcc9d63765280c1c4e7e80e2bd1b34 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 00:03:42 -0500
Subject: [PATCH 27/43] Update new instance / migration dialogs

---
 src/mainwindow.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ac4e093d1..e34b648c2 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1289,14 +1289,15 @@ void MainWindow::showEvent(QShowEvent* event)
       }
 
       QMessageBox newCatDialog;
-      newCatDialog.setWindowTitle(tr("Import Categories"));
+      newCatDialog.setWindowTitle(tr("Category Setup"));
       newCatDialog.setText(
           tr("Please choose how to handle the default category setup.\n\n"
              "If you've already connected to Nexus, you can automatically import Nexus "
              "categories for this game (if applicable). Otherwise, use the old Mod "
-             "Organizer default category structure, or leave the categories blank."));
+             "Organizer default category structure, or leave the categories blank (for "
+             "manual setup)."));
       QPushButton importBtn(tr("&Import Nexus Categories"));
-      QPushButton defaultBtn(tr("Use &Default Categories"));
+      QPushButton defaultBtn(tr("Use &Old Category Defaults"));
       QPushButton cancelBtn(tr("Do &Nothing"));
       if (NexusInterface::instance().getAccessManager()->validated()) {
         newCatDialog.addButton(&importBtn, QMessageBox::ButtonRole::AcceptRole);
@@ -1319,7 +1320,7 @@ void MainWindow::showEvent(QShowEvent* event)
       if (m_LastVersion < QVersionNumber(2, 5) &&
           !GlobalSettings::hideCategoryReminder()) {
         QMessageBox migrateCatDialog;
-        migrateCatDialog.setWindowTitle("Category Updates");
+        migrateCatDialog.setWindowTitle("Category Migration");
         migrateCatDialog.setText(
             tr("This is your first time running version 2.5 or higher with an old MO2 "
                "instance. The category system now relies on an updated system to map "
@@ -1335,16 +1336,16 @@ void MainWindow::showEvent(QShowEvent* event)
                "which can be changed at any time in the Settings dialog."));
         QPushButton importBtn(tr("&Import Nexus Categories"));
         QPushButton openSettingsBtn(tr("&Open Categories Dialog"));
-        QPushButton showTutorialBtn(tr("&Show Tutorial"));
+        QPushButton disableBtn(tr("&Disable Nexus Mappings"));
         QPushButton closeBtn(tr("&Close"));
         QCheckBox dontShow(tr("&Don't show this again"));
         if (NexusInterface::instance().getAccessManager()->validated()) {
           migrateCatDialog.addButton(&importBtn, QMessageBox::ButtonRole::AcceptRole);
         }
         migrateCatDialog.addButton(&openSettingsBtn,
-                                   QMessageBox::ButtonRole::AcceptRole);
-        migrateCatDialog.addButton(&showTutorialBtn,
-                                   QMessageBox::ButtonRole::AcceptRole);
+                                   QMessageBox::ButtonRole::ActionRole);
+        migrateCatDialog.addButton(&disableBtn,
+                                   QMessageBox::ButtonRole::DestructiveRole);
         migrateCatDialog.addButton(&closeBtn, QMessageBox::ButtonRole::RejectRole);
         migrateCatDialog.setCheckBox(&dontShow);
         migrateCatDialog.exec();
@@ -1352,8 +1353,8 @@ void MainWindow::showEvent(QShowEvent* event)
           importCategories(dontShow.isChecked());
         } else if (migrateCatDialog.clickedButton() == &openSettingsBtn) {
           this->ui->filtersEdit->click();
-        } else if (migrateCatDialog.clickedButton() == &showTutorialBtn) {
-          // TODO: Implement tutorial
+        } else if (migrateCatDialog.clickedButton() == &disableBtn) {
+          Settings::instance().nexus().setCategoryMappings(false);
         }
         if (dontShow.isChecked()) {
           GlobalSettings::setHideCategoryReminder(true);

From 133c072eb7f63e807f2a211804537f59d1f8b0ed Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 00:08:58 -0500
Subject: [PATCH 28/43] Rework download category parsing - Bypasses issue where
 hidden downloads are not accessible - getCategoryID no longer necessary

---
 src/downloadmanager.cpp    |  8 --------
 src/downloadmanager.h      |  8 --------
 src/modlistviewactions.cpp | 19 ++++++++++---------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 3e5303c6d..3c9e776ec 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1404,14 +1404,6 @@ int DownloadManager::getModID(int index) const
   return m_ActiveDownloads.at(index)->m_FileInfo->modID;
 }
 
-int DownloadManager::getCategoryID(int index) const
-{
-  if ((index < 0) || (index >= m_ActiveDownloads.size())) {
-    throw MyException(tr("mod id: invalid download index %1").arg(index));
-  }
-  return m_ActiveDownloads.at(index)->m_FileInfo->categoryID;
-}
-
 QString DownloadManager::getDisplayGameName(int index) const
 {
   if ((index < 0) || (index >= m_ActiveDownloads.size())) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 359455d95..d264ec87f 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -356,14 +356,6 @@ class DownloadManager : public QObject
    **/
   int getModID(int index) const;
 
-  /**
-   * @brief retrieve the nexus category id of the download specified by index
-   *
-   * @param index index of the file to look up
-   * @return the nexus category id
-   */
-  int getCategoryID(int index) const;
-
   /**
    * @brief retrieve the displayable game name of the download specified by the index
    *
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index fd2f5c68d..d82dca878 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -279,12 +279,13 @@ void ModListViewActions::assignCategories() const
   }
   for (auto mod : m_core.modList()->allMods()) {
     ModInfo::Ptr modInfo = ModInfo::getByName(mod);
-    QString file         = modInfo->installationFile();
     int nexusCategory    = modInfo->getNexusCategory();
     if (!nexusCategory) {
-      auto download = m_core.downloadManager()->getDownloadIndex(file);
-      if (download >= 0) {
-        nexusCategory = m_core.downloadManager()->getCategoryID(download);
+      QSettings downloadMeta(m_core.downloadsPath() + "/" +
+                                 modInfo->installationFile() + ".meta",
+                             QSettings::IniFormat);
+      if (downloadMeta.contains("category")) {
+        nexusCategory = downloadMeta.value("category", 0).toInt();
       }
     }
     int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
@@ -1127,11 +1128,11 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
 
     int categoryID = modInfo->getNexusCategory();
     if (!categoryID) {
-      int downloadIndex =
-          m_core.downloadManager()->getDownloadIndex(modInfo->installationFile());
-      if (downloadIndex >= 0) {
-        auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex);
-        categoryID        = downloadInfo->categoryID;
+      QSettings downloadMeta(m_core.downloadsPath() + "/" +
+                                 modInfo->installationFile() + ".meta",
+                             QSettings::IniFormat);
+      if (downloadMeta.contains("category")) {
+        categoryID = downloadMeta.value("category", 0).toInt();
       }
     }
     unsigned int categoryIndex =

From d2e48ed72e3526c08580d5c4b3531778267532c5 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 17:43:29 -0500
Subject: [PATCH 29/43] Fix rebase issues

---
 src/categories.cpp              |    8 +-
 src/categoriesdialog.cpp        |    1 -
 src/directoryrefresher.h        |    1 -
 src/filterlist.cpp              |   25 +-
 src/filterlist.h                |    7 +-
 src/mainwindow.cpp              | 1228 +------------------------------
 src/mainwindow.h                |    9 -
 src/moapplication.h             |    1 -
 src/modinfodialogcategories.cpp |   12 +-
 src/modinfodialogcategories.h   |    5 +-
 src/modinforegular.cpp          |    3 +-
 src/modlist.cpp                 |   10 +-
 src/modlistcontextmenu.cpp      |    6 +-
 src/modlistsortproxy.cpp        |  185 ++---
 src/nexusinterface.h            |   28 +-
 src/settingsdialog.ui           |    8 +-
 src/settingsdialoggeneral.cpp   |    2 +-
 17 files changed, 157 insertions(+), 1382 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 61cd6334a..18cee4f9d 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -40,15 +40,9 @@ QString CategoryFactory::categoriesFilePath()
   return qApp->property("dataPath").toString() + "/categories.dat";
 }
 
-
-QString CategoryFactory::nexusMappingFilePath()
-{
-  return qApp->property("dataPath").toString() + "/nexuscatmap.dat";
-}
-
-
 CategoryFactory::CategoryFactory() : QObject()
 {
+  atexit(&cleanup);
 }
 
 QString CategoryFactory::nexusMappingFilePath()
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index d97edb8ef..4b42495e4 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -193,7 +193,6 @@ void CategoriesDialog::fillTable()
   QTableWidget* table         = ui->categoriesTable;
   QListWidget* list           = ui->nexusCategoryList;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
   table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
   table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
   table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
diff --git a/src/directoryrefresher.h b/src/directoryrefresher.h
index 49eb15be1..2e6de1a06 100644
--- a/src/directoryrefresher.h
+++ b/src/directoryrefresher.h
@@ -54,7 +54,6 @@ class DirectoryRefresher : public QObject
     int priority;
   };
 
-
   DirectoryRefresher(std::size_t threadCount);
 
   /**
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index ba0671a78..c88945f83 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -188,9 +188,9 @@ class CriteriaItemFilter : public QObject
   }
 };
 
-
-FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory)
-  : ui(ui), m_Organizer(organizer), m_pluginContainer(pluginContainer), m_factory(factory)
+FilterList::FilterList(Ui::MainWindow* ui, OrganizerCore& core,
+                       CategoryFactory& factory)
+    : ui(ui), m_core(core), m_factory(factory)
 {
   auto* eventFilter = new CriteriaItemFilter(ui->filters, [&](auto* item, int dir) {
     return cycleItem(item, dir);
@@ -275,15 +275,15 @@ void FilterList::addContentCriteria()
 void FilterList::addCategoryCriteria(QTreeWidgetItem* root,
                                      const std::set<int>& categoriesUsed, int targetID)
 {
-  const auto count = static_cast<unsigned int>(m_factory->numCategories());
+  const auto count = static_cast<unsigned int>(m_factory.numCategories());
   for (unsigned int i = 1; i < count; ++i) {
-    if (m_factory->getParentID(i) == targetID) {
-      int categoryID = m_factory->getCategoryID(i);
+    if (m_factory.getParentID(i) == targetID) {
+      int categoryID = m_factory.getCategoryID(i);
       if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
         QTreeWidgetItem* item =
-          addCriteriaItem(root, m_factory->getCategoryName(i),
-            categoryID, ModListSortProxy::TypeCategory);
-        if (m_factory->hasChildren(i)) {
+            addCriteriaItem(root, m_factory.getCategoryName(i), categoryID,
+                            ModListSortProxy::TypeCategory);
+        if (m_factory.hasChildren(i)) {
           addCategoryCriteria(item, categoriesUsed, categoryID);
         }
       }
@@ -295,9 +295,8 @@ void FilterList::addSpecialCriteria(int type)
 {
   const auto sc = static_cast<CategoryFactory::SpecialCategories>(type);
 
-  addCriteriaItem(
-    nullptr, m_factory->getSpecialCategoryName(sc),
-    type, ModListSortProxy::TypeSpecial);
+  addCriteriaItem(nullptr, m_factory.getSpecialCategoryName(sc), type,
+                  ModListSortProxy::TypeSpecial);
 }
 
 void FilterList::refresh()
@@ -334,7 +333,7 @@ void FilterList::refresh()
           log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
           break;
         }
-        currentID = m_factory->getParentID(m_factory->getCategoryIndex(currentID));
+        currentID = m_factory.getParentID(m_factory.getCategoryIndex(currentID));
       }
     }
   }
diff --git a/src/filterlist.h b/src/filterlist.h
index 823a63c2c..c28b08c0e 100644
--- a/src/filterlist.h
+++ b/src/filterlist.h
@@ -18,7 +18,7 @@ class FilterList : public QObject
   Q_OBJECT;
 
 public:
-  FilterList(Ui::MainWindow* ui, OrganizerCore* organizer, PluginContainer* pluginContainer, CategoryFactory* factory);
+  FilterList(Ui::MainWindow* ui, OrganizerCore& organizer, CategoryFactory& factory);
 
   void restoreState(const Settings& s);
   void saveState(Settings& s) const;
@@ -36,9 +36,8 @@ class FilterList : public QObject
   class CriteriaItem;
 
   Ui::MainWindow* ui;
-  OrganizerCore* m_Organizer;
-  CategoryFactory* m_factory;
-  PluginContainer* m_pluginContainer;
+  OrganizerCore& m_core;
+  CategoryFactory& m_factory;
 
   bool onClick(QMouseEvent* e);
   void onItemActivated(QTreeWidgetItem* item);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e34b648c2..74504ed62 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -290,19 +290,6 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
     ui->statusBar->setAPI(ni.getAPIStats(), ni.getAPIUserAccount());
   }
 
-  languageChange(settings.interface().language());
-
-  m_CategoryFactory->loadCategories();
-  m_Filters.reset(new FilterList(ui, &m_OrganizerCore, &m_PluginContainer, m_CategoryFactory));
-
-  connect(
-    m_Filters.get(), &FilterList::criteriaChanged,
-    [&](auto&& v) { onFiltersCriteria(v); });
-
-  connect(
-    m_Filters.get(), &FilterList::optionsChanged,
-    [&](auto&& mode, auto&& sep) { onFiltersOptions(mode, sep); });
-
   m_CategoryFactory->loadCategories();
 
   ui->logList->setCore(m_OrganizerCore);
@@ -421,13 +408,9 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore,
           SLOT(nexusApi()));
 
-  connect(CategoryFactory::instance(), SIGNAL(requestNexusCategories()), this, SLOT(requestNexusCategories()));
-
-  connect(
-    NexusInterface::instance(&pluginContainer)->getAccessManager(),
-    SIGNAL(credentialsReceived(const APIUserAccount&)),
-    this,
-    SLOT(updateWindowTitle(const APIUserAccount&)));
+  connect(NexusInterface::instance().getAccessManager(),
+          SIGNAL(credentialsReceived(const APIUserAccount&)), this,
+          SLOT(updateWindowTitle(const APIUserAccount&)));
 
   connect(NexusInterface::instance().getAccessManager(),
           SIGNAL(credentialsReceived(const APIUserAccount&)),
@@ -2574,738 +2557,6 @@ void MainWindow::refreshProfile_activated()
   m_OrganizerCore.profileRefresh();
 }
 
-void MainWindow::updateModCount()
-{
-  int activeCount = 0;
-  int visActiveCount = 0;
-  int backupCount = 0;
-  int visBackupCount = 0;
-  int foreignCount = 0;
-  int visForeignCount = 0;
-  int separatorCount = 0;
-  int visSeparatorCount = 0;
-  int regularCount = 0;
-  int visRegularCount = 0;
-
-  QStringList allMods = m_OrganizerCore.modList()->allMods();
-
-  auto hasFlag = [](std::vector<ModInfo::EFlag> flags, ModInfo::EFlag filter) {
-    return std::find(flags.begin(), flags.end(), filter) != flags.end();
-  };
-
-  bool isEnabled;
-  bool isVisible;
-  for (QString mod : allMods) {
-    int modIndex = ModInfo::getIndex(mod);
-    ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
-    std::vector<ModInfo::EFlag> modFlags = modInfo->getFlags();
-    isEnabled = m_OrganizerCore.currentProfile()->modEnabled(modIndex);
-    isVisible = m_ModListSortProxy->filterMatchesMod(modInfo, isEnabled);
-
-    for (auto flag : modFlags) {
-      switch (flag) {
-      case ModInfo::FLAG_BACKUP: backupCount++;
-        if (isVisible)
-          visBackupCount++;
-        break;
-      case ModInfo::FLAG_FOREIGN: foreignCount++;
-        if (isVisible)
-          visForeignCount++;
-        break;
-      case ModInfo::FLAG_SEPARATOR: separatorCount++;
-        if (isVisible)
-          visSeparatorCount++;
-        break;
-      }
-    }
-
-    if (!hasFlag(modFlags, ModInfo::FLAG_BACKUP) &&
-        !hasFlag(modFlags, ModInfo::FLAG_FOREIGN) &&
-        !hasFlag(modFlags, ModInfo::FLAG_SEPARATOR) &&
-        !hasFlag(modFlags, ModInfo::FLAG_OVERWRITE)) {
-      if (isEnabled) {
-        activeCount++;
-        if (isVisible)
-          visActiveCount++;
-      }
-      if (isVisible)
-        visRegularCount++;
-      regularCount++;
-    }
-  }
-
-  ui->activeModsCounter->display(visActiveCount);
-  ui->activeModsCounter->setToolTip(tr("<table cellspacing=\"5\">"
-    "<tr><th>Type</th><th>All</th><th>Visible</th>"
-    "<tr><td>Enabled mods:&emsp;</td><td align=right>%1 / %2</td><td align=right>%3 / %4</td></tr>"
-    "<tr><td>Unmanaged/DLCs:&emsp;</td><td align=right>%5</td><td align=right>%6</td></tr>"
-    "<tr><td>Mod backups:&emsp;</td><td align=right>%7</td><td align=right>%8</td></tr>"
-    "<tr><td>Separators:&emsp;</td><td align=right>%9</td><td align=right>%10</td></tr>"
-    "</table>")
-    .arg(activeCount)
-    .arg(regularCount)
-    .arg(visActiveCount)
-    .arg(visRegularCount)
-    .arg(foreignCount)
-    .arg(visForeignCount)
-    .arg(backupCount)
-    .arg(visBackupCount)
-    .arg(separatorCount)
-    .arg(visSeparatorCount)
-  );
-}
-
-void MainWindow::updatePluginCount()
-{
-  int activeMasterCount = 0;
-  int activeLightMasterCount = 0;
-  int activeRegularCount = 0;
-  int masterCount = 0;
-  int lightMasterCount = 0;
-  int regularCount = 0;
-  int activeVisibleCount = 0;
-
-  PluginList *list = m_OrganizerCore.pluginList();
-  QString filter = ui->espFilterEdit->text();
-
-  for (QString plugin : list->pluginNames()) {
-    bool active = list->isEnabled(plugin);
-    bool visible = m_PluginListSortProxy->filterMatchesPlugin(plugin);
-    if (list->isLight(plugin) || list->isLightFlagged(plugin)) {
-      lightMasterCount++;
-      activeLightMasterCount += active;
-      activeVisibleCount += visible && active;
-    } else if (list->isMaster(plugin)) {
-      masterCount++;
-      activeMasterCount += active;
-      activeVisibleCount += visible && active;
-    } else {
-      regularCount++;
-      activeRegularCount += active;
-      activeVisibleCount += visible && active;
-    }
-  }
-
-  int activeCount = activeMasterCount + activeLightMasterCount + activeRegularCount;
-  int totalCount = masterCount + lightMasterCount + regularCount;
-
-  ui->activePluginsCounter->display(activeVisibleCount);
-  ui->activePluginsCounter->setToolTip(tr("<table cellspacing=\"6\">"
-    "<tr><th>Type</th><th>Active      </th><th>Total</th></tr>"
-    "<tr><td>All plugins:</td><td align=right>%1    </td><td align=right>%2</td></tr>"
-    "<tr><td>ESMs:</td><td align=right>%3    </td><td align=right>%4</td></tr>"
-    "<tr><td>ESPs:</td><td align=right>%7    </td><td align=right>%8</td></tr>"
-    "<tr><td>ESMs+ESPs:</td><td align=right>%9    </td><td align=right>%10</td></tr>"
-    "<tr><td>ESLs:</td><td align=right>%5    </td><td align=right>%6</td></tr>"
-    "</table>")
-    .arg(activeCount).arg(totalCount)
-    .arg(activeMasterCount).arg(masterCount)
-    .arg(activeLightMasterCount).arg(lightMasterCount)
-    .arg(activeRegularCount).arg(regularCount)
-    .arg(activeMasterCount+activeRegularCount).arg(masterCount+regularCount)
-  );
-}
-
-void MainWindow::information_clicked()
-{
-  try {
-    displayModInformation(m_ContextRow);
-  } catch (const std::exception &e) {
-    reportError(e.what());
-  }
-}
-
-void MainWindow::createEmptyMod_clicked()
-{
-  GuessedValue<QString> name;
-  name.setFilter(&fixDirectoryName);
-
-  while (name->isEmpty()) {
-    bool ok;
-    name.update(QInputDialog::getText(this, tr("Create Mod..."),
-                                      tr("This will create an empty mod.\n"
-                                         "Please enter a name:"), QLineEdit::Normal, "", &ok),
-                GUESS_USER);
-    if (!ok) {
-      return;
-    }
-  }
-
-  if (m_OrganizerCore.getMod(name) != nullptr) {
-    reportError(tr("A mod with this name already exists"));
-    return;
-  }
-
-  int newPriority = -1;
-  if (m_ContextRow >= 0 && m_ModListSortProxy->sortColumn() == ModList::COL_PRIORITY) {
-    newPriority = m_OrganizerCore.currentProfile()->getModPriority(m_ContextRow);
-  }
-
-  IModInterface *newMod = m_OrganizerCore.createMod(name);
-  if (newMod == nullptr) {
-    return;
-  }
-
-  m_OrganizerCore.refreshModList();
-
-  if (newPriority >= 0) {
-    m_OrganizerCore.modList()->changeModPriority(ModInfo::getIndex(name), newPriority);
-  }
-}
-
-void MainWindow::createSeparator_clicked()
-{
-  GuessedValue<QString> name;
-  name.setFilter(&fixDirectoryName);
-  while (name->isEmpty())
-  {
-    bool ok;
-    name.update(QInputDialog::getText(this, tr("Create Separator..."),
-      tr("This will create a new separator.\n"
-        "Please enter a name:"), QLineEdit::Normal, "", &ok),
-      GUESS_USER);
-    if (!ok) { return; }
-  }
-  if (m_OrganizerCore.getMod(name) != nullptr)
-  {
-    reportError(tr("A separator with this name already exists"));
-    return;
-  }
-  name->append("_separator");
-  if (m_OrganizerCore.getMod(name) != nullptr)
-  {
-    return;
-  }
-
-  int newPriority = -1;
-  if (m_ContextRow >= 0 && m_ModListSortProxy->sortColumn() == ModList::COL_PRIORITY)
-  {
-    newPriority = m_OrganizerCore.currentProfile()->getModPriority(m_ContextRow);
-  }
-
-  if (m_OrganizerCore.createMod(name) == nullptr) { return; }
-  m_OrganizerCore.refreshModList();
-
-  if (newPriority >= 0)
-  {
-    m_OrganizerCore.modList()->changeModPriority(ModInfo::getIndex(name), newPriority);
-  }
-
-  if (auto c=m_OrganizerCore.settings().colors().previousSeparatorColor()) {
-    ModInfo::getByIndex(ModInfo::getIndex(name))->setColor(*c);
-  }
-}
-
-void MainWindow::setColor_clicked()
-{
-  auto& settings = m_OrganizerCore.settings();
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-
-  QColorDialog dialog(this);
-  dialog.setOption(QColorDialog::ShowAlphaChannel);
-
-  QColor currentColor = modInfo->color();
-  if (currentColor.isValid()) {
-    dialog.setCurrentColor(currentColor);
-  }
-  else if (auto c=settings.colors().previousSeparatorColor()) {
-    dialog.setCurrentColor(*c);
-  }
-
-  if (!dialog.exec())
-    return;
-
-  currentColor = dialog.currentColor();
-  if (!currentColor.isValid())
-    return;
-
-  settings.colors().setPreviousSeparatorColor(currentColor);
-
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    for (QModelIndex idx : selection->selectedRows()) {
-      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-       info->setColor(currentColor);
-    }
-  }
-  else {
-    modInfo->setColor(currentColor);
-  }
-}
-
-void MainWindow::resetColor_clicked()
-{
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-  QColor color = QColor();
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    for (QModelIndex idx : selection->selectedRows()) {
-      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-       info->setColor(color);
-    }
-  }
-  else {
-    modInfo->setColor(color);
-  }
-
-  m_OrganizerCore.settings().colors().removePreviousSeparatorColor();
-}
-
-void MainWindow::createModFromOverwrite()
-{
-  GuessedValue<QString> name;
-  name.setFilter(&fixDirectoryName);
-
-  while (name->isEmpty()) {
-    bool ok;
-    name.update(QInputDialog::getText(this, tr("Create Mod..."),
-                                      tr("This will move all files from overwrite into a new, regular mod.\n"
-                                         "Please enter a name:"), QLineEdit::Normal, "", &ok),
-                GUESS_USER);
-    if (!ok) {
-      return;
-    }
-  }
-
-  if (m_OrganizerCore.getMod(name) != nullptr) {
-    reportError(tr("A mod with this name already exists"));
-    return;
-  }
-
-  const IModInterface *newMod = m_OrganizerCore.createMod(name);
-  if (newMod == nullptr) {
-    return;
-  }
-
-  doMoveOverwriteContentToMod(newMod->absolutePath());
-}
-
-void MainWindow::moveOverwriteContentToExistingMod()
-{
-  QStringList mods;
-  auto indexesByPriority = m_OrganizerCore.currentProfile()->getAllIndexesByPriority();
-  for (auto & iter : indexesByPriority) {
-    if ((iter.second != UINT_MAX)) {
-      ModInfo::Ptr modInfo = ModInfo::getByIndex(iter.second);
-      if (!modInfo->hasFlag(ModInfo::FLAG_SEPARATOR) && !modInfo->hasFlag(ModInfo::FLAG_FOREIGN) && !modInfo->hasFlag(ModInfo::FLAG_OVERWRITE)) {
-        mods << modInfo->name();
-      }
-    }
-  }
-
-  ListDialog dialog(this);
-  dialog.setWindowTitle("Select a mod...");
-  dialog.setChoices(mods);
-
-  if (dialog.exec() == QDialog::Accepted) {
-    QString result = dialog.getChoice();
-    if (!result.isEmpty()) {
-
-      QString modAbsolutePath;
-
-      for (const auto& mod : m_OrganizerCore.modsSortedByProfilePriority()) {
-        if (result.compare(mod) == 0) {
-          ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(mod));
-          modAbsolutePath = modInfo->absolutePath();
-          break;
-        }
-      }
-
-      if (modAbsolutePath.isNull()) {
-        log::warn("Mod {} has not been found, for some reason", result);
-        return;
-      }
-
-      doMoveOverwriteContentToMod(modAbsolutePath);
-    }
-  }
-}
-
-void MainWindow::doMoveOverwriteContentToMod(const QString &modAbsolutePath)
-{
-  unsigned int overwriteIndex = ModInfo::findMod([](ModInfo::Ptr mod) -> bool {
-    std::vector<ModInfo::EFlag> flags = mod->getFlags();
-    return std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end(); });
-
-  ModInfo::Ptr overwriteInfo = ModInfo::getByIndex(overwriteIndex);
-  bool successful = shellMove((QDir::toNativeSeparators(overwriteInfo->absolutePath()) + "\\*"),
-    (QDir::toNativeSeparators(modAbsolutePath)), false, this);
-
-  if (successful) {
-    MessageDialog::showMessage(tr("Move successful."), this);
-  }
-  else {
-    const auto e = GetLastError();
-    log::error("Move operation failed: {}", formatSystemMessage(e));
-  }
-
-  m_OrganizerCore.refreshModList();
-}
-
-void MainWindow::clearOverwrite()
-{
-  unsigned int overwriteIndex = ModInfo::findMod([](ModInfo::Ptr mod) -> bool {
-    std::vector<ModInfo::EFlag> flags = mod->getFlags();
-    return std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE)
-      != flags.end();
-  });
-
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(overwriteIndex);
-  if (modInfo)
-  {
-    QDir overwriteDir(modInfo->absolutePath());
-    if (QMessageBox::question(this, tr("Are you sure?"),
-      tr("About to recursively delete:\n") + overwriteDir.absolutePath(),
-      QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok)
-    {
-      QStringList delList;
-      for (auto f : overwriteDir.entryList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot))
-        delList.push_back(overwriteDir.absoluteFilePath(f));
-      if (shellDelete(delList, true)) {
-        scheduleCheckForProblems();
-        m_OrganizerCore.refreshModList();
-      } else {
-        const auto e = GetLastError();
-        log::error("Delete operation failed: {}", formatSystemMessage(e));
-      }
-    }
-  }
-}
-
-void MainWindow::cancelModListEditor()
-{
-  ui->modList->setEnabled(false);
-  ui->modList->setEnabled(true);
-}
-
-void MainWindow::on_modList_doubleClicked(const QModelIndex &index)
-{
-  if (!index.isValid()) {
-    return;
-  }
-
-  if (m_OrganizerCore.modList()->timeElapsedSinceLastChecked() <= QApplication::doubleClickInterval()) {
-    // don't interpret double click if we only just checked a mod
-    return;
-  }
-
-  QModelIndex sourceIdx = mapToModel(m_OrganizerCore.modList(), index);
-  if (!sourceIdx.isValid()) {
-    return;
-  }
-
-  Qt::KeyboardModifiers modifiers = QApplication::queryKeyboardModifiers();
-  if (modifiers.testFlag(Qt::ControlModifier)) {
-    try {
-      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
-
-      ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-      shell::Explore(modInfo->absolutePath());
-
-      // workaround to cancel the editor that might have opened because of
-      // selection-click
-      ui->modList->closePersistentEditor(index);
-    }
-    catch (const std::exception &e) {
-      reportError(e.what());
-    }
-  }
-  else if (modifiers.testFlag(Qt::ShiftModifier)) {
-    try {
-      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
-      QModelIndex idx = m_OrganizerCore.modList()->index(m_ContextRow, 0);
-      visitNexusOrWebPage(idx);
-      ui->modList->closePersistentEditor(index);
-    }
-    catch (const std::exception & e) {
-      reportError(e.what());
-    }
-  }
-  else{
-    try {
-      m_ContextRow = m_ModListSortProxy->mapToSource(index).row();
-      sourceIdx.column();
-
-      auto tab = ModInfoTabIDs::None;
-
-      switch (sourceIdx.column()) {
-        case ModList::COL_NOTES: tab = ModInfoTabIDs::Notes; break;
-        case ModList::COL_VERSION: tab = ModInfoTabIDs::Nexus; break;
-        case ModList::COL_MODID: tab = ModInfoTabIDs::Nexus; break;
-        case ModList::COL_GAME: tab = ModInfoTabIDs::Nexus; break;
-        case ModList::COL_CATEGORY: tab = ModInfoTabIDs::Categories; break;
-        case ModList::COL_CONFLICTFLAGS: tab = ModInfoTabIDs::Conflicts; break;
-      }
-
-      displayModInformation(sourceIdx.row(), tab);
-      // workaround to cancel the editor that might have opened because of
-      // selection-click
-      ui->modList->closePersistentEditor(index);
-    }
-    catch (const std::exception &e) {
-      reportError(e.what());
-    }
-  }
-}
-
-void MainWindow::on_listOptionsBtn_pressed()
-{
-  m_ContextRow = -1;
-}
-
-void MainWindow::openOriginInformation_clicked()
-{
-  try {
-    QItemSelectionModel *selection = ui->espList->selectionModel();
-    //we don't want to open multiple modinfodialogs.
-    /*if (selection->hasSelection() && selection->selectedRows().count() > 0) {
-
-      for (QModelIndex idx : selection->selectedRows()) {
-        QString fileName = idx.data().toString();
-        ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-        std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
-
-        if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
-          displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-        }
-      }
-    }
-    else {}*/
-    QModelIndex idx = selection->currentIndex();
-    QString fileName = idx.data().toString();
-
-    ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-    std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
-
-    if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
-      displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-    }
-  }
-  catch (const std::exception &e) {
-    reportError(e.what());
-  }
-}
-
-void MainWindow::on_espList_doubleClicked(const QModelIndex &index)
-{
-  if (!index.isValid()) {
-    return;
-  }
-
-  if (m_OrganizerCore.pluginList()->timeElapsedSinceLastChecked() <= QApplication::doubleClickInterval()) {
-    // don't interpret double click if we only just checked a plugin
-    return;
-  }
-
-  QModelIndex sourceIdx = mapToModel(m_OrganizerCore.pluginList(), index);
-  if (!sourceIdx.isValid()) {
-    return;
-  }
-  try {
-
-    QItemSelectionModel *selection = ui->espList->selectionModel();
-
-    if (selection->hasSelection() && selection->selectedRows().count() == 1) {
-
-      QModelIndex idx = selection->currentIndex();
-      QString fileName = idx.data().toString();
-
-      if (ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)) == UINT_MAX)
-        return;
-
-      ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-      std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
-
-      if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
-
-        Qt::KeyboardModifiers modifiers = QApplication::queryKeyboardModifiers();
-        if (modifiers.testFlag(Qt::ControlModifier)) {
-          openExplorer_activated();
-          // workaround to cancel the editor that might have opened because of
-          // selection-click
-          ui->espList->closePersistentEditor(index);
-        }
-        else {
-
-          displayModInformation(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-          // workaround to cancel the editor that might have opened because of
-          // selection-click
-          ui->espList->closePersistentEditor(index);
-        }
-      }
-    }
-  }
-  catch (const std::exception &e) {
-    reportError(e.what());
-  }
-}
-
-bool MainWindow::populateMenuCategories(QMenu *menu, int targetID)
-{
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-  const std::set<int> &categories = modInfo->getCategories();
-
-  bool childEnabled = false;
-
-  for (unsigned int i = 1; i < m_CategoryFactory->numCategories(); ++i) {
-    if (m_CategoryFactory->getParentID(i) == targetID) {
-      QMenu *targetMenu = menu;
-      if (m_CategoryFactory->hasChildren(i)) {
-        targetMenu = menu->addMenu(m_CategoryFactory->getCategoryName(i).replace('&', "&&"));
-      }
-
-      int id = m_CategoryFactory->getCategoryID(i);
-      QScopedPointer<QCheckBox> checkBox(new QCheckBox(targetMenu));
-      bool enabled = categories.find(id) != categories.end();
-      checkBox->setText(m_CategoryFactory->getCategoryName(i).replace('&', "&&"));
-      if (enabled) {
-        childEnabled = true;
-      }
-      checkBox->setChecked(enabled ? Qt::Checked : Qt::Unchecked);
-
-      QScopedPointer<QWidgetAction> checkableAction(new QWidgetAction(targetMenu));
-      checkableAction->setDefaultWidget(checkBox.take());
-      checkableAction->setData(id);
-      targetMenu->addAction(checkableAction.take());
-
-      if (m_CategoryFactory->hasChildren(i)) {
-        if (populateMenuCategories(targetMenu, m_CategoryFactory->getCategoryID(i)) || enabled) {
-          targetMenu->setIcon(QIcon(":/MO/gui/resources/check.png"));
-        }
-      }
-    }
-  }
-  return childEnabled;
-}
-
-void MainWindow::replaceCategoriesFromMenu(QMenu *menu, int modRow)
-{
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(modRow);
-  for (QAction* action : menu->actions()) {
-    if (action->menu() != nullptr) {
-      replaceCategoriesFromMenu(action->menu(), modRow);
-    } else {
-      QWidgetAction *widgetAction = qobject_cast<QWidgetAction*>(action);
-      if (widgetAction != nullptr) {
-        QCheckBox *checkbox = qobject_cast<QCheckBox*>(widgetAction->defaultWidget());
-        modInfo->setCategory(widgetAction->data().toInt(), checkbox->isChecked());
-      }
-    }
-  }
-}
-
-void MainWindow::addRemoveCategoriesFromMenu(QMenu *menu, int modRow, int referenceRow)
-{
-  if (referenceRow != -1 && referenceRow != modRow) {
-    ModInfo::Ptr editedModInfo = ModInfo::getByIndex(referenceRow);
-    for (QAction* action : menu->actions()) {
-      if (action->menu() != nullptr) {
-        addRemoveCategoriesFromMenu(action->menu(), modRow, referenceRow);
-      } else {
-        QWidgetAction *widgetAction = qobject_cast<QWidgetAction*>(action);
-        if (widgetAction != nullptr) {
-          QCheckBox *checkbox = qobject_cast<QCheckBox*>(widgetAction->defaultWidget());
-          int categoryId = widgetAction->data().toInt();
-          bool checkedBefore = editedModInfo->categorySet(categoryId);
-          bool checkedAfter = checkbox->isChecked();
-
-          if (checkedBefore != checkedAfter) { // only update if the category was changed on the edited mod
-            ModInfo::Ptr currentModInfo = ModInfo::getByIndex(modRow);
-            currentModInfo->setCategory(categoryId, checkedAfter);
-          }
-        }
-      }
-    }
-  } else {
-    replaceCategoriesFromMenu(menu, modRow);
-  }
-}
-
-void MainWindow::addRemoveCategories_MenuHandler() {
-  QMenu *menu = qobject_cast<QMenu*>(sender());
-  if (menu == nullptr) {
-    log::error("not a menu?");
-    return;
-  }
-
-  QList<QPersistentModelIndex> selected;
-  for (const QModelIndex &idx : ui->modList->selectionModel()->selectedRows()) {
-    selected.append(QPersistentModelIndex(idx));
-  }
-
-  if (selected.size() > 0) {
-    int minRow = INT_MAX;
-    int maxRow = -1;
-
-    for (const QPersistentModelIndex &idx : selected) {
-      log::debug("change categories on: {}", idx.data().toString());
-      QModelIndex modIdx = mapToModel(m_OrganizerCore.modList(), idx);
-      if (modIdx.row() != m_ContextIdx.row()) {
-        addRemoveCategoriesFromMenu(menu, modIdx.row(), m_ContextIdx.row());
-      }
-      if (idx.row() < minRow) minRow = idx.row();
-      if (idx.row() > maxRow) maxRow = idx.row();
-    }
-    replaceCategoriesFromMenu(menu, m_ContextIdx.row());
-
-    m_OrganizerCore.modList()->notifyChange(minRow, maxRow + 1);
-
-    for (const QPersistentModelIndex &idx : selected) {
-      ui->modList->selectionModel()->select(idx, QItemSelectionModel::Select | QItemSelectionModel::Rows);
-    }
-  } else {
-    //For single mod selections, just do a replace
-    replaceCategoriesFromMenu(menu, m_ContextRow);
-    m_OrganizerCore.modList()->notifyChange(m_ContextRow);
-  }
-
-  refreshFilters();
-}
-
-void MainWindow::replaceCategories_MenuHandler() {
-  QMenu *menu = qobject_cast<QMenu*>(sender());
-  if (menu == nullptr) {
-    log::error("not a menu?");
-    return;
-  }
-
-  QList<QPersistentModelIndex> selected;
-  for (const QModelIndex &idx : ui->modList->selectionModel()->selectedRows()) {
-    selected.append(QPersistentModelIndex(idx));
-  }
-
-  if (selected.size() > 0) {
-    QStringList selectedMods;
-    int minRow = INT_MAX;
-    int maxRow = -1;
-    for (int i = 0; i < selected.size(); ++i) {
-      QModelIndex temp = mapToModel(m_OrganizerCore.modList(), selected.at(i));
-      selectedMods.append(temp.data().toString());
-      replaceCategoriesFromMenu(menu, mapToModel(m_OrganizerCore.modList(), selected.at(i)).row());
-      if (temp.row() < minRow) minRow = temp.row();
-      if (temp.row() > maxRow) maxRow = temp.row();
-    }
-
-    m_OrganizerCore.modList()->notifyChange(minRow, maxRow + 1);
-
-    // find mods by their name because indices are invalidated
-    QAbstractItemModel *model = ui->modList->model();
-    for (const QString &mod : selectedMods) {
-      QModelIndexList matches = model->match(model->index(0, 0), Qt::DisplayRole, mod, 1,
-                                             Qt::MatchFixedString | Qt::MatchCaseSensitive | Qt::MatchRecursive);
-      if (matches.size() > 0) {
-        ui->modList->selectionModel()->select(matches.at(0), QItemSelectionModel::Select | QItemSelectionModel::Rows);
-      }
-    }
-  } else {
-    //For single mod selections, just do a replace
-    replaceCategoriesFromMenu(menu, m_ContextRow);
-    m_OrganizerCore.modList()->notifyChange(m_ContextRow);
-  }
-
-  refreshFilters();
-}
-
 void MainWindow::saveArchiveList()
 {
   if (m_OrganizerCore.isArchivesInit()) {
@@ -3325,180 +2576,6 @@ void MainWindow::saveArchiveList()
   }
 }
 
-void MainWindow::checkModsForUpdates()
-{
-  bool checkingModsForUpdate = false;
-  if (NexusInterface::instance(&m_PluginContainer)->getAccessManager()->validated()) {
-    checkingModsForUpdate = ModInfo::checkAllForUpdate(&m_PluginContainer, this);
-    NexusInterface::instance(&m_PluginContainer)->requestEndorsementInfo(this, QVariant(), QString());
-    NexusInterface::instance(&m_PluginContainer)->requestTrackingInfo(this, QVariant(), QString());
-  } else {
-    QString apiKey;
-    if (m_OrganizerCore.settings().nexus().apiKey(apiKey)) {
-      m_OrganizerCore.doAfterLogin([this] () { this->checkModsForUpdates(); });
-      NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
-    } else {
-      log::warn("{}", tr("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus."));
-    }
-  }
-
-  bool updatesAvailable = false;
-  for (auto mod : m_OrganizerCore.modList()->allMods()) {
-    ModInfo::Ptr modInfo = ModInfo::getByName(mod);
-    if (modInfo->updateAvailable()) {
-      updatesAvailable = true;
-      break;
-    }
-  }
-
-  if (updatesAvailable || checkingModsForUpdate) {
-    m_ModListSortProxy->setCriteria({{
-        ModListSortProxy::TypeSpecial,
-        CategoryFactory::UpdateAvailable,
-        false}
-    });
-
-    m_Filters->setSelection({{
-      ModListSortProxy::TypeSpecial,
-      CategoryFactory::UpdateAvailable,
-      false
-    }});
-  }
-}
-
-void MainWindow::changeVersioningScheme() {
-  if (QMessageBox::question(this, tr("Continue?"),
-        tr("The versioning scheme decides which version is considered newer than another.\n"
-           "This function will guess the versioning scheme under the assumption that the installed version is outdated."),
-        QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Yes) {
-
-    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
-
-    bool success = false;
-
-    static VersionInfo::VersionScheme schemes[] = { VersionInfo::SCHEME_REGULAR, VersionInfo::SCHEME_DECIMALMARK, VersionInfo::SCHEME_NUMBERSANDLETTERS };
-
-    for (int i = 0; i < sizeof(schemes) / sizeof(VersionInfo::VersionScheme) && !success; ++i) {
-      VersionInfo verOld(info->version().canonicalString(), schemes[i]);
-      VersionInfo verNew(info->newestVersion().canonicalString(), schemes[i]);
-      if (verOld < verNew) {
-        info->setVersion(verOld);
-        info->setNewestVersion(verNew);
-        success = true;
-      }
-    }
-    if (!success) {
-      QMessageBox::information(this, tr("Sorry"),
-          tr("I don't know a versioning scheme where %1 is newer than %2.").arg(info->newestVersion().canonicalString()).arg(info->version().canonicalString()),
-          QMessageBox::Ok);
-    }
-  }
-}
-
-void MainWindow::ignoreUpdate() {
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    for (QModelIndex idx : selection->selectedRows()) {
-      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-      info->ignoreUpdate(true);
-    }
-  }
-  else {
-    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
-    info->ignoreUpdate(true);
-  }
-  if (m_ModListSortProxy != nullptr)
-    m_ModListSortProxy->invalidate();
-}
-
-void MainWindow::checkModUpdates_clicked()
-{
-  std::multimap<QString, int> IDs;
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    for (QModelIndex idx : selection->selectedRows()) {
-      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-      IDs.insert(std::make_pair<QString, int>(info->gameName(), info->nexusId()));
-    }
-  } else {
-    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
-    IDs.insert(std::make_pair<QString, int>(info->gameName(), info->nexusId()));
-  }
-  modUpdateCheck(IDs);
-}
-
-void MainWindow::unignoreUpdate()
-{
-  QItemSelectionModel *selection = ui->modList->selectionModel();
-  if (selection->hasSelection() && selection->selectedRows().count() > 1) {
-    for (QModelIndex idx : selection->selectedRows()) {
-      ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-      info->ignoreUpdate(false);
-    }
-  }
-  else {
-    ModInfo::Ptr info = ModInfo::getByIndex(m_ContextRow);
-    info->ignoreUpdate(false);
-  }
-  if (m_ModListSortProxy != nullptr)
-    m_ModListSortProxy->invalidate();
-}
-
-void MainWindow::addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu,
-                                              ModInfo::Ptr info) {
-  const std::set<int> &categories = info->getCategories();
-  for (int categoryID : categories) {
-    int catIdx = m_CategoryFactory->getCategoryIndex(categoryID);
-    QWidgetAction *action = new QWidgetAction(primaryCategoryMenu);
-    try {
-      QRadioButton *categoryBox = new QRadioButton(
-          m_CategoryFactory->getCategoryName(catIdx).replace('&', "&&"),
-          primaryCategoryMenu);
-      connect(categoryBox, &QRadioButton::toggled, [info, categoryID](bool enable) {
-        if (enable) {
-          info->setPrimaryCategory(categoryID);
-        }
-      });
-      categoryBox->setChecked(categoryID == info->primaryCategory());
-      action->setDefaultWidget(categoryBox);
-    } catch (const std::exception &e) {
-      log::error("failed to create category checkbox: {}", e.what());
-    }
-
-    action->setData(categoryID);
-    primaryCategoryMenu->addAction(action);
-  }
-}
-
-void MainWindow::addPrimaryCategoryCandidates()
-{
-  QMenu *menu = qobject_cast<QMenu*>(sender());
-  if (menu == nullptr) {
-    log::error("not a menu?");
-    return;
-  }
-  menu->clear();
-  ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-
-  addPrimaryCategoryCandidates(menu, modInfo);
-}
-
-void MainWindow::enableVisibleMods()
-{
-  if (QMessageBox::question(nullptr, tr("Confirm"), tr("Really enable all visible mods?"),
-                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-    m_ModListSortProxy->enableAllVisible();
-  }
-}
-
-void MainWindow::disableVisibleMods()
-{
-  if (QMessageBox::question(nullptr, tr("Confirm"), tr("Really disable all visible mods?"),
-                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-    m_ModListSortProxy->disableAllVisible();
-  }
-}
-
 void MainWindow::openInstanceFolder()
 {
   QString dataPath = qApp->property("dataPath").toString();
@@ -3558,184 +2635,6 @@ void MainWindow::openMyGamesFolder()
   shell::Explore(m_OrganizerCore.managedGame()->documentsDirectory());
 }
 
-
-void MainWindow::exportModListCSV()
-{
-	//SelectionDialog selection(tr("Choose what to export"));
-
-	//selection.addChoice(tr("Everything"), tr("All installed mods are included in the list"), 0);
-	//selection.addChoice(tr("Active Mods"), tr("Only active (checked) mods from your current profile are included"), 1);
-	//selection.addChoice(tr("Visible"), tr("All mods visible in the mod list are included"), 2);
-
-	QDialog selection(this);
-	QGridLayout *grid = new QGridLayout;
-	selection.setWindowTitle(tr("Export to csv"));
-
-	QLabel *csvDescription = new QLabel();
-	csvDescription->setText(tr("CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.\nYou can also use online editors and converters instead."));
-	grid->addWidget(csvDescription);
-
-	QGroupBox *groupBoxRows = new QGroupBox(tr("Select what mods you want export:"));
-	QRadioButton *all = new QRadioButton(tr("All installed mods"));
-	QRadioButton *active = new QRadioButton(tr("Only active (checked) mods from your current profile"));
-	QRadioButton *visible = new QRadioButton(tr("All currently visible mods in the mod list"));
-
-	QVBoxLayout *vbox = new QVBoxLayout;
-	vbox->addWidget(all);
-	vbox->addWidget(active);
-	vbox->addWidget(visible);
-	vbox->addStretch(1);
-	groupBoxRows->setLayout(vbox);
-
-
-
-	grid->addWidget(groupBoxRows);
-
-	QButtonGroup *buttonGroupRows = new QButtonGroup();
-	buttonGroupRows->addButton(all, 0);
-	buttonGroupRows->addButton(active, 1);
-	buttonGroupRows->addButton(visible, 2);
-	buttonGroupRows->button(0)->setChecked(true);
-
-
-
-	QGroupBox *groupBoxColumns = new QGroupBox(tr("Choose what Columns to export:"));
-	groupBoxColumns->setFlat(true);
-
-	QCheckBox *mod_Priority = new QCheckBox(tr("Mod_Priority"));
-	mod_Priority->setChecked(true);
-	QCheckBox *mod_Name = new QCheckBox(tr("Mod_Name"));
-	mod_Name->setChecked(true);
-  QCheckBox *mod_Note = new QCheckBox(tr("Notes_column"));
-	QCheckBox *mod_Status = new QCheckBox(tr("Mod_Status"));
-  mod_Status->setChecked(true);
-	QCheckBox *primary_Category = new QCheckBox(tr("Primary_Category"));
-	QCheckBox *nexus_ID = new QCheckBox(tr("Nexus_ID"));
-	QCheckBox *mod_Nexus_URL = new QCheckBox(tr("Mod_Nexus_URL"));
-	QCheckBox *mod_Version = new QCheckBox(tr("Mod_Version"));
-	QCheckBox *install_Date = new QCheckBox(tr("Install_Date"));
-	QCheckBox *download_File_Name = new QCheckBox(tr("Download_File_Name"));
-
-	QVBoxLayout *vbox1 = new QVBoxLayout;
-	vbox1->addWidget(mod_Priority);
-	vbox1->addWidget(mod_Name);
-	vbox1->addWidget(mod_Status);
-  vbox1->addWidget(mod_Note);
-	vbox1->addWidget(primary_Category);
-	vbox1->addWidget(nexus_ID);
-	vbox1->addWidget(mod_Nexus_URL);
-	vbox1->addWidget(mod_Version);
-	vbox1->addWidget(install_Date);
-	vbox1->addWidget(download_File_Name);
-	groupBoxColumns->setLayout(vbox1);
-
-	grid->addWidget(groupBoxColumns);
-
-	QPushButton *ok = new QPushButton("Ok");
-	QPushButton *cancel = new QPushButton("Cancel");
-	QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-	connect(buttons, SIGNAL(accepted()), &selection, SLOT(accept()));
-	connect(buttons, SIGNAL(rejected()), &selection, SLOT(reject()));
-
-	grid->addWidget(buttons);
-
-	selection.setLayout(grid);
-
-
-	if (selection.exec() == QDialog::Accepted) {
-
-		unsigned int numMods = ModInfo::getNumMods();
-		int selectedRowID = buttonGroupRows->checkedId();
-
-		try {
-			QBuffer buffer;
-			buffer.open(QIODevice::ReadWrite);
-			CSVBuilder builder(&buffer);
-			builder.setEscapeMode(CSVBuilder::TYPE_STRING, CSVBuilder::QUOTE_ALWAYS);
-			std::vector<std::pair<QString, CSVBuilder::EFieldType> > fields;
-			if (mod_Priority->isChecked())
-				fields.push_back(std::make_pair(QString("#Mod_Priority"), CSVBuilder::TYPE_STRING));
-      if (mod_Status->isChecked())
-        fields.push_back(std::make_pair(QString("#Mod_Status"), CSVBuilder::TYPE_STRING));
-			if (mod_Name->isChecked())
-				fields.push_back(std::make_pair(QString("#Mod_Name"), CSVBuilder::TYPE_STRING));
-      if (mod_Note->isChecked())
-        fields.push_back(std::make_pair(QString("#Note"), CSVBuilder::TYPE_STRING));
-			if (primary_Category->isChecked())
-				fields.push_back(std::make_pair(QString("#Primary_Category"), CSVBuilder::TYPE_STRING));
-			if (nexus_ID->isChecked())
-				fields.push_back(std::make_pair(QString("#Nexus_ID"), CSVBuilder::TYPE_INTEGER));
-			if (mod_Nexus_URL->isChecked())
-				fields.push_back(std::make_pair(QString("#Mod_Nexus_URL"), CSVBuilder::TYPE_STRING));
-			if (mod_Version->isChecked())
-				fields.push_back(std::make_pair(QString("#Mod_Version"), CSVBuilder::TYPE_STRING));
-			if (install_Date->isChecked())
-				fields.push_back(std::make_pair(QString("#Install_Date"), CSVBuilder::TYPE_STRING));
-			if (download_File_Name->isChecked())
-				fields.push_back(std::make_pair(QString("#Download_File_Name"), CSVBuilder::TYPE_STRING));
-
-			builder.setFields(fields);
-
-			builder.writeHeader();
-
-      auto indexesByPriority = m_OrganizerCore.currentProfile()->getAllIndexesByPriority();
-      for (auto& iter : indexesByPriority) {
-				ModInfo::Ptr info = ModInfo::getByIndex(iter.second);
-				bool enabled = m_OrganizerCore.currentProfile()->modEnabled(iter.second);
-				if ((selectedRowID == 1) && !enabled) {
-					continue;
-				}
-				else if ((selectedRowID == 2) && !m_ModListSortProxy->filterMatchesMod(info, enabled)) {
-					continue;
-				}
-				std::vector<ModInfo::EFlag> flags = info->getFlags();
-				if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) == flags.end()) &&
-					(std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) == flags.end())) {
-					if (mod_Priority->isChecked())
-						builder.setRowField("#Mod_Priority", QString("%1").arg(iter.first, 4, 10, QChar('0')));
-          if (mod_Status->isChecked())
-            builder.setRowField("#Mod_Status", (enabled) ? "+" : "-");
-					if (mod_Name->isChecked())
-						builder.setRowField("#Mod_Name", info->name());
-          if (mod_Note->isChecked())
-            builder.setRowField("#Note", QString("%1").arg(info->comments().remove(',')));
-					if (primary_Category->isChecked())
-						builder.setRowField("#Primary_Category", (m_CategoryFactory->categoryExists(info->primaryCategory())) ? m_CategoryFactory->getCategoryNameByID(info->primaryCategory()) : "");
-					if (nexus_ID->isChecked())
-						builder.setRowField("#Nexus_ID", info->nexusId());
-					if (mod_Nexus_URL->isChecked())
-						builder.setRowField("#Mod_Nexus_URL",(info->nexusId()>0)? NexusInterface::instance(&m_PluginContainer)->getModURL(info->nexusId(), info->gameName()) : "");
-					if (mod_Version->isChecked())
-						builder.setRowField("#Mod_Version", info->version().canonicalString());
-					if (install_Date->isChecked())
-						builder.setRowField("#Install_Date", info->creationTime().toString("yyyy/MM/dd HH:mm:ss"));
-					if (download_File_Name->isChecked())
-						builder.setRowField("#Download_File_Name", info->installationFile());
-
-					builder.writeRow();
-				}
-			}
-
-			SaveTextAsDialog saveDialog(this);
-			saveDialog.setText(buffer.data());
-			saveDialog.exec();
-		}
-		catch (const std::exception &e) {
-			reportError(tr("export failed: %1").arg(e.what()));
-		}
-	}
-}
-
-static void addMenuAsPushButton(QMenu *menu, QMenu *subMenu)
-{
-  QPushButton *pushBtn = new QPushButton(subMenu->title());
-  pushBtn->setMenu(subMenu);
-  QWidgetAction *action = new QWidgetAction(menu);
-  action->setDefaultWidget(pushBtn);
-  menu->addAction(action);
-}
-
 QMenu* MainWindow::openFolderMenu()
 {
   QMenu* FolderMenu = new QMenu(this);
@@ -4010,65 +2909,6 @@ void MainWindow::originModified(int originID)
   DirectoryRefresher::cleanStructure(m_OrganizerCore.directoryStructure());
 }
 
-
-void MainWindow::enableSelectedPlugins_clicked()
-{
-  m_OrganizerCore.pluginList()->enableSelected(ui->espList->selectionModel());
-}
-
-
-void MainWindow::disableSelectedPlugins_clicked()
-{
-  m_OrganizerCore.pluginList()->disableSelected(ui->espList->selectionModel());
-}
-
-void MainWindow::sendSelectedPluginsToTop_clicked()
-{
-  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), 0);
-}
-
-void MainWindow::sendSelectedPluginsToBottom_clicked()
-{
-  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), INT_MAX);
-}
-
-void MainWindow::sendSelectedPluginsToPriority_clicked()
-{
-  bool ok;
-  int newPriority = QInputDialog::getInt(this,
-    tr("Set Priority"), tr("Set the priority of the selected plugins"),
-    0, 0, INT_MAX, 1, &ok);
-  if (!ok) return;
-
-  m_OrganizerCore.pluginList()->sendToPriority(ui->espList->selectionModel(), newPriority);
-}
-
-void MainWindow::requestNexusCategories()
-{
-  CategoriesDialog dialog(&m_PluginContainer, this);
-
-  if (dialog.exec() == QDialog::Accepted) {
-    dialog.commitChanges();
-  }
-}
-
-void MainWindow::enableSelectedMods_clicked()
-{
-  m_OrganizerCore.modList()->enableSelected(ui->modList->selectionModel());
-  if (m_ModListSortProxy != nullptr) {
-    m_ModListSortProxy->invalidate();
-  }
-}
-
-
-void MainWindow::disableSelectedMods_clicked()
-{
-  m_OrganizerCore.modList()->disableSelected(ui->modList->selectionModel());
-  if (m_ModListSortProxy != nullptr) {
-    m_ModListSortProxy->invalidate();
-  }
-}
-
 void MainWindow::updateAvailable()
 {
   ui->actionUpdate->setEnabled(true);
@@ -4813,67 +3653,7 @@ void MainWindow::on_displayCategoriesBtn_toggled(bool checked)
   setCategoryListVisible(checked);
 }
 
-void MainWindow::deselectFilters()
-{
-  m_Filters->clearSelection();
-}
-
-void MainWindow::refreshFilters()
-{
-  QItemSelection currentSelection = ui->modList->selectionModel()->selection();
-
-  int idxRow = ui->modList->currentIndex().row();
-  QVariant currentIndexName = ui->modList->model()->index(idxRow, 0).data();
-  ui->modList->setCurrentIndex(QModelIndex());
-
-  m_Filters->refresh();
-
-  ui->modList->selectionModel()->select(currentSelection, QItemSelectionModel::Select);
-
-  QModelIndexList matchList;
-  if (currentIndexName.isValid()) {
-    matchList = ui->modList->model()->match(
-      ui->modList->model()->index(0, 0),
-      Qt::DisplayRole,
-      currentIndexName);
-  }
-
-  if (matchList.size() > 0) {
-    ui->modList->setCurrentIndex(matchList.at(0));
-  }
-}
-
-void MainWindow::onFiltersCriteria(const std::vector<ModListSortProxy::Criteria>& criteria)
-{
-  m_ModListSortProxy->setCriteria(criteria);
-
-  QString label = "?";
-
-  if (criteria.empty()) {
-    label = "";
-  } else if (criteria.size() == 1) {
-    const auto& c = criteria[0];
-
-    if (c.type == ModListSortProxy::TypeContent) {
-      const auto *content = m_OrganizerCore.modDataContents().findById(c.id);
-      label = content ? content->name() : QString();
-    } else {
-      label = m_CategoryFactory->getCategoryNameByID(c.id);
-    }
-
-    if (label.isEmpty()) {
-      log::error("category {}:{} not found", c.type, c.id);
-    }
-  } else {
-    label = tr("<Multiple>");
-  }
-
-  ui->currentCategoryLabel->setText(label);
-  ui->modList->reset();
-}
-
-void MainWindow::onFiltersOptions(
-  ModListSortProxy::FilterMode mode, ModListSortProxy::SeparatorsMode sep)
+void MainWindow::removeFromToolbar(QAction* action)
 {
   const auto& title = action->text();
   auto& list        = *m_OrganizerCore.executablesList();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 67e88846b..eae50aa09 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -157,13 +157,6 @@ class MainWindow : public QMainWindow, public IUserInterface
 public slots:
   void refresherProgress(const DirectoryRefreshProgress* p);
 
-  void directory_refreshed();
-
-  void toolPluginInvoke();
-  void modPagePluginInvoke();
-
-  void requestNexusCategories();
-
 signals:
   // emitted after the information dialog has been closed, used by tutorials
   //
@@ -290,8 +283,6 @@ private slots:
 
   QAction* m_ContextAction;
 
-  QAction* m_browseModPage;
-
   CategoryFactory* m_CategoryFactory;
 
   QTimer m_CheckBSATimer;
diff --git a/src/moapplication.h b/src/moapplication.h
index 43ae62435..498242f3e 100644
--- a/src/moapplication.h
+++ b/src/moapplication.h
@@ -23,7 +23,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "env.h"
 #include <QApplication>
 #include <QFileSystemWatcher>
-#include "env.h"
 
 class Settings;
 class MOMultiProcess;
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 8819c0fa8..5665df9fb 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -44,19 +44,19 @@ bool CategoriesTab::usesOriginFiles() const
   return false;
 }
 
-void CategoriesTab::add(
-  const CategoryFactory* factory, const std::set<int>& enabledCategories,
-  QTreeWidgetItem* root, int rootLevel)
+void CategoriesTab::add(const CategoryFactory* factory,
+                        const std::set<int>& enabledCategories, QTreeWidgetItem* root,
+                        int rootLevel)
 {
-  for (int i=0; i<static_cast<int>(factory->numCategories()); ++i) {
+  for (int i = 0; i < static_cast<int>(factory->numCategories()); ++i) {
     if (factory->getParentID(i) != rootLevel) {
       continue;
     }
 
     int categoryID = factory->getCategoryID(i);
 
-    QTreeWidgetItem* newItem
-      = new QTreeWidgetItem(QStringList(factory->getCategoryName(i)));
+    QTreeWidgetItem* newItem =
+        new QTreeWidgetItem(QStringList(factory->getCategoryName(i)));
 
     newItem->setFlags(newItem->flags() | Qt::ItemIsUserCheckable);
 
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index e73bfa32f..b390146cf 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -13,9 +13,8 @@ class CategoriesTab : public ModInfoDialogTab
   bool usesOriginFiles() const override;
 
 private:
-  void add(
-    const CategoryFactory* factory, const std::set<int>& enabledCategories,
-    QTreeWidgetItem* root, int rootLevel);
+  void add(const CategoryFactory* factory, const std::set<int>& enabledCategories,
+           QTreeWidgetItem* root, int rootLevel);
 
   void updatePrimary();
   void addChecked(QTreeWidgetItem* tree);
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index e238075a8..585904771 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -212,7 +212,8 @@ void ModInfoRegular::readMeta()
       // ignore invalid id
       continue;
     }
-    if (ok && (categoryID != 0) && (CategoryFactory::instance()->categoryExists(categoryID))) {
+    if (ok && (categoryID != 0) &&
+        (CategoryFactory::instance()->categoryExists(categoryID))) {
       m_Categories.insert(categoryID);
       if (iter == categories.begin()) {
         m_PrimaryCategory = categoryID;
diff --git a/src/modlist.cpp b/src/modlist.cpp
index 41d679d9a..9f64cc711 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -285,10 +285,11 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
   } else if (role == GroupingRole) {
     if (column == COL_CATEGORY) {
       QVariantList categoryNames;
-      std::set<int> categories = modInfo->getCategories();
+      std::set<int> categories         = modInfo->getCategories();
       CategoryFactory* categoryFactory = CategoryFactory::instance();
       for (auto iter = categories.begin(); iter != categories.end(); ++iter) {
-        categoryNames.append(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
+        categoryNames.append(
+            categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
       }
       if (categoryNames.count() != 0) {
         return categoryNames;
@@ -453,7 +454,10 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
           categoryString << " , ";
         }
         try {
-          categoryString << "<span style=\"white-space: nowrap;\"><i>" << ToWString(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*catIter))) << "</font></span>";
+          categoryString << "<span style=\"white-space: nowrap;\"><i>"
+                         << ToWString(categoryFactory->getCategoryName(
+                                categoryFactory->getCategoryIndex(*catIter)))
+                         << "</font></span>";
         } catch (const std::exception& e) {
           log::error("failed to generate tooltip: {}", e.what());
           return QString();
diff --git a/src/modlistcontextmenu.cpp b/src/modlistcontextmenu.cpp
index 6954652e0..06cd19d6d 100644
--- a/src/modlistcontextmenu.cpp
+++ b/src/modlistcontextmenu.cpp
@@ -95,7 +95,7 @@ void ModListGlobalContextMenu::populate(OrganizerCore& core, ModListView* view,
     view->actions().checkModsForUpdates();
   });
   addAction(tr("Auto assign categories"), [=]() {
-   view->actions().assignCategories();
+    view->actions().assignCategories();
   });
   addAction(tr("Refresh"), &core, &OrganizerCore::profileRefresh);
   addAction(tr("Export to csv..."), [=]() {
@@ -187,11 +187,11 @@ void ModListPrimaryCategoryMenu::populate(const CategoryFactory* factory,
   clear();
   const std::set<int>& categories = mod->getCategories();
   for (int categoryID : categories) {
-    int catIdx            = factory.getCategoryIndex(categoryID);
+    int catIdx            = factory->getCategoryIndex(categoryID);
     QWidgetAction* action = new QWidgetAction(this);
     try {
       QRadioButton* categoryBox =
-          new QRadioButton(factory.getCategoryName(catIdx).replace('&', "&&"), this);
+          new QRadioButton(factory->getCategoryName(catIdx).replace('&', "&&"), this);
       categoryBox->setChecked(categoryID == mod->primaryCategory());
       action->setDefaultWidget(categoryBox);
       action->setData(categoryID);
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 1d54dfa45..e61f94947 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -125,104 +125,111 @@ bool ModListSortProxy::lessThan(const QModelIndex& left, const QModelIndex& righ
             right.data(ModList::PriorityRole).toInt();
 
   switch (left.column()) {
-    case ModList::COL_FLAGS: {
-      std::vector<ModInfo::EFlag> leftFlags = leftMod->getFlags();
-      std::vector<ModInfo::EFlag> rightFlags = rightMod->getFlags();
-      if (leftFlags.size() != rightFlags.size()) {
-        lt = leftFlags.size() < rightFlags.size();
-      } else {
-        lt = flagsId(leftFlags) < flagsId(rightFlags);
-      }
-    } break;
-    case ModList::COL_CONFLICTFLAGS: {
-      std::vector<ModInfo::EConflictFlag> leftFlags = leftMod->getConflictFlags();
-      std::vector<ModInfo::EConflictFlag> rightFlags = rightMod->getConflictFlags();
-      if (leftFlags.size() != rightFlags.size()) {
-        lt = leftFlags.size() < rightFlags.size();
-      } else {
-        lt = conflictFlagsId(leftFlags) < conflictFlagsId(rightFlags);
-      }
-    } break;
-    case ModList::COL_CONTENT: {
-      const auto& lContents = leftMod->getContents();
-      const auto& rContents = rightMod->getContents();
-      unsigned int lValue   = 0;
-      unsigned int rValue   = 0;
-      m_Organizer->modDataContents().forEachContentIn(
+  case ModList::COL_FLAGS: {
+    std::vector<ModInfo::EFlag> leftFlags  = leftMod->getFlags();
+    std::vector<ModInfo::EFlag> rightFlags = rightMod->getFlags();
+    if (leftFlags.size() != rightFlags.size()) {
+      lt = leftFlags.size() < rightFlags.size();
+    } else {
+      lt = flagsId(leftFlags) < flagsId(rightFlags);
+    }
+  } break;
+  case ModList::COL_CONFLICTFLAGS: {
+    std::vector<ModInfo::EConflictFlag> leftFlags  = leftMod->getConflictFlags();
+    std::vector<ModInfo::EConflictFlag> rightFlags = rightMod->getConflictFlags();
+    if (leftFlags.size() != rightFlags.size()) {
+      lt = leftFlags.size() < rightFlags.size();
+    } else {
+      lt = conflictFlagsId(leftFlags) < conflictFlagsId(rightFlags);
+    }
+  } break;
+  case ModList::COL_CONTENT: {
+    const auto& lContents = leftMod->getContents();
+    const auto& rContents = rightMod->getContents();
+    unsigned int lValue   = 0;
+    unsigned int rValue   = 0;
+    m_Organizer->modDataContents().forEachContentIn(
         lContents, [&lValue](auto const& content) {
           lValue += 2U << static_cast<unsigned int>(content.id());
         });
-      m_Organizer->modDataContents().forEachContentIn(
+    m_Organizer->modDataContents().forEachContentIn(
         rContents, [&rValue](auto const& content) {
           rValue += 2U << static_cast<unsigned int>(content.id());
-      });
-      lt = lValue < rValue;
-    } break;
-    case ModList::COL_NAME: {
-      int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
-      if (comp != 0)
-        lt = comp < 0;
-    } break;
-    case ModList::COL_CATEGORY: {
-      if (leftMod->primaryCategory() != rightMod->primaryCategory()) {
-        if (leftMod->primaryCategory() < 0)
-          lt = false;
-        else if (rightMod->primaryCategory() < 0)
-          lt = true;
-        else {
-          try {
-            CategoryFactory* categories = CategoryFactory::instance();
-            QString leftCatName = categories->getCategoryName(categories->getCategoryIndex(leftMod->primaryCategory()));
-            QString rightCatName = categories->getCategoryName(categories->getCategoryIndex(rightMod->primaryCategory()));
-            lt = leftCatName < rightCatName;
-          } catch (const std::exception& e) {
-            log::error("failed to compare categories: {}", e.what());
-          }
+        });
+    lt = lValue < rValue;
+  } break;
+  case ModList::COL_NAME: {
+    int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
+    if (comp != 0)
+      lt = comp < 0;
+  } break;
+  case ModList::COL_CATEGORY: {
+    if (leftMod->primaryCategory() != rightMod->primaryCategory()) {
+      if (leftMod->primaryCategory() < 0)
+        lt = false;
+      else if (rightMod->primaryCategory() < 0)
+        lt = true;
+      else {
+        try {
+          CategoryFactory* categories = CategoryFactory::instance();
+          QString leftCatName         = categories->getCategoryName(
+              categories->getCategoryIndex(leftMod->primaryCategory()));
+          QString rightCatName = categories->getCategoryName(
+              categories->getCategoryIndex(rightMod->primaryCategory()));
+          lt = leftCatName < rightCatName;
+        } catch (const std::exception& e) {
+          log::error("failed to compare categories: {}", e.what());
         }
       }
-    } break;
-    case ModList::COL_MODID: {
-      if (leftMod->nexusId() != rightMod->nexusId())
-        lt = leftMod->nexusId() < rightMod->nexusId();
-    } break;
-    case ModList::COL_VERSION: {
-      if (leftMod->version() != rightMod->version())
-        lt = leftMod->version() < rightMod->version();
-    } break;
-    case ModList::COL_INSTALLTIME: {
-      QDateTime leftTime = left.data().toDateTime();
-      QDateTime rightTime = right.data().toDateTime();
-      if (leftTime != rightTime)
-        return leftTime < rightTime;
-    } break;
-    case ModList::COL_GAME: {
-      if (leftMod->gameName() != rightMod->gameName()) {
-        lt = leftMod->gameName() < rightMod->gameName();
+    }
+  } break;
+  case ModList::COL_MODID: {
+    if (leftMod->nexusId() != rightMod->nexusId())
+      lt = leftMod->nexusId() < rightMod->nexusId();
+  } break;
+  case ModList::COL_VERSION: {
+    if (leftMod->version() != rightMod->version())
+      lt = leftMod->version() < rightMod->version();
+  } break;
+  case ModList::COL_INSTALLTIME: {
+    QDateTime leftTime  = left.data().toDateTime();
+    QDateTime rightTime = right.data().toDateTime();
+    if (leftTime != rightTime)
+      return leftTime < rightTime;
+  } break;
+  case ModList::COL_GAME: {
+    if (leftMod->gameName() != rightMod->gameName()) {
+      lt = leftMod->gameName() < rightMod->gameName();
+    } else {
+      int comp =
+          QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
+      if (comp != 0)
+        lt = comp < 0;
+    }
+  } break;
+  case ModList::COL_NOTES: {
+    QString leftComments  = leftMod->comments();
+    QString rightComments = rightMod->comments();
+    if (leftComments != rightComments) {
+      if (leftComments.isEmpty()) {
+        lt = sortOrder() == Qt::DescendingOrder;
+      } else if (rightComments.isEmpty()) {
+        lt = sortOrder() == Qt::AscendingOrder;
       } else {
-        int comp = QString::compare(leftMod->name(), rightMod->name(), Qt::CaseInsensitive);
-        if (comp != 0)
-          lt = comp < 0;
-       }
-    } break;
-    case ModList::COL_NOTES: {
-      QString leftComments = leftMod->comments();
-      QString rightComments = rightMod->comments();
-      if (leftComments != rightComments) {
-        if (leftComments.isEmpty()) {
-          lt = sortOrder() == Qt::DescendingOrder;
-        } else if (rightComments.isEmpty()) {
-          lt = sortOrder() == Qt::AscendingOrder;
-        } else {
-          lt = leftComments < rightComments;
-        }
+        lt = leftComments < rightComments;
       }
-    } break;
-    case ModList::COL_PRIORITY: {
-      // nop, already compared by priority
-    } break;
-    default: {
-      log::warn("Sorting is not defined for column {}", left.column());
-    } break;
+    }
+  } break;
+  case ModList::COL_PRIORITY: {
+    if (leftMod->isBackup() != rightMod->isBackup()) {
+      lt = leftMod->isBackup();
+    } else if (leftMod->isOverwrite() != rightMod->isOverwrite()) {
+      lt = rightMod->isOverwrite();
+    }
+  } break;
+  default: {
+    log::warn("Sorting is not defined for column {}", left.column());
+  } break;
   }
   return lt;
 }
diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index b79127afa..5fab222f1 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -135,7 +135,8 @@ public slots:
   void nxmTrackedModsAvailable(QVariant userData, QVariant resultData, int requestID);
   void nxmTrackingToggled(QString gameName, int modID, QVariant userData, bool tracked,
                           int requestID);
-  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID);
+  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData,
+                            int requestID);
   void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
                         int requestID, int errorCode, const QString& errorMessage);
 
@@ -452,16 +453,18 @@ class NexusInterface : public QObject
                             MOBase::IPluginGame const* game);
 
   /**
-  * @param gameName the game short name to support multiple game sources
-  * @brief toggle tracking state of the mod
-  * @param modID id of the mod
-  * @param track true if the mod should be tracked, false for not tracked
-  * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)
-  * @param userData user data to be returned with the result
-  * @param game the game with which the mods are associated
-  * @return int an id to identify the request
-  */
-  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData, const QString& subModule)
+   * @param gameName the game short name to support multiple game sources
+   * @brief toggle tracking state of the mod
+   * @param modID id of the mod
+   * @param track true if the mod should be tracked, false for not tracked
+   * @param receiver the object to receive the result asynchronously via a signal
+   * (nxmFilesAvailable)
+   * @param userData user data to be returned with the result
+   * @param game the game with which the mods are associated
+   * @return int an id to identify the request
+   */
+  int requestGameInfo(QString gameName, QObject* receiver, QVariant userData,
+                      const QString& subModule)
   {
     return requestGameInfo(gameName, receiver, userData, subModule, getGame(gameName));
   }
@@ -588,7 +591,8 @@ class NexusInterface : public QObject
   void nxmTrackedModsAvailable(QVariant userData, QVariant resultData, int requestID);
   void nxmTrackingToggled(QString gameName, int modID, QVariant userData, bool tracked,
                           int requestID);
-  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData, int requestID);
+  void nxmGameInfoAvailable(QString gameName, QVariant userData, QVariant resultData,
+                            int requestID);
   void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
                         int requestID, int errorCode, const QString& errorString);
   void requestsChanged(const APIStats& stats, const APIUserAccount& user);
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 40921d9db..3ed66456e 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1052,8 +1052,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>761</width>
-            <height>515</height>
+            <width>778</width>
+            <height>497</height>
            </rect>
           </property>
           <property name="autoFillBackground">
@@ -1742,8 +1742,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>390</width>
-            <height>342</height>
+            <width>778</width>
+            <height>475</height>
            </rect>
           </property>
           <property name="autoFillBackground">
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 4ce721109..6a666437e 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -160,7 +160,7 @@ void GeneralSettingsTab::resetDialogs()
 
 void GeneralSettingsTab::onEditCategories()
 {
-  CategoriesDialog dialog(m_PluginContainer, &dialog());
+  CategoriesDialog catDialog(m_PluginContainer, &dialog());
 
   if (catDialog.exec() == QDialog::Accepted) {
     catDialog.commitChanges();

From 7c900bb1c86406669119a71bbbe156fedc8341cd Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 21:04:45 -0500
Subject: [PATCH 30/43] Add new dialog for category import - Merge or replace
 strategies - Nexus mappings are optional - If mappings are applied, remapping
 is optional

---
 src/categoriesdialog.cpp     | 67 ++++++++++++++++++++------------
 src/categoryimportdialog.cpp | 75 ++++++++++++++++++++++++++++++++++++
 src/categoryimportdialog.h   | 44 +++++++++++++++++++++
 3 files changed, 161 insertions(+), 25 deletions(-)
 create mode 100644 src/categoryimportdialog.cpp
 create mode 100644 src/categoryimportdialog.h

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 4b42495e4..5b6270f8a 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -19,6 +19,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "categoriesdialog.h"
 #include "categories.h"
+#include "categoryimportdialog.h"
 #include "messagedialog.h"
 #include "nexusinterface.h"
 #include "settings.h"
@@ -292,43 +293,59 @@ void CategoriesDialog::nexusRefresh_clicked()
 
 void CategoriesDialog::nexusImport_clicked()
 {
-  if (QMessageBox::question(nullptr, tr("Import Nexus Categories?"),
-                            tr("This will overwrite your existing categories with the "
-                               "loaded Nexus categories."),
-                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+  auto importDialog = CategoryImportDialog(this);
+  if (importDialog.exec() && importDialog.strategy()) {
+    refreshIDs();
     QTableWidget* table = ui->categoriesTable;
     QListWidget* list   = ui->nexusCategoryList;
-
-    table->setRowCount(0);
-    refreshIDs();
+    if (importDialog.strategy() == CategoryImportDialog::Overwrite) {
+      table->setRowCount(0);
+      m_HighestID = 0;
+    }
     int row = 0;
     for (int i = 0; i < list->count(); ++i) {
-      row = table->rowCount();
-      table->insertRow(table->rowCount());
-      //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
-
-      QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
-      idItem->setData(Qt::DisplayRole, ++m_HighestID);
-
-      QScopedPointer<QTableWidgetItem> nameItem(
-          new QTableWidgetItem(list->item(i)->data(Qt::DisplayRole).toString()));
+      QString name = list->item(i)->data(Qt::DisplayRole).toString();
+      int nexusID  = list->item(i)->data(Qt::UserRole).toInt();
       QStringList nexusLabel;
       QVariantList nexusData;
-      nexusLabel.append(list->item(i)->data(Qt::DisplayRole).toString());
+      nexusLabel.append(name);
       QVariantList data;
-      data.append(QVariant(list->item(i)->data(Qt::DisplayRole).toString()));
-      data.append(QVariant(list->item(i)->data(Qt::UserRole).toInt()));
+      data.append(QVariant(name));
+      data.append(QVariant(nexusID));
       nexusData.insert(nexusData.size(), data);
       QScopedPointer<QTableWidgetItem> nexusCatItem(
           new QTableWidgetItem(nexusLabel.join(", ")));
       nexusCatItem->setData(Qt::UserRole, nexusData);
-      QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
-      parentIDItem->setData(Qt::DisplayRole, 0);
+      if (!table->findItems(name, Qt::MatchExactly).size()) {
+        row = table->rowCount();
+        table->insertRow(table->rowCount());
+        //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
 
-      table->setItem(row, 0, idItem.take());
-      table->setItem(row, 1, nameItem.take());
-      table->setItem(row, 2, parentIDItem.take());
-      table->setItem(row, 3, nexusCatItem.take());
+        QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
+        idItem->setData(Qt::DisplayRole, ++m_HighestID);
+
+        QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(name));
+        QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
+        parentIDItem->setData(Qt::DisplayRole, 0);  // No parent
+
+        table->setItem(row, 0, idItem.take());
+        table->setItem(row, 1, nameItem.take());
+        table->setItem(row, 2, parentIDItem.take());
+
+        if (importDialog.assign()) {
+          table->setItem(row, 3, nexusCatItem.take());
+        }
+      } else {
+        for (auto item : table->findItems(name, Qt::MatchContains | Qt::MatchWrap)) {
+          if (item->column() == 1 && item->text() == name && importDialog.remap()) {
+            table->setItem(item->row(), 3, nexusCatItem.take());
+          } else if (importDialog.remap()) {
+            QScopedPointer<QTableWidgetItem> blankItem(new QTableWidgetItem());
+            blankItem->setData(Qt::UserRole, QVariantList());
+            table->setItem(item->row(), 3, blankItem.get());
+          }
+        }
+      }
     }
     refreshIDs();
   }
diff --git a/src/categoryimportdialog.cpp b/src/categoryimportdialog.cpp
new file mode 100644
index 000000000..4b09c391d
--- /dev/null
+++ b/src/categoryimportdialog.cpp
@@ -0,0 +1,75 @@
+#include "categoryimportdialog.h"
+#include "ui_categoryimportdialog.h"
+
+#include "organizercore.h"
+
+using namespace MOBase;
+
+CategoryImportDialog::CategoryImportDialog(QWidget* parent)
+    : QDialog(parent), ui(new Ui::CategoryImportDialog)
+{
+  ui->setupUi(this);
+  connect(ui->buttonBox, &QDialogButtonBox::accepted, this,
+          &CategoryImportDialog::accepted);
+  connect(ui->buttonBox, &QDialogButtonBox::rejected, this,
+          &CategoryImportDialog::rejected);
+  connect(ui->strategyGroup, &QButtonGroup::buttonClicked, this,
+          &CategoryImportDialog::on_strategyClicked);
+  connect(ui->assignOption, &QCheckBox::clicked, this,
+          &CategoryImportDialog::on_assignOptionClicked);
+}
+
+void CategoryImportDialog::accepted()
+{
+  accept();
+}
+
+void CategoryImportDialog::rejected()
+{
+  reject();
+}
+
+CategoryImportDialog::~CategoryImportDialog()
+{
+  delete ui;
+}
+
+CategoryImportDialog::ImportStrategy CategoryImportDialog::strategy()
+{
+  if (ui->mergeOption->isChecked()) {
+    return ImportStrategy::Merge;
+  } else if (ui->replaceOption->isChecked()) {
+    return ImportStrategy::Overwrite;
+  }
+  return ImportStrategy::None;
+}
+
+bool CategoryImportDialog::assign()
+{
+  return ui->assignOption->isChecked();
+}
+
+bool CategoryImportDialog::remap()
+{
+  return ui->remapOption->isChecked();
+}
+
+void CategoryImportDialog::on_strategyClicked(QAbstractButton* button)
+{
+  if (button == ui->replaceOption) {
+    ui->remapOption->setChecked(false);
+    ui->remapOption->setDisabled(true);
+  } else {
+    ui->remapOption->setEnabled(true);
+  }
+}
+
+void CategoryImportDialog::on_assignOptionClicked(bool checked)
+{
+  if (checked && strategy() == ImportStrategy::Merge) {
+    ui->remapOption->setEnabled(true);
+  } else {
+    ui->remapOption->setChecked(false);
+    ui->remapOption->setDisabled(true);
+  }
+}
diff --git a/src/categoryimportdialog.h b/src/categoryimportdialog.h
new file mode 100644
index 000000000..bfc2eee49
--- /dev/null
+++ b/src/categoryimportdialog.h
@@ -0,0 +1,44 @@
+#ifndef CATEGORYIMPORTDIALOG_H
+#define CATEGORYIMPORTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui
+{
+class CategoryImportDialog;
+}
+
+/**
+ * @brief Dialog that allows users to configure mod categories
+ **/
+class CategoryImportDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  enum ImportStrategy
+  {
+    None,
+    Overwrite,
+    Merge
+  };
+
+public:
+  explicit CategoryImportDialog(QWidget* parent = 0);
+  ~CategoryImportDialog();
+
+  ImportStrategy strategy();
+  bool assign();
+  bool remap();
+
+public slots:
+  void accepted();
+  void rejected();
+  void on_strategyClicked(QAbstractButton* button);
+  void on_assignOptionClicked(bool clicked);
+
+private:
+  Ui::CategoryImportDialog* ui;
+};
+
+#endif  // CATEGORYIMPORTDIALOG_H

From aff3e098739909fbd36db02c812cc5361ca8ee16 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Fri, 22 Sep 2023 02:41:32 -0500
Subject: [PATCH 31/43] Add UI file

---
 src/categoryimportdialog.ui | 144 ++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 src/categoryimportdialog.ui

diff --git a/src/categoryimportdialog.ui b/src/categoryimportdialog.ui
new file mode 100644
index 000000000..c3a18ab1e
--- /dev/null
+++ b/src/categoryimportdialog.ui
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CategoryImportDialog</class>
+ <widget class="QDialog" name="CategoryImportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>193</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Nexus Category Import</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>&lt;h3&gt;How do you want to import the categories?&lt;/h3&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Import Strategy</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="mergeOption">
+          <property name="text">
+           <string>Merge</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">strategyGroup</string>
+          </attribute>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="replaceOption">
+          <property name="text">
+           <string>Replace</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">strategyGroup</string>
+          </attribute>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Options</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="assignOption">
+          <property name="text">
+           <string>Assign nexus mappings</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="remapOption">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Remap existing mappings</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+ <buttongroups>
+  <buttongroup name="strategyGroup"/>
+ </buttongroups>
+</ui>

From 31a85a3db5fcb34b36dc6ed6f56a351a5dcb319a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Fri, 22 Sep 2023 13:50:31 -0500
Subject: [PATCH 32/43] Reassign filter group for category classes

---
 src/CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 125b6ebd4..1b9a0f852 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,9 +42,14 @@ mo2_add_filter(NAME src/browser GROUPS
 	browserview
 )
 
+mo2_add_filter(NAME src/categories GROUPS
+        categories
+	categoriestable
+        categoriesdialog
+	categoryimportdialog
+)
+
 mo2_add_filter(NAME src/core GROUPS
-	categories
-    categoriestable
 	archivefiletree
 	installationmanager
 	nexusinterface
@@ -61,7 +66,6 @@ mo2_add_filter(NAME src/core GROUPS
 mo2_add_filter(NAME src/dialogs GROUPS
 	aboutdialog
 	activatemodsdialog
-	categoriesdialog
 	credentialsdialog
 	filedialogmemory
 	forcedloaddialog

From e22331fa0305d8a0a2b8b6d37203dac1ed3524e9 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 19:00:41 -0500
Subject: [PATCH 33/43] Restructure category refresh action - Remove plugins
 class - Route signals to run Nexus API call from MainWindow - Pass Dialog
 instance to route response data - Revert CategoryFactory::instance to return
 reference

---
 src/categories.cpp              | 11 +++++++---
 src/categories.h                |  7 +++++-
 src/categoriesdialog.cpp        | 38 +++++++++++++++------------------
 src/categoriesdialog.h          |  7 +-----
 src/downloadmanager.cpp         | 37 +++++++++++++++++---------------
 src/downloadmanager.h           |  9 ++++++++
 src/filterlist.cpp              |  2 +-
 src/installationmanager.cpp     |  4 ++--
 src/mainwindow.cpp              | 33 +++++++++++++++++-----------
 src/mainwindow.h                |  3 ++-
 src/moapplication.cpp           |  2 +-
 src/modinfo.cpp                 | 12 +++++------
 src/modinfodialogcategories.cpp | 12 +++++------
 src/modinfodialogcategories.h   |  2 +-
 src/modinforegular.cpp          | 10 ++++-----
 src/modlist.cpp                 | 18 ++++++++--------
 src/modlistsortproxy.cpp        | 10 ++++-----
 src/modlistviewactions.cpp      |  8 +++----
 src/organizercore.cpp           |  3 ++-
 src/settingsdialoggeneral.cpp   |  2 +-
 20 files changed, 127 insertions(+), 103 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 18cee4f9d..5d0d2bb77 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -146,10 +146,10 @@ void CategoryFactory::loadCategories()
     loadDefaultCategories();
 }
 
-CategoryFactory* CategoryFactory::instance()
+CategoryFactory& CategoryFactory::instance()
 {
   static CategoryFactory s_Instance;
-  return &s_Instance;
+  return s_Instance;
 }
 
 void CategoryFactory::reset()
@@ -285,7 +285,7 @@ void CategoryFactory::addCategory(int id, const QString& name,
 void CategoryFactory::setNexusCategories(
     std::vector<CategoryFactory::NexusCategory>& nexusCats)
 {
-  m_NexusMap.empty();
+  m_NexusMap.clear();
   for (auto nexusCat : nexusCats) {
     m_NexusMap.emplace(nexusCat.m_ID, nexusCat);
   }
@@ -293,6 +293,11 @@ void CategoryFactory::setNexusCategories(
   saveCategories();
 }
 
+void CategoryFactory::refreshNexusCategories(CategoriesDialog* dialog)
+{
+  emit nexusCategoryRefresh(dialog);
+}
+
 void CategoryFactory::loadDefaultCategories()
 {
   // the order here is relevant as it defines the order in which the
diff --git a/src/categories.h b/src/categories.h
index 3f91e6c52..b7a9c2145 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -25,6 +25,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <map>
 #include <vector>
 
+class CategoriesDialog;
+
 /**
  * @brief Manage the available mod categories
  * @warning member functions of this class currently use a wild mix of ids and indexes
@@ -116,6 +118,8 @@ class CategoryFactory : public QObject
 
   void setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats);
 
+  void refreshNexusCategories(CategoriesDialog* dialog);
+
   int addCategory(const QString& name, const std::vector<NexusCategory>& nexusCats,
                   int parentID);
 
@@ -211,7 +215,7 @@ class CategoryFactory : public QObject
    *
    * @return the reference to the singleton
    **/
-  static CategoryFactory* instance();
+  static CategoryFactory& instance();
 
   /**
    * @return path to the file that contains the categories list
@@ -224,6 +228,7 @@ class CategoryFactory : public QObject
   static QString nexusMappingFilePath();
 
 signals:
+  void nexusCategoryRefresh(CategoriesDialog*);
   void categoriesSaved();
 
 private:
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 5b6270f8a..53c930f37 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -105,9 +105,8 @@ class ValidatingDelegate : public QItemDelegate
   QValidator* m_Validator;
 };
 
-CategoriesDialog::CategoriesDialog(PluginContainer* pluginContainer, QWidget* parent)
-    : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog),
-      m_PluginContainer(pluginContainer)
+CategoriesDialog::CategoriesDialog(QWidget* parent)
+    : TutorableDialog("Categories", parent), ui(new Ui::CategoriesDialog)
 {
   ui->setupUi(this);
   fillTable();
@@ -144,8 +143,8 @@ void CategoriesDialog::cellChanged(int row, int)
 
 void CategoriesDialog::commitChanges()
 {
-  CategoryFactory* categories = CategoryFactory::instance();
-  categories->reset();
+  CategoryFactory& categories = CategoryFactory::instance();
+  categories.reset();
 
   for (int i = 0; i < ui->categoriesTable->rowCount(); ++i) {
     int index = ui->categoriesTable->verticalHeader()->logicalIndex(i);
@@ -157,12 +156,12 @@ void CategoriesDialog::commitChanges()
           nexusCat.toList()[0].toString(), nexusCat.toList()[1].toInt()));
     }
 
-    categories->addCategory(ui->categoriesTable->item(index, 0)->text().toInt(),
-                            ui->categoriesTable->item(index, 1)->text(), nexusCats,
-                            ui->categoriesTable->item(index, 2)->text().toInt());
+    categories.addCategory(ui->categoriesTable->item(index, 0)->text().toInt(),
+                           ui->categoriesTable->item(index, 1)->text(), nexusCats,
+                           ui->categoriesTable->item(index, 2)->text().toInt());
   }
 
-  categories->setParents();
+  categories.setParents();
 
   std::vector<CategoryFactory::NexusCategory> nexusCats;
   for (int i = 0; i < ui->nexusCategoryList->count(); ++i) {
@@ -171,9 +170,9 @@ void CategoriesDialog::commitChanges()
         ui->nexusCategoryList->item(i)->data(Qt::UserRole).toInt()));
   }
 
-  categories->setNexusCategories(nexusCats);
+  categories.setNexusCategories(nexusCats);
 
-  categories->saveCategories();
+  categories.saveCategories();
 }
 
 void CategoriesDialog::refreshIDs()
@@ -190,7 +189,7 @@ void CategoriesDialog::refreshIDs()
 
 void CategoriesDialog::fillTable()
 {
-  CategoryFactory* categories = CategoryFactory::instance();
+  CategoryFactory& categories = CategoryFactory::instance();
   QTableWidget* table         = ui->categoriesTable;
   QListWidget* list           = ui->nexusCategoryList;
 
@@ -211,8 +210,8 @@ void CategoriesDialog::fillTable()
 
   int row = 0;
   for (std::vector<CategoryFactory::Category>::const_iterator iter =
-           categories->m_Categories.begin();
-       iter != categories->m_Categories.end(); ++iter, ++row) {
+           categories.m_Categories.begin();
+       iter != categories.m_Categories.end(); ++iter, ++row) {
     const CategoryFactory::Category& category = *iter;
     if (category.m_ID == 0) {
       --row;
@@ -235,12 +234,12 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 3, nexusCatItem.take());
   }
 
-  for (auto nexusCat : categories->m_NexusMap) {
+  for (auto nexusCat : categories.m_NexusMap) {
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
     nexusItem->setData(Qt::DisplayRole, nexusCat.second.m_Name);
     nexusItem->setData(Qt::UserRole, nexusCat.second.m_ID);
     list->addItem(nexusItem.take());
-    auto item = table->item(categories->resolveNexusID(nexusCat.first) - 1, 3);
+    auto item = table->item(categories.resolveNexusID(nexusCat.first) - 1, 3);
     if (item != nullptr) {
       auto itemData = item->data(Qt::UserRole).toList();
       QVariantList newData;
@@ -285,10 +284,7 @@ void CategoriesDialog::removeNexusMap_clicked()
 
 void CategoriesDialog::nexusRefresh_clicked()
 {
-  NexusInterface& nexus = NexusInterface::instance();
-  nexus.setPluginContainer(m_PluginContainer);
-  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), this,
-                        QVariant(), QString());
+  CategoryFactory::instance().refreshNexusCategories(this);
 }
 
 void CategoriesDialog::nexusImport_clicked()
@@ -356,7 +352,7 @@ void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant,
 {
   QVariantMap result          = resultData.toMap();
   QVariantList categories     = result["categories"].toList();
-  CategoryFactory* catFactory = CategoryFactory::instance();
+  CategoryFactory& catFactory = CategoryFactory::instance();
   QListWidget* list           = ui->nexusCategoryList;
   list->clear();
   for (auto category : categories) {
diff --git a/src/categoriesdialog.h b/src/categoriesdialog.h
index 1bcf273cd..94f390b07 100644
--- a/src/categoriesdialog.h
+++ b/src/categoriesdialog.h
@@ -38,7 +38,7 @@ class CategoriesDialog : public MOBase::TutorableDialog
   Q_OBJECT
 
 public:
-  explicit CategoriesDialog(PluginContainer* pluginContainer, QWidget* parent = 0);
+  explicit CategoriesDialog(QWidget* parent = 0);
   ~CategoriesDialog();
 
   // also saves and restores geometry
@@ -52,16 +52,11 @@ class CategoriesDialog : public MOBase::TutorableDialog
   void commitChanges();
 
 public slots:
-
   void nxmGameInfoAvailable(QString gameName, QVariant, QVariant resultData, int);
   void nxmRequestFailed(QString, int, int, QVariant, int, int errorCode,
                         const QString& errorMessage);
 
-signals:
-  void refreshNexusCategories();
-
 private slots:
-
   void on_categoriesTable_customContextMenuRequested(const QPoint& pos);
   void addCategory_clicked();
   void removeCategory_clicked();
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 3c9e776ec..d7a72c0be 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -153,6 +153,20 @@ DownloadManager::DownloadInfo::createFromMeta(const QString& filePath, bool show
   return info;
 }
 
+ScopedDisableDirWatcher::ScopedDisableDirWatcher(DownloadManager* downloadManager)
+{
+  m_downloadManager = downloadManager;
+  m_downloadManager->startDisableDirWatcher();
+  log::debug("Scoped Disable DirWatcher: Started");
+}
+
+ScopedDisableDirWatcher::~ScopedDisableDirWatcher()
+{
+  m_downloadManager->endDisableDirWatcher();
+  m_downloadManager = nullptr;
+  log::debug("Scoped Disable DirWatcher: Stopped");
+}
+
 void DownloadManager::startDisableDirWatcher()
 {
   DownloadManager::m_DirWatcherDisabler++;
@@ -317,10 +331,9 @@ void DownloadManager::refreshList()
 {
   TimeThis tt("DownloadManager::refreshList()");
 
+  // avoid triggering other refreshes
+  ScopedDisableDirWatcher scopedDirWatcher(this);
   try {
-    // avoid triggering other refreshes
-    startDisableDirWatcher();
-
     int downloadsBefore = m_ActiveDownloads.size();
 
     // remove finished downloads
@@ -419,10 +432,7 @@ void DownloadManager::refreshList()
 
     log::debug("saw {} downloads", m_ActiveDownloads.size());
 
-    emit update(-1);
-
-    // let watcher trigger refreshes again
-    endDisableDirWatcher();
+    emit update(-1);  
 
   } catch (const std::bad_alloc&) {
     reportError(tr("Memory allocation error (in refreshing directory)."));
@@ -758,7 +768,7 @@ void DownloadManager::addNXMDownload(const QString& url)
 void DownloadManager::removeFile(int index, bool deleteFile)
 {
   // Avoid triggering refreshes from DirWatcher
-  startDisableDirWatcher();
+  ScopedDisableDirWatcher scopedDirWatcher(this);
 
   if (index >= m_ActiveDownloads.size()) {
     throw MyException(tr("remove: invalid download index %1").arg(index));
@@ -770,7 +780,6 @@ void DownloadManager::removeFile(int index, bool deleteFile)
       (download->m_State == STATE_DOWNLOADING)) {
     // shouldn't have been possible
     log::error("tried to remove active download");
-    endDisableDirWatcher();
     return;
   }
 
@@ -781,7 +790,6 @@ void DownloadManager::removeFile(int index, bool deleteFile)
   if (deleteFile) {
     if (!shellDelete(QStringList(filePath), true)) {
       reportError(tr("failed to delete %1").arg(filePath));
-      endDisableDirWatcher();
       return;
     }
 
@@ -795,8 +803,6 @@ void DownloadManager::removeFile(int index, bool deleteFile)
       metaSettings.setValue("removed", true);
   }
   m_DownloadRemoved(index);
-
-  endDisableDirWatcher();
 }
 
 class LessThanWrapper
@@ -1449,15 +1455,13 @@ void DownloadManager::markInstalled(int index)
   }
 
   // Avoid triggering refreshes from DirWatcher
-  startDisableDirWatcher();
+  ScopedDisableDirWatcher scopedDirWatcher(this);
 
   DownloadInfo* info = m_ActiveDownloads.at(index);
   QSettings metaFile(info->m_Output.fileName() + ".meta", QSettings::IniFormat);
   metaFile.setValue("installed", true);
   metaFile.setValue("uninstalled", false);
 
-  endDisableDirWatcher();
-
   setState(m_ActiveDownloads.at(index), STATE_INSTALLED);
 }
 
@@ -1686,7 +1690,7 @@ void DownloadManager::downloadReadyRead()
 void DownloadManager::createMetaFile(DownloadInfo* info)
 {
   // Avoid triggering refreshes from DirWatcher
-  startDisableDirWatcher();
+  ScopedDisableDirWatcher scopedDirWatcher(this);
 
   QSettings metaFile(QString("%1.meta").arg(info->m_Output.fileName()),
                      QSettings::IniFormat);
@@ -1710,7 +1714,6 @@ void DownloadManager::createMetaFile(DownloadInfo* info)
                                   (info->m_State == DownloadManager::STATE_ERROR));
   metaFile.setValue("removed", info->m_Hidden);
 
-  endDisableDirWatcher();
   // slightly hackish...
   for (int i = 0; i < m_ActiveDownloads.size(); ++i) {
     if (m_ActiveDownloads[i] == info) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index d264ec87f..618c2813a 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -634,4 +634,13 @@ private slots:
   QTimer m_TimeoutTimer;
 };
 
+class ScopedDisableDirWatcher
+{
+public:
+  ScopedDisableDirWatcher(DownloadManager* downloadManager);
+  ~ScopedDisableDirWatcher();
+
+private:
+  DownloadManager* m_downloadManager;
+};
 #endif  // DOWNLOADMANAGER_H
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index c88945f83..3be67def3 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -425,7 +425,7 @@ void FilterList::checkCriteria()
 
 void FilterList::editCategories()
 {
-  CategoriesDialog dialog(&m_core.pluginContainer(), qApp->activeWindow());
+  CategoriesDialog dialog(qApp->activeWindow());
 
   if (dialog.exec() == QDialog::Accepted) {
     dialog.commitChanges();
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 3f247b388..37c86c7e4 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -663,7 +663,7 @@ InstallationResult InstallationManager::install(const QString& fileName,
     version                    = metaFile.value("version", "").toString();
     newestVersion              = metaFile.value("newestVersion", "").toString();
     category                   = metaFile.value("category", 0).toInt();
-    unsigned int categoryIndex = CategoryFactory::instance()->resolveNexusID(category);
+    unsigned int categoryIndex = CategoryFactory::instance().resolveNexusID(category);
     if (category != 0 && categoryIndex == 0U &&
         Settings::instance().nexus().categoryMappings()) {
       QMessageBox nexusQuery;
@@ -685,7 +685,7 @@ InstallationResult InstallationManager::install(const QString& fileName,
         return MOBase::IPluginInstaller::RESULT_CATEGORYREQUESTED;
       }
     } else {
-      categoryID = CategoryFactory::instance()->getCategoryID(categoryIndex);
+      categoryID = CategoryFactory::instance().getCategoryID(categoryIndex);
     }
     repository     = metaFile.value("repository", "").toString();
     fileCategoryID = metaFile.value("fileCategory", 1).toInt();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 74504ed62..ce2c4dd04 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -290,7 +290,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
     ui->statusBar->setAPI(ni.getAPIStats(), ni.getAPIUserAccount());
   }
 
-  m_CategoryFactory->loadCategories();
+  m_CategoryFactory.loadCategories();
 
   ui->logList->setCore(m_OrganizerCore);
 
@@ -455,8 +455,9 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
   connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this,
           &MainWindow::modInstalled);
 
-  connect(m_CategoryFactory, &CategoryFactory::categoriesSaved, this,
-          &MainWindow::categoriesSaved);
+  connect(&m_CategoryFactory, SIGNAL(nexusCategoryRefresh(CategoriesDialog*)), this,
+          SLOT(refreshNexusCategories(CategoriesDialog*)));
+  connect(&m_CategoryFactory, SIGNAL(categoriesSaved()), this, SLOT(categoriesSaved()));
 
   m_CheckBSATimer.setSingleShot(true);
   connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList()));
@@ -540,7 +541,7 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
 
 void MainWindow::setupModList()
 {
-  ui->modList->setup(m_OrganizerCore, *m_CategoryFactory, this, ui);
+  ui->modList->setup(m_OrganizerCore, m_CategoryFactory, this, ui);
 
   connect(&ui->modList->actions(), &ModListViewActions::overwriteCleared, [=]() {
     scheduleCheckForProblems();
@@ -1291,11 +1292,11 @@ void MainWindow::showEvent(QShowEvent* event)
       if (newCatDialog.clickedButton() == &importBtn) {
         importCategories(false);
       } else if (newCatDialog.clickedButton() == &cancelBtn) {
-        m_CategoryFactory->reset();
+        m_CategoryFactory.reset();
       } else if (newCatDialog.clickedButton() == &defaultBtn) {
-        m_CategoryFactory->loadCategories();
+        m_CategoryFactory.loadCategories();
       }
-      m_CategoryFactory->saveCategories();
+      m_CategoryFactory.saveCategories();
 
       m_OrganizerCore.settings().setFirstStart(false);
     } else {
@@ -2087,7 +2088,7 @@ void MainWindow::fixCategories()
     std::set<int> categories = modInfo->getCategories();
     for (std::set<int>::iterator iter = categories.begin(); iter != categories.end();
          ++iter) {
-      if (!m_CategoryFactory->categoryExists(*iter)) {
+      if (!m_CategoryFactory.categoryExists(*iter)) {
         modInfo->setCategory(*iter, false);
       }
     }
@@ -2831,12 +2832,20 @@ void MainWindow::onPluginRegistrationChanged()
   m_DownloadsTab->update();
 }
 
+void MainWindow::refreshNexusCategories(CategoriesDialog* dialog)
+{
+  NexusInterface& nexus = NexusInterface::instance();
+  nexus.setPluginContainer(&m_PluginContainer);
+  nexus.requestGameInfo(Settings::instance().game().plugin()->gameShortName(), dialog,
+                        QVariant(), QString());
+}
+
 void MainWindow::categoriesSaved()
 {
   for (auto modName : m_OrganizerCore.modList()->allMods()) {
     auto mod = ModInfo::getByName(modName);
     for (auto category : mod->getCategories()) {
-      if (!m_CategoryFactory->categoryExists(category))
+      if (!m_CategoryFactory.categoryExists(category))
         mod->setCategory(category, false);
     }
   }
@@ -3457,14 +3466,14 @@ void MainWindow::nxmGameInfoAvailable(QString gameName, QVariant, QVariant resul
 {
   QVariantMap result          = resultData.toMap();
   QVariantList categories     = result["categories"].toList();
-  CategoryFactory* catFactory = CategoryFactory::instance();
-  catFactory->reset();
+  CategoryFactory& catFactory = CategoryFactory::instance();
+  catFactory.reset();
   for (auto category : categories) {
     auto catMap = category.toMap();
     std::vector<CategoryFactory::NexusCategory> nexusCat;
     nexusCat.push_back(CategoryFactory::NexusCategory(catMap["name"].toString(),
                                                       catMap["category_id"].toInt()));
-    catFactory->addCategory(catMap["name"].toString(), nexusCat, 0);
+    catFactory.addCategory(catMap["name"].toString(), nexusCat, 0);
   }
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index eae50aa09..99feca83b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -283,7 +283,7 @@ private slots:
 
   QAction* m_ContextAction;
 
-  CategoryFactory* m_CategoryFactory;
+  CategoryFactory& m_CategoryFactory;
 
   QTimer m_CheckBSATimer;
   QTimer m_SaveMetaTimer;
@@ -363,6 +363,7 @@ private slots:
 
   void importCategories(bool);
 
+  void refreshNexusCategories(CategoriesDialog* dialog);
   void categoriesSaved();
 
   // update info
diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index 7e95217ed..e131d3d96 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -296,7 +296,7 @@ int MOApplication::setup(MOMultiProcess& multiProcess, bool forceSelect)
             m_instance->gamePlugin()->steamAPPId(),
             m_instance->gamePlugin()->gameDirectory().absolutePath());
 
-  CategoryFactory::instance()->loadCategories();
+  CategoryFactory::instance().loadCategories();
   m_core->updateExecutablesList();
   m_core->updateModInfoFromDisc();
   m_core->setCurrentProfile(m_instance->profileName());
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 0ae28e737..1028c66f1 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -493,9 +493,9 @@ void ModInfo::setPluginSelected(const bool& isSelected)
 
 void ModInfo::addCategory(const QString& categoryName)
 {
-  int id = CategoryFactory::instance()->getCategoryID(categoryName);
+  int id = CategoryFactory::instance().getCategoryID(categoryName);
   if (id == -1) {
-    id = CategoryFactory::instance()->addCategory(
+    id = CategoryFactory::instance().addCategory(
         categoryName, std::vector<CategoryFactory::NexusCategory>(), 0);
   }
   setCategory(id, true);
@@ -503,7 +503,7 @@ void ModInfo::addCategory(const QString& categoryName)
 
 bool ModInfo::removeCategory(const QString& categoryName)
 {
-  int id = CategoryFactory::instance()->getCategoryID(categoryName);
+  int id = CategoryFactory::instance().getCategoryID(categoryName);
   if (id == -1) {
     return false;
   }
@@ -518,9 +518,9 @@ QStringList ModInfo::categories() const
 {
   QStringList result;
 
-  CategoryFactory* catFac = CategoryFactory::instance();
+  CategoryFactory& catFac = CategoryFactory::instance();
   for (int id : m_Categories) {
-    result.append(catFac->getCategoryName(catFac->getCategoryIndex(id)));
+    result.append(catFac.getCategoryName(catFac.getCategoryIndex(id)));
   }
 
   return result;
@@ -550,7 +550,7 @@ bool ModInfo::categorySet(int categoryID) const
   for (std::set<int>::const_iterator iter = m_Categories.begin();
        iter != m_Categories.end(); ++iter) {
     if ((*iter == categoryID) ||
-        (CategoryFactory::instance()->isDescendantOf(*iter, categoryID))) {
+        (CategoryFactory::instance().isDescendantOf(*iter, categoryID))) {
       return true;
     }
   }
diff --git a/src/modinfodialogcategories.cpp b/src/modinfodialogcategories.cpp
index 5665df9fb..a7a4ce1e6 100644
--- a/src/modinfodialogcategories.cpp
+++ b/src/modinfodialogcategories.cpp
@@ -44,19 +44,19 @@ bool CategoriesTab::usesOriginFiles() const
   return false;
 }
 
-void CategoriesTab::add(const CategoryFactory* factory,
+void CategoriesTab::add(const CategoryFactory& factory,
                         const std::set<int>& enabledCategories, QTreeWidgetItem* root,
                         int rootLevel)
 {
-  for (int i = 0; i < static_cast<int>(factory->numCategories()); ++i) {
-    if (factory->getParentID(i) != rootLevel) {
+  for (int i = 0; i < static_cast<int>(factory.numCategories()); ++i) {
+    if (factory.getParentID(i) != rootLevel) {
       continue;
     }
 
-    int categoryID = factory->getCategoryID(i);
+    int categoryID = factory.getCategoryID(i);
 
     QTreeWidgetItem* newItem =
-        new QTreeWidgetItem(QStringList(factory->getCategoryName(i)));
+        new QTreeWidgetItem(QStringList(factory.getCategoryName(i)));
 
     newItem->setFlags(newItem->flags() | Qt::ItemIsUserCheckable);
 
@@ -67,7 +67,7 @@ void CategoriesTab::add(const CategoryFactory* factory,
 
     newItem->setData(0, Qt::UserRole, categoryID);
 
-    if (factory->hasChildren(i)) {
+    if (factory.hasChildren(i)) {
       add(factory, enabledCategories, newItem, categoryID);
     }
 
diff --git a/src/modinfodialogcategories.h b/src/modinfodialogcategories.h
index b390146cf..03b3555b8 100644
--- a/src/modinfodialogcategories.h
+++ b/src/modinfodialogcategories.h
@@ -13,7 +13,7 @@ class CategoriesTab : public ModInfoDialogTab
   bool usesOriginFiles() const override;
 
 private:
-  void add(const CategoryFactory* factory, const std::set<int>& enabledCategories,
+  void add(const CategoryFactory& factory, const std::set<int>& enabledCategories,
            QTreeWidgetItem* root, int rootLevel);
 
   void updatePrimary();
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index 585904771..c79fc5740 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -213,7 +213,7 @@ void ModInfoRegular::readMeta()
       continue;
     }
     if (ok && (categoryID != 0) &&
-        (CategoryFactory::instance()->categoryExists(categoryID))) {
+        (CategoryFactory::instance().categoryExists(categoryID))) {
       m_Categories.insert(categoryID);
       if (iter == categories.begin()) {
         m_PrimaryCategory = categoryID;
@@ -578,7 +578,7 @@ void ModInfoRegular::setInstallationFile(const QString& fileName)
 
 void ModInfoRegular::addNexusCategory(int categoryID)
 {
-  m_Categories.insert(CategoryFactory::instance()->resolveNexusID(categoryID));
+  m_Categories.insert(CategoryFactory::instance().resolveNexusID(categoryID));
 }
 
 void ModInfoRegular::setIsEndorsed(bool endorsed)
@@ -734,15 +734,15 @@ QString ModInfoRegular::getDescription() const
     const std::set<int>& categories = getCategories();
     std::wostringstream categoryString;
     categoryString << ToWString(tr("Categories: <br>"));
-    CategoryFactory* categoryFactory = CategoryFactory::instance();
+    CategoryFactory& categoryFactory = CategoryFactory::instance();
     for (std::set<int>::const_iterator catIter = categories.begin();
          catIter != categories.end(); ++catIter) {
       if (catIter != categories.begin()) {
         categoryString << " , ";
       }
       categoryString << "<span style=\"white-space: nowrap;\"><i>"
-                     << ToWString(categoryFactory->getCategoryName(
-                            categoryFactory->getCategoryIndex(*catIter)))
+                     << ToWString(categoryFactory.getCategoryName(
+                            categoryFactory.getCategoryIndex(*catIter)))
                      << "</font></span>";
     }
 
diff --git a/src/modlist.cpp b/src/modlist.cpp
index 9f64cc711..7a9513695 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -232,11 +232,11 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
       } else {
         int category = modInfo->primaryCategory();
         if (category != -1) {
-          CategoryFactory* categoryFactory = CategoryFactory::instance();
-          if (categoryFactory->categoryExists(category)) {
+          CategoryFactory& categoryFactory = CategoryFactory::instance();
+          if (categoryFactory.categoryExists(category)) {
             try {
-              int categoryIdx = categoryFactory->getCategoryIndex(category);
-              return categoryFactory->getCategoryName(categoryIdx);
+              int categoryIdx = categoryFactory.getCategoryIndex(category);
+              return categoryFactory.getCategoryName(categoryIdx);
             } catch (const std::exception& e) {
               log::error("failed to retrieve category name: {}", e.what());
               return QString();
@@ -286,10 +286,10 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
     if (column == COL_CATEGORY) {
       QVariantList categoryNames;
       std::set<int> categories         = modInfo->getCategories();
-      CategoryFactory* categoryFactory = CategoryFactory::instance();
+      CategoryFactory& categoryFactory = CategoryFactory::instance();
       for (auto iter = categories.begin(); iter != categories.end(); ++iter) {
         categoryNames.append(
-            categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
+            categoryFactory.getCategoryName(categoryFactory.getCategoryIndex(*iter)));
       }
       if (categoryNames.count() != 0) {
         return categoryNames;
@@ -447,7 +447,7 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
       const std::set<int>& categories = modInfo->getCategories();
       std::wostringstream categoryString;
       categoryString << ToWString(tr("Categories: <br>"));
-      CategoryFactory* categoryFactory = CategoryFactory::instance();
+      CategoryFactory& categoryFactory = CategoryFactory::instance();
       for (std::set<int>::const_iterator catIter = categories.begin();
            catIter != categories.end(); ++catIter) {
         if (catIter != categories.begin()) {
@@ -455,8 +455,8 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
         }
         try {
           categoryString << "<span style=\"white-space: nowrap;\"><i>"
-                         << ToWString(categoryFactory->getCategoryName(
-                                categoryFactory->getCategoryIndex(*catIter)))
+                         << ToWString(categoryFactory.getCategoryName(
+                                categoryFactory.getCategoryIndex(*catIter)))
                          << "</font></span>";
         } catch (const std::exception& e) {
           log::error("failed to generate tooltip: {}", e.what());
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index e61f94947..704ec10b1 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -171,11 +171,11 @@ bool ModListSortProxy::lessThan(const QModelIndex& left, const QModelIndex& righ
         lt = true;
       else {
         try {
-          CategoryFactory* categories = CategoryFactory::instance();
-          QString leftCatName         = categories->getCategoryName(
-              categories->getCategoryIndex(leftMod->primaryCategory()));
-          QString rightCatName = categories->getCategoryName(
-              categories->getCategoryIndex(rightMod->primaryCategory()));
+          CategoryFactory& categories = CategoryFactory::instance();
+          QString leftCatName         = categories.getCategoryName(
+              categories.getCategoryIndex(leftMod->primaryCategory()));
+          QString rightCatName = categories.getCategoryName(
+              categories.getCategoryIndex(rightMod->primaryCategory()));
           lt = leftCatName < rightCatName;
         } catch (const std::exception& e) {
           log::error("failed to compare categories: {}", e.what());
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index d82dca878..983574abd 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -288,13 +288,13 @@ void ModListViewActions::assignCategories() const
         nexusCategory = downloadMeta.value("category", 0).toInt();
       }
     }
-    int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory);
+    int newCategory = CategoryFactory::instance().resolveNexusID(nexusCategory);
     if (newCategory != 0) {
       for (auto category : modInfo->categories()) {
         modInfo->removeCategory(category);
       }
     }
-    modInfo->setCategory(CategoryFactory::instance()->getCategoryID(newCategory), true);
+    modInfo->setCategory(CategoryFactory::instance().getCategoryID(newCategory), true);
   }
 }
 
@@ -1136,10 +1136,10 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
       }
     }
     unsigned int categoryIndex =
-        CategoryFactory::instance()->resolveNexusID(categoryID);
+        CategoryFactory::instance().resolveNexusID(categoryID);
     if (categoryIndex != 0)
       modInfo->setPrimaryCategory(
-          CategoryFactory::instance()->getCategoryID(categoryIndex));
+          CategoryFactory::instance().getCategoryID(categoryIndex));
   }
 }
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 3781a4e1f..dda731ba7 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -804,7 +804,7 @@ OrganizerCore::doInstall(const QString& archivePath, GuessedValue<QString> modNa
     return {modIndex, modInfo};
   } else {
     if (result.result() == MOBase::IPluginInstaller::RESULT_CATEGORYREQUESTED) {
-      CategoriesDialog dialog(&pluginContainer(), qApp->activeWindow());
+      CategoriesDialog dialog(qApp->activeWindow());
 
       if (dialog.exec() == QDialog::Accepted) {
         dialog.commitChanges();
@@ -831,6 +831,7 @@ OrganizerCore::doInstall(const QString& archivePath, GuessedValue<QString> modNa
 
 ModInfo::Ptr OrganizerCore::installDownload(int index, int priority)
 {
+  ScopedDisableDirWatcher scopedDirwatcher(&m_DownloadManager);
   try {
     QString fileName        = m_DownloadManager.getFilePath(index);
     QString gameName        = m_DownloadManager.getGameName(index);
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 6a666437e..62b26c2fb 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -160,7 +160,7 @@ void GeneralSettingsTab::resetDialogs()
 
 void GeneralSettingsTab::onEditCategories()
 {
-  CategoriesDialog catDialog(m_PluginContainer, &dialog());
+  CategoriesDialog catDialog(&dialog());
 
   if (catDialog.exec() == QDialog::Accepted) {
     catDialog.commitChanges();

From a67a919e54b34d50c77c5967c2ca5eb31ad7200d Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 19:03:07 -0500
Subject: [PATCH 34/43] Revert version.rc I think VS did this when I tried to
 use the GUI

---
 src/version.rc | 53 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/version.rc b/src/version.rc
index aa92aee1d..0db83d44d 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,24 +1,37 @@
 #include "Winver.h"
 
-// If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses
-// VER_FILEVERSION to determine version number. Otherwise, if letters are used in
-// VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser Otherwise, uses the
-// numbers from VER_FILEVERSION and sets the release type as pre-alpha
-#define VER_FILEVERSION 2, 5, 0
-#define VER_FILEVERSION_STR "2.5.0-beta9\0"
+// If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
+// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
+// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
+#define VER_FILEVERSION     2,5,0
+#define VER_FILEVERSION_STR "2.5.0-beta7\0"
 
-VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION PRODUCTVERSION VER_FILEVERSION
-    FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS VS_FF_PRERELEASE FILEOS VOS__WINDOWS32
-        FILETYPE VFT_APP FILESUBTYPE(0) BEGIN BLOCK
-    "StringFileInfo" BEGIN BLOCK "040904B0" BEGIN VALUE "FileVersion",
-    VER_FILEVERSION_STR VALUE "CompanyName",
-    "Mod Organizer 2 Team\0" VALUE "FileDescription",
-    "Mod Organizer 2 GUI\0" VALUE "OriginalFilename",
-    "ModOrganizer.exe\0" VALUE "InternalName", "ModOrganizer2\0" VALUE "LegalCopyright",
-    "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 "
-    "contributors\0" VALUE "ProductName",
-    "Mod Organizer 2\0" VALUE "ProductVersion",
-    VER_FILEVERSION_STR END END
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_FILEVERSION
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGS       VS_FF_PRERELEASE
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     (0)
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+        VALUE "FileVersion", VER_FILEVERSION_STR
+        VALUE "CompanyName", "Mod Organizer 2 Team\0"
+        VALUE "FileDescription",  "Mod Organizer 2 GUI\0"
+        VALUE "OriginalFilename", "ModOrganizer.exe\0"
+        VALUE "InternalName", "ModOrganizer2\0"
+        VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 contributors\0"
+        VALUE "ProductName",      "Mod Organizer 2\0"
+        VALUE "ProductVersion", VER_FILEVERSION_STR
+      END
+    END
 
-    BLOCK "VarFileInfo" BEGIN VALUE "Translation",
-    0x0409, 1200 END END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x0409, 1200
+    END
+END

From b7d4d20bf185e23e5d19451cccb66bdc94acf09f Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 19:04:01 -0500
Subject: [PATCH 35/43] Revert TS

---
 src/organizer_en.ts | 1821 ++++++++++++++++++-------------------------
 1 file changed, 768 insertions(+), 1053 deletions(-)

diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 9eef07f70..18eaac8e9 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -224,186 +224,72 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="30"/>
-        <source>Refresh from Nexus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.ui" line="43"/>
-        <source>&lt;-- Import Nexus Cats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.ui" line="102"/>
+        <location filename="categoriesdialog.ui" line="66"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="105"/>
+        <location filename="categoriesdialog.ui" line="69"/>
         <source>Internal ID for the category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="108"/>
+        <location filename="categoriesdialog.ui" line="72"/>
         <source>Internal ID for the category. The categories a mod belongs to are stored by this ID. It is recommended you use new IDs for categories you add instead of re-using existing ones.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="113"/>
+        <location filename="categoriesdialog.ui" line="77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="116"/>
-        <location filename="categoriesdialog.ui" line="119"/>
-        <source>The display name of the category.</source>
-        <oldsource>Name of the Categorie used for display.</oldsource>
+        <location filename="categoriesdialog.ui" line="80"/>
+        <location filename="categoriesdialog.ui" line="83"/>
+        <source>Name of the Categorie used for display.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="124"/>
-        <source>Parent ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.ui" line="127"/>
-        <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.ui" line="132"/>
-        <location filename="categoriesdialog.ui" line="160"/>
-        <source>Nexus Categories</source>
+        <location filename="categoriesdialog.ui" line="88"/>
+        <source>Nexus IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="135"/>
+        <location filename="categoriesdialog.ui" line="91"/>
         <source>Comma-Separated list of Nexus IDs to be matched to the internal ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.ui" line="138"/>
-        <source>
-                &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-                &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-                p, li { white-space: pre-wrap; }
-                &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
-                &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
-                &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
-              </source>
-        <oldsource>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <location filename="categoriesdialog.ui" line="94"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You can match one or multiple nexus categories to a internal ID. Whenever you download a mod from a Nexus Page, Mod Organizer will try to resolve the category defined on the Nexus to one available in MO.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.ui" line="154"/>
-        <source>Drag &amp; drop nexus categories from this pane onto the target category on the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categoriesdialog.cpp" line="295"/>
-        <source>Import Nexus Categories?</source>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;To find out a category id used by the nexus, visit the categories list of the nexus page and hover over the links there.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="296"/>
-        <source>This will overwrite your existing categories with the loaded Nexus categories.</source>
+        <location filename="categoriesdialog.ui" line="105"/>
+        <source>Parent ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="358"/>
-        <source>Error %1: Request to Nexus failed: %2</source>
+        <location filename="categoriesdialog.ui" line="108"/>
+        <source>If set, the category is defined as a sub-category of another one. Parent ID needs to be a valid category ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="366"/>
+        <location filename="categoriesdialog.cpp" line="250"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categoriesdialog.cpp" line="367"/>
+        <location filename="categoriesdialog.cpp" line="251"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="categoriesdialog.cpp" line="369"/>
-        <source>Remove Nexus Mapping(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryFactory</name>
-    <message>
-        <location filename="categories.cpp" line="77"/>
-        <location filename="categories.cpp" line="130"/>
-        <source>invalid category id {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="87"/>
-        <location filename="categories.cpp" line="97"/>
-        <source>invalid category line {}: {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="104"/>
-        <source>invalid category line {}: {} ({} cells)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="125"/>
-        <source>invalid nexus ID {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="136"/>
-        <source>invalid nexus category line {}: {} ({} cells)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="197"/>
-        <source>Failed to save custom categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="221"/>
-        <source>Failed to save nexus category mappings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="362"/>
-        <location filename="categories.cpp" line="408"/>
-        <location filename="categories.cpp" line="417"/>
-        <location filename="categories.cpp" line="485"/>
-        <source>invalid category index: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="400"/>
-        <source>{} is no valid category id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="495"/>
-        <source>invalid category id: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="519"/>
-        <source>nexus category id {} maps to internal {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="categories.cpp" line="524"/>
-        <source>nexus category id {} not mapped</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ConflictsTab</name>
@@ -461,303 +347,283 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="41"/>
+        <location filename="createinstancedialog.ui" line="42"/>
         <source>Creating a new instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="74"/>
+        <location filename="createinstancedialog.ui" line="75"/>
         <source>&lt;h3&gt;What is an instance?&lt;/h3&gt;
 &lt;p&gt;An instance is a full set of mods, downloads, profiles and configuration for a game. Each game must be managed in its own instance. Mod Organizer can freely switch between instances.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="88"/>
+        <location filename="createinstancedialog.ui" line="89"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/ModOrganizer2/modorganizer/wiki/Instances&quot;&gt;More information&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="111"/>
+        <location filename="createinstancedialog.ui" line="112"/>
         <source>Never show this page again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="137"/>
+        <location filename="createinstancedialog.ui" line="138"/>
         <source>&lt;h3&gt;Select the type of instance to create.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="174"/>
+        <location filename="createinstancedialog.ui" line="175"/>
         <source>Create a global instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="180"/>
+        <location filename="createinstancedialog.ui" line="181"/>
         <source>Global instances are stored in %1, but some paths can be changed to be on a different drive if necessary. A single installation of Mod Organizer can manage multiple global instances.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="187"/>
+        <location filename="createinstancedialog.ui" line="188"/>
         <source>Create a portable instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="193"/>
+        <location filename="createinstancedialog.ui" line="194"/>
         <source>A portable instance stores everything in Mod Organizer&apos;s installation folder, currently %1. There can only be one portable instance per installation of Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="203"/>
+        <location filename="createinstancedialog.ui" line="204"/>
         <source>A portable instance already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="248"/>
+        <location filename="createinstancedialog.ui" line="249"/>
         <source>&lt;h3&gt;Select the game to manage.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="337"/>
+        <location filename="createinstancedialog.ui" line="338"/>
         <source>Show all supported games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="357"/>
+        <location filename="createinstancedialog.ui" line="358"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="389"/>
+        <location filename="createinstancedialog.ui" line="390"/>
         <source>&lt;h3&gt;Select the game edition.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="396"/>
+        <location filename="createinstancedialog.ui" line="397"/>
         <source>This game has multiple variants. The correct one must be selected or Mod Organizer will not be able to launch the game properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="493"/>
+        <location filename="createinstancedialog.ui" line="494"/>
         <source>&lt;h3&gt;Customize the name for this &lt;span style=&quot;white-space: nowrap;&quot;&gt;%1&lt;/span&gt; instance.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="512"/>
+        <location filename="createinstancedialog.ui" line="513"/>
         <source>Instance name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="519"/>
+        <location filename="createinstancedialog.ui" line="520"/>
         <source>There is already an instance with this name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="526"/>
+        <location filename="createinstancedialog.ui" line="527"/>
         <source>The name contains invalid characters. It must be a valid folder name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="568"/>
-        <source>&lt;h3&gt;Configure your profile settings.&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialog.ui" line="587"/>
-        <source>Use profile-specific game INI files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialog.ui" line="597"/>
-        <source>Use profile-specific save games</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialog.ui" line="607"/>
-        <source>Automatic archive invalidation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialog.ui" line="652"/>
+        <location filename="createinstancedialog.ui" line="569"/>
         <source>&lt;h3&gt;Select a folder where the data should be stored.&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="662"/>
+        <location filename="createinstancedialog.ui" line="579"/>
         <source>This includes downloads, mods, profiles and overwrite for your &lt;b&gt;%1&lt;/b&gt; instance. If there is enough space on this drive, you should use the default folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="712"/>
-        <location filename="createinstancedialog.ui" line="794"/>
-        <location filename="createinstancedialog.ui" line="801"/>
-        <location filename="createinstancedialog.ui" line="843"/>
-        <location filename="createinstancedialog.ui" line="902"/>
-        <location filename="createinstancedialog.ui" line="909"/>
+        <location filename="createinstancedialog.ui" line="629"/>
+        <location filename="createinstancedialog.ui" line="711"/>
+        <location filename="createinstancedialog.ui" line="718"/>
+        <location filename="createinstancedialog.ui" line="760"/>
+        <location filename="createinstancedialog.ui" line="819"/>
+        <location filename="createinstancedialog.ui" line="826"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="719"/>
+        <location filename="createinstancedialog.ui" line="636"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="739"/>
+        <location filename="createinstancedialog.ui" line="656"/>
         <source>Warning: This folder already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="746"/>
-        <location filename="createinstancedialog.ui" line="815"/>
-        <location filename="createinstancedialog.ui" line="822"/>
-        <location filename="createinstancedialog.ui" line="850"/>
-        <location filename="createinstancedialog.ui" line="874"/>
-        <location filename="createinstancedialog.ui" line="881"/>
+        <location filename="createinstancedialog.ui" line="663"/>
+        <location filename="createinstancedialog.ui" line="732"/>
+        <location filename="createinstancedialog.ui" line="739"/>
+        <location filename="createinstancedialog.ui" line="767"/>
+        <location filename="createinstancedialog.ui" line="791"/>
+        <location filename="createinstancedialog.ui" line="798"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="753"/>
+        <location filename="createinstancedialog.ui" line="670"/>
         <source>Warning: The folder contains invalid characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="808"/>
+        <location filename="createinstancedialog.ui" line="725"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="829"/>
+        <location filename="createinstancedialog.ui" line="746"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="836"/>
+        <location filename="createinstancedialog.ui" line="753"/>
         <source>Base directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="857"/>
+        <location filename="createinstancedialog.ui" line="774"/>
         <source>Warning: The folder %1 already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="867"/>
+        <location filename="createinstancedialog.ui" line="784"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="888"/>
+        <location filename="createinstancedialog.ui" line="805"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="895"/>
+        <location filename="createinstancedialog.ui" line="812"/>
         <source>Use %BASE_DIR% to refer to the Base Directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="929"/>
+        <location filename="createinstancedialog.ui" line="846"/>
         <source>Warning: The folder %1 contains invalid characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="980"/>
+        <location filename="createinstancedialog.ui" line="897"/>
         <source>Show advanced options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1012"/>
+        <location filename="createinstancedialog.ui" line="929"/>
         <source>&lt;h3&gt;Link Mod Organizer with your Nexus account&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1019"/>
+        <location filename="createinstancedialog.ui" line="936"/>
         <source>Linking with Nexus allows you to download mods directly from Mod Organizer and automatically check for updates. This is optional.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1083"/>
+        <location filename="createinstancedialog.ui" line="1000"/>
         <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1103"/>
+        <location filename="createinstancedialog.ui" line="1020"/>
         <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1154"/>
+        <location filename="createinstancedialog.ui" line="1071"/>
         <source>&lt;h3&gt;Confirmation&lt;/h3&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1161"/>
+        <location filename="createinstancedialog.ui" line="1078"/>
         <source>The instance is about to be created. Review the information below and press &apos;Finish&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1202"/>
+        <location filename="createinstancedialog.ui" line="1119"/>
         <source>Instance creation log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1237"/>
+        <location filename="createinstancedialog.ui" line="1154"/>
         <source>Launch the new instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1285"/>
+        <location filename="createinstancedialog.ui" line="1202"/>
         <source>&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1292"/>
+        <location filename="createinstancedialog.ui" line="1209"/>
         <source>Next &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.ui" line="1302"/>
+        <location filename="createinstancedialog.ui" line="1219"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="255"/>
+        <location filename="createinstancedialog.cpp" line="254"/>
         <source>Setting up instance %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="256"/>
+        <location filename="createinstancedialog.cpp" line="255"/>
         <source>Setting up an instance %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="302"/>
+        <location filename="createinstancedialog.cpp" line="301"/>
         <source>Creating instance...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="363"/>
+        <location filename="createinstancedialog.cpp" line="358"/>
         <source>Writing %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="375"/>
+        <location filename="createinstancedialog.cpp" line="370"/>
         <source>Format error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="379"/>
+        <location filename="createinstancedialog.cpp" line="374"/>
         <source>Error %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="391"/>
+        <location filename="createinstancedialog.cpp" line="386"/>
         <source>Done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialog.cpp" line="441"/>
+        <location filename="createinstancedialog.cpp" line="436"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,32 +1002,32 @@ Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="564"/>
+        <location filename="downloadmanager.cpp" line="544"/>
         <source>failed to download %1: could not open output file: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="593"/>
+        <location filename="downloadmanager.cpp" line="573"/>
         <source>Download again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="594"/>
+        <location filename="downloadmanager.cpp" line="574"/>
         <source>A file with the same name &quot;%1&quot; has already been downloaded. Do you want to download it again? The new file will receive a different name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="661"/>
+        <location filename="downloadmanager.cpp" line="638"/>
         <source>Wrong Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="662"/>
+        <location filename="downloadmanager.cpp" line="639"/>
         <source>The download link is for a mod for &quot;%1&quot; but this instance of MO has been set up for &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="676"/>
+        <location filename="downloadmanager.cpp" line="653"/>
         <source>There is already a download queued for this file.
 
 Mod %1
@@ -1169,12 +1035,12 @@ File %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="683"/>
+        <location filename="downloadmanager.cpp" line="660"/>
         <source>Already Queued</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="696"/>
+        <location filename="downloadmanager.cpp" line="673"/>
         <source>There is already a download started for this file.
 
 Mod %1:	%2
@@ -1182,288 +1048,287 @@ File %3:	%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="732"/>
+        <location filename="downloadmanager.cpp" line="709"/>
         <source>Already Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="764"/>
-        <location filename="downloadmanager.cpp" line="898"/>
+        <location filename="downloadmanager.cpp" line="741"/>
+        <location filename="downloadmanager.cpp" line="875"/>
         <source>remove: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="783"/>
+        <location filename="downloadmanager.cpp" line="760"/>
         <source>failed to delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="790"/>
+        <location filename="downloadmanager.cpp" line="767"/>
         <source>failed to delete meta file for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="851"/>
+        <location filename="downloadmanager.cpp" line="828"/>
         <source>restore: invalid download index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="919"/>
+        <location filename="downloadmanager.cpp" line="896"/>
         <source>cancel: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="931"/>
+        <location filename="downloadmanager.cpp" line="908"/>
         <source>pause: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="953"/>
+        <location filename="downloadmanager.cpp" line="930"/>
         <source>resume: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="964"/>
+        <location filename="downloadmanager.cpp" line="941"/>
         <source>resume (int): invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="989"/>
+        <location filename="downloadmanager.cpp" line="967"/>
         <source>No known download urls. Sorry, this download can&apos;t be resumed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1032"/>
-        <location filename="downloadmanager.cpp" line="1091"/>
+        <location filename="downloadmanager.cpp" line="1010"/>
+        <location filename="downloadmanager.cpp" line="1069"/>
         <source>query: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1054"/>
+        <location filename="downloadmanager.cpp" line="1032"/>
         <source>Please enter the nexus mod id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1055"/>
+        <location filename="downloadmanager.cpp" line="1033"/>
         <source>Mod ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1067"/>
+        <location filename="downloadmanager.cpp" line="1045"/>
         <source>Please select the source game code for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1125"/>
+        <location filename="downloadmanager.cpp" line="1103"/>
         <source>Hashing download file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1126"/>
+        <location filename="downloadmanager.cpp" line="1104"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1153"/>
+        <location filename="downloadmanager.cpp" line="1131"/>
         <source>VisitNexus: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1173"/>
+        <location filename="downloadmanager.cpp" line="1151"/>
         <source>Nexus ID for this Mod is unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1180"/>
+        <location filename="downloadmanager.cpp" line="1158"/>
         <source>OpenFile: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1224"/>
+        <location filename="downloadmanager.cpp" line="1202"/>
         <source>OpenFileInDownloadsFolder: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1257"/>
+        <location filename="downloadmanager.cpp" line="1235"/>
         <source>get pending: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1266"/>
+        <location filename="downloadmanager.cpp" line="1244"/>
         <source>get path: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1276"/>
+        <location filename="downloadmanager.cpp" line="1254"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1278"/>
+        <location filename="downloadmanager.cpp" line="1256"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1280"/>
+        <location filename="downloadmanager.cpp" line="1258"/>
         <source>Optional</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1282"/>
+        <location filename="downloadmanager.cpp" line="1260"/>
         <source>Old</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1284"/>
+        <location filename="downloadmanager.cpp" line="1262"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1286"/>
+        <location filename="downloadmanager.cpp" line="1264"/>
         <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1288"/>
+        <location filename="downloadmanager.cpp" line="1266"/>
         <source>Archived</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1290"/>
+        <location filename="downloadmanager.cpp" line="1268"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1297"/>
+        <location filename="downloadmanager.cpp" line="1275"/>
         <source>display name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1318"/>
+        <location filename="downloadmanager.cpp" line="1296"/>
         <source>file name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1342"/>
+        <location filename="downloadmanager.cpp" line="1305"/>
         <source>file time: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1361"/>
+        <location filename="downloadmanager.cpp" line="1324"/>
         <source>file size: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1370"/>
+        <location filename="downloadmanager.cpp" line="1333"/>
         <source>progress: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1379"/>
+        <location filename="downloadmanager.cpp" line="1342"/>
         <source>state: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1388"/>
+        <location filename="downloadmanager.cpp" line="1351"/>
         <source>infocomplete: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1402"/>
-        <location filename="downloadmanager.cpp" line="1410"/>
-        <location filename="downloadmanager.cpp" line="1418"/>
-        <location filename="downloadmanager.cpp" line="1431"/>
+        <location filename="downloadmanager.cpp" line="1365"/>
+        <location filename="downloadmanager.cpp" line="1373"/>
+        <location filename="downloadmanager.cpp" line="1386"/>
         <source>mod id: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1439"/>
+        <location filename="downloadmanager.cpp" line="1394"/>
         <source>ishidden: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1447"/>
+        <location filename="downloadmanager.cpp" line="1402"/>
         <source>file info: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1456"/>
+        <location filename="downloadmanager.cpp" line="1411"/>
         <source>mark installed: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1501"/>
+        <location filename="downloadmanager.cpp" line="1456"/>
         <source>mark uninstalled: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1670"/>
+        <location filename="downloadmanager.cpp" line="1625"/>
         <source>%1% - %2 - ~%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1681"/>
+        <location filename="downloadmanager.cpp" line="1636"/>
         <source>Memory allocation error (in processing progress event).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1690"/>
+        <location filename="downloadmanager.cpp" line="1645"/>
         <source>Memory allocation error (in processing downloaded data).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1812"/>
+        <location filename="downloadmanager.cpp" line="1767"/>
         <source>Information updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1814"/>
-        <location filename="downloadmanager.cpp" line="1837"/>
+        <location filename="downloadmanager.cpp" line="1769"/>
+        <location filename="downloadmanager.cpp" line="1792"/>
         <source>No matching file found on Nexus! Maybe this file is no longer available or it was renamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1817"/>
+        <location filename="downloadmanager.cpp" line="1772"/>
         <source>No file on Nexus matches the selected file by name. Please manually choose the correct one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2014"/>
+        <location filename="downloadmanager.cpp" line="1969"/>
         <source>No download server available. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2184"/>
+        <location filename="downloadmanager.cpp" line="2139"/>
         <source>Failed to request file info from nexus: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2216"/>
+        <location filename="downloadmanager.cpp" line="2167"/>
         <source>Warning: Content type is: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2223"/>
+        <location filename="downloadmanager.cpp" line="2174"/>
         <source>Download header content length: %1 downloaded file size: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2227"/>
+        <location filename="downloadmanager.cpp" line="2178"/>
         <source>Download failed: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2252"/>
+        <location filename="downloadmanager.cpp" line="2203"/>
         <source>We were unable to download the file due to errors after four retries. There may be an issue with the Nexus servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2341"/>
+        <location filename="downloadmanager.cpp" line="2292"/>
         <source>failed to re-open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2389"/>
+        <location filename="downloadmanager.cpp" line="2340"/>
         <source>Unable to write download to drive (return %1).
 Check the drive&apos;s available storage.
 
@@ -2112,22 +1977,22 @@ Right now the only case I know of where this needs to be overwritten is for the
 <context>
     <name>FilterList</name>
     <message>
-        <location filename="filterlist.cpp" line="224"/>
+        <location filename="filterlist.cpp" line="223"/>
         <source>Filter separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="226"/>
+        <location filename="filterlist.cpp" line="225"/>
         <source>Show separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="228"/>
+        <location filename="filterlist.cpp" line="227"/>
         <source>Hide separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filterlist.cpp" line="269"/>
+        <location filename="filterlist.cpp" line="268"/>
         <source>Contains %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,88 +2317,68 @@ Right now the only case I know of where this needs to be overwritten is for the
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="670"/>
-        <source>This Nexus category has not yet been mapped. Do you wish to proceed without setting a category, proceed and disable automatic Nexus mappings, or stop and configure your category mappings?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="installationmanager.cpp" line="674"/>
-        <source>&amp;Proceed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="installationmanager.cpp" line="675"/>
-        <source>&amp;Disable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="installationmanager.cpp" line="676"/>
-        <source>&amp;Stop &amp;&amp; Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="installationmanager.cpp" line="794"/>
+        <location filename="installationmanager.cpp" line="772"/>
         <source>Invalid file tree returned by plugin.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="841"/>
+        <location filename="installationmanager.cpp" line="819"/>
         <source>Installation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="842"/>
+        <location filename="installationmanager.cpp" line="820"/>
         <source>Something went wrong while installing this mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="866"/>
+        <location filename="installationmanager.cpp" line="844"/>
         <source>None of the available installer plugins were able to handle that archive.
 This is likely due to a corrupted or incompatible download or unrecognized archive format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="878"/>
+        <location filename="installationmanager.cpp" line="856"/>
         <source>no error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="881"/>
+        <location filename="installationmanager.cpp" line="859"/>
         <source>7z.dll not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="884"/>
+        <location filename="installationmanager.cpp" line="862"/>
         <source>7z.dll isn&apos;t valid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="887"/>
+        <location filename="installationmanager.cpp" line="865"/>
         <source>archive not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="890"/>
+        <location filename="installationmanager.cpp" line="868"/>
         <source>failed to open archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="893"/>
+        <location filename="installationmanager.cpp" line="871"/>
         <source>unsupported archive type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="896"/>
+        <location filename="installationmanager.cpp" line="874"/>
         <source>internal library error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="899"/>
+        <location filename="installationmanager.cpp" line="877"/>
         <source>archive invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="installationmanager.cpp" line="903"/>
+        <location filename="installationmanager.cpp" line="881"/>
         <source>unknown archive error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,7 +3188,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwindow.ui" line="1253"/>
-        <location filename="mainwindow.cpp" line="1161"/>
+        <location filename="mainwindow.cpp" line="1156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3601,7 +3446,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="mainwindow.ui" line="1823"/>
         <location filename="mainwindow.ui" line="1826"/>
-        <location filename="mainwindow.cpp" line="2951"/>
+        <location filename="mainwindow.cpp" line="2855"/>
         <source>Endorse Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3685,488 +3530,429 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="352"/>
+        <location filename="mainwindow.cpp" line="350"/>
         <source>Toolbar and Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="354"/>
+        <location filename="mainwindow.cpp" line="352"/>
         <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="356"/>
+        <location filename="mainwindow.cpp" line="354"/>
         <source>Start Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="377"/>
+        <location filename="mainwindow.cpp" line="375"/>
         <source>There is no supported sort mechanism for this game. You will probably have to use a third-party tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="640"/>
+        <location filename="mainwindow.cpp" line="635"/>
         <source>Crash on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="641"/>
+        <location filename="mainwindow.cpp" line="636"/>
         <source>MO crashed while exiting.  Some settings may not be saved.
 
 Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="947"/>
+        <location filename="mainwindow.cpp" line="942"/>
         <source>There are notifications to read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="967"/>
+        <location filename="mainwindow.cpp" line="962"/>
         <source>There are no notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1068"/>
+        <location filename="mainwindow.cpp" line="1063"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1072"/>
+        <location filename="mainwindow.cpp" line="1067"/>
         <source>Won&apos;t Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1088"/>
+        <location filename="mainwindow.cpp" line="1083"/>
         <source>Help on UI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1092"/>
+        <location filename="mainwindow.cpp" line="1087"/>
         <source>Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1097"/>
-        <location filename="mainwindow.cpp" line="1265"/>
+        <location filename="mainwindow.cpp" line="1092"/>
+        <location filename="mainwindow.cpp" line="1260"/>
         <source>Game Support Wiki</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1097"/>
         <source>Chat on Discord</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1106"/>
+        <location filename="mainwindow.cpp" line="1101"/>
         <source>Report Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1105"/>
         <source>Tutorials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1152"/>
+        <location filename="mainwindow.cpp" line="1147"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1153"/>
+        <location filename="mainwindow.cpp" line="1148"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1162"/>
+        <location filename="mainwindow.cpp" line="1157"/>
         <source>Please enter a name for the new profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1170"/>
+        <location filename="mainwindow.cpp" line="1165"/>
         <source>failed to create profile: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1207"/>
+        <location filename="mainwindow.cpp" line="1202"/>
         <source>Show tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1208"/>
+        <location filename="mainwindow.cpp" line="1203"/>
         <source>You are starting Mod Organizer for the first time. Do you want to show a tutorial of its basic features? If you choose no you can always start the tutorial from the &quot;Help&quot; menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1213"/>
+        <location filename="mainwindow.cpp" line="1208"/>
         <source>Never ask to show tutorials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1266"/>
+        <location filename="mainwindow.cpp" line="1261"/>
         <source>Do you know how to mod this game? Do you need to learn? There&apos;s a game support wiki available! Click OK to open the wiki. In the future, you can access this link from the &quot;Help&quot; menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1275"/>
-        <source>Import Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1277"/>
-        <source>Please choose how to handle the default category setup.
-
-If you&apos;ve already connected to Nexus, you can automatically import Nexus categories for this game (if applicable). Otherwise, use the old Mod Organizer default category structure, or leave the categories blank.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1281"/>
-        <location filename="mainwindow.cpp" line="1319"/>
-        <source>&amp;Import Nexus Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1282"/>
-        <source>Use &amp;Default Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1283"/>
-        <source>Do &amp;Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1307"/>
-        <source>This is your first time running version 2.5 or higher with an old MO2 instance. The category system now relies on an updated system to map Nexus categories.
-
-In order to assign Nexus categories automatically, you will need to import the Nexus categories for the currently managed game and map them to your preferred category structure.
-
-You can either manually open the category editor, via the Settings dialog or the category filter sidebar, and set up the mappings as you see fit, or you can automatically import and map the categories as defined on Nexus.
-
-As a final option, you can disable Nexus category mapping altogether, which can be changed at any time in the Settings dialog.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1320"/>
-        <source>&amp;Open Categories Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1321"/>
-        <source>&amp;Show Tutorial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1322"/>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1323"/>
-        <source>&amp;Don&apos;t show this again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1446"/>
+        <location filename="mainwindow.cpp" line="1371"/>
         <source>Downloads in progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1447"/>
+        <location filename="mainwindow.cpp" line="1372"/>
         <source>There are still downloads in progress, do you really want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1506"/>
+        <location filename="mainwindow.cpp" line="1431"/>
         <source>Plugin &quot;%1&quot; failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1508"/>
+        <location filename="mainwindow.cpp" line="1433"/>
         <source>Plugin &quot;%1&quot; failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1875"/>
+        <location filename="mainwindow.cpp" line="1800"/>
         <source>&lt;Edit...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1886"/>
+        <location filename="mainwindow.cpp" line="1811"/>
         <source>(no executables)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2052"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>This bsa is enabled in the ini file so it may be required!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2103"/>
+        <location filename="mainwindow.cpp" line="2028"/>
         <source>Activating Network Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2199"/>
+        <location filename="mainwindow.cpp" line="2122"/>
         <source>Notice: Your current MO version (%1) is lower than the previously used one (%2). The GUI may not downgrade gracefully, so you may experience oddities. However, there should be no serious issues.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2345"/>
+        <location filename="mainwindow.cpp" line="2268"/>
         <source>Start Tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2346"/>
+        <location filename="mainwindow.cpp" line="2269"/>
         <source>You&apos;re about to start a tutorial. For technical reasons it&apos;s not possible to end the tutorial early. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2485"/>
+        <location filename="mainwindow.cpp" line="2400"/>
         <source>failed to change origin name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2515"/>
+        <location filename="mainwindow.cpp" line="2430"/>
         <source>failed to move &quot;%1&quot; from mod &quot;%2&quot; to &quot;%3&quot;: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2642"/>
+        <location filename="mainwindow.cpp" line="2557"/>
         <source>Open Game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2643"/>
+        <location filename="mainwindow.cpp" line="2558"/>
         <source>Open MyGames folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2644"/>
+        <location filename="mainwindow.cpp" line="2559"/>
         <source>Open INIs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2649"/>
+        <location filename="mainwindow.cpp" line="2564"/>
         <source>Open Instance folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2650"/>
+        <location filename="mainwindow.cpp" line="2565"/>
         <source>Open Mods folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2651"/>
+        <location filename="mainwindow.cpp" line="2566"/>
         <source>Open Profile folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2652"/>
+        <location filename="mainwindow.cpp" line="2567"/>
         <source>Open Downloads folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2658"/>
+        <location filename="mainwindow.cpp" line="2573"/>
         <source>Open MO2 Install folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2659"/>
+        <location filename="mainwindow.cpp" line="2574"/>
         <source>Open MO2 Plugins folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2660"/>
+        <location filename="mainwindow.cpp" line="2575"/>
         <source>Open MO2 Stylesheets folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2662"/>
+        <location filename="mainwindow.cpp" line="2577"/>
         <source>Open MO2 Logs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2742"/>
+        <location filename="mainwindow.cpp" line="2657"/>
         <source>Restart Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2744"/>
+        <location filename="mainwindow.cpp" line="2659"/>
         <source>Mod Organizer must restart to finish configuration changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2746"/>
+        <location filename="mainwindow.cpp" line="2661"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2748"/>
+        <location filename="mainwindow.cpp" line="2663"/>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2748"/>
+        <location filename="mainwindow.cpp" line="2663"/>
         <source>Some things might be weird.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2773"/>
+        <location filename="mainwindow.cpp" line="2688"/>
         <source>Can&apos;t change download directory while downloads are in progress!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2914"/>
+        <location filename="mainwindow.cpp" line="2818"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2952"/>
+        <location filename="mainwindow.cpp" line="2856"/>
         <source>Do you want to endorse Mod Organizer on %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2971"/>
+        <location filename="mainwindow.cpp" line="2875"/>
         <source>Abstain from Endorsing Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2972"/>
+        <location filename="mainwindow.cpp" line="2876"/>
         <source>Are you sure you want to abstain from endorsing Mod Organizer 2?
 You will have to visit the mod page on the %1 Nexus site to change your mind.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3000"/>
+        <location filename="mainwindow.cpp" line="2904"/>
         <source>Thank you for endorsing MO2! :)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3005"/>
+        <location filename="mainwindow.cpp" line="2909"/>
         <source>Please reconsider endorsing MO2 on Nexus!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3118"/>
+        <location filename="mainwindow.cpp" line="3022"/>
         <source>None of your %1 mods appear to have had recent file updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3131"/>
+        <location filename="mainwindow.cpp" line="3035"/>
         <source>All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3361"/>
+        <location filename="mainwindow.cpp" line="3263"/>
         <source>Thank you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3362"/>
+        <location filename="mainwindow.cpp" line="3264"/>
         <source>Thank you for your endorsement!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3476"/>
+        <location filename="mainwindow.cpp" line="3362"/>
         <source>Mod ID %1 no longer seems to be available on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3494"/>
+        <location filename="mainwindow.cpp" line="3380"/>
         <source>Error %1: Request to Nexus failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3511"/>
-        <location filename="mainwindow.cpp" line="3584"/>
+        <location filename="mainwindow.cpp" line="3397"/>
+        <location filename="mainwindow.cpp" line="3470"/>
         <source>failed to read %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3524"/>
+        <location filename="mainwindow.cpp" line="3410"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3525"/>
+        <location filename="mainwindow.cpp" line="3411"/>
         <source>failed to extract %1 (errorcode %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3559"/>
+        <location filename="mainwindow.cpp" line="3445"/>
         <source>Extract BSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3598"/>
+        <location filename="mainwindow.cpp" line="3484"/>
         <source>This archive contains invalid hashes. Some files may be broken.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3608"/>
+        <location filename="mainwindow.cpp" line="3494"/>
         <source>Extract...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3677"/>
+        <location filename="mainwindow.cpp" line="3563"/>
         <source>Remove &apos;%1&apos; from the toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3733"/>
+        <location filename="mainwindow.cpp" line="3619"/>
         <source>Backup of load order created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3744"/>
+        <location filename="mainwindow.cpp" line="3630"/>
         <source>Choose backup to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3761"/>
+        <location filename="mainwindow.cpp" line="3647"/>
         <source>No Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3762"/>
+        <location filename="mainwindow.cpp" line="3648"/>
         <source>There are no backups to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3786"/>
-        <location filename="mainwindow.cpp" line="3810"/>
+        <location filename="mainwindow.cpp" line="3672"/>
+        <location filename="mainwindow.cpp" line="3696"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3787"/>
-        <location filename="mainwindow.cpp" line="3811"/>
+        <location filename="mainwindow.cpp" line="3673"/>
+        <location filename="mainwindow.cpp" line="3697"/>
         <source>Failed to restore the backup. Errorcode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3799"/>
+        <location filename="mainwindow.cpp" line="3685"/>
         <source>Backup of mod list created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3879"/>
+        <location filename="mainwindow.cpp" line="3765"/>
         <source>A file with the same name has already been downloaded. What would you like to do?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3881"/>
+        <location filename="mainwindow.cpp" line="3767"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3882"/>
+        <location filename="mainwindow.cpp" line="3768"/>
         <source>Rename new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3883"/>
+        <location filename="mainwindow.cpp" line="3769"/>
         <source>Ignore file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4490,93 +4276,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1032"/>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.ui" line="1091"/>
-        <location filename="modinfodialog.ui" line="1097"/>
+        <location filename="modinfodialog.ui" line="1068"/>
+        <location filename="modinfodialog.ui" line="1074"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1094"/>
+        <location filename="modinfodialog.ui" line="1071"/>
         <source>Refresh all information from Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1108"/>
-        <location filename="modinfodialog.ui" line="1233"/>
+        <location filename="modinfodialog.ui" line="1085"/>
+        <location filename="modinfodialog.ui" line="1210"/>
         <source>Open in Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1119"/>
+        <location filename="modinfodialog.ui" line="1096"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1130"/>
+        <location filename="modinfodialog.ui" line="1107"/>
         <source>Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1197"/>
+        <location filename="modinfodialog.ui" line="1174"/>
         <source>about:blank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1223"/>
+        <location filename="modinfodialog.ui" line="1200"/>
         <source>Use Custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1244"/>
+        <location filename="modinfodialog.ui" line="1221"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1252"/>
-        <location filename="modinfodialog.ui" line="1255"/>
-        <location filename="modinfodialog.ui" line="1258"/>
+        <location filename="modinfodialog.ui" line="1229"/>
+        <location filename="modinfodialog.ui" line="1232"/>
+        <location filename="modinfodialog.ui" line="1235"/>
         <source>Enter comments about the mod here.  These are displayed in the notes column of the mod list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1265"/>
+        <location filename="modinfodialog.ui" line="1242"/>
         <source>Set Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1272"/>
+        <location filename="modinfodialog.ui" line="1249"/>
         <source>Reset Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1281"/>
-        <location filename="modinfodialog.ui" line="1284"/>
-        <location filename="modinfodialog.ui" line="1290"/>
+        <location filename="modinfodialog.ui" line="1258"/>
+        <location filename="modinfodialog.ui" line="1261"/>
+        <location filename="modinfodialog.ui" line="1267"/>
         <source>Enter notes about the mod here.  These can be viewed in the mod list by hovering over the notes column or the flags column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1298"/>
+        <location filename="modinfodialog.ui" line="1275"/>
         <source>Filetree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1312"/>
+        <location filename="modinfodialog.ui" line="1289"/>
         <source>Open Mod in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1337"/>
+        <location filename="modinfodialog.ui" line="1314"/>
         <source>A directory view of this mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1340"/>
+        <location filename="modinfodialog.ui" line="1317"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -4586,17 +4367,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1376"/>
+        <location filename="modinfodialog.ui" line="1353"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1386"/>
+        <location filename="modinfodialog.ui" line="1363"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1409"/>
+        <location filename="modinfodialog.ui" line="1386"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4635,12 +4416,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModInfoRegular</name>
     <message>
-        <location filename="modinforegular.cpp" line="730"/>
+        <location filename="modinforegular.cpp" line="727"/>
         <source>%1 contains no esp/esm/esl and no asset (textures, meshes, interface, ...) directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinforegular.cpp" line="736"/>
+        <location filename="modinforegular.cpp" line="733"/>
         <source>Categories: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4920,7 +4701,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListChangeCategoryMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="108"/>
+        <location filename="modlistcontextmenu.cpp" line="105"/>
         <source>Change Categories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4928,241 +4709,236 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListContextMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="237"/>
+        <location filename="modlistcontextmenu.cpp" line="234"/>
         <source>All Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="244"/>
+        <location filename="modlistcontextmenu.cpp" line="241"/>
         <source>Collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="245"/>
+        <location filename="modlistcontextmenu.cpp" line="242"/>
         <source>Collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="249"/>
+        <location filename="modlistcontextmenu.cpp" line="246"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="269"/>
+        <location filename="modlistcontextmenu.cpp" line="266"/>
         <source>Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="314"/>
+        <location filename="modlistcontextmenu.cpp" line="311"/>
         <source>Send to... </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="315"/>
+        <location filename="modlistcontextmenu.cpp" line="312"/>
         <source>Lowest priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="318"/>
+        <location filename="modlistcontextmenu.cpp" line="315"/>
         <source>Highest priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="321"/>
+        <location filename="modlistcontextmenu.cpp" line="318"/>
         <source>Priority...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="324"/>
+        <location filename="modlistcontextmenu.cpp" line="321"/>
         <source>Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="328"/>
+        <location filename="modlistcontextmenu.cpp" line="325"/>
         <source>First conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="333"/>
+        <location filename="modlistcontextmenu.cpp" line="330"/>
         <source>Last conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="363"/>
+        <location filename="modlistcontextmenu.cpp" line="360"/>
         <source>Sync to Mods...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="366"/>
+        <location filename="modlistcontextmenu.cpp" line="363"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="369"/>
+        <location filename="modlistcontextmenu.cpp" line="366"/>
         <source>Move content to Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="372"/>
+        <location filename="modlistcontextmenu.cpp" line="369"/>
         <source>Clear Overwrite...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="376"/>
-        <location filename="modlistcontextmenu.cpp" line="453"/>
-        <location filename="modlistcontextmenu.cpp" line="620"/>
+        <location filename="modlistcontextmenu.cpp" line="373"/>
+        <location filename="modlistcontextmenu.cpp" line="450"/>
+        <location filename="modlistcontextmenu.cpp" line="611"/>
         <source>Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="386"/>
+        <location filename="modlistcontextmenu.cpp" line="383"/>
         <source>Rename Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="389"/>
+        <location filename="modlistcontextmenu.cpp" line="386"/>
         <source>Remove Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="398"/>
-        <location filename="modlistcontextmenu.cpp" line="525"/>
+        <location filename="modlistcontextmenu.cpp" line="395"/>
+        <location filename="modlistcontextmenu.cpp" line="522"/>
         <source>Select Color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="403"/>
-        <location filename="modlistcontextmenu.cpp" line="529"/>
+        <location filename="modlistcontextmenu.cpp" line="400"/>
+        <location filename="modlistcontextmenu.cpp" line="526"/>
         <source>Reset Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="421"/>
+        <location filename="modlistcontextmenu.cpp" line="418"/>
         <source>Restore Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="424"/>
+        <location filename="modlistcontextmenu.cpp" line="421"/>
         <source>Remove Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="429"/>
-        <location filename="modlistcontextmenu.cpp" line="593"/>
+        <location filename="modlistcontextmenu.cpp" line="426"/>
+        <location filename="modlistcontextmenu.cpp" line="584"/>
         <source>Ignore missing data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="435"/>
-        <location filename="modlistcontextmenu.cpp" line="600"/>
+        <location filename="modlistcontextmenu.cpp" line="432"/>
+        <location filename="modlistcontextmenu.cpp" line="591"/>
         <source>Mark as converted/working</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="441"/>
-        <location filename="modlistcontextmenu.cpp" line="608"/>
+        <location filename="modlistcontextmenu.cpp" line="438"/>
+        <location filename="modlistcontextmenu.cpp" line="599"/>
         <source>Visit on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="448"/>
-        <location filename="modlistcontextmenu.cpp" line="615"/>
+        <location filename="modlistcontextmenu.cpp" line="445"/>
+        <location filename="modlistcontextmenu.cpp" line="606"/>
         <source>Visit on %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="466"/>
+        <location filename="modlistcontextmenu.cpp" line="463"/>
         <source>Change versioning scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="472"/>
+        <location filename="modlistcontextmenu.cpp" line="469"/>
         <source>Force-check updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="476"/>
+        <location filename="modlistcontextmenu.cpp" line="473"/>
         <source>Un-ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="481"/>
+        <location filename="modlistcontextmenu.cpp" line="478"/>
         <source>Ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="488"/>
+        <location filename="modlistcontextmenu.cpp" line="485"/>
         <source>Enable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="491"/>
+        <location filename="modlistcontextmenu.cpp" line="488"/>
         <source>Disable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="502"/>
+        <location filename="modlistcontextmenu.cpp" line="499"/>
         <source>Rename Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="505"/>
+        <location filename="modlistcontextmenu.cpp" line="502"/>
         <source>Reinstall Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="508"/>
+        <location filename="modlistcontextmenu.cpp" line="505"/>
         <source>Remove Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="511"/>
+        <location filename="modlistcontextmenu.cpp" line="508"/>
         <source>Create Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="517"/>
+        <location filename="modlistcontextmenu.cpp" line="514"/>
         <source>Restore hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="539"/>
+        <location filename="modlistcontextmenu.cpp" line="536"/>
         <source>Un-Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="544"/>
-        <location filename="modlistcontextmenu.cpp" line="552"/>
+        <location filename="modlistcontextmenu.cpp" line="541"/>
+        <location filename="modlistcontextmenu.cpp" line="549"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="547"/>
+        <location filename="modlistcontextmenu.cpp" line="544"/>
         <source>Won&apos;t endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="557"/>
+        <location filename="modlistcontextmenu.cpp" line="554"/>
         <source>Endorsement state unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="565"/>
-        <source>Remap Category (From Nexus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modlistcontextmenu.cpp" line="573"/>
+        <location filename="modlistcontextmenu.cpp" line="564"/>
         <source>Start tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="578"/>
+        <location filename="modlistcontextmenu.cpp" line="569"/>
         <source>Stop tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="583"/>
+        <location filename="modlistcontextmenu.cpp" line="574"/>
         <source>Tracked state unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5256,16 +5032,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="modlistcontextmenu.cpp" line="97"/>
-        <source>Auto assign categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modlistcontextmenu.cpp" line="100"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="101"/>
+        <location filename="modlistcontextmenu.cpp" line="98"/>
         <source>Export to csv...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5273,7 +5044,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListPrimaryCategoryMenu</name>
     <message>
-        <location filename="modlistcontextmenu.cpp" line="177"/>
+        <location filename="modlistcontextmenu.cpp" line="174"/>
         <source>Primary Category</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5328,313 +5099,313 @@ Please enter the name:</source>
 <context>
     <name>ModListViewActions</name>
     <message>
-        <location filename="modlistviewactions.cpp" line="99"/>
+        <location filename="modlistviewactions.cpp" line="98"/>
         <source>Choose Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="100"/>
+        <location filename="modlistviewactions.cpp" line="99"/>
         <source>Mod Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="120"/>
-        <location filename="modlistviewactions.cpp" line="1306"/>
+        <location filename="modlistviewactions.cpp" line="119"/>
+        <location filename="modlistviewactions.cpp" line="1261"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="121"/>
+        <location filename="modlistviewactions.cpp" line="120"/>
         <source>This will create an empty mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="131"/>
-        <location filename="modlistviewactions.cpp" line="1317"/>
+        <location filename="modlistviewactions.cpp" line="130"/>
+        <location filename="modlistviewactions.cpp" line="1272"/>
         <source>A mod with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="158"/>
+        <location filename="modlistviewactions.cpp" line="157"/>
         <source>Create Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="159"/>
+        <location filename="modlistviewactions.cpp" line="158"/>
         <source>This will create a new separator.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="168"/>
+        <location filename="modlistviewactions.cpp" line="167"/>
         <source>A separator with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="216"/>
+        <location filename="modlistviewactions.cpp" line="215"/>
         <source>Really enable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="216"/>
+        <location filename="modlistviewactions.cpp" line="215"/>
         <source>Really disable %1 mod(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="217"/>
-        <location filename="modlistviewactions.cpp" line="775"/>
-        <location filename="modlistviewactions.cpp" line="1024"/>
+        <location filename="modlistviewactions.cpp" line="216"/>
+        <location filename="modlistviewactions.cpp" line="752"/>
+        <location filename="modlistviewactions.cpp" line="1001"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="240"/>
-        <location filename="modlistviewactions.cpp" line="302"/>
+        <location filename="modlistviewactions.cpp" line="239"/>
+        <location filename="modlistviewactions.cpp" line="279"/>
         <source>You are not currently authenticated with Nexus. Please do so under Settings -&gt; Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="321"/>
+        <location filename="modlistviewactions.cpp" line="298"/>
         <source>Export to csv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="325"/>
+        <location filename="modlistviewactions.cpp" line="302"/>
         <source>CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.
 You can also use online editors and converters instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="330"/>
+        <location filename="modlistviewactions.cpp" line="307"/>
         <source>Select what mods you want export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="331"/>
+        <location filename="modlistviewactions.cpp" line="308"/>
         <source>All installed mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="333"/>
+        <location filename="modlistviewactions.cpp" line="310"/>
         <source>Only active (checked) mods from your current profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="335"/>
+        <location filename="modlistviewactions.cpp" line="312"/>
         <source>All currently visible mods in the mod list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="352"/>
+        <location filename="modlistviewactions.cpp" line="329"/>
         <source>Choose what Columns to export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="355"/>
+        <location filename="modlistviewactions.cpp" line="332"/>
         <source>Mod_Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="357"/>
+        <location filename="modlistviewactions.cpp" line="334"/>
         <source>Mod_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="359"/>
+        <location filename="modlistviewactions.cpp" line="336"/>
         <source>Notes_column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="360"/>
+        <location filename="modlistviewactions.cpp" line="337"/>
         <source>Mod_Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="362"/>
+        <location filename="modlistviewactions.cpp" line="339"/>
         <source>Primary_Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="363"/>
+        <location filename="modlistviewactions.cpp" line="340"/>
         <source>Nexus_ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="364"/>
+        <location filename="modlistviewactions.cpp" line="341"/>
         <source>Mod_Nexus_URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="365"/>
+        <location filename="modlistviewactions.cpp" line="342"/>
         <source>Mod_Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="366"/>
+        <location filename="modlistviewactions.cpp" line="343"/>
         <source>Install_Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="367"/>
+        <location filename="modlistviewactions.cpp" line="344"/>
         <source>Download_File_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="494"/>
+        <location filename="modlistviewactions.cpp" line="471"/>
         <source>export failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="548"/>
+        <location filename="modlistviewactions.cpp" line="525"/>
         <source>Failed to display overwrite dialog: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="609"/>
+        <location filename="modlistviewactions.cpp" line="586"/>
         <source>Set Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="610"/>
+        <location filename="modlistviewactions.cpp" line="587"/>
         <source>Set the priority of the selected mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="740"/>
+        <location filename="modlistviewactions.cpp" line="717"/>
         <source>failed to rename mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="776"/>
+        <location filename="modlistviewactions.cpp" line="753"/>
         <source>Remove the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="793"/>
+        <location filename="modlistviewactions.cpp" line="770"/>
         <source>failed to remove mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="821"/>
+        <location filename="modlistviewactions.cpp" line="798"/>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="822"/>
+        <location filename="modlistviewactions.cpp" line="799"/>
         <source>The versioning scheme decides which version is considered newer than another.
 This function will guess the versioning scheme under the assumption that the installed version is outdated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="848"/>
+        <location filename="modlistviewactions.cpp" line="825"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="849"/>
+        <location filename="modlistviewactions.cpp" line="826"/>
         <source>I don&apos;t know a versioning scheme where %1 is newer than %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="870"/>
+        <location filename="modlistviewactions.cpp" line="847"/>
         <source>Opening Nexus Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="871"/>
+        <location filename="modlistviewactions.cpp" line="848"/>
         <source>You are trying to open %1 links to Nexus Mods.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="894"/>
-        <location filename="modlistviewactions.cpp" line="916"/>
+        <location filename="modlistviewactions.cpp" line="871"/>
+        <location filename="modlistviewactions.cpp" line="893"/>
         <source>Opening Web Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="895"/>
-        <location filename="modlistviewactions.cpp" line="917"/>
+        <location filename="modlistviewactions.cpp" line="872"/>
+        <location filename="modlistviewactions.cpp" line="894"/>
         <source>You are trying to open %1 Web Pages.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="967"/>
-        <location filename="modlistviewactions.cpp" line="972"/>
-        <location filename="modlistviewactions.cpp" line="983"/>
+        <location filename="modlistviewactions.cpp" line="944"/>
+        <location filename="modlistviewactions.cpp" line="949"/>
+        <location filename="modlistviewactions.cpp" line="960"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="968"/>
+        <location filename="modlistviewactions.cpp" line="945"/>
         <source>Installation file no longer exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="973"/>
+        <location filename="modlistviewactions.cpp" line="950"/>
         <source>Mods installed with old versions of MO can&apos;t be reinstalled in this way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="983"/>
+        <location filename="modlistviewactions.cpp" line="960"/>
         <source>Failed to create backup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1025"/>
+        <location filename="modlistviewactions.cpp" line="1002"/>
         <source>Restore all hidden files in the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1058"/>
-        <location filename="modlistviewactions.cpp" line="1376"/>
+        <location filename="modlistviewactions.cpp" line="1035"/>
+        <location filename="modlistviewactions.cpp" line="1331"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1059"/>
+        <location filename="modlistviewactions.cpp" line="1036"/>
         <source>About to restore all hidden files in:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1092"/>
+        <location filename="modlistviewactions.cpp" line="1069"/>
         <source>Endorsing multiple mods will take a while. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1258"/>
+        <location filename="modlistviewactions.cpp" line="1213"/>
         <source>Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1259"/>
+        <location filename="modlistviewactions.cpp" line="1214"/>
         <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1263"/>
+        <location filename="modlistviewactions.cpp" line="1218"/>
         <source>failed to remove mod &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1269"/>
+        <location filename="modlistviewactions.cpp" line="1224"/>
         <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1288"/>
+        <location filename="modlistviewactions.cpp" line="1243"/>
         <source>Move successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1307"/>
+        <location filename="modlistviewactions.cpp" line="1262"/>
         <source>This will move all files from overwrite into a new, regular mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlistviewactions.cpp" line="1377"/>
+        <location filename="modlistviewactions.cpp" line="1332"/>
         <source>About to recursively delete:
 </source>
         <translation type="unfinished"></translation>
@@ -5699,32 +5470,32 @@ Please enter a name:</source>
 <context>
     <name>NexusInterface</name>
     <message>
-        <location filename="nexusinterface.cpp" line="355"/>
+        <location filename="nexusinterface.cpp" line="339"/>
         <source>Please pick the mod ID for &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="846"/>
+        <location filename="nexusinterface.cpp" line="805"/>
         <source>You must authorize MO2 in Settings -&gt; Nexus to use the Nexus API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="855"/>
+        <location filename="nexusinterface.cpp" line="814"/>
         <source>You&apos;ve exceeded the Nexus API rate limit and requests are now being throttled. Your next batch of requests will be available in approximately %1 minutes and %2 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="936"/>
+        <location filename="nexusinterface.cpp" line="895"/>
         <source>Aborting download: Either you clicked on a premium-only link and your account is not premium, or the download link was generated by a different account than the one stored in Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1077"/>
+        <location filename="nexusinterface.cpp" line="1033"/>
         <source>empty response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="1157"/>
+        <location filename="nexusinterface.cpp" line="1109"/>
         <source>invalid response</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5775,27 +5546,27 @@ Please enter a name:</source>
 <context>
     <name>NexusTab</name>
     <message>
-        <location filename="modinfodialognexus.cpp" line="156"/>
+        <location filename="modinfodialognexus.cpp" line="150"/>
         <source>Current Version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="159"/>
+        <location filename="modinfodialognexus.cpp" line="153"/>
         <source>No update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="191"/>
+        <location filename="modinfodialognexus.cpp" line="185"/>
         <source>Tracked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="194"/>
+        <location filename="modinfodialognexus.cpp" line="188"/>
         <source>Untracked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialognexus.cpp" line="307"/>
+        <location filename="modinfodialognexus.cpp" line="301"/>
         <source>
       &lt;div style=&quot;text-align: center;&quot;&gt;
       &lt;p&gt;This mod does not have a valid Nexus ID. You can add a custom web
@@ -5815,207 +5586,207 @@ Please enter a name:</source>
 <context>
     <name>OrganizerCore</name>
     <message>
-        <location filename="organizercore.cpp" line="198"/>
+        <location filename="organizercore.cpp" line="197"/>
         <source>File is write protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="200"/>
+        <location filename="organizercore.cpp" line="199"/>
         <source>Invalid file format (probably a bug)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="202"/>
+        <location filename="organizercore.cpp" line="201"/>
         <source>Unknown error %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="206"/>
+        <location filename="organizercore.cpp" line="205"/>
         <source>Failed to write settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="207"/>
+        <location filename="organizercore.cpp" line="206"/>
         <source>An error occurred trying to write back MO settings to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="361"/>
+        <location filename="organizercore.cpp" line="360"/>
         <source>Download started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="364"/>
+        <location filename="organizercore.cpp" line="363"/>
         <source>Download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="563"/>
+        <location filename="organizercore.cpp" line="562"/>
         <source>The selected profile &apos;%1&apos; does not exist. The profile &apos;%2&apos; will be used instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="743"/>
+        <location filename="organizercore.cpp" line="742"/>
         <source>Installation cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="744"/>
+        <location filename="organizercore.cpp" line="743"/>
         <source>Another installation is currently in progress.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="757"/>
+        <location filename="organizercore.cpp" line="756"/>
         <source>Installation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="790"/>
+        <location filename="organizercore.cpp" line="788"/>
         <source>Configure Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="791"/>
+        <location filename="organizercore.cpp" line="789"/>
         <source>This mod contains ini tweaks. Do you want to configure them now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="801"/>
+        <location filename="organizercore.cpp" line="799"/>
         <source>mod not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="817"/>
+        <location filename="organizercore.cpp" line="807"/>
         <source>Extraction cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="818"/>
+        <location filename="organizercore.cpp" line="808"/>
         <source>The installation was cancelled while extracting files. If this was prior to a FOMOD setup, this warning may be ignored. However, if this was during installation, the mod will likely be missing files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1043"/>
+        <location filename="organizercore.cpp" line="1031"/>
         <source>file not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1059"/>
+        <location filename="organizercore.cpp" line="1047"/>
         <source>failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1107"/>
+        <location filename="organizercore.cpp" line="1095"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1108"/>
+        <location filename="organizercore.cpp" line="1096"/>
         <source>Sorry, can&apos;t preview anything. This function currently does not support extracting from bsas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1119"/>
+        <location filename="organizercore.cpp" line="1107"/>
         <source>File &apos;%1&apos; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1127"/>
+        <location filename="organizercore.cpp" line="1115"/>
         <source>Failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1232"/>
+        <location filename="organizercore.cpp" line="1220"/>
         <source>Failed to refresh list of esps: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1340"/>
+        <location filename="organizercore.cpp" line="1328"/>
         <source>Multiple esps/esls activated, please check that they don&apos;t conflict.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1411"/>
+        <location filename="organizercore.cpp" line="1399"/>
         <source>You need to be logged in with Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1455"/>
+        <location filename="organizercore.cpp" line="1443"/>
         <source>Download?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1456"/>
+        <location filename="organizercore.cpp" line="1444"/>
         <source>A download has been started but no installed page plugin recognizes it.
 If you download anyway no information (i.e. version) will be associated with the download.
 Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1677"/>
-        <location filename="organizercore.cpp" line="1729"/>
+        <location filename="organizercore.cpp" line="1665"/>
+        <location filename="organizercore.cpp" line="1717"/>
         <source>failed to update mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1736"/>
-        <location filename="organizercore.cpp" line="1753"/>
+        <location filename="organizercore.cpp" line="1724"/>
+        <location filename="organizercore.cpp" line="1741"/>
         <source>login successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1762"/>
+        <location filename="organizercore.cpp" line="1750"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1763"/>
+        <location filename="organizercore.cpp" line="1751"/>
         <source>Login failed, try again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1771"/>
+        <location filename="organizercore.cpp" line="1759"/>
         <source>login failed: %1. Download will not be associated with an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1779"/>
+        <location filename="organizercore.cpp" line="1767"/>
         <source>login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1789"/>
+        <location filename="organizercore.cpp" line="1777"/>
         <source>login failed: %1. You need to log-in with Nexus to update MO.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1836"/>
+        <location filename="organizercore.cpp" line="1824"/>
         <source>MO1 &quot;Script Extender&quot; load mechanism has left hook.dll in your game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1840"/>
-        <location filename="organizercore.cpp" line="1861"/>
+        <location filename="organizercore.cpp" line="1828"/>
+        <location filename="organizercore.cpp" line="1849"/>
         <source>Description missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1849"/>
+        <location filename="organizercore.cpp" line="1837"/>
         <source>&lt;a href=&quot;%1&quot;&gt;hook.dll&lt;/a&gt; has been found in your game folder (right click to copy the full path). This is most likely a leftover of setting the ModOrganizer 1 load mechanism to &quot;Script Extender&quot;, in which case you must remove this file either by changing the load mechanism in ModOrganizer 1 or manually removing the file, otherwise the game is likely to crash and burn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1886"/>
+        <location filename="organizercore.cpp" line="1874"/>
         <source>failed to save load order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1958"/>
+        <location filename="organizercore.cpp" line="1946"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2038"/>
+        <location filename="organizercore.cpp" line="2026"/>
         <source>The designated write target &quot;%1&quot; is not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6236,97 +6007,92 @@ Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="246"/>
+        <location filename="pluginlist.cpp" line="242"/>
         <source>failed to update esp info for file %1 (source id: %2), error: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="405"/>
+        <location filename="pluginlist.cpp" line="400"/>
         <source>Plugin not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1254"/>
+        <location filename="pluginlist.cpp" line="1238"/>
         <source>Origin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1258"/>
+        <location filename="pluginlist.cpp" line="1242"/>
         <source>This plugin can&apos;t be disabled (enforced by the game).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1262"/>
+        <location filename="pluginlist.cpp" line="1245"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1267"/>
+        <location filename="pluginlist.cpp" line="1250"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1272"/>
+        <location filename="pluginlist.cpp" line="1255"/>
         <source>Missing Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1284"/>
+        <location filename="pluginlist.cpp" line="1267"/>
         <source>Enabled Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1295"/>
+        <location filename="pluginlist.cpp" line="1273"/>
         <source>Loads Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1296"/>
+        <location filename="pluginlist.cpp" line="1277"/>
         <source>There are Archives connected to this plugin. Their assets will be added to your game, overwriting in case of conflicts following the plugin order. Loose files will always overwrite assets from Archives. (This flag only checks for Archives from the same mod as the plugin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1304"/>
+        <location filename="pluginlist.cpp" line="1286"/>
         <source>Loads INI settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1307"/>
+        <location filename="pluginlist.cpp" line="1289"/>
         <source>There is an ini file connected to this plugin. Its settings will be added to your game settings, overwriting in case of conflicts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1314"/>
-        <source>This %1 is flagged as an ESL. It will adhere to the %1 load order but the records will be loaded in ESL space.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="pluginlist.cpp" line="1320"/>
-        <source>This game does not currently permit custom plugin loading. There may be manual workarounds.</source>
+        <location filename="pluginlist.cpp" line="1295"/>
+        <source>This ESP is flagged as an ESL. It will adhere to the ESP load order but the records will be loaded in ESL space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1351"/>
+        <location filename="pluginlist.cpp" line="1327"/>
         <source>Incompatible with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1357"/>
+        <location filename="pluginlist.cpp" line="1333"/>
         <source>Depends on missing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1365"/>
+        <location filename="pluginlist.cpp" line="1341"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1369"/>
+        <location filename="pluginlist.cpp" line="1345"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1642"/>
+        <location filename="pluginlist.cpp" line="1618"/>
         <source>failed to restore load order for %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6570,61 +6336,61 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="276"/>
+        <location filename="profile.cpp" line="253"/>
         <source>failed to write mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="287"/>
+        <location filename="profile.cpp" line="264"/>
         <source>failed to update tweaked ini file, wrong settings may be used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="309"/>
+        <location filename="profile.cpp" line="286"/>
         <source>failed to create tweaked ini: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="335"/>
+        <location filename="profile.cpp" line="312"/>
         <source>failed to open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="427"/>
+        <location filename="profile.cpp" line="404"/>
         <source>&quot;%1&quot; is missing or inaccessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="489"/>
-        <location filename="profile.cpp" line="527"/>
-        <location filename="profile.cpp" line="619"/>
-        <location filename="profile.cpp" line="677"/>
-        <location filename="profile.cpp" line="686"/>
+        <location filename="profile.cpp" line="466"/>
+        <location filename="profile.cpp" line="504"/>
+        <location filename="profile.cpp" line="596"/>
+        <location filename="profile.cpp" line="654"/>
+        <location filename="profile.cpp" line="663"/>
         <source>invalid mod index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="572"/>
+        <location filename="profile.cpp" line="549"/>
         <source>A mod named &quot;overwrite&quot; was detected, disabled, and moved to the highest priority on the mod list. You may want to rename this mod and enable it again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="863"/>
+        <location filename="profile.cpp" line="838"/>
         <source>Delete profile-specific save games?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="864"/>
+        <location filename="profile.cpp" line="839"/>
         <source>Do you want to delete the profile-specific save games? (If you select &quot;No&quot;, the save games will show up again if you re-enable profile-specific save games)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="899"/>
+        <location filename="profile.cpp" line="873"/>
         <source>Missing profile-specific game INI files!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="900"/>
+        <location filename="profile.cpp" line="874"/>
         <source>Some of your profile-specific game INI files were missing.  They will now be copied from the vanilla game folder.  You might want to double-check your settings.
 
 Missing files:
@@ -6632,12 +6398,12 @@ Missing files:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="919"/>
+        <location filename="profile.cpp" line="893"/>
         <source>Delete profile-specific game INI files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profile.cpp" line="920"/>
+        <location filename="profile.cpp" line="894"/>
         <source>Do you want to delete the profile-specific game INI files? (If you select &quot;No&quot;, the INI files will be used again if you re-enable profile-specific game INI files.)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6927,60 +6693,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="428"/>
+        <location filename="categories.cpp" line="142"/>
+        <source>Failed to save custom categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="268"/>
+        <location filename="categories.cpp" line="314"/>
+        <location filename="categories.cpp" line="323"/>
+        <location filename="categories.cpp" line="391"/>
+        <source>invalid category index: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="334"/>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="431"/>
+        <location filename="categories.cpp" line="337"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="434"/>
+        <location filename="categories.cpp" line="340"/>
         <source>Has category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="437"/>
+        <location filename="categories.cpp" line="343"/>
         <source>Conflicted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="440"/>
+        <location filename="categories.cpp" line="346"/>
         <source>Has hidden files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="443"/>
+        <location filename="categories.cpp" line="349"/>
         <source>Endorsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="446"/>
+        <location filename="categories.cpp" line="352"/>
         <source>Has backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="449"/>
+        <location filename="categories.cpp" line="355"/>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="452"/>
+        <location filename="categories.cpp" line="358"/>
         <source>Has valid game data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="455"/>
+        <location filename="categories.cpp" line="361"/>
         <source>Has Nexus ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="458"/>
+        <location filename="categories.cpp" line="364"/>
         <source>Tracked on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="categories.cpp" line="401"/>
+        <source>invalid category id: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="colortable.cpp" line="200"/>
         <source>Is overwritten (loose files)</source>
@@ -7012,35 +6796,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="290"/>
+        <location filename="commandline.cpp" line="289"/>
         <source>failed to start application: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="752"/>
+        <location filename="commandline.cpp" line="751"/>
         <source>Executable &apos;%1&apos; not found in instance &apos;%2&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="778"/>
+        <location filename="commandline.cpp" line="777"/>
         <source>Failed to run &apos;%1&apos;. The logs might have more information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="commandline.cpp" line="787"/>
+        <location filename="commandline.cpp" line="786"/>
         <source>Failed to run &apos;%1&apos;. The logs might have more information. %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="commandline.cpp" line="870"/>
-        <source>Download URL must start with https://</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="commandline.cpp" line="875"/>
-        <source>Download started</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="createinstancedialog.cpp" line="77"/>
         <source>Creating %1</source>
@@ -7060,7 +6834,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="createinstancedialogpages.cpp" line="37"/>
-        <location filename="createinstancedialogpages.cpp" line="1232"/>
+        <location filename="createinstancedialogpages.cpp" line="1210"/>
         <source>Instance type: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7070,81 +6844,81 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="299"/>
+        <location filename="createinstancedialogpages.cpp" line="293"/>
         <source>Find game installation for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="347"/>
+        <location filename="createinstancedialogpages.cpp" line="341"/>
         <source>Find game installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="396"/>
-        <location filename="createinstancedialogpages.cpp" line="683"/>
-        <location filename="createinstancedialogpages.cpp" line="684"/>
+        <location filename="createinstancedialogpages.cpp" line="390"/>
+        <location filename="createinstancedialogpages.cpp" line="677"/>
+        <location filename="createinstancedialogpages.cpp" line="678"/>
         <source>Unrecognized game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="398"/>
+        <location filename="createinstancedialogpages.cpp" line="392"/>
         <source>The folder %1 does not seem to contain a game Mod Organizer can manage.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="401"/>
+        <location filename="createinstancedialogpages.cpp" line="395"/>
         <source>See details for the list of supported games.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="478"/>
+        <location filename="createinstancedialogpages.cpp" line="472"/>
         <source>No installation found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="549"/>
+        <location filename="createinstancedialogpages.cpp" line="543"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="550"/>
+        <location filename="createinstancedialogpages.cpp" line="544"/>
         <source>The folder must contain a valid game installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="661"/>
-        <location filename="createinstancedialogpages.cpp" line="662"/>
+        <location filename="createinstancedialogpages.cpp" line="655"/>
+        <location filename="createinstancedialogpages.cpp" line="656"/>
         <source>Microsoft Store game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="664"/>
+        <location filename="createinstancedialogpages.cpp" line="658"/>
         <source>The folder %1 seems to be a Microsoft Store game install.  Games installed through the Microsoft Store are not supported by Mod Organizer and will not work properly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="670"/>
-        <location filename="createinstancedialogpages.cpp" line="692"/>
-        <location filename="createinstancedialogpages.cpp" line="718"/>
+        <location filename="createinstancedialogpages.cpp" line="664"/>
+        <location filename="createinstancedialogpages.cpp" line="686"/>
+        <location filename="createinstancedialogpages.cpp" line="712"/>
         <source>Use this folder for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="671"/>
+        <location filename="createinstancedialogpages.cpp" line="665"/>
         <source>Use this folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="672"/>
-        <location filename="createinstancedialogpages.cpp" line="693"/>
-        <location filename="createinstancedialogpages.cpp" line="719"/>
+        <location filename="createinstancedialogpages.cpp" line="666"/>
+        <location filename="createinstancedialogpages.cpp" line="687"/>
+        <location filename="createinstancedialogpages.cpp" line="713"/>
         <source>I know what I&apos;m doing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="673"/>
-        <location filename="createinstancedialogpages.cpp" line="694"/>
-        <location filename="createinstancedialogpages.cpp" line="720"/>
+        <location filename="createinstancedialogpages.cpp" line="667"/>
+        <location filename="createinstancedialogpages.cpp" line="688"/>
+        <location filename="createinstancedialogpages.cpp" line="714"/>
         <location filename="settingsdialognexus.cpp" line="270"/>
         <location filename="settingsdialognexus.cpp" line="277"/>
         <location filename="settingsdialogworkarounds.cpp" line="142"/>
@@ -7160,103 +6934,69 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="686"/>
+        <location filename="createinstancedialogpages.cpp" line="680"/>
         <source>The folder %1 does not seem to contain an installation for &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%2&lt;/span&gt; or for any other game Mod Organizer can manage.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="705"/>
-        <location filename="createinstancedialogpages.cpp" line="706"/>
+        <location filename="createinstancedialogpages.cpp" line="699"/>
+        <location filename="createinstancedialogpages.cpp" line="700"/>
         <source>Incorrect game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="708"/>
+        <location filename="createinstancedialogpages.cpp" line="702"/>
         <source>The folder %1 seems to contain an installation for &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%2&lt;/span&gt;, not &lt;span style=&quot;white-space: nowrap; font-weight: bold;&quot;&gt;%3&lt;/span&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="716"/>
+        <location filename="createinstancedialogpages.cpp" line="710"/>
         <source>Manage %1 instead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1234"/>
+        <location filename="createinstancedialogpages.cpp" line="1212"/>
         <source>Instance location: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1237"/>
+        <location filename="createinstancedialogpages.cpp" line="1215"/>
         <source>Instance name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1240"/>
-        <source>Profile settings:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1242"/>
-        <source>  Local INIs: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1243"/>
-        <location filename="createinstancedialogpages.cpp" line="1246"/>
-        <location filename="createinstancedialogpages.cpp" line="1248"/>
-        <source>yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1243"/>
-        <location filename="createinstancedialogpages.cpp" line="1246"/>
-        <location filename="createinstancedialogpages.cpp" line="1249"/>
-        <source>no</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1245"/>
-        <source>  Local Saves: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1247"/>
-        <source>  Automatic Archive Invalidation: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="createinstancedialogpages.cpp" line="1254"/>
-        <location filename="createinstancedialogpages.cpp" line="1258"/>
+        <location filename="createinstancedialogpages.cpp" line="1221"/>
+        <location filename="createinstancedialogpages.cpp" line="1225"/>
         <source>Base directory: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1259"/>
+        <location filename="createinstancedialogpages.cpp" line="1226"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1260"/>
+        <location filename="createinstancedialogpages.cpp" line="1227"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1261"/>
+        <location filename="createinstancedialogpages.cpp" line="1228"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1262"/>
+        <location filename="createinstancedialogpages.cpp" line="1229"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1271"/>
+        <location filename="createinstancedialogpages.cpp" line="1238"/>
         <source>Game: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="createinstancedialogpages.cpp" line="1272"/>
+        <location filename="createinstancedialogpages.cpp" line="1239"/>
         <source>Game location: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7398,7 +7138,7 @@ Destination:<byte value="xd"/>
     <message>
         <location filename="loglist.cpp" line="384"/>
         <location filename="loot.cpp" line="396"/>
-        <location filename="organizercore.cpp" line="389"/>
+        <location filename="organizercore.cpp" line="388"/>
         <location filename="settingsdialogdiagnostics.cpp" line="37"/>
         <location filename="settingsdialogdiagnostics.cpp" line="63"/>
         <location filename="settingsdialogpaths.cpp" line="100"/>
@@ -7410,7 +7150,7 @@ Destination:<byte value="xd"/>
     </message>
     <message>
         <location filename="loglist.cpp" line="385"/>
-        <location filename="organizercore.cpp" line="390"/>
+        <location filename="organizercore.cpp" line="389"/>
         <source>Failed to create &quot;%1&quot;. Your user account probably lacks permission.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7517,23 +7257,23 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1260"/>
+        <location filename="mainwindow.cpp" line="1255"/>
         <source>Please use &quot;Help&quot; from the toolbar to get usage instructions to all elements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1601"/>
+        <location filename="mainwindow.cpp" line="1526"/>
         <source>Visit %1 on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1817"/>
-        <location filename="mainwindow.cpp" line="2886"/>
+        <location filename="mainwindow.cpp" line="1742"/>
+        <location filename="mainwindow.cpp" line="2790"/>
         <source>&lt;Manage...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1829"/>
+        <location filename="mainwindow.cpp" line="1754"/>
         <source>failed to parse profile %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7671,7 +7411,7 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="408"/>
+        <location filename="organizercore.cpp" line="407"/>
         <source>One of the configured MO2 directories (profiles, mods, or overwrite) is on a path containing a symbolic (or other) link. This is likely to be incompatible with MO2&apos;s virtual filesystem.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7681,12 +7421,12 @@ Destination:<byte value="xd"/>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="708"/>
+        <location filename="pluginlist.cpp" line="699"/>
         <source>failed to access %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="722"/>
+        <location filename="pluginlist.cpp" line="713"/>
         <source>failed to set file time %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7739,19 +7479,19 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1397"/>
-        <location filename="settings.cpp" line="1421"/>
-        <location filename="settings.cpp" line="1469"/>
+        <location filename="settings.cpp" line="1367"/>
+        <location filename="settings.cpp" line="1391"/>
+        <location filename="settings.cpp" line="1439"/>
         <source>attempt to store setting for unknown plugin &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1967"/>
+        <location filename="settings.cpp" line="1927"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1968"/>
+        <location filename="settings.cpp" line="1928"/>
         <source>Failed to start the helper application: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7788,12 +7528,12 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="173"/>
+        <location filename="settingsdialoggeneral.cpp" line="161"/>
         <source>Confirm?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="174"/>
+        <location filename="settingsdialoggeneral.cpp" line="162"/>
         <source>This will reset all the choices you made to dialogs and make them all visible again. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7812,26 +7552,26 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="settingsdialognexus.cpp" line="440"/>
+        <location filename="settingsdialognexus.cpp" line="441"/>
         <location filename="settingsdialognexus.cpp" line="442"/>
         <location filename="settingsdialognexus.cpp" line="443"/>
         <location filename="settingsdialognexus.cpp" line="444"/>
-        <location filename="settingsdialognexus.cpp" line="445"/>
-        <location filename="settingsdialognexus.cpp" line="446"/>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="458"/>
+        <location filename="settingsdialognexus.cpp" line="456"/>
         <source>Executables (*.exe)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="458"/>
+        <location filename="settingsdialognexus.cpp" line="456"/>
         <source>All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="461"/>
+        <location filename="settingsdialognexus.cpp" line="459"/>
         <source>Select the browser executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8214,17 +7954,17 @@ You can restart Mod Organizer as administrator and try launching the program aga
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="46"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="47"/>
         <source>%1, #%2, Level %3, %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="99"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="100"/>
         <source>failed to open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="108"/>
+        <location filename="../../game_gamebryo/src/gamebryo/gamebryosavegame.cpp" line="109"/>
         <source>wrong file format - expected %1 got %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8715,148 +8455,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="settingsdialog.ui" line="210"/>
-        <source>Profile Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="216"/>
-        <source>Local INIs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="223"/>
-        <source>Local Saves</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="230"/>
-        <source>Automatic Archive Invalidation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="240"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="258"/>
-        <location filename="settingsdialog.ui" line="261"/>
+        <location filename="settingsdialog.ui" line="228"/>
+        <location filename="settingsdialog.ui" line="231"/>
         <source>Dialogs will always be centered on the main window, but will remember their size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="264"/>
+        <location filename="settingsdialog.ui" line="234"/>
         <source>Always center dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="271"/>
+        <location filename="settingsdialog.ui" line="241"/>
         <source>Show confirmation when changing instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="278"/>
-        <location filename="settingsdialog.ui" line="281"/>
+        <location filename="settingsdialog.ui" line="248"/>
+        <location filename="settingsdialog.ui" line="251"/>
         <source>Show the menubar when the Alt key is pressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="284"/>
+        <location filename="settingsdialog.ui" line="254"/>
         <source>Show menubar when pressing Alt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="291"/>
+        <location filename="settingsdialog.ui" line="261"/>
         <source>Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="294"/>
+        <location filename="settingsdialog.ui" line="264"/>
         <source>Open previews on double-click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="325"/>
-        <location filename="settingsdialog.ui" line="328"/>
+        <location filename="settingsdialog.ui" line="295"/>
+        <location filename="settingsdialog.ui" line="298"/>
         <source>Reset all choices made in dialogs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="331"/>
+        <location filename="settingsdialog.ui" line="301"/>
         <source>Reset Dialog Choices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="338"/>
-        <location filename="settingsdialog.ui" line="341"/>
+        <location filename="settingsdialog.ui" line="308"/>
+        <location filename="settingsdialog.ui" line="311"/>
         <source>Modify the categories available to arrange your mods.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="344"/>
+        <location filename="settingsdialog.ui" line="314"/>
         <source>Configure Mod Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="385"/>
+        <location filename="settingsdialog.ui" line="355"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="391"/>
+        <location filename="settingsdialog.ui" line="361"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="400"/>
-        <location filename="settingsdialog.ui" line="403"/>
+        <location filename="settingsdialog.ui" line="370"/>
+        <location filename="settingsdialog.ui" line="373"/>
         <source>Visual theme of the user interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="410"/>
+        <location filename="settingsdialog.ui" line="380"/>
         <source>Explore...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="435"/>
+        <location filename="settingsdialog.ui" line="405"/>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="487"/>
-        <location filename="settingsdialog.ui" line="490"/>
+        <location filename="settingsdialog.ui" line="457"/>
+        <location filename="settingsdialog.ui" line="460"/>
         <source>Reset all colors to their default value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="493"/>
+        <location filename="settingsdialog.ui" line="463"/>
         <source>Reset Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="512"/>
+        <location filename="settingsdialog.ui" line="482"/>
         <source>Mod List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="533"/>
-        <location filename="settingsdialog.ui" line="536"/>
+        <location filename="settingsdialog.ui" line="503"/>
+        <location filename="settingsdialog.ui" line="506"/>
         <source>Colors set on separators will also be shown in the mod list scrollbar at the location of the separator. This can be useful for quickly navigating to a specific separator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="539"/>
+        <location filename="settingsdialog.ui" line="509"/>
         <source>Show mod list separator colors on the scrollbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="549"/>
+        <location filename="settingsdialog.ui" line="519"/>
         <source>Disable this to no longer display mods installed outside MO in the mod list (left pane). Assets from those mods will then be treated as having lowest mod priority together with the original game content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="552"/>
+        <location filename="settingsdialog.ui" line="522"/>
         <source>By default Mod Organizer will display esp+bsa bundles installed with foreign tools as mods (left pane). This allows you to control their priority in relation to other mods. This is particularly useful if you also use Steam Workshop to install mods.
 However, if you installed loose file mods outside MO which conflict with BSAs also installed outside MO those conflicts can&apos;t be resolved correctly.
 
@@ -8864,452 +8584,447 @@ If you disable this feature, MO will only display official DLCs this way. Please
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="558"/>
+        <location filename="settingsdialog.ui" line="528"/>
         <source>Display mods installed outside MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="568"/>
-        <location filename="settingsdialog.ui" line="571"/>
+        <location filename="settingsdialog.ui" line="538"/>
+        <location filename="settingsdialog.ui" line="541"/>
         <source>Save the current filters when closing MO2 and restore them on startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="574"/>
+        <location filename="settingsdialog.ui" line="544"/>
         <source>Remember selected filters after restarting MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="581"/>
-        <location filename="settingsdialog.ui" line="584"/>
+        <location filename="settingsdialog.ui" line="551"/>
+        <location filename="settingsdialog.ui" line="554"/>
         <source>Check if updates are available for mods after installing them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="587"/>
+        <location filename="settingsdialog.ui" line="557"/>
         <source>Check for updates when installing mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="597"/>
-        <location filename="settingsdialog.ui" line="600"/>
+        <location filename="settingsdialog.ui" line="567"/>
+        <location filename="settingsdialog.ui" line="570"/>
         <source>Automatically collapse separators, categories or nexus ids after a delay when hovering them during drag.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="603"/>
+        <location filename="settingsdialog.ui" line="573"/>
         <source>Automatically collapse items during drag on hover</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="629"/>
+        <location filename="settingsdialog.ui" line="599"/>
         <source>Collapsible Separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="649"/>
-        <location filename="settingsdialog.ui" line="652"/>
+        <location filename="settingsdialog.ui" line="619"/>
+        <location filename="settingsdialog.ui" line="622"/>
         <source>Highlight collapsed separators based on conflicts and plugins from mods inside them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="655"/>
+        <location filename="settingsdialog.ui" line="625"/>
         <source>on separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="665"/>
+        <location filename="settingsdialog.ui" line="635"/>
         <source>Enable when sorting by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="672"/>
+        <location filename="settingsdialog.ui" line="642"/>
         <source>Show conflicts and plugins </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="679"/>
-        <location filename="settingsdialog.ui" line="682"/>
+        <location filename="settingsdialog.ui" line="649"/>
+        <location filename="settingsdialog.ui" line="652"/>
         <source>When selecting a collapsed separator, highlight conflicting mods and plugins from mods inside the separator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="685"/>
+        <location filename="settingsdialog.ui" line="655"/>
         <source>from separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="695"/>
+        <location filename="settingsdialog.ui" line="665"/>
         <source>ascending priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="705"/>
+        <location filename="settingsdialog.ui" line="675"/>
         <source>descending  priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="712"/>
+        <location filename="settingsdialog.ui" line="682"/>
         <source>Show icons on separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="734"/>
+        <location filename="settingsdialog.ui" line="704"/>
         <source>conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="744"/>
+        <location filename="settingsdialog.ui" line="714"/>
         <source>flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="754"/>
+        <location filename="settingsdialog.ui" line="724"/>
         <source>content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="764"/>
+        <location filename="settingsdialog.ui" line="734"/>
         <source>version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="792"/>
-        <location filename="settingsdialog.ui" line="795"/>
+        <location filename="settingsdialog.ui" line="762"/>
+        <location filename="settingsdialog.ui" line="765"/>
         <source>Do not share the collapse/expanded state of separators between profiles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="798"/>
+        <location filename="settingsdialog.ui" line="768"/>
         <source>Profile-specific collapse states for separators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="822"/>
+        <location filename="settingsdialog.ui" line="792"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="830"/>
-        <location filename="settingsdialog.ui" line="847"/>
-        <location filename="settingsdialog.ui" line="944"/>
-        <location filename="settingsdialog.ui" line="1002"/>
-        <location filename="settingsdialog.ui" line="1981"/>
+        <location filename="settingsdialog.ui" line="800"/>
+        <location filename="settingsdialog.ui" line="817"/>
+        <location filename="settingsdialog.ui" line="914"/>
+        <location filename="settingsdialog.ui" line="972"/>
+        <location filename="settingsdialog.ui" line="1941"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="857"/>
+        <location filename="settingsdialog.ui" line="827"/>
         <source>Caches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="864"/>
+        <location filename="settingsdialog.ui" line="834"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="871"/>
-        <location filename="settingsdialog.ui" line="874"/>
+        <location filename="settingsdialog.ui" line="841"/>
+        <location filename="settingsdialog.ui" line="844"/>
         <source>Directory where downloads are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="891"/>
+        <location filename="settingsdialog.ui" line="861"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="911"/>
+        <location filename="settingsdialog.ui" line="881"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="934"/>
+        <location filename="settingsdialog.ui" line="904"/>
         <source>Directory where mods are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="937"/>
+        <location filename="settingsdialog.ui" line="907"/>
         <source>Directory where mods are stored. Please note that changing this will break all associations of profiles with mods that don&apos;t exist in the new location (with the same name).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="961"/>
+        <location filename="settingsdialog.ui" line="931"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="981"/>
+        <location filename="settingsdialog.ui" line="951"/>
         <source>Managed Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="988"/>
+        <location filename="settingsdialog.ui" line="958"/>
         <source>Base Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="995"/>
+        <location filename="settingsdialog.ui" line="965"/>
         <source>Use %BASE_DIR% to refer to the Base Directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1024"/>
+        <location filename="settingsdialog.ui" line="994"/>
         <source> All directories must be writable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1032"/>
+        <location filename="settingsdialog.ui" line="1002"/>
         <source>Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1080"/>
+        <location filename="settingsdialog.ui" line="1050"/>
         <source>Nexus Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1089"/>
+        <location filename="settingsdialog.ui" line="1059"/>
         <source>User ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1106"/>
+        <location filename="settingsdialog.ui" line="1076"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1120"/>
+        <location filename="settingsdialog.ui" line="1090"/>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1137"/>
+        <location filename="settingsdialog.ui" line="1107"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1146"/>
+        <location filename="settingsdialog.ui" line="1116"/>
         <source>Daily requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1160"/>
+        <location filename="settingsdialog.ui" line="1130"/>
         <source>Hourly requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1179"/>
+        <location filename="settingsdialog.ui" line="1149"/>
         <source>Nexus Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1200"/>
+        <location filename="settingsdialog.ui" line="1170"/>
         <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1207"/>
+        <location filename="settingsdialog.ui" line="1177"/>
         <source>Manually enter the API key and try to login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1210"/>
+        <location filename="settingsdialog.ui" line="1180"/>
         <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1217"/>
+        <location filename="settingsdialog.ui" line="1187"/>
         <source>Clear the stored Nexus API key and force reauthorization.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1220"/>
+        <location filename="settingsdialog.ui" line="1190"/>
         <source>Disconnect from Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1293"/>
-        <location filename="settingsdialog.ui" line="1768"/>
+        <location filename="settingsdialog.ui" line="1263"/>
+        <location filename="settingsdialog.ui" line="1728"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1326"/>
+        <location filename="settingsdialog.ui" line="1296"/>
         <source>Endorsement Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1336"/>
+        <location filename="settingsdialog.ui" line="1306"/>
         <source>Tracked Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1346"/>
-        <source>Use Nexus category mappings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="1356"/>
-        <location filename="settingsdialog.ui" line="1359"/>
+        <location filename="settingsdialog.ui" line="1316"/>
+        <location filename="settingsdialog.ui" line="1319"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, a counter is displayed in the bottom right corner.  This informs the user of their remaining API requests.  The Nexus API becomes unusable once these API requests run out.  Checking this option will hide that counter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1362"/>
+        <location filename="settingsdialog.ui" line="1322"/>
         <source>Hide API Request Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1387"/>
+        <location filename="settingsdialog.ui" line="1347"/>
         <source>Associate with &quot;Download with manager&quot; links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1394"/>
+        <location filename="settingsdialog.ui" line="1354"/>
         <source>Remove cache and cookies.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1397"/>
+        <location filename="settingsdialog.ui" line="1357"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1410"/>
+        <location filename="settingsdialog.ui" line="1370"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1433"/>
+        <location filename="settingsdialog.ui" line="1393"/>
         <source>Known Servers (updated on download)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1454"/>
+        <location filename="settingsdialog.ui" line="1414"/>
         <source>Preferred Servers (Drag &amp; Drop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1481"/>
+        <location filename="settingsdialog.ui" line="1441"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1582"/>
+        <location filename="settingsdialog.ui" line="1542"/>
         <source>Author:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1602"/>
+        <location filename="settingsdialog.ui" line="1562"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1622"/>
+        <location filename="settingsdialog.ui" line="1582"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1645"/>
+        <location filename="settingsdialog.ui" line="1605"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1674"/>
+        <location filename="settingsdialog.ui" line="1634"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1679"/>
+        <location filename="settingsdialog.ui" line="1639"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1687"/>
+        <location filename="settingsdialog.ui" line="1647"/>
         <source>No plugin found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1708"/>
+        <location filename="settingsdialog.ui" line="1668"/>
         <source>Blacklisted Plugins (use &lt;del&gt; to remove):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1722"/>
+        <location filename="settingsdialog.ui" line="1682"/>
         <source>Workarounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1786"/>
+        <location filename="settingsdialog.ui" line="1746"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1789"/>
+        <location filename="settingsdialog.ui" line="1749"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)
 Uncheck this if you want to use Mod Organizer with total conversions (like Nehrim) but be aware that the game will crash if required files are not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1793"/>
+        <location filename="settingsdialog.ui" line="1753"/>
         <source>Force-enable game files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1803"/>
+        <location filename="settingsdialog.ui" line="1763"/>
         <source>Enable parsing of Archives. This is an Experimental Feature. Has negative effects on performance and known incorrectness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1806"/>
+        <location filename="settingsdialog.ui" line="1766"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, MO will parse archive files (BSA, BA2) to calculate conflicts between the contents of the archive files and other loose files. This process has a noticeable cost in performance.&lt;/p&gt;&lt;p&gt;This feature should not be confused with the archive management feature offered by MO1. MO2 will only show conflicts with archives and will NOT load them into the game or program.&lt;/p&gt;&lt;p&gt;If you disable this feature, MO will only display conflicts between loose files.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1809"/>
+        <location filename="settingsdialog.ui" line="1769"/>
         <source>Enable archives parsing (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1819"/>
-        <location filename="settingsdialog.ui" line="1822"/>
+        <location filename="settingsdialog.ui" line="1779"/>
+        <location filename="settingsdialog.ui" line="1782"/>
         <source>Disable this to prevent the GUI from being locked when running an executable.  This may result in abnormal behavior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1825"/>
+        <location filename="settingsdialog.ui" line="1785"/>
         <source>Lock GUI when running executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1838"/>
+        <location filename="settingsdialog.ui" line="1798"/>
         <source>Steam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1847"/>
+        <location filename="settingsdialog.ui" line="1807"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1861"/>
+        <location filename="settingsdialog.ui" line="1821"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1868"/>
+        <location filename="settingsdialog.ui" line="1828"/>
         <source>Steam App ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1875"/>
+        <location filename="settingsdialog.ui" line="1835"/>
         <source>The Steam AppID for your game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1878"/>
+        <location filename="settingsdialog.ui" line="1838"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -9325,68 +9040,68 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1905"/>
+        <location filename="settingsdialog.ui" line="1865"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1911"/>
+        <location filename="settingsdialog.ui" line="1871"/>
         <source>Disable automatic internet features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1914"/>
+        <location filename="settingsdialog.ui" line="1874"/>
         <source>Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1917"/>
+        <location filename="settingsdialog.ui" line="1877"/>
         <source>Offline Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1924"/>
+        <location filename="settingsdialog.ui" line="1884"/>
         <source>Use a proxy for network connections.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1927"/>
+        <location filename="settingsdialog.ui" line="1887"/>
         <source>Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1930"/>
+        <location filename="settingsdialog.ui" line="1890"/>
         <source>Use System HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1952"/>
-        <location filename="settingsdialog.ui" line="1955"/>
-        <location filename="settingsdialog.ui" line="1958"/>
-        <location filename="settingsdialog.ui" line="1968"/>
-        <location filename="settingsdialog.ui" line="1971"/>
-        <location filename="settingsdialog.ui" line="1974"/>
+        <location filename="settingsdialog.ui" line="1912"/>
+        <location filename="settingsdialog.ui" line="1915"/>
+        <location filename="settingsdialog.ui" line="1918"/>
+        <location filename="settingsdialog.ui" line="1928"/>
+        <location filename="settingsdialog.ui" line="1931"/>
+        <location filename="settingsdialog.ui" line="1934"/>
         <source>Use &quot;%1&quot; as a placeholder for the URL.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1961"/>
+        <location filename="settingsdialog.ui" line="1921"/>
         <source>Custom browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2009"/>
-        <location filename="settingsdialog.ui" line="2012"/>
+        <location filename="settingsdialog.ui" line="1969"/>
+        <location filename="settingsdialog.ui" line="1972"/>
         <source>Resets the window geometries for all windows.  This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2015"/>
+        <location filename="settingsdialog.ui" line="1975"/>
         <source>Reset Window Geometries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2022"/>
+        <location filename="settingsdialog.ui" line="1982"/>
         <source>Add executables to the blacklist to prevent them from
 accessing the virtual file system. This is useful to prevent
 unintended programs from being hooked. Hooking unintended
@@ -9395,54 +9110,54 @@ programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2029"/>
+        <location filename="settingsdialog.ui" line="1989"/>
         <source>Add executables to the blacklist to prevent them from accessing the virtual file system.  This is useful to prevent unintended programs from being hooked.  Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2032"/>
+        <location filename="settingsdialog.ui" line="1992"/>
         <source>Executables Blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2042"/>
-        <location filename="settingsdialog.ui" line="2046"/>
+        <location filename="settingsdialog.ui" line="2002"/>
+        <location filename="settingsdialog.ui" line="2006"/>
         <source>For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles.
 For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2050"/>
+        <location filename="settingsdialog.ui" line="2010"/>
         <source>Back-date BSAs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2094"/>
+        <location filename="settingsdialog.ui" line="2054"/>
         <source>These are workarounds for problems with Mod Organizer. Please make sure you read the help text before changing anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2105"/>
+        <location filename="settingsdialog.ui" line="2065"/>
         <source>Diagnostics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2114"/>
+        <location filename="settingsdialog.ui" line="2074"/>
         <source>Logs and Crashes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2123"/>
+        <location filename="settingsdialog.ui" line="2083"/>
         <source>Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2130"/>
+        <location filename="settingsdialog.ui" line="2090"/>
         <source>Decides the amount of data printed to &quot;ModOrganizer.log&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2133"/>
+        <location filename="settingsdialog.ui" line="2093"/>
         <source>
                                     Decides the amount of data printed to &quot;ModOrganizer.log&quot;.
                                     &quot;Debug&quot; produces very useful information for finding problems. There is usually no noteworthy performance impact but the file may become rather large. If this is a problem you may prefer the &quot;Info&quot; level for regular use. On the &quot;Error&quot; level the log file usually remains empty.
@@ -9450,17 +9165,17 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2143"/>
+        <location filename="settingsdialog.ui" line="2103"/>
         <source>Crash Dumps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2150"/>
+        <location filename="settingsdialog.ui" line="2110"/>
         <source>Decides which type of crash dumps are collected when injected processes crash.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2153"/>
+        <location filename="settingsdialog.ui" line="2113"/>
         <source>
                                     Decides which type of crash dumps are collected when injected processes crash.
                                     &quot;None&quot; Disables the generation of crash dumps by MO.
@@ -9471,17 +9186,17 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2166"/>
+        <location filename="settingsdialog.ui" line="2126"/>
         <source>Max Dumps To Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2173"/>
+        <location filename="settingsdialog.ui" line="2133"/>
         <source>Maximum number of crash dumps to keep on disk. Use 0 for unlimited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2176"/>
+        <location filename="settingsdialog.ui" line="2136"/>
         <source>
                                     Maximum number of crash dumps to keep on disk. Use 0 for unlimited.
                                     Set &quot;Crash Dumps&quot; above to None to disable crash dump collection.
@@ -9489,22 +9204,22 @@ For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2189"/>
+        <location filename="settingsdialog.ui" line="2149"/>
         <source>Integrated LOOT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2198"/>
+        <location filename="settingsdialog.ui" line="2158"/>
         <source>LOOT Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2211"/>
+        <location filename="settingsdialog.ui" line="2171"/>
         <source>Hint: right click link and copy link location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="2214"/>
+        <location filename="settingsdialog.ui" line="2174"/>
         <source>
                             Logs and crash dumps are stored under your current instance in the &lt;a href=&quot;LOGS_FULL_PATH&quot;&gt;LOGS_DIR&lt;/a&gt;
                             and &lt;a href=&quot;DUMPS_FULL_PATH&quot;&gt;DUMPS_DIR&lt;/a&gt; folders.

From efdff42d5f6cdf5044e741ad7aa00bf73991c422 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 20:59:40 -0500
Subject: [PATCH 36/43] Make category struct attributes private

---
 src/categories.cpp         | 61 +++++++++++++++++---------------------
 src/categories.h           | 44 ++++++++++++++++++---------
 src/categoriesdialog.cpp   | 16 +++++-----
 src/downloadmanager.cpp    |  2 +-
 src/modlistviewactions.cpp |  3 +-
 5 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 5d0d2bb77..1e2997fbb 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -131,7 +131,7 @@ void CategoryFactory::loadCategories()
                        nexCells[0].constData());
           }
           m_NexusMap.insert_or_assign(nexID, NexusCategory(nexName, nexID));
-          m_NexusMap.at(nexID).m_CategoryID = catID;
+          m_NexusMap.at(nexID).setCategoryID(catID);
         } else {
           log::error(tr("invalid nexus category line {}: {} ({} cells)").toStdString(),
                      lineNum, nexLine.constData(), nexCells.count());
@@ -157,10 +157,6 @@ void CategoryFactory::reset()
   m_Categories.clear();
   m_NexusMap.clear();
   m_IDMap.clear();
-  // 28 =
-  // 43 = Savegames (makes no sense to install them through MO)
-  // 45 = Videos and trailers
-  // 87 = Miscelanous
   addCategory(0, "None", std::vector<NexusCategory>(), 0);
 }
 
@@ -168,16 +164,16 @@ void CategoryFactory::setParents()
 {
   for (std::vector<Category>::iterator iter = m_Categories.begin();
        iter != m_Categories.end(); ++iter) {
-    iter->m_HasChildren = false;
+    iter->setHasChildren(false);
   }
 
   for (std::vector<Category>::const_iterator categoryIter = m_Categories.begin();
        categoryIter != m_Categories.end(); ++categoryIter) {
-    if (categoryIter->m_ParentID != 0) {
+    if (categoryIter->parentID() != 0) {
       std::map<int, unsigned int>::const_iterator iter =
-          m_IDMap.find(categoryIter->m_ParentID);
+          m_IDMap.find(categoryIter->parentID());
       if (iter != m_IDMap.end()) {
-        m_Categories[iter->second].m_HasChildren = true;
+        m_Categories[iter->second].setHasChildren(true);
       }
     }
   }
@@ -201,15 +197,15 @@ void CategoryFactory::saveCategories()
   categoryFile.resize(0);
   for (std::vector<Category>::const_iterator iter = m_Categories.begin();
        iter != m_Categories.end(); ++iter) {
-    if (iter->m_ID == 0) {
+    if (iter->ID() == 0) {
       continue;
     }
     QByteArray line;
-    line.append(QByteArray::number(iter->m_ID))
+    line.append(QByteArray::number(iter->ID()))
         .append("|")
-        .append(iter->m_Name.toUtf8())
+        .append(iter->name().toUtf8())
         .append("|")
-        .append(QByteArray::number(iter->m_ParentID))
+        .append(QByteArray::number(iter->parentID()))
         .append("\n");
     categoryFile.write(line);
   }
@@ -225,9 +221,9 @@ void CategoryFactory::saveCategories()
   nexusMapFile.resize(0);
   for (auto iter = m_NexusMap.begin(); iter != m_NexusMap.end(); ++iter) {
     QByteArray line;
-    line.append(QByteArray::number(iter->second.m_CategoryID)).append("|");
-    line.append(iter->second.m_Name.toUtf8()).append("|");
-    line.append(QByteArray::number(iter->second.m_ID)).append("\n");
+    line.append(QByteArray::number(iter->second.categoryID())).append("|");
+    line.append(iter->second.name().toUtf8()).append("|");
+    line.append(QByteArray::number(iter->second.ID())).append("\n");
     nexusMapFile.write(line);
   }
   nexusMapFile.close();
@@ -274,8 +270,8 @@ void CategoryFactory::addCategory(int id, const QString& name,
                                   int parentID)
 {
   for (auto nexusCat : nexusCats) {
-    m_NexusMap.insert_or_assign(nexusCat.m_ID, nexusCat);
-    m_NexusMap.at(nexusCat.m_ID).m_CategoryID = id;
+    m_NexusMap.insert_or_assign(nexusCat.ID(), nexusCat);
+    m_NexusMap.at(nexusCat.ID()).setCategoryID(id);
   }
   int index = static_cast<int>(m_Categories.size());
   m_Categories.push_back(Category(index, id, name, parentID, nexusCats));
@@ -285,9 +281,8 @@ void CategoryFactory::addCategory(int id, const QString& name,
 void CategoryFactory::setNexusCategories(
     std::vector<CategoryFactory::NexusCategory>& nexusCats)
 {
-  m_NexusMap.clear();
   for (auto nexusCat : nexusCats) {
-    m_NexusMap.emplace(nexusCat.m_ID, nexusCat);
+    m_NexusMap.emplace(nexusCat.ID(), nexusCat);
   }
 
   saveCategories();
@@ -367,7 +362,7 @@ int CategoryFactory::getParentID(unsigned int index) const
     throw MyException(tr("invalid category index: %1").arg(index));
   }
 
-  return m_Categories[index].m_ParentID;
+  return m_Categories[index].parentID();
 }
 
 bool CategoryFactory::categoryExists(int id) const
@@ -394,12 +389,12 @@ bool CategoryFactory::isDescendantOfImpl(int id, int parentID,
 
   if (iter != m_IDMap.end()) {
     unsigned int index = iter->second;
-    if (m_Categories[index].m_ParentID == 0) {
+    if (m_Categories[index].parentID() == 0) {
       return false;
-    } else if (m_Categories[index].m_ParentID == parentID) {
+    } else if (m_Categories[index].parentID() == parentID) {
       return true;
     } else {
-      return isDescendantOfImpl(m_Categories[index].m_ParentID, parentID, seen);
+      return isDescendantOfImpl(m_Categories[index].parentID(), parentID, seen);
     }
   } else {
     log::warn(tr("{} is no valid category id").toStdString(), id);
@@ -413,7 +408,7 @@ bool CategoryFactory::hasChildren(unsigned int index) const
     throw MyException(tr("invalid category index: %1").arg(index));
   }
 
-  return m_Categories[index].m_HasChildren;
+  return m_Categories[index].hasChildren();
 }
 
 QString CategoryFactory::getCategoryName(unsigned int index) const
@@ -422,7 +417,7 @@ QString CategoryFactory::getCategoryName(unsigned int index) const
     throw MyException(tr("invalid category index: %1").arg(index));
   }
 
-  return m_Categories[index].m_Name;
+  return m_Categories[index].name();
 }
 
 QString CategoryFactory::getSpecialCategoryName(SpecialCategories type) const
@@ -480,7 +475,7 @@ QString CategoryFactory::getCategoryNameByID(int id) const
       return {};
     }
 
-    return m_Categories[index].m_Name;
+    return m_Categories[index].name();
   }
 }
 
@@ -490,7 +485,7 @@ int CategoryFactory::getCategoryID(unsigned int index) const
     throw MyException(tr("invalid category index: %1").arg(index));
   }
 
-  return m_Categories[index].m_ID;
+  return m_Categories[index].ID();
 }
 
 int CategoryFactory::getCategoryIndex(int ID) const
@@ -506,11 +501,11 @@ int CategoryFactory::getCategoryID(const QString& name) const
 {
   auto iter = std::find_if(m_Categories.begin(), m_Categories.end(),
                            [name](const Category& cat) -> bool {
-                             return cat.m_Name == name;
+                             return cat.name() == name;
                            });
 
   if (iter != m_Categories.end()) {
-    return iter->m_ID;
+    return iter->ID();
   } else {
     return -1;
   }
@@ -520,10 +515,10 @@ unsigned int CategoryFactory::resolveNexusID(int nexusID) const
 {
   auto result = m_NexusMap.find(nexusID);
   if (result != m_NexusMap.end()) {
-    if (m_IDMap.count(result->second.m_CategoryID)) {
+    if (m_IDMap.count(result->second.categoryID())) {
       log::debug(tr("nexus category id {} maps to internal {}").toStdString(), nexusID,
-                 m_IDMap.at(result->second.m_CategoryID));
-      return m_IDMap.at(result->second.m_CategoryID);
+                 m_IDMap.at(result->second.categoryID()));
+      return m_IDMap.at(result->second.categoryID());
     }
   }
   log::debug(tr("nexus category id {} not mapped").toStdString(), nexusID);
diff --git a/src/categories.h b/src/categories.h
index b7a9c2145..a6ee2e24f 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -58,46 +58,62 @@ class CategoryFactory : public QObject
 public:
   struct NexusCategory
   {
-    NexusCategory(const QString& name, const int nexusID) : m_Name(name), m_ID(nexusID)
+    NexusCategory(const QString name, const int nexusID) : m_Name(name), m_ID(nexusID)
     {}
-    QString m_Name;
-    int m_ID;
-    int m_CategoryID = -1;
 
     friend bool operator==(const NexusCategory& LHS, const NexusCategory& RHS)
     {
-      return LHS.m_ID == RHS.m_ID;
+      return LHS.ID() == RHS.ID();
     }
 
     friend bool operator==(const NexusCategory& LHS, const int RHS)
     {
-      return LHS.m_ID == RHS;
+      return LHS.ID() == RHS;
     }
 
     friend bool operator<(const NexusCategory& LHS, const NexusCategory& RHS)
     {
-      return LHS.m_ID < RHS.m_ID;
+      return LHS.ID() < RHS.ID();
     }
+
+    QString name() const { return m_Name; }
+    int ID() const { return m_ID; }
+    int categoryID() const { return m_CategoryID; }
+    void setCategoryID(int categoryID) { m_CategoryID = categoryID; }
+
+  private:
+    QString m_Name;
+    int m_ID;
+    int m_CategoryID = -1;
   };
 
   struct Category
   {
-    Category(int sortValue, int id, const QString& name, int parentID,
+    Category(int sortValue, int id, const QString name, int parentID,
              std::vector<NexusCategory> nexusCats)
         : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
           m_ParentID(parentID), m_NexusCats(nexusCats)
     {}
+
+    friend bool operator<(const Category& LHS, const Category& RHS)
+    {
+      return LHS.sortValue() < RHS.sortValue();
+    }
+
+    int sortValue() const { return m_SortValue; }
+    int ID() const { return m_ID; }
+    int parentID() const { return m_ParentID; }
+    QString name() const { return m_Name; }
+    bool hasChildren() const { return m_HasChildren; }
+    void setHasChildren(bool b) { m_HasChildren = b; }
+
+  private:
     int m_SortValue;
     int m_ID;
     int m_ParentID;
-    bool m_HasChildren;
     QString m_Name;
     std::vector<NexusCategory> m_NexusCats;
-
-    friend bool operator<(const Category& LHS, const Category& RHS)
-    {
-      return LHS.m_SortValue < RHS.m_SortValue;
-    }
+    bool m_HasChildren;
   };
 
 public:
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 53c930f37..b770fa0bd 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -213,7 +213,7 @@ void CategoriesDialog::fillTable()
            categories.m_Categories.begin();
        iter != categories.m_Categories.end(); ++iter, ++row) {
     const CategoryFactory::Category& category = *iter;
-    if (category.m_ID == 0) {
+    if (category.ID() == 0) {
       --row;
       continue;
     }
@@ -221,11 +221,11 @@ void CategoriesDialog::fillTable()
     //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
 
     QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
-    idItem->setData(Qt::DisplayRole, category.m_ID);
+    idItem->setData(Qt::DisplayRole, category.ID());
 
-    QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(category.m_Name));
+    QScopedPointer<QTableWidgetItem> nameItem(new QTableWidgetItem(category.name()));
     QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
-    parentIDItem->setData(Qt::DisplayRole, category.m_ParentID);
+    parentIDItem->setData(Qt::DisplayRole, category.parentID());
     QScopedPointer<QTableWidgetItem> nexusCatItem(new QTableWidgetItem());
 
     table->setItem(row, 0, idItem.take());
@@ -236,15 +236,15 @@ void CategoriesDialog::fillTable()
 
   for (auto nexusCat : categories.m_NexusMap) {
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
-    nexusItem->setData(Qt::DisplayRole, nexusCat.second.m_Name);
-    nexusItem->setData(Qt::UserRole, nexusCat.second.m_ID);
+    nexusItem->setData(Qt::DisplayRole, nexusCat.second.name());
+    nexusItem->setData(Qt::UserRole, nexusCat.second.ID());
     list->addItem(nexusItem.take());
     auto item = table->item(categories.resolveNexusID(nexusCat.first) - 1, 3);
     if (item != nullptr) {
       auto itemData = item->data(Qt::UserRole).toList();
       QVariantList newData;
-      newData.append(nexusCat.second.m_Name);
-      newData.append(nexusCat.second.m_ID);
+      newData.append(nexusCat.second.name());
+      newData.append(nexusCat.second.ID());
       itemData.insert(itemData.length(), newData);
       QStringList names;
       for (auto cat : itemData) {
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index d7a72c0be..6894b401e 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -432,7 +432,7 @@ void DownloadManager::refreshList()
 
     log::debug("saw {} downloads", m_ActiveDownloads.size());
 
-    emit update(-1);  
+    emit update(-1);
 
   } catch (const std::bad_alloc&) {
     reportError(tr("Memory allocation error (in refreshing directory)."));
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index 983574abd..cbac9c6c3 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -1135,8 +1135,7 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const
         categoryID = downloadMeta.value("category", 0).toInt();
       }
     }
-    unsigned int categoryIndex =
-        CategoryFactory::instance().resolveNexusID(categoryID);
+    unsigned int categoryIndex = CategoryFactory::instance().resolveNexusID(categoryID);
     if (categoryIndex != 0)
       modInfo->setPrimaryCategory(
           CategoryFactory::instance().getCategoryID(categoryIndex));

From 5d67b8dd212c235a452468dff5271880fb2d4ac3 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 21:02:52 -0500
Subject: [PATCH 37/43] Remove extraneous function

---
 src/downloadmanager.cpp | 15 ---------------
 src/downloadmanager.h   |  8 --------
 2 files changed, 23 deletions(-)

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 6894b401e..3f9a2a882 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1327,21 +1327,6 @@ QString DownloadManager::getFileName(int index) const
   return m_ActiveDownloads.at(index)->m_FileName;
 }
 
-int DownloadManager::getDownloadIndex(QString filename) const
-{
-  auto file = std::find_if(m_ActiveDownloads.begin(), m_ActiveDownloads.end(),
-                           [=](DownloadManager::DownloadInfo* const val) {
-                             if (val->m_FileName == filename)
-                               return true;
-                             return false;
-                           });
-  if (file != m_ActiveDownloads.end()) {
-    int fileIndex = m_ActiveDownloads.indexOf(*file);
-    return fileIndex;
-  }
-  return -1;
-}
-
 QDateTime DownloadManager::getFileTime(int index) const
 {
   if ((index < 0) || (index >= m_ActiveDownloads.size())) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 618c2813a..76e9ab5a7 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -298,14 +298,6 @@ class DownloadManager : public QObject
    **/
   QString getFileName(int index) const;
 
-  /**
-   * @brief retrieve the file index from the filename
-   *
-   * @param filename the filename of the download
-   * @return the index of the file
-   */
-  int getDownloadIndex(QString filename) const;
-
   /**
    * @brief retrieve the file size of the download specified by index
    *

From 5f14c57555b42a583500829970da221f056be47e Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 21:35:29 -0500
Subject: [PATCH 38/43] Unnecessary class definition

---
 src/filterlist.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/filterlist.h b/src/filterlist.h
index c28b08c0e..f572762e7 100644
--- a/src/filterlist.h
+++ b/src/filterlist.h
@@ -9,7 +9,6 @@ namespace Ui
 class MainWindow;
 };
 class CategoryFactory;
-class PluginContainer;
 class Settings;
 class OrganizerCore;
 

From 4bd860a0d276aa154c0c976c28b6b263a6572801 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 21:51:41 -0500
Subject: [PATCH 39/43] Remove download refresh scoped blocker - Accidentally
 added to this branch

---
 src/downloadmanager.cpp | 35 ++++++++++++++++-------------------
 src/downloadmanager.h   |  9 ---------
 src/organizercore.cpp   |  1 -
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 3f9a2a882..5ccbdb4da 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -153,20 +153,6 @@ DownloadManager::DownloadInfo::createFromMeta(const QString& filePath, bool show
   return info;
 }
 
-ScopedDisableDirWatcher::ScopedDisableDirWatcher(DownloadManager* downloadManager)
-{
-  m_downloadManager = downloadManager;
-  m_downloadManager->startDisableDirWatcher();
-  log::debug("Scoped Disable DirWatcher: Started");
-}
-
-ScopedDisableDirWatcher::~ScopedDisableDirWatcher()
-{
-  m_downloadManager->endDisableDirWatcher();
-  m_downloadManager = nullptr;
-  log::debug("Scoped Disable DirWatcher: Stopped");
-}
-
 void DownloadManager::startDisableDirWatcher()
 {
   DownloadManager::m_DirWatcherDisabler++;
@@ -331,9 +317,10 @@ void DownloadManager::refreshList()
 {
   TimeThis tt("DownloadManager::refreshList()");
 
-  // avoid triggering other refreshes
-  ScopedDisableDirWatcher scopedDirWatcher(this);
   try {
+    // avoid triggering other refreshes
+    startDisableDirWatcher();
+
     int downloadsBefore = m_ActiveDownloads.size();
 
     // remove finished downloads
@@ -434,6 +421,9 @@ void DownloadManager::refreshList()
 
     emit update(-1);
 
+    // let watcher trigger refreshes again
+    endDisableDirWatcher();
+
   } catch (const std::bad_alloc&) {
     reportError(tr("Memory allocation error (in refreshing directory)."));
   }
@@ -768,7 +758,7 @@ void DownloadManager::addNXMDownload(const QString& url)
 void DownloadManager::removeFile(int index, bool deleteFile)
 {
   // Avoid triggering refreshes from DirWatcher
-  ScopedDisableDirWatcher scopedDirWatcher(this);
+  startDisableDirWatcher();
 
   if (index >= m_ActiveDownloads.size()) {
     throw MyException(tr("remove: invalid download index %1").arg(index));
@@ -780,6 +770,7 @@ void DownloadManager::removeFile(int index, bool deleteFile)
       (download->m_State == STATE_DOWNLOADING)) {
     // shouldn't have been possible
     log::error("tried to remove active download");
+    endDisableDirWatcher();
     return;
   }
 
@@ -790,6 +781,7 @@ void DownloadManager::removeFile(int index, bool deleteFile)
   if (deleteFile) {
     if (!shellDelete(QStringList(filePath), true)) {
       reportError(tr("failed to delete %1").arg(filePath));
+      endDisableDirWatcher();
       return;
     }
 
@@ -803,6 +795,8 @@ void DownloadManager::removeFile(int index, bool deleteFile)
       metaSettings.setValue("removed", true);
   }
   m_DownloadRemoved(index);
+
+  endDisableDirWatcher();
 }
 
 class LessThanWrapper
@@ -1440,13 +1434,15 @@ void DownloadManager::markInstalled(int index)
   }
 
   // Avoid triggering refreshes from DirWatcher
-  ScopedDisableDirWatcher scopedDirWatcher(this);
+  startDisableDirWatcher();
 
   DownloadInfo* info = m_ActiveDownloads.at(index);
   QSettings metaFile(info->m_Output.fileName() + ".meta", QSettings::IniFormat);
   metaFile.setValue("installed", true);
   metaFile.setValue("uninstalled", false);
 
+  endDisableDirWatcher();
+
   setState(m_ActiveDownloads.at(index), STATE_INSTALLED);
 }
 
@@ -1675,7 +1671,7 @@ void DownloadManager::downloadReadyRead()
 void DownloadManager::createMetaFile(DownloadInfo* info)
 {
   // Avoid triggering refreshes from DirWatcher
-  ScopedDisableDirWatcher scopedDirWatcher(this);
+  startDisableDirWatcher();
 
   QSettings metaFile(QString("%1.meta").arg(info->m_Output.fileName()),
                      QSettings::IniFormat);
@@ -1699,6 +1695,7 @@ void DownloadManager::createMetaFile(DownloadInfo* info)
                                   (info->m_State == DownloadManager::STATE_ERROR));
   metaFile.setValue("removed", info->m_Hidden);
 
+  endDisableDirWatcher();
   // slightly hackish...
   for (int i = 0; i < m_ActiveDownloads.size(); ++i) {
     if (m_ActiveDownloads[i] == info) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 76e9ab5a7..305c10e3e 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -626,13 +626,4 @@ private slots:
   QTimer m_TimeoutTimer;
 };
 
-class ScopedDisableDirWatcher
-{
-public:
-  ScopedDisableDirWatcher(DownloadManager* downloadManager);
-  ~ScopedDisableDirWatcher();
-
-private:
-  DownloadManager* m_downloadManager;
-};
 #endif  // DOWNLOADMANAGER_H
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index dda731ba7..b4e758d1b 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -831,7 +831,6 @@ OrganizerCore::doInstall(const QString& archivePath, GuessedValue<QString> modNa
 
 ModInfo::Ptr OrganizerCore::installDownload(int index, int priority)
 {
-  ScopedDisableDirWatcher scopedDirwatcher(&m_DownloadManager);
   try {
     QString fileName        = m_DownloadManager.getFilePath(index);
     QString gameName        = m_DownloadManager.getGameName(index);

From 11522cf700e07a6c39bad45c346e62a73935c083 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Sat, 23 Sep 2023 22:12:58 -0500
Subject: [PATCH 40/43] Remove unnecessary plugincontainer from settings

---
 src/settingsdialog.cpp        | 4 ++--
 src/settingsdialoggeneral.cpp | 5 ++---
 src/settingsdialoggeneral.h   | 6 +-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 67c9dd5d4..425a1cb80 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -37,8 +37,8 @@ SettingsDialog::SettingsDialog(PluginContainer* pluginContainer, Settings& setti
 {
   ui->setupUi(this);
 
-  m_tabs.push_back(std::unique_ptr<SettingsTab>(
-      new GeneralSettingsTab(settings, m_pluginContainer, *this)));
+  m_tabs.push_back(
+      std::unique_ptr<SettingsTab>(new GeneralSettingsTab(settings, *this)));
   m_tabs.push_back(std::unique_ptr<SettingsTab>(new ThemeSettingsTab(settings, *this)));
   m_tabs.push_back(
       std::unique_ptr<SettingsTab>(new ModListSettingsTab(settings, *this)));
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 62b26c2fb..7acaa190b 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -8,9 +8,8 @@
 
 using namespace MOBase;
 
-GeneralSettingsTab::GeneralSettingsTab(Settings& s, PluginContainer* pluginContainer,
-                                       SettingsDialog& d)
-    : SettingsTab(s, d), m_PluginContainer(pluginContainer)
+GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
+    : SettingsTab(s, d)
 {
   // language
   addLanguages();
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index aa11edbb3..6c1ee8670 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -8,8 +8,7 @@
 class GeneralSettingsTab : public SettingsTab
 {
 public:
-  GeneralSettingsTab(Settings& settings, PluginContainer* pluginContainer,
-                     SettingsDialog& dialog);
+  GeneralSettingsTab(Settings& settings, SettingsDialog& dialog);
 
   void update();
 
@@ -21,9 +20,6 @@ class GeneralSettingsTab : public SettingsTab
 
   void onEditCategories();
   void onResetDialogs();
-
-private:
-  PluginContainer* m_PluginContainer;
 };
 
 #endif  // SETTINGSDIALOGGENERAL_H

From c30b5183aeea55290ec9072cac958cd6e90fdf30 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sun, 24 Sep 2023 05:46:09 -0500
Subject: [PATCH 41/43] Convert for loops, move nexusCats

---
 src/categories.cpp       | 37 +++++++++++++++++--------------------
 src/categories.h         |  4 ++--
 src/categoriesdialog.cpp |  4 ++--
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/categories.cpp b/src/categories.cpp
index 1e2997fbb..c1aa756f3 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -162,16 +162,14 @@ void CategoryFactory::reset()
 
 void CategoryFactory::setParents()
 {
-  for (std::vector<Category>::iterator iter = m_Categories.begin();
-       iter != m_Categories.end(); ++iter) {
-    iter->setHasChildren(false);
+  for (auto& category : m_Categories) {
+    category.setHasChildren(false);
   }
 
-  for (std::vector<Category>::const_iterator categoryIter = m_Categories.begin();
-       categoryIter != m_Categories.end(); ++categoryIter) {
-    if (categoryIter->parentID() != 0) {
+  for (const auto& category : m_Categories) {
+    if (category.parentID() != 0) {
       std::map<int, unsigned int>::const_iterator iter =
-          m_IDMap.find(categoryIter->parentID());
+          m_IDMap.find(category.parentID());
       if (iter != m_IDMap.end()) {
         m_Categories[iter->second].setHasChildren(true);
       }
@@ -195,17 +193,16 @@ void CategoryFactory::saveCategories()
   }
 
   categoryFile.resize(0);
-  for (std::vector<Category>::const_iterator iter = m_Categories.begin();
-       iter != m_Categories.end(); ++iter) {
-    if (iter->ID() == 0) {
+  for (const auto& category : m_Categories) {
+    if (category.ID() == 0) {
       continue;
     }
     QByteArray line;
-    line.append(QByteArray::number(iter->ID()))
+    line.append(QByteArray::number(category.ID()))
         .append("|")
-        .append(iter->name().toUtf8())
+        .append(category.name().toUtf8())
         .append("|")
-        .append(QByteArray::number(iter->parentID()))
+        .append(QByteArray::number(category.parentID()))
         .append("\n");
     categoryFile.write(line);
   }
@@ -219,11 +216,11 @@ void CategoryFactory::saveCategories()
   }
 
   nexusMapFile.resize(0);
-  for (auto iter = m_NexusMap.begin(); iter != m_NexusMap.end(); ++iter) {
+  for (const auto& nexMap : m_NexusMap) {
     QByteArray line;
-    line.append(QByteArray::number(iter->second.categoryID())).append("|");
-    line.append(iter->second.name().toUtf8()).append("|");
-    line.append(QByteArray::number(iter->second.ID())).append("\n");
+    line.append(QByteArray::number(nexMap.second.categoryID())).append("|");
+    line.append(nexMap.second.name().toUtf8()).append("|");
+    line.append(QByteArray::number(nexMap.second.ID())).append("\n");
     nexusMapFile.write(line);
   }
   nexusMapFile.close();
@@ -269,7 +266,7 @@ void CategoryFactory::addCategory(int id, const QString& name,
                                   const std::vector<NexusCategory>& nexusCats,
                                   int parentID)
 {
-  for (auto nexusCat : nexusCats) {
+  for (const auto& nexusCat : nexusCats) {
     m_NexusMap.insert_or_assign(nexusCat.ID(), nexusCat);
     m_NexusMap.at(nexusCat.ID()).setCategoryID(id);
   }
@@ -279,9 +276,9 @@ void CategoryFactory::addCategory(int id, const QString& name,
 }
 
 void CategoryFactory::setNexusCategories(
-    std::vector<CategoryFactory::NexusCategory>& nexusCats)
+    const std::vector<CategoryFactory::NexusCategory>& nexusCats)
 {
-  for (auto nexusCat : nexusCats) {
+  for (const auto& nexusCat : nexusCats) {
     m_NexusMap.emplace(nexusCat.ID(), nexusCat);
   }
 
diff --git a/src/categories.h b/src/categories.h
index a6ee2e24f..15b9bbc17 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -92,7 +92,7 @@ class CategoryFactory : public QObject
     Category(int sortValue, int id, const QString name, int parentID,
              std::vector<NexusCategory> nexusCats)
         : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
-          m_ParentID(parentID), m_NexusCats(nexusCats)
+          m_ParentID(parentID), m_NexusCats(std::move(nexusCats))
     {}
 
     friend bool operator<(const Category& LHS, const Category& RHS)
@@ -132,7 +132,7 @@ class CategoryFactory : public QObject
    **/
   void saveCategories();
 
-  void setNexusCategories(std::vector<CategoryFactory::NexusCategory>& nexusCats);
+  void setNexusCategories(const std::vector<CategoryFactory::NexusCategory>& nexusCats);
 
   void refreshNexusCategories(CategoriesDialog* dialog);
 
diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index b770fa0bd..21523e85b 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -234,7 +234,7 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 3, nexusCatItem.take());
   }
 
-  for (auto nexusCat : categories.m_NexusMap) {
+  for (const auto& nexusCat : categories.m_NexusMap) {
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
     nexusItem->setData(Qt::DisplayRole, nexusCat.second.name());
     nexusItem->setData(Qt::UserRole, nexusCat.second.ID());
@@ -355,7 +355,7 @@ void CategoriesDialog::nxmGameInfoAvailable(QString gameName, QVariant,
   CategoryFactory& catFactory = CategoryFactory::instance();
   QListWidget* list           = ui->nexusCategoryList;
   list->clear();
-  for (auto category : categories) {
+  for (const auto& category : categories) {
     auto catMap = category.toMap();
     QScopedPointer<QListWidgetItem> nexusItem(new QListWidgetItem());
     nexusItem->setData(Qt::DisplayRole, catMap["name"].toString());

From cdc16dfbb2b41f4ede8c471658819d4b6132fcf0 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sun, 24 Sep 2023 14:36:52 -0500
Subject: [PATCH 42/43] Use c++11 for loop

---
 src/categoriesdialog.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index 21523e85b..e577eb5f5 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -209,10 +209,7 @@ void CategoriesDialog::fillTable()
                                     QRegularExpression("([0-9]+)?(,[0-9]+)*"), this)));
 
   int row = 0;
-  for (std::vector<CategoryFactory::Category>::const_iterator iter =
-           categories.m_Categories.begin();
-       iter != categories.m_Categories.end(); ++iter, ++row) {
-    const CategoryFactory::Category& category = *iter;
+  for (const auto& category : categories.m_Categories) {
     if (category.ID() == 0) {
       --row;
       continue;
@@ -232,6 +229,7 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 1, nameItem.take());
     table->setItem(row, 2, parentIDItem.take());
     table->setItem(row, 3, nexusCatItem.take());
+    ++row;
   }
 
   for (const auto& nexusCat : categories.m_NexusMap) {

From 74668b9363d877d055a5e8b8c7d001ba448dc832 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sun, 24 Sep 2023 19:03:08 -0500
Subject: [PATCH 43/43] Fixes for table * row increment needs to be before the
 logic but after the ID check/continue * avoid running context menu logic on
 null rows

---
 src/categoriesdialog.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/categoriesdialog.cpp b/src/categoriesdialog.cpp
index e577eb5f5..ff2262861 100644
--- a/src/categoriesdialog.cpp
+++ b/src/categoriesdialog.cpp
@@ -214,6 +214,7 @@ void CategoriesDialog::fillTable()
       --row;
       continue;
     }
+    ++row;
     table->insertRow(row);
     //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
 
@@ -229,7 +230,6 @@ void CategoriesDialog::fillTable()
     table->setItem(row, 1, nameItem.take());
     table->setItem(row, 2, parentIDItem.take());
     table->setItem(row, 3, nexusCatItem.take());
-    ++row;
   }
 
   for (const auto& nexusCat : categories.m_NexusMap) {
@@ -270,14 +270,16 @@ void CategoriesDialog::addCategory_clicked()
 
 void CategoriesDialog::removeCategory_clicked()
 {
-  ui->categoriesTable->removeRow(m_ContextRow);
+  if (m_ContextRow >= 0)
+    ui->categoriesTable->removeRow(m_ContextRow);
 }
 
 void CategoriesDialog::removeNexusMap_clicked()
 {
-  ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::UserRole, QVariantList());
-  ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::DisplayRole, QString());
-  // ui->categoriesTable->update();
+  if (m_ContextRow >= 0) {
+    ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::UserRole, QVariantList());
+    ui->categoriesTable->item(m_ContextRow, 3)->setData(Qt::DisplayRole, QString());
+  }
 }
 
 void CategoriesDialog::nexusRefresh_clicked()