From 5cecb80780cf0a07d0b07e95a745ac1a3878519a Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 21 Aug 2024 23:00:51 +0900
Subject: [PATCH 1/2] Adding PortMaster as a new system

---
 resources/systems/linux/es_systems.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml
index c3e2620e5..3e5aa6111 100644
--- a/resources/systems/linux/es_systems.xml
+++ b/resources/systems/linux/es_systems.xml
@@ -1566,6 +1566,15 @@
         <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
+    <system>
+        <name>portmaster</name>
+        <fullname>PortMaster</fullname>
+        <path>%ROMPATH%/portmaster</path>
+        <extension>.sh</extension>
+        <command label="PortMaster">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <platform>portmaster, pc, pcwindows</platform>
+        <theme>portmaster</theme>
+    </system>
     <system>
         <name>ps2</name>
         <fullname>Sony PlayStation 2</fullname>

From 76e2fd741f77fc887ca4325f0c376f98b8b9e5ea Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 4 Sep 2024 21:03:37 +0900
Subject: [PATCH 2/2] Restored lost collection settings

---
 es-app/src/guis/GuiMenu.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 6ee3c07bb..fb7e2122e 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -2063,6 +2063,17 @@ void GuiMenu::openESDEConfiguration() {
     });
     s->addRow(row);
 
+    // COLLECTION SETTINGS
+    row.elements.clear();
+    row.addElement(std::make_shared<TextComponent>("GAME COLLECTION SETTINGS",
+                                                   Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary),
+                   true);
+    row.addElement(mMenu.makeArrow(), false);
+    row.makeAcceptInputHandler([this] {
+        openCollectionSystemOptions();
+    });
+    s->addRow(row);
+
     // OTHER SETTINGS
     row.elements.clear();
     row.addElement(std::make_shared<TextComponent>("OTHER SETTINGS",